diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index 5043188..adcf3dd 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -172,6 +172,7 @@ IDL_BINDINGS += \
     fileapi/FileEntry.idl \
     fileapi/FileEntrySync.idl \
     fileapi/FileError.idl \
+    fileapi/FileException.idl \
     fileapi/FileList.idl \
     fileapi/FileReader.idl \
     fileapi/FileSystemCallback.idl \
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm
index 922da15..5791983 100644
--- a/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -40,6 +40,10 @@ my @implFixedHeader = ();
 my @implContent = ();
 my @implContentDecls = ();
 my %implIncludes = ();
+my %headerInclues = ();
+$headerIncludes{"wtf/text/StringHash.h"} = 1;
+$headerIncludes{"WrapperTypeInfo.h"} = 1;
+$headerIncludes{"V8DOMWrapper.h"} = 1;

 my @allParents = ();

@@ -205,8 +209,11 @@ sub GetSVGPropertyTypes
         $implIncludes{"SVGAnimatedListPropertyTearOff.h"} = 1;
     } elsif ($svgNativeType =~ /SVGTransformListPropertyTearOff/) {
         $svgListPropertyType = $svgWrappedNativeType;
-        $implIncludes{"SVGAnimatedListPropertyTearOff.h"} = 1;
-        $implIncludes{"SVGTransformListPropertyTearOff.h"} = 1;
+        $headerIncludes{"SVGAnimatedListPropertyTearOff.h"} = 1;
+        $headerIncludes{"SVGTransformListPropertyTearOff.h"} = 1;
+    } elsif ($svgNativeType =~ /SVGPathSegListPropertyTearOff/) {
+        $svgListPropertyType = $svgWrappedNativeType;
+        $headerIncludes{"SVGPathSegListPropertyTearOff.h"} = 1;
     }

     if ($svgPropertyType) {
@@ -234,11 +241,6 @@ sub GenerateHeader
     # - Add default header template
     push(@headerContent, GenerateHeaderContentHeader($dataNode));

-    my %headerInclues = ();
-    $headerIncludes{"wtf/text/StringHash.h"} = 1;
-    $headerIncludes{"WrapperTypeInfo.h"} = 1;
-    $headerIncludes{"V8DOMWrapper.h"} = 1;
-
     my $headerClassInclude = GetHeaderClassInclude($implClassName);
     $headerIncludes{$headerClassInclude} = 1 if $headerClassInclude ne "";

diff --git a/WebCore/bindings/v8/ScriptControllerQt.cpp b/WebCore/bindings/v8/ScriptControllerQt.cpp
index 246921e..11bcb01 100644
--- a/WebCore/bindings/v8/ScriptControllerQt.cpp
+++ b/WebCore/bindings/v8/ScriptControllerQt.cpp
@@ -40,7 +40,7 @@ QScriptEngine* ScriptController::qtScriptEngine()
         v8::Context::Scope scope(v8Context);
         if (v8Context.IsEmpty())
             return 0;
-        m_qtScriptEngine = new QScriptEngine(QScriptEngine::AdoptCurrentContext);
+        m_qtScriptEngine = new QScriptEngine;
      }
      return m_qtScriptEngine.get();
 }
diff --git a/WebCore/bindings/v8/V8GCController.cpp b/WebCore/bindings/v8/V8GCController.cpp
index b26882b..3eeacec 100644
--- a/WebCore/bindings/v8/V8GCController.cpp
+++ b/WebCore/bindings/v8/V8GCController.cpp
@@ -444,7 +444,7 @@ void V8GCController::gcEpilogue()

 void V8GCController::checkMemoryUsage()
 {
-#if PLATFORM(CHROMIUM)
+#if PLATFORM(CHROMIUM) || PLATFORM(QT) && !OS(SYMBIAN)
     // These values are appropriate for Chromium only.
     const int lowUsageMB = 256;  // If memory usage is below this threshold, do not bother forcing GC.
     const int highUsageMB = 1024;  // If memory usage is above this threshold, force GC more aggresively.
diff --git a/WebCore/inspector/CodeGeneratorInspector.pm b/WebCore/inspector/CodeGeneratorInspector.pm
index 8a3654d..177ca3b 100644
--- a/WebCore/inspector/CodeGeneratorInspector.pm
+++ b/WebCore/inspector/CodeGeneratorInspector.pm
@@ -669,6 +669,7 @@ sub generateSource
     push(@sourceContent, "\n#include \"config.h\"");
     push(@sourceContent, "#include \"$className.h\"");
     push(@sourceContent, "#include <wtf/text/StringConcatenate.h>");
+    push(@sourceContent, "#include <wtf/text/CString.h>");
     push(@sourceContent, "");
     push(@sourceContent, "#if ENABLE(INSPECTOR)");
     push(@sourceContent, "");