Merge branch '4.8' into earth-staging-master

Conflicts:
	dist/changes-4.8.0

707 files changed, 16426 insertions, 8960 deletions

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index f786b78..34446ae 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-a52dbae362a295e0adfb7ee4fdc21734ae4b7b45
+64cce100215c71575f19ca0b090c65fa97d4ba10
diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog
index 96ef591..bc11b4d 100644
--- a/src/3rdparty/webkit/ChangeLog
+++ b/src/3rdparty/webkit/ChangeLog
@@ -1,3 +1,16 @@
+2011-08-06  Aron Rosenberg  <arosenberg@logitech.com>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] Fix build with Intel compiler on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=65088
+
+        Disable Intel Compiler warning 873 - function "" has no corresponding operator
+        delete (to be called if an exception is thrown during initialization of an
+        allocated object).
+
+        * Source/WebKit.pri:
+
 2011-06-27  Alexis Menard  <alexis.menard@openbossa.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog
index ae7ef60..9cda920 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,248 @@
+2011-05-23  Thouraya ANDOLSI  <thouraya.andolsi@st.com>
+
+        Reviewed by Gavin Barraclough.
+
+        [SH4] AssemblerLabel does not name a type
+        https://bugs.webkit.org/show_bug.cgi?id=59927
+
+        SH4Assembler.h file shoold be included before AbstractMacroAssembler.h.
+
+        * assembler/MacroAssemblerSH4.h:
+
+2011-06-28  Pierre Rossi  <pierre.rossi@gmail.com>
+
+        Reviewed by Eric Seidel.
+
+        Warnings in JSC's JIT on 32 bit
+        https://bugs.webkit.org/show_bug.cgi?id=63259
+
+        Fairly straightforward, just use ASSERT_JIT_OFFSET_UNUSED when it applies.
+
+        * jit/JITPropertyAccess32_64.cpp:
+        (JSC::JIT::emit_op_method_check):
+        (JSC::JIT::compileGetByIdHotPath):
+        (JSC::JIT::emit_op_put_by_id):
+
+2011-08-30  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
+
+        [Qt] Do not unconditionally use pkg-config in .pro files
+        https://bugs.webkit.org/show_bug.cgi?id=67055
+
+        Reviewed by Andreas Kling.
+
+        Original patch from Rohan McGovern <rohan.mcgovern@nokia.com>
+
+        Using the first pkg-config in PATH is prone to errors when cross
+        compiling inside the Qt repository (using Qt's build-system).
+
+        This patch protect calls for pkg-config with
+        !contains(QT_CONFIG, no-pkg-config). no-pkg-config is added to
+        QT_CONFIG by Qt's 'configure' when cross-compiling on systems
+        without pkg-config.
+
+        The respective change in Qt's configure has been submited already.
+
+        No new tests as this is just a build change.
+
+        * wtf/wtf.pri: protect pkg-config calls
+
+2011-08-28  Jonathan Liu  <net147@gmail.com>
+
+        Fix build error when compiling with MinGW-w64 by disabling JIT
+        on Windows 64-bit
+        https://bugs.webkit.org/show_bug.cgi?id=61235
+
+        Reviewed by Gavin Barraclough.
+
+        The fixed mmap executable allocator for JIT on x86_64 requires
+        sys/mman.h which is not available on Windows.
+
+        * wtf/Platform.h:
+
+2011-07-08  Chang Shu  <cshu@webkit.org>
+
+        Rename "makeSecure" to "fill" and remove the support for displaying last character
+        to avoid layering violatation.
+        https://bugs.webkit.org/show_bug.cgi?id=59114
+
+        Reviewed by Alexey Proskuryakov.
+
+        * JavaScriptCore.exp:
+        * JavaScriptCore.order:
+        * wtf/text/StringImpl.cpp:
+        (WTF::StringImpl::fill):
+        * wtf/text/StringImpl.h:
+        * wtf/text/WTFString.h:
+        (WTF::String::fill):
+
+2011-08-15  Gavin Barraclough  <barraclough@apple.com>
+
+        Crash accessing static property on sealed object
+        https://bugs.webkit.org/show_bug.cgi?id=66242
+
+        Reviewed by Sam Weinig.
+
+        * runtime/JSObject.h:
+        (JSC::JSObject::putDirectInternal):
+            - should only check isExtensible if checkReadOnly.
+
+2011-08-06  Aron Rosenberg  <arosenberg@logitech.com>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] Fix build with Intel compiler on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=65088
+
+        Intel compiler needs .lib suffixes instead of .a
+        Intel compiler doesn't support nullptr
+        Intel compiler supports unsized arrays
+
+        * JavaScriptCore.pri:
+        * jsc.cpp:
+        * wtf/ByteArray.h:
+        * wtf/NullPtr.h:
+
+2011-05-15  Gavin Barraclough  <barraclough@apple.com>
+
+        Reviewed by Geoff Garen & Michael Saboff.
+
+        https://bugs.webkit.org/show_bug.cgi?id=60860
+        Simplify backtracking in YARR JIT
+
+        YARR JIT currently performs a single pass of code generation over the pattern,
+        with special handling to allow the code generation for some backtracking code
+        out of line. We can simplify things by moving to a common mechanism whereby all
+        forwards matching code is generated in one pass, and all backtracking code is
+        generated in another. Backtracking code can be generated in reverse order, to
+        optimized the common fall-through case.
+
+        To make it easier to walk over the pattern, we can first convert to a more
+        byte-code like format before JIT generating. In time we should unify this with
+        the YARR interpreter to more closely unify the two.
+
+        * yarr/YarrJIT.cpp:
+        (JSC::Yarr::YarrGenerator::jumpIfNoAvailableInput):
+        (JSC::Yarr::YarrGenerator::YarrOp::YarrOp):
+        (JSC::Yarr::YarrGenerator::BacktrackingState::BacktrackingState):
+        (JSC::Yarr::YarrGenerator::BacktrackingState::append):
+        (JSC::Yarr::YarrGenerator::BacktrackingState::fallthrough):
+        (JSC::Yarr::YarrGenerator::BacktrackingState::link):
+        (JSC::Yarr::YarrGenerator::BacktrackingState::linkTo):
+        (JSC::Yarr::YarrGenerator::BacktrackingState::takeBacktracksToJumpList):
+        (JSC::Yarr::YarrGenerator::BacktrackingState::isEmpty):
+        (JSC::Yarr::YarrGenerator::BacktrackingState::linkDataLabels):
+        (JSC::Yarr::YarrGenerator::BacktrackingState::ReturnAddressRecord::ReturnAddressRecord):
+        (JSC::Yarr::YarrGenerator::generateAssertionBOL):
+        (JSC::Yarr::YarrGenerator::backtrackAssertionBOL):
+        (JSC::Yarr::YarrGenerator::generateAssertionEOL):
+        (JSC::Yarr::YarrGenerator::backtrackAssertionEOL):
+        (JSC::Yarr::YarrGenerator::matchAssertionWordchar):
+        (JSC::Yarr::YarrGenerator::generateAssertionWordBoundary):
+        (JSC::Yarr::YarrGenerator::backtrackAssertionWordBoundary):
+        (JSC::Yarr::YarrGenerator::generatePatternCharacterOnce):
+        (JSC::Yarr::YarrGenerator::backtrackPatternCharacterOnce):
+        (JSC::Yarr::YarrGenerator::generatePatternCharacterFixed):
+        (JSC::Yarr::YarrGenerator::backtrackPatternCharacterFixed):
+        (JSC::Yarr::YarrGenerator::generatePatternCharacterGreedy):
+        (JSC::Yarr::YarrGenerator::backtrackPatternCharacterGreedy):
+        (JSC::Yarr::YarrGenerator::generatePatternCharacterNonGreedy):
+        (JSC::Yarr::YarrGenerator::backtrackPatternCharacterNonGreedy):
+        (JSC::Yarr::YarrGenerator::generateCharacterClassOnce):
+        (JSC::Yarr::YarrGenerator::backtrackCharacterClassOnce):
+        (JSC::Yarr::YarrGenerator::generateCharacterClassFixed):
+        (JSC::Yarr::YarrGenerator::backtrackCharacterClassFixed):
+        (JSC::Yarr::YarrGenerator::generateCharacterClassGreedy):
+        (JSC::Yarr::YarrGenerator::backtrackCharacterClassGreedy):
+        (JSC::Yarr::YarrGenerator::generateCharacterClassNonGreedy):
+        (JSC::Yarr::YarrGenerator::backtrackCharacterClassNonGreedy):
+        (JSC::Yarr::YarrGenerator::generateTerm):
+        (JSC::Yarr::YarrGenerator::backtrackTerm):
+        (JSC::Yarr::YarrGenerator::generate):
+        (JSC::Yarr::YarrGenerator::backtrack):
+        (JSC::Yarr::YarrGenerator::opCompileParenthesesSubpattern):
+        (JSC::Yarr::YarrGenerator::opCompileParentheticalAssertion):
+        (JSC::Yarr::YarrGenerator::opCompileAlternative):
+        (JSC::Yarr::YarrGenerator::opCompileBody):
+        (JSC::Yarr::YarrGenerator::YarrGenerator):
+        (JSC::Yarr::YarrGenerator::compile):
+
+2011-06-08  Mikołaj Małecki  <m.malecki@samsung.com>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Crash by buffer overrun crash when serializing inspector object tree.
+        https://bugs.webkit.org/show_bug.cgi?id=52791
+
+        No new tests. The problem can be reproduced by trying to create InspectorValue
+        from 1.0e-100 and call ->toJSONString() on this.
+
+        * JavaScriptCore.exp:
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
+        export 2 functions DecimalNumber::bufferLengthForStringExponential and
+        DecimalNumber::toStringExponential.
+
+2011-07-26  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Unreviewed build fix for Qt/Linux.
+
+        On platforms with no glib and gstreamer we should not build javascriptcore
+        with the Glib support. This is related to http://trac.webkit.org/changeset/91752.
+
+        * wtf/wtf.pri:
+
+2011-07-26  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Change default backend to use GStreamer on Linux and QuickTime on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=63472
+
+        Enable the bits needed for GStreamer only when QtMultimedia is not used.
+
+        * wtf/wtf.pri:
+
+2011-07-12  Hui Huang  <Hui.2.Huang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Fix compiling errors with QtWebkit 2.2 WINSCW build.
+        https://bugs.webkit.org/show_bug.cgi?id=64391
+
+        (QtWebKit-2.2 only, patch not in webkit trunk)
+
+        * parser/JSParser.cpp:
+        * runtime/JSONObject.cpp:
+        * wtf/PageAllocatorSymbian.h:
+        * wtf/Platform.h:
+        * wtf/text/AtomicString.h:
+        * wtf/text/StringStatics.cpp:
+
+
+2011-07-13  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        Broken build on QNX
+        https://bugs.webkit.org/show_bug.cgi?id=63717
+
+        QNX doesn't support pthread's SA_RESTART (required by
+        JSC_MULTIPLE_THREADS), JIT is broken at runtime and there a
+        few minor compilation errors here and there.
+
+        Original patch by Ritt Konstantin <ritt.ks@gmail.com>, also
+        tested by him on QNX v6.5 (x86)
+
+        * wtf/DateMath.cpp: fix usage of abs/labs
+        * wtf/Platform.h: Disable JIT and JSC_MULTIPLE_THREADS
+        * wtf/StackBounds.cpp: Add a couple of missing includes (and sort them)
+
+2011-07-09  Thouraya Andolsi  <thouraya.andolsi@st.com>
+
+        Fix unaligned userspace access for SH4 platforms. 
+        https://bugs.webkit.org/show_bug.cgi?id=62993
+
+        * wtf/Platform.h:
+
 2011-05-23  Matthew Delaney  <mdelaney@apple.com>
 
         Reviewed by Simon Fraser.
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri
index f6d064f..d8290cf 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/JavaScriptCore.pri
@@ -73,7 +73,7 @@ defineTest(prependJavaScriptCoreLib) {
     # Argument is the relative path to JavaScriptCore.pro's qmake output
     pathToJavaScriptCoreOutput = $$ARGS/$$JAVASCRIPTCORE_DESTDIR
 
-    win32-msvc*|wince* {
+    win32-msvc*|wince*|win32-icc {
         LIBS = -l$$JAVASCRIPTCORE_TARGET $$LIBS
         LIBS = -L$$pathToJavaScriptCoreOutput $$LIBS
         POST_TARGETDEPS += $${pathToJavaScriptCoreOutput}$${QMAKE_DIR_SEP}$${JAVASCRIPTCORE_TARGET}.lib
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h b/src/3rdparty/webkit/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h
index 5ef7b20..9036f0f 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/assembler/MacroAssemblerSH4.h
@@ -29,8 +29,8 @@
 
 #if ENABLE(ASSEMBLER) && CPU(SH4)
 
-#include "AbstractMacroAssembler.h"
 #include "SH4Assembler.h"
+#include "AbstractMacroAssembler.h"
 #include <wtf/Assertions.h>
 
 namespace JSC {
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp
index f18e277..c88e9ad 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/jit/JITPropertyAccess32_64.cpp
@@ -225,9 +225,9 @@ void JIT::emit_op_method_check(Instruction* currentInstruction)
     move(TrustedImm32(JSValue::CellTag), regT1);
     Jump match = jump();
     
-    ASSERT_JIT_OFFSET(differenceBetween(info.structureToCompare, protoObj), patchOffsetMethodCheckProtoObj);
+    ASSERT_JIT_OFFSET_UNUSED(protoObj, differenceBetween(info.structureToCompare, protoObj), patchOffsetMethodCheckProtoObj);
     ASSERT_JIT_OFFSET(differenceBetween(info.structureToCompare, protoStructureToCompare), patchOffsetMethodCheckProtoStruct);
-    ASSERT_JIT_OFFSET(differenceBetween(info.structureToCompare, putFunction), patchOffsetMethodCheckPutFunction);
+    ASSERT_JIT_OFFSET_UNUSED(putFunction, differenceBetween(info.structureToCompare, putFunction), patchOffsetMethodCheckPutFunction);
     
     // Link the failure cases here.
     structureCheck.link(this);
@@ -436,9 +436,9 @@ void JIT::compileGetByIdHotPath()
     
     loadPtr(Address(regT0, OBJECT_OFFSETOF(JSObject, m_propertyStorage)), regT2);
     DataLabel32 displacementLabel1 = loadPtrWithAddressOffsetPatch(Address(regT2, patchGetByIdDefaultOffset), regT0); // payload
-    ASSERT_JIT_OFFSET(differenceBetween(hotPathBegin, displacementLabel1), patchOffsetGetByIdPropertyMapOffset1);
+    ASSERT_JIT_OFFSET_UNUSED(displacementLabel1, differenceBetween(hotPathBegin, displacementLabel1), patchOffsetGetByIdPropertyMapOffset1);
     DataLabel32 displacementLabel2 = loadPtrWithAddressOffsetPatch(Address(regT2, patchGetByIdDefaultOffset), regT1); // tag
-    ASSERT_JIT_OFFSET(differenceBetween(hotPathBegin, displacementLabel2), patchOffsetGetByIdPropertyMapOffset2);
+    ASSERT_JIT_OFFSET_UNUSED(displacementLabel2, differenceBetween(hotPathBegin, displacementLabel2), patchOffsetGetByIdPropertyMapOffset2);
     
     Label putResult(this);
     ASSERT_JIT_OFFSET(differenceBetween(hotPathBegin, putResult), patchOffsetGetByIdPutResult);
@@ -514,8 +514,8 @@ void JIT::emit_op_put_by_id(Instruction* currentInstruction)
     
     END_UNINTERRUPTED_SEQUENCE(sequencePutById);
     
-    ASSERT_JIT_OFFSET(differenceBetween(hotPathBegin, displacementLabel1), patchOffsetPutByIdPropertyMapOffset1);
-    ASSERT_JIT_OFFSET(differenceBetween(hotPathBegin, displacementLabel2), patchOffsetPutByIdPropertyMapOffset2);
+    ASSERT_JIT_OFFSET_UNUSED(displacementLabel1, differenceBetween(hotPathBegin, displacementLabel1), patchOffsetPutByIdPropertyMapOffset1);
+    ASSERT_JIT_OFFSET_UNUSED(displacementLabel2, differenceBetween(hotPathBegin, displacementLabel2), patchOffsetPutByIdPropertyMapOffset2);
 }
 
 void JIT::emitSlow_op_put_by_id(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/jsc.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/jsc.cpp
index 6ef8e18..5f63749 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/jsc.cpp
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/jsc.cpp
@@ -312,7 +312,7 @@ EncodedJSValue JSC_HOST_CALL functionQuit(ExecState* exec)
 // be in a separate main function because the jscmain function requires object
 // unwinding.
 
-#if COMPILER(MSVC) && !defined(_DEBUG) && !OS(WINCE)
+#if COMPILER(MSVC) && !COMPILER(INTEL) && !defined(_DEBUG) && !OS(WINCE)
 #define TRY       __try {
 #define EXCEPT(x) } __except (EXCEPTION_EXECUTE_HANDLER) { x; }
 #else
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/parser/JSParser.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/parser/JSParser.cpp
index f36c668..5f6d8cf 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/parser/JSParser.cpp
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/parser/JSParser.cpp
@@ -215,13 +215,21 @@ private:
     template <class TreeBuilder> ALWAYS_INLINE TreeExpression parseObjectLiteral(TreeBuilder&);
     template <class TreeBuilder> ALWAYS_INLINE TreeExpression parseStrictObjectLiteral(TreeBuilder&);
     template <class TreeBuilder> ALWAYS_INLINE TreeArguments parseArguments(TreeBuilder&);
+#if COMPILER(WINSCW)
+    template <bool strict, class TreeBuilder> ALWAYS_INLINE TreeProperty parseProperty(bool, TreeBuilder&);
+#else
     template <bool strict, class TreeBuilder> ALWAYS_INLINE TreeProperty parseProperty(TreeBuilder&);
+#endif
     template <class TreeBuilder> ALWAYS_INLINE TreeFunctionBody parseFunctionBody(TreeBuilder&);
     template <class TreeBuilder> ALWAYS_INLINE TreeFormalParameterList parseFormalParameters(TreeBuilder&);
     template <class TreeBuilder> ALWAYS_INLINE TreeExpression parseVarDeclarationList(TreeBuilder&, int& declarations, const Identifier*& lastIdent, TreeExpression& lastInitializer, int& identStart, int& initStart, int& initEnd);
     template <class TreeBuilder> ALWAYS_INLINE TreeConstDeclList parseConstDeclarationList(TreeBuilder& context);
     enum FunctionRequirements { FunctionNoRequirements, FunctionNeedsName };
+#if COMPILER(WINSCW)
+    template <FunctionRequirements, bool nameIsInContainingScope, class TreeBuilder> bool parseFunctionInfo(FunctionRequirements, bool, TreeBuilder&, const Identifier*&, TreeFormalParameterList&, TreeFunctionBody&, int& openBrace, int& closeBrace, int& bodyStartLine);
+#else
     template <FunctionRequirements, bool nameIsInContainingScope, class TreeBuilder> bool parseFunctionInfo(TreeBuilder&, const Identifier*&, TreeFormalParameterList&, TreeFunctionBody&, int& openBrace, int& closeBrace, int& bodyStartLine);
+#endif
     ALWAYS_INLINE int isBinaryOperator(JSTokenType token);
     bool allowAutomaticSemicolon();
 
@@ -1290,7 +1298,11 @@ template <class TreeBuilder> TreeFunctionBody JSParser::parseFunctionBody(TreeBu
     return context.createFunctionBody(strictMode());
 }
 
+#if COMPILER(WINSCW)
+template <JSParser::FunctionRequirements, bool, class TreeBuilder> bool JSParser::parseFunctionInfo(JSParser::FunctionRequirements requirements, bool nameIsInContainingScope, TreeBuilder& context, const Identifier*& name, TreeFormalParameterList& parameters, TreeFunctionBody& body, int& openBracePos, int& closeBracePos, int& bodyStartLine)
+#else
 template <JSParser::FunctionRequirements requirements, bool nameIsInContainingScope, class TreeBuilder> bool JSParser::parseFunctionInfo(TreeBuilder& context, const Identifier*& name, TreeFormalParameterList& parameters, TreeFunctionBody& body, int& openBracePos, int& closeBracePos, int& bodyStartLine)
+#endif
 {
     AutoPopScopeRef functionScope(this, pushScope());
     functionScope->setIsFunction();
@@ -1371,7 +1383,11 @@ template <class TreeBuilder> TreeStatement JSParser::parseFunctionDeclaration(Tr
     int openBracePos = 0;
     int closeBracePos = 0;
     int bodyStartLine = 0;
+#if COMPILER(WINSCW)
+    failIfFalse((parseFunctionInfo<FunctionNeedsName, true>(FunctionNeedsName, true, context, name, parameters, body, openBracePos, closeBracePos, bodyStartLine)));
+#else
     failIfFalse((parseFunctionInfo<FunctionNeedsName, true>(context, name, parameters, body, openBracePos, closeBracePos, bodyStartLine)));
+#endif
     failIfFalse(name);
     failIfFalseIfStrict(declareVariable(name));
     return context.createFuncDeclStatement(name, body, parameters, openBracePos, closeBracePos, bodyStartLine, m_lastLine);
@@ -1695,8 +1711,11 @@ template <class TreeBuilder> TreeExpression JSParser::parseBinaryExpression(Tree
     return context.popOperandStack(operandStackDepth);
 }
 
-
+#if COMPILER(WINSCW)
+template <bool complete, class TreeBuilder> TreeProperty JSParser::parseProperty(bool complete, TreeBuilder& context)
+#else
 template <bool complete, class TreeBuilder> TreeProperty JSParser::parseProperty(TreeBuilder& context)
+#endif
 {
     bool wasIdent = false;
     switch (m_token.m_type) {
@@ -1710,7 +1729,14 @@ template <bool complete, class TreeBuilder> TreeProperty JSParser::parseProperty
             next();
             TreeExpression node = parseAssignmentExpression(context);
             failIfFalse(node);
+#if COMPILER(WINSCW)
+            if (complete)
+                return context.template createProperty<true>(ident, node, PropertyNode::Constant);
+            else
+                return context.template createProperty<false>(ident, node, PropertyNode::Constant);
+#else
             return context.template createProperty<complete>(ident, node, PropertyNode::Constant);
+#endif
         }
         failIfFalse(wasIdent);
         matchOrFail(IDENT);
@@ -1727,8 +1753,16 @@ template <bool complete, class TreeBuilder> TreeProperty JSParser::parseProperty
             type = PropertyNode::Setter;
         else
             fail();
+#if COMPILER(WINSCW)
+        failIfFalse((parseFunctionInfo<FunctionNeedsName, false>(FunctionNeedsName, false, context, accessorName, parameters, body, openBracePos, closeBracePos, bodyStartLine)));
+        if (complete)
+            return context.template createGetterOrSetterProperty<true>(type, accessorName, parameters, body, openBracePos, closeBracePos, bodyStartLine, m_lastLine);
+        else
+            return context.template createGetterOrSetterProperty<false>(type, accessorName, parameters, body, openBracePos, closeBracePos, bodyStartLine, m_lastLine);
+#else
         failIfFalse((parseFunctionInfo<FunctionNeedsName, false>(context, accessorName, parameters, body, openBracePos, closeBracePos, bodyStartLine)));
         return context.template createGetterOrSetterProperty<complete>(type, accessorName, parameters, body, openBracePos, closeBracePos, bodyStartLine, m_lastLine);
+#endif
     }
     case NUMBER: {
         double propertyName = m_token.m_data.doubleValue;
@@ -1736,7 +1770,14 @@ template <bool complete, class TreeBuilder> TreeProperty JSParser::parseProperty
         consumeOrFail(COLON);
         TreeExpression node = parseAssignmentExpression(context);
         failIfFalse(node);
+#if COMPILER(WINSCW)
+        if (complete)
+            return context.template createProperty<true>(m_globalData, propertyName, node, PropertyNode::Constant);
+        else
+            return context.template createProperty<false>(m_globalData, propertyName, node, PropertyNode::Constant);
+#else
         return context.template createProperty<complete>(m_globalData, propertyName, node, PropertyNode::Constant);
+#endif
     }
     default:
         failIfFalse(m_token.m_type & KeywordTokenFlag);
@@ -1754,7 +1795,11 @@ template <class TreeBuilder> TreeExpression JSParser::parseObjectLiteral(TreeBui
         return context.createObjectLiteral();
     }
 
+#if COMPILER(WINSCW)
+    TreeProperty property = parseProperty<false>(false, context);
+#else
     TreeProperty property = parseProperty<false>(context);
+#endif
     failIfFalse(property);
     if (!m_syntaxAlreadyValidated && context.getType(property) != PropertyNode::Constant) {
         m_lexer->setOffset(startOffset);
@@ -1768,7 +1813,11 @@ template <class TreeBuilder> TreeExpression JSParser::parseObjectLiteral(TreeBui
         // allow extra comma, see http://bugs.webkit.org/show_bug.cgi?id=5939
         if (match(CLOSEBRACE))
             break;
+#if COMPILER(WINSCW)
+        property = parseProperty<false>(false, context);
+#else
         property = parseProperty<false>(context);
+#endif
         failIfFalse(property);
         if (!m_syntaxAlreadyValidated && context.getType(property) != PropertyNode::Constant) {
             m_lexer->setOffset(startOffset);
@@ -1792,7 +1841,11 @@ template <class TreeBuilder> TreeExpression JSParser::parseStrictObjectLiteral(T
         return context.createObjectLiteral();
     }
     
+#if COMPILER(WINSCW)
+    TreeProperty property = parseProperty<true>(true, context);
+#else
     TreeProperty property = parseProperty<true>(context);
+#endif
     failIfFalse(property);
     
     typedef HashMap<RefPtr<StringImpl>, unsigned, IdentifierRepHash> ObjectValidationMap;
@@ -1808,7 +1861,11 @@ template <class TreeBuilder> TreeExpression JSParser::parseStrictObjectLiteral(T
         // allow extra comma, see http://bugs.webkit.org/show_bug.cgi?id=5939
         if (match(CLOSEBRACE))
             break;
+#if COMPILER(WINSCW)
+        property = parseProperty<true>(true, context);
+#else
         property = parseProperty<true>(context);
+#endif
         failIfFalse(property);
         if (!m_syntaxAlreadyValidated) {
             std::pair<ObjectValidationMap::iterator, bool> propertyEntryIter = objectValidator.add(context.getName(property).impl(), context.getType(property));
@@ -1987,7 +2044,11 @@ template <class TreeBuilder> TreeExpression JSParser::parseMemberExpression(Tree
         int closeBracePos = 0;
         int bodyStartLine = 0;
         next();
+#if COMPILER(WINSCW)
+        failIfFalse((parseFunctionInfo<FunctionNoRequirements, false>(FunctionNoRequirements, false, context, name, parameters, body, openBracePos, closeBracePos, bodyStartLine)));
+#else
         failIfFalse((parseFunctionInfo<FunctionNoRequirements, false>(context, name, parameters, body, openBracePos, closeBracePos, bodyStartLine)));
+#endif
         base = context.createFunctionExpr(name, body, parameters, openBracePos, closeBracePos, bodyStartLine, m_lastLine);
     } else
         base = parsePrimaryExpression(context);
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp
index 8742fdc..27a508a 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSONObject.cpp
@@ -76,8 +76,13 @@ private:
 class Stringifier {
     WTF_MAKE_NONCOPYABLE(Stringifier);
 public:
+#if COMPILER(WINSCW)
+    Stringifier(ExecState*, const Local<Unknown>* replacer, const Local<Unknown>* space);
+    Local<Unknown> stringify(Handle<Unknown>*);
+#else
     Stringifier(ExecState*, const Local<Unknown>& replacer, const Local<Unknown>& space);
     Local<Unknown> stringify(Handle<Unknown>);
+#endif
 
     void visitAggregate(SlotVisitor&);
 
@@ -197,6 +202,15 @@ JSValue PropertyNameForFunctionCall::value(ExecState* exec) const
 
 // ------------------------------ Stringifier --------------------------------
 
+#if COMPILER(WINSCW)
+Stringifier::Stringifier(ExecState* exec, const Local<Unknown>* replacer, const Local<Unknown>* space)
+    : m_exec(exec)
+    , m_replacer(*replacer)
+    , m_usingArrayReplacer(false)
+    , m_arrayReplacerPropertyNames(exec)
+    , m_replacerCallType(CallTypeNone)
+    , m_gap(gap(exec, space->get()))
+#else
 Stringifier::Stringifier(ExecState* exec, const Local<Unknown>& replacer, const Local<Unknown>& space)
     : m_exec(exec)
     , m_replacer(replacer)
@@ -204,6 +218,7 @@ Stringifier::Stringifier(ExecState* exec, const Local<Unknown>& replacer, const
     , m_arrayReplacerPropertyNames(exec)
     , m_replacerCallType(CallTypeNone)
     , m_gap(gap(exec, space.get()))
+#endif
 {
     if (!m_replacer.isObject())
         return;
@@ -244,17 +259,29 @@ Stringifier::Stringifier(ExecState* exec, const Local<Unknown>& replacer, const
     m_replacerCallType = m_replacer.asObject()->getCallData(m_replacerCallData);
 }
 
+#if COMPILER(WINSCW)
+Local<Unknown> Stringifier::stringify(Handle<Unknown>* value)
+#else
 Local<Unknown> Stringifier::stringify(Handle<Unknown> value)
+#endif
 {
     JSObject* object = constructEmptyObject(m_exec);
     if (m_exec->hadException())
         return Local<Unknown>(m_exec->globalData(), jsNull());
 
     PropertyNameForFunctionCall emptyPropertyName(m_exec->globalData().propertyNames->emptyIdentifier);
+#if COMPILER(WINSCW)
+    object->putDirect(m_exec->globalData(), m_exec->globalData().propertyNames->emptyIdentifier, value->get());
+#else
     object->putDirect(m_exec->globalData(), m_exec->globalData().propertyNames->emptyIdentifier, value.get());
+#endif
 
     UStringBuilder result;
+#if COMPILER(WINSCW)
+    if (appendStringifiedValue(result, value->get(), object, emptyPropertyName) != StringifySucceeded)
+#else
     if (appendStringifiedValue(result, value.get(), object, emptyPropertyName) != StringifySucceeded)
+#endif
         return Local<Unknown>(m_exec->globalData(), jsUndefined());
     if (m_exec->hadException())
         return Local<Unknown>(m_exec->globalData(), jsNull());
@@ -606,6 +633,15 @@ bool JSONObject::getOwnPropertyDescriptor(ExecState* exec, const Identifier& pro
 
 class Walker {
 public:
+#if COMPILER(WINSCW)
+    Walker(ExecState* exec, Handle<JSObject>* function, CallType callType, CallData callData)
+        : m_exec(exec)
+        , m_function(exec->globalData(), *function)
+        , m_callType(callType)
+        , m_callData(callData)
+    {
+    }
+#else
     Walker(ExecState* exec, Handle<JSObject> function, CallType callType, CallData callData)
         : m_exec(exec)
         , m_function(exec->globalData(), function)
@@ -613,6 +649,7 @@ public:
         , m_callData(callData)
     {
     }
+#endif
     JSValue walk(JSValue unfiltered);
 private:
     JSValue callReviver(JSObject* thisObj, JSValue property, JSValue unfiltered)
@@ -829,7 +866,12 @@ EncodedJSValue JSC_HOST_CALL JSONProtoFuncParse(ExecState* exec)
     CallType callType = getCallData(function, callData);
     if (callType == CallTypeNone)
         return JSValue::encode(unfiltered);
+#if COMPILER(WINSCW)
+    Local<JSObject> handle(exec->globalData(), asObject(function));
+    return JSValue::encode(Walker(exec, &handle, callType, callData).walk(unfiltered));
+#else
     return JSValue::encode(Walker(exec, Local<JSObject>(exec->globalData(), asObject(function)), callType, callData).walk(unfiltered));
+#endif
 }
 
 // ECMA-262 v5 15.12.3
@@ -841,13 +883,24 @@ EncodedJSValue JSC_HOST_CALL JSONProtoFuncStringify(ExecState* exec)
     Local<Unknown> value(exec->globalData(), exec->argument(0));
     Local<Unknown> replacer(exec->globalData(), exec->argument(1));
     Local<Unknown> space(exec->globalData(), exec->argument(2));
+#if COMPILER(WINSCW)
+    return JSValue::encode(Stringifier(exec, &replacer, &space).stringify(&value).get());
+#else
     return JSValue::encode(Stringifier(exec, replacer, space).stringify(value).get());
+#endif
 }
 
 UString JSONStringify(ExecState* exec, JSValue value, unsigned indent)
 {
     LocalScope scope(exec->globalData());
+#if COMPILER(WINSCW)
+    Local<Unknown> replacer(exec->globalData(), jsNull());
+    Local<Unknown> space(exec->globalData(), jsNumber(indent));
+    Local<Unknown> valueHandle(exec->globalData(), value);
+    Local<Unknown> result = Stringifier(exec, &replacer, &space).stringify(&valueHandle);
+#else
     Local<Unknown> result = Stringifier(exec, Local<Unknown>(exec->globalData(), jsNull()), Local<Unknown>(exec->globalData(), jsNumber(indent))).stringify(Local<Unknown>(exec->globalData(), value));
+#endif
     if (result.isUndefinedOrNull())
         return UString();
     return result.getString(exec);
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSObject.h b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSObject.h
index 768c457..1d7d2f7 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSObject.h
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/JSObject.h
@@ -587,7 +587,7 @@ inline bool JSObject::putDirectInternal(JSGlobalData& globalData, const Identifi
             return true;
         }
 
-        if (!isExtensible())
+        if (checkReadOnly && !isExtensible())
             return false;
 
         size_t currentCapacity = m_structure->propertyStorageCapacity();
@@ -651,7 +651,7 @@ inline bool JSObject::putDirectInternal(JSGlobalData& globalData, const Identifi
         return true;
     }
 
-    if (!isExtensible())
+    if (checkReadOnly && !isExtensible())
         return false;
 
     Structure* structure = Structure::addPropertyTransition(globalData, m_structure.get(), propertyName, attributes, specificFunction, offset);
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ByteArray.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ByteArray.h
index bdec630..47b1cff 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ByteArray.h
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/ByteArray.h
@@ -91,7 +91,7 @@ namespace WTF {
 // MSVC can't handle correctly unsized array.
 // warning C4200: nonstandard extension used : zero-sized array in struct/union
 // Cannot generate copy-ctor or copy-assignment operator when UDT contains a zero-sized array
-#if COMPILER(MSVC)
+#if COMPILER(MSVC) && !COMPILER(INTEL)
         unsigned char m_data[INT_MAX];
 #else
         unsigned char m_data[];
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/DateMath.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/DateMath.cpp
index d414eae..b181ee2 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/DateMath.cpp
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/DateMath.cpp
@@ -692,7 +692,7 @@ double parseES5DateFromNullTerminatedCharacters(const char* dateString)
             return NaN;
         if (*postParsePosition != ':' || (postParsePosition - currentPosition) != 2)
             return NaN;
-        tzHoursAbs = abs(tzHours);
+        tzHoursAbs = labs(tzHours);
         currentPosition = postParsePosition + 1;
         
         if (!isASCIIDigit(*currentPosition))
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h
index c0e7bd3..9c4319d 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/NullPtr.h
@@ -35,7 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
     #define __has_feature(feature) 0
 #endif
 
-#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600)
+#if __has_feature(cxx_nullptr) || (GCC_VERSION_AT_LEAST(4, 6, 0) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || (defined(_MSC_VER) && _MSC_VER >= 1600 && !COMPILER(INTEL))
 
 #define HAVE_NULLPTR 1
 
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/PageAllocatorSymbian.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/PageAllocatorSymbian.h
index eba5b03..d396379 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/PageAllocatorSymbian.h
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/PageAllocatorSymbian.h
@@ -68,7 +68,7 @@ public:
 // Size of the large up-front reservation
 #if defined(__WINS__) 
 // Emulator has limited virtual address space
-const size_t largeReservationSize = 96*1024*1024;
+const size_t largeReservationSize = 64*1024*1024;
 #else
 // HW has plenty of virtual addresses
 const size_t largeReservationSize = 256*1024*1024;
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
index 716d9e1..a8298c4 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h
@@ -365,7 +365,7 @@
 
 #endif /* ARM */
 
-#if CPU(ARM) || CPU(MIPS)
+#if CPU(ARM) || CPU(MIPS) || CPU(SH4)
 #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1
 #endif
 
@@ -581,7 +581,7 @@
 #define WTF_USE_PTHREAD_BASED_QT 1
 #endif
 
-#if (PLATFORM(GTK) || PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || (PLATFORM(QT) && (OS(DARWIN) || USE(PTHREAD_BASED_QT)) && !ENABLE(SINGLE_THREADED))) && !defined(ENABLE_JSC_MULTIPLE_THREADS)
+#if (PLATFORM(GTK) || PLATFORM(IOS) || PLATFORM(MAC) || PLATFORM(WIN) || (PLATFORM(QT) && (OS(DARWIN) || USE(PTHREAD_BASED_QT)) && !ENABLE(SINGLE_THREADED))) && !OS(QNX) && !defined(ENABLE_JSC_MULTIPLE_THREADS)
 #define ENABLE_JSC_MULTIPLE_THREADS 1
 #endif
 
@@ -1014,8 +1014,13 @@
 #define ENABLE_JIT 0
 #endif
 
-/* JIT is not implemented for 64 bit on MSVC */
-#if !defined(ENABLE_JIT) && COMPILER(MSVC) && CPU(X86_64)
+/* JIT is not implemented for Windows 64-bit */
+#if !defined(ENABLE_JIT) && OS(WINDOWS) && CPU(X86_64)
+#define ENABLE_JIT 0
+#endif
+
+/* Disable JIT for WINSCW Symbian Emulator */
+#if !defined(ENABLE_JIT) && COMPILER(WINSCW)
 #define ENABLE_JIT 0
 #endif
 
@@ -1023,7 +1028,8 @@
 #if !defined(ENABLE_JIT) \
     && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \
     && (OS(DARWIN) || !COMPILER(GCC) || GCC_VERSION_AT_LEAST(4, 1, 0)) \
-    && !OS(WINCE)
+    && !OS(WINCE) \
+    && !OS(QNX)
 #define ENABLE_JIT 1
 #endif
 
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/StackBounds.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/StackBounds.cpp
index 41e0d60..6b61270 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/StackBounds.cpp
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/StackBounds.cpp
@@ -41,10 +41,12 @@
 
 #elif OS(QNX)
 
+#include <errno.h>
 #include <fcntl.h>
-#include <sys/procfs.h>
+#include <pthread.h>
 #include <stdio.h>
-#include <errno.h>
+#include <string.h>
+#include <sys/procfs.h>
 
 #elif OS(UNIX)
 
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.h
index 440700c..cc451e8 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.h
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.h
@@ -113,6 +113,16 @@ public:
     static AtomicString fromUTF8(const char*, size_t);
     static AtomicString fromUTF8(const char*);
 
+#if COMPILER(WINSCW)
+    static const AtomicString& nullAtom2();
+    static const AtomicString& emptyAtom2();
+    static const AtomicString& textAtom2();
+    static const AtomicString& commentAtom2();
+    static const AtomicString& starAtom2();
+    static const AtomicString& xmlAtom2();
+    static const AtomicString& xmlnsAtom2();
+#endif
+
 private:
     String m_string;
     
@@ -155,6 +165,24 @@ inline bool equalIgnoringCase(const String& a, const AtomicString& b) { return e
 // Define external global variables for the commonly used atomic strings.
 // These are only usable from the main thread.
 #ifndef ATOMICSTRING_HIDE_GLOBALS
+
+#if COMPILER(WINSCW)
+extern const JS_EXPORTDATA AtomicString nullAtom1;
+extern const JS_EXPORTDATA AtomicString emptyAtom1;
+extern const JS_EXPORTDATA AtomicString textAtom1;
+extern const JS_EXPORTDATA AtomicString commentAtom1;
+extern const JS_EXPORTDATA AtomicString starAtom1;
+extern const JS_EXPORTDATA AtomicString xmlAtom1;
+extern const JS_EXPORTDATA AtomicString xmlnsAtom1;
+
+#define nullAtom AtomicString::nullAtom2()
+#define emptyAtom AtomicString::emptyAtom2()
+#define textAtom AtomicString::textAtom2()
+#define commentAtom AtomicString::commentAtom2()
+#define starAtom AtomicString::starAtom2()
+#define xmlAtom AtomicString::xmlAtom2()
+#define xmlnsAtom AtomicString::xmlnsAtom2()
+#else
 extern const JS_EXPORTDATA AtomicString nullAtom;
 extern const JS_EXPORTDATA AtomicString emptyAtom;
 extern const JS_EXPORTDATA AtomicString textAtom;
@@ -162,6 +190,7 @@ extern const JS_EXPORTDATA AtomicString commentAtom;
 extern const JS_EXPORTDATA AtomicString starAtom;
 extern const JS_EXPORTDATA AtomicString xmlAtom;
 extern const JS_EXPORTDATA AtomicString xmlnsAtom;
+#endif
 
 inline AtomicString AtomicString::fromUTF8(const char* characters, size_t length)
 {
@@ -190,6 +219,7 @@ template<> struct DefaultHash<AtomicString> {
 
 } // namespace WTF
 
+#if !COMPILER(WINSCW)
 #ifndef ATOMICSTRING_HIDE_GLOBALS
 using WTF::AtomicString;
 using WTF::nullAtom;
@@ -200,5 +230,6 @@ using WTF::starAtom;
 using WTF::xmlAtom;
 using WTF::xmlnsAtom;
 #endif
+#endif
 
 #endif // AtomicString_h
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringImpl.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringImpl.cpp
index 17b4d7d..ea8770a 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringImpl.cpp
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringImpl.cpp
@@ -270,17 +270,15 @@ PassRefPtr<StringImpl> StringImpl::upper()
     return newImpl.release();
 }
 
-PassRefPtr<StringImpl> StringImpl::secure(UChar character, LastCharacterBehavior behavior)
+PassRefPtr<StringImpl> StringImpl::fill(UChar character)
 {
     if (!m_length)
         return this;
 
     UChar* data;
     RefPtr<StringImpl> newImpl = createUninitialized(m_length, data);
-    unsigned lastCharacterIndex = m_length - 1;
-    for (unsigned i = 0; i < lastCharacterIndex; ++i)
+    for (unsigned i = 0; i < m_length; ++i)
         data[i] = character;
-    data[lastCharacterIndex] = (behavior == ObscureLastCharacter) ? character : m_data[lastCharacterIndex];
     return newImpl.release();
 }
 
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringImpl.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringImpl.h
index 81911b3..b0ec163 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringImpl.h
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringImpl.h
@@ -284,9 +284,7 @@ public:
     PassRefPtr<StringImpl> lower();
     PassRefPtr<StringImpl> upper();
 
-    enum LastCharacterBehavior { ObscureLastCharacter, DisplayLastCharacter };
-
-    PassRefPtr<StringImpl> secure(UChar, LastCharacterBehavior = ObscureLastCharacter);
+    PassRefPtr<StringImpl> fill(UChar);
     PassRefPtr<StringImpl> foldCase();
 
     PassRefPtr<StringImpl> stripWhiteSpace();
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringStatics.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringStatics.cpp
index ce08728..c5a8b43 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringStatics.cpp
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringStatics.cpp
@@ -51,6 +51,15 @@ StringImpl* StringImpl::empty()
     return &emptyString;
 }
 
+#if COMPILER(WINSCW)
+static AtomicString nullAtom1;
+static AtomicString emptyAtom1;
+static AtomicString textAtom1;
+static AtomicString commentAtom1;
+static AtomicString starAtom1;
+static AtomicString xmlAtom1;
+static AtomicString xmlnsAtom1;
+#else
 JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, nullAtom)
 JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, emptyAtom, "")
 JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, textAtom, "#text")
@@ -58,6 +67,7 @@ JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, commentAtom, "#comment")
 JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, starAtom, "*")
 JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, xmlAtom, "xml")
 JS_EXPORTDATA DEFINE_GLOBAL(AtomicString, xmlnsAtom, "xmlns")
+#endif
 
 void AtomicString::init()
 {
@@ -67,6 +77,15 @@ void AtomicString::init()
         ASSERT(isMainThread());
 
         // Use placement new to initialize the globals.
+#if COMPILER(WINSCW)
+        new ((void*)&nullAtom1) AtomicString;
+        new ((void*)&emptyAtom1) AtomicString("");
+        new ((void*)&textAtom1) AtomicString("#text");
+        new ((void*)&commentAtom1) AtomicString("#comment");
+        new ((void*)&starAtom1) AtomicString("*");
+        new ((void*)&xmlAtom1) AtomicString("xml");
+        new ((void*)&xmlnsAtom1) AtomicString("xmlns");
+#else
         new ((void*)&nullAtom) AtomicString;
         new ((void*)&emptyAtom) AtomicString("");
         new ((void*)&textAtom) AtomicString("#text");
@@ -74,9 +93,19 @@ void AtomicString::init()
         new ((void*)&starAtom) AtomicString("*");
         new ((void*)&xmlAtom) AtomicString("xml");
         new ((void*)&xmlnsAtom) AtomicString("xmlns");
-
+#endif
         initialized = true;
     }
 }
 
+#if COMPILER(WINSCW)
+const AtomicString& AtomicString::nullAtom2() { return nullAtom1;}
+const AtomicString& AtomicString::emptyAtom2() { return emptyAtom1;}
+const AtomicString& AtomicString::textAtom2() { return textAtom1;}
+const AtomicString& AtomicString::commentAtom2() { return commentAtom1;}
+const AtomicString& AtomicString::starAtom2() { return starAtom1;}
+const AtomicString& AtomicString::xmlAtom2() { return xmlAtom1;}
+const AtomicString& AtomicString::xmlnsAtom2() { return xmlnsAtom1;}
+#endif
+
 }
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/WTFString.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/WTFString.h
index b593d20..f29228b 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/WTFString.h
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/WTFString.h
@@ -219,7 +219,7 @@ public:
 
     void makeLower() { if (m_impl) m_impl = m_impl->lower(); }
     void makeUpper() { if (m_impl) m_impl = m_impl->upper(); }
-    void makeSecure(UChar aChar) { if (m_impl) m_impl = m_impl->secure(aChar); }
+    void fill(UChar c) { if (m_impl) m_impl = m_impl->fill(c); }
 
     void truncate(unsigned len);
     void remove(unsigned pos, int len = 1);
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/wtf.pri b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/wtf.pri
index 10b41e4..ccc2f60 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/wtf.pri
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/wtf.pri
@@ -41,10 +41,12 @@ SOURCES += \
     wtf/unicode/icu/CollatorICU.cpp \
     wtf/unicode/UTF8.cpp
 
-contains(DEFINES, USE_GSTREAMER=1) {
-    DEFINES += ENABLE_GLIB_SUPPORT=1
-    PKGCONFIG += glib-2.0 gio-2.0
-    CONFIG += link_pkgconfig
+linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
+    !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
+        DEFINES += ENABLE_GLIB_SUPPORT=1
+        PKGCONFIG += glib-2.0 gio-2.0
+        CONFIG += link_pkgconfig
+    }
 }
 
 unix:!symbian: SOURCES += wtf/OSAllocatorPosix.cpp
diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/yarr/YarrJIT.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/yarr/YarrJIT.cpp
index ece2379..f3356b1 100644
--- a/src/3rdparty/webkit/Source/JavaScriptCore/yarr/YarrJIT.cpp
+++ b/src/3rdparty/webkit/Source/JavaScriptCore/yarr/YarrJIT.cpp
@@ -228,9 +228,10 @@ class YarrGenerator : private MacroAssembler {
     }
 
     // Jumps if input not available; will have (incorrectly) incremented already!
-    Jump jumpIfNoAvailableInput(unsigned countToCheck)
+    Jump jumpIfNoAvailableInput(unsigned countToCheck = 0)
     {
-        add32(Imm32(countToCheck), index);
+        if (countToCheck)
+            add32(Imm32(countToCheck), index);
         return branch32(Above, index, length);
     }
 
@@ -295,1056 +296,455 @@ class YarrGenerator : private MacroAssembler {
         jump(Address(stackPointerRegister, frameLocation * sizeof(void*)));
     }
 
-    struct IndirectJumpEntry {
-        IndirectJumpEntry(int32_t stackOffset)
-            : m_stackOffset(stackOffset)
-        {
-        }
-
-        IndirectJumpEntry(int32_t stackOffset, Jump jump)
-            : m_stackOffset(stackOffset)
-        {
-            addJump(jump);
-        }
-
-        IndirectJumpEntry(int32_t stackOffset, DataLabelPtr dataLabel)
-        : m_stackOffset(stackOffset)
-        {
-            addDataLabel(dataLabel);
-        }
-
-        void addJump(Jump jump)
-        {
-            m_relJumps.append(jump);
-        }
-        
-        void addDataLabel(DataLabelPtr dataLabel)
-        {
-            m_dataLabelPtrVector.append(dataLabel);
-        }
-
-        int32_t m_stackOffset;
-        JumpList m_relJumps;
-        Vector<DataLabelPtr, 16> m_dataLabelPtrVector;
+    enum YarrOpCode {
+        // These nodes wrap body alternatives - those in the main disjunction,
+        // rather than subpatterns or assertions. These are chained together in
+        // a doubly linked list, with a 'begin' node for the first alternative,
+        // a 'next' node for each subsequent alternative, and an 'end' node at
+        // the end. In the case of repeating alternatives, the 'end' node also
+        // has a reference back to 'begin'.
+        OpBodyAlternativeBegin,
+        OpBodyAlternativeNext,
+        OpBodyAlternativeEnd,
+        // Similar to the body alternatives, but used for subpatterns with two
+        // or more alternatives.
+        OpNestedAlternativeBegin,
+        OpNestedAlternativeNext,
+        OpNestedAlternativeEnd,
+        // Used for alternatives in subpatterns where there is only a single
+        // alternative (backtrackingis easier in these cases), or for alternatives
+        // which never need to be backtracked (those in parenthetical assertions,
+        // terminal subpatterns).
+        OpSimpleNestedAlternativeBegin,
+        OpSimpleNestedAlternativeNext,
+        OpSimpleNestedAlternativeEnd,
+        // Used to wrap 'Once' subpattern matches (quantityCount == 1).
+        OpParenthesesSubpatternOnceBegin,
+        OpParenthesesSubpatternOnceEnd,
+        // Used to wrap 'Terminal' subpattern matches (at the end of the regexp).
+        OpParenthesesSubpatternTerminalBegin,
+        OpParenthesesSubpatternTerminalEnd,
+        // Used to wrap parenthetical assertions.
+        OpParentheticalAssertionBegin,
+        OpParentheticalAssertionEnd,
+        // Wraps all simple terms (pattern characters, character classes).
+        OpTerm,
+        // Where an expression contains only 'once through' body alternatives
+        // and no repeating ones, this op is used to return match failure.
+        OpMatchFailed
     };
 
-    struct AlternativeBacktrackRecord {
-        DataLabelPtr dataLabel;
-        Label backtrackLocation;
-
-        AlternativeBacktrackRecord(DataLabelPtr dataLabel, Label backtrackLocation)
-            : dataLabel(dataLabel)
-            , backtrackLocation(backtrackLocation)
-        {
-        }
-    };
-
-    struct ParenthesesTail;
-    struct TermGenerationState;
-
-    struct GenerationState {
-        typedef HashMap<int, IndirectJumpEntry*, WTF::IntHash<uint32_t>, UnsignedWithZeroKeyHashTraits<uint32_t> > IndirectJumpHashMap;
-
-        GenerationState()
-            : m_parenNestingLevel(0)
-        {
-        }
-
-        void addIndirectJumpEntry(int32_t stackOffset, Jump jump)
-        {
-            IndirectJumpHashMap::iterator result = m_indirectJumpMap.find(stackOffset);
-
-            ASSERT(stackOffset >= 0);
-
-            uint32_t offset = static_cast<uint32_t>(stackOffset);
-
-            if (result == m_indirectJumpMap.end())
-                m_indirectJumpMap.add(offset, new IndirectJumpEntry(stackOffset, jump));
-            else
-                result->second->addJump(jump);
-        }
-
-        void addIndirectJumpEntry(int32_t stackOffset, JumpList jumps)
-        {
-            JumpList::JumpVector jumpVector = jumps.jumps();
-            size_t size = jumpVector.size();
-            for (size_t i = 0; i < size; ++i)
-                addIndirectJumpEntry(stackOffset, jumpVector[i]);
-
-            jumps.empty();
-        }
-
-        void addIndirectJumpEntry(int32_t stackOffset, DataLabelPtr dataLabel)
-        {
-            IndirectJumpHashMap::iterator result = m_indirectJumpMap.find(stackOffset);
-
-            ASSERT(stackOffset >= 0);
-
-            uint32_t offset = static_cast<uint32_t>(stackOffset);
-
-            if (result == m_indirectJumpMap.end())
-                m_indirectJumpMap.add(offset, new IndirectJumpEntry(stackOffset, dataLabel));
-            else
-                result->second->addDataLabel(dataLabel);
-        }
-
-        void emitIndirectJumpTable(MacroAssembler* masm)
+    // This structure is used to hold the compiled opcode information,
+    // including reference back to the original PatternTerm/PatternAlternatives,
+    // and JIT compilation data structures.
+    struct YarrOp {
+        explicit YarrOp(PatternTerm* term)
+            : m_op(OpTerm)
+            , m_term(term)
+            , m_isDeadCode(false)
         {
-            for (IndirectJumpHashMap::iterator iter = m_indirectJumpMap.begin(); iter != m_indirectJumpMap.end(); ++iter) {
-                IndirectJumpEntry* indJumpEntry = iter->second;
-                size_t size = indJumpEntry->m_dataLabelPtrVector.size();
-                if (size) {
-                    // Link any associated DataLabelPtr's with indirect jump via label
-                    Label hereLabel = masm->label();
-                    for (size_t i = 0; i < size; ++i)
-                        m_backtrackRecords.append(AlternativeBacktrackRecord(indJumpEntry->m_dataLabelPtrVector[i], hereLabel));
-                }
-                indJumpEntry->m_relJumps.link(masm);
-                masm->jump(Address(stackPointerRegister, indJumpEntry->m_stackOffset));
-                delete indJumpEntry;
-            }
-        }
-
-        void incrementParenNestingLevel()
-        {
-            ++m_parenNestingLevel;
-        }
-
-        void decrementParenNestingLevel()
-        {
-            --m_parenNestingLevel;
-        }
-
-        ParenthesesTail* addParenthesesTail(PatternTerm& term, JumpList* jumpListToPriorParen)
-        {
-            OwnPtr<ParenthesesTail> tail = adoptPtr(new ParenthesesTail(term, m_parenNestingLevel, jumpListToPriorParen));
-            ParenthesesTail* rawTail = tail.get();
-
-            m_parenTails.append(tail.release());
-            m_parenTailsForIteration.append(rawTail);
-
-            return rawTail;
         }
 
-        void emitParenthesesTail(YarrGenerator* generator)
+        explicit YarrOp(YarrOpCode op)
+            : m_op(op)
+            , m_isDeadCode(false)
         {
-            unsigned vectorSize = m_parenTails.size();
-            bool priorBacktrackFallThrough = false;
-
-            // Emit in reverse order so parentTail N can fall through to N-1
-            for (unsigned index = vectorSize; index > 0; --index) {
-                JumpList jumpsToNext;
-                priorBacktrackFallThrough = m_parenTails[index-1].get()->generateCode(generator, jumpsToNext, priorBacktrackFallThrough, index > 1);
-                if (index > 1)
-                    jumpsToNext.linkTo(generator->label(), generator);
-                else
-                    addJumpsToNextInteration(jumpsToNext);
-            }
-            m_parenTails.clear();
         }
 
-        void addJumpToNextInteration(Jump jump)
-        {
-            m_jumpsToNextInteration.append(jump);
-        }
+        // The operation, as a YarrOpCode, and also a reference to the PatternTerm.
+        YarrOpCode m_op;
+        PatternTerm* m_term;
 
-        void addJumpsToNextInteration(JumpList jumps)
-        {
-            m_jumpsToNextInteration.append(jumps);
-        }
+        // For alternatives, this holds the PatternAlternative and doubly linked
+        // references to this alternative's siblings. In the case of the
+        // OpBodyAlternativeEnd node at the end of a section of repeating nodes,
+        // m_nextOp will reference the OpBodyAlternativeBegin node of the first
+        // repeating alternative.
+        PatternAlternative* m_alternative;
+        size_t m_previousOp;
+        size_t m_nextOp;
 
-        void addDataLabelToNextIteration(DataLabelPtr dataLabel)
-        {
-            m_dataPtrsToNextIteration.append(dataLabel);
-        }
+        // Used to record a set of Jumps out of the generated code, typically
+        // used for jumps out to backtracking code, and a single reentry back
+        // into the code for a node (likely where a backtrack will trigger
+        // rematching).
+        Label m_reentry;
+        JumpList m_jumps;
 
-        void linkToNextIteration(Label label)
-        {
-            m_nextIteration = label;
+        // This flag is used to null out the second pattern character, when
+        // two are fused to match a pair together.
+        bool m_isDeadCode;
 
-            for (unsigned i = 0; i < m_dataPtrsToNextIteration.size(); ++i)
-                m_backtrackRecords.append(AlternativeBacktrackRecord(m_dataPtrsToNextIteration[i], m_nextIteration));
+        // Currently used in the case of some of the more complex management of
+        // 'm_checked', to cache the offset used in this alternative, to avoid
+        // recalculating it.
+        int m_checkAdjust;
 
-            m_dataPtrsToNextIteration.clear();
-
-            for (unsigned i = 0; i < m_parenTailsForIteration.size(); ++i)
-                m_parenTailsForIteration[i]->setNextIteration(m_nextIteration);
-
-            m_parenTailsForIteration.clear();
-        }
-
-        void linkToNextIteration(YarrGenerator* generator)
-        {
-            m_jumpsToNextInteration.linkTo(m_nextIteration, generator);
-        }
-
-        int m_parenNestingLevel;
-        Vector<AlternativeBacktrackRecord> m_backtrackRecords;
-        IndirectJumpHashMap m_indirectJumpMap;
-        Label m_nextIteration;
-        Vector<OwnPtr<ParenthesesTail> > m_parenTails;
-        JumpList m_jumpsToNextInteration;
-        Vector<DataLabelPtr> m_dataPtrsToNextIteration;
-        Vector<ParenthesesTail*> m_parenTailsForIteration;
+        // Used by OpNestedAlternativeNext/End to hold the pointer to the
+        // value that will be pushed into the pattern's frame to return to,
+        // upon backtracking back into the disjunction.
+        DataLabelPtr m_returnAddress;
     };
 
-    struct BacktrackDestination {
-        typedef enum {
-            NoBacktrack,
-            BacktrackLabel,
-            BacktrackStackOffset,
-            BacktrackJumpList,
-            BacktrackLinked
-        } BacktrackType;
-
-        BacktrackDestination()
-            : m_backtrackType(NoBacktrack)
-            , m_backtrackToLabel(0)
-            , m_subDataLabelPtr(0)
-            , m_nextBacktrack(0)
-            , m_backtrackSourceLabel(0)
-            , m_backtrackSourceJumps(0)
+    // BacktrackingState
+    // This class encapsulates information about the state of code generation
+    // whilst generating the code for backtracking, when a term fails to match.
+    // Upon entry to code generation of the backtracking code for a given node,
+    // the Backtracking state will hold references to all control flow sources
+    // that are outputs in need of further backtracking from the prior node
+    // generated (which is the subsequent operation in the regular expression,
+    // and in the m_ops Vector, since we generated backtracking backwards).
+    // These references to control flow take the form of:
+    //  - A jump list of jumps, to be linked to code that will backtrack them
+    //    further.
+    //  - A set of DataLabelPtr values, to be populated with values to be
+    //    treated effectively as return addresses backtracking into complex
+    //    subpatterns.
+    //  - A flag indicating that the current sequence of generated code up to
+    //    this point requires backtracking.
+    class BacktrackingState {
+    public:
+        BacktrackingState()
+            : m_pendingFallthrough(false)
         {
         }
 
-        BacktrackDestination(int32_t stackOffset)
-            : m_backtrackType(BacktrackStackOffset)
-            , m_backtrackStackOffset(stackOffset)
-            , m_backtrackToLabel(0)
-            , m_subDataLabelPtr(0)
-            , m_nextBacktrack(0)
-            , m_backtrackSourceLabel(0)
-            , m_backtrackSourceJumps(0)
+        // Add a jump or jumps, a return address, or set the flag indicating
+        // that the current 'fallthrough' control flow requires backtracking.
+        void append(const Jump& jump)
         {
+            m_laterFailures.append(jump);
         }
-
-        BacktrackDestination(Label label)
-            : m_backtrackType(BacktrackLabel)
-            , m_backtrackLabel(label)
-            , m_backtrackToLabel(0)
-            , m_subDataLabelPtr(0)
-            , m_nextBacktrack(0)
-            , m_backtrackSourceLabel(0)
-            , m_backtrackSourceJumps(0)
+        void append(JumpList& jumpList)
         {
+            m_laterFailures.append(jumpList);
         }
-
-        void clear(bool doDataLabelClear = true)
+        void append(const DataLabelPtr& returnAddress)
         {
-            m_backtrackType = NoBacktrack;
-            if (doDataLabelClear)
-                clearDataLabel();
-            m_nextBacktrack = 0;
+            m_pendingReturns.append(returnAddress);
         }
-
-        void clearDataLabel()
+        void fallthrough()
         {
-            m_dataLabelPtr = DataLabelPtr();
+            ASSERT(!m_pendingFallthrough);
+            m_pendingFallthrough = true;
         }
 
-        bool hasDestination()
+        // These methods clear the backtracking state, either linking to the
+        // current location, a provided label, or copying the backtracking out
+        // to a JumpList. All actions may require code generation to take place,
+        // and as such are passed a pointer to the assembler.
+        void link(MacroAssembler* assembler)
         {
-            return (m_backtrackType != NoBacktrack);
-        }
-
-        bool isStackOffset()
-        {
-            return (m_backtrackType == BacktrackStackOffset);
-        }
-
-        bool isLabel()
-        {
-            return (m_backtrackType == BacktrackLabel);
-        }
-
-        bool isJumpList()
-        {
-            return (m_backtrackType == BacktrackJumpList);
-        }
-
-        bool hasDataLabel()
-        {
-            return m_dataLabelPtr.isSet();
-        }
-
-        void copyTarget(BacktrackDestination& rhs, bool copyDataLabel = true)
-        {
-            m_backtrackType = rhs.m_backtrackType;
-            if (m_backtrackType == BacktrackStackOffset)
-                m_backtrackStackOffset = rhs.m_backtrackStackOffset;
-            else if (m_backtrackType == BacktrackLabel)
-                m_backtrackLabel = rhs.m_backtrackLabel;
-            if (copyDataLabel)
-                m_dataLabelPtr = rhs.m_dataLabelPtr;
-            m_backtrackSourceJumps = rhs.m_backtrackSourceJumps;
-            m_backtrackSourceLabel = rhs.m_backtrackSourceLabel;
-        }
-
-        void copyTo(BacktrackDestination& lhs)
-        {
-            lhs.m_backtrackType = m_backtrackType;
-            if (m_backtrackType == BacktrackStackOffset)
-                lhs.m_backtrackStackOffset = m_backtrackStackOffset;
-            else if (m_backtrackType == BacktrackLabel)
-                lhs.m_backtrackLabel = m_backtrackLabel;
-            lhs.m_backtrackSourceJumps = m_backtrackSourceJumps;
-            lhs.m_backtrackSourceLabel = m_backtrackSourceLabel;
-            lhs.m_dataLabelPtr = m_dataLabelPtr;
-            lhs.m_backTrackJumps = m_backTrackJumps;
-        }
-
-        void addBacktrackJump(Jump jump)
-        {
-            m_backTrackJumps.append(jump);
-        }
-
-        void setStackOffset(int32_t stackOffset)
-        {
-            m_backtrackType = BacktrackStackOffset;
-            m_backtrackStackOffset = stackOffset;
-        }
-
-        void setLabel(Label label)
-        {
-            m_backtrackType = BacktrackLabel;
-            m_backtrackLabel = label;
-        }
-
-        void setNextBacktrackLabel(Label label)
-        {
-            if (m_nextBacktrack)
-                m_nextBacktrack->setLabel(label);
-        }
-
-        void propagateBacktrackToLabel(const BacktrackDestination& rhs)
-        {
-            if (!m_backtrackToLabel && rhs.m_backtrackToLabel)
-                m_backtrackToLabel = rhs.m_backtrackToLabel;
-        }
-
-        void setBacktrackToLabel(Label* backtrackToLabel)
-        {
-            if (!m_backtrackToLabel)
-                m_backtrackToLabel = backtrackToLabel;
-        }
-
-        bool hasBacktrackToLabel()
-        {
-            return m_backtrackToLabel;
-        }
-
-        void setBacktrackJumpList(JumpList* jumpList)
-        {
-            m_backtrackType = BacktrackJumpList;
-            m_backtrackSourceJumps = jumpList;
-        }
-
-        void setBacktrackSourceLabel(Label* backtrackSourceLabel)
-        {
-            m_backtrackSourceLabel = backtrackSourceLabel;
-        }
-
-        void setDataLabel(DataLabelPtr dp)
-        {
-            if (m_subDataLabelPtr) {
-                *m_subDataLabelPtr = dp;
-                m_subDataLabelPtr = 0;
-            } else {
-                ASSERT(!hasDataLabel());
-                m_dataLabelPtr = dp;
+            if (m_pendingReturns.size()) {
+                Label here(assembler);
+                for (unsigned i = 0; i < m_pendingReturns.size(); ++i)
+                    m_backtrackRecords.append(ReturnAddressRecord(m_pendingReturns[i], here));
+                m_pendingReturns.clear();
             }
+            m_laterFailures.link(assembler);
+            m_laterFailures.clear();
+            m_pendingFallthrough = false;
         }
-
-        void clearSubDataLabelPtr()
-        {
-            m_subDataLabelPtr = 0;
-        }
-
-        void setSubDataLabelPtr(DataLabelPtr* subDataLabelPtr)
+        void linkTo(Label label, MacroAssembler* assembler)
         {
-            m_subDataLabelPtr = subDataLabelPtr;
-        }
-
-        void linkToNextBacktrack(BacktrackDestination* nextBacktrack)
-        {
-            m_nextBacktrack = nextBacktrack;
-        }
-
-        int32_t getStackOffset()
-        {
-            ASSERT(m_backtrackType == BacktrackStackOffset);
-            return m_backtrackStackOffset;
-        }
-
-        Label getLabel()
-        {
-            ASSERT(m_backtrackType == BacktrackLabel);
-            return m_backtrackLabel;
-        }
-
-        JumpList& getBacktrackJumps()
-        {
-            return m_backTrackJumps;
-        }
-
-        DataLabelPtr& getDataLabel()
-        {
-            return m_dataLabelPtr;
-        }
-
-        void jumpToBacktrack(MacroAssembler* masm)
-        {
-            if (isJumpList()) {
-                if (m_backtrackSourceLabel && (m_backtrackSourceLabel->isSet()))
-                    masm->jump().linkTo(*m_backtrackSourceLabel, masm);
-                else
-                    m_backtrackSourceJumps->append(masm->jump());
-            } else if (isStackOffset())
-                masm->jump(Address(stackPointerRegister, m_backtrackStackOffset));
-            else if (isLabel())
-                masm->jump().linkTo(m_backtrackLabel, masm);
-            else
-                m_backTrackJumps.append(masm->jump());
-        }
-
-        void jumpToBacktrack(YarrGenerator* generator, Jump jump)
-        {
-            if (isJumpList()) {
-                if (m_backtrackSourceLabel && (m_backtrackSourceLabel->isSet()))
-                    jump.linkTo(*m_backtrackSourceLabel, generator);
-                else
-                    m_backtrackSourceJumps->append(jump);
-            } else if (isStackOffset())
-                generator->m_expressionState.addIndirectJumpEntry(getStackOffset(), jump);
-            else if (isLabel())
-                jump.linkTo(getLabel(), generator);
-            else
-                m_backTrackJumps.append(jump);
-        }
-
-        void jumpToBacktrack(YarrGenerator* generator, JumpList& jumps)
-        {
-            if (isJumpList()) {
-                if (m_backtrackSourceLabel && (m_backtrackSourceLabel->isSet()))
-                    jumps.linkTo(*m_backtrackSourceLabel, generator);
-                else
-                    m_backtrackSourceJumps->append(jumps);
-            } else if (isStackOffset())
-                generator->m_expressionState.addIndirectJumpEntry(getStackOffset(), jumps);
-            else if (isLabel())
-                jumps.linkTo(getLabel(), generator);
-            else
-                m_backTrackJumps.append(jumps);
-        }
-
-        bool plantJumpToBacktrackIfExists(YarrGenerator* generator)
-        {
-            if (isJumpList()) {
-                if (m_backtrackSourceLabel && (m_backtrackSourceLabel->isSet()))
-                    generator->jump(*m_backtrackSourceLabel);
-                else
-                    m_backtrackSourceJumps->append(generator->jump());
-
-                return true;
-            }
-
-            if (isStackOffset()) {
-                generator->jump(Address(stackPointerRegister, getStackOffset()));
-                return true;
+            if (m_pendingReturns.size()) {
+                for (unsigned i = 0; i < m_pendingReturns.size(); ++i)
+                    m_backtrackRecords.append(ReturnAddressRecord(m_pendingReturns[i], label));
+                m_pendingReturns.clear();
             }
-
-            if (isLabel()) {
-                generator->jump(getLabel());
-                if (hasDataLabel()) {
-                    generator->m_expressionState.m_backtrackRecords.append(AlternativeBacktrackRecord(getDataLabel(), getLabel()));
-                    clearDataLabel();
-                }
-                return true;
+            if (m_pendingFallthrough)
+                assembler->jump(label);
+            m_laterFailures.linkTo(label, assembler);
+            m_laterFailures.clear();
+            m_pendingFallthrough = false;
+        }
+        void takeBacktracksToJumpList(JumpList& jumpList, MacroAssembler* assembler)
+        {
+            if (m_pendingReturns.size()) {
+                Label here(assembler);
+                for (unsigned i = 0; i < m_pendingReturns.size(); ++i)
+                    m_backtrackRecords.append(ReturnAddressRecord(m_pendingReturns[i], here));
+                m_pendingReturns.clear();
+                m_pendingFallthrough = true;
             }
-
-            return false;
+            if (m_pendingFallthrough)
+                jumpList.append(assembler->jump());
+            jumpList.append(m_laterFailures);
+            m_laterFailures.clear();
+            m_pendingFallthrough = false;
         }
 
-        void linkBacktrackToLabel(Label backtrackLabel)
+        bool isEmpty()
         {
-            if (m_backtrackToLabel)
-                *m_backtrackToLabel = backtrackLabel;
+            return m_laterFailures.empty() && m_pendingReturns.isEmpty() && !m_pendingFallthrough;
         }
 
-        void linkAlternativeBacktracks(YarrGenerator* generator, bool nextIteration = false)
+        // Called at the end of code generation to link all return addresses.
+        void linkDataLabels(LinkBuffer& linkBuffer)
         {
-            Label hereLabel = generator->label();
-
-            if (m_backtrackToLabel) {
-                *m_backtrackToLabel = hereLabel;
-                m_backtrackToLabel = 0;
-            }
-
-            m_backTrackJumps.link(generator);
-
-            if (nextIteration)
-                generator->m_expressionState.linkToNextIteration(hereLabel);
-
-            if (hasDataLabel()) {
-                generator->m_expressionState.m_backtrackRecords.append(AlternativeBacktrackRecord(getDataLabel(), hereLabel));
-                // data label cleared as a result of the clear() below
-            }
-
-            clear();
-        }
-
-        void linkAlternativeBacktracksTo(YarrGenerator* generator, Label label, bool nextIteration = false)
-        {
-            m_backTrackJumps.linkTo(label, generator);
-
-            if (nextIteration)
-                generator->m_expressionState.linkToNextIteration(label);
-
-            if (hasDataLabel()) {
-                generator->m_expressionState.m_backtrackRecords.append(AlternativeBacktrackRecord(getDataLabel(), label));
-                clearDataLabel();
-            }
+            ASSERT(isEmpty());
+            for (unsigned i = 0; i < m_backtrackRecords.size(); ++i)
+                linkBuffer.patch(m_backtrackRecords[i].m_dataLabel, linkBuffer.locationOf(m_backtrackRecords[i].m_backtrackLocation));
         }
 
     private:
-        BacktrackType m_backtrackType;
-        int32_t m_backtrackStackOffset;
-        Label m_backtrackLabel;
-        DataLabelPtr m_dataLabelPtr;
-        Label* m_backtrackToLabel;
-        DataLabelPtr* m_subDataLabelPtr;
-        BacktrackDestination* m_nextBacktrack;
-        Label* m_backtrackSourceLabel;
-        JumpList* m_backtrackSourceJumps;
-        JumpList m_backTrackJumps;
-    };
-
-    struct TermGenerationState {
-        TermGenerationState(PatternDisjunction* disjunction, unsigned checkedTotal)
-            : disjunction(disjunction)
-            , checkedTotal(checkedTotal)
-            , m_subParenNum(0)
-            , m_linkedBacktrack(0)
-            , m_jumpList(0)
-        {
-        }
-
-        void resetAlternative()
-        {
-            m_backtrack.clear();
-            alt = 0;
-        }
-        bool alternativeValid()
-        {
-            return alt < disjunction->m_alternatives.size();
-        }
-        void nextAlternative()
-        {
-            ++alt;
-        }
-        PatternAlternative* alternative()
-        {
-            return disjunction->m_alternatives[alt];
-        }
-        bool isLastAlternative()
-        {
-            return (alt + 1) == disjunction->m_alternatives.size();
-        }
-
-        void resetTerm()
-        {
-            ASSERT(alternativeValid());
-            t = 0;
-            m_subParenNum = 0;
-        }
-        bool termValid()
-        {
-            ASSERT(alternativeValid());
-            return t < alternative()->m_terms.size();
-        }
-        void nextTerm()
-        {
-            ASSERT(alternativeValid());
-            ++t;
-        }
-        PatternTerm& term()
-        {
-            ASSERT(alternativeValid());
-            return alternative()->m_terms[t];
-        }
-        bool isLastTerm()
-        {
-            ASSERT(alternativeValid());
-            return (t + 1) == alternative()->m_terms.size();
-        }
-        unsigned getSubParenNum()
-        {
-            return m_subParenNum++;
-        }
-        bool isMainDisjunction()
-        {
-            return !disjunction->m_parent;
-        }
-
-        void setJumpListToPriorParen(JumpList* jumpList)
-        {
-            m_jumpList = jumpList;
-        }
-
-        JumpList* getJumpListToPriorParen()
-        {
-            return m_jumpList;
-        }
-
-        PatternTerm& lookaheadTerm()
-        {
-            ASSERT(alternativeValid());
-            ASSERT((t + 1) < alternative()->m_terms.size());
-            return alternative()->m_terms[t + 1];
-        }
-        bool isSinglePatternCharacterLookaheadTerm()
-        {
-            ASSERT(alternativeValid());
-            return ((t + 1) < alternative()->m_terms.size())
-                && (lookaheadTerm().type == PatternTerm::TypePatternCharacter)
-                && (lookaheadTerm().quantityType == QuantifierFixedCount)
-                && (lookaheadTerm().quantityCount == 1);
-        }
-
-        int inputOffset()
-        {
-            return term().inputPosition - checkedTotal;
-        }
-
-        void clearBacktrack()
-        {
-            m_backtrack.clear(false);
-            m_linkedBacktrack = 0;
-        }
-
-        void jumpToBacktrack(MacroAssembler* masm)
-        {
-            m_backtrack.jumpToBacktrack(masm);
-        }
-
-        void jumpToBacktrack(YarrGenerator* generator, Jump jump)
-        {
-            m_backtrack.jumpToBacktrack(generator, jump);
-        }
-
-        void jumpToBacktrack(YarrGenerator* generator, JumpList& jumps)
-        {
-            m_backtrack.jumpToBacktrack(generator, jumps);
-        }
-
-        bool plantJumpToBacktrackIfExists(YarrGenerator* generator)
-        {
-            return m_backtrack.plantJumpToBacktrackIfExists(generator);
-        }
-
-        void linkDataLabelToBacktrackIfExists(YarrGenerator* generator, DataLabelPtr dataLabel)
-        {
-            // If we have a stack offset backtrack destination, use it directly
-            if (m_backtrack.isStackOffset()) {
-                generator->m_expressionState.addIndirectJumpEntry(m_backtrack.getStackOffset(), dataLabel);
-                m_backtrack.clearSubDataLabelPtr();
-            } else {
-                // If we have a backtrack label, connect the datalabel to it directly.
-                if (m_backtrack.isLabel()) {
-                    generator->m_expressionState.m_backtrackRecords.append(AlternativeBacktrackRecord(dataLabel, m_backtrack.getLabel()));
-                    m_backtrack.clearSubDataLabelPtr();
-                } else
-                    setBacktrackDataLabel(dataLabel);
+        struct ReturnAddressRecord {
+            ReturnAddressRecord(DataLabelPtr dataLabel, Label backtrackLocation)
+                : m_dataLabel(dataLabel)
+                , m_backtrackLocation(backtrackLocation)
+            {
             }
-        }
-
-        void addBacktrackJump(Jump jump)
-        {
-            m_backtrack.addBacktrackJump(jump);
-        }
-
-        void setBacktrackDataLabel(DataLabelPtr dp)
-        {
-            m_backtrack.setDataLabel(dp);
-        }
-
-        void setBackTrackStackOffset(int32_t stackOffset)
-        {
-            m_backtrack.setStackOffset(stackOffset);
-        }
-
-        void setBacktrackLabel(Label label)
-        {
-            m_backtrack.setLabel(label);
-        }
-
-        void linkAlternativeBacktracks(YarrGenerator* generator, bool nextIteration = false)
-        {
-            m_backtrack.linkAlternativeBacktracks(generator, nextIteration);
-            m_linkedBacktrack = 0;
-        }
-
-        void linkAlternativeBacktracksTo(YarrGenerator* generator, Label label, bool nextIteration = false)
-        {
-            m_backtrack.linkAlternativeBacktracksTo(generator, label, nextIteration);
-        }
-
-        void setBacktrackLink(BacktrackDestination* linkedBacktrack)
-        {
-            m_linkedBacktrack = linkedBacktrack;
-        }
-
-        void chainBacktracks(BacktrackDestination* followonBacktrack)
-        {
-            if (m_linkedBacktrack)
-                m_linkedBacktrack->linkToNextBacktrack(followonBacktrack);
-        }
 
-        BacktrackDestination& getBacktrackDestination()
-        {
-            return m_backtrack;
-        }
-
-        void propagateBacktrackingFrom(YarrGenerator* generator, BacktrackDestination& backtrack, bool doJump = true)
-        {
-            if (doJump)
-                m_backtrack.jumpToBacktrack(generator, backtrack.getBacktrackJumps());
-
-            if (m_backtrack.isLabel() && backtrack.hasBacktrackToLabel())
-                backtrack.linkBacktrackToLabel(m_backtrack.getLabel());
-
-            if (backtrack.hasDestination()) {
-                if (m_backtrack.hasDataLabel())
-                    generator->m_expressionState.addDataLabelToNextIteration(m_backtrack.getDataLabel());
+            DataLabelPtr m_dataLabel;
+            Label m_backtrackLocation;
+        };
 
-                m_backtrack.copyTarget(backtrack, doJump);
-            }
-        }
-
-        PatternDisjunction* disjunction;
-        int checkedTotal;
-    private:
-        unsigned alt;
-        unsigned t;
-        unsigned m_subParenNum;
-        BacktrackDestination m_backtrack;
-        BacktrackDestination* m_linkedBacktrack;
-        JumpList* m_jumpList;
+        JumpList m_laterFailures;
+        bool m_pendingFallthrough;
+        Vector<DataLabelPtr, 4> m_pendingReturns;
+        Vector<ReturnAddressRecord, 4> m_backtrackRecords;
     };
 
-    struct ParenthesesTail {
-        ParenthesesTail(PatternTerm& term, int nestingLevel, JumpList* jumpListToPriorParen)
-            : m_term(term)
-            , m_nestingLevel(nestingLevel)
-            , m_subParenIndex(0)
-            , m_jumpListToPriorParen(jumpListToPriorParen)
-        {
-        }
-
-        void processBacktracks(YarrGenerator* generator, TermGenerationState& state, TermGenerationState& parenthesesState, Label nonGreedyTryParentheses, Label fallThrough)
-        {
-            m_nonGreedyTryParentheses = nonGreedyTryParentheses;
-            m_fallThrough = fallThrough;
-
-            m_subParenIndex = state.getSubParenNum();
-            parenthesesState.getBacktrackDestination().copyTo(m_parenBacktrack);
-            state.chainBacktracks(&m_backtrack);
-            BacktrackDestination& stateBacktrack = state.getBacktrackDestination();
-            stateBacktrack.copyTo(m_backtrack);
-            stateBacktrack.setBacktrackToLabel(&m_backtrackToLabel);
-            state.setBacktrackLink(&m_backtrack);
-            stateBacktrack.setSubDataLabelPtr(&m_dataAfterLabelPtr);
-
-            m_doDirectBacktrack = m_parenBacktrack.hasDestination();
-
-            if ((m_term.quantityType == QuantifierGreedy) || (m_term.quantityType == QuantifierNonGreedy))
-                m_doDirectBacktrack = false;
-
-            if (m_doDirectBacktrack)
-                state.propagateBacktrackingFrom(generator, m_parenBacktrack, false);
-            else {
-                stateBacktrack.setBacktrackJumpList(&m_afterBacktrackJumps);
-                stateBacktrack.setBacktrackSourceLabel(&m_backtrackFromAfterParens);
-            }
-        }
-
-        void setNextIteration(Label nextIteration)
-        {
-            if (!m_nestingLevel && !m_backtrackToLabel.isSet())
-                m_backtrackToLabel = nextIteration;
-        }
-
-        void addAfterParenJump(Jump jump)
-        {
-            m_afterBacktrackJumps.append(jump);
-        }
+    // Generation methods:
+    // ===================
 
-        bool generateCode(YarrGenerator* generator, JumpList& jumpsToNext, bool priorBackTrackFallThrough, bool nextBacktrackFallThrough)
-        {
-            const RegisterID indexTemporary = regT0;
-            unsigned parenthesesFrameLocation = m_term.frameLocation;
-            Jump fromPriorBacktrack;
-            bool needJumpForPriorParenTail = false;
-
-            if (priorBackTrackFallThrough
-                && ((m_term.quantityType == QuantifierGreedy)
-                 || (m_term.quantityType == QuantifierNonGreedy)
-                 || (!m_doDirectBacktrack && m_parenBacktrack.hasDestination()))) {
-                // If the prior paren tail code assumed that it could fall through,
-                // but we need to generate after paren backtrack code, then provide
-                // a jump around that code for the prior paren tail code.
-                // A regular expressing like ((xxx)...)? needs this.
-                fromPriorBacktrack = generator->jump();
-                needJumpForPriorParenTail = true;
-            }
-
-            if (!m_backtrack.hasDestination()) {
-                if (m_backtrackToLabel.isSet()) {
-                    m_backtrack.setLabel(m_backtrackToLabel);
-                    nextBacktrackFallThrough = false;
-                } else if (m_jumpListToPriorParen) {
-                    // If we don't have a destination, go back to either the prior paren or the next outer paren.
-                    m_backtrack.setBacktrackJumpList(m_jumpListToPriorParen);
-                    nextBacktrackFallThrough = false;
-                } else
-                    m_backtrack.setBacktrackJumpList(&jumpsToNext);
-            } else
-                nextBacktrackFallThrough = false;
-
-            // A failure AFTER the parens jumps here - Backtrack to this paren
-            m_backtrackFromAfterParens = generator->label();
-
-            if (m_dataAfterLabelPtr.isSet())
-                generator->m_expressionState.m_backtrackRecords.append(AlternativeBacktrackRecord(m_dataAfterLabelPtr, m_backtrackFromAfterParens));
-
-            m_afterBacktrackJumps.link(generator);
-
-            if (m_term.quantityType == QuantifierGreedy) {
-                // If this is -1 we have now tested with both with and without the parens.
-                generator->loadFromFrame(parenthesesFrameLocation, indexTemporary);
-                m_backtrack.jumpToBacktrack(generator, generator->branch32(Equal, indexTemporary, TrustedImm32(-1)));
-            } else if (m_term.quantityType == QuantifierNonGreedy) {
-                // If this is -1 we have now tested with both with and without the parens.
-                generator->loadFromFrame(parenthesesFrameLocation, indexTemporary);
-                generator->branch32(Equal, indexTemporary, TrustedImm32(-1)).linkTo(m_nonGreedyTryParentheses, generator);
-            }
-
-            if (!m_doDirectBacktrack)
-                m_parenBacktrack.plantJumpToBacktrackIfExists(generator);
-
-            // A failure WITHIN the parens jumps here
-            if (needJumpForPriorParenTail)
-                fromPriorBacktrack.link(generator);
-            m_parenBacktrack.linkAlternativeBacktracks(generator);
-            m_withinBacktrackJumps.link(generator);
-
-            if (m_term.capture())
-                generator->store32(TrustedImm32(-1), Address(output, (m_term.parentheses.subpatternId << 1) * sizeof(int)));
-
-            if (m_term.quantityType == QuantifierGreedy) {
-                generator->storeToFrame(TrustedImm32(-1), parenthesesFrameLocation);
-                generator->jump().linkTo(m_fallThrough, generator);
-                nextBacktrackFallThrough = false;
-            } else if (!nextBacktrackFallThrough)
-                m_backtrack.jumpToBacktrack(generator);
-
-            if (!m_doDirectBacktrack)
-                m_backtrack.setNextBacktrackLabel(m_backtrackFromAfterParens);
-
-            return nextBacktrackFallThrough;
-        }
-
-        PatternTerm& m_term;
-        int m_nestingLevel;
-        unsigned m_subParenIndex;
-        JumpList* m_jumpListToPriorParen;
-        Label m_nonGreedyTryParentheses;
-        Label m_fallThrough;
-        Label m_backtrackToLabel;
-        Label m_backtrackFromAfterParens;
-        DataLabelPtr m_dataAfterLabelPtr;
-        JumpList m_withinBacktrackJumps;
-        JumpList m_afterBacktrackJumps;
-        BacktrackDestination m_parenBacktrack;
-        BacktrackDestination m_backtrack;
-        bool m_doDirectBacktrack;
-    };
+    // This method provides a default implementation of backtracking common
+    // to many terms; terms commonly jump out of the forwards  matching path
+    // on any failed conditions, and add these jumps to the m_jumps list. If
+    // no special handling is required we can often just backtrack to m_jumps.
+    void backtrackTermDefault(size_t opIndex)
+    {
+        YarrOp& op = m_ops[opIndex];
+        m_backtrackingState.append(op.m_jumps);
+    }
 
-    void generateAssertionBOL(TermGenerationState& state)
+    void generateAssertionBOL(size_t opIndex)
     {
-        PatternTerm& term = state.term();
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
 
         if (m_pattern.m_multiline) {
             const RegisterID character = regT0;
 
             JumpList matchDest;
-            if (!term.inputPosition)
-                matchDest.append(branch32(Equal, index, Imm32(state.checkedTotal)));
+            if (!term->inputPosition)
+                matchDest.append(branch32(Equal, index, Imm32(m_checked)));
 
-            readCharacter(state.inputOffset() - 1, character);
+            readCharacter((term->inputPosition - m_checked) - 1, character);
             matchCharacterClass(character, matchDest, m_pattern.newlineCharacterClass());
-            state.jumpToBacktrack(this);
+            op.m_jumps.append(jump());
 
             matchDest.link(this);
         } else {
             // Erk, really should poison out these alternatives early. :-/
-            if (term.inputPosition)
-                state.jumpToBacktrack(this);
+            if (term->inputPosition)
+                op.m_jumps.append(jump());
             else
-                state.jumpToBacktrack(this, branch32(NotEqual, index, Imm32(state.checkedTotal)));
+                op.m_jumps.append(branch32(NotEqual, index, Imm32(m_checked)));
         }
     }
+    void backtrackAssertionBOL(size_t opIndex)
+    {
+        backtrackTermDefault(opIndex);
+    }
 
-    void generateAssertionEOL(TermGenerationState& state)
+    void generateAssertionEOL(size_t opIndex)
     {
-        PatternTerm& term = state.term();
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
 
         if (m_pattern.m_multiline) {
             const RegisterID character = regT0;
 
             JumpList matchDest;
-            if (term.inputPosition == state.checkedTotal)
+            if (term->inputPosition == m_checked)
                 matchDest.append(atEndOfInput());
 
-            readCharacter(state.inputOffset(), character);
+            readCharacter((term->inputPosition - m_checked), character);
             matchCharacterClass(character, matchDest, m_pattern.newlineCharacterClass());
-            state.jumpToBacktrack(this);
+            op.m_jumps.append(jump());
 
             matchDest.link(this);
         } else {
-            if (term.inputPosition == state.checkedTotal)
-                state.jumpToBacktrack(this, notAtEndOfInput());
+            if (term->inputPosition == m_checked)
+                op.m_jumps.append(notAtEndOfInput());
             // Erk, really should poison out these alternatives early. :-/
             else
-                state.jumpToBacktrack(this);
+                op.m_jumps.append(jump());
         }
     }
+    void backtrackAssertionEOL(size_t opIndex)
+    {
+        backtrackTermDefault(opIndex);
+    }
 
     // Also falls though on nextIsNotWordChar.
-    void matchAssertionWordchar(TermGenerationState& state, JumpList& nextIsWordChar, JumpList& nextIsNotWordChar)
+    void matchAssertionWordchar(size_t opIndex, JumpList& nextIsWordChar, JumpList& nextIsNotWordChar)
     {
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
+
         const RegisterID character = regT0;
-        PatternTerm& term = state.term();
 
-        if (term.inputPosition == state.checkedTotal)
+        if (term->inputPosition == m_checked)
             nextIsNotWordChar.append(atEndOfInput());
 
-        readCharacter(state.inputOffset(), character);
+        readCharacter((term->inputPosition - m_checked), character);
         matchCharacterClass(character, nextIsWordChar, m_pattern.wordcharCharacterClass());
     }
 
-    void generateAssertionWordBoundary(TermGenerationState& state)
+    void generateAssertionWordBoundary(size_t opIndex)
     {
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
+
         const RegisterID character = regT0;
-        PatternTerm& term = state.term();
 
         Jump atBegin;
         JumpList matchDest;
-        if (!term.inputPosition)
-            atBegin = branch32(Equal, index, Imm32(state.checkedTotal));
-        readCharacter(state.inputOffset() - 1, character);
+        if (!term->inputPosition)
+            atBegin = branch32(Equal, index, Imm32(m_checked));
+        readCharacter((term->inputPosition - m_checked) - 1, character);
         matchCharacterClass(character, matchDest, m_pattern.wordcharCharacterClass());
-        if (!term.inputPosition)
+        if (!term->inputPosition)
             atBegin.link(this);
 
         // We fall through to here if the last character was not a wordchar.
         JumpList nonWordCharThenWordChar;
         JumpList nonWordCharThenNonWordChar;
-        if (term.invert()) {
-            matchAssertionWordchar(state, nonWordCharThenNonWordChar, nonWordCharThenWordChar);
+        if (term->invert()) {
+            matchAssertionWordchar(opIndex, nonWordCharThenNonWordChar, nonWordCharThenWordChar);
             nonWordCharThenWordChar.append(jump());
         } else {
-            matchAssertionWordchar(state, nonWordCharThenWordChar, nonWordCharThenNonWordChar);
+            matchAssertionWordchar(opIndex, nonWordCharThenWordChar, nonWordCharThenNonWordChar);
             nonWordCharThenNonWordChar.append(jump());
         }
-        state.jumpToBacktrack(this, nonWordCharThenNonWordChar);
+        op.m_jumps.append(nonWordCharThenNonWordChar);
 
         // We jump here if the last character was a wordchar.
         matchDest.link(this);
         JumpList wordCharThenWordChar;
         JumpList wordCharThenNonWordChar;
-        if (term.invert()) {
-            matchAssertionWordchar(state, wordCharThenNonWordChar, wordCharThenWordChar);
+        if (term->invert()) {
+            matchAssertionWordchar(opIndex, wordCharThenNonWordChar, wordCharThenWordChar);
             wordCharThenWordChar.append(jump());
         } else {
-            matchAssertionWordchar(state, wordCharThenWordChar, wordCharThenNonWordChar);
+            matchAssertionWordchar(opIndex, wordCharThenWordChar, wordCharThenNonWordChar);
             // This can fall-though!
         }
 
-        state.jumpToBacktrack(this, wordCharThenWordChar);
+        op.m_jumps.append(wordCharThenWordChar);
 
         nonWordCharThenWordChar.link(this);
         wordCharThenNonWordChar.link(this);
     }
+    void backtrackAssertionWordBoundary(size_t opIndex)
+    {
+        backtrackTermDefault(opIndex);
+    }
 
-    void generatePatternCharacterSingle(TermGenerationState& state)
+    void generatePatternCharacterOnce(size_t opIndex)
     {
+        YarrOp& op = m_ops[opIndex];
+
+        // m_ops always ends with a OpBodyAlternativeEnd or OpMatchFailed
+        // node, so there must always be at least one more node.
+        ASSERT(opIndex + 1 < m_ops.size());
+        YarrOp& nextOp = m_ops[opIndex + 1];
+
+        if (op.m_isDeadCode)
+            return;
+
+        PatternTerm* term = op.m_term;
+        UChar ch = term->patternCharacter;
+
         const RegisterID character = regT0;
-        UChar ch = state.term().patternCharacter;
+
+        if (nextOp.m_op == OpTerm) {
+            PatternTerm* nextTerm = nextOp.m_term;
+            if (nextTerm->type == PatternTerm::TypePatternCharacter
+                && nextTerm->quantityType == QuantifierFixedCount
+                && nextTerm->quantityCount == 1
+                && nextTerm->inputPosition == (term->inputPosition + 1)) {
+
+                UChar ch2 = nextTerm->patternCharacter;
+
+                int mask = 0;
+                int chPair = ch | (ch2 << 16);
+
+                if (m_pattern.m_ignoreCase) {
+                    if (isASCIIAlpha(ch))
+                        mask |= 32;
+                    if (isASCIIAlpha(ch2))
+                        mask |= 32 << 16;
+                }
+
+                BaseIndex address(input, index, TimesTwo, (term->inputPosition - m_checked) * sizeof(UChar));
+                if (mask) {
+                    load32WithUnalignedHalfWords(address, character);
+                    or32(Imm32(mask), character);
+                    op.m_jumps.append(branch32(NotEqual, character, Imm32(chPair | mask)));
+                } else
+                    op.m_jumps.append(branch32WithUnalignedHalfWords(NotEqual, address, Imm32(chPair)));
+
+                nextOp.m_isDeadCode = true;
+                return;
+            }
+        }
 
         if (m_pattern.m_ignoreCase && isASCIIAlpha(ch)) {
-            readCharacter(state.inputOffset(), character);
+            readCharacter(term->inputPosition - m_checked, character);
             or32(TrustedImm32(32), character);
-            state.jumpToBacktrack(this, branch32(NotEqual, character, Imm32(Unicode::toLower(ch))));
+            op.m_jumps.append(branch32(NotEqual, character, Imm32(Unicode::toLower(ch))));
         } else {
             ASSERT(!m_pattern.m_ignoreCase || (Unicode::toLower(ch) == Unicode::toUpper(ch)));
-            state.jumpToBacktrack(this, jumpIfCharNotEquals(ch, state.inputOffset()));
+            op.m_jumps.append(jumpIfCharNotEquals(ch, term->inputPosition - m_checked));
         }
     }
-
-    void generatePatternCharacterPair(TermGenerationState& state)
+    void backtrackPatternCharacterOnce(size_t opIndex)
     {
-        const RegisterID character = regT0;
-        UChar ch1 = state.term().patternCharacter;
-        UChar ch2 = state.lookaheadTerm().patternCharacter;
-
-        int mask = 0;
-        int chPair = ch1 | (ch2 << 16);
-
-        if (m_pattern.m_ignoreCase) {
-            if (isASCIIAlpha(ch1))
-                mask |= 32;
-            if (isASCIIAlpha(ch2))
-                mask |= 32 << 16;
-        }
-
-        if (mask) {
-            load32WithUnalignedHalfWords(BaseIndex(input, index, TimesTwo, state.inputOffset() * sizeof(UChar)), character);
-            or32(Imm32(mask), character);
-            state.jumpToBacktrack(this, branch32(NotEqual, character, Imm32(chPair | mask)));
-        } else
-            state.jumpToBacktrack(this, branch32WithUnalignedHalfWords(NotEqual, BaseIndex(input, index, TimesTwo, state.inputOffset() * sizeof(UChar)), Imm32(chPair)));
+        backtrackTermDefault(opIndex);
     }
 
-    void generatePatternCharacterFixed(TermGenerationState& state)
+    void generatePatternCharacterFixed(size_t opIndex)
     {
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
+        UChar ch = term->patternCharacter;
+
         const RegisterID character = regT0;
         const RegisterID countRegister = regT1;
-        PatternTerm& term = state.term();
-        UChar ch = term.patternCharacter;
 
         move(index, countRegister);
-        sub32(Imm32(term.quantityCount), countRegister);
+        sub32(Imm32(term->quantityCount), countRegister);
 
         Label loop(this);
+        BaseIndex address(input, countRegister, TimesTwo, (term->inputPosition - m_checked + term->quantityCount) * sizeof(UChar));
+
         if (m_pattern.m_ignoreCase && isASCIIAlpha(ch)) {
-            load16(BaseIndex(input, countRegister, TimesTwo, (state.inputOffset() + term.quantityCount) * sizeof(UChar)), character);
+            load16(address, character);
             or32(TrustedImm32(32), character);
-            state.jumpToBacktrack(this, branch32(NotEqual, character, Imm32(Unicode::toLower(ch))));
+            op.m_jumps.append(branch32(NotEqual, character, Imm32(Unicode::toLower(ch))));
         } else {
             ASSERT(!m_pattern.m_ignoreCase || (Unicode::toLower(ch) == Unicode::toUpper(ch)));
-            state.jumpToBacktrack(this, branch16(NotEqual, BaseIndex(input, countRegister, TimesTwo, (state.inputOffset() + term.quantityCount) * sizeof(UChar)), Imm32(ch)));
+            op.m_jumps.append(branch16(NotEqual, address, Imm32(ch)));
         }
         add32(TrustedImm32(1), countRegister);
         branch32(NotEqual, countRegister, index).linkTo(loop, this);
     }
+    void backtrackPatternCharacterFixed(size_t opIndex)
+    {
+        backtrackTermDefault(opIndex);
+    }
 
-    void generatePatternCharacterGreedy(TermGenerationState& state)
+    void generatePatternCharacterGreedy(size_t opIndex)
     {
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
+        UChar ch = term->patternCharacter;
+
         const RegisterID character = regT0;
         const RegisterID countRegister = regT1;
-        PatternTerm& term = state.term();
-        UChar ch = term.patternCharacter;
 
         move(TrustedImm32(0), countRegister);
 
@@ -1352,121 +752,152 @@ class YarrGenerator : private MacroAssembler {
         Label loop(this);
         failures.append(atEndOfInput());
         if (m_pattern.m_ignoreCase && isASCIIAlpha(ch)) {
-            readCharacter(state.inputOffset(), character);
+            readCharacter(term->inputPosition - m_checked, character);
             or32(TrustedImm32(32), character);
             failures.append(branch32(NotEqual, character, Imm32(Unicode::toLower(ch))));
         } else {
             ASSERT(!m_pattern.m_ignoreCase || (Unicode::toLower(ch) == Unicode::toUpper(ch)));
-            failures.append(jumpIfCharNotEquals(ch, state.inputOffset()));
+            failures.append(jumpIfCharNotEquals(ch, term->inputPosition - m_checked));
         }
 
         add32(TrustedImm32(1), countRegister);
         add32(TrustedImm32(1), index);
-        if (term.quantityCount != quantifyInfinite) {
-            branch32(NotEqual, countRegister, Imm32(term.quantityCount)).linkTo(loop, this);
-            failures.append(jump());
-        } else
+        if (term->quantityCount == quantifyInfinite)
             jump(loop);
-
-        Label backtrackBegin(this);
-        loadFromFrame(term.frameLocation, countRegister);
-        state.jumpToBacktrack(this, branchTest32(Zero, countRegister));
-        sub32(TrustedImm32(1), countRegister);
-        sub32(TrustedImm32(1), index);
+        else
+            branch32(NotEqual, countRegister, Imm32(term->quantityCount)).linkTo(loop, this);
 
         failures.link(this);
+        op.m_reentry = label();
 
-        storeToFrame(countRegister, term.frameLocation);
+        storeToFrame(countRegister, term->frameLocation);
 
-        state.setBacktrackLabel(backtrackBegin);
     }
+    void backtrackPatternCharacterGreedy(size_t opIndex)
+    {
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
+
+        const RegisterID countRegister = regT1;
 
-    void generatePatternCharacterNonGreedy(TermGenerationState& state)
+        m_backtrackingState.link(this);
+
+        loadFromFrame(term->frameLocation, countRegister);
+        m_backtrackingState.append(branchTest32(Zero, countRegister));
+        sub32(TrustedImm32(1), countRegister);
+        sub32(TrustedImm32(1), index);
+        jump(op.m_reentry);
+    }
+
+    void generatePatternCharacterNonGreedy(size_t opIndex)
     {
-        const RegisterID character = regT0;
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
+
         const RegisterID countRegister = regT1;
-        PatternTerm& term = state.term();
-        UChar ch = term.patternCharacter;
 
         move(TrustedImm32(0), countRegister);
+        op.m_reentry = label();
+        storeToFrame(countRegister, term->frameLocation);
+    }
+    void backtrackPatternCharacterNonGreedy(size_t opIndex)
+    {
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
+        UChar ch = term->patternCharacter;
+
+        const RegisterID character = regT0;
+        const RegisterID countRegister = regT1;
 
-        Jump firstTimeDoNothing = jump();
+        JumpList nonGreedyFailures;
 
-        Label hardFail(this);
-        sub32(countRegister, index);
-        state.jumpToBacktrack(this);
+        m_backtrackingState.link(this);
 
-        Label backtrackBegin(this);
-        loadFromFrame(term.frameLocation, countRegister);
+        loadFromFrame(term->frameLocation, countRegister);
 
-        atEndOfInput().linkTo(hardFail, this);
-        if (term.quantityCount != quantifyInfinite)
-            branch32(Equal, countRegister, Imm32(term.quantityCount), hardFail);
+        nonGreedyFailures.append(atEndOfInput());
+        if (term->quantityCount != quantifyInfinite)
+            nonGreedyFailures.append(branch32(Equal, countRegister, Imm32(term->quantityCount)));
         if (m_pattern.m_ignoreCase && isASCIIAlpha(ch)) {
-            readCharacter(state.inputOffset(), character);
+            readCharacter(term->inputPosition - m_checked, character);
             or32(TrustedImm32(32), character);
-            branch32(NotEqual, character, Imm32(Unicode::toLower(ch))).linkTo(hardFail, this);
+            nonGreedyFailures.append(branch32(NotEqual, character, Imm32(Unicode::toLower(ch))));
         } else {
             ASSERT(!m_pattern.m_ignoreCase || (Unicode::toLower(ch) == Unicode::toUpper(ch)));
-            jumpIfCharNotEquals(ch, state.inputOffset()).linkTo(hardFail, this);
+            nonGreedyFailures.append(jumpIfCharNotEquals(ch, term->inputPosition - m_checked));
         }
 
         add32(TrustedImm32(1), countRegister);
         add32(TrustedImm32(1), index);
 
-        firstTimeDoNothing.link(this);
-        storeToFrame(countRegister, term.frameLocation);
+        jump(op.m_reentry);
 
-        state.setBacktrackLabel(backtrackBegin);
+        nonGreedyFailures.link(this);
+        sub32(countRegister, index);
+        m_backtrackingState.fallthrough();
     }
 
-    void generateCharacterClassSingle(TermGenerationState& state)
+    void generateCharacterClassOnce(size_t opIndex)
     {
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
+
         const RegisterID character = regT0;
-        PatternTerm& term = state.term();
 
         JumpList matchDest;
-        readCharacter(state.inputOffset(), character);
-        matchCharacterClass(character, matchDest, term.characterClass);
+        readCharacter((term->inputPosition - m_checked), character);
+        matchCharacterClass(character, matchDest, term->characterClass);
 
-        if (term.invert())
-            state.jumpToBacktrack(this, matchDest);
+        if (term->invert())
+            op.m_jumps.append(matchDest);
         else {
-            state.jumpToBacktrack(this);
+            op.m_jumps.append(jump());
             matchDest.link(this);
         }
     }
+    void backtrackCharacterClassOnce(size_t opIndex)
+    {
+        backtrackTermDefault(opIndex);
+    }
 
-    void generateCharacterClassFixed(TermGenerationState& state)
+    void generateCharacterClassFixed(size_t opIndex)
     {
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
+
         const RegisterID character = regT0;
         const RegisterID countRegister = regT1;
-        PatternTerm& term = state.term();
 
         move(index, countRegister);
-        sub32(Imm32(term.quantityCount), countRegister);
+        sub32(Imm32(term->quantityCount), countRegister);
 
         Label loop(this);
         JumpList matchDest;
-        load16(BaseIndex(input, countRegister, TimesTwo, (state.inputOffset() + term.quantityCount) * sizeof(UChar)), character);
-        matchCharacterClass(character, matchDest, term.characterClass);
+        load16(BaseIndex(input, countRegister, TimesTwo, (term->inputPosition - m_checked + term->quantityCount) * sizeof(UChar)), character);
+        matchCharacterClass(character, matchDest, term->characterClass);
 
-        if (term.invert())
-            state.jumpToBacktrack(this, matchDest);
+        if (term->invert())
+            op.m_jumps.append(matchDest);
         else {
-            state.jumpToBacktrack(this);
+            op.m_jumps.append(jump());
             matchDest.link(this);
         }
 
         add32(TrustedImm32(1), countRegister);
         branch32(NotEqual, countRegister, index).linkTo(loop, this);
     }
+    void backtrackCharacterClassFixed(size_t opIndex)
+    {
+        backtrackTermDefault(opIndex);
+    }
 
-    void generateCharacterClassGreedy(TermGenerationState& state)
+    void generateCharacterClassGreedy(size_t opIndex)
     {
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
+
         const RegisterID character = regT0;
         const RegisterID countRegister = regT1;
-        PatternTerm& term = state.term();
 
         move(TrustedImm32(0), countRegister);
 
@@ -1474,692 +905,1356 @@ class YarrGenerator : private MacroAssembler {
         Label loop(this);
         failures.append(atEndOfInput());
 
-        if (term.invert()) {
-            readCharacter(state.inputOffset(), character);
-            matchCharacterClass(character, failures, term.characterClass);
+        if (term->invert()) {
+            readCharacter(term->inputPosition - m_checked, character);
+            matchCharacterClass(character, failures, term->characterClass);
         } else {
             JumpList matchDest;
-            readCharacter(state.inputOffset(), character);
-            matchCharacterClass(character, matchDest, term.characterClass);
+            readCharacter(term->inputPosition - m_checked, character);
+            matchCharacterClass(character, matchDest, term->characterClass);
             failures.append(jump());
             matchDest.link(this);
         }
 
         add32(TrustedImm32(1), countRegister);
         add32(TrustedImm32(1), index);
-        if (term.quantityCount != quantifyInfinite) {
-            branch32(NotEqual, countRegister, Imm32(term.quantityCount)).linkTo(loop, this);
+        if (term->quantityCount != quantifyInfinite) {
+            branch32(NotEqual, countRegister, Imm32(term->quantityCount)).linkTo(loop, this);
             failures.append(jump());
         } else
             jump(loop);
 
-        Label backtrackBegin(this);
-        loadFromFrame(term.frameLocation, countRegister);
-        state.jumpToBacktrack(this, branchTest32(Zero, countRegister));
-        sub32(TrustedImm32(1), countRegister);
-        sub32(TrustedImm32(1), index);
-
         failures.link(this);
+        op.m_reentry = label();
+
+        storeToFrame(countRegister, term->frameLocation);
+    }
+    void backtrackCharacterClassGreedy(size_t opIndex)
+    {
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
 
-        storeToFrame(countRegister, term.frameLocation);
+        const RegisterID countRegister = regT1;
+
+        m_backtrackingState.link(this);
 
-        state.setBacktrackLabel(backtrackBegin);
+        loadFromFrame(term->frameLocation, countRegister);
+        m_backtrackingState.append(branchTest32(Zero, countRegister));
+        sub32(TrustedImm32(1), countRegister);
+        sub32(TrustedImm32(1), index);
+        jump(op.m_reentry);
     }
 
-    void generateCharacterClassNonGreedy(TermGenerationState& state)
+    void generateCharacterClassNonGreedy(size_t opIndex)
     {
-        const RegisterID character = regT0;
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
+
         const RegisterID countRegister = regT1;
-        PatternTerm& term = state.term();
 
         move(TrustedImm32(0), countRegister);
+        op.m_reentry = label();
+        storeToFrame(countRegister, term->frameLocation);
+    }
+    void backtrackCharacterClassNonGreedy(size_t opIndex)
+    {
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
 
-        Jump firstTimeDoNothing = jump();
+        const RegisterID character = regT0;
+        const RegisterID countRegister = regT1;
 
-        Label hardFail(this);
-        sub32(countRegister, index);
-        state.jumpToBacktrack(this);
+        JumpList nonGreedyFailures;
+
+        m_backtrackingState.link(this);
 
         Label backtrackBegin(this);
-        loadFromFrame(term.frameLocation, countRegister);
+        loadFromFrame(term->frameLocation, countRegister);
 
-        atEndOfInput().linkTo(hardFail, this);
-        branch32(Equal, countRegister, Imm32(term.quantityCount), hardFail);
+        nonGreedyFailures.append(atEndOfInput());
+        nonGreedyFailures.append(branch32(Equal, countRegister, Imm32(term->quantityCount)));
 
         JumpList matchDest;
-        readCharacter(state.inputOffset(), character);
-        matchCharacterClass(character, matchDest, term.characterClass);
+        readCharacter(term->inputPosition - m_checked, character);
+        matchCharacterClass(character, matchDest, term->characterClass);
 
-        if (term.invert())
-            matchDest.linkTo(hardFail, this);
+        if (term->invert())
+            nonGreedyFailures.append(matchDest);
         else {
-            jump(hardFail);
+            nonGreedyFailures.append(jump());
             matchDest.link(this);
         }
 
         add32(TrustedImm32(1), countRegister);
         add32(TrustedImm32(1), index);
 
-        firstTimeDoNothing.link(this);
-        storeToFrame(countRegister, term.frameLocation);
+        jump(op.m_reentry);
 
-        state.setBacktrackLabel(backtrackBegin);
+        nonGreedyFailures.link(this);
+        sub32(countRegister, index);
+        m_backtrackingState.fallthrough();
     }
 
-    void generateParenthesesDisjunction(PatternTerm& parenthesesTerm, TermGenerationState& state, unsigned alternativeFrameLocation)
+    // Code generation/backtracking for simple terms
+    // (pattern characters, character classes, and assertions).
+    // These methods farm out work to the set of functions above.
+    void generateTerm(size_t opIndex)
     {
-        ASSERT((parenthesesTerm.type == PatternTerm::TypeParenthesesSubpattern) || (parenthesesTerm.type == PatternTerm::TypeParentheticalAssertion));
-        ASSERT(parenthesesTerm.quantityCount == 1);
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
 
-        PatternDisjunction* disjunction = parenthesesTerm.parentheses.disjunction;
-        unsigned preCheckedCount = ((parenthesesTerm.quantityType == QuantifierFixedCount) && (parenthesesTerm.type != PatternTerm::TypeParentheticalAssertion)) ? disjunction->m_minimumSize : 0;
+        switch (term->type) {
+        case PatternTerm::TypePatternCharacter:
+            switch (term->quantityType) {
+            case QuantifierFixedCount:
+                if (term->quantityCount == 1)
+                    generatePatternCharacterOnce(opIndex);
+                else
+                    generatePatternCharacterFixed(opIndex);
+                break;
+            case QuantifierGreedy:
+                generatePatternCharacterGreedy(opIndex);
+                break;
+            case QuantifierNonGreedy:
+                generatePatternCharacterNonGreedy(opIndex);
+                break;
+            }
+            break;
 
-        if (disjunction->m_alternatives.size() == 1) {
-            state.resetAlternative();
-            ASSERT(state.alternativeValid());
-            PatternAlternative* alternative = state.alternative();
-            optimizeAlternative(alternative);
+        case PatternTerm::TypeCharacterClass:
+            switch (term->quantityType) {
+            case QuantifierFixedCount:
+                if (term->quantityCount == 1)
+                    generateCharacterClassOnce(opIndex);
+                else
+                    generateCharacterClassFixed(opIndex);
+                break;
+            case QuantifierGreedy:
+                generateCharacterClassGreedy(opIndex);
+                break;
+            case QuantifierNonGreedy:
+                generateCharacterClassNonGreedy(opIndex);
+                break;
+            }
+            break;
 
-            int countToCheck = alternative->m_minimumSize - preCheckedCount;
-            if (countToCheck) {
-                ASSERT((parenthesesTerm.type == PatternTerm::TypeParentheticalAssertion) || (parenthesesTerm.quantityType != QuantifierFixedCount));
+        case PatternTerm::TypeAssertionBOL:
+            generateAssertionBOL(opIndex);
+            break;
 
-                // FIXME: This is quite horrible.  The call to 'plantJumpToBacktrackIfExists'
-                // will be forced to always trampoline into here, just to decrement the index.
-                // Ick. 
-                Jump skip = jump();
+        case PatternTerm::TypeAssertionEOL:
+            generateAssertionEOL(opIndex);
+            break;
 
-                Label backtrackBegin(this);
-                sub32(Imm32(countToCheck), index);
-                state.addBacktrackJump(jump());
+        case PatternTerm::TypeAssertionWordBoundary:
+            generateAssertionWordBoundary(opIndex);
+            break;
 
-                skip.link(this);
+        case PatternTerm::TypeForwardReference:
+            break;
 
-                state.setBacktrackLabel(backtrackBegin);
+        case PatternTerm::TypeParenthesesSubpattern:
+        case PatternTerm::TypeParentheticalAssertion:
+            ASSERT_NOT_REACHED();
+        case PatternTerm::TypeBackReference:
+            m_shouldFallBack = true;
+            break;
+        }
+    }
+    void backtrackTerm(size_t opIndex)
+    {
+        YarrOp& op = m_ops[opIndex];
+        PatternTerm* term = op.m_term;
 
-                state.jumpToBacktrack(this, jumpIfNoAvailableInput(countToCheck));
-                state.checkedTotal += countToCheck;
+        switch (term->type) {
+        case PatternTerm::TypePatternCharacter:
+            switch (term->quantityType) {
+            case QuantifierFixedCount:
+                if (term->quantityCount == 1)
+                    backtrackPatternCharacterOnce(opIndex);
+                else
+                    backtrackPatternCharacterFixed(opIndex);
+                break;
+            case QuantifierGreedy:
+                backtrackPatternCharacterGreedy(opIndex);
+                break;
+            case QuantifierNonGreedy:
+                backtrackPatternCharacterNonGreedy(opIndex);
+                break;
             }
+            break;
 
-            for (state.resetTerm(); state.termValid(); state.nextTerm())
-                generateTerm(state);
-
-            state.checkedTotal -= countToCheck;
-        } else {
-            JumpList successes;
-            bool propogateBacktrack = false;
-
-            // Save current state's paren jump list for use with each alternative 
-            JumpList* outerJumpList = state.getJumpListToPriorParen();
+        case PatternTerm::TypeCharacterClass:
+            switch (term->quantityType) {
+            case QuantifierFixedCount:
+                if (term->quantityCount == 1)
+                    backtrackCharacterClassOnce(opIndex);
+                else
+                    backtrackCharacterClassFixed(opIndex);
+                break;
+            case QuantifierGreedy:
+                backtrackCharacterClassGreedy(opIndex);
+                break;
+            case QuantifierNonGreedy:
+                backtrackCharacterClassNonGreedy(opIndex);
+                break;
+            }
+            break;
 
-            for (state.resetAlternative(); state.alternativeValid(); state.nextAlternative(), state.setJumpListToPriorParen(outerJumpList)) {
-                PatternAlternative* alternative = state.alternative();
-                optimizeAlternative(alternative);
+        case PatternTerm::TypeAssertionBOL:
+            backtrackAssertionBOL(opIndex);
+            break;
 
-                ASSERT(alternative->m_minimumSize >= preCheckedCount);
-                int countToCheck = alternative->m_minimumSize - preCheckedCount;
-                if (countToCheck) {
-                    state.addBacktrackJump(jumpIfNoAvailableInput(countToCheck));
-                    state.checkedTotal += countToCheck;
-                }
+        case PatternTerm::TypeAssertionEOL:
+            backtrackAssertionEOL(opIndex);
+            break;
 
-                for (state.resetTerm(); state.termValid(); state.nextTerm())
-                    generateTerm(state);
+        case PatternTerm::TypeAssertionWordBoundary:
+            backtrackAssertionWordBoundary(opIndex);
+            break;
 
-                // Matched an alternative.
-                DataLabelPtr dataLabel = storeToFrameWithPatch(alternativeFrameLocation);
+        case PatternTerm::TypeForwardReference:
+            break;
 
-                if (!state.isLastAlternative() || countToCheck)
-                    successes.append(jump());
+        case PatternTerm::TypeParenthesesSubpattern:
+        case PatternTerm::TypeParentheticalAssertion:
+            ASSERT_NOT_REACHED();
+        case PatternTerm::TypeBackReference:
+            m_shouldFallBack = true;
+            break;
+        }
+    }
 
-                // Alternative did not match.
+    void generate()
+    {
+        // Forwards generate the matching code.
+        ASSERT(m_ops.size());
+        size_t opIndex = 0;
 
-                // Do we have a backtrack destination?
-                //    if so, link the data label to it.
-                state.linkDataLabelToBacktrackIfExists(this, dataLabel);
+        do {
+            YarrOp& op = m_ops[opIndex];
+            switch (op.m_op) {
 
-                if (!state.isLastAlternative() || countToCheck)
-                    state.linkAlternativeBacktracks(this);
+            case OpTerm:
+                generateTerm(opIndex);
+                break;
 
-                if (countToCheck) {
-                    sub32(Imm32(countToCheck), index);
-                    state.checkedTotal -= countToCheck;
-                } else if (state.isLastAlternative())
-                    propogateBacktrack = true;
+            // OpBodyAlternativeBegin/Next/End
+            //
+            // These nodes wrap the set of alternatives in the body of the regular expression.
+            // There may be either one or two chains of OpBodyAlternative nodes, one representing
+            // the 'once through' sequence of alternatives (if any exist), and one representing
+            // the repeating alternatives (again, if any exist).
+            //
+            // Upon normal entry to the Begin alternative, we will check that input is available.
+            // Reentry to the Begin alternative will take place after the check has taken place,
+            // and will assume that the input position has already been progressed as appropriate.
+            //
+            // Entry to subsequent Next/End alternatives occurs when the prior alternative has
+            // successfully completed a match - return a success state from JIT code.
+            //
+            // Next alternatives allow for reentry optimized to suit backtracking from its
+            // preceding alternative. It expects the input position to still be set to a position
+            // appropriate to its predecessor, and it will only perform an input check if the
+            // predecessor had a minimum size less than its own.
+            //
+            // In the case 'once through' expressions, the End node will also have a reentry
+            // point to jump to when the last alternative fails. Again, this expects the input
+            // position to still reflect that expected by the prior alternative.
+            case OpBodyAlternativeBegin: {
+                PatternAlternative* alternative = op.m_alternative;
+
+                // Upon entry at the head of the set of alternatives, check if input is available
+                // to run the first alternative. (This progresses the input position).
+                op.m_jumps.append(jumpIfNoAvailableInput(alternative->m_minimumSize));
+                // We will reenter after the check, and assume the input position to have been
+                // set as appropriate to this alternative.
+                op.m_reentry = label();
+
+                m_checked += alternative->m_minimumSize;
+                break;
             }
-            // We fall through to here when the last alternative fails.
-            // Add a backtrack out of here for the parenthese handling code to link up.
-            if (!propogateBacktrack)
-                state.addBacktrackJump(jump());
-
-            // Save address on stack for the parens code to backtrack to, to retry the
-            // next alternative.
-            state.setBackTrackStackOffset(alternativeFrameLocation * sizeof(void*));
-
-            successes.link(this);
-        }
-    }
+            case OpBodyAlternativeNext:
+            case OpBodyAlternativeEnd: {
+                PatternAlternative* priorAlternative = m_ops[op.m_previousOp].m_alternative;
+                PatternAlternative* alternative = op.m_alternative;
+
+                // If we get here, the prior alternative matched - return success.
+                
+                // Adjust the stack pointer to remove the pattern's frame.
+                if (m_pattern.m_body->m_callFrameSize)
+                    addPtr(Imm32(m_pattern.m_body->m_callFrameSize * sizeof(void*)), stackPointerRegister);
+
+                // Load appropriate values into the return register and the first output
+                // slot, and return. In the case of pattern with a fixed size, we will
+                // not have yet set the value in the first 
+                ASSERT(index != returnRegister);
+                if (m_pattern.m_body->m_hasFixedSize) {
+                    move(index, returnRegister);
+                    if (priorAlternative->m_minimumSize)
+                        sub32(Imm32(priorAlternative->m_minimumSize), returnRegister);
+                    store32(returnRegister, output);
+                } else
+                    load32(Address(output), returnRegister);
+                store32(index, Address(output, 4));
+                generateReturn();
+
+                // This is the divide between the tail of the prior alternative, above, and
+                // the head of the subsequent alternative, below.
+
+                if (op.m_op == OpBodyAlternativeNext) {
+                    // This is the reentry point for the Next alternative. We expect any code
+                    // that jumps here to do so with the input position matching that of the
+                    // PRIOR alteranative, and we will only check input availability if we
+                    // need to progress it forwards.
+                    op.m_reentry = label();
+                    if (int delta = alternative->m_minimumSize - priorAlternative->m_minimumSize) {
+                        add32(Imm32(delta), index);
+                        if (delta > 0)
+                            op.m_jumps.append(jumpIfNoAvailableInput());
+                    }
+                } else if (op.m_nextOp == notFound) {
+                    // This is the reentry point for the End of 'once through' alternatives,
+                    // jumped to when the las alternative fails to match.
+                    op.m_reentry = label();
+                    sub32(Imm32(priorAlternative->m_minimumSize), index);
+                }
 
-    void generateParenthesesSingle(TermGenerationState& state)
-    {
-        const RegisterID indexTemporary = regT0;
-        PatternTerm& term = state.term();
-        PatternDisjunction* disjunction = term.parentheses.disjunction;
-        ASSERT(term.quantityCount == 1);
+                if (op.m_op == OpBodyAlternativeNext)
+                    m_checked += alternative->m_minimumSize;
+                m_checked -= priorAlternative->m_minimumSize;
+                break;
+            }
 
-        unsigned preCheckedCount = (term.quantityType == QuantifierFixedCount) ? disjunction->m_minimumSize : 0;
+            // OpSimpleNestedAlternativeBegin/Next/End
+            // OpNestedAlternativeBegin/Next/End
+            //
+            // These nodes are used to handle sets of alternatives that are nested within
+            // subpatterns and parenthetical assertions. The 'simple' forms are used where
+            // we do not need to be able to backtrack back into any alternative other than
+            // the last, the normal forms allow backtracking into any alternative.
+            //
+            // Each Begin/Next node is responsible for planting an input check to ensure
+            // sufficient input is available on entry. Next nodes additionally need to
+            // jump to the end - Next nodes use the End node's m_jumps list to hold this
+            // set of jumps.
+            //
+            // In the non-simple forms, successful alternative matches must store a
+            // 'return address' using a DataLabelPtr, used to store the address to jump
+            // to when backtracking, to get to the code for the appropriate alternative.
+            case OpSimpleNestedAlternativeBegin:
+            case OpNestedAlternativeBegin: {
+                PatternTerm* term = op.m_term;
+                PatternAlternative* alternative = op.m_alternative;
+                PatternDisjunction* disjunction = term->parentheses.disjunction;
+
+                // Calculate how much input we need to check for, and if non-zero check.
+                op.m_checkAdjust = alternative->m_minimumSize;
+                if ((term->quantityType == QuantifierFixedCount) && (term->type != PatternTerm::TypeParentheticalAssertion))
+                    op.m_checkAdjust -= disjunction->m_minimumSize;
+                if (op.m_checkAdjust)
+                    op.m_jumps.append(jumpIfNoAvailableInput(op.m_checkAdjust));
+ 
+                m_checked += op.m_checkAdjust;
+                break;
+            }
+            case OpSimpleNestedAlternativeNext:
+            case OpNestedAlternativeNext: {
+                PatternTerm* term = op.m_term;
+                PatternAlternative* alternative = op.m_alternative;
+                PatternDisjunction* disjunction = term->parentheses.disjunction;
+
+                // In the non-simple case, store a 'return address' so we can backtrack correctly.
+                if (op.m_op == OpNestedAlternativeNext) {
+                    unsigned parenthesesFrameLocation = term->frameLocation;
+                    unsigned alternativeFrameLocation = parenthesesFrameLocation;
+                    if (term->quantityType != QuantifierFixedCount)
+                        alternativeFrameLocation += YarrStackSpaceForBackTrackInfoParenthesesOnce;
+                    op.m_returnAddress = storeToFrameWithPatch(alternativeFrameLocation);
+                }
 
-        unsigned parenthesesFrameLocation = term.frameLocation;
-        unsigned alternativeFrameLocation = parenthesesFrameLocation;
-        if (term.quantityType != QuantifierFixedCount)
-            alternativeFrameLocation += YarrStackSpaceForBackTrackInfoParenthesesOnce;
+                // If we reach here then the last alternative has matched - jump to the
+                // End node, to skip over any further alternatives.
+                //
+                // FIXME: this is logically O(N^2) (though N can be expected to be very
+                // small). We could avoid this either by adding an extra jump to the JIT
+                // data structures, or by making backtracking code that jumps to Next
+                // alternatives are responsible for checking that input is available (if
+                // we didn't need to plant the input checks, then m_jumps would be free).
+                YarrOp* endOp = &m_ops[op.m_nextOp];
+                while (endOp->m_nextOp != notFound) {
+                    ASSERT(endOp->m_op == OpSimpleNestedAlternativeNext || endOp->m_op == OpNestedAlternativeNext);
+                    endOp = &m_ops[endOp->m_nextOp];
+                }
+                ASSERT(endOp->m_op == OpSimpleNestedAlternativeEnd || endOp->m_op == OpNestedAlternativeEnd);
+                endOp->m_jumps.append(jump());
+
+                // This is the entry point for the next alternative.
+                op.m_reentry = label();
+
+                // Calculate how much input we need to check for, and if non-zero check.
+                op.m_checkAdjust = alternative->m_minimumSize;
+                if ((term->quantityType == QuantifierFixedCount) && (term->type != PatternTerm::TypeParentheticalAssertion))
+                    op.m_checkAdjust -= disjunction->m_minimumSize;
+                if (op.m_checkAdjust)
+                    op.m_jumps.append(jumpIfNoAvailableInput(op.m_checkAdjust));
+
+                YarrOp& lastOp = m_ops[op.m_previousOp];
+                m_checked -= lastOp.m_checkAdjust;
+                m_checked += op.m_checkAdjust;
+                break;
+            }
+            case OpSimpleNestedAlternativeEnd:
+            case OpNestedAlternativeEnd: {
+                PatternTerm* term = op.m_term;
+
+                // In the non-simple case, store a 'return address' so we can backtrack correctly.
+                if (op.m_op == OpNestedAlternativeEnd) {
+                    unsigned parenthesesFrameLocation = term->frameLocation;
+                    unsigned alternativeFrameLocation = parenthesesFrameLocation;
+                    if (term->quantityType != QuantifierFixedCount)
+                        alternativeFrameLocation += YarrStackSpaceForBackTrackInfoParenthesesOnce;
+                    op.m_returnAddress = storeToFrameWithPatch(alternativeFrameLocation);
+                }
 
-        // optimized case - no capture & no quantifier can be handled in a light-weight manner.
-        if (!term.capture() && (term.quantityType == QuantifierFixedCount)) {
-            m_expressionState.incrementParenNestingLevel();
+                // If this set of alternatives contains more than one alternative,
+                // then the Next nodes will have planted jumps to the End, and added
+                // them to this node's m_jumps list.
+                op.m_jumps.link(this);
+                op.m_jumps.clear();
 
-            TermGenerationState parenthesesState(disjunction, state.checkedTotal);
+                YarrOp& lastOp = m_ops[op.m_previousOp];
+                m_checked -= lastOp.m_checkAdjust;
+                break;
+            }
 
-            // Use the current state's jump list for the nested parentheses.
-            parenthesesState.setJumpListToPriorParen(state.getJumpListToPriorParen());
+            // OpParenthesesSubpatternOnceBegin/End
+            //
+            // These nodes support (optionally) capturing subpatterns, that have a
+            // quantity count of 1 (this covers fixed once, and ?/?? quantifiers). 
+            case OpParenthesesSubpatternOnceBegin: {
+                PatternTerm* term = op.m_term;
+                unsigned parenthesesFrameLocation = term->frameLocation;
+                const RegisterID indexTemporary = regT0;
+                ASSERT(term->quantityCount == 1);
+
+                // Upon entry to a Greedy quantified set of parenthese store the index.
+                // We'll use this for two purposes:
+                //  - To indicate which iteration we are on of mathing the remainder of
+                //    the expression after the parentheses - the first, including the
+                //    match within the parentheses, or the second having skipped over them.
+                //  - To check for empty matches, which must be rejected.
+                //
+                // At the head of a NonGreedy set of parentheses we'll immediately set the
+                // value on the stack to -1 (indicating a match skipping the subpattern),
+                // and plant a jump to the end. We'll also plant a label to backtrack to
+                // to reenter the subpattern later, with a store to set up index on the
+                // second iteration.
+                //
+                // FIXME: for capturing parens, could use the index in the capture array?
+                if (term->quantityType == QuantifierGreedy)
+                    storeToFrame(index, parenthesesFrameLocation);
+                else if (term->quantityType == QuantifierNonGreedy) {
+                    storeToFrame(TrustedImm32(-1), parenthesesFrameLocation);
+                    op.m_jumps.append(jump());
+                    op.m_reentry = label();
+                    storeToFrame(index, parenthesesFrameLocation);
+                }
 
-            generateParenthesesDisjunction(state.term(), parenthesesState, alternativeFrameLocation);
-            // this expects that any backtracks back out of the parentheses will be in the
-            // parenthesesState's m_backTrackJumps vector, and that if they need backtracking
-            // they will have set an entry point on the parenthesesState's m_backtrackLabel.
-            BacktrackDestination& parenthesesBacktrack = parenthesesState.getBacktrackDestination();
-            BacktrackDestination& stateBacktrack = state.getBacktrackDestination();
+                // If the parenthese are capturing, store the starting index value to the
+                // captures array, offsetting as necessary.
+                //
+                // FIXME: could avoid offsetting this value in JIT code, apply
+                // offsets only afterwards, at the point the results array is
+                // being accessed.
+                if (term->capture()) {
+                    int offsetId = term->parentheses.subpatternId << 1;
+                    int inputOffset = term->inputPosition - m_checked;
+                    if (term->quantityType == QuantifierFixedCount)
+                        inputOffset -= term->parentheses.disjunction->m_minimumSize;
+                    if (inputOffset) {
+                        move(index, indexTemporary);
+                        add32(Imm32(inputOffset), indexTemporary);
+                        store32(indexTemporary, Address(output, offsetId * sizeof(int)));
+                    } else
+                        store32(index, Address(output, offsetId * sizeof(int)));
+                }
+                break;
+            }
+            case OpParenthesesSubpatternOnceEnd: {
+                PatternTerm* term = op.m_term;
+                unsigned parenthesesFrameLocation = term->frameLocation;
+                const RegisterID indexTemporary = regT0;
+                ASSERT(term->quantityCount == 1);
+
+                // For Greedy/NonGreedy quantified parentheses, we must reject zero length
+                // matches. If the minimum size is know to be non-zero we need not check.
+                if (term->quantityType != QuantifierFixedCount && !term->parentheses.disjunction->m_minimumSize)
+                    op.m_jumps.append(branch32(Equal, index, Address(stackPointerRegister, parenthesesFrameLocation * sizeof(void*))));
+
+                // If the parenthese are capturing, store the ending index value to the
+                // captures array, offsetting as necessary.
+                //
+                // FIXME: could avoid offsetting this value in JIT code, apply
+                // offsets only afterwards, at the point the results array is
+                // being accessed.
+                if (term->capture()) {
+                    int offsetId = (term->parentheses.subpatternId << 1) + 1;
+                    int inputOffset = term->inputPosition - m_checked;
+                    if (inputOffset) {
+                        move(index, indexTemporary);
+                        add32(Imm32(inputOffset), indexTemporary);
+                        store32(indexTemporary, Address(output, offsetId * sizeof(int)));
+                    } else
+                        store32(index, Address(output, offsetId * sizeof(int)));
+                }
 
-            state.propagateBacktrackingFrom(this, parenthesesBacktrack);
-            stateBacktrack.propagateBacktrackToLabel(parenthesesBacktrack);
+                // If the parentheses are quantified Greedy then add a label to jump back
+                // to if get a failed match from after the parentheses. For NonGreedy
+                // parentheses, link the jump from before the subpattern to here.
+                if (term->quantityType == QuantifierGreedy)
+                    op.m_reentry = label();
+                else if (term->quantityType == QuantifierNonGreedy) {
+                    YarrOp& beginOp = m_ops[op.m_previousOp];
+                    beginOp.m_jumps.link(this);
+                }
+                break;
+            }
 
-            state.setJumpListToPriorParen(parenthesesState.getJumpListToPriorParen());
+            // OpParenthesesSubpatternTerminalBegin/End
+            case OpParenthesesSubpatternTerminalBegin: {
+                PatternTerm* term = op.m_term;
+                ASSERT(term->quantityType == QuantifierGreedy);
+                ASSERT(term->quantityCount == quantifyInfinite);
+                ASSERT(!term->capture());
 
-            m_expressionState.decrementParenNestingLevel();
-        } else {
-            Jump nonGreedySkipParentheses;
-            Label nonGreedyTryParentheses;
-            if (term.quantityType == QuantifierGreedy)
-                storeToFrame(index, parenthesesFrameLocation);
-            else if (term.quantityType == QuantifierNonGreedy) {
-                storeToFrame(TrustedImm32(-1), parenthesesFrameLocation);
-                nonGreedySkipParentheses = jump();
-                nonGreedyTryParentheses = label();
-                storeToFrame(index, parenthesesFrameLocation);
-            }
+                // Upon entry set a label to loop back to.
+                op.m_reentry = label();
 
-            // store the match start index
-            if (term.capture()) {
-                int inputOffset = state.inputOffset() - preCheckedCount;
-                if (inputOffset) {
-                    move(index, indexTemporary);
-                    add32(Imm32(inputOffset), indexTemporary);
-                    store32(indexTemporary, Address(output, (term.parentheses.subpatternId << 1) * sizeof(int)));
-                } else
-                    store32(index, Address(output, (term.parentheses.subpatternId << 1) * sizeof(int)));
+                // Store the start index of the current match; we need to reject zero
+                // length matches.
+                storeToFrame(index, term->frameLocation);
+                break;
             }
+            case OpParenthesesSubpatternTerminalEnd: {
+                PatternTerm* term = op.m_term;
 
-            ParenthesesTail* parenthesesTail = m_expressionState.addParenthesesTail(term, state.getJumpListToPriorParen());
+                // Check for zero length matches - if the match is non-zero, then we
+                // can accept it & loop back up to the head of the subpattern.
+                YarrOp& beginOp = m_ops[op.m_previousOp];
+                branch32(NotEqual, index, Address(stackPointerRegister, term->frameLocation * sizeof(void*)), beginOp.m_reentry);
 
-            m_expressionState.incrementParenNestingLevel();
+                // Reject the match - backtrack back into the subpattern.
+                op.m_jumps.append(jump());
 
-            TermGenerationState parenthesesState(disjunction, state.checkedTotal);
+                // This is the entry point to jump to when we stop matching - we will
+                // do so once the subpattern cannot match any more.
+                op.m_reentry = label();
+                break;
+            }
 
-            // Save the parenthesesTail for backtracking from nested parens to this one.
-            parenthesesState.setJumpListToPriorParen(&parenthesesTail->m_withinBacktrackJumps);
+            // OpParentheticalAssertionBegin/End
+            case OpParentheticalAssertionBegin: {
+                PatternTerm* term = op.m_term;
 
-            // generate the body of the parentheses
-            generateParenthesesDisjunction(state.term(), parenthesesState, alternativeFrameLocation);
+                // Store the current index - assertions should not update index, so
+                // we will need to restore it upon a successful match.
+                unsigned parenthesesFrameLocation = term->frameLocation;
+                storeToFrame(index, parenthesesFrameLocation);
 
-            // For non-fixed counts, backtrack if we didn't match anything.
-            if (term.quantityType != QuantifierFixedCount)
-                parenthesesTail->addAfterParenJump(branch32(Equal, index, Address(stackPointerRegister, (parenthesesFrameLocation * sizeof(void*)))));
+                // Check 
+                op.m_checkAdjust = m_checked - term->inputPosition;
+                if (op.m_checkAdjust)
+                    sub32(Imm32(op.m_checkAdjust), index);
 
-            // store the match end index
-            if (term.capture()) {
-                int inputOffset = state.inputOffset();
-                if (inputOffset) {
-                    move(index, indexTemporary);
-                    add32(Imm32(state.inputOffset()), indexTemporary);
-                    store32(indexTemporary, Address(output, ((term.parentheses.subpatternId << 1) + 1) * sizeof(int)));
-                } else
-                    store32(index, Address(output, ((term.parentheses.subpatternId << 1) + 1) * sizeof(int)));
+                m_checked -= op.m_checkAdjust;
+                break;
             }
+            case OpParentheticalAssertionEnd: {
+                PatternTerm* term = op.m_term;
+
+                // Restore the input index value.
+                unsigned parenthesesFrameLocation = term->frameLocation;
+                loadFromFrame(parenthesesFrameLocation, index);
+
+                // If inverted, a successful match of the assertion must be treated
+                // as a failure, so jump to backtracking.
+                if (term->invert()) {
+                    op.m_jumps.append(jump());
+                    op.m_reentry = label();
+                }
 
-            m_expressionState.decrementParenNestingLevel();
-
-            parenthesesTail->processBacktracks(this, state, parenthesesState, nonGreedyTryParentheses, label());
+                YarrOp& lastOp = m_ops[op.m_previousOp];
+                m_checked += lastOp.m_checkAdjust;
+                break;
+            }
 
-            state.setJumpListToPriorParen(&parenthesesTail->m_afterBacktrackJumps);
-            
-            parenthesesState.getBacktrackDestination().clear();
+            case OpMatchFailed:
+                if (m_pattern.m_body->m_callFrameSize)
+                    addPtr(Imm32(m_pattern.m_body->m_callFrameSize * sizeof(void*)), stackPointerRegister);
+                move(TrustedImm32(-1), returnRegister);
+                generateReturn();
+                break;
+            }
 
-            if (term.quantityType == QuantifierNonGreedy)
-                nonGreedySkipParentheses.link(this);
-        }
+            ++opIndex;
+        } while (opIndex < m_ops.size());
     }
 
-    void generateParenthesesGreedyNoBacktrack(TermGenerationState& state)
+    void backtrack()
     {
-        PatternTerm& parenthesesTerm = state.term();
-        PatternDisjunction* disjunction = parenthesesTerm.parentheses.disjunction;
-        ASSERT(parenthesesTerm.type == PatternTerm::TypeParenthesesSubpattern);
-        ASSERT(parenthesesTerm.quantityCount != 1); // Handled by generateParenthesesSingle.
+        // Backwards generate the backtracking code.
+        size_t opIndex = m_ops.size();
+        ASSERT(opIndex);
 
-        TermGenerationState parenthesesState(disjunction, state.checkedTotal);
+        do {
+            --opIndex;
+            YarrOp& op = m_ops[opIndex];
+            switch (op.m_op) {
 
-        Label matchAgain(this);
+            case OpTerm:
+                backtrackTerm(opIndex);
+                break;
 
-        storeToFrame(index, parenthesesTerm.frameLocation); // Save the current index to check for zero len matches later.
+            // OpBodyAlternativeBegin/Next/End
+            //
+            // For each Begin/Next node representing an alternative, we need to decide what to do
+            // in two circumstances:
+            //  - If we backtrack back into this node, from within the alternative.
+            //  - If the input check at the head of the alternative fails (if this exists).
+            //
+            // We treat these two cases differently since in the former case we have slightly
+            // more information - since we are backtracking out of a prior alternative we know
+            // that at least enough input was available to run it. For example, given the regular
+            // expression /a|b/, if we backtrack out of the first alternative (a failed pattern
+            // character match of 'a'), then we need not perform an additional input availability
+            // check before running the second alternative.
+            //
+            // Backtracking required differs for the last alternative, which in the case of the
+            // repeating set of alternatives must loop. The code generated for the last alternative
+            // will also be used to handle all input check failures from any prior alternatives -
+            // these require similar functionality, in seeking the next available alternative for
+            // which there is sufficient input.
+            //
+            // Since backtracking of all other alternatives simply requires us to link backtracks
+            // to the reentry point for the subsequent alternative, we will only be generating any
+            // code when backtracking the last alternative.
+            case OpBodyAlternativeBegin:
+            case OpBodyAlternativeNext: {
+                PatternAlternative* alternative = op.m_alternative;
+
+                if (op.m_op == OpBodyAlternativeNext) {
+                    PatternAlternative* priorAlternative = m_ops[op.m_previousOp].m_alternative;
+                    m_checked += priorAlternative->m_minimumSize;
+                }
+                m_checked -= alternative->m_minimumSize;
 
-        for (parenthesesState.resetAlternative(); parenthesesState.alternativeValid(); parenthesesState.nextAlternative()) {
+                // Is this the last alternative? If not, then if we backtrack to this point we just
+                // need to jump to try to match the next alternative.
+                if (m_ops[op.m_nextOp].m_op != OpBodyAlternativeEnd) {
+                    m_backtrackingState.linkTo(m_ops[op.m_nextOp].m_reentry, this);
+                    break;
+                }
+                YarrOp& endOp = m_ops[op.m_nextOp];
 
-            PatternAlternative* alternative = parenthesesState.alternative();
-            optimizeAlternative(alternative);
+                YarrOp* beginOp = &op;
+                while (beginOp->m_op != OpBodyAlternativeBegin) {
+                    ASSERT(beginOp->m_op == OpBodyAlternativeNext);
+                    beginOp = &m_ops[beginOp->m_previousOp];
+                }
 
-            int countToCheck = alternative->m_minimumSize;
-            if (countToCheck) {
-                parenthesesState.addBacktrackJump(jumpIfNoAvailableInput(countToCheck));
-                parenthesesState.checkedTotal += countToCheck;
-            }
+                bool onceThrough = endOp.m_nextOp == notFound;
+
+                // First, generate code to handle cases where we backtrack out of an attempted match
+                // of the last alternative. If this is a 'once through' set of alternatives then we
+                // have nothing to do - link this straight through to the End.
+                if (onceThrough)
+                    m_backtrackingState.linkTo(endOp.m_reentry, this);
+                else {
+                    // Okay, we're going to need to loop. Calculate the delta between where the input
+                    // position was, and where we want it to be allowing for the fact that we need to
+                    // increment by 1. E.g. for the regexp /a|x/ we need to increment the position by
+                    // 1 between loop iterations, but for /abcd|xyz/ we need to increment by two when
+                    // looping from the last alternative to the first, for /a|xyz/ we need to decrement
+                    // by 1, and for /a|xy/ we don't need to move the input position at all.
+                    int deltaLastAlternativeToFirstAlternativePlusOne = (beginOp->m_alternative->m_minimumSize - alternative->m_minimumSize) + 1;
+
+                    // If we don't need to move the input poistion, and the pattern has a fixed size
+                    // (in which case we omit the store of the start index until the pattern has matched)
+                    // then we can just link the backtrack out of the last alternative straight to the
+                    // head of the first alternative.
+                    if (!deltaLastAlternativeToFirstAlternativePlusOne && m_pattern.m_body->m_hasFixedSize)
+                        m_backtrackingState.linkTo(beginOp->m_reentry, this);
+                    else {
+                        // We need to generate a trampoline of code to execute before looping back
+                        // around to the first alternative.
+                        m_backtrackingState.link(this);
+
+                        // If the pattern size is not fixed, then store the start index, for use if we match.
+                        if (!m_pattern.m_body->m_hasFixedSize) {
+                            if (alternative->m_minimumSize == 1)
+                                store32(index, Address(output));
+                            else {
+                                move(index, regT0);
+                                if (alternative->m_minimumSize)
+                                    sub32(Imm32(alternative->m_minimumSize - 1), regT0);
+                                else
+                                    add32(Imm32(1), regT0);
+                                store32(regT0, Address(output));
+                            }
+                        }
+
+                        if (deltaLastAlternativeToFirstAlternativePlusOne)
+                            add32(Imm32(deltaLastAlternativeToFirstAlternativePlusOne), index);
+
+                        // Loop. Since this code is only reached when we backtrack out of the last
+                        // alternative (and NOT linked to from the input check upon entry to the
+                        // last alternative) we know that there must be at least enough input as
+                        // required by the last alternative. As such, we only need to check if the
+                        // first will require more to run - if the same or less is required we can
+                        // unconditionally jump.
+                        if (deltaLastAlternativeToFirstAlternativePlusOne > 0)
+                            checkInput().linkTo(beginOp->m_reentry, this);
+                        else
+                            jump(beginOp->m_reentry);
+                    }
+                }
 
-            for (parenthesesState.resetTerm(); parenthesesState.termValid(); parenthesesState.nextTerm())
-                generateTerm(parenthesesState);
+                // We can reach this point in the code in two ways:
+                //  - Fallthrough from the code above (a repeating alternative backtracked out of its
+                //    last alternative, and did not have sufficent input to run the first).
+                //  - We will loop back up to the following label when a releating alternative loops,
+                //    following a failed input check.
+                //
+                // Either way, we have just failed the input check for the first alternative.
+                Label firstInputCheckFailed(this);
+
+                // Generate code to handle input check failures from alternatives except the last.
+                // prevOp is the alternative we're handling a bail out from (initially Begin), and
+                // nextOp is the alternative we will be attempting to reenter into.
+                // 
+                // We will link input check failures from the forwards matching path back to the code
+                // that can handle them.
+                YarrOp* prevOp = beginOp;
+                YarrOp* nextOp = &m_ops[beginOp->m_nextOp];
+                while (nextOp->m_op != OpBodyAlternativeEnd) {
+                    prevOp->m_jumps.link(this);
+
+                    int delta = nextOp->m_alternative->m_minimumSize - prevOp->m_alternative->m_minimumSize;
+                    if (delta)
+                        add32(Imm32(delta), index);
+
+                    // We only get here if an input check fails, it is only worth checking again
+                    // if the next alternative has a minimum size less than the last.
+                    if (delta < 0) {
+                        // FIXME: if we added an extra label to YarrOp, we could avoid needing to
+                        // subtract delta back out, and reduce this code. Should performance test
+                        // the benefit of this.
+                        Jump fail = jumpIfNoAvailableInput();
+                        sub32(Imm32(delta), index);
+                        jump(nextOp->m_reentry);
+                        fail.link(this);
+                    }
+                    prevOp = nextOp;
+                    nextOp = &m_ops[nextOp->m_nextOp];
+                }
 
-            // If we get here, we matched! If the index advanced then try to match more since limit isn't supported yet.
-            branch32(NotEqual, index, Address(stackPointerRegister, (parenthesesTerm.frameLocation * sizeof(void*))), matchAgain);
+                // We fall through to here if there is insufficient input to run the last alternative.
 
-            // If we get here we matched, but we matched "" - cannot accept this alternative as is, so either backtrack,
-            // or fall through to try the next alternative if no backtrack is available.
-            parenthesesState.plantJumpToBacktrackIfExists(this);
+                // If there is insufficient input to run the last alternative, then for 'once through'
+                // alternatives we are done - just jump back up into the forwards matching path at the End.
+                if (onceThrough) {
+                    op.m_jumps.linkTo(endOp.m_reentry, this);
+                    jump(endOp.m_reentry);
+                    break;
+                }
 
-            parenthesesState.linkAlternativeBacktracks(this);
+                // For repeating alternatives, link any input check failure from the last alternative to
+                // this point.
+                op.m_jumps.link(this);
 
-            // We get here if the alternative fails to match - fall through to the next iteration, or out of the loop.
+                bool needsToUpdateMatchStart = !m_pattern.m_body->m_hasFixedSize;
 
-            if (countToCheck) {
-                sub32(Imm32(countToCheck), index);
-                parenthesesState.checkedTotal -= countToCheck;
-            }
-        }
+                // Check for cases where input position is already incremented by 1 for the last
+                // alternative (this is particularly useful where the minimum size of the body
+                // disjunction is 0, e.g. /a*|b/).
+                if (needsToUpdateMatchStart && alternative->m_minimumSize == 1) {
+                    // index is already incremented by 1, so just store it now!
+                    store32(index, Address(output));
+                    needsToUpdateMatchStart = false;
+                }
 
-        // If the last alternative falls through to here, we have a failed match...
-        // Which means that we match whatever we have matched up to this point (even if nothing).
-    }
+                // Check whether there is sufficient input to loop. Increment the input position by
+                // one, and check. Also add in the minimum disjunction size before checking - there
+                // is no point in looping if we're just going to fail all the input checks around
+                // the next iteration.
+                int deltaLastAlternativeToBodyMinimumPlusOne = (m_pattern.m_body->m_minimumSize + 1) - alternative->m_minimumSize;
+                if (deltaLastAlternativeToBodyMinimumPlusOne)
+                    add32(Imm32(deltaLastAlternativeToBodyMinimumPlusOne), index);
+                Jump matchFailed = jumpIfNoAvailableInput();
+
+                if (needsToUpdateMatchStart) {
+                    if (!m_pattern.m_body->m_minimumSize)
+                        store32(index, Address(output));
+                    else {
+                        move(index, regT0);
+                        sub32(Imm32(m_pattern.m_body->m_minimumSize), regT0);
+                        store32(regT0, Address(output));
+                    }
+                }
 
-    void generateParentheticalAssertion(TermGenerationState& state)
-    {
-        PatternTerm& term = state.term();
-        PatternDisjunction* disjunction = term.parentheses.disjunction;
-        ASSERT(term.quantityCount == 1);
-        ASSERT(term.quantityType == QuantifierFixedCount);
+                // Calculate how much more input the first alternative requires than the minimum
+                // for the body as a whole. If no more is needed then we dont need an additional
+                // input check here - jump straight back up to the start of the first alternative.
+                int deltaBodyMinimumToFirstAlternative = beginOp->m_alternative->m_minimumSize - m_pattern.m_body->m_minimumSize;
+                if (!deltaBodyMinimumToFirstAlternative)
+                    jump(beginOp->m_reentry);
+                else {
+                    add32(Imm32(deltaBodyMinimumToFirstAlternative), index);
+                    checkInput().linkTo(beginOp->m_reentry, this);
+                    jump(firstInputCheckFailed);
+                }
 
-        unsigned parenthesesFrameLocation = term.frameLocation;
-        unsigned alternativeFrameLocation = parenthesesFrameLocation + YarrStackSpaceForBackTrackInfoParentheticalAssertion;
+                // We jump to here if we iterate to the point that there is insufficient input to
+                // run any matches, and need to return a failure state from JIT code.
+                matchFailed.link(this);
 
-        int countCheckedAfterAssertion = state.checkedTotal - term.inputPosition;
+                if (m_pattern.m_body->m_callFrameSize)
+                    addPtr(Imm32(m_pattern.m_body->m_callFrameSize * sizeof(void*)), stackPointerRegister);
+                move(TrustedImm32(-1), returnRegister);
+                generateReturn();
+                break;
+            }
+            case OpBodyAlternativeEnd: {
+                // We should never backtrack back into a body disjunction.
+                ASSERT(m_backtrackingState.isEmpty());
 
-        if (term.invert()) {
-            // Inverted case
-            storeToFrame(index, parenthesesFrameLocation);
+                PatternAlternative* priorAlternative = m_ops[op.m_previousOp].m_alternative;
+                m_checked += priorAlternative->m_minimumSize;
+                break;
+            }
 
-            state.checkedTotal -= countCheckedAfterAssertion;
-            if (countCheckedAfterAssertion)
-                sub32(Imm32(countCheckedAfterAssertion), index);
+            // OpSimpleNestedAlternativeBegin/Next/End
+            // OpNestedAlternativeBegin/Next/End
+            //
+            // Generate code for when we backtrack back out of an alternative into
+            // a Begin or Next node, or when the entry input count check fails. If
+            // there are more alternatives we need to jump to the next alternative,
+            // if not we backtrack back out of the current set of parentheses.
+            //
+            // In the case of non-simple nested assertions we need to also link the
+            // 'return address' appropriately to backtrack back out into the correct
+            // alternative.
+            case OpSimpleNestedAlternativeBegin:
+            case OpSimpleNestedAlternativeNext:
+            case OpNestedAlternativeBegin:
+            case OpNestedAlternativeNext: {
+                YarrOp& nextOp = m_ops[op.m_nextOp];
+                bool isBegin = op.m_previousOp == notFound;
+                bool isLastAlternative = nextOp.m_nextOp == notFound;
+                ASSERT(isBegin == (op.m_op == OpSimpleNestedAlternativeBegin || op.m_op == OpNestedAlternativeBegin));
+                ASSERT(isLastAlternative == (nextOp.m_op == OpSimpleNestedAlternativeEnd || nextOp.m_op == OpNestedAlternativeEnd));
+
+                // Treat an input check failure the same as a failed match.
+                m_backtrackingState.append(op.m_jumps);
+
+                // Set the backtracks to jump to the appropriate place. We may need
+                // to link the backtracks in one of three different way depending on
+                // the type of alternative we are dealing with:
+                //  - A single alternative, with no simplings.
+                //  - The last alternative of a set of two or more.
+                //  - An alternative other than the last of a set of two or more.
+                //
+                // In the case of a single alternative on its own, we don't need to
+                // jump anywhere - if the alternative fails to match we can just
+                // continue to backtrack out of the parentheses without jumping.
+                //
+                // In the case of the last alternative in a set of more than one, we
+                // need to jump to return back out to the beginning. We'll do so by
+                // adding a jump to the End node's m_jumps list, and linking this
+                // when we come to generate the Begin node. For alternatives other
+                // than the last, we need to jump to the next alternative.
+                //
+                // If the alternative had adjusted the input position we must link
+                // backtracking to here, correct, and then jump on. If not we can
+                // link the backtracks directly to their destination.
+                if (op.m_checkAdjust) {
+                    // Handle the cases where we need to link the backtracks here.
+                    m_backtrackingState.link(this);
+                    sub32(Imm32(op.m_checkAdjust), index);
+                    if (!isLastAlternative) {
+                        // An alternative that is not the last should jump to its successor.
+                        jump(nextOp.m_reentry);
+                    } else if (!isBegin) {
+                        // The last of more than one alternatives must jump back to the begnning.
+                        nextOp.m_jumps.append(jump());
+                    } else {
+                        // A single alternative on its own can fall through.
+                        m_backtrackingState.fallthrough();
+                    }
+                } else {
+                    // Handle the cases where we can link the backtracks directly to their destinations.
+                    if (!isLastAlternative) {
+                        // An alternative that is not the last should jump to its successor.
+                        m_backtrackingState.linkTo(nextOp.m_reentry, this);
+                    } else if (!isBegin) {
+                        // The last of more than one alternatives must jump back to the begnning.
+                        m_backtrackingState.takeBacktracksToJumpList(nextOp.m_jumps, this);
+                    }
+                    // In the case of a single alternative on its own do nothing - it can fall through.
+                }
 
-            TermGenerationState parenthesesState(disjunction, state.checkedTotal);
-            generateParenthesesDisjunction(state.term(), parenthesesState, alternativeFrameLocation);
-            // Success! - which means - Fail!
-            loadFromFrame(parenthesesFrameLocation, index);
-            state.jumpToBacktrack(this);
+                // At this point we've handled the backtracking back into this node.
+                // Now link any backtracks that need to jump to here.
+
+                // For non-simple alternatives, link the alternative's 'return address'
+                // so that we backtrack back out into the previous alternative.
+                if (op.m_op == OpNestedAlternativeNext)
+                    m_backtrackingState.append(op.m_returnAddress);
+
+                // If there is more than one alternative, then the last alternative will
+                // have planted a jump to be linked to the end. This jump was added to the
+                // End node's m_jumps list. If we are back at the beginning, link it here.
+                if (isBegin) {
+                    YarrOp* endOp = &m_ops[op.m_nextOp];
+                    while (endOp->m_nextOp != notFound) {
+                        ASSERT(endOp->m_op == OpSimpleNestedAlternativeNext || endOp->m_op == OpNestedAlternativeNext);
+                        endOp = &m_ops[endOp->m_nextOp];
+                    }
+                    ASSERT(endOp->m_op == OpSimpleNestedAlternativeEnd || endOp->m_op == OpNestedAlternativeEnd);
+                    m_backtrackingState.append(endOp->m_jumps);
+                }
 
-            // And fail means success.
-            parenthesesState.linkAlternativeBacktracks(this);
+                if (!isBegin) {
+                    YarrOp& lastOp = m_ops[op.m_previousOp];
+                    m_checked += lastOp.m_checkAdjust;
+                }
+                m_checked -= op.m_checkAdjust;
+                break;
+            }
+            case OpSimpleNestedAlternativeEnd:
+            case OpNestedAlternativeEnd: {
+                PatternTerm* term = op.m_term;
+
+                // If we backtrack into the end of a simple subpattern do nothing;
+                // just continue through into the last alternative. If we backtrack
+                // into the end of a non-simple set of alterntives we need to jump
+                // to the backtracking return address set up during generation.
+                if (op.m_op == OpNestedAlternativeEnd) {
+                    m_backtrackingState.link(this);
+
+                    // Plant a jump to the return address.
+                    unsigned parenthesesFrameLocation = term->frameLocation;
+                    unsigned alternativeFrameLocation = parenthesesFrameLocation;
+                    if (term->quantityType != QuantifierFixedCount)
+                        alternativeFrameLocation += YarrStackSpaceForBackTrackInfoParenthesesOnce;
+                    loadFromFrameAndJump(alternativeFrameLocation);
+
+                    // Link the DataLabelPtr associated with the end of the last
+                    // alternative to this point.
+                    m_backtrackingState.append(op.m_returnAddress);
+                }
 
-            loadFromFrame(parenthesesFrameLocation, index);
+                YarrOp& lastOp = m_ops[op.m_previousOp];
+                m_checked += lastOp.m_checkAdjust;
+                break;
+            }
 
-            state.checkedTotal += countCheckedAfterAssertion;
-        } else {
-            // Normal case
-            storeToFrame(index, parenthesesFrameLocation);
+            // OpParenthesesSubpatternOnceBegin/End
+            //
+            // When we are backtracking back out of a capturing subpattern we need
+            // to clear the start index in the matches output array, to record that
+            // this subpattern has not been captured.
+            //
+            // When backtracking back out of a Greedy quantified subpattern we need
+            // to catch this, and try running the remainder of the alternative after
+            // the subpattern again, skipping the parentheses.
+            //
+            // Upon backtracking back into a quantified set of parentheses we need to
+            // check whether we were currently skipping the subpattern. If not, we
+            // can backtrack into them, if we were we need to either backtrack back
+            // out of the start of the parentheses, or jump back to the forwards
+            // matching start, depending of whether the match is Greedy or NonGreedy.
+            case OpParenthesesSubpatternOnceBegin: {
+                PatternTerm* term = op.m_term;
+                ASSERT(term->quantityCount == 1);
+
+                // We only need to backtrack to thispoint if capturing or greedy.
+                if (term->capture() || term->quantityType == QuantifierGreedy) {
+                    m_backtrackingState.link(this);
+
+                    // If capturing, clear the capture (we only need to reset start).
+                    if (term->capture())
+                        store32(TrustedImm32(-1), Address(output, (term->parentheses.subpatternId << 1) * sizeof(int)));
+
+                    // If Greedy, jump to the end.
+                    if (term->quantityType == QuantifierGreedy) {
+                        // Clear the flag in the stackframe indicating we ran through the subpattern.
+                        unsigned parenthesesFrameLocation = term->frameLocation;
+                        storeToFrame(TrustedImm32(-1), parenthesesFrameLocation);
+                        // Jump to after the parentheses, skipping the subpattern.
+                        jump(m_ops[op.m_nextOp].m_reentry);
+                        // A backtrack from after the parentheses, when skipping the subpattern,
+                        // will jump back to here.
+                        op.m_jumps.link(this);
+                    }
 
-            state.checkedTotal -= countCheckedAfterAssertion;
-            if (countCheckedAfterAssertion)
-                sub32(Imm32(countCheckedAfterAssertion), index);
+                    m_backtrackingState.fallthrough();
+                }
+                break;
+            }
+            case OpParenthesesSubpatternOnceEnd: {
+                PatternTerm* term = op.m_term;
+
+                if (term->quantityType != QuantifierFixedCount) {
+                    m_backtrackingState.link(this);
+
+                    // Check whether we should backtrack back into the parentheses, or if we
+                    // are currently in a state where we had skipped over the subpattern
+                    // (in which case the flag value on the stack will be -1).
+                    unsigned parenthesesFrameLocation = term->frameLocation;
+                    Jump hadSkipped = branch32(Equal, Address(stackPointerRegister, parenthesesFrameLocation * sizeof(void*)), TrustedImm32(-1));
+
+                    if (term->quantityType == QuantifierGreedy) {
+                        // For Greedy parentheses, we skip after having already tried going
+                        // through the subpattern, so if we get here we're done.
+                        YarrOp& beginOp = m_ops[op.m_previousOp];
+                        beginOp.m_jumps.append(hadSkipped);
+                    } else {
+                        // For NonGreedy parentheses, we try skipping the subpattern first,
+                        // so if we get here we need to try running through the subpattern
+                        // next. Jump back to the start of the parentheses in the forwards
+                        // matching path.
+                        ASSERT(term->quantityType == QuantifierNonGreedy);
+                        YarrOp& beginOp = m_ops[op.m_previousOp];
+                        hadSkipped.linkTo(beginOp.m_reentry, this);
+                    }
 
-            TermGenerationState parenthesesState(disjunction, state.checkedTotal);
-            generateParenthesesDisjunction(state.term(), parenthesesState, alternativeFrameLocation);
-            // Success! - which means - Success!
-            loadFromFrame(parenthesesFrameLocation, index);
-            Jump success = jump();
+                    m_backtrackingState.fallthrough();
+                }
 
-            parenthesesState.linkAlternativeBacktracks(this);
+                m_backtrackingState.append(op.m_jumps);
+                break;
+            }
 
-            loadFromFrame(parenthesesFrameLocation, index);
-            state.jumpToBacktrack(this);
+            // OpParenthesesSubpatternTerminalBegin/End
+            //
+            // Terminal subpatterns will always match - there is nothing after them to
+            // force a backtrack, and they have a minimum count of 0, and as such will
+            // always produce an acceptable result.
+            case OpParenthesesSubpatternTerminalBegin: {
+                // We will backtrack to this point once the subpattern cannot match any
+                // more. Since no match is accepted as a successful match (we are Greedy
+                // quantified with a minimum of zero) jump back to the forwards matching
+                // path at the end.
+                YarrOp& endOp = m_ops[op.m_nextOp];
+                m_backtrackingState.linkTo(endOp.m_reentry, this);
+                break;
+            }
+            case OpParenthesesSubpatternTerminalEnd:
+                // We should never be backtracking to here (hence the 'terminal' in the name).
+                ASSERT(m_backtrackingState.isEmpty());
+                m_backtrackingState.append(op.m_jumps);
+                break;
 
-            success.link(this);
+            // OpParentheticalAssertionBegin/End
+            case OpParentheticalAssertionBegin: {
+                PatternTerm* term = op.m_term;
+                YarrOp& endOp = m_ops[op.m_nextOp];
 
-            state.checkedTotal += countCheckedAfterAssertion;
-        }
-    }
+                // We need to handle the backtracks upon backtracking back out
+                // of a parenthetical assertion if either we need to correct
+                // the input index, or the assertion was inverted.
+                if (op.m_checkAdjust || term->invert()) {
+                     m_backtrackingState.link(this);
 
-    void generateTerm(TermGenerationState& state)
-    {
-        PatternTerm& term = state.term();
+                    if (op.m_checkAdjust)
+                        add32(Imm32(op.m_checkAdjust), index);
 
-        switch (term.type) {
-        case PatternTerm::TypeAssertionBOL:
-            generateAssertionBOL(state);
-            break;
+                    // In an inverted assertion failure to match the subpattern
+                    // is treated as a successful match - jump to the end of the
+                    // subpattern. We already have adjusted the input position
+                    // back to that before the assertion, which is correct.
+                    if (term->invert())
+                        jump(endOp.m_reentry);
 
-        case PatternTerm::TypeAssertionEOL:
-            generateAssertionEOL(state);
-            break;
+                    m_backtrackingState.fallthrough();
+                }
 
-        case PatternTerm::TypeAssertionWordBoundary:
-            generateAssertionWordBoundary(state);
-            break;
+                // The End node's jump list will contain any backtracks into
+                // the end of the assertion. Also, if inverted, we will have
+                // added the failure caused by a successful match to this.
+                m_backtrackingState.append(endOp.m_jumps);
 
-        case PatternTerm::TypePatternCharacter:
-            switch (term.quantityType) {
-            case QuantifierFixedCount:
-                if (term.quantityCount == 1) {
-                    if (state.isSinglePatternCharacterLookaheadTerm() && (state.lookaheadTerm().inputPosition == (term.inputPosition + 1))) {
-                        generatePatternCharacterPair(state);
-                        state.nextTerm();
-                    } else
-                        generatePatternCharacterSingle(state);
-                } else
-                    generatePatternCharacterFixed(state);
-                break;
-            case QuantifierGreedy:
-                generatePatternCharacterGreedy(state);
-                break;
-            case QuantifierNonGreedy:
-                generatePatternCharacterNonGreedy(state);
+                m_checked += op.m_checkAdjust;
                 break;
             }
-            break;
+            case OpParentheticalAssertionEnd: {
+                // FIXME: We should really be clearing any nested subpattern
+                // matches on bailing out from after the pattern. Firefox has
+                // this bug too (presumably because they use YARR!)
 
-        case PatternTerm::TypeCharacterClass:
-            switch (term.quantityType) {
-            case QuantifierFixedCount:
-                if (term.quantityCount == 1)
-                    generateCharacterClassSingle(state);
-                else
-                    generateCharacterClassFixed(state);
-                break;
-            case QuantifierGreedy:
-                generateCharacterClassGreedy(state);
-                break;
-            case QuantifierNonGreedy:
-                generateCharacterClassNonGreedy(state);
+                // Never backtrack into an assertion; later failures bail to before the begin.
+                m_backtrackingState.takeBacktracksToJumpList(op.m_jumps, this);
+
+                YarrOp& lastOp = m_ops[op.m_previousOp];
+                m_checked -= lastOp.m_checkAdjust;
                 break;
             }
-            break;
 
-        case PatternTerm::TypeBackReference:
-            m_shouldFallBack = true;
-            break;
-
-        case PatternTerm::TypeForwardReference:
-            break;
-
-        case PatternTerm::TypeParenthesesSubpattern:
-            if (term.quantityCount == 1 && !term.parentheses.isCopy)
-                generateParenthesesSingle(state);
-            else if (term.parentheses.isTerminal)
-                generateParenthesesGreedyNoBacktrack(state);
-            else
-                m_shouldFallBack = true;
-            break;
+            case OpMatchFailed:
+                break;
+            }
 
-        case PatternTerm::TypeParentheticalAssertion:
-            generateParentheticalAssertion(state);
-            break;
-        }
+        } while (opIndex);
     }
 
-    void generateDisjunction(PatternDisjunction* disjunction)
+    // Compilation methods:
+    // ====================
+
+    // opCompileParenthesesSubpattern
+    // Emits ops for a subpattern (set of parentheses). These consist
+    // of a set of alternatives wrapped in an outer set of nodes for
+    // the parentheses.
+    // Supported types of parentheses are 'Once' (quantityCount == 1)
+    // and 'Terminal' (non-capturing parentheses quantified as greedy
+    // and infinite).
+    // Alternatives will use the 'Simple' set of ops if either the
+    // subpattern is terminal (in which case we will never need to
+    // backtrack), or if the subpattern only contains one alternative.
+    void opCompileParenthesesSubpattern(PatternTerm* term)
     {
-        TermGenerationState state(disjunction, 0);
-        state.resetAlternative();
-
-        // check availability for the next alternative
-        int countCheckedForCurrentAlternative = 0;
-        int countToCheckForFirstAlternative = 0;
-        bool hasShorterAlternatives = false;
-        bool setRepeatAlternativeLabels = false;
-        JumpList notEnoughInputForPreviousAlternative;
-        Label firstAlternative;
-        Label firstAlternativeInputChecked;
-
-        // The label 'firstAlternative' is used to plant a check to see if there is 
-        // sufficient input available to run the first repeating alternative.
-        // The label 'firstAlternativeInputChecked' will jump directly to matching 
-        // the first repeating alternative having skipped this check.
-
-        if (state.alternativeValid()) {
-            PatternAlternative* alternative = state.alternative();
-            if (!alternative->onceThrough()) {
-                firstAlternative = Label(this);
-                setRepeatAlternativeLabels = true;
+        YarrOpCode parenthesesBeginOpCode;
+        YarrOpCode parenthesesEndOpCode;
+        YarrOpCode alternativeBeginOpCode = OpSimpleNestedAlternativeBegin;
+        YarrOpCode alternativeNextOpCode = OpSimpleNestedAlternativeNext;
+        YarrOpCode alternativeEndOpCode = OpSimpleNestedAlternativeEnd;
+
+        // We can currently only compile quantity 1 subpatterns that are
+        // not copies. We generate a copy in the case of a range quantifier,
+        // e.g. /(?:x){3,9}/, or /(?:x)+/ (These are effectively expanded to
+        // /(?:x){3,3}(?:x){0,6}/ and /(?:x)(?:x)*/ repectively). The problem
+        // comes where the subpattern is capturing, in which case we would
+        // need to restore the capture from the first subpattern upon a
+        // failure in the second.
+        if (term->quantityCount == 1 && !term->parentheses.isCopy) {
+            // Select the 'Once' nodes.
+            parenthesesBeginOpCode = OpParenthesesSubpatternOnceBegin;
+            parenthesesEndOpCode = OpParenthesesSubpatternOnceEnd;
+
+            // If there is more than one alternative we cannot use the 'simple' nodes.
+            if (term->parentheses.disjunction->m_alternatives.size() != 1) {
+                alternativeBeginOpCode = OpNestedAlternativeBegin;
+                alternativeNextOpCode = OpNestedAlternativeNext;
+                alternativeEndOpCode = OpNestedAlternativeEnd;
             }
-            countToCheckForFirstAlternative = alternative->m_minimumSize;
-            state.checkedTotal += countToCheckForFirstAlternative;
-            if (countToCheckForFirstAlternative)
-                notEnoughInputForPreviousAlternative.append(jumpIfNoAvailableInput(countToCheckForFirstAlternative));
-            countCheckedForCurrentAlternative = countToCheckForFirstAlternative;
+        } else if (term->parentheses.isTerminal) {
+            // Select the 'Terminal' nodes.
+            parenthesesBeginOpCode = OpParenthesesSubpatternTerminalBegin;
+            parenthesesEndOpCode = OpParenthesesSubpatternTerminalEnd;
+        } else {
+            // This subpattern is not supported by the JIT.
+            m_shouldFallBack = true;
+            return;
         }
 
-        if (setRepeatAlternativeLabels)
-            firstAlternativeInputChecked = Label(this);
-
-        while (state.alternativeValid()) {
-            PatternAlternative* alternative = state.alternative();
-            optimizeAlternative(alternative);
+        size_t parenBegin = m_ops.size();
+        m_ops.append(parenthesesBeginOpCode);
 
-            // Track whether any alternatives are shorter than the first one.
-            if (!alternative->onceThrough())
-                hasShorterAlternatives = hasShorterAlternatives || (countCheckedForCurrentAlternative < countToCheckForFirstAlternative);
+        m_ops.append(alternativeBeginOpCode);
+        m_ops.last().m_previousOp = notFound;
+        m_ops.last().m_term = term;
+        Vector<PatternAlternative*>& alternatives =  term->parentheses.disjunction->m_alternatives;
+        for (unsigned i = 0; i < alternatives.size(); ++i) {
+            size_t lastOpIndex = m_ops.size() - 1;
 
-            for (state.resetTerm(); state.termValid(); state.nextTerm())
-                generateTerm(state);
+            PatternAlternative* nestedAlternative = alternatives[i];
+            opCompileAlternative(nestedAlternative);
 
-            // If we get here, the alternative matched.
-            if (m_pattern.m_body->m_callFrameSize)
-                addPtr(Imm32(m_pattern.m_body->m_callFrameSize * sizeof(void*)), stackPointerRegister);
+            size_t thisOpIndex = m_ops.size();
+            m_ops.append(YarrOp(alternativeNextOpCode));
 
-            ASSERT(index != returnRegister);
-            if (m_pattern.m_body->m_hasFixedSize) {
-                move(index, returnRegister);
-                if (alternative->m_minimumSize)
-                    sub32(Imm32(alternative->m_minimumSize), returnRegister);
-
-                store32(returnRegister, output);
-            } else
-                load32(Address(output), returnRegister);
+            YarrOp& lastOp = m_ops[lastOpIndex];
+            YarrOp& thisOp = m_ops[thisOpIndex];
 
-            store32(index, Address(output, 4));
-
-            generateReturn();
-
-            state.nextAlternative();
-            if (alternative->onceThrough() && state.alternativeValid())
-                state.clearBacktrack();
-
-            // if there are any more alternatives, plant the check for input before looping.
-            if (state.alternativeValid()) {
-                state.setJumpListToPriorParen(0);
-                PatternAlternative* nextAlternative = state.alternative();
-                if (!setRepeatAlternativeLabels && !nextAlternative->onceThrough()) {
-                    // We have handled non-repeating alternatives, jump to next iteration 
-                    // and loop over repeating alternatives.
-                    state.jumpToBacktrack(this);
-
-                    countToCheckForFirstAlternative = nextAlternative->m_minimumSize;
+            lastOp.m_alternative = nestedAlternative;
+            lastOp.m_nextOp = thisOpIndex;
+            thisOp.m_previousOp = lastOpIndex;
+            thisOp.m_term = term;
+        }
+        YarrOp& lastOp = m_ops.last();
+        ASSERT(lastOp.m_op == alternativeNextOpCode);
+        lastOp.m_op = alternativeEndOpCode;
+        lastOp.m_alternative = 0;
+        lastOp.m_nextOp = notFound;
 
-                    // If we get here, there the last input checked failed.
-                    notEnoughInputForPreviousAlternative.link(this);
+        size_t parenEnd = m_ops.size();
+        m_ops.append(parenthesesEndOpCode);
 
-                    state.linkAlternativeBacktracks(this);
+        m_ops[parenBegin].m_term = term;
+        m_ops[parenBegin].m_previousOp = notFound;
+        m_ops[parenBegin].m_nextOp = parenEnd;
+        m_ops[parenEnd].m_term = term;
+        m_ops[parenEnd].m_previousOp = parenBegin;
+        m_ops[parenEnd].m_nextOp = notFound;
+    }
 
-                    // Back up to start the looping alternatives.
-                    if (countCheckedForCurrentAlternative)
-                        sub32(Imm32(countCheckedForCurrentAlternative), index);
+    // opCompileParentheticalAssertion
+    // Emits ops for a parenthetical assertion. These consist of an
+    // OpSimpleNestedAlternativeBegin/Next/End set of nodes wrapping
+    // the alternatives, with these wrapped by an outer pair of
+    // OpParentheticalAssertionBegin/End nodes.
+    // We can always use the OpSimpleNestedAlternative nodes in the
+    // case of parenthetical assertions since these only ever match
+    // once, and will never backtrack back into the assertion.
+    void opCompileParentheticalAssertion(PatternTerm* term)
+    {
+        size_t parenBegin = m_ops.size();
+        m_ops.append(OpParentheticalAssertionBegin);
+
+        m_ops.append(OpSimpleNestedAlternativeBegin);
+        m_ops.last().m_previousOp = notFound;
+        m_ops.last().m_term = term;
+        Vector<PatternAlternative*>& alternatives =  term->parentheses.disjunction->m_alternatives;
+        for (unsigned i = 0; i < alternatives.size(); ++i) {
+            size_t lastOpIndex = m_ops.size() - 1;
+
+            PatternAlternative* nestedAlternative = alternatives[i];
+            opCompileAlternative(nestedAlternative);
+
+            size_t thisOpIndex = m_ops.size();
+            m_ops.append(YarrOp(OpSimpleNestedAlternativeNext));
+
+            YarrOp& lastOp = m_ops[lastOpIndex];
+            YarrOp& thisOp = m_ops[thisOpIndex];
+
+            lastOp.m_alternative = nestedAlternative;
+            lastOp.m_nextOp = thisOpIndex;
+            thisOp.m_previousOp = lastOpIndex;
+            thisOp.m_term = term;
+        }
+        YarrOp& lastOp = m_ops.last();
+        ASSERT(lastOp.m_op == OpSimpleNestedAlternativeNext);
+        lastOp.m_op = OpSimpleNestedAlternativeEnd;
+        lastOp.m_alternative = 0;
+        lastOp.m_nextOp = notFound;
+
+        size_t parenEnd = m_ops.size();
+        m_ops.append(OpParentheticalAssertionEnd);
+
+        m_ops[parenBegin].m_term = term;
+        m_ops[parenBegin].m_previousOp = notFound;
+        m_ops[parenBegin].m_nextOp = parenEnd;
+        m_ops[parenEnd].m_term = term;
+        m_ops[parenEnd].m_previousOp = parenBegin;
+        m_ops[parenEnd].m_nextOp = notFound;
+    }
 
-                    firstAlternative = Label(this);
+    // opCompileAlternative
+    // Called to emit nodes for all terms in an alternative.
+    void opCompileAlternative(PatternAlternative* alternative)
+    {
+        optimizeAlternative(alternative);
 
-                    state.checkedTotal = countToCheckForFirstAlternative;
-                    if (countToCheckForFirstAlternative)
-                        notEnoughInputForPreviousAlternative.append(jumpIfNoAvailableInput(countToCheckForFirstAlternative));
+        for (unsigned i = 0; i < alternative->m_terms.size(); ++i) {
+            PatternTerm* term = &alternative->m_terms[i];
 
-                    countCheckedForCurrentAlternative = countToCheckForFirstAlternative;
+            switch (term->type) {
+            case PatternTerm::TypeParenthesesSubpattern:
+                opCompileParenthesesSubpattern(term);
+                break;
 
-                    firstAlternativeInputChecked = Label(this);
+            case PatternTerm::TypeParentheticalAssertion:
+                opCompileParentheticalAssertion(term);
+                break;
 
-                    setRepeatAlternativeLabels = true;
-                } else {
-                    int countToCheckForNextAlternative = nextAlternative->m_minimumSize;
-
-                    if (countCheckedForCurrentAlternative > countToCheckForNextAlternative) { // CASE 1: current alternative was longer than the next one.
-                        // If we get here, then the last input checked failed.
-                        notEnoughInputForPreviousAlternative.link(this);
-
-                        // Check if sufficent input available to run the next alternative 
-                        notEnoughInputForPreviousAlternative.append(jumpIfNoAvailableInput(countToCheckForNextAlternative - countCheckedForCurrentAlternative));
-                        // We are now in the correct state to enter the next alternative; this add is only required
-                        // to mirror and revert operation of the sub32, just below.
-                        add32(Imm32(countCheckedForCurrentAlternative - countToCheckForNextAlternative), index);
-
-                        // If we get here, then the last input checked passed.
-                        state.linkAlternativeBacktracks(this);
-
-                        // No need to check if we can run the next alternative, since it is shorter -
-                        // just update index.
-                        sub32(Imm32(countCheckedForCurrentAlternative - countToCheckForNextAlternative), index);
-                    } else if (countCheckedForCurrentAlternative < countToCheckForNextAlternative) { // CASE 2: next alternative is longer than the current one.
-                        // If we get here, then the last input checked failed.
-                        // If there is insufficient input to run the current alternative, and the next alternative is longer,
-                        // then there is definitely not enough input to run it - don't even check. Just adjust index, as if
-                        // we had checked.
-                        notEnoughInputForPreviousAlternative.link(this);
-                        add32(Imm32(countToCheckForNextAlternative - countCheckedForCurrentAlternative), index);
-                        notEnoughInputForPreviousAlternative.append(jump());
-
-                        // The next alternative is longer than the current one; check the difference.
-                        state.linkAlternativeBacktracks(this);
-
-                        notEnoughInputForPreviousAlternative.append(jumpIfNoAvailableInput(countToCheckForNextAlternative - countCheckedForCurrentAlternative));
-                    } else { // CASE 3: Both alternatives are the same length.
-                        ASSERT(countCheckedForCurrentAlternative == countToCheckForNextAlternative);
-
-                        // If the next alterative is the same length as this one, then no need to check the input -
-                        // if there was sufficent input to run the current alternative then there is sufficient
-                        // input to run the next one; if not, there isn't.
-                        state.linkAlternativeBacktracks(this);
-                    }
-                    state.checkedTotal -= countCheckedForCurrentAlternative;
-                    countCheckedForCurrentAlternative = countToCheckForNextAlternative;
-                    state.checkedTotal += countCheckedForCurrentAlternative;
-                }
+            default:
+                m_ops.append(term);
             }
         }
+    }
 
-        // If we get here, all Alternatives failed...
+    // opCompileBody
+    // This method compiles the body disjunction of the regular expression.
+    // The body consists of two sets of alternatives - zero or more 'once
+    // through' (BOL anchored) alternatives, followed by zero or more
+    // repeated alternatives.
+    // For each of these two sets of alteratives, if not empty they will be
+    // wrapped in a set of OpBodyAlternativeBegin/Next/End nodes (with the
+    // 'begin' node referencing the first alternative, and 'next' nodes
+    // referencing any further alternatives. The begin/next/end nodes are
+    // linked together in a doubly linked list. In the case of repeating
+    // alternatives, the end node is also linked back to the beginning.
+    // If no repeating alternatives exist, then a OpMatchFailed node exists
+    // to return the failing result.
+    void opCompileBody(PatternDisjunction* disjunction)
+    {
+        Vector<PatternAlternative*>& alternatives =  disjunction->m_alternatives;
+        size_t currentAlternativeIndex = 0;
 
-        state.checkedTotal -= countCheckedForCurrentAlternative;
+        // Emit the 'once through' alternatives.
+        if (alternatives.size() && alternatives[0]->onceThrough()) {
+            m_ops.append(YarrOp(OpBodyAlternativeBegin));
+            m_ops.last().m_previousOp = notFound;
 
-        if (!setRepeatAlternativeLabels) {
-            // If there are no alternatives that need repeating (all are marked 'onceThrough') then just link
-            // the match failures to this point, and fall through to the return below.
-            state.linkAlternativeBacktracks(this, true);
+            do {
+                size_t lastOpIndex = m_ops.size() - 1;
+                PatternAlternative* alternative = alternatives[currentAlternativeIndex];
+                opCompileAlternative(alternative);
 
-            notEnoughInputForPreviousAlternative.link(this);
-        } else {
-            // How much more input need there be to be able to retry from the first alternative?
-            // examples:
-            //   /yarr_jit/ or /wrec|pcre/
-            //     In these examples we need check for one more input before looping.
-            //   /yarr_jit|pcre/
-            //     In this case we need check for 5 more input to loop (+4 to allow for the first alterative
-            //     being four longer than the last alternative checked, and another +1 to effectively move
-            //     the start position along by one).
-            //   /yarr|rules/ or /wrec|notsomuch/
-            //     In these examples, provided that there was sufficient input to have just been matching for
-            //     the second alternative we can loop without checking for available input (since the second
-            //     alternative is longer than the first).  In the latter example we need to decrement index
-            //     (by 4) so the start position is only progressed by 1 from the last iteration.
-            int incrementForNextIter = (countToCheckForFirstAlternative - countCheckedForCurrentAlternative) + 1;
-
-            // First, deal with the cases where there was sufficient input to try the last alternative.
-            if (incrementForNextIter > 0) // We need to check for more input anyway, fall through to the checking below.
-                state.linkAlternativeBacktracks(this, true);
-            else if (m_pattern.m_body->m_hasFixedSize && !incrementForNextIter) // No need to update anything, link these backtracks straight to the to pof the loop!
-                state.linkAlternativeBacktracksTo(this, firstAlternativeInputChecked, true);
-            else { // no need to check the input, but we do have some bookkeeping to do first.
-                state.linkAlternativeBacktracks(this, true);
-
-                // Where necessary update our preserved start position.
-                if (!m_pattern.m_body->m_hasFixedSize) {
-                    move(index, regT0);
-                    sub32(Imm32(countCheckedForCurrentAlternative - 1), regT0);
-                    store32(regT0, Address(output));
-                }
+                size_t thisOpIndex = m_ops.size();
+                m_ops.append(YarrOp(OpBodyAlternativeNext));
 
-                // Update index if necessary, and loop (without checking).
-                if (incrementForNextIter)
-                    add32(Imm32(incrementForNextIter), index);
-                jump().linkTo(firstAlternativeInputChecked, this);
-            }
+                YarrOp& lastOp = m_ops[lastOpIndex];
+                YarrOp& thisOp = m_ops[thisOpIndex];
 
-            notEnoughInputForPreviousAlternative.link(this);
-            // Update our idea of the start position, if we're tracking this.
-            if (!m_pattern.m_body->m_hasFixedSize) {
-                if (countCheckedForCurrentAlternative - 1) {
-                    move(index, regT0);
-                    sub32(Imm32(countCheckedForCurrentAlternative - 1), regT0);
-                    store32(regT0, Address(output));
-                } else
-                    store32(index, Address(output));
-            }
+                lastOp.m_alternative = alternative;
+                lastOp.m_nextOp = thisOpIndex;
+                thisOp.m_previousOp = lastOpIndex;
+                
+                ++currentAlternativeIndex;
+            } while (currentAlternativeIndex < alternatives.size() && alternatives[currentAlternativeIndex]->onceThrough());
 
-            // Check if there is sufficent input to run the first alternative again.
-            jumpIfAvailableInput(incrementForNextIter).linkTo(firstAlternativeInputChecked, this);
-            // No - insufficent input to run the first alteranative, are there any other alternatives we
-            // might need to check?  If so, the last check will have left the index incremented by
-            // (countToCheckForFirstAlternative + 1), so we need test whether countToCheckForFirstAlternative
-            // LESS input is available, to have the effect of just progressing the start position by 1
-            // from the last iteration.  If this check passes we can just jump up to the check associated
-            // with the first alternative in the loop.  This is a bit sad, since we'll end up trying the
-            // first alternative again, and this check will fail (otherwise the check planted just above
-            // here would have passed).  This is a bit sad, however it saves trying to do something more
-            // complex here in compilation, and in the common case we should end up coallescing the checks.
-            //
-            // FIXME: a nice improvement here may be to stop trying to match sooner, based on the least
-            // of the minimum-alternative-lengths.  E.g. if I have two alternatives of length 200 and 150,
-            // and a string of length 100, we'll end up looping index from 0 to 100, checking whether there
-            // is sufficient input to run either alternative (constantly failing).  If there had been only
-            // one alternative, or if the shorter alternative had come first, we would have terminated
-            // immediately. :-/
-            if (hasShorterAlternatives)
-                jumpIfAvailableInput(-countToCheckForFirstAlternative).linkTo(firstAlternative, this);
-            // index will now be a bit garbled (depending on whether 'hasShorterAlternatives' is true,
-            // it has either been incremented by 1 or by (countToCheckForFirstAlternative + 1) ... 
-            // but since we're about to return a failure this doesn't really matter!)
+            YarrOp& lastOp = m_ops.last();
+
+            ASSERT(lastOp.m_op == OpBodyAlternativeNext);
+            lastOp.m_op = OpBodyAlternativeEnd;
+            lastOp.m_alternative = 0;
+            lastOp.m_nextOp = notFound;
         }
 
-        if (m_pattern.m_body->m_callFrameSize)
-            addPtr(Imm32(m_pattern.m_body->m_callFrameSize * sizeof(void*)), stackPointerRegister);
+        if (currentAlternativeIndex == alternatives.size()) {
+            m_ops.append(YarrOp(OpMatchFailed));
+            return;
+        }
 
-        move(TrustedImm32(-1), returnRegister);
+        // Emit the repeated alternatives.
+        size_t repeatLoop = m_ops.size();
+        m_ops.append(YarrOp(OpBodyAlternativeBegin));
+        m_ops.last().m_previousOp = notFound;
+        do {
+            size_t lastOpIndex = m_ops.size() - 1;
+            PatternAlternative* alternative = alternatives[currentAlternativeIndex];
+            ASSERT(!alternative->onceThrough());
+            opCompileAlternative(alternative);
+
+            size_t thisOpIndex = m_ops.size();
+            m_ops.append(YarrOp(OpBodyAlternativeNext));
 
-        generateReturn();
+            YarrOp& lastOp = m_ops[lastOpIndex];
+            YarrOp& thisOp = m_ops[thisOpIndex];
 
-        m_expressionState.emitParenthesesTail(this);
-        m_expressionState.emitIndirectJumpTable(this);
-        m_expressionState.linkToNextIteration(this);
+            lastOp.m_alternative = alternative;
+            lastOp.m_nextOp = thisOpIndex;
+            thisOp.m_previousOp = lastOpIndex;
+            
+            ++currentAlternativeIndex;
+        } while (currentAlternativeIndex < alternatives.size());
+        YarrOp& lastOp = m_ops.last();
+        ASSERT(lastOp.m_op == OpBodyAlternativeNext);
+        lastOp.m_op = OpBodyAlternativeEnd;
+        lastOp.m_alternative = 0;
+        lastOp.m_nextOp = repeatLoop;
     }
 
     void generateEnter()
@@ -2230,10 +2325,11 @@ public:
     YarrGenerator(YarrPattern& pattern)
         : m_pattern(pattern)
         , m_shouldFallBack(false)
+        , m_checked(0)
     {
     }
 
-    void generate()
+    void compile(JSGlobalData* globalData, YarrCodeBlock& jitObject)
     {
         generateEnter();
 
@@ -2243,26 +2339,50 @@ public:
         if (m_pattern.m_body->m_callFrameSize)
             subPtr(Imm32(m_pattern.m_body->m_callFrameSize * sizeof(void*)), stackPointerRegister);
 
-        generateDisjunction(m_pattern.m_body);
-    }
-
-    void compile(JSGlobalData* globalData, YarrCodeBlock& jitObject)
-    {
-        generate();
+        // Compile the pattern to the internal 'YarrOp' representation.
+        opCompileBody(m_pattern.m_body);
 
-        LinkBuffer patchBuffer(this, globalData->regexAllocator);
+        // If we encountered anything we can't handle in the JIT code
+        // (e.g. backreferences) then return early.
+        if (m_shouldFallBack) {
+            jitObject.setFallBack(true);
+            return;
+        }
 
-        for (unsigned i = 0; i < m_expressionState.m_backtrackRecords.size(); ++i)
-            patchBuffer.patch(m_expressionState.m_backtrackRecords[i].dataLabel, patchBuffer.locationOf(m_expressionState.m_backtrackRecords[i].backtrackLocation));
+        generate();
+        backtrack();
 
-        jitObject.set(patchBuffer.finalizeCode());
+        // Link & finalize the code.
+        LinkBuffer linkBuffer(this, globalData->regexAllocator);
+        m_backtrackingState.linkDataLabels(linkBuffer);
+        jitObject.set(linkBuffer.finalizeCode());
         jitObject.setFallBack(m_shouldFallBack);
     }
 
 private:
     YarrPattern& m_pattern;
+
+    // Used to detect regular expression constructs that are not currently
+    // supported in the JIT; fall back to the interpreter when this is detected.
     bool m_shouldFallBack;
-    GenerationState m_expressionState;
+
+    // The regular expression expressed as a linear sequence of operations.
+    Vector<YarrOp, 128> m_ops;
+
+    // This records the current input offset being applied due to the current
+    // set of alternatives we are nested within. E.g. when matching the
+    // character 'b' within the regular expression /abc/, we will know that
+    // the minimum size for the alternative is 3, checked upon entry to the
+    // alternative, and that 'b' is at offset 1 from the start, and as such
+    // when matching 'b' we need to apply an offset of -2 to the load.
+    //
+    // FIXME: This should go away. Rather than tracking this value throughout
+    // code generation, we should gather this information up front & store it
+    // on the YarrOp structure.
+    int m_checked;
+
+    // This class records state whilst generating the backtracking path of code.
+    BacktrackingState m_backtrackingState;
 };
 
 void jitCompile(YarrPattern& pattern, JSGlobalData* globalData, YarrCodeBlock& jitObject)
diff --git a/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest.cbproj b/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest.cbproj
index 285bb2a..95c3054 100644
--- a/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest.cbproj
+++ b/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest.cbproj
@@ -1,138 +1,138 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{bca37a72-5b07-46cf-b44e-89f8e06451a2}</ProjectGuid>
-    <Config Condition="'$(Config)'==''">Release</Config>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
-    <Base>true</Base>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
-    <Base>true</Base>
-    <Cfg_1>true</Cfg_1>
-    <CfgParent>Base</CfgParent>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
-    <Base>true</Base>
-    <Cfg_2>true</Cfg_2>
-    <CfgParent>Base</CfgParent>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Base)'!=''">
-    <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-    <OutputExt>lib</OutputExt>
-    <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-    <Defines>NO_STRICT</Defines>
-    <DynamicRTL>true</DynamicRTL>
-    <UsePackages>true</UsePackages>
-    <ProjectType>CppStaticLibrary</ProjectType>
-    <BCC_CPPCompileAlways>true</BCC_CPPCompileAlways>
-    <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi</PackageImports>
-    <BCC_wpar>false</BCC_wpar>
-    <IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</IncludePath>
-    <AllPackageLibs>rtl.lib;vcl.lib</AllPackageLibs>
-    <TLIB_PageSize>32</TLIB_PageSize>
-    <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</ILINK_LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Cfg_1)'!=''">
-    <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-    <DCC_Optimize>false</DCC_Optimize>
-    <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-    <Defines>_DEBUG;$(Defines)</Defines>
-    <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-    <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-    <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
-    <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-    <DCC_Define>DEBUG</DCC_Define>
-    <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-    <IntermediateOutputDir>Debug</IntermediateOutputDir>
-    <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-    <BCC_StackFrames>true</BCC_StackFrames>
-    <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-    <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-    <TASM_Debugging>Full</TASM_Debugging>
-    <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Cfg_2)'!=''">
-    <Defines>NDEBUG;$(Defines)</Defines>
-    <IntermediateOutputDir>Release</IntermediateOutputDir>
-    <ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-    <TASM_Debugging>None</TASM_Debugging>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>
-    <Borland.ProjectType>CppStaticLibrary</Borland.ProjectType>
-    <BorlandProject>
-<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams"></Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD"></Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Excluded_Packages>
-      
-      
-      <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
-      <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
-    </Excluded_Packages><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">1</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines><HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Count">1</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item0">32</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item1">16</HistoryLists_hlTLIB_PageSize></HistoryLists_hlTLIB_PageSize></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>
-  </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />
-  <ItemGroup>
-    <None Include="..\include\gtest\gtest-death-test.h">
-      <BuildOrder>3</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\gtest-message.h">
-      <BuildOrder>4</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\gtest-param-test.h">
-      <BuildOrder>5</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\gtest-spi.h">
-      <BuildOrder>6</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\gtest-test-part.h">
-      <BuildOrder>7</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\gtest-typed-test.h">
-      <BuildOrder>8</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\gtest.h">
-      <BuildOrder>0</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\gtest_pred_impl.h">
-      <BuildOrder>1</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\gtest_prod.h">
-      <BuildOrder>2</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\internal\gtest-death-test-internal.h">
-      <BuildOrder>9</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\internal\gtest-filepath.h">
-      <BuildOrder>10</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\internal\gtest-internal.h">
-      <BuildOrder>11</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\internal\gtest-linked_ptr.h">
-      <BuildOrder>12</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\internal\gtest-param-util-generated.h">
-      <BuildOrder>14</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\internal\gtest-param-util.h">
-      <BuildOrder>13</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\internal\gtest-port.h">
-      <BuildOrder>15</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\internal\gtest-string.h">
-      <BuildOrder>16</BuildOrder>
-    </None>
-    <None Include="..\include\gtest\internal\gtest-type-util.h">
-      <BuildOrder>17</BuildOrder>
-    </None>
-    <CppCompile Include="gtest_all.cc">
-      <BuildOrder>18</BuildOrder>
-    </CppCompile>
-    <BuildConfiguration Include="Debug">
-      <Key>Cfg_1</Key>
-    </BuildConfiguration>
-    <BuildConfiguration Include="Release">
-      <Key>Cfg_2</Key>
-    </BuildConfiguration>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>

+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

+    <ProjectGuid>{bca37a72-5b07-46cf-b44e-89f8e06451a2}</ProjectGuid>

+    <Config Condition="'$(Config)'==''">Release</Config>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

+    <Base>true</Base>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">

+    <Base>true</Base>

+    <Cfg_1>true</Cfg_1>

+    <CfgParent>Base</CfgParent>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">

+    <Base>true</Base>

+    <Cfg_2>true</Cfg_2>

+    <CfgParent>Base</CfgParent>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Base)'!=''">

+    <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>

+    <OutputExt>lib</OutputExt>

+    <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>

+    <Defines>NO_STRICT</Defines>

+    <DynamicRTL>true</DynamicRTL>

+    <UsePackages>true</UsePackages>

+    <ProjectType>CppStaticLibrary</ProjectType>

+    <BCC_CPPCompileAlways>true</BCC_CPPCompileAlways>

+    <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi</PackageImports>

+    <BCC_wpar>false</BCC_wpar>

+    <IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</IncludePath>

+    <AllPackageLibs>rtl.lib;vcl.lib</AllPackageLibs>

+    <TLIB_PageSize>32</TLIB_PageSize>

+    <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</ILINK_LibraryPath>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Cfg_1)'!=''">

+    <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>

+    <DCC_Optimize>false</DCC_Optimize>

+    <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>

+    <Defines>_DEBUG;$(Defines)</Defines>

+    <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>

+    <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>

+    <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>

+    <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>

+    <DCC_Define>DEBUG</DCC_Define>

+    <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>

+    <IntermediateOutputDir>Debug</IntermediateOutputDir>

+    <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>

+    <BCC_StackFrames>true</BCC_StackFrames>

+    <BCC_DisableOptimizations>true</BCC_DisableOptimizations>

+    <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>

+    <TASM_Debugging>Full</TASM_Debugging>

+    <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Cfg_2)'!=''">

+    <Defines>NDEBUG;$(Defines)</Defines>

+    <IntermediateOutputDir>Release</IntermediateOutputDir>

+    <ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath)</ILINK_LibraryPath>

+    <TASM_Debugging>None</TASM_Debugging>

+  </PropertyGroup>

+  <ProjectExtensions>

+    <Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>

+    <Borland.ProjectType>CppStaticLibrary</Borland.ProjectType>

+    <BorlandProject>

+<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams"></Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD"></Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Excluded_Packages>

+      

+      

+      <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>

+      <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>

+    </Excluded_Packages><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">1</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines><HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Count">1</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item0">32</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item1">16</HistoryLists_hlTLIB_PageSize></HistoryLists_hlTLIB_PageSize></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>

+  </ProjectExtensions>

+  <Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />

+  <ItemGroup>

+    <None Include="..\include\gtest\gtest-death-test.h">

+      <BuildOrder>3</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\gtest-message.h">

+      <BuildOrder>4</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\gtest-param-test.h">

+      <BuildOrder>5</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\gtest-spi.h">

+      <BuildOrder>6</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\gtest-test-part.h">

+      <BuildOrder>7</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\gtest-typed-test.h">

+      <BuildOrder>8</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\gtest.h">

+      <BuildOrder>0</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\gtest_pred_impl.h">

+      <BuildOrder>1</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\gtest_prod.h">

+      <BuildOrder>2</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\internal\gtest-death-test-internal.h">

+      <BuildOrder>9</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\internal\gtest-filepath.h">

+      <BuildOrder>10</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\internal\gtest-internal.h">

+      <BuildOrder>11</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\internal\gtest-linked_ptr.h">

+      <BuildOrder>12</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\internal\gtest-param-util-generated.h">

+      <BuildOrder>14</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\internal\gtest-param-util.h">

+      <BuildOrder>13</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\internal\gtest-port.h">

+      <BuildOrder>15</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\internal\gtest-string.h">

+      <BuildOrder>16</BuildOrder>

+    </None>

+    <None Include="..\include\gtest\internal\gtest-type-util.h">

+      <BuildOrder>17</BuildOrder>

+    </None>

+    <CppCompile Include="gtest_all.cc">

+      <BuildOrder>18</BuildOrder>

+    </CppCompile>

+    <BuildConfiguration Include="Debug">

+      <Key>Cfg_1</Key>

+    </BuildConfiguration>

+    <BuildConfiguration Include="Release">

+      <Key>Cfg_2</Key>

+    </BuildConfiguration>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest.groupproj b/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest.groupproj
index 849f4c4..faf31ca 100644
--- a/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest.groupproj
+++ b/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest.groupproj
@@ -1,54 +1,54 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{c1d923e0-6cba-4332-9b6f-3420acbf5091}</ProjectGuid>
-  </PropertyGroup>
-  <ItemGroup />
-  <ItemGroup>
-    <Projects Include="gtest.cbproj" />
-    <Projects Include="gtest_main.cbproj" />
-    <Projects Include="gtest_unittest.cbproj" />
-  </ItemGroup>
-  <ProjectExtensions>
-    <Borland.Personality>Default.Personality</Borland.Personality>
-    <Borland.ProjectType />
-    <BorlandProject>
-<BorlandProject xmlns=""><Default.Personality></Default.Personality></BorlandProject></BorlandProject>
-  </ProjectExtensions>
-  <Target Name="gtest">
-    <MSBuild Projects="gtest.cbproj" Targets="" />
-  </Target>
-  <Target Name="gtest:Clean">
-    <MSBuild Projects="gtest.cbproj" Targets="Clean" />
-  </Target>
-  <Target Name="gtest:Make">
-    <MSBuild Projects="gtest.cbproj" Targets="Make" />
-  </Target>
-  <Target Name="gtest_main">
-    <MSBuild Projects="gtest_main.cbproj" Targets="" />
-  </Target>
-  <Target Name="gtest_main:Clean">
-    <MSBuild Projects="gtest_main.cbproj" Targets="Clean" />
-  </Target>
-  <Target Name="gtest_main:Make">
-    <MSBuild Projects="gtest_main.cbproj" Targets="Make" />
-  </Target>
-  <Target Name="gtest_unittest">
-    <MSBuild Projects="gtest_unittest.cbproj" Targets="" />
-  </Target>
-  <Target Name="gtest_unittest:Clean">
-    <MSBuild Projects="gtest_unittest.cbproj" Targets="Clean" />
-  </Target>
-  <Target Name="gtest_unittest:Make">
-    <MSBuild Projects="gtest_unittest.cbproj" Targets="Make" />
-  </Target>
-  <Target Name="Build">
-    <CallTarget Targets="gtest;gtest_main;gtest_unittest" />
-  </Target>
-  <Target Name="Clean">
-    <CallTarget Targets="gtest:Clean;gtest_main:Clean;gtest_unittest:Clean" />
-  </Target>
-  <Target Name="Make">
-    <CallTarget Targets="gtest:Make;gtest_main:Make;gtest_unittest:Make" />
-  </Target>
-  <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

+    <ProjectGuid>{c1d923e0-6cba-4332-9b6f-3420acbf5091}</ProjectGuid>

+  </PropertyGroup>

+  <ItemGroup />

+  <ItemGroup>

+    <Projects Include="gtest.cbproj" />

+    <Projects Include="gtest_main.cbproj" />

+    <Projects Include="gtest_unittest.cbproj" />

+  </ItemGroup>

+  <ProjectExtensions>

+    <Borland.Personality>Default.Personality</Borland.Personality>

+    <Borland.ProjectType />

+    <BorlandProject>

+<BorlandProject xmlns=""><Default.Personality></Default.Personality></BorlandProject></BorlandProject>

+  </ProjectExtensions>

+  <Target Name="gtest">

+    <MSBuild Projects="gtest.cbproj" Targets="" />

+  </Target>

+  <Target Name="gtest:Clean">

+    <MSBuild Projects="gtest.cbproj" Targets="Clean" />

+  </Target>

+  <Target Name="gtest:Make">

+    <MSBuild Projects="gtest.cbproj" Targets="Make" />

+  </Target>

+  <Target Name="gtest_main">

+    <MSBuild Projects="gtest_main.cbproj" Targets="" />

+  </Target>

+  <Target Name="gtest_main:Clean">

+    <MSBuild Projects="gtest_main.cbproj" Targets="Clean" />

+  </Target>

+  <Target Name="gtest_main:Make">

+    <MSBuild Projects="gtest_main.cbproj" Targets="Make" />

+  </Target>

+  <Target Name="gtest_unittest">

+    <MSBuild Projects="gtest_unittest.cbproj" Targets="" />

+  </Target>

+  <Target Name="gtest_unittest:Clean">

+    <MSBuild Projects="gtest_unittest.cbproj" Targets="Clean" />

+  </Target>

+  <Target Name="gtest_unittest:Make">

+    <MSBuild Projects="gtest_unittest.cbproj" Targets="Make" />

+  </Target>

+  <Target Name="Build">

+    <CallTarget Targets="gtest;gtest_main;gtest_unittest" />

+  </Target>

+  <Target Name="Clean">

+    <CallTarget Targets="gtest:Clean;gtest_main:Clean;gtest_unittest:Clean" />

+  </Target>

+  <Target Name="Make">

+    <CallTarget Targets="gtest:Make;gtest_main:Make;gtest_unittest:Make" />

+  </Target>

+  <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />

 </Project>
\ No newline at end of file
diff --git a/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_all.cc b/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_all.cc
index ba7ad68..121b2d8 100644
--- a/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_all.cc
+++ b/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_all.cc
@@ -1,38 +1,38 @@
-// Copyright 2009, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * 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 Google Inc. 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.
-//
-// Author: Josh Kelley (joshkel@gmail.com)
-//
-// Google C++ Testing Framework (Google Test)
-//
-// C++Builder's IDE cannot build a static library from files with hyphens
-// in their name.  See http://qc.codegear.com/wc/qcmain.aspx?d=70977 .
-// This file serves as a workaround.
-
-#include "src/gtest-all.cc"
+// Copyright 2009, Google Inc.

+// All rights reserved.

+//

+// Redistribution and use in source and binary forms, with or without

+// modification, are permitted provided that the following conditions are

+// met:

+//

+//     * 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 Google Inc. 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.

+//

+// Author: Josh Kelley (joshkel@gmail.com)

+//

+// Google C++ Testing Framework (Google Test)

+//

+// C++Builder's IDE cannot build a static library from files with hyphens

+// in their name.  See http://qc.codegear.com/wc/qcmain.aspx?d=70977 .

+// This file serves as a workaround.

+

+#include "src/gtest-all.cc"

diff --git a/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_link.cc b/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_link.cc
index b955ebf..918eccd 100644
--- a/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_link.cc
+++ b/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_link.cc
@@ -1,40 +1,40 @@
-// Copyright 2009, Google Inc.
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * 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 Google Inc. 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.
-//
-// Author: Josh Kelley (joshkel@gmail.com)
-//
-// Google C++ Testing Framework (Google Test)
-//
-// Links gtest.lib and gtest_main.lib into the current project in C++Builder.
-// This means that these libraries can't be renamed, but it's the only way to
-// ensure that Debug versus Release test builds are linked against the
-// appropriate Debug or Release build of the libraries.
-
-#pragma link "gtest.lib"
-#pragma link "gtest_main.lib"
+// Copyright 2009, Google Inc.

+// All rights reserved.

+//

+// Redistribution and use in source and binary forms, with or without

+// modification, are permitted provided that the following conditions are

+// met:

+//

+//     * 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 Google Inc. 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.

+//

+// Author: Josh Kelley (joshkel@gmail.com)

+//

+// Google C++ Testing Framework (Google Test)

+//

+// Links gtest.lib and gtest_main.lib into the current project in C++Builder.

+// This means that these libraries can't be renamed, but it's the only way to

+// ensure that Debug versus Release test builds are linked against the

+// appropriate Debug or Release build of the libraries.

+

+#pragma link "gtest.lib"

+#pragma link "gtest_main.lib"

diff --git a/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_main.cbproj b/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_main.cbproj
index fae32cb..d76ce13 100644
--- a/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_main.cbproj
+++ b/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_main.cbproj
@@ -1,82 +1,82 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{bca37a72-5b07-46cf-b44e-89f8e06451a2}</ProjectGuid>
-    <Config Condition="'$(Config)'==''">Release</Config>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
-    <Base>true</Base>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
-    <Base>true</Base>
-    <Cfg_1>true</Cfg_1>
-    <CfgParent>Base</CfgParent>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
-    <Base>true</Base>
-    <Cfg_2>true</Cfg_2>
-    <CfgParent>Base</CfgParent>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Base)'!=''">
-    <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-    <OutputExt>lib</OutputExt>
-    <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-    <Defines>NO_STRICT</Defines>
-    <DynamicRTL>true</DynamicRTL>
-    <UsePackages>true</UsePackages>
-    <ProjectType>CppStaticLibrary</ProjectType>
-    <BCC_CPPCompileAlways>true</BCC_CPPCompileAlways>
-    <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi</PackageImports>
-    <BCC_wpar>false</BCC_wpar>
-    <IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</IncludePath>
-    <AllPackageLibs>rtl.lib;vcl.lib</AllPackageLibs>
-    <TLIB_PageSize>32</TLIB_PageSize>
-    <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</ILINK_LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Cfg_1)'!=''">
-    <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-    <DCC_Optimize>false</DCC_Optimize>
-    <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-    <Defines>_DEBUG;$(Defines)</Defines>
-    <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-    <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-    <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
-    <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-    <DCC_Define>DEBUG</DCC_Define>
-    <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-    <IntermediateOutputDir>Debug</IntermediateOutputDir>
-    <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-    <BCC_StackFrames>true</BCC_StackFrames>
-    <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-    <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-    <TASM_Debugging>Full</TASM_Debugging>
-    <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Cfg_2)'!=''">
-    <Defines>NDEBUG;$(Defines)</Defines>
-    <IntermediateOutputDir>Release</IntermediateOutputDir>
-    <ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-    <TASM_Debugging>None</TASM_Debugging>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>
-    <Borland.ProjectType>CppStaticLibrary</Borland.ProjectType>
-    <BorlandProject>
-<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams"></Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD"></Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Excluded_Packages>
-      <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
-      <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
-    </Excluded_Packages><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">1</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines><HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Count">1</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item0">32</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item1">16</HistoryLists_hlTLIB_PageSize></HistoryLists_hlTLIB_PageSize></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>
-  </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />
-  <ItemGroup>
-    <CppCompile Include="..\src\gtest_main.cc">
-      <BuildOrder>0</BuildOrder>
-    </CppCompile>
-    <BuildConfiguration Include="Debug">
-      <Key>Cfg_1</Key>
-    </BuildConfiguration>
-    <BuildConfiguration Include="Release">
-      <Key>Cfg_2</Key>
-    </BuildConfiguration>
-  </ItemGroup>
-</Project>
+<?xml version="1.0" encoding="utf-8"?>

+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

+    <ProjectGuid>{bca37a72-5b07-46cf-b44e-89f8e06451a2}</ProjectGuid>

+    <Config Condition="'$(Config)'==''">Release</Config>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

+    <Base>true</Base>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">

+    <Base>true</Base>

+    <Cfg_1>true</Cfg_1>

+    <CfgParent>Base</CfgParent>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">

+    <Base>true</Base>

+    <Cfg_2>true</Cfg_2>

+    <CfgParent>Base</CfgParent>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Base)'!=''">

+    <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>

+    <OutputExt>lib</OutputExt>

+    <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>

+    <Defines>NO_STRICT</Defines>

+    <DynamicRTL>true</DynamicRTL>

+    <UsePackages>true</UsePackages>

+    <ProjectType>CppStaticLibrary</ProjectType>

+    <BCC_CPPCompileAlways>true</BCC_CPPCompileAlways>

+    <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;dclZipForged11.bpi;vclZipForged11.bpi;GR32_BDS2006.bpi;GR32_DSGN_BDS2006.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi;CExceptionExpert11.bpi</PackageImports>

+    <BCC_wpar>false</BCC_wpar>

+    <IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</IncludePath>

+    <AllPackageLibs>rtl.lib;vcl.lib</AllPackageLibs>

+    <TLIB_PageSize>32</TLIB_PageSize>

+    <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</ILINK_LibraryPath>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Cfg_1)'!=''">

+    <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>

+    <DCC_Optimize>false</DCC_Optimize>

+    <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>

+    <Defines>_DEBUG;$(Defines)</Defines>

+    <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>

+    <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>

+    <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>

+    <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>

+    <DCC_Define>DEBUG</DCC_Define>

+    <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>

+    <IntermediateOutputDir>Debug</IntermediateOutputDir>

+    <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>

+    <BCC_StackFrames>true</BCC_StackFrames>

+    <BCC_DisableOptimizations>true</BCC_DisableOptimizations>

+    <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>

+    <TASM_Debugging>Full</TASM_Debugging>

+    <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Cfg_2)'!=''">

+    <Defines>NDEBUG;$(Defines)</Defines>

+    <IntermediateOutputDir>Release</IntermediateOutputDir>

+    <ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath)</ILINK_LibraryPath>

+    <TASM_Debugging>None</TASM_Debugging>

+  </PropertyGroup>

+  <ProjectExtensions>

+    <Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>

+    <Borland.ProjectType>CppStaticLibrary</Borland.ProjectType>

+    <BorlandProject>

+<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams"></Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD"></Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Excluded_Packages>

+      <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>

+      <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>

+    </Excluded_Packages><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\include;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\src;..\src;..\include</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">1</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines><HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Count">1</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item0">32</HistoryLists_hlTLIB_PageSize><HistoryLists_hlTLIB_PageSize Name="Item1">16</HistoryLists_hlTLIB_PageSize></HistoryLists_hlTLIB_PageSize></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>

+  </ProjectExtensions>

+  <Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />

+  <ItemGroup>

+    <CppCompile Include="..\src\gtest_main.cc">

+      <BuildOrder>0</BuildOrder>

+    </CppCompile>

+    <BuildConfiguration Include="Debug">

+      <Key>Cfg_1</Key>

+    </BuildConfiguration>

+    <BuildConfiguration Include="Release">

+      <Key>Cfg_2</Key>

+    </BuildConfiguration>

+  </ItemGroup>

+</Project>

diff --git a/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_unittest.cbproj b/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_unittest.cbproj
index 33f7056..dc5db8e 100644
--- a/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_unittest.cbproj
+++ b/src/3rdparty/webkit/Source/ThirdParty/gtest/codegear/gtest_unittest.cbproj
@@ -1,88 +1,88 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{eea63393-5ac5-4b9c-8909-d75fef2daa41}</ProjectGuid>
-    <Config Condition="'$(Config)'==''">Release</Config>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
-    <Base>true</Base>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">
-    <Base>true</Base>
-    <Cfg_1>true</Cfg_1>
-    <CfgParent>Base</CfgParent>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">
-    <Base>true</Base>
-    <Cfg_2>true</Cfg_2>
-    <CfgParent>Base</CfgParent>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Base)'!=''">
-    <OutputExt>exe</OutputExt>
-    <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>
-    <Defines>NO_STRICT</Defines>
-    <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>
-    <DynamicRTL>true</DynamicRTL>
-    <ILINK_ObjectSearchPath>..\test</ILINK_ObjectSearchPath>
-    <UsePackages>true</UsePackages>
-    <ProjectType>CppConsoleApplication</ProjectType>
-    <NoVCL>true</NoVCL>
-    <BCC_CPPCompileAlways>true</BCC_CPPCompileAlways>
-    <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi</PackageImports>
-    <BCC_wpar>false</BCC_wpar>
-    <IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..</IncludePath>
-    <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</ILINK_LibraryPath>
-    <Multithreaded>true</Multithreaded>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Cfg_1)'!=''">
-    <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>
-    <DCC_Optimize>false</DCC_Optimize>
-    <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>
-    <Defines>_DEBUG;$(Defines)</Defines>
-    <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>
-    <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>
-    <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>
-    <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>
-    <DCC_Define>DEBUG</DCC_Define>
-    <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>
-    <IntermediateOutputDir>Debug</IntermediateOutputDir>
-    <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>
-    <BCC_StackFrames>true</BCC_StackFrames>
-    <BCC_DisableOptimizations>true</BCC_DisableOptimizations>
-    <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-    <TASM_Debugging>Full</TASM_Debugging>
-    <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Cfg_2)'!=''">
-    <Defines>NDEBUG;$(Defines)</Defines>
-    <IntermediateOutputDir>Release</IntermediateOutputDir>
-    <ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath)</ILINK_LibraryPath>
-    <TASM_Debugging>None</TASM_Debugging>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>
-    <Borland.ProjectType>CppConsoleApplication</Borland.ProjectType>
-    <BorlandProject>
-<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams"></Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD"></Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Excluded_Packages>
-      
-      
-      <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>
-      <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>
-    </Excluded_Packages><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item1">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item2">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(OUTPUTDIR);..\test</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">2</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item1">STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>
-  </ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />
-  <ItemGroup>
-    <CppCompile Include="..\test\gtest_unittest.cc">
-      <BuildOrder>0</BuildOrder>
-    </CppCompile>
-    <CppCompile Include="gtest_link.cc">
-      <BuildOrder>1</BuildOrder>
-    </CppCompile>
-    <BuildConfiguration Include="Debug">
-      <Key>Cfg_1</Key>
-    </BuildConfiguration>
-    <BuildConfiguration Include="Release">
-      <Key>Cfg_2</Key>
-    </BuildConfiguration>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>

+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup>

+    <ProjectGuid>{eea63393-5ac5-4b9c-8909-d75fef2daa41}</ProjectGuid>

+    <Config Condition="'$(Config)'==''">Release</Config>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">

+    <Base>true</Base>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_1)'!=''">

+    <Base>true</Base>

+    <Cfg_1>true</Cfg_1>

+    <CfgParent>Base</CfgParent>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_2)'!=''">

+    <Base>true</Base>

+    <Cfg_2>true</Cfg_2>

+    <CfgParent>Base</CfgParent>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Base)'!=''">

+    <OutputExt>exe</OutputExt>

+    <BCC_OptimizeForSpeed>true</BCC_OptimizeForSpeed>

+    <Defines>NO_STRICT</Defines>

+    <DCC_CBuilderOutput>JPHNE</DCC_CBuilderOutput>

+    <DynamicRTL>true</DynamicRTL>

+    <ILINK_ObjectSearchPath>..\test</ILINK_ObjectSearchPath>

+    <UsePackages>true</UsePackages>

+    <ProjectType>CppConsoleApplication</ProjectType>

+    <NoVCL>true</NoVCL>

+    <BCC_CPPCompileAlways>true</BCC_CPPCompileAlways>

+    <PackageImports>rtl.bpi;vcl.bpi;bcbie.bpi;vclx.bpi;vclactnband.bpi;xmlrtl.bpi;bcbsmp.bpi;dbrtl.bpi;vcldb.bpi;bdertl.bpi;vcldbx.bpi;dsnap.bpi;dsnapcon.bpi;vclib.bpi;ibxpress.bpi;adortl.bpi;dbxcds.bpi;dbexpress.bpi;DbxCommonDriver.bpi;websnap.bpi;vclie.bpi;webdsnap.bpi;inet.bpi;inetdbbde.bpi;inetdbxpress.bpi;soaprtl.bpi;Rave75VCL.bpi;teeUI.bpi;tee.bpi;teedb.bpi;IndyCore.bpi;IndySystem.bpi;IndyProtocols.bpi;IntrawebDB_90_100.bpi;Intraweb_90_100.bpi;Jcl.bpi;JclVcl.bpi;JvCoreD11R.bpi;JvSystemD11R.bpi;JvStdCtrlsD11R.bpi;JvAppFrmD11R.bpi;JvBandsD11R.bpi;JvDBD11R.bpi;JvDlgsD11R.bpi;JvBDED11R.bpi;JvCmpD11R.bpi;JvCryptD11R.bpi;JvCtrlsD11R.bpi;JvCustomD11R.bpi;JvDockingD11R.bpi;JvDotNetCtrlsD11R.bpi;JvEDID11R.bpi;JvGlobusD11R.bpi;JvHMID11R.bpi;JvInterpreterD11R.bpi;JvJansD11R.bpi;JvManagedThreadsD11R.bpi;JvMMD11R.bpi;JvNetD11R.bpi;JvPageCompsD11R.bpi;JvPluginD11R.bpi;JvPrintPreviewD11R.bpi;JvRuntimeDesignD11R.bpi;JvTimeFrameworkD11R.bpi;JvValidatorsD11R.bpi;JvWizardD11R.bpi;JvXPCtrlsD11R.bpi;VclSmp.bpi</PackageImports>

+    <BCC_wpar>false</BCC_wpar>

+    <IncludePath>$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..</IncludePath>

+    <ILINK_LibraryPath>$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</ILINK_LibraryPath>

+    <Multithreaded>true</Multithreaded>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Cfg_1)'!=''">

+    <BCC_OptimizeForSpeed>false</BCC_OptimizeForSpeed>

+    <DCC_Optimize>false</DCC_Optimize>

+    <DCC_DebugInfoInExe>true</DCC_DebugInfoInExe>

+    <Defines>_DEBUG;$(Defines)</Defines>

+    <ILINK_FullDebugInfo>true</ILINK_FullDebugInfo>

+    <BCC_InlineFunctionExpansion>false</BCC_InlineFunctionExpansion>

+    <ILINK_DisableIncrementalLinking>true</ILINK_DisableIncrementalLinking>

+    <BCC_UseRegisterVariables>None</BCC_UseRegisterVariables>

+    <DCC_Define>DEBUG</DCC_Define>

+    <BCC_DebugLineNumbers>true</BCC_DebugLineNumbers>

+    <IntermediateOutputDir>Debug</IntermediateOutputDir>

+    <TASM_DisplaySourceLines>true</TASM_DisplaySourceLines>

+    <BCC_StackFrames>true</BCC_StackFrames>

+    <BCC_DisableOptimizations>true</BCC_DisableOptimizations>

+    <ILINK_LibraryPath>$(BDS)\lib\debug;$(ILINK_LibraryPath)</ILINK_LibraryPath>

+    <TASM_Debugging>Full</TASM_Debugging>

+    <BCC_SourceDebuggingOn>true</BCC_SourceDebuggingOn>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Cfg_2)'!=''">

+    <Defines>NDEBUG;$(Defines)</Defines>

+    <IntermediateOutputDir>Release</IntermediateOutputDir>

+    <ILINK_LibraryPath>$(BDS)\lib\release;$(ILINK_LibraryPath)</ILINK_LibraryPath>

+    <TASM_Debugging>None</TASM_Debugging>

+  </PropertyGroup>

+  <ProjectExtensions>

+    <Borland.Personality>CPlusPlusBuilder.Personality</Borland.Personality>

+    <Borland.ProjectType>CppConsoleApplication</Borland.ProjectType>

+    <BorlandProject>

+<BorlandProject><CPlusPlusBuilder.Personality><VersionInfo><VersionInfo Name="IncludeVerInfo">False</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">1033</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Debugging><Debugging Name="DebugSourceDirs"></Debugging></Debugging><Parameters><Parameters Name="RunParams"></Parameters><Parameters Name="Launcher"></Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="DebugCWD"></Parameters><Parameters Name="HostApplication"></Parameters><Parameters Name="RemoteHost"></Parameters><Parameters Name="RemotePath"></Parameters><Parameters Name="RemoteParams"></Parameters><Parameters Name="RemoteLauncher"></Parameters><Parameters Name="UseRemoteLauncher">False</Parameters><Parameters Name="RemoteCWD"></Parameters><Parameters Name="RemoteDebug">False</Parameters><Parameters Name="Debug Symbols Search Path"></Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Excluded_Packages>

+      

+      

+      <Excluded_Packages Name="$(BDS)\bin\bcboffice2k100.bpl">CodeGear C++Builder Office 2000 Servers Package</Excluded_Packages>

+      <Excluded_Packages Name="$(BDS)\bin\bcbofficexp100.bpl">CodeGear C++Builder Office XP Servers Package</Excluded_Packages>

+    </Excluded_Packages><Linker><Linker Name="LibPrefix"></Linker><Linker Name="LibSuffix"></Linker><Linker Name="LibVersion"></Linker></Linker><ProjectProperties><ProjectProperties Name="AutoShowDeps">False</ProjectProperties><ProjectProperties Name="ManagePaths">True</ProjectProperties><ProjectProperties Name="VerifyPackages">True</ProjectProperties></ProjectProperties><HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Count">3</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item0">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test;..</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item1">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include;..\test</HistoryLists_hlIncludePath><HistoryLists_hlIncludePath Name="Item2">$(BDS)\include;$(BDS)\include\dinkumware;$(BDS)\include\vcl;..\include</HistoryLists_hlIncludePath></HistoryLists_hlIncludePath><HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Count">1</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item0">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item1">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;..\test</HistoryLists_hlILINK_LibraryPath><HistoryLists_hlILINK_LibraryPath Name="Item2">$(BDS)\lib;$(BDS)\lib\obj;$(BDS)\lib\psdk;$(OUTPUTDIR);..\test</HistoryLists_hlILINK_LibraryPath></HistoryLists_hlILINK_LibraryPath><HistoryLists_hlDefines><HistoryLists_hlDefines Name="Count">2</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item0">NO_STRICT</HistoryLists_hlDefines><HistoryLists_hlDefines Name="Item1">STRICT</HistoryLists_hlDefines></HistoryLists_hlDefines></CPlusPlusBuilder.Personality></BorlandProject></BorlandProject>

+  </ProjectExtensions>

+  <Import Project="$(MSBuildBinPath)\Borland.Cpp.Targets" />

+  <ItemGroup>

+    <CppCompile Include="..\test\gtest_unittest.cc">

+      <BuildOrder>0</BuildOrder>

+    </CppCompile>

+    <CppCompile Include="gtest_link.cc">

+      <BuildOrder>1</BuildOrder>

+    </CppCompile>

+    <BuildConfiguration Include="Debug">

+      <Key>Cfg_1</Key>

+    </BuildConfiguration>

+    <BuildConfiguration Include="Release">

+      <Key>Cfg_2</Key>

+    </BuildConfiguration>

+  </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/src/3rdparty/webkit/Source/ThirdParty/gyp/gyp.bat b/src/3rdparty/webkit/Source/ThirdParty/gyp/gyp.bat
index 91ebf1e..90fbc6d 100755
--- a/src/3rdparty/webkit/Source/ThirdParty/gyp/gyp.bat
+++ b/src/3rdparty/webkit/Source/ThirdParty/gyp/gyp.bat
@@ -1,5 +1,5 @@
-@rem Copyright (c) 2009 Google Inc. All rights reserved.
-@rem Use of this source code is governed by a BSD-style license that can be
-@rem found in the LICENSE file.
-
-@python "%~dp0/gyp" %*
+@rem Copyright (c) 2009 Google Inc. All rights reserved.

+@rem Use of this source code is governed by a BSD-style license that can be

+@rem found in the LICENSE file.

+

+@python "%~dp0/gyp" %*

diff --git a/src/3rdparty/webkit/Source/ThirdParty/gyp/samples/samples.bat b/src/3rdparty/webkit/Source/ThirdParty/gyp/samples/samples.bat
index 5683255..778d9c9 100644
--- a/src/3rdparty/webkit/Source/ThirdParty/gyp/samples/samples.bat
+++ b/src/3rdparty/webkit/Source/ThirdParty/gyp/samples/samples.bat
@@ -1,5 +1,5 @@
-@rem Copyright (c) 2009 Google Inc. All rights reserved.
-@rem Use of this source code is governed by a BSD-style license that can be
-@rem found in the LICENSE file.
-
-@python %~dp0/samples %*
+@rem Copyright (c) 2009 Google Inc. All rights reserved.

+@rem Use of this source code is governed by a BSD-style license that can be

+@rem found in the LICENSE file.

+

+@python %~dp0/samples %*

diff --git a/src/3rdparty/webkit/Source/ThirdParty/gyp/test/actions/gyptest-errors.py b/src/3rdparty/webkit/Source/ThirdParty/gyp/test/actions/gyptest-errors.py
index 4a2aa07..ca41487 100644
--- a/src/3rdparty/webkit/Source/ThirdParty/gyp/test/actions/gyptest-errors.py
+++ b/src/3rdparty/webkit/Source/ThirdParty/gyp/test/actions/gyptest-errors.py
@@ -1,24 +1,24 @@
-#!/usr/bin/env python
+#!/usr/bin/env python

 
 # Copyright (c) 2009 Google Inc. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-
-"""
-Verifies behavior for different action configuration errors:
-exit status of 1, and the expected error message must be in stderr.
-"""
-
-import TestGyp
-
-test = TestGyp.TestGyp()
-
-
-test.run_gyp('action_missing_name.gyp', chdir='src', status=1, stderr=None)
-expect = [
-  "Anonymous action in target broken_actions2.  An action must have an 'action_name' field.",
-]
-test.must_contain_all_lines(test.stderr(), expect)
-
-
-test.pass_test()
+

+"""

+Verifies behavior for different action configuration errors:

+exit status of 1, and the expected error message must be in stderr.

+"""

+

+import TestGyp

+

+test = TestGyp.TestGyp()

+

+

+test.run_gyp('action_missing_name.gyp', chdir='src', status=1, stderr=None)

+expect = [

+  "Anonymous action in target broken_actions2.  An action must have an 'action_name' field.",

+]

+test.must_contain_all_lines(test.stderr(), expect)

+

+

+test.pass_test()

diff --git a/src/3rdparty/webkit/Source/ThirdParty/gyp/test/actions/src/subdir1/program.c b/src/3rdparty/webkit/Source/ThirdParty/gyp/test/actions/src/subdir1/program.c
index f155939..d5f661d 100644
--- a/src/3rdparty/webkit/Source/ThirdParty/gyp/test/actions/src/subdir1/program.c
+++ b/src/3rdparty/webkit/Source/ThirdParty/gyp/test/actions/src/subdir1/program.c
@@ -1,12 +1,12 @@
-#include <stdio.h>
-
-extern void prog1(void);
-extern void prog2(void);
-
-int main(int argc, char *argv[])
-{
-  printf("Hello from program.c\n");
-  prog1();
-  prog2();
-  return 0;
-}
+#include <stdio.h>

+

+extern void prog1(void);

+extern void prog2(void);

+

+int main(int argc, char *argv[])

+{

+  printf("Hello from program.c\n");

+  prog1();

+  prog2();

+  return 0;

+}

diff --git a/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/actions/subdir1/actions-out/README.txt b/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/actions/subdir1/actions-out/README.txt
index 90ef886..1b052c9 100644
--- a/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/actions/subdir1/actions-out/README.txt
+++ b/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/actions/subdir1/actions-out/README.txt
@@ -1,4 +1,4 @@
-A place-holder for this Xcode build output directory, so that the
-test script can verify that .xcodeproj files are not created in
-their normal location by making the src/ read-only, and then
-selectively making this build directory writable.
+A place-holder for this Xcode build output directory, so that the

+test script can verify that .xcodeproj files are not created in

+their normal location by making the src/ read-only, and then

+selectively making this build directory writable.

diff --git a/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/actions/subdir1/program.c b/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/actions/subdir1/program.c
index f155939..d5f661d 100644
--- a/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/actions/subdir1/program.c
+++ b/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/actions/subdir1/program.c
@@ -1,12 +1,12 @@
-#include <stdio.h>
-
-extern void prog1(void);
-extern void prog2(void);
-
-int main(int argc, char *argv[])
-{
-  printf("Hello from program.c\n");
-  prog1();
-  prog2();
-  return 0;
-}
+#include <stdio.h>

+

+extern void prog1(void);

+extern void prog2(void);

+

+int main(int argc, char *argv[])

+{

+  printf("Hello from program.c\n");

+  prog1();

+  prog2();

+  return 0;

+}

diff --git a/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/actions/subdir2/actions-out/README.txt b/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/actions/subdir2/actions-out/README.txt
index 90ef886..1b052c9 100644
--- a/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/actions/subdir2/actions-out/README.txt
+++ b/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/actions/subdir2/actions-out/README.txt
@@ -1,4 +1,4 @@
-A place-holder for this Xcode build output directory, so that the
-test script can verify that .xcodeproj files are not created in
-their normal location by making the src/ read-only, and then
-selectively making this build directory writable.
+A place-holder for this Xcode build output directory, so that the

+test script can verify that .xcodeproj files are not created in

+their normal location by making the src/ read-only, and then

+selectively making this build directory writable.

diff --git a/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/rules/subdir2/rules-out/README.txt b/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/rules/subdir2/rules-out/README.txt
index 90ef886..1b052c9 100644
--- a/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/rules/subdir2/rules-out/README.txt
+++ b/src/3rdparty/webkit/Source/ThirdParty/gyp/test/generator-output/rules/subdir2/rules-out/README.txt
@@ -1,4 +1,4 @@
-A place-holder for this Xcode build output directory, so that the
-test script can verify that .xcodeproj files are not created in
-their normal location by making the src/ read-only, and then
-selectively making this build directory writable.
+A place-holder for this Xcode build output directory, so that the

+test script can verify that .xcodeproj files are not created in

+their normal location by making the src/ read-only, and then

+selectively making this build directory writable.

diff --git a/src/3rdparty/webkit/Source/ThirdParty/gyp/tools/pretty_gyp.py b/src/3rdparty/webkit/Source/ThirdParty/gyp/tools/pretty_gyp.py
index 128c2e3..04c7901 100644
--- a/src/3rdparty/webkit/Source/ThirdParty/gyp/tools/pretty_gyp.py
+++ b/src/3rdparty/webkit/Source/ThirdParty/gyp/tools/pretty_gyp.py
@@ -1,142 +1,142 @@
-#!/usr/bin/env python
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# This file pretty-prints the contents of a GYP file.
-
-import sys
-import re
-
-input = []
-if len(sys.argv) > 1:
-  input_file = open(sys.argv[1])
-  input = input_file.read().splitlines()
-  input_file.close()
-else:
-  input = sys.stdin.read().splitlines()
-
-# This is used to remove comments when we're counting braces.
-comment_re = re.compile(r'\s*#.*')
-
-# This is used to remove quoted strings when we're counting braces.
-# It takes into account quoted quotes, and makes sure that the quotes
-# match.
-# NOTE: It does not handle quotes that span more than one line, or
-# cases where an escaped quote is preceeded by an escaped backslash.
-quote_re_str = r'(?P<q>[\'"])(.*?)(?<![^\\][\\])(?P=q)'
-quote_re = re.compile(quote_re_str)
-
-def comment_replace(matchobj):
-  return matchobj.group(1) + matchobj.group(2) + '#' * len(matchobj.group(3))
-
-def mask_comments(input):
-  # This is used to mask the quoted strings so we skip braces inside
-  # quoted strings.
-  search_re = re.compile(r'(.*?)(#)(.*)')
-  return [search_re.sub(comment_replace, line) for line in input]
-
-def quote_replace(matchobj):
-  return "%s%s%s%s" % (matchobj.group(1),
-                       matchobj.group(2),
-                       'x'*len(matchobj.group(3)),
-                       matchobj.group(2))
-
-def mask_quotes(input):
-  # This is used to mask the quoted strings so we skip braces inside
-  # quoted strings.
-  search_re = re.compile(r'(.*?)' + quote_re_str)
-  return [search_re.sub(quote_replace, line) for line in input]
-
-def do_split(input, masked_input, search_re):
-  output = []
-  mask_output = []
-  for (line, masked_line) in zip(input, masked_input):
-    m = search_re.match(masked_line)
-    while m:
-      split = len(m.group(1))
-      line = line[:split] + r'\n' + line[split:]
-      masked_line = masked_line[:split] + r'\n' + masked_line[split:]
-      m = search_re.match(masked_line)
-    output.extend(line.split(r'\n'))
-    mask_output.extend(masked_line.split(r'\n'))
-  return (output, mask_output)
-
-# This masks out the quotes and comments, and then splits appropriate
-# lines (lines that matche the double_*_brace re's above) before
-# indenting them below.
-def split_double_braces(input):
-  # These are used to split lines which have multiple braces on them, so
-  # that the indentation looks prettier when all laid out (e.g. closing
-  # braces make a nice diagonal line).
-  double_open_brace_re = re.compile(r'(.*?[\[\{\(,])(\s*)([\[\{\(])')
-  double_close_brace_re = re.compile(r'(.*?[\]\}\)],?)(\s*)([\]\}\)])')
-
-  masked_input = mask_quotes(input)
-  masked_input = mask_comments(masked_input)
-
-  (output, mask_output) = do_split(input, masked_input, double_open_brace_re)
-  (output, mask_output) = do_split(output, mask_output, double_close_brace_re)
-
-  return output
-
-# This keeps track of the number of braces on a given line and returns
-# the result.  It starts at zero and subtracts for closed braces, and
-# adds for open braces.
-def count_braces(line):
-  open_braces = ['[', '(', '{']
-  close_braces = [']', ')', '}']
-  closing_prefix_re = re.compile(r'(.*?[^\s\]\}\)]+.*?)([\]\}\)],?)\s*$')
-  cnt = 0
-  stripline = comment_re.sub(r'', line)
-  stripline = quote_re.sub(r"''", stripline)
-  for char in stripline:
-    for brace in open_braces:
-      if char == brace:
-        cnt += 1
-    for brace in close_braces:
-      if char == brace:
-        cnt -= 1
-
-  after = False
-  if cnt > 0:
-    after = True
-
-  # This catches the special case of a closing brace having something
-  # other than just whitespace ahead of it -- we don't want to
-  # unindent that until after this line is printed so it stays with
-  # the previous indentation level.
-  if cnt < 0 and closing_prefix_re.match(stripline):
-    after = True
-  return (cnt, after)
-
-# This does the main work of indenting the input based on the brace counts.
-def prettyprint_input(lines):
-  indent = 0
-  basic_offset = 2
-  last_line = ""
-  for line in lines:
-    if comment_re.match(line):
-      print line
-    else:
-      line = line.strip('\r\n\t ')  # Otherwise doesn't strip \r on Unix.
-      if len(line) > 0:
-        (brace_diff, after) = count_braces(line)
-        if brace_diff != 0:
-          if after:
-            print " " * (basic_offset * indent) + line
-            indent += brace_diff
-          else:
-            indent += brace_diff
-            print " " * (basic_offset * indent) + line
-        else:
-          print " " * (basic_offset * indent) + line
-      else:
-        print ""
-      last_line = line
-
-# Split up the double braces.
-lines = split_double_braces(input)
-
-# Indent and print the output.
-prettyprint_input(lines)
+#!/usr/bin/env python

+# Copyright (c) 2009 The Chromium Authors. All rights reserved.

+# Use of this source code is governed by a BSD-style license that can be

+# found in the LICENSE file.

+

+# This file pretty-prints the contents of a GYP file.

+

+import sys

+import re

+

+input = []

+if len(sys.argv) > 1:

+  input_file = open(sys.argv[1])

+  input = input_file.read().splitlines()

+  input_file.close()

+else:

+  input = sys.stdin.read().splitlines()

+

+# This is used to remove comments when we're counting braces.

+comment_re = re.compile(r'\s*#.*')

+

+# This is used to remove quoted strings when we're counting braces.

+# It takes into account quoted quotes, and makes sure that the quotes

+# match.

+# NOTE: It does not handle quotes that span more than one line, or

+# cases where an escaped quote is preceeded by an escaped backslash.

+quote_re_str = r'(?P<q>[\'"])(.*?)(?<![^\\][\\])(?P=q)'

+quote_re = re.compile(quote_re_str)

+

+def comment_replace(matchobj):

+  return matchobj.group(1) + matchobj.group(2) + '#' * len(matchobj.group(3))

+

+def mask_comments(input):

+  # This is used to mask the quoted strings so we skip braces inside

+  # quoted strings.

+  search_re = re.compile(r'(.*?)(#)(.*)')

+  return [search_re.sub(comment_replace, line) for line in input]

+

+def quote_replace(matchobj):

+  return "%s%s%s%s" % (matchobj.group(1),

+                       matchobj.group(2),

+                       'x'*len(matchobj.group(3)),

+                       matchobj.group(2))

+

+def mask_quotes(input):

+  # This is used to mask the quoted strings so we skip braces inside

+  # quoted strings.

+  search_re = re.compile(r'(.*?)' + quote_re_str)

+  return [search_re.sub(quote_replace, line) for line in input]

+

+def do_split(input, masked_input, search_re):

+  output = []

+  mask_output = []

+  for (line, masked_line) in zip(input, masked_input):

+    m = search_re.match(masked_line)

+    while m:

+      split = len(m.group(1))

+      line = line[:split] + r'\n' + line[split:]

+      masked_line = masked_line[:split] + r'\n' + masked_line[split:]

+      m = search_re.match(masked_line)

+    output.extend(line.split(r'\n'))

+    mask_output.extend(masked_line.split(r'\n'))

+  return (output, mask_output)

+

+# This masks out the quotes and comments, and then splits appropriate

+# lines (lines that matche the double_*_brace re's above) before

+# indenting them below.

+def split_double_braces(input):

+  # These are used to split lines which have multiple braces on them, so

+  # that the indentation looks prettier when all laid out (e.g. closing

+  # braces make a nice diagonal line).

+  double_open_brace_re = re.compile(r'(.*?[\[\{\(,])(\s*)([\[\{\(])')

+  double_close_brace_re = re.compile(r'(.*?[\]\}\)],?)(\s*)([\]\}\)])')

+

+  masked_input = mask_quotes(input)

+  masked_input = mask_comments(masked_input)

+

+  (output, mask_output) = do_split(input, masked_input, double_open_brace_re)

+  (output, mask_output) = do_split(output, mask_output, double_close_brace_re)

+

+  return output

+

+# This keeps track of the number of braces on a given line and returns

+# the result.  It starts at zero and subtracts for closed braces, and

+# adds for open braces.

+def count_braces(line):

+  open_braces = ['[', '(', '{']

+  close_braces = [']', ')', '}']

+  closing_prefix_re = re.compile(r'(.*?[^\s\]\}\)]+.*?)([\]\}\)],?)\s*$')

+  cnt = 0

+  stripline = comment_re.sub(r'', line)

+  stripline = quote_re.sub(r"''", stripline)

+  for char in stripline:

+    for brace in open_braces:

+      if char == brace:

+        cnt += 1

+    for brace in close_braces:

+      if char == brace:

+        cnt -= 1

+

+  after = False

+  if cnt > 0:

+    after = True

+

+  # This catches the special case of a closing brace having something

+  # other than just whitespace ahead of it -- we don't want to

+  # unindent that until after this line is printed so it stays with

+  # the previous indentation level.

+  if cnt < 0 and closing_prefix_re.match(stripline):

+    after = True

+  return (cnt, after)

+

+# This does the main work of indenting the input based on the brace counts.

+def prettyprint_input(lines):

+  indent = 0

+  basic_offset = 2

+  last_line = ""

+  for line in lines:

+    if comment_re.match(line):

+      print line

+    else:

+      line = line.strip('\r\n\t ')  # Otherwise doesn't strip \r on Unix.

+      if len(line) > 0:

+        (brace_diff, after) = count_braces(line)

+        if brace_diff != 0:

+          if after:

+            print " " * (basic_offset * indent) + line

+            indent += brace_diff

+          else:

+            indent += brace_diff

+            print " " * (basic_offset * indent) + line

+        else:

+          print " " * (basic_offset * indent) + line

+      else:

+        print ""

+      last_line = line

+

+# Split up the double braces.

+lines = split_double_braces(input)

+

+# Indent and print the output.

+prettyprint_input(lines)

diff --git a/src/3rdparty/webkit/Source/WebCore/ChangeLog b/src/3rdparty/webkit/Source/WebCore/ChangeLog
index f112cba..da9d1b2 100644..100755
--- a/src/3rdparty/webkit/Source/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/Source/WebCore/ChangeLog
@@ -1,3 +1,1376 @@
+2011-09-12  Adam Klein  <adamk@chromium.org>
+
+        Fix out-of-bounds access in Gradient::sortStopsIfNecessary
+        https://bugs.webkit.org/show_bug.cgi?id=67958
+
+        Reviewed by Darin Adler.
+
+        Reported by Valgrind in http://crbug.com/77049.
+
+        The errant code was added as an optimization in r67804.
+        This patch reverts that one, as all parties agree that the optimization
+        doesn't seem worthwhile, and there clearly aren't any tests covering
+        the special case.
+
+        No new tests, as existing tests should cover the remaining call to
+        |std::stable_sort|.
+
+        * platform/graphics/Gradient.cpp:
+        (WebCore::Gradient::sortStopsIfNecessary):
+
+2011-09-09  Dominic Mazzoni  <dmazzoni@google.com>
+
+        Assert being hit in AccessibilityRenderObject::addChildren()
+        https://bugs.webkit.org/show_bug.cgi?id=61805
+
+        Reviewed by Chris Fleizach.
+
+        Fix nextSibling and previousSibling to handle adjacent continuations
+        properly, otherwise nodes end up appearing in the accessibility
+        tree twice (or a debug assertion could be raised).
+
+        Test: accessibility/adjacent-continuations-cause-assertion-failure.html
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::previousSibling):
+        (WebCore::AccessibilityRenderObject::nextSibling):
+
+2011-09-08  Abhishek Arya  <inferno@chromium.org>
+
+        :before content rendering issues with list markers and run-ins.
+        https://bugs.webkit.org/show_bug.cgi?id=67735
+
+        1) Remove the isAnonymous checks for run-in detection since the
+        run-in can belong to a node.
+        2) When the parent has block children, then the list marker will
+        be enclosed in an anonymous block. In that case, for going to the
+        next list marker, we need to traverse one level up. We don't need
+        this check when searching for generated run-in (loop 2), since we
+        know parent will have inline children, so the list marker wont be
+        enclosed in an anonymous block.
+
+        Reviewed by Dave Hyatt.
+
+        Tests: fast/lists/list-marker-before-content-table.html
+               fast/runin/runin-generated-before-content.html
+
+        * rendering/RenderObjectChildList.cpp:
+        (WebCore::RenderObjectChildList::beforePseudoElementRenderer):
+
+2011-09-10  Ken Buchanan <kenrb@chromium.org>
+
+        Crash due to bad data in SVGDocumentExtensions m_pendingResources
+        https://bugs.webkit.org/show_bug.cgi?id=67488
+
+        Reviewed by Nikolas Zimmermann.
+
+        Resolving a crash condition caused by the deletion of
+        elements while pending resource entries for those elements are still
+        recorded.
+
+        * rendering/svg/RenderSVGResourceContainer.cpp:
+        (WebCore::RenderSVGResourceContainer::registerResource)
+        * svg/SVGDocumentExtensions.h:
+        (WebCore::SVGDocumentExtensions::isElementInPendingResources)
+        * svg/SVGDocumentExtensions.cpp:
+        (WebCore::SVGDocumentExtensions::addPendingResource)
+        (WebCore::SVGDocumentExtensions::isElementInPendingResources)
+        (WebCore::SVGDocumentExtensions::removeElementFromPendingResources)
+        * svg/SVGStyledElement.h:
+        (WebCore::SVGStyledElement::clearHasPendingResourcesIfPossible)
+        * svg/SVGStyledElement.cpp:
+        (WebCore::SVGStyledElement::buildPendingResourcesIfNeeded)
+        (WebCore::SVGStyledElement::clearHasPendingResourcesIfPossible)
+        * svg/SVGUseElement.cpp:
+        (WebCore::SVGUseElement::svgAttributeChanged)
+
+2011-09-08  Alexey Proskuryakov  <ap@apple.com>
+
+        REGRESSION (r66874): Missing RefPtr in ScriptController
+        https://bugs.webkit.org/show_bug.cgi?id=67748
+
+        Reviewed by Adam Barth.
+
+        * bindings/ScriptControllerBase.cpp: (WebCore::ScriptController::executeScript):
+
+2011-09-06  Abhishek Arya  <inferno@chromium.org>
+
+        Style not propagated to anonymous boxes and anonymous
+        inline-blocks.
+        https://bugs.webkit.org/show_bug.cgi?id=67364
+
+        Reviewed by James Robinson.
+
+        Share propagateStyleToAnonymousChildren with RenderBlock::styleDidChange.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::styleDidChange):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::propagateStyleToAnonymousChildren):
+        * rendering/RenderObject.h:
+
+2011-09-04  Abhishek Arya  <inferno@chromium.org>
+
+        Style not propagated to anonymous boxes and anonymous
+        inline-blocks.
+        https://bugs.webkit.org/show_bug.cgi?id=67364
+
+        Reviewed by James Robinson.
+
+        Tests: fast/ruby/ruby-block-style-not-updated-with-before-after-content.html
+               fast/ruby/ruby-block-style-not-updated.html
+               fast/ruby/ruby-inline-style-not-updated-with-before-after-content.html
+               fast/ruby/ruby-inline-style-not-updated.html
+               fast/table/table-row-style-not-updated-with-after-content.html
+               fast/table/table-row-style-not-updated-with-before-content.html
+               fast/table/table-row-style-not-updated.html
+               fast/table/table-style-not-updated.html
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::propagateStyleToAnonymousChildren):
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::isBeforeAfterContent):
+        * rendering/RenderRuby.cpp:
+        (WebCore::RenderRubyAsInline::styleDidChange):
+        (WebCore::RenderRubyAsBlock::styleDidChange):
+        * rendering/RenderRuby.h:
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::styleDidChange):
+        * rendering/RenderTableRow.cpp:
+        (WebCore::RenderTableRow::styleDidChange):
+        (WebCore::RenderTableRow::addChild):
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::styleDidChange):
+        (WebCore::RenderTableSection::addChild):
+        * rendering/RenderTableSection.h:
+
+2011-09-05  Abhishek Arya  <inferno@chromium.org>
+
+        Crash in RenderObjectChildList::destroyLeftOverChildren()
+        https://bugs.webkit.org/show_bug.cgi?id=64753
+
+        Reviewed by James Robinson.
+
+        If any of the ancestors between column span element and containing
+        column's block is a continuation, then don't attempt to render the
+        column span by splitting the block into continuations.
+
+        Test: fast/multicol/column-span-parent-continuation-crash.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::columnsBlockForSpanningElement):
+
+2011-08-30  Abhishek Arya  <inferno@chromium.org>
+
+        Removed m_owner accessed in custom scrollbars.
+        https://bugs.webkit.org/show_bug.cgi?id=64737
+
+        Reviewed by David Hyatt.
+
+        Problem does not reproduce in DRT, even with Eventhandler tricks
+        and gc(). So, adding a manual test.
+
+        * manual-tests/custom-scrollbar-renderer-removed-crash.html: Added.
+        * page/FrameView.cpp:
+        (WebCore::FrameView::clearOwningRendererForCustomScrollbars):
+        * page/FrameView.h:
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::willBeDestroyed): when this renderbox is getting
+        destroyed, clear the custom scrollbar in this frameview having this renderbox
+        as its owning renderer.
+        * rendering/RenderScrollbar.cpp:
+        (WebCore::RenderScrollbar::getScrollbarPseudoStyle): fix the null check.
+
+2011-09-04  Abhishek Arya  <inferno@chromium.org>
+
+        Crash in Range::processAncestorsAndTheirSiblings.
+        https://bugs.webkit.org/show_bug.cgi?id=67556
+
+        Reviewed by Ryosuke Niwa.
+
+        Create a temporary RefPtr Node vector to keep all the ancestor's
+        childs so that we don't access removed child nodes.
+
+        Test: fast/dom/Range/range-delete-contents-event-fire-crash.html
+
+        * dom/Range.cpp:
+        (WebCore::Range::processContents):
+        (WebCore::Range::processAncestorsAndTheirSiblings):
+
+2011-08-30  Adam Barth  <abarth@webkit.org>
+
+        Flaky crash with JavaScript URLs
+        https://bugs.webkit.org/show_bug.cgi?id=66360
+
+        Reviewed by Nate Chapin.
+
+        This patch teaches DocumentWriter::begin to make a copy of the URL
+        before beginning a new document to avoid a crash.
+
+        Test: fast/loader/javascript-url-iframe-crash.html
+
+        * loader/DocumentWriter.cpp:
+        (WebCore::DocumentWriter::begin):
+
+2011-08-30  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Emit last progress notification before calling dispatchDidFinishLoad
+        https://bugs.webkit.org/show_bug.cgi?id=28851
+
+        Reviewed by Adam Barth.
+
+        Original patch by Xan Lopez. Change FrameLoader to dispatch the notifications in
+        a more natural sequence.
+
+        Test: http/tests/loading/progress-finished-callback.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::checkLoadCompleteForThisFrame):
+
+2011-08-22  Nate Chapin  <japhet@chromium.org>
+
+        Unload events can crash us when they blank out
+        a parent frame.
+        https://bugs.webkit.org/show_bug.cgi?id=64741
+
+        Reviewed by Adam Barth.
+
+        Test: fast/loader/document-destruction-within-unload.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::stopLoading): Prevent unload events
+            from going into infinite recursion.
+        (WebCore::FrameLoader::setDocumentLoader): Ensure we don't
+            let set m_documentLoader to a DocumentLoader with a null Frame*.
+        (WebCore::FrameLoader::detachChildren): Save off a vector of
+            children to detach, rather than doing it inline.
+
+2011-08-30  Abhishek Arya  <inferno@chromium.org>
+
+        Style not updated for table parts in :before, :after content.
+        https://bugs.webkit.org/show_bug.cgi?id=66141        
+
+        Reviewed by Dave Hyatt.
+
+        Tests: fast/table/table-before-child-style-update.html
+               fast/table/table-row-before-child-style-update.html
+
+        * rendering/RenderObjectChildList.cpp:
+        (WebCore::RenderObjectChildList::updateBeforeAfterContent):
+
+2011-08-25  Abhishek Arya  <inferno@chromium.org>
+
+        Incorrect layout of :before and :after content, with display
+        table, table-row and table-cell.
+        https://bugs.webkit.org/show_bug.cgi?id=66699
+
+        Reviewed by David Hyatt.
+
+        Tests: fast/table/table-after-child-in-table.html
+               fast/table/table-before-child-in-table.html
+               fast/table/table-cell-after-child-in-block.html
+               fast/table/table-cell-after-child-in-table.html
+               fast/table/table-cell-before-child-in-block.html
+               fast/table/table-cell-before-child-in-table.html
+               fast/table/table-row-after-child-in-block.html
+               fast/table/table-row-after-child-in-table.html
+               fast/table/table-row-before-child-in-block.html
+               fast/table/table-row-before-child-in-table.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::addChildIgnoringAnonymousColumnBlocks):
+        Fix the looping condition to detect :after child correctly.
+        isAnonymousBlock() does not apply to tables, instead
+        using isAnonymous().
+        * rendering/RenderTableRow.cpp:
+        (WebCore::RenderTableRow::addChild): Don't add the new child
+        in the generatedContainer with :before, :after content.
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::addChild): Don't add the new child
+        in the generatedContainer with :before, :after content.
+
+2011-08-29  Abhishek Arya  <inferno@chromium.org>
+
+        Crash in InlineBox::deleteLine due to accessing removed
+        renderer.
+        https://bugs.webkit.org/show_bug.cgi?id=66015
+
+        Reviewed by Simon Fraser.
+
+        Test: fast/block/line-layout/inline-box-wrapper-crash.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::positionLineBox): Make sure that the
+        previous inline box wrapper is destroyed properly, before
+        setting a new one.
+
+2011-08-30  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
+
+        [Qt] Do not unconditionally use pkg-config in .pro files
+        https://bugs.webkit.org/show_bug.cgi?id=67055
+
+        Reviewed by Andreas Kling.
+
+        Original patch from Rohan McGovern <rohan.mcgovern@nokia.com>
+
+        Using the first pkg-config in PATH is prone to errors when cross
+        compiling inside the Qt repository (using Qt's build-system).
+
+        This patch protect calls for pkg-config with
+        !contains(QT_CONFIG, no-pkg-config). no-pkg-config is added to
+        QT_CONFIG by Qt's 'configure' when cross-compiling on systems
+        without pkg-config.
+
+        The respective change in Qt's configure has been submited already.
+
+        No new tests as this is just a build change.
+
+        * features.pri: protect pkg-config calls
+
+2011-08-25  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
+
+        [Qt] Enable password echo on Symbian builds
+        https://bugs.webkit.org/show_bug.cgi?id=66954
+
+        Reviewed by Chang Shu.
+
+        No tests, as this is just a build change.
+
+        * config.h:
+
+2011-08-23  Chang Shu  <cshu@webkit.org>
+
+        Added support for momentarily revealing last typed character in password input.
+        Code change was partially based on Apple's iOS code and Samuel Nevala's work.
+        https://bugs.webkit.org/show_bug.cgi?id=32509
+
+        Reviewed by Alexey Proskuryakov.
+
+        * editing/InsertIntoTextNodeCommand.cpp:
+        (WebCore::InsertIntoTextNodeCommand::doApply):
+        * rendering/RenderText.cpp:
+        (WebCore::SecureTextTimer::SecureTextTimer):
+        (WebCore::SecureTextTimer::restartWithNewText):
+        (WebCore::SecureTextTimer::invalidate):
+        (WebCore::SecureTextTimer::lastTypedCharacterOffset):
+        (WebCore::SecureTextTimer::fired):
+        (WebCore::RenderText::willBeDestroyed):
+        (WebCore::RenderText::setTextInternal):
+        (WebCore::RenderText::secureText):
+        (WebCore::RenderText::momentarilyRevealLastTypedCharacter):
+        * rendering/RenderText.h:
+        (WebCore::RenderText::isSecure):
+        * testing/Internals.cpp:
+        (WebCore::Internals::setPasswordEchoEnabled): Fixed some silly coding in Internals.
+        (WebCore::Internals::setPasswordEchoDurationInSeconds):
+        (WebCore::Internals::reset):
+
+2011-07-08  Chang Shu  <cshu@webkit.org>
+
+        Update calling sites after function renamed.
+        https://bugs.webkit.org/show_bug.cgi?id=59114
+
+        Reviewed by Alexey Proskuryakov.
+
+        No new tests, just refactoring.
+
+        * editing/visible_units.cpp:
+        (WebCore::previousBoundary):
+        (WebCore::nextBoundary):
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::setTextInternal):
+
+2011-08-18  Chang Shu  <cshu@webkit.org>
+
+        Add support of setPasswordEchoEnabled and setPasswordEchoDuration for password echo feature
+        https://bugs.webkit.org/show_bug.cgi?id=66052
+
+        Reviewed by Alexey Proskuryakov.
+
+        Added runtime settings in WebCore.
+        Added support in window.internals for testing.
+
+        Tests: editing/input/password-echo-passnode.html
+               editing/input/password-echo-passnode2.html
+               editing/input/password-echo-passnode3.html
+               editing/input/password-echo-textnode.html
+
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        * page/Settings.h:
+        (WebCore::Settings::setPasswordEchoEnabled):
+        (WebCore::Settings::passwordEchoEnabled):
+        (WebCore::Settings::setPasswordEchoDurationInSeconds):
+        (WebCore::Settings::passwordEchoDurationInSeconds):
+        * testing/Internals.cpp:
+        (WebCore::Internals::Internals):
+        (WebCore::Internals::setPasswordEchoEnabled):
+        (WebCore::Internals::setPasswordEchoDurationInSeconds):
+        (WebCore::Internals::reset):
+        * testing/Internals.h:
+        * testing/Internals.idl:
+
+2011-08-16  Chang Shu  <cshu@webkit.org>
+
+        Support reset in WebCore::Internals
+        https://bugs.webkit.org/show_bug.cgi?id=66307
+
+        Reviewed by Dimitri Glazkov.
+
+        New tests will be added when function reset is implemented.
+
+        Added framework code in WebCoreTestSupport. The real implementation of
+        Internals::reset() depends on the need from the settings that require a reset.
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::reset):
+        * testing/Internals.h:
+        * testing/js/WebCoreTestSupport.cpp:
+        (WebCoreTestSupport::resetInternalsObject):
+        * testing/js/WebCoreTestSupport.h:
+        * testing/v8/WebCoreTestSupport.cpp:
+        (WebCoreTestSupport::resetInternalsObject):
+        * testing/v8/WebCoreTestSupport.h:
+
+2011-06-09  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Teach Qt about window.internals
+        https://bugs.webkit.org/show_bug.cgi?id=61074
+
+        A weakness of the Qt DRT setup is that things like JSContextRef are abstracted
+        away from the QtWebKit API so we need DumpRenderTreeSupportQt to access WebCore internals.
+        Since the window.internals object requires JSContextRef we need to implement it in DumpRenderTreeSupportQt
+        where we can access it. DumpRenderTreeSupportQt cannot be compiled outside Qt's WebCore and as it
+        is our only possible route into the WebCoreTestSupport class neither can the new window.internals plumbing.
+        Likewise we can't put the accessor in WebCoreTestSupport because it would then need to know about QWebFrame
+        and others. The only alternative seems like a compile time guard which we would have to teach the bots about.
+
+        * CodeGenerators.pri:
+        * WebCore.pri:
+        * WebCore.pro:
+
+2011-06-02  Dimitri Glazkov  <dglazkov@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Add build logistics and plumbing for window.internals object.
+        https://bugs.webkit.org/show_bug.cgi?id=60313
+
+        Test: fast/harness/internals-object.html
+
+        * Configurations/WebCoreTestSupport.xcconfig: Added.
+        * DerivedSources.make: Added support for generating from Internals.idl.
+        * WebCore.gyp/WebCore.gyp: Added new webcore_test_support library.
+        * WebCore.gypi: Ditto.
+        * WebCore.xcodeproj/project.pbxproj: Added WebCoreTestSupport library.
+        * testing/Internals.cpp: Added.
+        * testing/Internals.h: Added.
+        * testing/Internals.idl: Added.
+        * testing/js/WebCoreTestSupport.cpp: Added.
+        * testing/js/WebCoreTestSupport.h: Added.
+        * testing/v8/WebCoreTestSupport.cpp: Added.
+        * testing/v8/WebCoreTestSupport.h: Added.
+
+2011-08-22  Abhishek Arya  <inferno@chromium.org>
+
+        Crash in FocusController::advanceFocusInDocumentOrder
+        https://bugs.webkit.org/show_bug.cgi?id=66678
+
+        RefPtr the focusable node to prevent getting deleted by mutation
+        event.
+
+        Reviewed by Dave Hyatt.
+
+        Test: fast/frames/focus-controller-crash-change-event.html
+
+        * page/FocusController.cpp:
+        (WebCore::FocusController::advanceFocusInDocumentOrder):
+
+2011-08-18  Ryosuke Niwa  <rniwa@webkit.org>
+
+        SimplifiedBackwardsTextIterator returns incorrect offset with first-letter rule
+        https://bugs.webkit.org/show_bug.cgi?id=66086
+
+        Reviewed by Darin Adler.
+
+        The bug was caused by SimplifiedBackwardsTextIterator's not taking care of first-letter at all.
+        Fixing the bug by detecting RenderTextFragment in handleTextNode.
+
+        Also added m_shouldHandleFirstLetter to SimplifiedBackwardsTextIterator to keep track of whether or not
+        the next call to handleTextNode needs to process the first-letter part of the text fragment.
+
+        Test: editing/text-iterator/backward-textiterator-first-letter-crash.html
+
+        * editing/TextIterator.cpp:
+        (WebCore::firstRenderTextInFirstLetter): Extracted from handleTextNodeFirstLetter.
+        (WebCore::TextIterator::handleTextNodeFirstLetter): Calls firstRenderTextInFirstLetter.
+        (WebCore::SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator):
+        (WebCore::SimplifiedBackwardsTextIterator::handleTextNode):
+        (WebCore::SimplifiedBackwardsTextIterator::handleFirstLetter): Added.
+        * editing/TextIterator.h:
+
+2011-08-23  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [Qt] Fix build on Lion
+
+        https://bugs.webkit.org/show_bug.cgi?id=66770
+
+        Reviewed by Andreas Kling.
+
+        We were mistakenly picking up mac/WebCoreSystemInterface.h instead of
+        the Qt one, and building on Lion revealed this when a typedef for
+        IOSurfaceRef was wrapped in PLATFORM(MAC).
+
+        For now we fix this by including WebCoreSystemInterface using
+        brackets, so that we'll pick up the right file based on the
+        include paths. This also means exposing a few missing enums
+        in our own version of the file, so those were added.
+
+        Lasty, we need to link against the right system interface library
+        on Lion.
+
+        * platform/mac/WebVideoFullscreenHUDWindowController.mm:
+        * platform/qt/WebCoreSystemInterface.h:
+
+2011-08-08  Cris Neckar  <cdn@chromium.org>
+
+        Remove counter nodes from the tree and fix-up children when they are removed from the counter map.
+        https://bugs.webkit.org/show_bug.cgi?id=65346
+
+        Reviewed by Adam Barth.
+
+        Covered by existing CSS counter tests.
+
+        * rendering/CounterNode.cpp:
+        (WebCore::CounterNode::~CounterNode):
+
+2011-08-17  Oliver Hunt  <oliver@apple.com>
+
+        Move towards supporting user controlled prototypes on CanvasPixelArray
+        https://bugs.webkit.org/show_bug.cgi?id=66429
+
+        Reviewed by Gavin Barraclough.
+
+        Start using a per-global object structure for canvas pixel array.
+
+        * bindings/js/JSImageDataCustom.cpp:
+        (WebCore::toJS):
+
+2011-08-17  Abhishek Arya  <inferno@chromium.org>
+
+        Crash in Document::recalcStyleSelector
+        https://bugs.webkit.org/show_bug.cgi?id=66335
+
+        Reviewed by Simon Fraser.
+
+        When node is getting destroyed and its removedFromDocument
+        is not called due to entire document structure torn down(using
+        removeAllChildren), make sure to clear out the stylesheet
+        candidate node from document's structures in its destructor.
+
+        Test: svg/dom/stylesheet-candidate-node-crash-main.html
+
+        * dom/ProcessingInstruction.cpp:
+        (WebCore::ProcessingInstruction::~ProcessingInstruction):
+        * html/HTMLLinkElement.cpp:
+        (WebCore::HTMLLinkElement::~HTMLLinkElement):
+        * html/HTMLStyleElement.cpp:
+        (WebCore::HTMLStyleElement::~HTMLStyleElement):
+        * svg/SVGStyleElement.cpp:
+        (WebCore::SVGStyleElement::~SVGStyleElement):
+
+2011-08-12  Abhishek Arya  <inferno@chromium.org>
+
+        Crash in WebCore::editingIgnoresContent
+        https://bugs.webkit.org/show_bug.cgi?id=66125
+
+        Reviewed by Ryosuke Niwa.
+
+        RefPtr a few nodes in case they get blown away in
+        dispatchEvent calls.
+
+        Test: editing/selection/select-start-remove-root-crash.html
+
+        * editing/FrameSelection.cpp:
+        (WebCore::FrameSelection::selectAll):
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplacementFragment::ReplacementFragment):
+
+2011-08-13  Abhishek Arya  <inferno@chromium.org>
+
+        Crash in HTMLTreeBuilder::processAnyOtherEndTagForInBody
+        https://bugs.webkit.org/show_bug.cgi?id=66187
+
+        Reviewed by Adam Barth.
+
+        RefPtr a few ContainerNodes to prevent premature deletion.
+
+        Test: fast/html/process-end-tag-for-inbody-crash.html
+
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processCloseWhenNestedTag):
+        (WebCore::HTMLTreeBuilder::processAnyOtherEndTagForInBody):
+        (WebCore::HTMLTreeBuilder::callTheAdoptionAgency):
+
+2011-08-10  Abhishek Arya  <inferno@chromium.org>
+
+        Check that we do not need layout before trying to dirty
+        m_originatingLine for our floats.
+        https://bugs.webkit.org/show_bug.cgi?id=65938
+
+        Reviewed by Dave Hyatt.
+
+        Test: fast/block/float/float-originating-line-deleted-crash.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::removeFloatingObject):
+        (WebCore::RenderBlock::clearFloats):
+
+2011-08-11  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Unreviewed build fix for Qt.
+
+        Make sure we build when Qt is namespaced.
+
+        * platform/graphics/gstreamer/PlatformVideoWindowPrivate.h:
+
+2011-08-06  Aron Rosenberg  <arosenberg@logitech.com>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] Fix build with Intel compiler on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=65088
+
+        Intel compiler needs .lib suffixes instead of .a
+
+        * WebCore.pri:
+
+2011-08-03  Kent Tamura  <tkent@chromium.org>
+
+        Fix incorrect checks for HTMLMediaElement
+        https://bugs.webkit.org/show_bug.cgi?id=65590
+
+        Reviewed by Dimitri Glazkov.
+
+        <video> and <audio> can be an HTMLElement instance instead of
+        HTMLMediaElement if MediaPlayer::isAvailable() returns false or
+        the media feature is disabled at runtime.
+
+        * html/HTMLSourceElement.cpp:
+        (WebCore::HTMLSourceElement::insertedIntoTree):
+        (WebCore::HTMLSourceElement::willRemove):
+        * html/HTMLTrackElement.cpp:
+        (WebCore::HTMLTrackElement::insertedIntoTree):
+        (WebCore::HTMLTrackElement::willRemove):
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::toParentMediaElement):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::updateWidget):
+        * platform/efl/RenderThemeEfl.cpp:
+        (WebCore::RenderThemeEfl::paintMediaMuteButton):
+        * platform/gtk/RenderThemeGtk.cpp:
+        (WebCore::getMediaElementFromRenderObject):
+        * rendering/RenderThemeMac.mm:
+        (WebCore::RenderThemeMac::paintMediaSliderTrack):
+        * rendering/RenderThemeWinCE.cpp:
+        (WebCore::mediaElementParent):
+
+2011-07-28  Abhishek Arya  <inferno@chromium.org>
+
+        Regression(82144): Crash in TrailingObjects::updateMidpointsForTrailingBoxes
+        https://bugs.webkit.org/show_bug.cgi?id=65137
+
+        Fix the looping condition to prevent trailingSpaceMidpoint from becoming negative.
+
+        Reviewed by Dave Hyatt.
+
+        Test: fast/block/update-midpoints-for-trailing-boxes-crash.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::TrailingObjects::updateMidpointsForTrailingBoxes):
+
+2011-08-01  Jochen Eisinger  <jochen@chromium.org>
+
+        Never override the policy URL on form submissions.
+        https://bugs.webkit.org/show_bug.cgi?id=61809
+
+        Reviewed by Adam Barth.
+
+        Tests: http/tests/security/cookies/third-party-cookie-blocking-main-frame.html
+               http/tests/security/cookies/third-party-cookie-blocking-user-action.html
+               http/tests/security/cookies/third-party-cookie-blocking.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadURL):
+        (WebCore::FrameLoader::addExtraFieldsToSubresourceRequest):
+        (WebCore::FrameLoader::addExtraFieldsToMainResourceRequest):
+        (WebCore::FrameLoader::addExtraFieldsToRequest):
+        (WebCore::FrameLoader::loadPostRequest):
+        (WebCore::FrameLoader::loadDifferentDocumentItem):
+        * loader/FrameLoader.h:
+
+
+2011-07-27  Alexis Menard  <alexis.menard@openbossa.org>
+
+        [Qt] Unreviewed build fix for mac.
+
+        QtKit is now our default media player, the define is WTF_USE_QTKIT and it's not part
+        of the options passed to build-webkit, therefore DerivedSources should now generate the
+        includes when it's mac.
+
+        * DerivedSources.pro:
+        * WebCore.pro:
+
+2011-07-07  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Reviewed by David Hyatt.
+
+        Partial layout when a flex-box has visibility: collapse
+        https://bugs.webkit.org/show_bug.cgi?id=63776
+
+        Tests: fast/flexbox/crash-button-input-autofocus.html
+               fast/flexbox/crash-button-keygen.html
+               fast/flexbox/crash-button-relayout.html
+
+        The issue is that FlexBoxIterator would skip any child if it has visibility: collapsed.
+        However if one of the child is anonymous, it may wrap some other child that would be skipped.
+        Now FlexBoxIterator is called during the layout phase and thus some nodes would not relayouted
+        as expected.
+
+        * rendering/RenderDeprecatedFlexibleBox.cpp:
+        (WebCore::FlexBoxIterator::next): When iterating, don't skip anonymous content as there may
+        be real content hiding below.
+
+2011-06-30  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Update SVG position values on SVG DOM updates
+        https://bugs.webkit.org/show_bug.cgi?id=62439
+
+        Test: svg/custom/crash-textPath-attributes.html
+
+        * rendering/svg/RenderSVGInline.cpp:
+        (WebCore::RenderSVGInline::destroy): Notify our containing RenderSVGText that it needs
+        to update its positioning information.
+
+        * rendering/svg/SVGInlineFlowBox.cpp:
+        (WebCore::SVGInlineFlowBox::calculateBoundaries): Check the type of the InlineBox
+        like the rest of the code (fixes an ASSERT_NOT_REACHED in InlineBox::calculateBoudaries).
+
+        * rendering/svg/SVGTextLayoutAttributesBuilder.cpp:
+        (WebCore::SVGTextLayoutAttributesBuilder::buildLayoutAttributesForTextSubtree): Clear
+        our cached layout attributes every time we invalidate them. This avoids keeping stale
+        attribute that have a backpointer to a RenderObject.
+
+2011-07-13  John Knottenbelt  <jknotten@chromium.org>
+
+        Reference Geolocation object from GeoNotifier and Geolocation::setIsAllowed.
+        https://bugs.webkit.org/show_bug.cgi?id=64363
+
+        Reviewed by Tony Gentilcore.
+
+        Test: fast/dom/Geolocation/remove-remote-context-in-error-callback-crash.html
+
+        * page/Geolocation.cpp:
+        (WebCore::Geolocation::setIsAllowed):
+        * page/Geolocation.h:
+
+2011-06-26  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Kent Tamura.
+
+        m_formElementsWithFormAttribute doesn't ref the objects it holds
+        https://bugs.webkit.org/show_bug.cgi?id=62956
+
+        Test: fast/forms/form-associated-element-crash3.html
+
+        * dom/Document.h:
+
+2011-05-26  David Levin  <levin@chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        WebKit's font notification has problems when the WebKit main thread != UI thread.
+        https://bugs.webkit.org/show_bug.cgi?id=61391
+
+        This doesn't happen in DumpRenderTree, so it needs a unit test which is taking me
+        some time to write correctly. In the meantime, this issues happens to be causing
+        some crashes in Chrome so here's the fix alone for the time being.
+
+        * platform/graphics/mac/FontCacheMac.mm:
+        (WebCore::invalidateFontCache): Ensure that FontCache::invalidate is only called on WebKit's main thread.
+        (WebCore::fontCacheRegisteredFontsChangedNotificationCallback): Call common function for font cache invalidation.
+         Note that the call to fontCache() is fine since the singleton is initialized well before calling this function. Theoretically,
+         there could be a problem due to a lack of a memory barrier but that is highly unlikely and this is debug only code.
+        (WebCore::fontCacheATSNotificationCallback): Ditto.
+
+2011-07-07  Gavin Peters  <gavinp@chromium.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        fast/dom/HTMLLinkElement/link-and-subresource-test.html is flaky on chromium debug bots
+        https://bugs.webkit.org/show_bug.cgi?id=60097
+
+        The culprit was that CachedResource:stopLoading() was using *this
+        after a call to checkNotify(), which isn't kosher.  This patch
+        uses a CachedResourceHandle to keep the CachedResource alive.
+
+        The test is a very close copy of the eponymous
+        link-and-subresource-test.html, only substituting invalid
+        resources for the valid ones in that test.  The reproduction is
+        timing related, and happens much more consistantly with an invalid
+        resource for whatever reason.
+        Test: fast/dom/HTMLLinkElement/link-and-subresource-test-nonexistent.html
+
+        * loader/cache/CachedResource.cpp:
+        (WebCore::CachedResource::stopLoading):
+
+2011-06-08  Mikołaj Małecki  <m.malecki@samsung.com>
+
+        Reviewed by Pavel Feldman.
+
+        Web Inspector: Crash by buffer overrun crash when serializing inspector object tree.
+        https://bugs.webkit.org/show_bug.cgi?id=52791
+
+        No new tests. The problem can be reproduced by trying to create InspectorValue
+        from 1.0e-100 and call ->toJSONString() on this.
+
+        * inspector/InspectorValues.cpp:
+        (WebCore::InspectorBasicValue::writeJSON):
+        Added checking the predicted buffer size and choosing exponential format, or
+        eventually "NaN" if the buffer is too small for decimal format.
+
+2011-07-26  Alexis Menard  <alexis.menard@openbossa.org>
+
+        [Qt] Disable video support on linux if the dependencies are not found.
+
+        If we can't find the necessary dependencies to build the GStreamer media player
+        we disable the video support. This is related to http://trac.webkit.org/changeset/91752.
+
+        Reviewed by Holger Freyther.
+
+        No new tests, it's a build fix.
+
+        * features.pri:
+
+2011-07-26  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Change default backend to use GStreamer on Linux and QuickTime on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=63472
+
+        Enable the GStreamer backend and the QuickTime backend as default media players
+        for the Qt port on Mac and Linux. QtMultimedia is now a fallback option that you
+        can enable by passing DEFINES+=USE_QT_MULTIMEDIA=1 to enforce its usage.
+
+        No new tests. The media layout tests are disabled on the Qt port but hopefully with this
+        switch we can enable them again.
+
+        * WebCore.pri:
+        * WebCore.pro:
+        * features.pri:
+
+2011-06-23  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Eric Carlson.
+
+        [Qt] Implement fullscreen support on Mac with the QuickTime backend.
+        https://bugs.webkit.org/show_bug.cgi?id=61728
+
+        Implement fullscreen support for Qt when using the QuickTime backend.
+        We mostly use what is already done for the Mac port.
+
+        * DerivedSources.pro: We use the mac files and they have <WebCore/x> type
+        of includes. We need to generate those headers.
+        * WebCore.pro:
+        * platform/mac/WebVideoFullscreenController.h:
+        * platform/mac/WebVideoFullscreenController.mm:
+        * platform/mac/WebVideoFullscreenHUDWindowController.h:
+        * platform/mac/WebVideoFullscreenHUDWindowController.mm:
+        * platform/qt/WebCoreSystemInterface.h:
+        * platform/qt/WebCoreSystemInterface.mm:
+
+2011-06-21  Alexey Proskuryakov  <ap@apple.com>
+
+        Fix Mac build in some configurations.
+
+        * platform/mac/WebCoreSystemInterface.h: Added an enum matching WKSI one, since we cannot use
+        WKSI in WebCore.
+
+        * platform/mac/WebVideoFullscreenHUDWindowController.mm: Removed an include of WebKitSystemInterface.h.
+        It's not meant to be used from WebCore, and if included, a wrong copy may be used.
+        (createControlWithMediaUIControlType): Added a FIXME about problems with Leopard build.
+        (-[WebVideoFullscreenHUDWindowController windowDidLoad]): Ditto. Switched enum values to
+        WCSI style (lower level "wk").
+
+2011-06-20  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed build fix; Fix Leopard WebCore build.
+
+        * platform/mac/WebVideoFullscreenHUDWindowController.mm: On Leopard, NSWindowDelegate
+            is a category, not a protocol.
+
+2011-06-20  Jer Noble  <jer.noble@apple.com>
+
+        Unreviewed build fix; Fix 32-bit build.
+
+        Code recently moved from WebKit -> WebCore does not pass WebCore's more strict compiler warnings.  Use 
+        CGFloat, and float constants wherever possible, and use narrowPrecisionToFloat() where not.
+
+        * WebCore.xcodeproj/project.pbxproj: Add '-Wno-undef' flag for WebVideoFullScreenController.mm 
+        * platform/mac/WebVideoFullscreenController.mm:
+        (constrainFrameToRatioOfFrame): Use CGFloat instead of Double.
+        (-[WebVideoFullscreenWindow animateFromRect:toRect:withSubAnimation:controllerAction:]): Use float constant.
+        * platform/mac/WebVideoFullscreenHUDWindowController.mm:
+        (-[WebVideoFullscreenHUDWindowController updateVolume]): Use float for volume.
+        (-[WebVideoFullscreenHUDWindowController maxVolume]): Ditto.
+        (-[WebVideoFullscreenHUDWindowController volumeChanged:]): Ditto.
+        (-[WebVideoFullscreenHUDWindowController decrementVolume]): Ditto.
+        (-[WebVideoFullscreenHUDWindowController incrementVolume]): Ditto.
+        (-[WebVideoFullscreenHUDWindowController volume]): Ditto.
+        (-[WebVideoFullscreenHUDWindowController setVolume:]): Ditto. 
+        (timeToString): Narrow precision to float when converting to seconds.
+        * platform/mac/WebWindowAnimation.mm:
+        (scaledRect): Use CGFloat.
+        (-[WebWindowScaleAnimation init]): Use float constant.
+        (-[WebWindowScaleAnimation currentValue]): Ditto.
+        (-[WebWindowScaleAnimation additionalDurationNeededToReachFinalFrame]): Ditto.
+        (-[WebWindowFadeAnimation currentAlpha]): Ditto.
+
+2011-06-01  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Eric Carlson.
+
+        Move Full Screen Controllers into WebCore.
+
+        Remove dependency on QTKit from wekitExitFullscreen()
+        https://bugs.webkit.org/show_bug.cgi?id=61843
+
+        No new tests; the existing media full screen tests are sufficient.
+
+        * WebCore.exp.in: Add new exports.
+        * WebCore.xcodeproj/project.pbxproj: Add references to moved files.
+        * platform/mac/WebCoreSystemInterface.h: Add new WCSI interfaces to WKSI functions.
+        * platform/mac/WebCoreSystemInterface.mm:
+        * platform/mac/WebVideoFullscreenController.h: Renamed from Source/WebKit/mac/WebView/WebVideoFullscreenController.h.
+        * platform/mac/WebVideoFullscreenController.mm: Renamed from Source/WebKit/mac/WebView/WebVideoFullscreenController.mm.
+        
+        The following functions have had UNUSED_PARAM added:
+        (-[WebVideoFullscreenController applicationDidResignActive:]):
+        (-[WebVideoFullscreenController applicationDidChangeScreenParameters:]):
+        (-[WebVideoFullscreenWindow mouseMoved:]):
+
+Source/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.h.
+        * platform/mac/WebVideoFullscreenHUDWindowController.mm: Renamed from Source/WebKit/mac/WebView/WebVideoFullscreenHUDWindowController.mm.
+        
+        The following functions have had UNUSED_PARAM added:
+        (-[WebVideoFullscreenHUDWindow cancelOperation:]):
+        (-[WebVideoFullscreenHUDWindowController timelinePositionChanged:]):
+        (-[WebVideoFullscreenHUDWindowController setVolumeToZero:]):
+        (-[WebVideoFullscreenHUDWindowController setVolumeToMaximum:]):
+        (-[WebVideoFullscreenHUDWindowController togglePlaying:]):
+        (-[WebVideoFullscreenHUDWindowController mouseEntered:]):
+        (-[WebVideoFullscreenHUDWindowController mouseExited:]):
+        (-[WebVideoFullscreenHUDWindowController rewind:]):
+        (-[WebVideoFullscreenHUDWindowController fastForward:]):
+        (-[WebVideoFullscreenHUDWindowController windowDidExpose:]):
+        (-[WebVideoFullscreenHUDWindowController windowDidClose:]):
+
+        The following functions have had WKSI calls converted to WCSI ones:
+        (createControlWithMediaUIControlType):
+        (createTimeTextField):
+        
+        * platform/mac/WebWindowAnimation.h: Renamed from Source/WebKit/mac/WebView/WebWindowAnimation.h.
+        * platform/mac/WebWindowAnimation.mm: Renamed from Source/WebKit/mac/WebView/WebWindowAnimation.m.
+        (WebWindowAnimationDurationFromDuration):
+
+        The following functions have had WKSI calls converted to WCSI ones:
+        (-[WebWindowScaleAnimation setCurrentProgress:]):
+        (-[WebWindowFadeAnimation initWithDuration:window:initialAlpha:finalAlpha:]):
+
+2011-07-27  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Calling window.find immediately after mutating the document crashes WebKit.
+        https://bugs.webkit.org/show_bug.cgi?id=65296
+
+        Reviewed by Darin Adler.
+
+        Don't forget to layout first.
+
+        Test: editing/text-iterator/find-after-mutation.html
+
+        * editing/TextIterator.cpp:
+        (WebCore::findPlainText):
+
+2011-07-27  MORITA Hajime  <morrita@google.com>
+
+        Inconsistent state of TreeScope reference.
+        https://bugs.webkit.org/show_bug.cgi?id=65235
+        
+        The tree scope pointers on shadow tree nodes didn't cleared.
+        even when the tree scope (shadow root) is destroyed.
+        This change clear these poitners before detaching the shadow root.
+
+        Reviewed by Dimitri Glazkov.
+
+        Test: fast/dom/shadow/tree-scope-crash.html
+
+        * dom/Element.cpp:
+        (WebCore::Element::removeShadowRoot):
+
+2011-05-22  Dominic Cooney  <dominicc@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        When removing a shadow root, also remove it from the render tree.
+        https://bugs.webkit.org/show_bug.cgi?id=61245
+
+        Test: existing fast/dom/shadow/layout-tests-can-access-shadow.html
+
+        * dom/Element.cpp:
+        (WebCore::Element::removeShadowRoot): Call detach if attached.
+
+2011-07-22  Sergey Glazunov  <serg.glazunov@gmail.com>
+
+        Perform the JavaScript navigation check on a complete URL
+        https://bugs.webkit.org/show_bug.cgi?id=65038
+
+        Reviewed by Adam Barth.
+
+        Test: http/tests/security/xss-DENIED-document-baseURI-javascript.html
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::setLocation):
+        (WebCore::DOMWindow::createWindow):
+        (WebCore::DOMWindow::open):
+
+2011-07-22  David Grogan  <dgrogan@chromium.org>
+
+        Fix crash in IDBRequest::abort
+        https://bugs.webkit.org/show_bug.cgi?id=64740
+
+        Reviewed by Nate Chapin.
+
+        Tested manually with the testcase in the bug.
+
+        * storage/IDBRequest.cpp:
+        (WebCore::IDBRequest::~IDBRequest):
+        (WebCore::IDBRequest::abort):
+
+2011-07-25  Daniel Bates  <dbates@rim.com>
+
+        REGRESSION (r85964): Improper relayout of some nested positioned elements
+        https://bugs.webkit.org/show_bug.cgi?id=64286
+
+        Reviewed by David Hyatt.
+
+        Fixes an issue when traversing up the containing block hierarchy after skipping
+        relatively positioned inlines.
+
+        When processing a positioned element we skip any intermediate inlines to get to
+        to enclosing block B, but don't use the containing block for B (call this P_B) to
+        properly continue traversing up the containing block hierarchy. So, B may be
+        considered again instead of looking at P_B. Hence, we don't set the correct dirty
+        bits for P_B and may not schedule a relayout with respect to the correct layout node.
+
+        Test: fast/block/positioning/relayout-nested-positioned-elements-crash.html
+
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::markContainingBlocksForLayout):
+
+2011-07-26  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=60778
+
+        Use after free because of line box culling optimization regression.
+
+        In the case of a child with no line box being removed (typically
+        a <br> in quirks mode), if there is no previous sibling with a line
+        box, then we have a potential problem with the culling optimization.
+
+        The culled inline may still have other leaf line box children, but
+        they may follow the removed <br>. In this case we can't rely on
+        them, since we need a line box that comes before the <br>.
+
+        The fix is to simply recur up to the parent if we are a culled inline
+        and could not find a previous line box.
+
+        Reviewed by Dan Bernstein.
+
+        Added editing/execCommand/crash-line-break-after-outdent.html
+
+        * rendering/RenderLineBoxList.cpp:
+        (WebCore::RenderLineBoxList::dirtyLinesFromChangedChild):
+
+2011-07-19  Abhishek Arya  <inferno@chromium.org>
+
+        Crash when removing unrenderered nodes in replacement fragment.
+        https://bugs.webkit.org/show_bug.cgi?id=64801
+
+        Reviewed by Ryosuke Niwa.
+
+        Test: editing/pasteboard/replacement-fragment-remove-unrendered-node-crash.html
+
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::ReplacementFragment::removeUnrenderedNodes):
+
+2011-07-21  Gavin Peters  <gavinp@chromium.org>
+
+        Extend the protector of a CSS style sheet.  Because checkLoaded() can recursively delete
+        parent style elements, the protector should be extended to include the parent call.
+
+        https://bugs.webkit.org/show_bug.cgi?id=64736
+
+        Reviewed by Simon Fraser.
+
+        Test: fast/css/css-imports-2.html
+
+        * css/CSSStyleSheet.cpp:
+        (WebCore::CSSStyleSheet::checkLoaded):
+
+2011-07-20  Tony Chang  <tony@chromium.org>
+
+        Stale pointer due to floats not removed (flexible box display)
+        https://bugs.webkit.org/show_bug.cgi?id=64603
+
+        Reviewed by David Hyatt.
+
+        Flexbox items should avoid floats.
+
+        Test: fast/flexbox/horizontal-box-float-crash.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::avoidsFloats):
+        * rendering/RenderBox.h:
+        (WebCore::RenderBox::isDeprecatedFlexItem):
+
+2011-07-12  Hui Huang  <Hui.2.Huang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Fix compiling errors with QtWebkit 2.2 WINSCW build.
+        https://bugs.webkit.org/show_bug.cgi?id=64391
+
+        (QtWebKit-2.2 only, patch not in webkit trunk)
+
+        * bindings/generic/ActiveDOMCallback.cpp:
+        * css/CSSStyleSelector.h:
+        * page/PrintContext.cpp:
+        * page/PrintContext.h:
+        * platform/network/HTTPHeaderMap.cpp:
+        * xml/XPathFunctions.cpp:
+        * xml/XPathPredicate.cpp:
+        * xml/XPathResult.cpp:
+
+2011-07-16  Sergey Glazunov  <serg.glazunov@gmail.com>
+
+        DOMWindow::open performs a security check on a wrong window
+        https://bugs.webkit.org/show_bug.cgi?id=64651
+
+        Reviewed by Adam Barth.
+
+        Test: http/tests/security/xss-DENIED-window-open-parent.html
+
+        * page/DOMWindow.cpp:
+        (WebCore::DOMWindow::open):
+
+2011-07-14  Adam Barth  <abarth@webkit.org>
+
+        The beforeload event allows tracking URI changes in a frame
+        https://bugs.webkit.org/show_bug.cgi?id=64482
+
+        Reviewed by Nate Chapin.
+
+        Tests: http/tests/security/beforeload-iframe-client-redirect.html
+               http/tests/security/beforeload-iframe-server-redirect.html
+
+        Only dispatch the beforeload event for a frame if we haven't yet
+        committed our first real load.  The URL that we send to our parent will
+        be the same URL the parent seens in the src attribute.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadWithDocumentLoader):
+
+2011-07-14  Tim Horton  <timothy_horton@apple.com>
+
+        Clear SVGElementInstance's children immediately upon detachment
+        https://bugs.webkit.org/show_bug.cgi?id=63739
+        <rdar://problem/9705708>
+
+        Reviewed by Nikolas Zimmermann.
+
+        In addition to clearing the instance's children in the destructor,
+        clear them when the instance is detached from its <use>. This way,
+        we won't attempt to use them after we're detached but before the
+        destructor has been called.
+
+        Test: svg/custom/use-crash-using-children-before-destroy.svg
+
+        * svg/SVGElementInstance.cpp:
+        (WebCore::SVGElementInstance::~SVGElementInstance):
+        (WebCore::SVGElementInstance::clearChildren):
+        * svg/SVGElementInstance.h:
+        * svg/SVGUseElement.cpp:
+        (WebCore::SVGUseElement::detachInstance):
+
+2011-06-20  Andras Becsi  <abecsi@webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        make-hash-tools.pl: Perl 5.14 compatibility
+        https://bugs.webkit.org/show_bug.cgi?id=61890
+
+        No new tests needed.
+
+        * make-hash-tools.pl: Use if/elsif instead of switch/case.
+
+2011-07-13  Abhishek Arya  <inferno@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Issue with Frame lifetime due to deletion in beforeload event.
+        https://bugs.webkit.org/show_bug.cgi?id=64457
+
+        Copy the Frame protector higher in the stack from loadWithDocumentLoader
+        to loadFrameRequest since any of loadPostRequest or loadURL can call
+        loadWithDocumentLoader, thereby dispatching the beforeload event and
+        blowing away the frame. This deleted frame will be later accessed in
+        the loadFrameRequest function causing a crash.       
+ 
+        Test: fast/events/form-iframe-target-before-load-crash2.html
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::loadFrameRequest):
+        (WebCore::FrameLoader::loadWithDocumentLoader):
+
+2011-06-03  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Frame flattening is broken with nested frames
+        https://bugs.webkit.org/show_bug.cgi?id=61491
+
+        Do not flatten offscreen iframes during frame flattening, as flattening might make them visible.
+
+        Test: fast/frames/flattening/iframe-flattening-out-of-view.html
+              fast/frames/flattening/iframe-flattening-out-of-view-and-scroll.html
+              fast/frames/flattening/iframe-flattening-out-of-view-scroll-and-relayout.html
+
+        * rendering/RenderIFrame.cpp:
+        (WebCore::RenderIFrame::flattenFrame):
+
+2011-06-23  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Windowless Plugins : <input> cursor blinks even after transferring focus to plugin
+        https://bugs.webkit.org/show_bug.cgi?id=30355
+
+        Test: plugins/mouse-click-plugin-clears-selection.html
+
+        PluginView needs to use page->focusController()->setFocusedNode() when focusing a plugin
+        in order to clear the FrameSelection in the currently focused node. In its platform-specific
+        code Chromium already does this (WebPluginContainerImpl.cpp).
+
+        * WebCore.exp.in: Add symbol for FocusController::setFocusedNode
+        * plugins/PluginView.cpp:
+        (WebCore::PluginView::focusPluginElement): Using FocusController::setFocusedNode() makes
+                                                   the call to FocusController:setFocusedFrame() and Document::setFocusedNode()
+                                                   redundant, since it calls both.
+
+2011-06-30  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Reviewed by Nikolas Zimmermann.
+
+        Assertion failure in RenderSVGInlineText::characterStartsNewTextChunk
+        https://bugs.webkit.org/show_bug.cgi?id=63076
+
+        Tests: svg/custom/crash-text-in-textpath.svg
+               svg/custom/text-node-in-text-invalidated.svg
+
+        The problem was that we did not call setNeedsPositionUpdate on RenderSVGText. When
+        doing our layout, we would not update the attributes on our SVGRenderInlineText as
+        we would not lay it out.
+
+        This was caused by childrenChanged being overridden on SVGTextPositioningElement but
+        not on SVGTextPathElement.
+
+        As both classes shared the same mother class, it made sense to move the logic here.
+        There should be no other side effects as SVGTextPathElement and SVGTextPositioningElement
+        are the only classes deriving from SVGTextContentElement.
+
+        * svg/SVGTextContentElement.cpp:
+        (WebCore::SVGTextContentElement::childrenChanged): Moved this method from SVGTextPositioningElement.
+        * svg/SVGTextContentElement.h:
+        * svg/SVGTextPositioningElement.cpp:
+        (WebCore::SVGTextPositioningElement::svgAttributeChanged): Updated after updatePositioningValuesInRenderer
+        removal, replaced by RenderSVGText::locateRenderSVGTextAncestor.
+        * svg/SVGTextPositioningElement.h:
+
+2011-06-30  Abhishek Arya  <inferno@chromium.org>
+
+        Reviewed by Ryosuke Niwa.
+
+        Crash when calling DOMSubtreeModified event when extracting range
+        contents.
+        https://bugs.webkit.org/show_bug.cgi?id=63650
+
+        Convert a few nodes to RefPtrs and add commonRoot verification checks
+        for Range::processContents.
+
+        Tests: fast/dom/Range/range-extract-contents-event-fire-crash.html
+               fast/dom/Range/range-extract-contents-event-fire-crash2.html
+
+        * dom/Range.cpp:
+        (WebCore::childOfCommonRootBeforeOffset):
+        (WebCore::Range::processContents):
+        (WebCore::Range::processContentsBetweenOffsets):
+        (WebCore::Range::processAncestorsAndTheirSiblings):
+
+2011-06-23  Abhishek Arya  <inferno@chromium.org>
+
+        Reviewed by James Robinson.
+
+        In RenderBlock, RenderWidget and RenderReplaced destroy functions,
+        call dirtyLinesFromChangedChild to tell our parent that we are going away.
+        https://bugs.webkit.org/show_bug.cgi?id=60307
+
+        Test: fast/block/child-not-removed-from-parent-lineboxes-crash.html
+              fast/block/block-not-removed-from-parent-lineboxes-crash.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::destroy):
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::destroy):
+        * rendering/RenderReplaced.h:
+        * rendering/RenderWidget.cpp:
+        (WebCore::RenderWidget::destroy):
+
+2011-05-05  David Hyatt  <hyatt@apple.com>
+
+        Reviewed by Darin Adler.
+
+        <rdar://problem/9354979> REGRESSION (r83070-r83126): Conversation takes 10 seconds to load and makes mail unresponsive
+
+        Culled inlines were triggering some pathological line box tree groveling that isn't even necessary.
+        Removed the ancient code (that used to be in RenderFlow), since it made no sense in the RenderBlock case
+        (it was running for inline blocks, which was definitely not even the intent) or in the RenderInline case
+        (the object being removed has no effect on any lines).
+        
+        Also tweaked culledInlineFirstLineBox and culledInlineLastLineBox to avoid bailing if the first replaced object that
+        is encountered has a null inlineBoxWrapper().  Just a slight speed optimization to avoid an extra null check.
+        
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::destroy):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::destroy):
+        (WebCore::RenderInline::culledInlineFirstLineBox):
+        (WebCore::RenderInline::culledInlineLastLineBox):
+
 2011-06-28  Roland Steiner  <rolandsteiner@chromium.org>
 
         Reviewed by Eric Seidel.
@@ -242,17 +1615,6 @@
         * loader/DocumentLoader.cpp: (WebCore::DocumentLoader::detachFromFrame): Rollout the fix
         for bug 62764.
 
-2011-06-24  Alexis Menard  <alexis.menard@openbossa.org>
-
-        Unreviewed build fix.
-
-        Build fix on Linux when using the GStreamer backend.
-
-        No new tests, just a build fix.
-
-        * platform/graphics/gstreamer/PlatformVideoWindowQt.cpp:
-        (FullScreenVideoWindow::keyPressEvent):
-
 2011-06-23  Abhishek Arya  <inferno@chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/src/3rdparty/webkit/Source/WebCore/CodeGenerators.pri b/src/3rdparty/webkit/Source/WebCore/CodeGenerators.pri
index cc29660..db6f7af 100644
--- a/src/3rdparty/webkit/Source/WebCore/CodeGenerators.pri
+++ b/src/3rdparty/webkit/Source/WebCore/CodeGenerators.pri
@@ -509,6 +509,7 @@ IDL_BINDINGS += \
     svg/SVGUseElement.idl \
     svg/SVGViewElement.idl \
     svg/SVGVKernElement.idl \
+    testing/Internals.idl \
     webaudio/AudioBuffer.idl \
     webaudio/AudioBufferSourceNode.idl \
     webaudio/AudioChannelMerger.idl \
@@ -613,6 +614,7 @@ idl.commands = perl -I$$PWD/bindings/scripts $$idl.wkScript \
                --include $$PWD/svg \
                --include $$PWD/storage \
                --include $$PWD/css \
+               --include $$PWD/testing \
                --include $$PWD/webaudio \
                --include $$PWD/workers \
                --outputDir $$WC_GENERATED_SOURCES_DIR \
diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.exp.in b/src/3rdparty/webkit/Source/WebCore/WebCore.exp.in
index 83317a8..982a8ef 100644
--- a/src/3rdparty/webkit/Source/WebCore/WebCore.exp.in
+++ b/src/3rdparty/webkit/Source/WebCore/WebCore.exp.in
@@ -263,6 +263,7 @@ __ZN7WebCore12IconDatabase27checkIntegrityBeforeOpeningEv
 __ZN7WebCore12IconDatabase5closeEv
 __ZN7WebCore12IconDatabase9setClientEPNS_18IconDatabaseClientE
 __ZN7WebCore12IconDatabaseC1Ev
+__ZN7WebCore12JSDOMWrapper34virtualFunctionToPreventWeakVtableEv
 __ZN7WebCore12PopupMenuMacC1EPNS_15PopupMenuClientE
 __ZN7WebCore12PrintContext12pagePropertyEPNS_5FrameEPKci
 __ZN7WebCore12PrintContext13numberOfPagesEPNS_5FrameERKNS_9FloatSizeE
@@ -389,6 +390,7 @@ __ZN7WebCore15DatabaseTracker8setQuotaEPNS_14SecurityOriginEy
 __ZN7WebCore15DatabaseTracker9setClientEPNS_21DatabaseTrackerClientE
 __ZN7WebCore15FocusController10setFocusedEb
 __ZN7WebCore15FocusController15setFocusedFrameEN3WTF10PassRefPtrINS_5FrameEEE
+__ZN7WebCore15FocusController14setFocusedNodeEPNS_4NodeEN3WTF10PassRefPtrINS_5FrameEEE
 __ZN7WebCore15FocusController15setInitialFocusENS_14FocusDirectionEPNS_13KeyboardEventE
 __ZN7WebCore15FocusController9setActiveEb
 __ZN7WebCore15GraphicsContext12setFillColorERKNS_5ColorENS_10ColorSpaceE
@@ -1010,6 +1012,8 @@ __ZN7WebCore9makeRangeERKNS_15VisiblePositionES2_
 __ZN7WebCore9pageCacheEv
 __ZN7WebCore9plainTextEPKNS_5RangeENS_20TextIteratorBehaviorE
 __ZN7WebCore9toElementEN3JSC7JSValueE
+__ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE
+__ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE
 __ZNK3JSC8Bindings10RootObject12globalObjectEv
 __ZNK3WTF6String14createCFStringEv
 __ZNK7WebCore5Frame26getDocumentBackgroundColorEv
@@ -1303,6 +1307,7 @@ __ZNK7WebCore9FrameView28isEnclosedInCompositingLayerEv
 __ZNK7WebCore9PageCache10frameCountEv
 __ZNK7WebCore9PageCache21autoreleasedPageCountEv
 __ZTVN7WebCore12ChromeClientE
+__ZTVN7WebCore12JSDOMWrapperE
 __ZTVN7WebCore16IconDatabaseBaseE
 __ZTVN7WebCore17FileChooserClientE
 __ZTVN7WebCore17FrameLoaderClientE
@@ -1325,6 +1330,8 @@ _wkCopyNSURLResponseStatusLine
 _wkCopyRequestWithStorageSession
 _wkCreateCTLineWithUniCharProvider
 _wkCreateCustomCFReadStream
+_wkCreateMediaUIBackgroundView
+_wkCreateMediaUIControl
 _wkCreateNSURLConnectionDelegateProxy
 _wkCreatePrivateStorageSession
 _wkCreateURLNPasteboardFlavorTypeName
@@ -1394,6 +1401,8 @@ _wkSignalCFReadStreamEnd
 _wkSignalCFReadStreamError
 _wkSignalCFReadStreamHasBytes
 _wkSignedPublicKeyAndChallengeString
+_wkWindowSetAlpha
+_wkWindowSetScaledFrame
 
 #if ENABLE(DOM_STORAGE)
 __ZN7WebCore14StorageTracker17initializeTrackerERKN3WTF6StringE
@@ -1631,8 +1640,6 @@ __ZN3JSC8Bindings8InstanceC2EN3WTF10PassRefPtrINS0_10RootObjectEEE
 __ZN3JSC8Bindings8InstanceD2Ev
 __ZN7WebCore13IdentifierRep7isValidEPS0_
 __ZN7WebCore16ScriptController16createRootObjectEPv
-__ZN7WebCore17cacheDOMStructureEPNS_17JSDOMGlobalObjectEPN3JSC9StructureEPKNS2_9ClassInfoE
-__ZN7WebCore21getCachedDOMStructureEPNS_17JSDOMGlobalObjectEPKN3JSC9ClassInfoE
 __ZNK3JSC8Bindings13RuntimeObject12defaultValueEPNS_9ExecStateENS_22PreferredPrimitiveTypeE
 __ZTVN3JSC13RuntimeMethodE
 #endif
@@ -1800,6 +1807,9 @@ __ZNK7WebCore16HTMLMediaElement6volumeEv
 __ZNK7WebCore16HTMLMediaElement7canPlayEv
 __ZNK7WebCore16HTMLMediaElement12playbackRateEv
 __ZNK7WebCore16HTMLMediaElement8durationEv
+__ZN7WebCore16HTMLMediaElement16returnToRealtimeEv
+__ZNK7WebCore16HTMLMediaElement12isFullscreenEv
+.objc_class_name_WebVideoFullscreenController
 #endif
 
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.gypi b/src/3rdparty/webkit/Source/WebCore/WebCore.gypi
index e418f7f..7383db1 100644
--- a/src/3rdparty/webkit/Source/WebCore/WebCore.gypi
+++ b/src/3rdparty/webkit/Source/WebCore/WebCore.gypi
@@ -6054,6 +6054,17 @@
             'xml/XSLTUnicodeSort.cpp',
             'xml/XSLTUnicodeSort.h',
         ],
+        'webcore_test_support_idl_files': [
+          'testing/Internals.idl',
+        ],
+        'webcore_test_support_files': [
+            'testing/v8/WebCoreTestSupport.cpp',
+            'testing/v8/WebCoreTestSupport.h',
+            'testing/js/WebCoreTestSupport.cpp',
+            'testing/js/WebCoreTestSupport.h',
+            'testing/Internals.cpp',
+            'testing/Internals.h',
+        ],
         'webcore_resource_files': [
             'English.lproj/Localizable.strings',
             'English.lproj/localizedStrings.js',
diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pri b/src/3rdparty/webkit/Source/WebCore/WebCore.pri
index 4ba1117..82311d2 100644
--- a/src/3rdparty/webkit/Source/WebCore/WebCore.pri
+++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pri
@@ -48,14 +48,16 @@ v8 {
         $$SOURCE_DIR/WebCore/bindings/v8 \
         $$SOURCE_DIR/WebCore/bindings/v8/custom \
         $$SOURCE_DIR/WebCore/bindings/v8/specialization \
-        $$SOURCE_DIR/WebCore/bridge/qt/v8
+        $$SOURCE_DIR/WebCore/bridge/qt/v8 \
+        $$SOURCE_DIR/WebCore/testing/v8
 
 } else {
     WEBCORE_INCLUDEPATH = \
         $$SOURCE_DIR/WebCore/bridge/jsc \
         $$SOURCE_DIR/WebCore/bindings/js \
         $$SOURCE_DIR/WebCore/bindings/js/specialization \
-        $$SOURCE_DIR/WebCore/bridge/c
+        $$SOURCE_DIR/WebCore/bridge/c \
+        $$SOURCE_DIR/WebCore/testing/js
 }
 
 WEBCORE_INCLUDEPATH = \
@@ -110,6 +112,7 @@ WEBCORE_INCLUDEPATH = \
     $$SOURCE_DIR/WebCore/svg/graphics \
     $$SOURCE_DIR/WebCore/svg/graphics/filters \
     $$SOURCE_DIR/WebCore/svg/properties \
+    $$SOURCE_DIR/WebCore/testing \
     $$SOURCE_DIR/WebCore/webaudio \
     $$SOURCE_DIR/WebCore/websockets \
     $$SOURCE_DIR/WebCore/wml \
@@ -242,26 +245,22 @@ contains(DEFINES, WTF_USE_QT_BEARER=1) {
 }
 
 contains(DEFINES, ENABLE_VIDEO=1) {
-    contains(DEFINES, USE_QTKIT=1) {
-        DEFINES += WTF_USE_QTKIT=1
-
+    contains(DEFINES, WTF_USE_QTKIT=1) {
         INCLUDEPATH += $$PWD/platform/graphics/mac
 
         LIBS += -framework AppKit -framework AudioUnit \
                 -framework AudioToolbox -framework CoreAudio \
                 -framework QuartzCore -framework QTKit
 
-    } else:contains(DEFINES, USE_GSTREAMER=1) {
-        DEFINES += WTF_USE_GSTREAMER=1
+    } else:contains(DEFINES, WTF_USE_GSTREAMER=1) {
         DEFINES += ENABLE_GLIB_SUPPORT=1
 
         INCLUDEPATH += $$PWD/platform/graphics/gstreamer
 
         PKGCONFIG += glib-2.0 gio-2.0 gstreamer-0.10 gstreamer-app-0.10 gstreamer-base-0.10 gstreamer-interfaces-0.10 gstreamer-pbutils-0.10 gstreamer-plugins-base-0.10 gstreamer-video-0.10
-    } else:contains(MOBILITY_CONFIG, multimedia) {
+    } else:contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
         CONFIG   *= mobility
         MOBILITY *= multimedia
-        DEFINES  += WTF_USE_QT_MULTIMEDIA=1
     }
 }
 
@@ -343,7 +342,7 @@ use_qt_mobile_theme: DEFINES += WTF_USE_QT_MOBILE_THEME=1
 defineTest(prependWebCoreLib) {
     pathToWebCoreOutput = $$ARGS/$$WEBCORE_DESTDIR
 
-    win32-msvc*|wince* {
+    win32-msvc*|wince*|win32-icc {
         LIBS = -l$$WEBCORE_TARGET $$LIBS
         LIBS = -L$$pathToWebCoreOutput $$LIBS
         POST_TARGETDEPS += $${pathToWebCoreOutput}$${QMAKE_DIR_SEP}$${WEBCORE_TARGET}.lib
diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pro b/src/3rdparty/webkit/Source/WebCore/WebCore.pro
index 107ff35..a305549 100644
--- a/src/3rdparty/webkit/Source/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pro
@@ -222,7 +222,8 @@ v8 {
         bindings/v8/custom/V8NotificationCenterCustom.cpp \
         bindings/v8/custom/V8ConsoleCustom.cpp \
         bindings/v8/custom/V8SQLTransactionSyncCustom.cpp \
-        bindings/v8/V8WorkerContextErrorHandler.cpp
+        bindings/v8/V8WorkerContextErrorHandler.cpp \
+        testing/v8/WebCoreTestSupport.cpp
 } else {
     SOURCES += \
         bindings/ScriptControllerBase.cpp \
@@ -374,7 +375,8 @@ v8 {
         bridge/runtime_array.cpp \
         bridge/runtime_method.cpp \
         bridge/runtime_object.cpp \
-        bridge/runtime_root.cpp
+        bridge/runtime_root.cpp \
+        testing/js/WebCoreTestSupport.cpp
 }
 
 SOURCES += \
@@ -1173,6 +1175,7 @@ SOURCES += \
     rendering/style/StyleSurroundData.cpp \
     rendering/style/StyleTransformData.cpp \
     rendering/style/StyleVisualData.cpp \
+    testing/Internals.cpp \
     xml/DOMParser.cpp \
     xml/XMLHttpRequest.cpp \
     xml/XMLHttpRequestProgressEventThrottle.cpp \
@@ -2420,6 +2423,7 @@ HEADERS += \
     svg/SVGVKernElement.h \
     svg/SVGZoomAndPan.h \
     svg/SVGZoomEvent.h \
+    testing/Internals.h \
     workers/AbstractWorker.h \
     workers/DedicatedWorkerContext.h \
     workers/DedicatedWorkerThread.h \
@@ -2934,31 +2938,43 @@ contains(DEFINES, ENABLE_VIDEO=1) {
             bindings/js/JSAudioConstructor.cpp
     }
 
-    contains(DEFINES, USE_QTKIT=1) {
+    contains(DEFINES, WTF_USE_QTKIT=1) {
+        INCLUDEPATH += \
+            $$SOURCE_DIR/../WebKitLibraries/
+
         HEADERS += \
             platform/graphics/mac/MediaPlayerPrivateQTKit.h \
             platform/mac/WebCoreObjCExtras.h \
             platform/qt/WebCoreSystemInterface.h \
             platform/mac/BlockExceptions.h \
-            platform/mac/WebCoreObjCExtras.h
+            platform/mac/WebCoreObjCExtras.h \
+            platform/mac/WebVideoFullscreenController.h \
+            platform/mac/WebVideoFullscreenHUDWindowController.h \
+            platform/mac/WebWindowAnimation.h
+
         SOURCES += \
+            platform/graphics/cg/IntRectCG.cpp \
+            platform/graphics/cg/FloatSizeCG.cpp \
+            platform/cf/SharedBufferCF.cpp \
+            platform/cf/KURLCFNet.cpp
+
+         OBJECTIVE_SOURCES += \
+            platform/qt/WebCoreSystemInterface.mm \
+            platform/mac/BlockExceptions.mm \
+            platform/mac/WebCoreObjCExtras.mm \
             platform/graphics/mac/MediaPlayerPrivateQTKit.mm \
             platform/mac/SharedBufferMac.mm \
             platform/mac/KURLMac.mm \
             platform/text/mac/StringMac.mm \
             platform/graphics/mac/FloatSizeMac.mm \
             platform/graphics/mac/IntRectMac.mm \
-            platform/graphics/cg/IntRectCG.cpp \
-            platform/graphics/cg/FloatSizeCG.cpp \
-            platform/cf/SharedBufferCF.cpp \
-            platform/cf/KURLCFNet.cpp \
-            platform/qt/WebCoreSystemInterface.mm \
-            platform/mac/BlockExceptions.mm \
-            platform/mac/WebCoreObjCExtras.mm
+            platform/mac/WebVideoFullscreenController.mm \
+            platform/mac/WebVideoFullscreenHUDWindowController.mm \
+            platform/mac/WebWindowAnimation.mm
 
         DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
 
-    } else: contains(DEFINES, USE_GSTREAMER=1) {
+    } else: contains(DEFINES, WTF_USE_GSTREAMER=1) {
         HEADERS += \
             platform/graphics/gstreamer/GOwnPtrGStreamer.h \
             platform/graphics/gstreamer/GRefPtrGStreamer.h \
@@ -2979,7 +2995,7 @@ contains(DEFINES, ENABLE_VIDEO=1) {
             platform/graphics/gstreamer/PlatformVideoWindowQt.cpp \
             platform/graphics/gstreamer/ImageGStreamerQt.cpp
 
-    } else:contains(MOBILITY_CONFIG, multimedia) {
+    } else:contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
         HEADERS += \ 
             platform/graphics/qt/MediaPlayerPrivateQt.h
 
diff --git a/src/3rdparty/webkit/Source/WebCore/accessibility/AccessibilityRenderObject.cpp b/src/3rdparty/webkit/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
index 25078c5..9725a6b 100644
--- a/src/3rdparty/webkit/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/accessibility/AccessibilityRenderObject.cpp
@@ -302,8 +302,12 @@ AccessibilityObject* AccessibilityRenderObject::previousSibling() const
 
     // Case 2: Anonymous block parent of the end of a continuation - skip all the way to before
     // the parent of the start, since everything in between will be linked up via the continuation.
-    else if (m_renderer->isAnonymousBlock() && firstChildIsInlineContinuation(m_renderer))
-        previousSibling = startOfContinuations(m_renderer->firstChild())->parent()->previousSibling();
+    else if (m_renderer->isAnonymousBlock() && firstChildIsInlineContinuation(m_renderer)) {
+        RenderObject* firstParent = startOfContinuations(m_renderer->firstChild())->parent();
+        while (firstChildIsInlineContinuation(firstParent))
+            firstParent = startOfContinuations(firstParent->firstChild())->parent();
+        previousSibling = firstParent->previousSibling();
+    }
 
     // Case 3: The node has an actual previous sibling
     else if (RenderObject* ps = m_renderer->previousSibling())
@@ -340,8 +344,12 @@ AccessibilityObject* AccessibilityRenderObject::nextSibling() const
 
     // Case 2: Anonymous block parent of the start of a continuation - skip all the way to
     // after the parent of the end, since everything in between will be linked up via the continuation.
-    else if (m_renderer->isAnonymousBlock() && lastChildHasContinuation(m_renderer))
-        nextSibling = endOfContinuations(m_renderer->lastChild())->parent()->nextSibling();
+    else if (m_renderer->isAnonymousBlock() && lastChildHasContinuation(m_renderer)) {
+        RenderObject* lastParent = endOfContinuations(m_renderer->lastChild())->parent();
+        while (lastChildHasContinuation(lastParent))
+            lastParent = endOfContinuations(lastParent->lastChild())->parent();
+        nextSibling = lastParent->nextSibling();
+    }
 
     // Case 3: node has an actual next sibling
     else if (RenderObject* ns = m_renderer->nextSibling())
diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/ScriptControllerBase.cpp b/src/3rdparty/webkit/Source/WebCore/bindings/ScriptControllerBase.cpp
index 4190637..254a6c2 100644
--- a/src/3rdparty/webkit/Source/WebCore/bindings/ScriptControllerBase.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/bindings/ScriptControllerBase.cpp
@@ -59,6 +59,8 @@ ScriptValue ScriptController::executeScript(const ScriptSourceCode& sourceCode)
     bool wasInExecuteScript = m_inExecuteScript;
     m_inExecuteScript = true;
 
+    RefPtr<Frame> protect(m_frame); // Script execution can destroy the frame, and thus the ScriptController.
+
     ScriptValue result = evaluate(sourceCode);
 
     if (!wasInExecuteScript) {
diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/generic/ActiveDOMCallback.cpp b/src/3rdparty/webkit/Source/WebCore/bindings/generic/ActiveDOMCallback.cpp
index ff02a42..86bfc56 100644
--- a/src/3rdparty/webkit/Source/WebCore/bindings/generic/ActiveDOMCallback.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/bindings/generic/ActiveDOMCallback.cpp
@@ -38,29 +38,6 @@
 
 namespace WebCore {
 
-static void destroyOnContextThread(PassOwnPtr<ActiveDOMObjectCallbackImpl>);
-
-class DestroyOnContextThreadTask : public ScriptExecutionContext::Task {
-public:
-    static PassOwnPtr<DestroyOnContextThreadTask> create(PassOwnPtr<ActiveDOMObjectCallbackImpl> impl)
-    {
-        return adoptPtr(new DestroyOnContextThreadTask(impl));
-    }
-
-    virtual void performTask(ScriptExecutionContext*)
-    {
-        destroyOnContextThread(m_impl.release());
-    }
-
-private:
-    DestroyOnContextThreadTask(PassOwnPtr<ActiveDOMObjectCallbackImpl> impl)
-        : m_impl(impl)
-    {
-    }
-
-    OwnPtr<ActiveDOMObjectCallbackImpl> m_impl;
-};
-
 class ActiveDOMObjectCallbackImpl : public ActiveDOMObject {
 public:
     ActiveDOMObjectCallbackImpl(ScriptExecutionContext* context)
@@ -109,6 +86,29 @@ private:
     bool m_stopped;
 };
 
+static void destroyOnContextThread(PassOwnPtr<ActiveDOMObjectCallbackImpl>);
+
+class DestroyOnContextThreadTask : public ScriptExecutionContext::Task {
+public:
+    static PassOwnPtr<DestroyOnContextThreadTask> create(PassOwnPtr<ActiveDOMObjectCallbackImpl> impl)
+    {
+        return adoptPtr(new DestroyOnContextThreadTask(impl));
+    }
+
+    virtual void performTask(ScriptExecutionContext*)
+    {
+        destroyOnContextThread(m_impl.release());
+    }
+
+private:
+    DestroyOnContextThreadTask(PassOwnPtr<ActiveDOMObjectCallbackImpl> impl)
+        : m_impl(impl)
+    {
+    }
+
+    OwnPtr<ActiveDOMObjectCallbackImpl> m_impl;
+};
+
 static void destroyOnContextThread(PassOwnPtr<ActiveDOMObjectCallbackImpl> impl)
 {
     OwnPtr<ActiveDOMObjectCallbackImpl> implOwnPtr = impl;
diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSDOMWrapper.cpp b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSDOMWrapper.cpp
index 60c0ed1..d54fe74 100644
--- a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSDOMWrapper.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSDOMWrapper.cpp
@@ -32,12 +32,9 @@ using namespace JSC;
 
 namespace WebCore {
 
-#ifndef NDEBUG
-
-JSDOMWrapper::~JSDOMWrapper()
+void JSDOMWrapper::virtualFunctionToPreventWeakVtable()
 {
+    ASSERT_NOT_REACHED();
 }
 
-#endif
-
 } // namespace WebCore
diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSDOMWrapper.h b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSDOMWrapper.h
index 2f5bebd..9a4aca5 100644
--- a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSDOMWrapper.h
+++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSDOMWrapper.h
@@ -48,6 +48,10 @@ public:
     }
 
 protected:
+    // An inline function cannot be the first non-abstract virtual function declared
+    // in the class as it results in the vtable being generated as a weak symbol.
+    virtual void virtualFunctionToPreventWeakVtable();
+
     explicit JSDOMWrapper(JSC::Structure* structure, JSC::JSGlobalObject* globalObject) 
         : JSObjectWithGlobalObject(globalObject, structure)
     {
@@ -56,10 +60,6 @@ protected:
         // needing to reach through the frame to get to the Document*.  See bug 27640.
         // ASSERT(globalObject->scriptExecutionContext());
     }
-
-#ifndef NDEBUG
-    virtual ~JSDOMWrapper();
-#endif
 };
 
 } // namespace WebCore
diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h
index a9366ed..01c6ac2 100644
--- a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h
+++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSExceptionBase.h
@@ -1,43 +1,43 @@
-/*
- * Copyright (C) 2009 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef JSExceptionBase_h
-#define JSExceptionBase_h
-
-namespace JSC {
-    
-class JSValue;
-
-}   // namespace JSC
-
-namespace WebCore {
-
-class ExceptionBase;
-
-ExceptionBase* toExceptionBase(JSC::JSValue);
-
-} // namespace WebCore
-
-#endif // JSExceptionBase_h
+/*

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

+ *

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

+ * modification, are permitted provided that the following conditions

+ * are met:

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

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

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

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

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

+ *

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

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

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

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

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

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

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

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

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

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

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

+ */

+

+#ifndef JSExceptionBase_h

+#define JSExceptionBase_h

+

+namespace JSC {

+    

+class JSValue;

+

+}   // namespace JSC

+

+namespace WebCore {

+

+class ExceptionBase;

+

+ExceptionBase* toExceptionBase(JSC::JSValue);

+

+} // namespace WebCore

+

+#endif // JSExceptionBase_h

diff --git a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSImageDataCustom.cpp b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSImageDataCustom.cpp
index 420b60c..6e242b0 100644
--- a/src/3rdparty/webkit/Source/WebCore/bindings/js/JSImageDataCustom.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/bindings/js/JSImageDataCustom.cpp
@@ -48,8 +48,10 @@ JSValue toJS(ExecState* exec, JSDOMGlobalObject* globalObject, ImageData* imageD
     wrapper = CREATE_DOM_WRAPPER(exec, globalObject, ImageData, imageData);
     Identifier dataName(exec, "data");
     static const ClassInfo cpaClassInfo = { "CanvasPixelArray", &JSByteArray::Base::s_info, 0, 0 };
-    DEFINE_STATIC_LOCAL(Strong<Structure>, cpaStructure, (exec->globalData(), JSByteArray::createStructure(exec->globalData(), jsNull(), &cpaClassInfo)));
-    wrapper->putDirect(exec->globalData(), dataName, new (exec) JSByteArray(exec, cpaStructure.get(), imageData->data()->data()), DontDelete | ReadOnly);
+    Structure* cpaStructure = getCachedDOMStructure(globalObject, &cpaClassInfo);
+    if (!cpaStructure)
+        cpaStructure = cacheDOMStructure(globalObject, JSByteArray::createStructure(exec->globalData(), jsNull(), &cpaClassInfo), &cpaClassInfo);
+    wrapper->putDirect(exec->globalData(), dataName, new (exec) JSByteArray(exec, cpaStructure, imageData->data()->data()), DontDelete | ReadOnly);
     exec->heap()->reportExtraMemoryCost(imageData->data()->length());
     
     return wrapper;
diff --git a/src/3rdparty/webkit/Source/WebCore/config.h b/src/3rdparty/webkit/Source/WebCore/config.h
index 001753e..a7ddcee 100644
--- a/src/3rdparty/webkit/Source/WebCore/config.h
+++ b/src/3rdparty/webkit/Source/WebCore/config.h
@@ -197,6 +197,7 @@
 
 #if OS(SYMBIAN)
 #define USE_SYSTEM_MALLOC 1
+#define ENABLE_PASSWORD_ECHO 1
 #endif
 
 #if OS(UNIX) || OS(WINDOWS)
diff --git a/src/3rdparty/webkit/Source/WebCore/css/CSSStyleSelector.h b/src/3rdparty/webkit/Source/WebCore/css/CSSStyleSelector.h
index a9b0c3e..1fe4ea2 100644
--- a/src/3rdparty/webkit/Source/WebCore/css/CSSStyleSelector.h
+++ b/src/3rdparty/webkit/Source/WebCore/css/CSSStyleSelector.h
@@ -209,7 +209,7 @@ public:
         
         bool checkSelector(const RuleData&);
 
-        template <bool firstPass>
+        template <bool applyFirst>
         void applyDeclarations(bool important, int startIndex, int endIndex);
 
         void matchPageRules(RuleSet*, bool isLeftPage, bool isFirstPage, const String& pageName);
diff --git a/src/3rdparty/webkit/Source/WebCore/css/CSSStyleSheet.cpp b/src/3rdparty/webkit/Source/WebCore/css/CSSStyleSheet.cpp
index 16c2ba8..37e5c2a 100644
--- a/src/3rdparty/webkit/Source/WebCore/css/CSSStyleSheet.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/css/CSSStyleSheet.cpp
@@ -220,13 +220,13 @@ void CSSStyleSheet::checkLoaded()
 {
     if (isLoading())
         return;
-    if (parent())
-        parent()->checkLoaded();
 
     // Avoid |this| being deleted by scripts that run via
     // ScriptableDocumentParser::executeScriptsWaitingForStylesheets().
     // See <rdar://problem/6622300>.
     RefPtr<CSSStyleSheet> protector(this);
+    if (parent())
+        parent()->checkLoaded();
     m_loadCompleted = ownerNode() ? ownerNode()->sheetLoaded() : true;
 }
 
diff --git a/src/3rdparty/webkit/Source/WebCore/dom/Document.h b/src/3rdparty/webkit/Source/WebCore/dom/Document.h
index 6e2f5ec..0948592 100644
--- a/src/3rdparty/webkit/Source/WebCore/dom/Document.h
+++ b/src/3rdparty/webkit/Source/WebCore/dom/Document.h
@@ -1227,7 +1227,7 @@ private:
 
     typedef ListHashSet<Element*, 64> FormElementListHashSet;
     FormElementListHashSet m_formElementsWithState;
-    typedef ListHashSet<FormAssociatedElement*, 32> FormAssociatedElementListHashSet;
+    typedef ListHashSet<RefPtr<FormAssociatedElement>, 32> FormAssociatedElementListHashSet;
     FormAssociatedElementListHashSet m_formElementsWithFormAttribute;
 
     typedef HashMap<FormElementKey, Vector<String>, FormElementKeyHash, FormElementKeyHashTraits> FormElementStateMap;
diff --git a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
index e7bfbc0..32e47ca 100644
--- a/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/dom/Element.cpp
@@ -1208,7 +1208,13 @@ void Element::removeShadowRoot()
         InspectorInstrumentation::willRemoveDOMNode(document(), this);
         data->m_shadowRoot = 0;
         document()->removeFocusedNodeOfSubtree(oldRoot.get());
+
+        // Remove from rendering tree
+        if (oldRoot->attached())
+            oldRoot->detach();
+
         oldRoot->setShadowHost(0);
+        oldRoot->setTreeScopeRecursively(document());
         if (oldRoot->inDocument())
             oldRoot->removedFromDocument();
         else
diff --git a/src/3rdparty/webkit/Source/WebCore/dom/ProcessingInstruction.cpp b/src/3rdparty/webkit/Source/WebCore/dom/ProcessingInstruction.cpp
index 30111d8..f7dcfd2 100644
--- a/src/3rdparty/webkit/Source/WebCore/dom/ProcessingInstruction.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/dom/ProcessingInstruction.cpp
@@ -62,6 +62,9 @@ ProcessingInstruction::~ProcessingInstruction()
 
     if (m_cachedSheet)
         m_cachedSheet->removeClient(this);
+
+    if (inDocument())
+        document()->removeStyleSheetCandidateNode(this);
 }
 
 void ProcessingInstruction::setData(const String& data, ExceptionCode&)
diff --git a/src/3rdparty/webkit/Source/WebCore/dom/Range.cpp b/src/3rdparty/webkit/Source/WebCore/dom/Range.cpp
index be196c8..4f8ad85 100644
--- a/src/3rdparty/webkit/Source/WebCore/dom/Range.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/dom/Range.cpp
@@ -51,6 +51,8 @@ using namespace std;
 static WTF::RefCountedLeakCounter rangeCounter("Range");
 #endif
 
+typedef Vector<RefPtr<Node> > NodeVector;
+
 inline Range::Range(PassRefPtr<Document> ownerDocument)
     : m_ownerDocument(ownerDocument)
     , m_start(m_ownerDocument)
@@ -621,7 +623,9 @@ static inline Node* childOfCommonRootBeforeOffset(Node* container, unsigned offs
 {
     ASSERT(container);
     ASSERT(commonRoot);
-    ASSERT(commonRoot->contains(container));
+    
+    if (!commonRoot->contains(container))
+        return 0;
 
     if (container == commonRoot) {
         container = container->firstChild();
@@ -663,8 +667,6 @@ static inline unsigned lengthOfContentsInNode(Node* node)
 
 PassRefPtr<DocumentFragment> Range::processContents(ActionType action, ExceptionCode& ec)
 {
-    typedef Vector<RefPtr<Node> > NodeVector;
-
     RefPtr<DocumentFragment> fragment;
     if (action == EXTRACT_CONTENTS || action == CLONE_CONTENTS)
         fragment = DocumentFragment::create(m_ownerDocument.get());
@@ -675,7 +677,7 @@ PassRefPtr<DocumentFragment> Range::processContents(ActionType action, Exception
     if (ec)
         return 0;
 
-    Node* commonRoot = commonAncestorContainer(ec);
+    RefPtr<Node> commonRoot = commonAncestorContainer(ec);
     if (ec)
         return 0;
     ASSERT(commonRoot);
@@ -686,8 +688,8 @@ PassRefPtr<DocumentFragment> Range::processContents(ActionType action, Exception
     }
 
     // what is the highest node that partially selects the start / end of the range?
-    Node* partialStart = highestAncestorUnderCommonRoot(m_start.container(), commonRoot);
-    Node* partialEnd = highestAncestorUnderCommonRoot(m_end.container(), commonRoot);
+    RefPtr<Node> partialStart = highestAncestorUnderCommonRoot(m_start.container(), commonRoot.get());
+    RefPtr<Node> partialEnd = highestAncestorUnderCommonRoot(m_end.container(), commonRoot.get());
 
     // Start and end containers are different.
     // There are three possibilities here:
@@ -706,29 +708,32 @@ PassRefPtr<DocumentFragment> Range::processContents(ActionType action, Exception
     //
     // These are deleted, cloned, or extracted (i.e. both) depending on action.
 
+    // Note that we are verifying that our common root hierarchy is still intact
+    // after any DOM mutation event, at various stages below. See webkit bug 60350.
+
     RefPtr<Node> leftContents;
-    if (m_start.container() != commonRoot) {
+    if (m_start.container() != commonRoot && commonRoot->contains(m_start.container())) {
         leftContents = processContentsBetweenOffsets(action, 0, m_start.container(), m_start.offset(), lengthOfContentsInNode(m_start.container()), ec);
-        leftContents = processAncestorsAndTheirSiblings(action, m_start.container(), ProcessContentsForward, leftContents, commonRoot, ec);
+        leftContents = processAncestorsAndTheirSiblings(action, m_start.container(), ProcessContentsForward, leftContents, commonRoot.get(), ec);
     }
 
     RefPtr<Node> rightContents;
-    if (m_end.container() != commonRoot) {
+    if (m_end.container() != commonRoot && commonRoot->contains(m_end.container())) {
         rightContents = processContentsBetweenOffsets(action, 0, m_end.container(), 0, m_end.offset(), ec);
-        rightContents = processAncestorsAndTheirSiblings(action, m_end.container(), ProcessContentsBackward, rightContents, commonRoot, ec);
+        rightContents = processAncestorsAndTheirSiblings(action, m_end.container(), ProcessContentsBackward, rightContents, commonRoot.get(), ec);
     }
 
     // delete all children of commonRoot between the start and end container
-    Node* processStart = childOfCommonRootBeforeOffset(m_start.container(), m_start.offset(), commonRoot);
-    if (m_start.container() != commonRoot) // processStart contains nodes before m_start.
+    RefPtr<Node> processStart = childOfCommonRootBeforeOffset(m_start.container(), m_start.offset(), commonRoot.get());
+    if (processStart && m_start.container() != commonRoot) // processStart contains nodes before m_start.
         processStart = processStart->nextSibling();
-    Node* processEnd = childOfCommonRootBeforeOffset(m_end.container(), m_end.offset(), commonRoot);
+    RefPtr<Node> processEnd = childOfCommonRootBeforeOffset(m_end.container(), m_end.offset(), commonRoot.get());
 
     // Collapse the range, making sure that the result is not within a node that was partially selected.
     if (action == EXTRACT_CONTENTS || action == DELETE_CONTENTS) {
-        if (partialStart)
+        if (partialStart && commonRoot->contains(partialStart.get()))
             setStart(partialStart->parentNode(), partialStart->nodeIndex() + 1, ec);
-        else if (partialEnd)
+        else if (partialEnd && commonRoot->contains(partialEnd.get()))
             setStart(partialEnd->parentNode(), partialEnd->nodeIndex(), ec);
         if (ec)
             return 0;
@@ -743,7 +748,7 @@ PassRefPtr<DocumentFragment> Range::processContents(ActionType action, Exception
 
     if (processStart) {
         NodeVector nodes;
-        for (Node* n = processStart; n && n != processEnd; n = n->nextSibling())
+        for (Node* n = processStart.get(); n && n != processEnd; n = n->nextSibling())
             nodes.append(n);
         processNodes(action, nodes, commonRoot, fragment, ec);
     }
@@ -834,7 +839,7 @@ PassRefPtr<Node> Range::processContentsBetweenOffsets(ActionType action, PassRef
         break;
     }
 
-    return result;
+    return result.release();
 }
 
 void Range::processNodes(ActionType action, Vector<RefPtr<Node> >& nodes, PassRefPtr<Node> oldContainer, PassRefPtr<Node> newContainer, ExceptionCode& ec)
@@ -875,9 +880,14 @@ PassRefPtr<Node> Range::processAncestorsAndTheirSiblings(ActionType action, Node
         // FIXME: This assertion may fail if DOM is modified during mutation event
         // FIXME: Share code with Range::processNodes
         ASSERT(!firstChildInAncestorToProcess || firstChildInAncestorToProcess->parentNode() == ancestor);
-        RefPtr<Node> next;
-        for (Node* child = firstChildInAncestorToProcess.get(); child; child = next.get()) {
-            next = direction == ProcessContentsForward ? child->nextSibling() : child->previousSibling();
+        
+        NodeVector nodes;
+        for (Node* child = firstChildInAncestorToProcess.get(); child;
+            child = (direction == ProcessContentsForward) ? child->nextSibling() : child->previousSibling())
+            nodes.append(child);
+
+        for (NodeVector::const_iterator it = nodes.begin(); it != nodes.end(); it++) {
+            Node* child = it->get();
             switch (action) {
             case DELETE_CONTENTS:
                 ancestor->removeChild(child, ec);
@@ -899,7 +909,7 @@ PassRefPtr<Node> Range::processAncestorsAndTheirSiblings(ActionType action, Node
         firstChildInAncestorToProcess = direction == ProcessContentsForward ? ancestor->nextSibling() : ancestor->previousSibling();
     }
 
-    return clonedContainer;
+    return clonedContainer.release();
 }
 
 PassRefPtr<DocumentFragment> Range::extractContents(ExceptionCode& ec)
diff --git a/src/3rdparty/webkit/Source/WebCore/dom/StyleElement.cpp b/src/3rdparty/webkit/Source/WebCore/dom/StyleElement.cpp
index 5b0e2ad..3bed5ae 100644
--- a/src/3rdparty/webkit/Source/WebCore/dom/StyleElement.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/dom/StyleElement.cpp
@@ -84,6 +84,15 @@ void StyleElement::removedFromDocument(Document* document, Element* element)
         document->styleSelectorChanged(DeferRecalcStyle);
 }
 
+void StyleElement::clearDocumentData(Document* document, Element* element)
+{
+    if (m_sheet)
+        m_sheet->clearOwnerNode();
+
+    if (element->inDocument())
+        document->removeStyleSheetCandidateNode(element);
+}
+
 void StyleElement::childrenChanged(Element* element)
 {
     ASSERT(element);
diff --git a/src/3rdparty/webkit/Source/WebCore/dom/StyleElement.h b/src/3rdparty/webkit/Source/WebCore/dom/StyleElement.h
index 4356c17..1f50c6e 100644
--- a/src/3rdparty/webkit/Source/WebCore/dom/StyleElement.h
+++ b/src/3rdparty/webkit/Source/WebCore/dom/StyleElement.h
@@ -44,6 +44,7 @@ protected:
 
     void insertedIntoDocument(Document*, Element*);
     void removedFromDocument(Document*, Element*);
+    void clearDocumentData(Document*, Element*);
     void childrenChanged(Element*);
     void finishParsingChildren(Element*);
 
diff --git a/src/3rdparty/webkit/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp b/src/3rdparty/webkit/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp
index b1a455b..0fbc2af 100644
--- a/src/3rdparty/webkit/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp
@@ -27,6 +27,8 @@
 #include "InsertIntoTextNodeCommand.h"
 
 #include "AXObjectCache.h"
+#include "RenderText.h"
+#include "Settings.h"
 #include "Text.h"
 
 namespace WebCore {
@@ -46,7 +48,13 @@ void InsertIntoTextNodeCommand::doApply()
 {
     if (!m_node->rendererIsEditable())
         return;
-    
+
+    if (document()->settings() && document()->settings()->passwordEchoEnabled()) {
+        RenderText* renderText = toRenderText(m_node->renderer());
+        if (renderText && renderText->isSecure())
+            renderText->momentarilyRevealLastTypedCharacter(m_offset + m_text.length() - 1);
+    }
+
     ExceptionCode ec;
     m_node->insertData(m_offset, m_text, ec);
 
diff --git a/src/3rdparty/webkit/Source/WebCore/editing/ReplaceSelectionCommand.cpp b/src/3rdparty/webkit/Source/WebCore/editing/ReplaceSelectionCommand.cpp
index 279bb35..d1aa6da 100644
--- a/src/3rdparty/webkit/Source/WebCore/editing/ReplaceSelectionCommand.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/editing/ReplaceSelectionCommand.cpp
@@ -138,7 +138,7 @@ ReplacementFragment::ReplacementFragment(Document* document, DocumentFragment* f
     if (!m_fragment->firstChild())
         return;
     
-    Element* editableRoot = selection.rootEditableElement();
+    RefPtr<Element> editableRoot = selection.rootEditableElement();
     ASSERT(editableRoot);
     if (!editableRoot)
         return;
@@ -153,8 +153,8 @@ ReplacementFragment::ReplacementFragment(Document* document, DocumentFragment* f
         return;
     }
 
-    Node* styleNode = selection.base().deprecatedNode();
-    RefPtr<StyledElement> holder = insertFragmentForTestRendering(styleNode);
+    RefPtr<Node> styleNode = selection.base().deprecatedNode();
+    RefPtr<StyledElement> holder = insertFragmentForTestRendering(styleNode.get());
     if (!holder) {
         removeInterchangeNodes(m_fragment.get());
         return;
@@ -174,7 +174,7 @@ ReplacementFragment::ReplacementFragment(Document* document, DocumentFragment* f
         m_fragment = createFragmentFromText(selection.toNormalizedRange().get(), evt->text());
         if (!m_fragment->firstChild())
             return;
-        holder = insertFragmentForTestRendering(styleNode);
+        holder = insertFragmentForTestRendering(styleNode.get());
     }
     
     removeInterchangeNodes(holder.get());
@@ -291,7 +291,7 @@ void ReplacementFragment::restoreTestRenderingNodesToFragment(StyledElement* hol
 
 void ReplacementFragment::removeUnrenderedNodes(Node* holder)
 {
-    Vector<Node*> unrendered;
+    Vector<RefPtr<Node> > unrendered;
 
     for (Node* node = holder->firstChild(); node; node = node->traverseNextNode(holder))
         if (!isNodeRendered(node) && !isTableStructureNode(node))
diff --git a/src/3rdparty/webkit/Source/WebCore/editing/SelectionController.cpp b/src/3rdparty/webkit/Source/WebCore/editing/SelectionController.cpp
index 879cb82..ba95ede 100644
--- a/src/3rdparty/webkit/Source/WebCore/editing/SelectionController.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/editing/SelectionController.cpp
@@ -1401,7 +1401,7 @@ void SelectionController::selectAll()
         return;
     }
     
-    Node* root = 0;
+    RefPtr<Node> root = 0;
     if (isContentEditable())
         root = highestEditableRoot(m_selection.start());
     else {
@@ -1411,7 +1411,7 @@ void SelectionController::selectAll()
     }
     if (!root)
         return;
-    VisibleSelection newSelection(VisibleSelection::selectionFromContentsOfNode(root));
+    VisibleSelection newSelection(VisibleSelection::selectionFromContentsOfNode(root.get()));
     if (shouldChangeSelection(newSelection))
         setSelection(newSelection);
     selectFrameElementInParentIfFullySelected();
diff --git a/src/3rdparty/webkit/Source/WebCore/editing/TextIterator.cpp b/src/3rdparty/webkit/Source/WebCore/editing/TextIterator.cpp
index b09c226..38ade02 100644
--- a/src/3rdparty/webkit/Source/WebCore/editing/TextIterator.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/editing/TextIterator.cpp
@@ -602,21 +602,30 @@ void TextIterator::handleTextBox()
     }
 }
 
+static inline RenderText* firstRenderTextInFirstLetter(RenderObject* firstLetter)
+{
+    if (!firstLetter)
+        return 0;
+
+    // FIXME: Should this check descendent objects?
+    for (RenderObject* current = firstLetter->firstChild(); current; current = current->nextSibling()) {
+        if (current->isText())
+            return toRenderText(current);
+    }
+    return 0;
+}
+
 void TextIterator::handleTextNodeFirstLetter(RenderTextFragment* renderer)
 {
     if (renderer->firstLetter()) {
         RenderObject* r = renderer->firstLetter();
         if (r->style()->visibility() != VISIBLE && !m_ignoresStyleVisibility)
             return;
-        for (RenderObject *currChild = r->firstChild(); currChild; currChild->nextSibling()) {
-            if (currChild->isText()) {
-                RenderText* firstLetter = toRenderText(currChild);
-                m_handledFirstLetter = true;
-                m_remainingTextBox = m_textBox;
-                m_textBox = firstLetter->firstTextBox();
-                m_firstLetterText = firstLetter;
-                return;
-            }
+        if (RenderText* firstLetter = firstRenderTextInFirstLetter(r)) {
+            m_handledFirstLetter = true;
+            m_remainingTextBox = m_textBox;
+            m_textBox = firstLetter->firstTextBox();
+            m_firstLetterText = firstLetter;
         }
     }
     m_handledFirstLetter = true;
@@ -1042,14 +1051,46 @@ Node* TextIterator::node() const
 SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator()
     : m_behavior(TextIteratorDefaultBehavior)
     , m_node(0)
+    , m_offset(0)
+    , m_handledNode(false)
+    , m_handledChildren(false)
+    , m_startNode(0)
+    , m_startOffset(0)
+    , m_endNode(0)
+    , m_endOffset(0)
     , m_positionNode(0)
+    , m_positionStartOffset(0)
+    , m_positionEndOffset(0)
+    , m_textCharacters(0)
+    , m_textLength(0)
+    , m_lastTextNode(0)
+    , m_lastCharacter(0)
+    , m_singleCharacterBuffer(0)
+    , m_havePassedStartNode(false)
+    , m_shouldHandleFirstLetter(false)
 {
 }
 
 SimplifiedBackwardsTextIterator::SimplifiedBackwardsTextIterator(const Range* r, TextIteratorBehavior behavior)
     : m_behavior(behavior)
     , m_node(0)
+    , m_offset(0)
+    , m_handledNode(false)
+    , m_handledChildren(false)
+    , m_startNode(0)
+    , m_startOffset(0)
+    , m_endNode(0)
+    , m_endOffset(0)
     , m_positionNode(0)
+    , m_positionStartOffset(0)
+    , m_positionEndOffset(0)
+    , m_textCharacters(0)
+    , m_textLength(0)
+    , m_lastTextNode(0)
+    , m_lastCharacter(0)
+    , m_singleCharacterBuffer(0)
+    , m_havePassedStartNode(false)
+    , m_shouldHandleFirstLetter(false)
 {
     ASSERT(m_behavior == TextIteratorDefaultBehavior);
 
@@ -1177,23 +1218,62 @@ bool SimplifiedBackwardsTextIterator::handleTextNode()
 {
     m_lastTextNode = m_node;
 
-    RenderText* renderer = toRenderText(m_node->renderer());
-    String str = renderer->text();
+    int startOffset;
+    int offsetInNode;
+    RenderText* renderer = handleFirstLetter(startOffset, offsetInNode);
+    if (!renderer)
+        return true;
 
-    if (!renderer->firstTextBox() && str.length() > 0)
+    String text = renderer->text();
+    if (!renderer->firstTextBox() && text.length() > 0)
         return true;
 
     m_positionEndOffset = m_offset;
-
-    m_offset = (m_node == m_startNode) ? m_startOffset : 0;
+    m_offset = startOffset + offsetInNode;
     m_positionNode = m_node;
     m_positionStartOffset = m_offset;
+
+    ASSERT(0 <= m_positionStartOffset - offsetInNode && m_positionStartOffset - offsetInNode <= static_cast<int>(text.length()));
+    ASSERT(1 <= m_positionEndOffset - offsetInNode && m_positionEndOffset - offsetInNode <= static_cast<int>(text.length()));
+    ASSERT(m_positionStartOffset <= m_positionEndOffset);
+
     m_textLength = m_positionEndOffset - m_positionStartOffset;
-    m_textCharacters = str.characters() + m_positionStartOffset;
+    m_textCharacters = text.characters() + (m_positionStartOffset - offsetInNode);
+    ASSERT(m_textCharacters >= text.characters());
+    ASSERT(m_textCharacters + m_textLength <= text.characters() + static_cast<int>(text.length()));
 
-    m_lastCharacter = str[m_positionEndOffset - 1];
+    m_lastCharacter = text[m_positionEndOffset - 1];
 
-    return true;
+    return !m_shouldHandleFirstLetter;
+}
+
+RenderText* SimplifiedBackwardsTextIterator::handleFirstLetter(int& startOffset, int& offsetInNode)
+{
+    RenderText* renderer = toRenderText(m_node->renderer());
+    startOffset = (m_node == m_startNode) ? m_startOffset : 0;
+
+    if (!renderer->isTextFragment()) {
+        offsetInNode = 0;
+        return renderer;
+    }
+
+    RenderTextFragment* fragment = toRenderTextFragment(renderer);
+    int offsetAfterFirstLetter = fragment->start();
+    if (startOffset >= offsetAfterFirstLetter) {
+        ASSERT(!m_shouldHandleFirstLetter);
+        offsetInNode = offsetAfterFirstLetter;
+        return renderer;
+    }
+
+    if (!m_shouldHandleFirstLetter && offsetAfterFirstLetter < m_offset) {
+        m_shouldHandleFirstLetter = true;
+        offsetInNode = offsetAfterFirstLetter;
+        return renderer;
+    }
+
+    m_shouldHandleFirstLetter = false;
+    offsetInNode = 0;
+    return firstRenderTextInFirstLetter(fragment->firstLetter());
 }
 
 bool SimplifiedBackwardsTextIterator::handleReplacedElement()
@@ -2563,6 +2643,9 @@ tryAgain:
 
 PassRefPtr<Range> findPlainText(const Range* range, const String& target, FindOptions options)
 {
+    // CharacterIterator requires renderers to be up-to-date
+    range->ownerDocument()->updateLayout();
+
     // First, find the text.
     size_t matchStart;
     size_t matchLength;
diff --git a/src/3rdparty/webkit/Source/WebCore/editing/TextIterator.h b/src/3rdparty/webkit/Source/WebCore/editing/TextIterator.h
index 9fe4ceb..8820388 100644
--- a/src/3rdparty/webkit/Source/WebCore/editing/TextIterator.h
+++ b/src/3rdparty/webkit/Source/WebCore/editing/TextIterator.h
@@ -203,6 +203,7 @@ public:
 private:
     void exitNode();
     bool handleTextNode();
+    RenderText* handleFirstLetter(int& startOffset, int& offsetInNode);
     bool handleReplacedElement();
     bool handleNonTextNode();
     void emitCharacter(UChar, Node*, int startOffset, int endOffset);
@@ -240,6 +241,9 @@ private:
 
     // Whether m_node has advanced beyond the iteration range (i.e. m_startNode).
     bool m_havePassedStartNode;
+
+    // Should handle first-letter renderer in the next call to handleTextNode.
+    bool m_shouldHandleFirstLetter;
 };
 
 // Builds on the text iterator, adding a character position so we can walk one
diff --git a/src/3rdparty/webkit/Source/WebCore/editing/visible_units.cpp b/src/3rdparty/webkit/Source/WebCore/editing/visible_units.cpp
index ff683a5..b2b52f3 100644
--- a/src/3rdparty/webkit/Source/WebCore/editing/visible_units.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/editing/visible_units.cpp
@@ -101,7 +101,7 @@ static VisiblePosition previousBoundary(const VisiblePosition& c, BoundarySearch
         else {
             // Treat bullets used in the text security mode as regular characters when looking for boundaries
             String iteratorString(it.characters(), it.length());
-            iteratorString = iteratorString.impl()->secure('x');
+            iteratorString.fill('x');
             string.prepend(iteratorString.characters(), iteratorString.length());
         }
         next = searchFunction(string.data(), string.size(), string.size() - suffixLength, MayHaveMoreContext, needMoreContext);
@@ -176,7 +176,7 @@ static VisiblePosition nextBoundary(const VisiblePosition& c, BoundarySearchFunc
         else {
             // Treat bullets used in the text security mode as regular characters when looking for boundaries
             String iteratorString(it.characters(), it.length());
-            iteratorString = iteratorString.impl()->secure('x');
+            iteratorString.fill('x');
             string.append(iteratorString.characters(), iteratorString.length());
         }
         next = searchFunction(string.data(), string.size(), prefixLength, MayHaveMoreContext, needMoreContext);
diff --git a/src/3rdparty/webkit/Source/WebCore/features.pri b/src/3rdparty/webkit/Source/WebCore/features.pri
index c56c9fc..f04d0b4 100644
--- a/src/3rdparty/webkit/Source/WebCore/features.pri
+++ b/src/3rdparty/webkit/Source/WebCore/features.pri
@@ -162,17 +162,23 @@ symbian|maemo5|maemo6 {
     DEFINES -= ENABLE_VIDEO=1
     DEFINES += ENABLE_VIDEO=0
 
-    contains(DEFINES, USE_QTKIT=1) {
+    mac:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
         DEFINES -= ENABLE_VIDEO=0
         DEFINES += ENABLE_VIDEO=1
-        DEFINES -= WTF_USE_QT_MULTIMEDIA=1
-        DEFINES += WTF_USE_QT_MULTIMEDIA=0
-    } else: contains(DEFINES, USE_GSTREAMER=1) {
-        DEFINES -= ENABLE_VIDEO=0
-        DEFINES += ENABLE_VIDEO=1
-        DEFINES -= WTF_USE_QT_MULTIMEDIA=1
-        DEFINES += WTF_USE_QT_MULTIMEDIA=0
-    } else:contains(MOBILITY_CONFIG, multimedia) {
+        DEFINES += WTF_USE_QTKIT=1
+        DEFINES -= WTF_USE_QTKIT=0
+    } else: linux-*:!contains(DEFINES, USE_QTMULTIMEDIA=1) {
+        !contains(QT_CONFIG, no-pkg-config):system(pkg-config --exists glib-2.0 gio-2.0 gstreamer-0.10): {
+            DEFINES -= ENABLE_VIDEO=0
+            DEFINES += ENABLE_VIDEO=1
+            DEFINES += WTF_USE_GSTREAMER=1
+            DEFINES -= WTF_USE_GSTREAMER=0
+        } else {
+            message("Disabling video due the lack of GLib/Gio/GStreamer.")
+            DEFINES -= ENABLE_VIDEO=1
+            DEFINES += ENABLE_VIDEO=0
+        }
+    } else: contains(MOBILITY_CONFIG, multimedia) {
         DEFINES -= ENABLE_VIDEO=0
         DEFINES += ENABLE_VIDEO=1
         DEFINES -= WTF_USE_QT_MULTIMEDIA=0
diff --git a/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.cpp b/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.cpp
index 1da5e2f..df97459 100644
--- a/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.cpp
@@ -1,8 +1,10 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
 
-/* Bison implementation for Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.5"
+#define YYBISON_VERSION "2.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -73,7 +75,7 @@
 
 /* Copy the first part of user declarations.  */
 
-/* Line 268 of yacc.c  */
+/* Line 189 of yacc.c  */
 #line 1 "../Source/WebCore/css/CSSGrammar.y"
 
 
@@ -135,8 +137,8 @@ using namespace HTMLNames;
 
 
 
-/* Line 268 of yacc.c  */
-#line 140 "/Source/WebCore/generated/CSSGrammar.tab.c"
+/* Line 189 of yacc.c  */
+#line 142 "/Source/WebCore/generated/CSSGrammar.tab.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -252,7 +254,7 @@ using namespace HTMLNames;
 typedef union YYSTYPE
 {
 
-/* Line 293 of yacc.c  */
+/* Line 214 of yacc.c  */
 #line 63 "../Source/WebCore/css/CSSGrammar.y"
 
     bool boolean;
@@ -280,8 +282,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 293 of yacc.c  */
-#line 285 "/Source/WebCore/generated/CSSGrammar.tab.c"
+/* Line 214 of yacc.c  */
+#line 287 "/Source/WebCore/generated/CSSGrammar.tab.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -291,7 +293,7 @@ typedef union YYSTYPE
 
 /* Copy the second part of user declarations.  */
 
-/* Line 343 of yacc.c  */
+/* Line 264 of yacc.c  */
 #line 88 "../Source/WebCore/css/CSSGrammar.y"
 
 
@@ -307,8 +309,8 @@ static int cssyylex(YYSTYPE* yylval, void* parser)
 
 
 
-/* Line 343 of yacc.c  */
-#line 312 "/Source/WebCore/generated/CSSGrammar.tab.c"
+/* Line 264 of yacc.c  */
+#line 314 "/Source/WebCore/generated/CSSGrammar.tab.c"
 
 #ifdef short
 # undef short
@@ -358,7 +360,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -411,11 +413,11 @@ YYID (yyi)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
 #     endif
 #    endif
 #   endif
@@ -438,24 +440,24 @@ YYID (yyi)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+#  if (defined __cplusplus && ! defined _STDLIB_H \
        && ! ((defined YYMALLOC || defined malloc) \
 	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -484,7 +486,23 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-# define YYCOPY_NEEDED 1
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -504,26 +522,6 @@ union yyalloc
 
 #endif
 
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
-#endif /* !YYCOPY_NEEDED */
-
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  21
 /* YYLAST -- Last index in YYTABLE.  */
@@ -898,8 +896,8 @@ static const yytype_uint8 yyr2[] =
        3
 };
 
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 static const yytype_uint16 yydefact[] =
 {
@@ -1054,7 +1052,8 @@ static const yytype_int16 yypgoto[] =
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -276
 static const yytype_int16 yytable[] =
 {
@@ -1228,12 +1227,6 @@ static const yytype_int16 yytable[] =
       87,    88,     0,     0,    90,    91,    92
 };
 
-#define yypact_value_is_default(yystate) \
-  ((yystate) == (-305))
-
-#define yytable_value_is_error(yytable_value) \
-  YYID (0)
-
 static const yytype_int16 yycheck[] =
 {
        0,    87,   127,    37,   243,   212,     5,   250,     8,     9,
@@ -1479,18 +1472,9 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
+   Once GCC version 2 has supplanted version 1, this can go.  */
 
 #define YYFAIL		goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -1500,6 +1484,7 @@ do								\
     {								\
       yychar = (Token);						\
       yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
       YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
@@ -1541,10 +1526,19 @@ while (YYID (0))
 #endif
 
 
-/* This macro is provided for backward compatibility. */
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #endif
 
 
@@ -1736,6 +1730,7 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
+
 
 #if YYERROR_VERBOSE
 
@@ -1838,142 +1833,115 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyssp, int yytoken)
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
 {
-  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
-  YYSIZE_T yysize = yysize0;
-  YYSIZE_T yysize1;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = 0;
-  /* Arguments of yyformat. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
-
-  /* There are many possibilities here to consider:
-     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-       for details.  YYERROR is fine as it does not invoke this
-       function.
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[*yyssp];
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-                if (! (yysize <= yysize1
-                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                  return 2;
-                yysize = yysize1;
-              }
-        }
-    }
+  int yyn = yypact[yystate];
 
-  switch (yycount)
-    {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
-    }
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
+    {
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
 
-  yysize1 = yysize + yystrlen (yyformat);
-  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-    return 2;
-  yysize = yysize1;
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
 
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
 
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
 }
 #endif /* YYERROR_VERBOSE */
+
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -2006,7 +1974,6 @@ yydestruct (yymsg, yytype, yyvaluep)
     }
 }
 
-
 /* Prevent warnings from -Wmissing-prototypes.  */
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
@@ -2023,9 +1990,12 @@ int yyparse ();
 #endif /* ! YYPARSE_PARAM */
 
 
-/*----------.
-| yyparse.  |
-`----------*/
+
+
+
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -2212,7 +2182,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -2243,8 +2213,8 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -2299,34 +2269,34 @@ yyreduce:
     {
         case 9:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 303 "../Source/WebCore/css/CSSGrammar.y"
     {
         static_cast<CSSParser*>(parser)->m_rule = (yyvsp[(4) - (6)].rule);
-    }
+    ;}
     break;
 
   case 10:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 309 "../Source/WebCore/css/CSSGrammar.y"
     {
         static_cast<CSSParser*>(parser)->m_keyframe = (yyvsp[(4) - (6)].keyframeRule);
-    }
+    ;}
     break;
 
   case 11:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 315 "../Source/WebCore/css/CSSGrammar.y"
     {
         /* can be empty */
-    }
+    ;}
     break;
 
   case 12:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 321 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
@@ -2338,22 +2308,22 @@ yyreduce:
             delete p->m_valueList;
             p->m_valueList = 0;
         }
-    }
+    ;}
     break;
 
   case 13:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 335 "../Source/WebCore/css/CSSGrammar.y"
     {
          CSSParser* p = static_cast<CSSParser*>(parser);
          p->m_mediaQuery = p->sinkFloatingMediaQuery((yyvsp[(4) - (5)].mediaQuery));
-     }
+     ;}
     break;
 
   case 14:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 342 "../Source/WebCore/css/CSSGrammar.y"
     {
         if ((yyvsp[(4) - (5)].selectorList)) {
@@ -2361,94 +2331,94 @@ yyreduce:
             if (p->m_selectorListForParseSelector)
                 p->m_selectorListForParseSelector->adoptSelectorVector(*(yyvsp[(4) - (5)].selectorList));
         }
-    }
+    ;}
     break;
 
   case 21:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 364 "../Source/WebCore/css/CSSGrammar.y"
     {
-  }
+  ;}
     break;
 
   case 24:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 374 "../Source/WebCore/css/CSSGrammar.y"
     {
      CSSParser* p = static_cast<CSSParser*>(parser);
      (yyval.rule) = static_cast<CSSParser*>(parser)->createCharsetRule((yyvsp[(3) - (5)].string));
      if ((yyval.rule) && p->m_styleSheet)
          p->m_styleSheet->append((yyval.rule));
-  }
+  ;}
     break;
 
   case 25:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 380 "../Source/WebCore/css/CSSGrammar.y"
     {
-  }
+  ;}
     break;
 
   case 26:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 382 "../Source/WebCore/css/CSSGrammar.y"
     {
-  }
+  ;}
     break;
 
   case 27:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 387 "../Source/WebCore/css/CSSGrammar.y"
     {
         // Ignore any @charset rule not at the beginning of the style sheet.
         (yyval.rule) = 0;
-    }
+    ;}
     break;
 
   case 29:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 395 "../Source/WebCore/css/CSSGrammar.y"
     {
      CSSParser* p = static_cast<CSSParser*>(parser);
      if ((yyvsp[(2) - (3)].rule) && p->m_styleSheet)
          p->m_styleSheet->append((yyvsp[(2) - (3)].rule));
- }
+ ;}
     break;
 
   case 30:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 403 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = (yyvsp[(2) - (2)].rule);
-    }
+    ;}
     break;
 
   case 37:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 415 "../Source/WebCore/css/CSSGrammar.y"
     {
         static_cast<CSSParser*>(parser)->m_hadSyntacticallyValidCSSRule = true;
-    }
+    ;}
     break;
 
   case 41:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 424 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.ruleList) = 0; }
+    { (yyval.ruleList) = 0; ;}
     break;
 
   case 42:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 425 "../Source/WebCore/css/CSSGrammar.y"
     {
       (yyval.ruleList) = (yyvsp[(1) - (3)].ruleList);
@@ -2457,357 +2427,357 @@ yyreduce:
               (yyval.ruleList) = static_cast<CSSParser*>(parser)->createRuleList();
           (yyval.ruleList)->append((yyvsp[(2) - (3)].rule));
       }
-  }
+  ;}
     break;
 
   case 53:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 453 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = static_cast<CSSParser*>(parser)->createImportRule((yyvsp[(3) - (6)].string), (yyvsp[(5) - (6)].mediaList));
-    }
+    ;}
     break;
 
   case 54:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 456 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = 0;
-    }
+    ;}
     break;
 
   case 55:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 459 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = 0;
-    }
+    ;}
     break;
 
   case 56:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 462 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = 0;
-    }
+    ;}
     break;
 
   case 57:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 468 "../Source/WebCore/css/CSSGrammar.y"
     {
     static_cast<CSSParser*>(parser)->addNamespace((yyvsp[(3) - (6)].string), (yyvsp[(4) - (6)].string));
     (yyval.rule) = 0;
-}
+;}
     break;
 
   case 58:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 472 "../Source/WebCore/css/CSSGrammar.y"
     {
     (yyval.rule) = 0;
-}
+;}
     break;
 
   case 59:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 475 "../Source/WebCore/css/CSSGrammar.y"
     {
     (yyval.rule) = 0;
-}
+;}
     break;
 
   case 60:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 478 "../Source/WebCore/css/CSSGrammar.y"
     {
     (yyval.rule) = 0;
-}
+;}
     break;
 
   case 61:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 484 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.string).characters = 0; }
+    { (yyval.string).characters = 0; ;}
     break;
 
   case 62:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 485 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.string) = (yyvsp[(1) - (2)].string); }
+    { (yyval.string) = (yyvsp[(1) - (2)].string); ;}
     break;
 
   case 65:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 494 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.string) = (yyvsp[(1) - (2)].string);
-    }
+    ;}
     break;
 
   case 66:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 500 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.valueList) = 0;
-    }
+    ;}
     break;
 
   case 67:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 503 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.valueList) = (yyvsp[(3) - (4)].valueList);
-    }
+    ;}
     break;
 
   case 68:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 509 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyvsp[(3) - (7)].string).lower();
         (yyval.mediaQueryExp) = static_cast<CSSParser*>(parser)->createFloatingMediaQueryExp((yyvsp[(3) - (7)].string), (yyvsp[(5) - (7)].valueList));
-    }
+    ;}
     break;
 
   case 69:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 516 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         (yyval.mediaQueryExpList) = p->createFloatingMediaQueryExpList();
         (yyval.mediaQueryExpList)->append(p->sinkFloatingMediaQueryExp((yyvsp[(1) - (1)].mediaQueryExp)));
-    }
+    ;}
     break;
 
   case 70:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 521 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.mediaQueryExpList) = (yyvsp[(1) - (5)].mediaQueryExpList);
         (yyval.mediaQueryExpList)->append(static_cast<CSSParser*>(parser)->sinkFloatingMediaQueryExp((yyvsp[(5) - (5)].mediaQueryExp)));
-    }
+    ;}
     break;
 
   case 71:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 528 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.mediaQueryExpList) = static_cast<CSSParser*>(parser)->createFloatingMediaQueryExpList();
-    }
+    ;}
     break;
 
   case 72:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 531 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.mediaQueryExpList) = (yyvsp[(3) - (3)].mediaQueryExpList);
-    }
+    ;}
     break;
 
   case 73:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 537 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.mediaQueryRestrictor) = MediaQuery::None;
-    }
+    ;}
     break;
 
   case 74:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 540 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.mediaQueryRestrictor) = MediaQuery::Only;
-    }
+    ;}
     break;
 
   case 75:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 543 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.mediaQueryRestrictor) = MediaQuery::Not;
-    }
+    ;}
     break;
 
   case 76:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 549 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         (yyval.mediaQuery) = p->createFloatingMediaQuery(p->sinkFloatingMediaQueryExpList((yyvsp[(1) - (1)].mediaQueryExpList)));
-    }
+    ;}
     break;
 
   case 77:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 554 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         (yyvsp[(3) - (4)].string).lower();
         (yyval.mediaQuery) = p->createFloatingMediaQuery((yyvsp[(1) - (4)].mediaQueryRestrictor), (yyvsp[(3) - (4)].string), p->sinkFloatingMediaQueryExpList((yyvsp[(4) - (4)].mediaQueryExpList)));
-    }
+    ;}
     break;
 
   case 78:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 562 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.mediaList) = static_cast<CSSParser*>(parser)->createMediaList();
-     }
+     ;}
     break;
 
   case 80:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 569 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         (yyval.mediaList) = p->createMediaList();
         (yyval.mediaList)->appendMediaQuery(p->sinkFloatingMediaQuery((yyvsp[(1) - (1)].mediaQuery)));
-    }
+    ;}
     break;
 
   case 81:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 574 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.mediaList) = (yyvsp[(1) - (4)].mediaList);
         if ((yyval.mediaList))
             (yyval.mediaList)->appendMediaQuery(static_cast<CSSParser*>(parser)->sinkFloatingMediaQuery((yyvsp[(4) - (4)].mediaQuery)));
-    }
+    ;}
     break;
 
   case 82:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 579 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.mediaList) = 0;
-    }
+    ;}
     break;
 
   case 83:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 585 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = static_cast<CSSParser*>(parser)->createMediaRule((yyvsp[(3) - (7)].mediaList), (yyvsp[(6) - (7)].ruleList));
-    }
+    ;}
     break;
 
   case 84:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 588 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = static_cast<CSSParser*>(parser)->createMediaRule(0, (yyvsp[(5) - (6)].ruleList));
-    }
+    ;}
     break;
 
   case 85:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 594 "../Source/WebCore/css/CSSGrammar.y"
     {
       (yyval.string) = (yyvsp[(1) - (2)].string);
-  }
+  ;}
     break;
 
   case 86:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 600 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = (yyvsp[(7) - (8)].keyframesRule);
         (yyvsp[(7) - (8)].keyframesRule)->setNameInternal((yyvsp[(3) - (8)].string));
-    }
+    ;}
     break;
 
   case 89:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 612 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.keyframesRule) = static_cast<CSSParser*>(parser)->createKeyframesRule(); }
+    { (yyval.keyframesRule) = static_cast<CSSParser*>(parser)->createKeyframesRule(); ;}
     break;
 
   case 90:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 613 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.keyframesRule) = (yyvsp[(1) - (3)].keyframesRule);
         if ((yyvsp[(2) - (3)].keyframeRule))
             (yyval.keyframesRule)->append((yyvsp[(2) - (3)].keyframeRule));
-    }
+    ;}
     break;
 
   case 91:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 621 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.keyframeRule) = static_cast<CSSParser*>(parser)->createKeyframeRule((yyvsp[(1) - (6)].valueList));
-    }
+    ;}
     break;
 
   case 92:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 627 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         (yyval.valueList) = p->createFloatingValueList();
         (yyval.valueList)->addValue(p->sinkFloatingValue((yyvsp[(1) - (1)].value)));
-    }
+    ;}
     break;
 
   case 93:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 632 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         (yyval.valueList) = (yyvsp[(1) - (5)].valueList);
         if ((yyval.valueList))
             (yyval.valueList)->addValue(p->sinkFloatingValue((yyvsp[(5) - (5)].value)));
-    }
+    ;}
     break;
 
   case 94:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 641 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).fValue = (yyvsp[(1) - (1)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; }
+    { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).fValue = (yyvsp[(1) - (1)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;}
     break;
 
   case 95:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 642 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER;
@@ -2818,12 +2788,12 @@ yyreduce:
             (yyval.value).fValue = 100;
         else
             YYERROR;
-    }
+    ;}
     break;
 
   case 96:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 656 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
@@ -2835,42 +2805,42 @@ yyreduce:
             // Also clear margin at-rules here once we fully implement margin at-rules parsing.
             (yyval.rule) = 0;
         }
-    }
+    ;}
     break;
 
   case 97:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 667 "../Source/WebCore/css/CSSGrammar.y"
     {
       (yyval.rule) = 0;
-    }
+    ;}
     break;
 
   case 98:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 670 "../Source/WebCore/css/CSSGrammar.y"
     {
       (yyval.rule) = 0;
-    }
+    ;}
     break;
 
   case 99:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 676 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         (yyval.selector) = p->createFloatingSelector();
         (yyval.selector)->setTag(QualifiedName(nullAtom, (yyvsp[(1) - (1)].string), p->m_defaultNamespace));
         (yyval.selector)->setForPage();
-    }
+    ;}
     break;
 
   case 100:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 682 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
@@ -2879,312 +2849,312 @@ yyreduce:
             (yyval.selector)->setTag(QualifiedName(nullAtom, (yyvsp[(1) - (2)].string), p->m_defaultNamespace));
             (yyval.selector)->setForPage();
         }
-    }
+    ;}
     break;
 
   case 101:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 690 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = (yyvsp[(1) - (1)].selector);
         if ((yyval.selector))
             (yyval.selector)->setForPage();
-    }
+    ;}
     break;
 
   case 102:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 695 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         (yyval.selector) = p->createFloatingSelector();
         (yyval.selector)->setForPage();
-    }
+    ;}
     break;
 
   case 105:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 708 "../Source/WebCore/css/CSSGrammar.y"
     {
         static_cast<CSSParser*>(parser)->startDeclarationsForMarginBox();
-    }
+    ;}
     break;
 
   case 106:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 710 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = static_cast<CSSParser*>(parser)->createMarginAtRule((yyvsp[(1) - (7)].marginBox));
-    }
+    ;}
     break;
 
   case 107:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 716 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::TopLeftCornerMarginBox;
-    }
+    ;}
     break;
 
   case 108:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 719 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::TopLeftMarginBox;
-    }
+    ;}
     break;
 
   case 109:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 722 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::TopCenterMarginBox;
-    }
+    ;}
     break;
 
   case 110:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 725 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::TopRightMarginBox;
-    }
+    ;}
     break;
 
   case 111:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 728 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::TopRightCornerMarginBox;
-    }
+    ;}
     break;
 
   case 112:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 731 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::BottomLeftCornerMarginBox;
-    }
+    ;}
     break;
 
   case 113:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 734 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::BottomLeftMarginBox;
-    }
+    ;}
     break;
 
   case 114:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 737 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::BottomCenterMarginBox;
-    }
+    ;}
     break;
 
   case 115:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 740 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::BottomRightMarginBox;
-    }
+    ;}
     break;
 
   case 116:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 743 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::BottomRightCornerMarginBox;
-    }
+    ;}
     break;
 
   case 117:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 746 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::LeftTopMarginBox;
-    }
+    ;}
     break;
 
   case 118:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 749 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::LeftMiddleMarginBox;
-    }
+    ;}
     break;
 
   case 119:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 752 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::LeftBottomMarginBox;
-    }
+    ;}
     break;
 
   case 120:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 755 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::RightTopMarginBox;
-    }
+    ;}
     break;
 
   case 121:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 758 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::RightMiddleMarginBox;
-    }
+    ;}
     break;
 
   case 122:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 761 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.marginBox) = CSSSelector::RightBottomMarginBox;
-    }
+    ;}
     break;
 
   case 123:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 768 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = static_cast<CSSParser*>(parser)->createFontFaceRule();
-    }
+    ;}
     break;
 
   case 124:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 771 "../Source/WebCore/css/CSSGrammar.y"
     {
       (yyval.rule) = 0;
-    }
+    ;}
     break;
 
   case 125:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 774 "../Source/WebCore/css/CSSGrammar.y"
     {
       (yyval.rule) = 0;
-    }
+    ;}
     break;
 
   case 126:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 780 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.relation) = CSSSelector::DirectAdjacent; }
+    { (yyval.relation) = CSSSelector::DirectAdjacent; ;}
     break;
 
   case 127:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 781 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.relation) = CSSSelector::IndirectAdjacent; }
+    { (yyval.relation) = CSSSelector::IndirectAdjacent; ;}
     break;
 
   case 128:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 782 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.relation) = CSSSelector::Child; }
+    { (yyval.relation) = CSSSelector::Child; ;}
     break;
 
   case 129:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 786 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.integer) = (yyvsp[(1) - (1)].integer); }
+    { (yyval.integer) = (yyvsp[(1) - (1)].integer); ;}
     break;
 
   case 130:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 787 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.integer) = 1; }
+    { (yyval.integer) = 1; ;}
     break;
 
   case 131:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 791 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.integer) = -1; }
+    { (yyval.integer) = -1; ;}
     break;
 
   case 132:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 792 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.integer) = 1; }
+    { (yyval.integer) = 1; ;}
     break;
 
   case 133:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 796 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         p->markPropertyStart();
-    }
+    ;}
     break;
 
   case 134:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 803 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         p->markSelectorListStart();
-    }
+    ;}
     break;
 
   case 135:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 810 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         p->markSelectorListEnd();
-    }
+    ;}
     break;
 
   case 136:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 817 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         (yyval.rule) = p->createStyleRule((yyvsp[(1) - (6)].selectorList));
-    }
+    ;}
     break;
 
   case 137:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 824 "../Source/WebCore/css/CSSGrammar.y"
     {
         if ((yyvsp[(1) - (1)].selector)) {
@@ -3194,12 +3164,12 @@ yyreduce:
             (yyval.selectorList)->append(p->sinkFloatingSelector((yyvsp[(1) - (1)].selector)));
             p->updateLastSelectorLineAndPosition();
         }
-    }
+    ;}
     break;
 
   case 138:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 833 "../Source/WebCore/css/CSSGrammar.y"
     {
         if ((yyvsp[(1) - (4)].selectorList) && (yyvsp[(4) - (4)].selector)) {
@@ -3209,48 +3179,48 @@ yyreduce:
             p->updateLastSelectorLineAndPosition();
         } else
             (yyval.selectorList) = 0;
-    }
+    ;}
     break;
 
   case 139:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 842 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selectorList) = 0;
-    }
+    ;}
     break;
 
   case 140:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 848 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = (yyvsp[(1) - (2)].selector);
-    }
+    ;}
     break;
 
   case 141:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 854 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = (yyvsp[(1) - (1)].selector);
-    }
+    ;}
     break;
 
   case 142:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 858 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = (yyvsp[(1) - (1)].selector);
-    }
+    ;}
     break;
 
   case 143:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 862 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = (yyvsp[(2) - (2)].selector);
@@ -3264,12 +3234,12 @@ yyreduce:
             end->setRelation(CSSSelector::Descendant);
             end->setTagHistory(p->sinkFloatingSelector((yyvsp[(1) - (2)].selector)));
         }
-    }
+    ;}
     break;
 
   case 144:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 875 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = (yyvsp[(3) - (3)].selector);
@@ -3283,75 +3253,75 @@ yyreduce:
             end->setRelation((yyvsp[(2) - (3)].relation));
             end->setTagHistory(p->sinkFloatingSelector((yyvsp[(1) - (3)].selector)));
         }
-    }
+    ;}
     break;
 
   case 145:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 888 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = 0;
-    }
+    ;}
     break;
 
   case 146:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 894 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.string).characters = 0; (yyval.string).length = 0; }
+    { (yyval.string).characters = 0; (yyval.string).length = 0; ;}
     break;
 
   case 147:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 895 "../Source/WebCore/css/CSSGrammar.y"
-    { static UChar star = '*'; (yyval.string).characters = &star; (yyval.string).length = 1; }
+    { static UChar star = '*'; (yyval.string).characters = &star; (yyval.string).length = 1; ;}
     break;
 
   case 148:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 896 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.string) = (yyvsp[(1) - (2)].string); }
+    { (yyval.string) = (yyvsp[(1) - (2)].string); ;}
     break;
 
   case 149:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 900 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         (yyval.selector) = p->createFloatingSelector();
         (yyval.selector)->setTag(QualifiedName(nullAtom, (yyvsp[(1) - (1)].string), p->m_defaultNamespace));
-    }
+    ;}
     break;
 
   case 150:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 905 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = (yyvsp[(2) - (2)].selector);
         if ((yyval.selector))
             static_cast<CSSParser*>(parser)->updateSpecifiersWithElementName(nullAtom, (yyvsp[(1) - (2)].string), (yyval.selector));
-    }
+    ;}
     break;
 
   case 151:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 910 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = (yyvsp[(1) - (1)].selector);
         if ((yyval.selector))
             static_cast<CSSParser*>(parser)->updateSpecifiersWithElementName(nullAtom, starAtom, (yyval.selector));
-    }
+    ;}
     break;
 
   case 152:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 915 "../Source/WebCore/css/CSSGrammar.y"
     {
         AtomicString namespacePrefix = (yyvsp[(1) - (2)].string);
@@ -3362,34 +3332,34 @@ yyreduce:
                                       p->m_styleSheet->determineNamespace(namespacePrefix)));
         else // FIXME: Shouldn't this case be an error?
             (yyval.selector)->setTag(QualifiedName(nullAtom, (yyvsp[(2) - (2)].string), p->m_defaultNamespace));
-    }
+    ;}
     break;
 
   case 153:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 925 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = (yyvsp[(3) - (3)].selector);
         if ((yyval.selector))
             static_cast<CSSParser*>(parser)->updateSpecifiersWithElementName((yyvsp[(1) - (3)].string), (yyvsp[(2) - (3)].string), (yyval.selector));
-    }
+    ;}
     break;
 
   case 154:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 930 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = (yyvsp[(2) - (2)].selector);
         if ((yyval.selector))
             static_cast<CSSParser*>(parser)->updateSpecifiersWithElementName((yyvsp[(1) - (2)].string), starAtom, (yyval.selector));
-    }
+    ;}
     break;
 
   case 155:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 938 "../Source/WebCore/css/CSSGrammar.y"
     {
         if ((yyvsp[(1) - (1)].selector)) {
@@ -3403,7 +3373,7 @@ yyreduce:
 
   case 156:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 946 "../Source/WebCore/css/CSSGrammar.y"
     {
         if ((yyvsp[(1) - (5)].selectorList) && (yyvsp[(5) - (5)].selector)) {
@@ -3412,21 +3382,21 @@ yyreduce:
             (yyval.selectorList)->append(p->sinkFloatingSelector((yyvsp[(5) - (5)].selector)));
         } else
             (yyval.selectorList) = 0;
-    }
+    ;}
     break;
 
   case 157:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 954 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selectorList) = 0;
-    }
+    ;}
     break;
 
   case 158:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 960 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParserString& str = (yyvsp[(1) - (1)].string);
@@ -3435,53 +3405,53 @@ yyreduce:
         if (doc && doc->isHTMLDocument())
             str.lower();
         (yyval.string) = str;
-    }
+    ;}
     break;
 
   case 159:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 968 "../Source/WebCore/css/CSSGrammar.y"
     {
         static UChar star = '*';
         (yyval.string).characters = &star;
         (yyval.string).length = 1;
-    }
+    ;}
     break;
 
   case 160:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 976 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = (yyvsp[(1) - (1)].selector);
-    }
+    ;}
     break;
 
   case 161:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 979 "../Source/WebCore/css/CSSGrammar.y"
     {
         if (!(yyvsp[(2) - (2)].selector))
             (yyval.selector) = 0;
         else if ((yyvsp[(1) - (2)].selector))
             (yyval.selector) = static_cast<CSSParser*>(parser)->updateSpecifiers((yyvsp[(1) - (2)].selector), (yyvsp[(2) - (2)].selector));
-    }
+    ;}
     break;
 
   case 162:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 985 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = 0;
-    }
+    ;}
     break;
 
   case 163:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 991 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
@@ -3490,12 +3460,12 @@ yyreduce:
         if (!p->m_strict)
             (yyvsp[(1) - (1)].string).lower();
         (yyval.selector)->setValue((yyvsp[(1) - (1)].string));
-    }
+    ;}
     break;
 
   case 164:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 999 "../Source/WebCore/css/CSSGrammar.y"
     {
         if ((yyvsp[(1) - (1)].string).characters[0] >= '0' && (yyvsp[(1) - (1)].string).characters[0] <= '9') {
@@ -3508,12 +3478,12 @@ yyreduce:
                 (yyvsp[(1) - (1)].string).lower();
             (yyval.selector)->setValue((yyvsp[(1) - (1)].string));
         }
-    }
+    ;}
     break;
 
   case 168:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1017 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
@@ -3522,12 +3492,12 @@ yyreduce:
         if (!p->m_strict)
             (yyvsp[(2) - (2)].string).lower();
         (yyval.selector)->setValue((yyvsp[(2) - (2)].string));
-    }
+    ;}
     break;
 
   case 169:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1028 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParserString& str = (yyvsp[(1) - (2)].string);
@@ -3536,35 +3506,35 @@ yyreduce:
         if (doc && doc->isHTMLDocument())
             str.lower();
         (yyval.string) = str;
-    }
+    ;}
     break;
 
   case 170:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1039 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = static_cast<CSSParser*>(parser)->createFloatingSelector();
         (yyval.selector)->setAttribute(QualifiedName(nullAtom, (yyvsp[(3) - (4)].string), nullAtom));
         (yyval.selector)->setMatch(CSSSelector::Set);
-    }
+    ;}
     break;
 
   case 171:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1044 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = static_cast<CSSParser*>(parser)->createFloatingSelector();
         (yyval.selector)->setAttribute(QualifiedName(nullAtom, (yyvsp[(3) - (8)].string), nullAtom));
         (yyval.selector)->setMatch((CSSSelector::Match)(yyvsp[(4) - (8)].integer));
         (yyval.selector)->setValue((yyvsp[(6) - (8)].string));
-    }
+    ;}
     break;
 
   case 172:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1050 "../Source/WebCore/css/CSSGrammar.y"
     {
         AtomicString namespacePrefix = (yyvsp[(3) - (5)].string);
@@ -3573,12 +3543,12 @@ yyreduce:
         (yyval.selector)->setAttribute(QualifiedName(namespacePrefix, (yyvsp[(4) - (5)].string),
                                    p->m_styleSheet->determineNamespace(namespacePrefix)));
         (yyval.selector)->setMatch(CSSSelector::Set);
-    }
+    ;}
     break;
 
   case 173:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1058 "../Source/WebCore/css/CSSGrammar.y"
     {
         AtomicString namespacePrefix = (yyvsp[(3) - (9)].string);
@@ -3588,66 +3558,66 @@ yyreduce:
                                    p->m_styleSheet->determineNamespace(namespacePrefix)));
         (yyval.selector)->setMatch((CSSSelector::Match)(yyvsp[(5) - (9)].integer));
         (yyval.selector)->setValue((yyvsp[(7) - (9)].string));
-    }
+    ;}
     break;
 
   case 174:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1070 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.integer) = CSSSelector::Exact;
-    }
+    ;}
     break;
 
   case 175:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1073 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.integer) = CSSSelector::List;
-    }
+    ;}
     break;
 
   case 176:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1076 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.integer) = CSSSelector::Hyphen;
-    }
+    ;}
     break;
 
   case 177:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1079 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.integer) = CSSSelector::Begin;
-    }
+    ;}
     break;
 
   case 178:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1082 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.integer) = CSSSelector::End;
-    }
+    ;}
     break;
 
   case 179:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1085 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.integer) = CSSSelector::Contain;
-    }
+    ;}
     break;
 
   case 182:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1096 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = static_cast<CSSParser*>(parser)->createFloatingSelector();
@@ -3657,12 +3627,12 @@ yyreduce:
         CSSSelector::PseudoType type = (yyval.selector)->pseudoType();
         if (type == CSSSelector::PseudoUnknown)
             (yyval.selector) = 0;
-    }
+    ;}
     break;
 
   case 183:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1107 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = static_cast<CSSParser*>(parser)->createFloatingSelector();
@@ -3672,12 +3642,12 @@ yyreduce:
         CSSSelector::PseudoType type = (yyval.selector)->pseudoType();
         if (type == CSSSelector::PseudoUnknown)
             (yyval.selector) = 0;
-    }
+    ;}
     break;
 
   case 184:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1116 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.selector) = static_cast<CSSParser*>(parser)->createFloatingSelector();
@@ -3686,12 +3656,12 @@ yyreduce:
         (yyval.selector)->setValue((yyvsp[(3) - (3)].string));
         // FIXME: This call is needed to force selector to compute the pseudoType early enough.
         (yyval.selector)->pseudoType();
-    }
+    ;}
     break;
 
   case 185:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1129 "../Source/WebCore/css/CSSGrammar.y"
     {
         if ((yyvsp[(4) - (6)].selectorList)) {
@@ -3706,12 +3676,12 @@ yyreduce:
                 (yyval.selector) = 0;
         } else
             (yyval.selector) = 0;
-    }
+    ;}
     break;
 
   case 186:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1144 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser *p = static_cast<CSSParser*>(parser);
@@ -3722,12 +3692,12 @@ yyreduce:
         CSSSelector::PseudoType type = (yyval.selector)->pseudoType();
         if (type == CSSSelector::PseudoUnknown)
             (yyval.selector) = 0;
-    }
+    ;}
     break;
 
   case 187:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1155 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser *p = static_cast<CSSParser*>(parser);
@@ -3738,12 +3708,12 @@ yyreduce:
         CSSSelector::PseudoType type = (yyval.selector)->pseudoType();
         if (type == CSSSelector::PseudoUnknown)
             (yyval.selector) = 0;
-    }
+    ;}
     break;
 
   case 188:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1166 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser *p = static_cast<CSSParser*>(parser);
@@ -3762,12 +3732,12 @@ yyreduce:
             if (!isValidNthToken((yyvsp[(4) - (6)].string)))
                 (yyval.selector) = 0;
         }
-    }
+    ;}
     break;
 
   case 189:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1185 "../Source/WebCore/css/CSSGrammar.y"
     {
         if (!(yyvsp[(4) - (6)].selector) || !(yyvsp[(4) - (6)].selector)->isSimple())
@@ -3784,126 +3754,126 @@ yyreduce:
             (yyvsp[(2) - (6)].string).lower();
             (yyval.selector)->setValue((yyvsp[(2) - (6)].string));
         }
-    }
+    ;}
     break;
 
   case 190:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1204 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.boolean) = (yyvsp[(1) - (1)].boolean);
-    }
+    ;}
     break;
 
   case 191:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1207 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.boolean) = (yyvsp[(1) - (2)].boolean);
         if ( (yyvsp[(2) - (2)].boolean) )
             (yyval.boolean) = (yyvsp[(2) - (2)].boolean);
-    }
+    ;}
     break;
 
   case 192:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1212 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.boolean) = (yyvsp[(1) - (1)].boolean);
-    }
+    ;}
     break;
 
   case 193:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1215 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.boolean) = false;
-    }
+    ;}
     break;
 
   case 194:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1218 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.boolean) = false;
-    }
+    ;}
     break;
 
   case 195:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1221 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.boolean) = (yyvsp[(1) - (2)].boolean);
-    }
+    ;}
     break;
 
   case 196:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1224 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.boolean) = (yyvsp[(1) - (2)].boolean);
-    }
+    ;}
     break;
 
   case 197:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1230 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         p->markPropertyStart();
         (yyval.boolean) = (yyvsp[(1) - (3)].boolean);
-    }
+    ;}
     break;
 
   case 198:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1235 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.boolean) = false;
-    }
+    ;}
     break;
 
   case 199:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1238 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.boolean) = false;
-    }
+    ;}
     break;
 
   case 200:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1241 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         p->markPropertyStart();
         (yyval.boolean) = false;
-    }
+    ;}
     break;
 
   case 201:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1246 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.boolean) = false;
-    }
+    ;}
     break;
 
   case 202:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1249 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
@@ -3911,34 +3881,34 @@ yyreduce:
         (yyval.boolean) = (yyvsp[(1) - (4)].boolean);
         if ((yyvsp[(2) - (4)].boolean))
             (yyval.boolean) = (yyvsp[(2) - (4)].boolean);
-    }
+    ;}
     break;
 
   case 203:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1256 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         p->markPropertyStart();
         (yyval.boolean) = (yyvsp[(1) - (4)].boolean);
-    }
+    ;}
     break;
 
   case 204:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1261 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         p->markPropertyStart();
         (yyval.boolean) = (yyvsp[(1) - (6)].boolean);
-    }
+    ;}
     break;
 
   case 205:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1269 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.boolean) = false;
@@ -3956,21 +3926,21 @@ yyreduce:
             p->m_valueList = 0;
         }
         p->markPropertyEnd((yyvsp[(5) - (5)].boolean), isPropertyParsed);
-    }
+    ;}
     break;
 
   case 206:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1287 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.boolean) = false;
-    }
+    ;}
     break;
 
   case 207:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1291 "../Source/WebCore/css/CSSGrammar.y"
     {
         /* The default movable type template has letter-spacing: .none;  Handle this by looking for
@@ -3979,102 +3949,102 @@ yyreduce:
         CSSParser* p = static_cast<CSSParser*>(parser);
         p->markPropertyEnd(false, false);
         (yyval.boolean) = false;
-    }
+    ;}
     break;
 
   case 208:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1300 "../Source/WebCore/css/CSSGrammar.y"
     {
         /* When we encounter something like p {color: red !important fail;} we should drop the declaration */
         CSSParser* p = static_cast<CSSParser*>(parser);
         p->markPropertyEnd(false, false);
         (yyval.boolean) = false;
-    }
+    ;}
     break;
 
   case 209:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1307 "../Source/WebCore/css/CSSGrammar.y"
     {
         /* Handle this case: div { text-align: center; !important } Just reduce away the stray !important. */
         (yyval.boolean) = false;
-    }
+    ;}
     break;
 
   case 210:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1312 "../Source/WebCore/css/CSSGrammar.y"
     {
         /* div { font-family: } Just reduce away this property with no value. */
         CSSParser* p = static_cast<CSSParser*>(parser);
         p->markPropertyEnd(false, false);
         (yyval.boolean) = false;
-    }
+    ;}
     break;
 
   case 211:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1319 "../Source/WebCore/css/CSSGrammar.y"
     {
         /* if we come across rules with invalid values like this case: p { weight: *; }, just discard the rule */
         CSSParser* p = static_cast<CSSParser*>(parser);
         p->markPropertyEnd(false, false);
         (yyval.boolean) = false;
-    }
+    ;}
     break;
 
   case 212:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1326 "../Source/WebCore/css/CSSGrammar.y"
     {
         /* if we come across: div { color{;color:maroon} }, ignore everything within curly brackets */
         (yyval.boolean) = false;
-    }
+    ;}
     break;
 
   case 213:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1333 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.integer) = cssPropertyID((yyvsp[(1) - (2)].string));
-    }
+    ;}
     break;
 
   case 214:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1339 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.boolean) = true; }
+    { (yyval.boolean) = true; ;}
     break;
 
   case 215:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1340 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.boolean) = false; }
+    { (yyval.boolean) = false; ;}
     break;
 
   case 216:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1344 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         (yyval.valueList) = p->createFloatingValueList();
         (yyval.valueList)->addValue(p->sinkFloatingValue((yyvsp[(1) - (1)].value)));
-    }
+    ;}
     break;
 
   case 217:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1349 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
@@ -4089,316 +4059,316 @@ yyreduce:
             }
             (yyval.valueList)->addValue(p->sinkFloatingValue((yyvsp[(3) - (3)].value)));
         }
-    }
+    ;}
     break;
 
   case 218:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1363 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.valueList) = 0;
-    }
+    ;}
     break;
 
   case 219:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1366 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.valueList) = 0;
-    }
+    ;}
     break;
 
   case 220:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1369 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.valueList) = 0;
-    }
+    ;}
     break;
 
   case 221:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1375 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.character) = '/';
-    }
+    ;}
     break;
 
   case 222:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1378 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.character) = ',';
-    }
+    ;}
     break;
 
   case 223:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1381 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.character) = 0;
-  }
+  ;}
     break;
 
   case 224:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1387 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value) = (yyvsp[(1) - (1)].value); }
+    { (yyval.value) = (yyvsp[(1) - (1)].value); ;}
     break;
 
   case 225:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1388 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value) = (yyvsp[(2) - (2)].value); (yyval.value).fValue *= (yyvsp[(1) - (2)].integer); }
+    { (yyval.value) = (yyvsp[(2) - (2)].value); (yyval.value).fValue *= (yyvsp[(1) - (2)].integer); ;}
     break;
 
   case 226:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1389 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_STRING; }
+    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_STRING; ;}
     break;
 
   case 227:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1390 "../Source/WebCore/css/CSSGrammar.y"
     {
       (yyval.value).id = cssValueKeywordID((yyvsp[(1) - (2)].string));
       (yyval.value).unit = CSSPrimitiveValue::CSS_IDENT;
       (yyval.value).string = (yyvsp[(1) - (2)].string);
-  }
+  ;}
     break;
 
   case 228:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1396 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION; }
+    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION; ;}
     break;
 
   case 229:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1397 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(2) - (3)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION; }
+    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(2) - (3)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_DIMENSION; ;}
     break;
 
   case 230:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1398 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_URI; }
+    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_URI; ;}
     break;
 
   case 231:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1399 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; }
+    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_UNICODE_RANGE; ;}
     break;
 
   case 232:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1400 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; }
+    { (yyval.value).id = 0; (yyval.value).string = (yyvsp[(1) - (2)].string); (yyval.value).unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; ;}
     break;
 
   case 233:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1401 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).string = CSSParserString(); (yyval.value).unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; }
+    { (yyval.value).id = 0; (yyval.value).string = CSSParserString(); (yyval.value).unit = CSSPrimitiveValue::CSS_PARSER_HEXCOLOR; ;}
     break;
 
   case 234:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1403 "../Source/WebCore/css/CSSGrammar.y"
     {
       (yyval.value) = (yyvsp[(1) - (1)].value);
-  }
+  ;}
     break;
 
   case 235:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1406 "../Source/WebCore/css/CSSGrammar.y"
     {
       (yyval.value) = (yyvsp[(1) - (1)].value);
-  }
+  ;}
     break;
 
   case 236:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1409 "../Source/WebCore/css/CSSGrammar.y"
     {
       (yyval.value) = (yyvsp[(1) - (1)].value);
-  }
+  ;}
     break;
 
   case 237:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1412 "../Source/WebCore/css/CSSGrammar.y"
     { /* Handle width: %; */
       (yyval.value).id = 0; (yyval.value).unit = 0;
-  }
+  ;}
     break;
 
   case 238:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1418 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).isInt = true; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; }
+    { (yyval.value).id = 0; (yyval.value).isInt = true; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;}
     break;
 
   case 239:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1419 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; }
+    { (yyval.value).id = 0; (yyval.value).isInt = false; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_NUMBER; ;}
     break;
 
   case 240:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1420 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PERCENTAGE; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PERCENTAGE; ;}
     break;
 
   case 241:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1421 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PX; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PX; ;}
     break;
 
   case 242:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1422 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_CM; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_CM; ;}
     break;
 
   case 243:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1423 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_MM; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_MM; ;}
     break;
 
   case 244:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1424 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_IN; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_IN; ;}
     break;
 
   case 245:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1425 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PT; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PT; ;}
     break;
 
   case 246:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1426 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PC; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_PC; ;}
     break;
 
   case 247:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1427 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_DEG; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_DEG; ;}
     break;
 
   case 248:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1428 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_RAD; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_RAD; ;}
     break;
 
   case 249:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1429 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_GRAD; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_GRAD; ;}
     break;
 
   case 250:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1430 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_TURN; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_TURN; ;}
     break;
 
   case 251:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1431 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_MS; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_MS; ;}
     break;
 
   case 252:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1432 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_S; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_S; ;}
     break;
 
   case 253:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1433 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_HZ; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_HZ; ;}
     break;
 
   case 254:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1434 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_KHZ; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_KHZ; ;}
     break;
 
   case 255:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1435 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_EMS; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_EMS; ;}
     break;
 
   case 256:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1436 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSParserValue::Q_EMS; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSParserValue::Q_EMS; ;}
     break;
 
   case 257:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1437 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_EXS; }
+    { (yyval.value).id = 0; (yyval.value).fValue = (yyvsp[(1) - (2)].number); (yyval.value).unit = CSSPrimitiveValue::CSS_EXS; ;}
     break;
 
   case 258:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1438 "../Source/WebCore/css/CSSGrammar.y"
     {
       (yyval.value).id = 0;
@@ -4407,12 +4377,12 @@ yyreduce:
       CSSParser* p = static_cast<CSSParser*>(parser);
       if (Document* doc = p->document())
           doc->setUsesRemUnits(true);
-  }
+  ;}
     break;
 
   case 259:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1449 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
@@ -4422,12 +4392,12 @@ yyreduce:
         (yyval.value).id = 0;
         (yyval.value).unit = CSSParserValue::Function;
         (yyval.value).function = f;
-    }
+    ;}
     break;
 
   case 260:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1458 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
@@ -4437,74 +4407,74 @@ yyreduce:
         (yyval.value).id = 0;
         (yyval.value).unit = CSSParserValue::Function;
         (yyval.value).function = f;
-  }
+  ;}
     break;
 
   case 261:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1470 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value) = (yyvsp[(1) - (1)].value); }
+    { (yyval.value) = (yyvsp[(1) - (1)].value); ;}
     break;
 
   case 262:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1471 "../Source/WebCore/css/CSSGrammar.y"
-    { (yyval.value) = (yyvsp[(2) - (2)].value); (yyval.value).fValue *= (yyvsp[(1) - (2)].integer); }
+    { (yyval.value) = (yyvsp[(2) - (2)].value); (yyval.value).fValue *= (yyvsp[(1) - (2)].integer); ;}
     break;
 
   case 263:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1475 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.character) = '+';
-    }
+    ;}
     break;
 
   case 264:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1478 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.character) = '-';
-    }
+    ;}
     break;
 
   case 265:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1481 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.character) = '*';
-    }
+    ;}
     break;
 
   case 266:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1484 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.character) = '/';
-    }
+    ;}
     break;
 
   case 267:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1487 "../Source/WebCore/css/CSSGrammar.y"
     {
         if (equalIgnoringCase("mod", (yyvsp[(1) - (2)].string).characters, (yyvsp[(1) - (2)].string).length))
             (yyval.character) = '%';
         else
             (yyval.character) = 0;
-    }
+    ;}
     break;
 
   case 268:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1496 "../Source/WebCore/css/CSSGrammar.y"
     {
         if ((yyvsp[(3) - (6)].valueList)) {
@@ -4518,23 +4488,23 @@ yyreduce:
             (yyval.valueList)->addValue(v);
         } else
             (yyval.valueList) = 0;
-    }
+    ;}
     break;
 
   case 269:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1511 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
         (yyval.valueList) = p->createFloatingValueList();
         (yyval.valueList)->addValue(p->sinkFloatingValue((yyvsp[(1) - (2)].value)));
-    }
+    ;}
     break;
 
   case 270:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1516 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
@@ -4549,12 +4519,12 @@ yyreduce:
         } else
             (yyval.valueList) = 0;
 
-    }
+    ;}
     break;
 
   case 271:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1530 "../Source/WebCore/css/CSSGrammar.y"
     {
         if ((yyvsp[(1) - (3)].valueList) && (yyvsp[(2) - (3)].character) && (yyvsp[(3) - (3)].valueList)) {
@@ -4567,30 +4537,30 @@ yyreduce:
             (yyval.valueList)->extend(*((yyvsp[(3) - (3)].valueList)));
         } else 
             (yyval.valueList) = 0;
-    }
+    ;}
     break;
 
   case 273:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1543 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.valueList) = 0;
-    }
+    ;}
     break;
 
   case 274:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1549 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.valueList) = (yyvsp[(1) - (1)].valueList);
-    }
+    ;}
     break;
 
   case 275:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1552 "../Source/WebCore/css/CSSGrammar.y"
     {
         if ((yyvsp[(1) - (4)].valueList) && (yyvsp[(4) - (4)].valueList)) {
@@ -4603,12 +4573,12 @@ yyreduce:
             (yyval.valueList)->extend(*((yyvsp[(4) - (4)].valueList)));
         } else
             (yyval.valueList) = 0;
-    }
+    ;}
     break;
 
   case 276:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1567 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
@@ -4618,39 +4588,39 @@ yyreduce:
         (yyval.value).id = 0;
         (yyval.value).unit = CSSParserValue::Function;
         (yyval.value).function = f;
-    }
+    ;}
     break;
 
   case 277:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1576 "../Source/WebCore/css/CSSGrammar.y"
     {
         YYERROR;
-    }
+    ;}
     break;
 
   case 278:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1583 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.string) = (yyvsp[(1) - (1)].string);
-    }
+    ;}
     break;
 
   case 279:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1586 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.string) = (yyvsp[(1) - (1)].string);
-    }
+    ;}
     break;
 
   case 280:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1592 "../Source/WebCore/css/CSSGrammar.y"
     {
         CSSParser* p = static_cast<CSSParser*>(parser);
@@ -4660,98 +4630,87 @@ yyreduce:
         (yyval.value).id = 0;
         (yyval.value).unit = CSSParserValue::Function;
         (yyval.value).function = f;
-    }
+    ;}
     break;
 
   case 281:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1601 "../Source/WebCore/css/CSSGrammar.y"
     {
         YYERROR;
-    }
+    ;}
     break;
 
   case 282:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1609 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = 0;
-    }
+    ;}
     break;
 
   case 283:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1612 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = 0;
-    }
+    ;}
     break;
 
   case 284:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1618 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = 0;
-    }
+    ;}
     break;
 
   case 285:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1621 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = 0;
-    }
+    ;}
     break;
 
   case 286:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1627 "../Source/WebCore/css/CSSGrammar.y"
     {
         (yyval.rule) = 0;
-    }
+    ;}
     break;
 
   case 287:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1645 "../Source/WebCore/css/CSSGrammar.y"
     {
         static_cast<CSSParser*>(parser)->invalidBlockHit();
-    }
+    ;}
     break;
 
   case 288:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 1648 "../Source/WebCore/css/CSSGrammar.y"
     {
         static_cast<CSSParser*>(parser)->invalidBlockHit();
-    }
+    ;}
     break;
 
 
 
-/* Line 1806 of yacc.c  */
-#line 4742 "/Source/WebCore/generated/CSSGrammar.tab.c"
+/* Line 1455 of yacc.c  */
+#line 4712 "/Source/WebCore/generated/CSSGrammar.tab.c"
       default: break;
     }
-  /* User semantic actions sometimes alter yychar, and that requires
-     that yytoken be updated with the new translation.  We take the
-     approach of translating immediately before every use of yytoken.
-     One alternative is translating here after every semantic action,
-     but that translation would be missed if the semantic action invokes
-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-     incorrect destructor might then be invoked immediately.  In the
-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-     to an incorrect destructor call or verbose syntax error message
-     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -4779,10 +4738,6 @@ yyreduce:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
-  /* Make sure we have latest lookahead translation.  See comments at
-     user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -4790,36 +4745,37 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
       {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
       }
-# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -4878,7 +4834,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
-      if (!yypact_value_is_default (yyn))
+      if (yyn != YYPACT_NINF)
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -4937,13 +4893,8 @@ yyexhaustedlab:
 
 yyreturn:
   if (yychar != YYEMPTY)
-    {
-      /* Make sure we have latest lookahead translation.  See comments at
-         user semantic actions for why this is necessary.  */
-      yytoken = YYTRANSLATE (yychar);
-      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval);
-    }
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
@@ -4968,7 +4919,7 @@ yyreturn:
 
 
 
-/* Line 2067 of yacc.c  */
+/* Line 1675 of yacc.c  */
 #line 1658 "../Source/WebCore/css/CSSGrammar.y"
 
 
diff --git a/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.h b/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.h
index 59225d8..2fcae75 100644
--- a/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.h
+++ b/src/3rdparty/webkit/Source/WebCore/generated/CSSGrammar.h
@@ -1,10 +1,12 @@
 #ifndef CSSGRAMMAR_H
 #define CSSGRAMMAR_H
-/* A Bison parser, made by GNU Bison 2.5.  */
 
-/* Bison interface for Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -128,7 +130,7 @@
 typedef union YYSTYPE
 {
 
-/* Line 2068 of yacc.c  */
+/* Line 1676 of yacc.c  */
 #line 63 "../Source/WebCore/css/CSSGrammar.y"
 
     bool boolean;
@@ -156,8 +158,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 2068 of yacc.c  */
-#line 159 "/Source/WebCore/generated/CSSGrammar.tab.h"
+/* Line 1676 of yacc.c  */
+#line 161 "/Source/WebCore/generated/CSSGrammar.tab.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/src/3rdparty/webkit/Source/WebCore/generated/CSSPropertyNames.cpp b/src/3rdparty/webkit/Source/WebCore/generated/CSSPropertyNames.cpp
index 945ba7d..1294a34 100644
--- a/src/3rdparty/webkit/Source/WebCore/generated/CSSPropertyNames.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/generated/CSSPropertyNames.cpp
@@ -1,4 +1,4 @@
-/* C++ code produced by gperf version 3.0.4 */
+/* C++ code produced by gperf version 3.0.3 */
 /* Command-line: gperf --key-positions='*' -D -n -s 2 CSSPropertyNames.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
diff --git a/src/3rdparty/webkit/Source/WebCore/generated/CSSValueKeywords.cpp b/src/3rdparty/webkit/Source/WebCore/generated/CSSValueKeywords.cpp
index 92c7541..081d323 100644
--- a/src/3rdparty/webkit/Source/WebCore/generated/CSSValueKeywords.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/generated/CSSValueKeywords.cpp
@@ -1,4 +1,4 @@
-/* C++ code produced by gperf version 3.0.4 */
+/* C++ code produced by gperf version 3.0.3 */
 /* Command-line: gperf --key-positions='*' -D -n -s 2 CSSValueKeywords.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
diff --git a/src/3rdparty/webkit/Source/WebCore/generated/ColorData.cpp b/src/3rdparty/webkit/Source/WebCore/generated/ColorData.cpp
index da31ef8..3b09b89 100644
--- a/src/3rdparty/webkit/Source/WebCore/generated/ColorData.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/generated/ColorData.cpp
@@ -1,4 +1,4 @@
-/* C++ code produced by gperf version 3.0.4 */
+/* C++ code produced by gperf version 3.0.3 */
 /* Command-line: gperf --key-positions='*' -D -s 2 /Source/WebCore/platform/ColorData.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
diff --git a/src/3rdparty/webkit/Source/WebCore/generated/DocTypeStrings.cpp b/src/3rdparty/webkit/Source/WebCore/generated/DocTypeStrings.cpp
index 5667009..e0a2b4f 100644
--- a/src/3rdparty/webkit/Source/WebCore/generated/DocTypeStrings.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/generated/DocTypeStrings.cpp
@@ -1,4 +1,4 @@
-/* C++ code produced by gperf version 3.0.4 */
+/* C++ code produced by gperf version 3.0.3 */
 /* Command-line: gperf --key-positions='*' -s 2 /Source/WebCore/html/DocTypeStrings.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSInternals.cpp b/src/3rdparty/webkit/Source/WebCore/generated/JSInternals.cpp
new file mode 100644
index 0000000..1a29b36
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/generated/JSInternals.cpp
@@ -0,0 +1,134 @@
+/*
+    This file is part of the WebKit open source project.
+    This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#include "config.h"
+#include "JSInternals.h"
+
+#include "ExceptionCode.h"
+#include "Internals.h"
+#include "JSDOMBinding.h"
+#include "JSDocument.h"
+#include <runtime/Error.h>
+#include <wtf/GetPtr.h>
+
+using namespace JSC;
+
+namespace WebCore {
+
+ASSERT_CLASS_FITS_IN_CELL(JSInternals);
+
+/* Hash table for prototype */
+#if ENABLE(JIT)
+#define THUNK_GENERATOR(generator) , generator
+#else
+#define THUNK_GENERATOR(generator)
+#endif
+
+static const HashTableValue JSInternalsPrototypeTableValues[3] =
+{
+    { "setPasswordEchoEnabled", DontDelete | Function, (intptr_t)static_cast<NativeFunction>(jsInternalsPrototypeFunctionSetPasswordEchoEnabled), (intptr_t)2 THUNK_GENERATOR(0) },
+    { "setPasswordEchoDurationInSeconds", DontDelete | Function, (intptr_t)static_cast<NativeFunction>(jsInternalsPrototypeFunctionSetPasswordEchoDurationInSeconds), (intptr_t)2 THUNK_GENERATOR(0) },
+    { 0, 0, 0, 0 THUNK_GENERATOR(0) }
+};
+
+#undef THUNK_GENERATOR
+static JSC_CONST_HASHTABLE HashTable JSInternalsPrototypeTable = { 5, 3, JSInternalsPrototypeTableValues, 0 };
+const ClassInfo JSInternalsPrototype::s_info = { "InternalsPrototype", &JSC::JSObjectWithGlobalObject::s_info, &JSInternalsPrototypeTable, 0 };
+
+JSObject* JSInternalsPrototype::self(ExecState* exec, JSGlobalObject* globalObject)
+{
+    return getDOMPrototype<JSInternals>(exec, globalObject);
+}
+
+bool JSInternalsPrototype::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+{
+    return getStaticFunctionSlot<JSObject>(exec, &JSInternalsPrototypeTable, this, propertyName, slot);
+}
+
+bool JSInternalsPrototype::getOwnPropertyDescriptor(ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+{
+    return getStaticFunctionDescriptor<JSObject>(exec, &JSInternalsPrototypeTable, this, propertyName, descriptor);
+}
+
+const ClassInfo JSInternals::s_info = { "Internals", &JSDOMWrapper::s_info, 0, 0 };
+
+JSInternals::JSInternals(Structure* structure, JSDOMGlobalObject* globalObject, PassRefPtr<Internals> impl)
+    : JSDOMWrapper(structure, globalObject)
+    , m_impl(impl)
+{
+    ASSERT(inherits(&s_info));
+}
+
+JSObject* JSInternals::createPrototype(ExecState* exec, JSGlobalObject* globalObject)
+{
+    return new (exec) JSInternalsPrototype(exec->globalData(), globalObject, JSInternalsPrototype::createStructure(globalObject->globalData(), globalObject->objectPrototype()));
+}
+
+EncodedJSValue JSC_HOST_CALL jsInternalsPrototypeFunctionSetPasswordEchoEnabled(ExecState* exec)
+{
+    JSValue thisValue = exec->hostThisValue();
+    if (!thisValue.inherits(&JSInternals::s_info))
+        return throwVMTypeError(exec);
+    JSInternals* castedThis = static_cast<JSInternals*>(asObject(thisValue));
+    Internals* imp = static_cast<Internals*>(castedThis->impl());
+    ExceptionCode ec = 0;
+    Document* document(toDocument(exec->argument(0)));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    bool enabled(exec->argument(1).toBoolean(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+
+    imp->setPasswordEchoEnabled(document, enabled, ec);
+    setDOMException(exec, ec);
+    return JSValue::encode(jsUndefined());
+}
+
+EncodedJSValue JSC_HOST_CALL jsInternalsPrototypeFunctionSetPasswordEchoDurationInSeconds(ExecState* exec)
+{
+    JSValue thisValue = exec->hostThisValue();
+    if (!thisValue.inherits(&JSInternals::s_info))
+        return throwVMTypeError(exec);
+    JSInternals* castedThis = static_cast<JSInternals*>(asObject(thisValue));
+    Internals* imp = static_cast<Internals*>(castedThis->impl());
+    ExceptionCode ec = 0;
+    Document* document(toDocument(exec->argument(0)));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    double durationInSeconds(exec->argument(1).toNumber(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+
+    imp->setPasswordEchoDurationInSeconds(document, durationInSeconds, ec);
+    setDOMException(exec, ec);
+    return JSValue::encode(jsUndefined());
+}
+
+JSC::JSValue toJS(JSC::ExecState* exec, JSDOMGlobalObject* globalObject, Internals* impl)
+{
+    return wrap<JSInternals>(exec, globalObject, impl);
+}
+
+Internals* toInternals(JSC::JSValue value)
+{
+    return value.inherits(&JSInternals::s_info) ? static_cast<JSInternals*>(asObject(value))->impl() : 0;
+}
+
+}
diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSInternals.h b/src/3rdparty/webkit/Source/WebCore/generated/JSInternals.h
new file mode 100644
index 0000000..08e2751
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/generated/JSInternals.h
@@ -0,0 +1,79 @@
+/*
+    This file is part of the WebKit open source project.
+    This file has been generated by generate-bindings.pl. DO NOT MODIFY!
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+*/
+
+#ifndef JSInternals_h
+#define JSInternals_h
+
+#include "JSDOMBinding.h"
+#include <runtime/JSGlobalObject.h>
+#include <runtime/JSObjectWithGlobalObject.h>
+#include <runtime/ObjectPrototype.h>
+
+namespace WebCore {
+
+class Internals;
+
+class JSInternals : public JSDOMWrapper {
+    typedef JSDOMWrapper Base;
+public:
+    JSInternals(JSC::Structure*, JSDOMGlobalObject*, PassRefPtr<Internals>);
+    static JSC::JSObject* createPrototype(JSC::ExecState*, JSC::JSGlobalObject*);
+    static const JSC::ClassInfo s_info;
+
+    static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)
+    {
+        return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
+    }
+
+    Internals* impl() const { return m_impl.get(); }
+
+private:
+    RefPtr<Internals> m_impl;
+protected:
+    static const unsigned StructureFlags = Base::StructureFlags;
+};
+
+JSC::JSValue toJS(JSC::ExecState*, JSDOMGlobalObject*, Internals*);
+Internals* toInternals(JSC::JSValue);
+
+class JSInternalsPrototype : public JSC::JSObjectWithGlobalObject {
+    typedef JSC::JSObjectWithGlobalObject Base;
+public:
+    static JSC::JSObject* self(JSC::ExecState*, JSC::JSGlobalObject*);
+    static const JSC::ClassInfo s_info;
+    virtual bool getOwnPropertySlot(JSC::ExecState*, const JSC::Identifier&, JSC::PropertySlot&);
+    virtual bool getOwnPropertyDescriptor(JSC::ExecState*, const JSC::Identifier&, JSC::PropertyDescriptor&);
+    static JSC::Structure* createStructure(JSC::JSGlobalData& globalData, JSC::JSValue prototype)
+    {
+        return JSC::Structure::create(globalData, prototype, JSC::TypeInfo(JSC::ObjectType, StructureFlags), AnonymousSlotCount, &s_info);
+    }
+    JSInternalsPrototype(JSC::JSGlobalData& globalData, JSC::JSGlobalObject* globalObject, JSC::Structure* structure) : JSC::JSObjectWithGlobalObject(globalData, globalObject, structure) { }
+protected:
+    static const unsigned StructureFlags = JSC::OverridesGetOwnPropertySlot | Base::StructureFlags;
+};
+
+// Functions
+
+JSC::EncodedJSValue JSC_HOST_CALL jsInternalsPrototypeFunctionSetPasswordEchoEnabled(JSC::ExecState*);
+JSC::EncodedJSValue JSC_HOST_CALL jsInternalsPrototypeFunctionSetPasswordEchoDurationInSeconds(JSC::ExecState*);
+
+} // namespace WebCore
+
+#endif
diff --git a/src/3rdparty/webkit/Source/WebCore/generated/JSWebGLRenderingContext.cpp b/src/3rdparty/webkit/Source/WebCore/generated/JSWebGLRenderingContext.cpp
index 6f38364..e2a03c2 100644
--- a/src/3rdparty/webkit/Source/WebCore/generated/JSWebGLRenderingContext.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/generated/JSWebGLRenderingContext.cpp
@@ -30,6 +30,7 @@
 #include "JSDOMBinding.h"
 #include "JSHTMLCanvasElement.h"
 #include "JSHTMLImageElement.h"
+#include "JSHTMLVideoElement.h"
 #include "JSImageData.h"
 #include "JSWebGLActiveInfo.h"
 #include "JSWebGLBuffer.h"
@@ -2985,6 +2986,40 @@ static EncodedJSValue JSC_HOST_CALL jsWebGLRenderingContextPrototypeFunctionTexI
     return JSValue::encode(jsUndefined());
 }
 
+static EncodedJSValue JSC_HOST_CALL jsWebGLRenderingContextPrototypeFunctionTexImage2D5(ExecState* exec)
+{
+    JSValue thisValue = exec->hostThisValue();
+    if (!thisValue.inherits(&JSWebGLRenderingContext::s_info))
+        return throwVMTypeError(exec);
+    JSWebGLRenderingContext* castedThis = static_cast<JSWebGLRenderingContext*>(asObject(thisValue));
+    WebGLRenderingContext* imp = static_cast<WebGLRenderingContext*>(castedThis->impl());
+    ExceptionCode ec = 0;
+    unsigned target(exec->argument(0).toUInt32(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    int level(exec->argument(1).toInt32(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    unsigned internalformat(exec->argument(2).toUInt32(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    unsigned format(exec->argument(3).toUInt32(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    unsigned type(exec->argument(4).toUInt32(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    if (exec->argumentCount() > 5 && !exec->argument(5).isUndefinedOrNull() && !exec->argument(5).inherits(&JSHTMLVideoElement::s_info))
+        return throwVMTypeError(exec);
+    HTMLVideoElement* video(toHTMLVideoElement(exec->argument(5)));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+
+    imp->texImage2D(target, level, internalformat, format, type, video, ec);
+    setDOMException(exec, ec);
+    return JSValue::encode(jsUndefined());
+}
+
 EncodedJSValue JSC_HOST_CALL jsWebGLRenderingContextPrototypeFunctionTexImage2D(ExecState* exec)
 {
     if ((exec->argumentCount() == 9 && (exec->argument(8).isNull() || (exec->argument(8).isObject() && asObject(exec->argument(8))->inherits(&JSArrayBufferView::s_info)))))
@@ -2995,6 +3030,8 @@ EncodedJSValue JSC_HOST_CALL jsWebGLRenderingContextPrototypeFunctionTexImage2D(
         return jsWebGLRenderingContextPrototypeFunctionTexImage2D3(exec);
     if ((exec->argumentCount() == 6 && (exec->argument(5).isNull() || (exec->argument(5).isObject() && asObject(exec->argument(5))->inherits(&JSHTMLCanvasElement::s_info)))))
         return jsWebGLRenderingContextPrototypeFunctionTexImage2D4(exec);
+    if ((exec->argumentCount() == 6 && (exec->argument(5).isNull() || (exec->argument(5).isObject() && asObject(exec->argument(5))->inherits(&JSHTMLVideoElement::s_info)))))
+        return jsWebGLRenderingContextPrototypeFunctionTexImage2D5(exec);
     return throwVMTypeError(exec);
 }
 
@@ -3152,6 +3189,43 @@ static EncodedJSValue JSC_HOST_CALL jsWebGLRenderingContextPrototypeFunctionTexS
     return JSValue::encode(jsUndefined());
 }
 
+static EncodedJSValue JSC_HOST_CALL jsWebGLRenderingContextPrototypeFunctionTexSubImage2D5(ExecState* exec)
+{
+    JSValue thisValue = exec->hostThisValue();
+    if (!thisValue.inherits(&JSWebGLRenderingContext::s_info))
+        return throwVMTypeError(exec);
+    JSWebGLRenderingContext* castedThis = static_cast<JSWebGLRenderingContext*>(asObject(thisValue));
+    WebGLRenderingContext* imp = static_cast<WebGLRenderingContext*>(castedThis->impl());
+    ExceptionCode ec = 0;
+    unsigned target(exec->argument(0).toUInt32(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    int level(exec->argument(1).toInt32(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    int xoffset(exec->argument(2).toInt32(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    int yoffset(exec->argument(3).toInt32(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    unsigned format(exec->argument(4).toUInt32(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    unsigned type(exec->argument(5).toUInt32(exec));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+    if (exec->argumentCount() > 6 && !exec->argument(6).isUndefinedOrNull() && !exec->argument(6).inherits(&JSHTMLVideoElement::s_info))
+        return throwVMTypeError(exec);
+    HTMLVideoElement* video(toHTMLVideoElement(exec->argument(6)));
+    if (exec->hadException())
+        return JSValue::encode(jsUndefined());
+
+    imp->texSubImage2D(target, level, xoffset, yoffset, format, type, video, ec);
+    setDOMException(exec, ec);
+    return JSValue::encode(jsUndefined());
+}
+
 EncodedJSValue JSC_HOST_CALL jsWebGLRenderingContextPrototypeFunctionTexSubImage2D(ExecState* exec)
 {
     if ((exec->argumentCount() == 9 && (exec->argument(8).isNull() || (exec->argument(8).isObject() && asObject(exec->argument(8))->inherits(&JSArrayBufferView::s_info)))))
@@ -3162,6 +3236,8 @@ EncodedJSValue JSC_HOST_CALL jsWebGLRenderingContextPrototypeFunctionTexSubImage
         return jsWebGLRenderingContextPrototypeFunctionTexSubImage2D3(exec);
     if ((exec->argumentCount() == 7 && (exec->argument(6).isNull() || (exec->argument(6).isObject() && asObject(exec->argument(6))->inherits(&JSHTMLCanvasElement::s_info)))))
         return jsWebGLRenderingContextPrototypeFunctionTexSubImage2D4(exec);
+    if ((exec->argumentCount() == 7 && (exec->argument(6).isNull() || (exec->argument(6).isObject() && asObject(exec->argument(6))->inherits(&JSHTMLVideoElement::s_info)))))
+        return jsWebGLRenderingContextPrototypeFunctionTexSubImage2D5(exec);
     return throwVMTypeError(exec);
 }
 
diff --git a/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.cpp b/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.cpp
index dc82e12..4e5cb97 100644
--- a/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.cpp
@@ -1,8 +1,10 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
 
-/* Bison implementation for Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton implementation for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -44,7 +46,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.5"
+#define YYBISON_VERSION "2.4.1"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -73,7 +75,7 @@
 
 /* Copy the first part of user declarations.  */
 
-/* Line 268 of yacc.c  */
+/* Line 189 of yacc.c  */
 #line 28 "../Source/WebCore/xml/XPathGrammar.y"
 
 
@@ -104,8 +106,8 @@ using namespace XPath;
 
 
 
-/* Line 268 of yacc.c  */
-#line 109 "/Source/WebCore/generated/XPathGrammar.tab.c"
+/* Line 189 of yacc.c  */
+#line 111 "/Source/WebCore/generated/XPathGrammar.tab.c"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -159,7 +161,7 @@ using namespace XPath;
 typedef union YYSTYPE
 {
 
-/* Line 293 of yacc.c  */
+/* Line 214 of yacc.c  */
 #line 60 "../Source/WebCore/xml/XPathGrammar.y"
 
     Step::Axis axis;
@@ -175,8 +177,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 293 of yacc.c  */
-#line 180 "/Source/WebCore/generated/XPathGrammar.tab.c"
+/* Line 214 of yacc.c  */
+#line 182 "/Source/WebCore/generated/XPathGrammar.tab.c"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -186,7 +188,7 @@ typedef union YYSTYPE
 
 /* Copy the second part of user declarations.  */
 
-/* Line 343 of yacc.c  */
+/* Line 264 of yacc.c  */
 #line 73 "../Source/WebCore/xml/XPathGrammar.y"
 
 
@@ -195,8 +197,8 @@ static void xpathyyerror(const char*) { }
     
 
 
-/* Line 343 of yacc.c  */
-#line 200 "/Source/WebCore/generated/XPathGrammar.tab.c"
+/* Line 264 of yacc.c  */
+#line 202 "/Source/WebCore/generated/XPathGrammar.tab.c"
 
 #ifdef short
 # undef short
@@ -246,7 +248,7 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if defined YYENABLE_NLS && YYENABLE_NLS
+# if YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
 #   define YY_(msgid) dgettext ("bison-runtime", msgid)
@@ -299,11 +301,11 @@ YYID (yyi)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef EXIT_SUCCESS
-#      define EXIT_SUCCESS 0
+#     ifndef _STDLIB_H
+#      define _STDLIB_H 1
 #     endif
 #    endif
 #   endif
@@ -326,24 +328,24 @@ YYID (yyi)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
+#  if (defined __cplusplus && ! defined _STDLIB_H \
        && ! ((defined YYMALLOC || defined malloc) \
 	     && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef EXIT_SUCCESS
-#    define EXIT_SUCCESS 0
+#   ifndef _STDLIB_H
+#    define _STDLIB_H 1
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined EXIT_SUCCESS && (defined __STDC__ || defined __C99__FUNC__ \
+#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
@@ -372,7 +374,23 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-# define YYCOPY_NEEDED 1
+/* Copy COUNT objects from FROM to TO.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(To, From, Count) \
+      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
+#  else
+#   define YYCOPY(To, From, Count)		\
+      do					\
+	{					\
+	  YYSIZE_T yyi;				\
+	  for (yyi = 0; yyi < (Count); yyi++)	\
+	    (To)[yyi] = (From)[yyi];		\
+	}					\
+      while (YYID (0))
+#  endif
+# endif
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
@@ -392,26 +410,6 @@ union yyalloc
 
 #endif
 
-#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
-#endif /* !YYCOPY_NEEDED */
-
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  47
 /* YYLAST -- Last index in YYTABLE.  */
@@ -570,8 +568,8 @@ static const yytype_uint8 yyr2[] =
        1,     2
 };
 
-/* YYDEFACT[STATE-NAME] -- Default reduction number in state STATE-NUM.
-   Performed when YYTABLE doesn't specify something else to do.  Zero
+/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
+   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
    means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
@@ -622,7 +620,8 @@ static const yytype_int8 yypgoto[] =
 
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
    positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If YYTABLE_NINF, syntax error.  */
+   number is the opposite.  If zero, do what YYDEFACT says.
+   If YYTABLE_NINF, syntax error.  */
 #define YYTABLE_NINF -1
 static const yytype_uint8 yytable[] =
 {
@@ -641,12 +640,6 @@ static const yytype_uint8 yytable[] =
       15
 };
 
-#define yypact_value_is_default(yystate) \
-  ((yystate) == (-44))
-
-#define yytable_value_is_error(yytable_value) \
-  YYID (0)
-
 static const yytype_int8 yycheck[] =
 {
        1,    12,     0,    19,    22,    48,    49,    43,    10,    11,
@@ -692,18 +685,9 @@ static const yytype_uint8 yystos[] =
 
 /* Like YYERROR except do call yyerror.  This remains here temporarily
    to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  However,
-   YYFAIL appears to be in use.  Nevertheless, it is formally deprecated
-   in Bison 2.4.2's NEWS entry, where a plan to phase it out is
-   discussed.  */
+   Once GCC version 2 has supplanted version 1, this can go.  */
 
 #define YYFAIL		goto yyerrlab
-#if defined YYFAIL
-  /* This is here to suppress warnings from the GCC cpp's
-     -Wunused-macros.  Normally we don't worry about that warning, but
-     some users do, and we want to make it easy for users to remove
-     YYFAIL uses, which will produce warnings from Bison 2.5.  */
-#endif
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
@@ -713,6 +697,7 @@ do								\
     {								\
       yychar = (Token);						\
       yylval = (Value);						\
+      yytoken = YYTRANSLATE (yychar);				\
       YYPOPSTACK (1);						\
       goto yybackup;						\
     }								\
@@ -754,10 +739,19 @@ while (YYID (0))
 #endif
 
 
-/* This macro is provided for backward compatibility. */
+/* YY_LOCATION_PRINT -- Print the location on the stream.
+   This macro was not mandated originally: define only if we know
+   we won't break user code: when these are the locations we know.  */
 
 #ifndef YY_LOCATION_PRINT
-# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# if YYLTYPE_IS_TRIVIAL
+#  define YY_LOCATION_PRINT(File, Loc)			\
+     fprintf (File, "%d.%d-%d.%d",			\
+	      (Loc).first_line, (Loc).first_column,	\
+	      (Loc).last_line,  (Loc).last_column)
+# else
+#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+# endif
 #endif
 
 
@@ -949,6 +943,7 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
+
 
 #if YYERROR_VERBOSE
 
@@ -1051,142 +1046,115 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
-   about the unexpected token YYTOKEN for the state stack whose top is
-   YYSSP.
-
-   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
-   not large enough to hold the message.  In that case, also set
-   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
-   required number of bytes is too large to store.  */
-static int
-yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
-                yytype_int16 *yyssp, int yytoken)
+/* Copy into YYRESULT an error message about the unexpected token
+   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
+   including the terminating null byte.  If YYRESULT is null, do not
+   copy anything; just return the number of bytes that would be
+   copied.  As a special case, return 0 if an ordinary "syntax error"
+   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
+   size calculation.  */
+static YYSIZE_T
+yysyntax_error (char *yyresult, int yystate, int yychar)
 {
-  YYSIZE_T yysize0 = yytnamerr (0, yytname[yytoken]);
-  YYSIZE_T yysize = yysize0;
-  YYSIZE_T yysize1;
-  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-  /* Internationalized format string. */
-  const char *yyformat = 0;
-  /* Arguments of yyformat. */
-  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-  /* Number of reported tokens (one for the "unexpected", one per
-     "expected"). */
-  int yycount = 0;
-
-  /* There are many possibilities here to consider:
-     - Assume YYFAIL is not used.  It's too flawed to consider.  See
-       <http://lists.gnu.org/archive/html/bison-patches/2009-12/msg00024.html>
-       for details.  YYERROR is fine as it does not invoke this
-       function.
-     - If this state is a consistent state with a default action, then
-       the only way this function was invoked is if the default action
-       is an error action.  In that case, don't check for expected
-       tokens because there are none.
-     - The only way there can be no lookahead present (in yychar) is if
-       this state is a consistent state with a default action.  Thus,
-       detecting the absence of a lookahead is sufficient to determine
-       that there is no unexpected or expected token to report.  In that
-       case, just report a simple "syntax error".
-     - Don't assume there isn't a lookahead just because this state is a
-       consistent state with a default action.  There might have been a
-       previous inconsistent state, consistent state with a non-default
-       action, or user semantic action that manipulated yychar.
-     - Of course, the expected token list depends on states to have
-       correct lookahead information, and it depends on the parser not
-       to perform extra reductions after fetching a lookahead from the
-       scanner and before detecting a syntax error.  Thus, state merging
-       (from LALR or IELR) and default reductions corrupt the expected
-       token list.  However, the list is correct for canonical LR with
-       one exception: it will still contain any token that will not be
-       accepted due to an error action in a later state.
-  */
-  if (yytoken != YYEMPTY)
-    {
-      int yyn = yypact[*yyssp];
-      yyarg[yycount++] = yytname[yytoken];
-      if (!yypact_value_is_default (yyn))
-        {
-          /* Start YYX at -YYN if negative to avoid negative indexes in
-             YYCHECK.  In other words, skip the first -YYN actions for
-             this state because they are default actions.  */
-          int yyxbegin = yyn < 0 ? -yyn : 0;
-          /* Stay within bounds of both yycheck and yytname.  */
-          int yychecklim = YYLAST - yyn + 1;
-          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-          int yyx;
-
-          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
-                && !yytable_value_is_error (yytable[yyx + yyn]))
-              {
-                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-                  {
-                    yycount = 1;
-                    yysize = yysize0;
-                    break;
-                  }
-                yyarg[yycount++] = yytname[yyx];
-                yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-                if (! (yysize <= yysize1
-                       && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-                  return 2;
-                yysize = yysize1;
-              }
-        }
-    }
+  int yyn = yypact[yystate];
 
-  switch (yycount)
+  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
+    return 0;
+  else
     {
-# define YYCASE_(N, S)                      \
-      case N:                               \
-        yyformat = S;                       \
-      break
-      YYCASE_(0, YY_("syntax error"));
-      YYCASE_(1, YY_("syntax error, unexpected %s"));
-      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
-      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
-      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
-      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
-# undef YYCASE_
-    }
+      int yytype = YYTRANSLATE (yychar);
+      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
+      YYSIZE_T yysize = yysize0;
+      YYSIZE_T yysize1;
+      int yysize_overflow = 0;
+      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+      int yyx;
+
+# if 0
+      /* This is so xgettext sees the translatable formats that are
+	 constructed on the fly.  */
+      YY_("syntax error, unexpected %s");
+      YY_("syntax error, unexpected %s, expecting %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
+      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
+# endif
+      char *yyfmt;
+      char const *yyf;
+      static char const yyunexpected[] = "syntax error, unexpected %s";
+      static char const yyexpecting[] = ", expecting %s";
+      static char const yyor[] = " or %s";
+      char yyformat[sizeof yyunexpected
+		    + sizeof yyexpecting - 1
+		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
+		       * (sizeof yyor - 1))];
+      char const *yyprefix = yyexpecting;
+
+      /* Start YYX at -YYN if negative to avoid negative indexes in
+	 YYCHECK.  */
+      int yyxbegin = yyn < 0 ? -yyn : 0;
+
+      /* Stay within bounds of both yycheck and yytname.  */
+      int yychecklim = YYLAST - yyn + 1;
+      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+      int yycount = 1;
+
+      yyarg[0] = yytname[yytype];
+      yyfmt = yystpcpy (yyformat, yyunexpected);
+
+      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
+	  {
+	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+	      {
+		yycount = 1;
+		yysize = yysize0;
+		yyformat[sizeof yyunexpected - 1] = '\0';
+		break;
+	      }
+	    yyarg[yycount++] = yytname[yyx];
+	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
+	    yysize_overflow |= (yysize1 < yysize);
+	    yysize = yysize1;
+	    yyfmt = yystpcpy (yyfmt, yyprefix);
+	    yyprefix = yyor;
+	  }
 
-  yysize1 = yysize + yystrlen (yyformat);
-  if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
-    return 2;
-  yysize = yysize1;
+      yyf = YY_(yyformat);
+      yysize1 = yysize + yystrlen (yyf);
+      yysize_overflow |= (yysize1 < yysize);
+      yysize = yysize1;
 
-  if (*yymsg_alloc < yysize)
-    {
-      *yymsg_alloc = 2 * yysize;
-      if (! (yysize <= *yymsg_alloc
-             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
-        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
-      return 1;
-    }
+      if (yysize_overflow)
+	return YYSIZE_MAXIMUM;
 
-  /* Avoid sprintf, as that infringes on the user's name space.
-     Don't have undefined behavior even if the translation
-     produced a string with the wrong number of "%s"s.  */
-  {
-    char *yyp = *yymsg;
-    int yyi = 0;
-    while ((*yyp = *yyformat) != '\0')
-      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
-        {
-          yyp += yytnamerr (yyp, yyarg[yyi++]);
-          yyformat += 2;
-        }
-      else
-        {
-          yyp++;
-          yyformat++;
-        }
-  }
-  return 0;
+      if (yyresult)
+	{
+	  /* Avoid sprintf, as that infringes on the user's name space.
+	     Don't have undefined behavior even if the translation
+	     produced a string with the wrong number of "%s"s.  */
+	  char *yyp = yyresult;
+	  int yyi = 0;
+	  while ((*yyp = *yyf) != '\0')
+	    {
+	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
+		{
+		  yyp += yytnamerr (yyp, yyarg[yyi++]);
+		  yyf += 2;
+		}
+	      else
+		{
+		  yyp++;
+		  yyf++;
+		}
+	    }
+	}
+      return yysize;
+    }
 }
 #endif /* YYERROR_VERBOSE */
+
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
@@ -1219,7 +1187,6 @@ yydestruct (yymsg, yytype, yyvaluep)
     }
 }
 
-
 /* Prevent warnings from -Wmissing-prototypes.  */
 #ifdef YYPARSE_PARAM
 #if defined __STDC__ || defined __cplusplus
@@ -1236,9 +1203,12 @@ int yyparse ();
 #endif /* ! YYPARSE_PARAM */
 
 
-/*----------.
-| yyparse.  |
-`----------*/
+
+
+
+/*-------------------------.
+| yyparse or yypush_parse.  |
+`-------------------------*/
 
 #ifdef YYPARSE_PARAM
 #if (defined __STDC__ || defined __C99__FUNC__ \
@@ -1425,7 +1395,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yypact_value_is_default (yyn))
+  if (yyn == YYPACT_NINF)
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1456,8 +1426,8 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yytable_value_is_error (yyn))
-        goto yyerrlab;
+      if (yyn == 0 || yyn == YYTABLE_NINF)
+	goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -1512,98 +1482,98 @@ yyreduce:
     {
         case 2:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 122 "../Source/WebCore/xml/XPathGrammar.y"
     {
         PARSER->m_topExpr = (yyvsp[(1) - (1)].expr);
-    }
+    ;}
     break;
 
   case 3:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 129 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.locationPath)->setAbsolute(false);
-    }
+    ;}
     break;
 
   case 4:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 134 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.locationPath)->setAbsolute(true);
-    }
+    ;}
     break;
 
   case 5:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 141 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.locationPath) = new LocationPath;
         PARSER->registerParseNode((yyval.locationPath));
-    }
+    ;}
     break;
 
   case 6:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 147 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.locationPath) = (yyvsp[(2) - (2)].locationPath);
-    }
+    ;}
     break;
 
   case 7:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 152 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.locationPath) = (yyvsp[(2) - (2)].locationPath);
         (yyval.locationPath)->insertFirstStep((yyvsp[(1) - (2)].step));
         PARSER->unregisterParseNode((yyvsp[(1) - (2)].step));
-    }
+    ;}
     break;
 
   case 8:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 161 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.locationPath) = new LocationPath;
         (yyval.locationPath)->appendStep((yyvsp[(1) - (1)].step));
         PARSER->unregisterParseNode((yyvsp[(1) - (1)].step));
         PARSER->registerParseNode((yyval.locationPath));
-    }
+    ;}
     break;
 
   case 9:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 169 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.locationPath)->appendStep((yyvsp[(3) - (3)].step));
         PARSER->unregisterParseNode((yyvsp[(3) - (3)].step));
-    }
+    ;}
     break;
 
   case 10:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 175 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.locationPath)->appendStep((yyvsp[(2) - (3)].step));
         (yyval.locationPath)->appendStep((yyvsp[(3) - (3)].step));
         PARSER->unregisterParseNode((yyvsp[(2) - (3)].step));
         PARSER->unregisterParseNode((yyvsp[(3) - (3)].step));
-    }
+    ;}
     break;
 
   case 11:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 185 "../Source/WebCore/xml/XPathGrammar.y"
     {
         if ((yyvsp[(2) - (2)].predList)) {
@@ -1613,12 +1583,12 @@ yyreduce:
             (yyval.step) = new Step(Step::ChildAxis, *(yyvsp[(1) - (2)].nodeTest));
         PARSER->deleteNodeTest((yyvsp[(1) - (2)].nodeTest));
         PARSER->registerParseNode((yyval.step));
-    }
+    ;}
     break;
 
   case 12:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 196 "../Source/WebCore/xml/XPathGrammar.y"
     {
         String localName;
@@ -1635,12 +1605,12 @@ yyreduce:
             (yyval.step) = new Step(Step::ChildAxis, Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
         PARSER->deleteString((yyvsp[(1) - (2)].str));
         PARSER->registerParseNode((yyval.step));
-    }
+    ;}
     break;
 
   case 13:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 214 "../Source/WebCore/xml/XPathGrammar.y"
     {
         if ((yyvsp[(3) - (3)].predList)) {
@@ -1650,12 +1620,12 @@ yyreduce:
             (yyval.step) = new Step((yyvsp[(1) - (3)].axis), *(yyvsp[(2) - (3)].nodeTest));
         PARSER->deleteNodeTest((yyvsp[(2) - (3)].nodeTest));
         PARSER->registerParseNode((yyval.step));
-    }
+    ;}
     break;
 
   case 14:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 225 "../Source/WebCore/xml/XPathGrammar.y"
     {
         String localName;
@@ -1672,21 +1642,21 @@ yyreduce:
             (yyval.step) = new Step((yyvsp[(1) - (3)].axis), Step::NodeTest(Step::NodeTest::NameTest, localName, namespaceURI));
         PARSER->deleteString((yyvsp[(2) - (3)].str));
         PARSER->registerParseNode((yyval.step));
-    }
+    ;}
     break;
 
   case 17:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 249 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.axis) = Step::AttributeAxis;
-    }
+    ;}
     break;
 
   case 18:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 256 "../Source/WebCore/xml/XPathGrammar.y"
     {
         if (*(yyvsp[(1) - (3)].str) == "node")
@@ -1698,147 +1668,147 @@ yyreduce:
 
         PARSER->deleteString((yyvsp[(1) - (3)].str));
         PARSER->registerNodeTest((yyval.nodeTest));
-    }
+    ;}
     break;
 
   case 19:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 269 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest);
         PARSER->deleteString((yyvsp[(1) - (3)].str));        
         PARSER->registerNodeTest((yyval.nodeTest));
-    }
+    ;}
     break;
 
   case 20:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 276 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.nodeTest) = new Step::NodeTest(Step::NodeTest::ProcessingInstructionNodeTest, (yyvsp[(3) - (4)].str)->stripWhiteSpace());
         PARSER->deleteString((yyvsp[(1) - (4)].str));        
         PARSER->deleteString((yyvsp[(3) - (4)].str));
         PARSER->registerNodeTest((yyval.nodeTest));
-    }
+    ;}
     break;
 
   case 21:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 286 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.predList) = 0;
-    }
+    ;}
     break;
 
   case 23:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 295 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.predList) = new Vector<Predicate*>;
         (yyval.predList)->append(new Predicate((yyvsp[(1) - (1)].expr)));
         PARSER->unregisterParseNode((yyvsp[(1) - (1)].expr));
         PARSER->registerPredicateVector((yyval.predList));
-    }
+    ;}
     break;
 
   case 24:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 303 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.predList)->append(new Predicate((yyvsp[(2) - (2)].expr)));
         PARSER->unregisterParseNode((yyvsp[(2) - (2)].expr));
-    }
+    ;}
     break;
 
   case 25:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 311 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = (yyvsp[(2) - (3)].expr);
-    }
+    ;}
     break;
 
   case 26:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 318 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.step) = new Step(Step::DescendantOrSelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
         PARSER->registerParseNode((yyval.step));
-    }
+    ;}
     break;
 
   case 27:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 326 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.step) = new Step(Step::SelfAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
         PARSER->registerParseNode((yyval.step));
-    }
+    ;}
     break;
 
   case 28:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 332 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.step) = new Step(Step::ParentAxis, Step::NodeTest(Step::NodeTest::AnyNodeTest));
         PARSER->registerParseNode((yyval.step));
-    }
+    ;}
     break;
 
   case 29:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 340 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = new VariableReference(*(yyvsp[(1) - (1)].str));
         PARSER->deleteString((yyvsp[(1) - (1)].str));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 30:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 347 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = (yyvsp[(2) - (3)].expr);
-    }
+    ;}
     break;
 
   case 31:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 352 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = new StringExpression(*(yyvsp[(1) - (1)].str));
         PARSER->deleteString((yyvsp[(1) - (1)].str));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 32:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 359 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = new Number((yyvsp[(1) - (1)].str)->toDouble());
         PARSER->deleteString((yyvsp[(1) - (1)].str));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 34:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 370 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = createFunction(*(yyvsp[(1) - (3)].str));
@@ -1846,12 +1816,12 @@ yyreduce:
             YYABORT;
         PARSER->deleteString((yyvsp[(1) - (3)].str));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 35:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 379 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = createFunction(*(yyvsp[(1) - (4)].str), *(yyvsp[(3) - (4)].argList));
@@ -1860,34 +1830,34 @@ yyreduce:
         PARSER->deleteString((yyvsp[(1) - (4)].str));
         PARSER->deleteExpressionVector((yyvsp[(3) - (4)].argList));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 36:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 391 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.argList) = new Vector<Expression*>;
         (yyval.argList)->append((yyvsp[(1) - (1)].expr));
         PARSER->unregisterParseNode((yyvsp[(1) - (1)].expr));
         PARSER->registerExpressionVector((yyval.argList));
-    }
+    ;}
     break;
 
   case 37:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 399 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.argList)->append((yyvsp[(3) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(3) - (3)].expr));
-    }
+    ;}
     break;
 
   case 40:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 413 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = new Union;
@@ -1896,21 +1866,21 @@ yyreduce:
         PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(3) - (3)].expr));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 41:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 425 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = (yyvsp[(1) - (1)].locationPath);
-    }
+    ;}
     break;
 
   case 43:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 432 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyvsp[(3) - (3)].locationPath)->setAbsolute(true);
@@ -1918,12 +1888,12 @@ yyreduce:
         PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(3) - (3)].locationPath));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 44:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 441 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyvsp[(3) - (3)].locationPath)->insertFirstStep((yyvsp[(2) - (3)].step));
@@ -1933,134 +1903,123 @@ yyreduce:
         PARSER->unregisterParseNode((yyvsp[(2) - (3)].step));
         PARSER->unregisterParseNode((yyvsp[(3) - (3)].locationPath));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 46:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 456 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = new Filter((yyvsp[(1) - (2)].expr), *(yyvsp[(2) - (2)].predList));
         PARSER->unregisterParseNode((yyvsp[(1) - (2)].expr));
         PARSER->deletePredicateVector((yyvsp[(2) - (2)].predList));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 48:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 468 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = new LogicalOp(LogicalOp::OP_Or, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(3) - (3)].expr));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 50:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 480 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = new LogicalOp(LogicalOp::OP_And, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(3) - (3)].expr));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 52:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 492 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = new EqTestOp((yyvsp[(2) - (3)].eqop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(3) - (3)].expr));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 54:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 504 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = new EqTestOp((yyvsp[(2) - (3)].eqop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(3) - (3)].expr));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 56:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 516 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = new NumericOp(NumericOp::OP_Add, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(3) - (3)].expr));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 57:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 524 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = new NumericOp(NumericOp::OP_Sub, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(3) - (3)].expr));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 59:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 536 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = new NumericOp((yyvsp[(2) - (3)].numop), (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(1) - (3)].expr));
         PARSER->unregisterParseNode((yyvsp[(3) - (3)].expr));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
   case 61:
 
-/* Line 1806 of yacc.c  */
+/* Line 1455 of yacc.c  */
 #line 548 "../Source/WebCore/xml/XPathGrammar.y"
     {
         (yyval.expr) = new Negative;
         (yyval.expr)->addSubExpression((yyvsp[(2) - (2)].expr));
         PARSER->unregisterParseNode((yyvsp[(2) - (2)].expr));
         PARSER->registerParseNode((yyval.expr));
-    }
+    ;}
     break;
 
 
 
-/* Line 1806 of yacc.c  */
-#line 2051 "/Source/WebCore/generated/XPathGrammar.tab.c"
+/* Line 1455 of yacc.c  */
+#line 2021 "/Source/WebCore/generated/XPathGrammar.tab.c"
       default: break;
     }
-  /* User semantic actions sometimes alter yychar, and that requires
-     that yytoken be updated with the new translation.  We take the
-     approach of translating immediately before every use of yytoken.
-     One alternative is translating here after every semantic action,
-     but that translation would be missed if the semantic action invokes
-     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
-     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
-     incorrect destructor might then be invoked immediately.  In the
-     case of YYERROR or YYBACKUP, subsequent parser actions might lead
-     to an incorrect destructor call or verbose syntax error message
-     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -2088,10 +2047,6 @@ yyreduce:
 | yyerrlab -- here on detecting error |
 `------------------------------------*/
 yyerrlab:
-  /* Make sure we have latest lookahead translation.  See comments at
-     user semantic actions for why this is necessary.  */
-  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
-
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -2099,36 +2054,37 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
-# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
-                                        yyssp, yytoken)
       {
-        char const *yymsgp = YY_("syntax error");
-        int yysyntax_error_status;
-        yysyntax_error_status = YYSYNTAX_ERROR;
-        if (yysyntax_error_status == 0)
-          yymsgp = yymsg;
-        else if (yysyntax_error_status == 1)
-          {
-            if (yymsg != yymsgbuf)
-              YYSTACK_FREE (yymsg);
-            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
-            if (!yymsg)
-              {
-                yymsg = yymsgbuf;
-                yymsg_alloc = sizeof yymsgbuf;
-                yysyntax_error_status = 2;
-              }
-            else
-              {
-                yysyntax_error_status = YYSYNTAX_ERROR;
-                yymsgp = yymsg;
-              }
-          }
-        yyerror (yymsgp);
-        if (yysyntax_error_status == 2)
-          goto yyexhaustedlab;
+	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
+	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
+	  {
+	    YYSIZE_T yyalloc = 2 * yysize;
+	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
+	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
+	    if (yymsg != yymsgbuf)
+	      YYSTACK_FREE (yymsg);
+	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
+	    if (yymsg)
+	      yymsg_alloc = yyalloc;
+	    else
+	      {
+		yymsg = yymsgbuf;
+		yymsg_alloc = sizeof yymsgbuf;
+	      }
+	  }
+
+	if (0 < yysize && yysize <= yymsg_alloc)
+	  {
+	    (void) yysyntax_error (yymsg, yystate, yychar);
+	    yyerror (yymsg);
+	  }
+	else
+	  {
+	    yyerror (YY_("syntax error"));
+	    if (yysize != 0)
+	      goto yyexhaustedlab;
+	  }
       }
-# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -2187,7 +2143,7 @@ yyerrlab1:
   for (;;)
     {
       yyn = yypact[yystate];
-      if (!yypact_value_is_default (yyn))
+      if (yyn != YYPACT_NINF)
 	{
 	  yyn += YYTERROR;
 	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
@@ -2246,13 +2202,8 @@ yyexhaustedlab:
 
 yyreturn:
   if (yychar != YYEMPTY)
-    {
-      /* Make sure we have latest lookahead translation.  See comments at
-         user semantic actions for why this is necessary.  */
-      yytoken = YYTRANSLATE (yychar);
-      yydestruct ("Cleanup: discarding lookahead",
-                  yytoken, &yylval);
-    }
+     yydestruct ("Cleanup: discarding lookahead",
+		 yytoken, &yylval);
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
@@ -2277,7 +2228,7 @@ yyreturn:
 
 
 
-/* Line 2067 of yacc.c  */
+/* Line 1675 of yacc.c  */
 #line 556 "../Source/WebCore/xml/XPathGrammar.y"
 
 
diff --git a/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.h b/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.h
index 2911272..fa6a7b3 100644
--- a/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.h
+++ b/src/3rdparty/webkit/Source/WebCore/generated/XPathGrammar.h
@@ -1,8 +1,10 @@
-/* A Bison parser, made by GNU Bison 2.5.  */
 
-/* Bison interface for Yacc-like parsers in C
+/* A Bison parser, made by GNU Bison 2.4.1.  */
+
+/* Skeleton interface for Bison's Yacc-like parsers in C
    
-      Copyright (C) 1984, 1989-1990, 2000-2011 Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Free Software Foundation, Inc.
    
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -64,7 +66,7 @@
 typedef union YYSTYPE
 {
 
-/* Line 2068 of yacc.c  */
+/* Line 1676 of yacc.c  */
 #line 60 "../Source/WebCore/xml/XPathGrammar.y"
 
     Step::Axis axis;
@@ -80,8 +82,8 @@ typedef union YYSTYPE
 
 
 
-/* Line 2068 of yacc.c  */
-#line 85 "/Source/WebCore/generated/XPathGrammar.tab.h"
+/* Line 1676 of yacc.c  */
+#line 87 "/Source/WebCore/generated/XPathGrammar.tab.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff --git a/src/3rdparty/webkit/Source/WebCore/html/HTMLLinkElement.cpp b/src/3rdparty/webkit/Source/WebCore/html/HTMLLinkElement.cpp
index 633dd1e..d7ca918 100644
--- a/src/3rdparty/webkit/Source/WebCore/html/HTMLLinkElement.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/html/HTMLLinkElement.cpp
@@ -83,6 +83,9 @@ HTMLLinkElement::~HTMLLinkElement()
     if (m_cachedLinkResource)
         m_cachedLinkResource->removeClient(this);
 #endif
+
+    if (inDocument())
+        document()->removeStyleSheetCandidateNode(this);
 }
 
 void HTMLLinkElement::setDisabled(bool disabled)
diff --git a/src/3rdparty/webkit/Source/WebCore/html/HTMLSourceElement.cpp b/src/3rdparty/webkit/Source/WebCore/html/HTMLSourceElement.cpp
index 59b3882..0631a20 100644
--- a/src/3rdparty/webkit/Source/WebCore/html/HTMLSourceElement.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/html/HTMLSourceElement.cpp
@@ -57,13 +57,15 @@ PassRefPtr<HTMLSourceElement> HTMLSourceElement::create(const QualifiedName& tag
 void HTMLSourceElement::insertedIntoTree(bool deep)
 {
     HTMLElement::insertedIntoTree(deep);
-    if (parentNode() && (parentNode()->hasTagName(audioTag) || parentNode()->hasTagName(videoTag)))
+    Element* parent = parentElement();
+    if (parent && parent->isMediaElement())
         static_cast<HTMLMediaElement*>(parentNode())->sourceWasAdded(this);
 }
 
 void HTMLSourceElement::willRemove()
 {
-    if (parentNode() && (parentNode()->hasTagName(audioTag) || parentNode()->hasTagName(videoTag)))
+    Element* parent = parentElement();
+    if (parent && parent->isMediaElement())
         static_cast<HTMLMediaElement*>(parentNode())->sourceWillBeRemoved(this);
     HTMLElement::willRemove();
 }
diff --git a/src/3rdparty/webkit/Source/WebCore/html/HTMLStyleElement.cpp b/src/3rdparty/webkit/Source/WebCore/html/HTMLStyleElement.cpp
index 0f256e1..0213f40 100644
--- a/src/3rdparty/webkit/Source/WebCore/html/HTMLStyleElement.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/html/HTMLStyleElement.cpp
@@ -44,8 +44,7 @@ inline HTMLStyleElement::HTMLStyleElement(const QualifiedName& tagName, Document
 
 HTMLStyleElement::~HTMLStyleElement()
 {
-    if (m_sheet)
-        m_sheet->clearOwnerNode();
+    StyleElement::clearDocumentData(document(), this);
 }
 
 PassRefPtr<HTMLStyleElement> HTMLStyleElement::create(const QualifiedName& tagName, Document* document, bool createdByParser)
diff --git a/src/3rdparty/webkit/Source/WebCore/html/HTMLTrackElement.cpp b/src/3rdparty/webkit/Source/WebCore/html/HTMLTrackElement.cpp
index 63f2788..4de878b 100644
--- a/src/3rdparty/webkit/Source/WebCore/html/HTMLTrackElement.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/html/HTMLTrackElement.cpp
@@ -53,7 +53,8 @@ PassRefPtr<HTMLTrackElement> HTMLTrackElement::create(const QualifiedName& tagNa
 void HTMLTrackElement::insertedIntoTree(bool deep)
 {
     HTMLElement::insertedIntoTree(deep);
-    if (parentNode() && (parentNode()->hasTagName(audioTag) || parentNode()->hasTagName(videoTag))) {
+    Element* parent = parentElement();
+    if (parent && parent->isMediaElement()) {
         // TODO(annacc):
         // static_cast<HTMLMediaElement*>(parentNode())->trackWasAdded(this);
     }
@@ -61,7 +62,8 @@ void HTMLTrackElement::insertedIntoTree(bool deep)
 
 void HTMLTrackElement::willRemove()
 {
-    if (parentNode() && (parentNode()->hasTagName(audioTag) || parentNode()->hasTagName(videoTag))) {
+    Element* parent = parentElement();
+    if (parent && parent->isMediaElement()) {
         // TODO(annacc):
         // static_cast<HTMLMediaElement*>(parentNode())->trackWillBeRemoved(this);
     }
diff --git a/src/3rdparty/webkit/Source/WebCore/html/parser/HTMLTreeBuilder.cpp b/src/3rdparty/webkit/Source/WebCore/html/parser/HTMLTreeBuilder.cpp
index 054f766..4492dd2 100644
--- a/src/3rdparty/webkit/Source/WebCore/html/parser/HTMLTreeBuilder.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/html/parser/HTMLTreeBuilder.cpp
@@ -603,13 +603,13 @@ void HTMLTreeBuilder::processCloseWhenNestedTag(AtomicHTMLToken& token)
     m_framesetOk = false;
     HTMLElementStack::ElementRecord* nodeRecord = m_tree.openElements()->topRecord();
     while (1) {
-        ContainerNode* node = nodeRecord->node();
-        if (shouldClose(node)) {
+        RefPtr<ContainerNode> node = nodeRecord->node();
+        if (shouldClose(node.get())) {
             ASSERT(node->isElementNode());
-            processFakeEndTag(toElement(node)->tagQName());
+            processFakeEndTag(toElement(node.get())->tagQName());
             break;
         }
-        if (isSpecialNode(node) && !node->hasTagName(addressTag) && !node->hasTagName(divTag) && !node->hasTagName(pTag))
+        if (isSpecialNode(node.get()) && !node->hasTagName(addressTag) && !node->hasTagName(divTag) && !node->hasTagName(pTag))
             break;
         nodeRecord = nodeRecord->next();
     }
@@ -1554,7 +1554,7 @@ void HTMLTreeBuilder::processAnyOtherEndTagForInBody(AtomicHTMLToken& token)
     ASSERT(token.type() == HTMLToken::EndTag);
     HTMLElementStack::ElementRecord* record = m_tree.openElements()->topRecord();
     while (1) {
-        ContainerNode* node = record->node();
+        RefPtr<ContainerNode> node = record->node();
         if (node->hasLocalName(token.name())) {
             m_tree.generateImpliedEndTags();
             // FIXME: The ElementRecord pointed to by record might be deleted by
@@ -1568,13 +1568,13 @@ void HTMLTreeBuilder::processAnyOtherEndTagForInBody(AtomicHTMLToken& token)
                 // http://www.w3.org/Bugs/Public/show_bug.cgi?id=10080
                 // We might have already popped the node for the token in
                 // generateImpliedEndTags, just abort.
-                if (!m_tree.openElements()->contains(toElement(node)))
+                if (!m_tree.openElements()->contains(toElement(node.get())))
                     return;
             }
-            m_tree.openElements()->popUntilPopped(toElement(node));
+            m_tree.openElements()->popUntilPopped(toElement(node.get()));
             return;
         }
-        if (isSpecialNode(node)) {
+        if (isSpecialNode(node.get())) {
             parseError(token);
             return;
         }
@@ -1631,7 +1631,7 @@ void HTMLTreeBuilder::callTheAdoptionAgency(AtomicHTMLToken& token)
         }
         // 4.
         ASSERT(furthestBlock->isAbove(formattingElementRecord));
-        ContainerNode* commonAncestor = formattingElementRecord->next()->node();
+        RefPtr<ContainerNode> commonAncestor = formattingElementRecord->next()->node();
         // 5.
         HTMLFormattingElementList::Bookmark bookmark = m_tree.activeFormattingElements()->bookmarkFor(formattingElement);
         // 6.
diff --git a/src/3rdparty/webkit/Source/WebCore/html/shadow/MediaControlElements.cpp b/src/3rdparty/webkit/Source/WebCore/html/shadow/MediaControlElements.cpp
index ac5d5e2..c3bfb9a 100644
--- a/src/3rdparty/webkit/Source/WebCore/html/shadow/MediaControlElements.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/html/shadow/MediaControlElements.cpp
@@ -57,7 +57,7 @@ HTMLMediaElement* toParentMediaElement(RenderObject* o)
 {
     Node* node = o->node();
     Node* mediaNode = node ? node->shadowAncestorNode() : 0;
-    if (!mediaNode || (!mediaNode->hasTagName(HTMLNames::videoTag) && !mediaNode->hasTagName(HTMLNames::audioTag)))
+    if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(mediaNode)->isMediaElement())
         return 0;
 
     return static_cast<HTMLMediaElement*>(mediaNode);
diff --git a/src/3rdparty/webkit/Source/WebCore/inspector/InspectorValues.cpp b/src/3rdparty/webkit/Source/WebCore/inspector/InspectorValues.cpp
index 09d1258..c80de51 100644
--- a/src/3rdparty/webkit/Source/WebCore/inspector/InspectorValues.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/inspector/InspectorValues.cpp
@@ -620,7 +620,18 @@ void InspectorBasicValue::writeJSON(Vector<UChar>* output) const
             output->append(falseString, 5);
     } else if (type() == TypeNumber) {
         NumberToStringBuffer buffer;
-        unsigned length = DecimalNumber(m_doubleValue).toStringDecimal(buffer, WTF::NumberToStringBufferLength);
+        DecimalNumber decimal = m_doubleValue;
+        unsigned length = 0;
+        if (decimal.bufferLengthForStringDecimal() > WTF::NumberToStringBufferLength) {
+            // Not enough room for decimal. Use exponential format.
+            if (decimal.bufferLengthForStringExponential() > WTF::NumberToStringBufferLength) {
+                // Fallback for an abnormal case if it's too little even for exponential.
+                output->append("NaN", 3);
+                return;
+            }
+            length = decimal.toStringExponential(buffer, WTF::NumberToStringBufferLength);
+        } else
+            length = decimal.toStringDecimal(buffer, WTF::NumberToStringBufferLength);
         output->append(buffer, length);
     }
 }
diff --git a/src/3rdparty/webkit/Source/WebCore/loader/DocumentWriter.cpp b/src/3rdparty/webkit/Source/WebCore/loader/DocumentWriter.cpp
index 2fc02d1..cbce0d3 100644
--- a/src/3rdparty/webkit/Source/WebCore/loader/DocumentWriter.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/loader/DocumentWriter.cpp
@@ -106,12 +106,17 @@ PassRefPtr<Document> DocumentWriter::createDocument(const KURL& url)
     return DOMImplementation::createDocument(m_mimeType, m_frame, url, m_frame->inViewSourceMode());
 }
 
-void DocumentWriter::begin(const KURL& url, bool dispatch, SecurityOrigin* origin)
+void DocumentWriter::begin(const KURL& urlReference, bool dispatch, SecurityOrigin* origin)
 {
     // We need to take a reference to the security origin because |clear|
     // might destroy the document that owns it.
     RefPtr<SecurityOrigin> forcedSecurityOrigin = origin;
 
+    // We grab a local copy of the URL because it's easy for callers to supply
+    // a URL that will be deallocated during the execution of this function.
+    // For example, see <https://bugs.webkit.org/show_bug.cgi?id=66360>.
+    KURL url = urlReference;
+
     // Create a new document before clearing the frame, because it may need to
     // inherit an aliased security context.
     RefPtr<Document> document = createDocument(url);
diff --git a/src/3rdparty/webkit/Source/WebCore/loader/FrameLoader.cpp b/src/3rdparty/webkit/Source/WebCore/loader/FrameLoader.cpp
index 75daae5..4bef249 100644
--- a/src/3rdparty/webkit/Source/WebCore/loader/FrameLoader.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/loader/FrameLoader.cpp
@@ -1331,6 +1331,9 @@ static bool isFeedWithNestedProtocolInHTTPFamily(const KURL& url)
 void FrameLoader::loadFrameRequest(const FrameLoadRequest& request, bool lockHistory, bool lockBackForwardList,
     PassRefPtr<Event> event, PassRefPtr<FormState> formState, ReferrerPolicy referrerPolicy)
 {    
+    // Protect frame from getting blown away inside dispatchBeforeLoadEvent in loadWithDocumentLoader.
+    RefPtr<Frame> protect(m_frame);
+
     KURL url = request.resourceRequest().url();
 
     ASSERT(m_frame->document());
@@ -1388,7 +1391,7 @@ void FrameLoader::loadURL(const KURL& newURL, const String& referrer, const Stri
         RefPtr<SecurityOrigin> referrerOrigin = SecurityOrigin::createFromString(referrer);
         addHTTPOriginIfNeeded(request, referrerOrigin->toString());
     }
-    addExtraFieldsToRequest(request, newLoadType, true, event || isFormSubmission);
+    addExtraFieldsToRequest(request, newLoadType, true);
     if (newLoadType == FrameLoadTypeReload || newLoadType == FrameLoadTypeReloadFromOrigin)
         request.setCachePolicy(ReloadIgnoringCacheData);
 
@@ -1567,7 +1570,13 @@ void FrameLoader::loadWithDocumentLoader(DocumentLoader* loader, FrameLoadType t
             loader->setTriggeringAction(NavigationAction(newURL, policyChecker()->loadType(), isFormSubmission));
 
         if (Element* ownerElement = m_frame->ownerElement()) {
-            if (!ownerElement->dispatchBeforeLoadEvent(loader->request().url().string())) {
+            // We skip dispatching the beforeload event if we've already
+            // committed a real document load because the event would leak
+            // subsequent activity by the frame which the parent frame isn't
+            // supposed to learn. For example, if the child frame navigated to
+            // a new URL, the parent frame shouldn't learn the URL.
+            if (!m_stateMachine.committedFirstRealDocumentLoad()
+                && !ownerElement->dispatchBeforeLoadEvent(loader->request().url().string())) {
                 continueLoadAfterNavigationPolicy(loader->request(), formState, false);
                 return;
             }
@@ -1871,6 +1880,20 @@ void FrameLoader::setDocumentLoader(DocumentLoader* loader)
         m_documentLoader->detachFromFrame();
 
     m_documentLoader = loader;
+
+    // The following abomination is brought to you by the unload event.
+    // The detachChildren() call above may trigger a child frame's unload event,
+    // which could do something obnoxious like call document.write("") on
+    // the main frame, which results in detaching children while detaching children.
+    // This can cause the new m_documentLoader to be detached from its Frame*, but still
+    // be alive. To make matters worse, DocumentLoaders with a null Frame* aren't supposed
+    // to happen when they're still alive (and many places below us on the stack think the
+    // DocumentLoader is still usable). Ergo, we reattach loader to its Frame, and pretend
+    // like nothing ever happened.
+    if (m_documentLoader && !m_documentLoader->frame()) {
+        ASSERT(!m_documentLoader->isLoading());
+        m_documentLoader->setFrame(m_frame);
+    }
 }
 
 void FrameLoader::setPolicyDocumentLoader(DocumentLoader* loader)
@@ -2497,14 +2520,15 @@ void FrameLoader::checkLoadCompleteForThisFrame()
             if (m_stateMachine.creatingInitialEmptyDocument() || !m_stateMachine.committedFirstRealDocumentLoad())
                 return;
 
+            if (Page* page = m_frame->page())
+                page->progress()->progressCompleted(m_frame);
+
             const ResourceError& error = dl->mainDocumentError();
             if (!error.isNull())
                 m_client->dispatchDidFailLoad(error);
             else
                 m_client->dispatchDidFinishLoad();
 
-            if (Page* page = m_frame->page())
-                page->progress()->progressCompleted(m_frame);
             return;
         }
         
@@ -2580,12 +2604,14 @@ void FrameLoader::frameLoadCompleted()
 
 void FrameLoader::detachChildren()
 {
-    // FIXME: Is it really necessary to do this in reverse order?
-    Frame* previous;
-    for (Frame* child = m_frame->tree()->lastChild(); child; child = previous) {
-        previous = child->tree()->previousSibling();
-        child->loader()->detachFromParent();
-    }
+    typedef Vector<RefPtr<Frame> > FrameVector;
+    FrameVector childrenToDetach;
+    childrenToDetach.reserveCapacity(m_frame->tree()->childCount());
+    for (Frame* child = m_frame->tree()->lastChild(); child; child = child->tree()->previousSibling())
+        childrenToDetach.append(child);
+    FrameVector::iterator end = childrenToDetach.end();
+    for (FrameVector::iterator it = childrenToDetach.begin(); it != end; it++)
+        (*it)->loader()->detachFromParent();
 }
 
 void FrameLoader::closeAndRemoveChild(Frame* child)
@@ -2700,20 +2726,20 @@ void FrameLoader::detachViewsAndDocumentLoader()
     
 void FrameLoader::addExtraFieldsToSubresourceRequest(ResourceRequest& request)
 {
-    addExtraFieldsToRequest(request, m_loadType, false, false);
+    addExtraFieldsToRequest(request, m_loadType, false);
 }
 
 void FrameLoader::addExtraFieldsToMainResourceRequest(ResourceRequest& request)
 {
-    addExtraFieldsToRequest(request, m_loadType, true, false);
+    addExtraFieldsToRequest(request, m_loadType, true);
 }
 
-void FrameLoader::addExtraFieldsToRequest(ResourceRequest& request, FrameLoadType loadType, bool mainResource, bool cookiePolicyURLFromRequest)
+void FrameLoader::addExtraFieldsToRequest(ResourceRequest& request, FrameLoadType loadType, bool mainResource)
 {
     // Don't set the cookie policy URL if it's already been set.
     // But make sure to set it on all requests, as it has significance beyond the cookie policy for all protocols (<rdar://problem/6616664>).
     if (request.firstPartyForCookies().isEmpty()) {
-        if (mainResource && (isLoadingMainFrame() || cookiePolicyURLFromRequest))
+        if (mainResource && isLoadingMainFrame())
             request.setFirstPartyForCookies(request.url());
         else if (Document* document = m_frame->document())
             request.setFirstPartyForCookies(document->firstPartyForCookies());
@@ -2812,7 +2838,7 @@ void FrameLoader::loadPostRequest(const ResourceRequest& inRequest, const String
     workingResourceRequest.setHTTPMethod("POST");
     workingResourceRequest.setHTTPBody(formData);
     workingResourceRequest.setHTTPContentType(contentType);
-    addExtraFieldsToRequest(workingResourceRequest, loadType, true, true);
+    addExtraFieldsToRequest(workingResourceRequest, loadType, true);
 
     NavigationAction action(url, loadType, true, event);
 
@@ -3286,7 +3312,7 @@ void FrameLoader::loadDifferentDocumentItem(HistoryItem* item, FrameLoadType loa
 
         // Make sure to add extra fields to the request after the Origin header is added for the FormData case.
         // See https://bugs.webkit.org/show_bug.cgi?id=22194 for more discussion.
-        addExtraFieldsToRequest(request, m_loadType, true, formData);
+        addExtraFieldsToRequest(request, m_loadType, true);
         addedExtraFields = true;
         
         // FIXME: Slight hack to test if the NSURL cache contains the page we're going to.
@@ -3329,7 +3355,7 @@ void FrameLoader::loadDifferentDocumentItem(HistoryItem* item, FrameLoadType loa
     }
     
     if (!addedExtraFields)
-        addExtraFieldsToRequest(request, m_loadType, true, formData);
+        addExtraFieldsToRequest(request, m_loadType, true);
 
     loadWithNavigationAction(request, action, false, loadType, 0);
 }
diff --git a/src/3rdparty/webkit/Source/WebCore/loader/FrameLoader.h b/src/3rdparty/webkit/Source/WebCore/loader/FrameLoader.h
index f2b16d9..728459c 100644
--- a/src/3rdparty/webkit/Source/WebCore/loader/FrameLoader.h
+++ b/src/3rdparty/webkit/Source/WebCore/loader/FrameLoader.h
@@ -356,7 +356,7 @@ private:
     void updateFirstPartyForCookies();
     void setFirstPartyForCookies(const KURL&);
     
-    void addExtraFieldsToRequest(ResourceRequest&, FrameLoadType loadType, bool isMainResource, bool cookiePolicyURLFromRequest);
+    void addExtraFieldsToRequest(ResourceRequest&, FrameLoadType, bool isMainResource);
 
     // Also not cool.
     void stopLoadingSubframes(ClearProvisionalItemPolicy);
diff --git a/src/3rdparty/webkit/Source/WebCore/loader/cache/CachedResource.cpp b/src/3rdparty/webkit/Source/WebCore/loader/cache/CachedResource.cpp
index 0f205da..8e5038a 100644
--- a/src/3rdparty/webkit/Source/WebCore/loader/cache/CachedResource.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/loader/cache/CachedResource.cpp
@@ -250,6 +250,8 @@ void CachedResource::setRequest(CachedResourceRequest* request)
         m_status = Pending;
     m_request = request;
 
+    CachedResourceHandle<CachedResource> protect(this);
+
     // All loads finish with data(allDataReceived = true) or error(), except for
     // canceled loads, which silently set our request to 0. Be sure to notify our
     // client in that case, so we don't seem to continue loading forever.
@@ -258,9 +260,6 @@ void CachedResource::setRequest(CachedResourceRequest* request)
         setStatus(Canceled);
         checkNotify();
     }
-
-    if (canDelete() && !inCache())
-        delete this;
 }
 
 void CachedResource::addClient(CachedResourceClient* client)
diff --git a/src/3rdparty/webkit/Source/WebCore/make-hash-tools.pl b/src/3rdparty/webkit/Source/WebCore/make-hash-tools.pl
index 37639eb..2812ce7 100644
--- a/src/3rdparty/webkit/Source/WebCore/make-hash-tools.pl
+++ b/src/3rdparty/webkit/Source/WebCore/make-hash-tools.pl
@@ -20,7 +20,6 @@
 #   Boston, MA 02110-1301, USA.
 
 use strict;
-use Switch;
 use File::Basename;
 
 my $outdir = $ARGV[0];
@@ -28,9 +27,7 @@ shift;
 my $option = basename($ARGV[0],".gperf");
 
 
-switch ($option) {
-
-case "DocTypeStrings" {
+if ($option eq "DocTypeStrings") {
 
     my $docTypeStringsGenerated    = "$outdir/DocTypeStrings.cpp";
     my $docTypeStringsGperf        = $ARGV[0];
@@ -38,9 +35,7 @@ case "DocTypeStrings" {
 
     system("gperf --key-positions=\"*\" -s 2 $docTypeStringsGperf > $docTypeStringsGenerated") == 0 || die "calling gperf failed: $?";
 
-} # case "DocTypeStrings"
-
-case "ColorData" {
+} elsif ($option eq "ColorData") {
 
     my $colorDataGenerated         = "$outdir/ColorData.cpp";
     my $colorDataGperf             = $ARGV[0];
@@ -48,6 +43,6 @@ case "ColorData" {
 
     system("gperf --key-positions=\"*\" -D -s 2 $colorDataGperf > $colorDataGenerated") == 0 || die "calling gperf failed: $?";
 
-} # case "ColorData"
-
-} # switch ($option)
+} else {
+    die "Unknown option.";
+}
diff --git a/src/3rdparty/webkit/Source/WebCore/page/DOMWindow.cpp b/src/3rdparty/webkit/Source/WebCore/page/DOMWindow.cpp
index d1d60ad..a86c1af 100644
--- a/src/3rdparty/webkit/Source/WebCore/page/DOMWindow.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/page/DOMWindow.cpp
@@ -1667,7 +1667,7 @@ void DOMWindow::setLocation(const String& urlString, DOMWindow* activeWindow, DO
     if (completedURL.isNull())
         return;
 
-    if (isInsecureScriptAccess(activeWindow, urlString))
+    if (isInsecureScriptAccess(activeWindow, completedURL))
         return;
 
     // We want a new history item if we are processing a user gesture.
@@ -1746,7 +1746,7 @@ Frame* DOMWindow::createWindow(const String& urlString, const AtomicString& fram
     newFrame->loader()->setOpener(openerFrame);
     newFrame->page()->setOpenedByDOM();
 
-    if (newFrame->domWindow()->isInsecureScriptAccess(activeWindow, urlString))
+    if (newFrame->domWindow()->isInsecureScriptAccess(activeWindow, completedURL))
         return newFrame;
 
     if (function)
@@ -1796,7 +1796,9 @@ PassRefPtr<DOMWindow> DOMWindow::open(const String& urlString, const AtomicStrin
         if (!activeFrame->loader()->shouldAllowNavigation(targetFrame))
             return 0;
 
-        if (isInsecureScriptAccess(activeWindow, urlString))
+        KURL completedURL = firstFrame->document()->completeURL(urlString);
+
+        if (targetFrame->domWindow()->isInsecureScriptAccess(activeWindow, completedURL))
             return targetFrame->domWindow();
 
         if (urlString.isEmpty())
@@ -1805,7 +1807,7 @@ PassRefPtr<DOMWindow> DOMWindow::open(const String& urlString, const AtomicStrin
         // For whatever reason, Firefox uses the first window rather than the active window to
         // determine the outgoing referrer. We replicate that behavior here.
         targetFrame->navigationScheduler()->scheduleLocationChange(activeFrame->document()->securityOrigin(),
-            firstFrame->document()->completeURL(urlString).string(),
+            completedURL,
             firstFrame->loader()->outgoingReferrer(),
             !activeFrame->script()->anyPageIsProcessingUserGesture(), false);
 
diff --git a/src/3rdparty/webkit/Source/WebCore/page/FocusController.cpp b/src/3rdparty/webkit/Source/WebCore/page/FocusController.cpp
index 5b91eeb..e7a44ca 100644
--- a/src/3rdparty/webkit/Source/WebCore/page/FocusController.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/page/FocusController.cpp
@@ -214,7 +214,7 @@ bool FocusController::advanceFocusInDocumentOrder(FocusDirection direction, Keyb
 
     document->updateLayoutIgnorePendingStylesheets();
 
-    Node* node = (direction == FocusDirectionForward)
+    RefPtr<Node> node = (direction == FocusDirectionForward)
         ? document->nextFocusableNode(currentNode, event)
         : document->previousFocusableNode(currentNode, event);
             
@@ -237,7 +237,7 @@ bool FocusController::advanceFocusInDocumentOrder(FocusDirection direction, Keyb
         frame = parentFrame;
     }
 
-    node = deepFocusableNode(direction, node, event);
+    node = deepFocusableNode(direction, node.get(), event);
 
     if (!node) {
         // We didn't find a node to focus, so we should try to pass focus to Chrome.
@@ -254,7 +254,7 @@ bool FocusController::advanceFocusInDocumentOrder(FocusDirection direction, Keyb
             ? d->nextFocusableNode(0, event)
             : d->previousFocusableNode(0, event);
 
-        node = deepFocusableNode(direction, node, event);
+        node = deepFocusableNode(direction, node.get(), event);
 
         if (!node)
             return false;
@@ -273,7 +273,7 @@ bool FocusController::advanceFocusInDocumentOrder(FocusDirection direction, Keyb
     if (node->isFrameOwnerElement()) {
         // We focus frames rather than frame owners.
         // FIXME: We should not focus frames that have no scrollbars, as focusing them isn't useful to the user.
-        HTMLFrameOwnerElement* owner = static_cast<HTMLFrameOwnerElement*>(node);
+        HTMLFrameOwnerElement* owner = static_cast<HTMLFrameOwnerElement*>(node.get());
         if (!owner->contentFrame())
             return false;
 
@@ -296,13 +296,13 @@ bool FocusController::advanceFocusInDocumentOrder(FocusDirection direction, Keyb
         setFocusedFrame(newDocument->frame());
 
     if (caretBrowsing) {
-        Position position = firstPositionInOrBeforeNode(node);
+        Position position = firstPositionInOrBeforeNode(node.get());
         VisibleSelection newSelection(position, position, DOWNSTREAM);
         if (frame->selection()->shouldChangeSelection(newSelection))
             frame->selection()->setSelection(newSelection);
     }
 
-    static_cast<Element*>(node)->focus(false);
+    static_cast<Element*>(node.get())->focus(false);
     return true;
 }
 
diff --git a/src/3rdparty/webkit/Source/WebCore/page/FrameView.cpp b/src/3rdparty/webkit/Source/WebCore/page/FrameView.cpp
index b7ff00a..ef72fb7 100644
--- a/src/3rdparty/webkit/Source/WebCore/page/FrameView.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/page/FrameView.cpp
@@ -1938,7 +1938,7 @@ void FrameView::updateWidget(RenderEmbeddedObject* object)
         static_cast<HTMLPlugInImageElement*>(ownerElement)->updateWidget(CreateAnyWidgetType);
     // FIXME: It is not clear that Media elements need or want this updateWidget() call.
 #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-    else if (ownerElement->hasTagName(videoTag) || ownerElement->hasTagName(audioTag))
+    else if (ownerElement->isMediaElement())
         static_cast<HTMLMediaElement*>(ownerElement)->updateWidget(CreateAnyWidgetType);
 #endif
     else
@@ -2277,6 +2277,23 @@ bool FrameView::hasCustomScrollbars() const
     return false;
 }
 
+void FrameView::clearOwningRendererForCustomScrollbars(RenderBox* box)
+{
+    const HashSet<RefPtr<Widget> >* viewChildren = children();
+    HashSet<RefPtr<Widget> >::const_iterator end = viewChildren->end();
+    for (HashSet<RefPtr<Widget> >::const_iterator current = viewChildren->begin(); current != end; ++current) {
+        Widget* widget = current->get();
+        if (widget->isScrollbar()) {
+            Scrollbar* scrollbar = static_cast<Scrollbar*>(widget);
+            if (scrollbar->isCustomScrollbar()) {
+                RenderScrollbar* customScrollbar = toRenderScrollbar(scrollbar);
+                if (customScrollbar->owningRenderer() == box)
+                    customScrollbar->clearOwningRenderer();
+            }
+        }
+    }
+}
+
 FrameView* FrameView::parentFrameView() const
 {
     if (Widget* parentView = parent()) {
diff --git a/src/3rdparty/webkit/Source/WebCore/page/FrameView.h b/src/3rdparty/webkit/Source/WebCore/page/FrameView.h
index fafebfe..b151cfc 100644
--- a/src/3rdparty/webkit/Source/WebCore/page/FrameView.h
+++ b/src/3rdparty/webkit/Source/WebCore/page/FrameView.h
@@ -267,6 +267,8 @@ public:
 
     virtual bool shouldSuspendScrollAnimations() const;
 
+    void clearOwningRendererForCustomScrollbars(RenderBox*);
+
 protected:
     virtual bool scrollContentsFastPath(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect);
     virtual void scrollContentsSlowPath(const IntRect& updateRect);
diff --git a/src/3rdparty/webkit/Source/WebCore/page/Geolocation.cpp b/src/3rdparty/webkit/Source/WebCore/page/Geolocation.cpp
index fc5b1c6..b93379a 100644
--- a/src/3rdparty/webkit/Source/WebCore/page/Geolocation.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/page/Geolocation.cpp
@@ -441,6 +441,9 @@ void Geolocation::resume()
 
 void Geolocation::setIsAllowed(bool allowed)
 {
+    // Protect the Geolocation object from garbage collection during a callback.
+    RefPtr<Geolocation> protect(this);
+
     // This may be due to either a new position from the service, or a cached
     // position.
     m_allowGeolocation = allowed ? Yes : No;
diff --git a/src/3rdparty/webkit/Source/WebCore/page/Geolocation.h b/src/3rdparty/webkit/Source/WebCore/page/Geolocation.h
index b52ad45..ec48f6e 100644
--- a/src/3rdparty/webkit/Source/WebCore/page/Geolocation.h
+++ b/src/3rdparty/webkit/Source/WebCore/page/Geolocation.h
@@ -100,7 +100,7 @@ private:
         void startTimerIfNeeded();
         void timerFired(Timer<GeoNotifier>*);
         
-        Geolocation* m_geolocation;
+        RefPtr<Geolocation> m_geolocation;
         RefPtr<PositionCallback> m_successCallback;
         RefPtr<PositionErrorCallback> m_errorCallback;
         RefPtr<PositionOptions> m_options;
diff --git a/src/3rdparty/webkit/Source/WebCore/page/PrintContext.cpp b/src/3rdparty/webkit/Source/WebCore/page/PrintContext.cpp
index 6c8b312..660ad11 100644
--- a/src/3rdparty/webkit/Source/WebCore/page/PrintContext.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/page/PrintContext.cpp
@@ -55,6 +55,13 @@ PrintContext::~PrintContext()
         end();
 }
 
+#if COMPILER(WINSCW)
+const IntRect& PrintContext::pageRect(size_t pageNumber) const
+{
+    return m_pageRects[pageNumber];
+}
+#endif
+
 void PrintContext::computePageRects(const FloatRect& printRect, float headerHeight, float footerHeight, float userScaleFactor, float& outPageHeight, bool allowHorizontalTiling)
 {
     m_pageRects.clear();
diff --git a/src/3rdparty/webkit/Source/WebCore/page/PrintContext.h b/src/3rdparty/webkit/Source/WebCore/page/PrintContext.h
index 873937a..aadff47 100644
--- a/src/3rdparty/webkit/Source/WebCore/page/PrintContext.h
+++ b/src/3rdparty/webkit/Source/WebCore/page/PrintContext.h
@@ -51,7 +51,11 @@ public:
 
     // These are only valid after page rects are computed.
     size_t pageCount() const { return m_pageRects.size(); }
+#if COMPILER(WINSCW)
+    const IntRect& pageRect(size_t pageNumber) const;
+#else
     const IntRect& pageRect(size_t pageNumber) const { return m_pageRects[pageNumber]; }
+#endif
     const Vector<IntRect>& pageRects() const { return m_pageRects; }
 
     float computeAutomaticScaleFactor(const FloatSize& availablePaperSize);
diff --git a/src/3rdparty/webkit/Source/WebCore/page/Settings.cpp b/src/3rdparty/webkit/Source/WebCore/page/Settings.cpp
index 2b9e8b7..2025bd0 100644
--- a/src/3rdparty/webkit/Source/WebCore/page/Settings.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/page/Settings.cpp
@@ -89,6 +89,7 @@ Settings::Settings(Page* page)
     : m_page(page)
     , m_editableLinkBehavior(EditableLinkDefaultBehavior)
     , m_textDirectionSubmenuInclusionBehavior(TextDirectionSubmenuAutomaticallyIncluded)
+    , m_passwordEchoDurationInSeconds(1)
     , m_minimumFontSize(0)
     , m_minimumLogicalFontSize(0)
     , m_defaultFontSize(0)
@@ -182,6 +183,7 @@ Settings::Settings(Page* page)
     , m_shouldInjectUserScriptsInInitialEmptyDocument(false)
     , m_allowDisplayOfInsecureContent(true)
     , m_allowRunningOfInsecureContent(true)
+    , m_passwordEchoEnabled(false)
 {
     // A Frame may not have been created yet, so we initialize the AtomicString 
     // hash before trying to use it.
diff --git a/src/3rdparty/webkit/Source/WebCore/page/Settings.h b/src/3rdparty/webkit/Source/WebCore/page/Settings.h
index ffe1037..1d2a138 100644
--- a/src/3rdparty/webkit/Source/WebCore/page/Settings.h
+++ b/src/3rdparty/webkit/Source/WebCore/page/Settings.h
@@ -407,6 +407,12 @@ namespace WebCore {
         void setAllowRunningOfInsecureContent(bool flag) { m_allowRunningOfInsecureContent = flag; }
         bool allowRunningOfInsecureContent() const { return m_allowRunningOfInsecureContent; }
 
+        void setPasswordEchoEnabled(bool flag) { m_passwordEchoEnabled = flag; }
+        bool passwordEchoEnabled() const { return m_passwordEchoEnabled; }
+
+        void setPasswordEchoDurationInSeconds(double durationInSeconds) { m_passwordEchoDurationInSeconds = durationInSeconds; }
+        double passwordEchoDurationInSeconds() const { return m_passwordEchoDurationInSeconds; }
+
     private:
         Page* m_page;
 
@@ -422,6 +428,7 @@ namespace WebCore {
         AtomicString m_fantasyFontFamily;
         EditableLinkBehavior m_editableLinkBehavior;
         TextDirectionSubmenuInclusionBehavior m_textDirectionSubmenuInclusionBehavior;
+        double m_passwordEchoDurationInSeconds;
         int m_minimumFontSize;
         int m_minimumLogicalFontSize;
         int m_defaultFontSize;
@@ -513,6 +520,7 @@ namespace WebCore {
         bool m_shouldInjectUserScriptsInInitialEmptyDocument : 1;
         bool m_allowDisplayOfInsecureContent : 1;
         bool m_allowRunningOfInsecureContent : 1;
+        bool m_passwordEchoEnabled : 1;
 
 #if USE(AVFOUNDATION)
         static bool gAVFoundationEnabled;
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/Gradient.cpp b/src/3rdparty/webkit/Source/WebCore/platform/graphics/Gradient.cpp
index 7e3984f..fc7b741 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/Gradient.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/Gradient.cpp
@@ -124,10 +124,6 @@ void Gradient::sortStopsIfNecessary()
     if (!m_stops.size())
         return;
 
-    // Shortcut for the ideal case (ordered 2-stop gradient)
-    if (m_stops.size() == 2 && compareStops(*m_stops.begin(), *m_stops.end()))
-        return;
-
     std::stable_sort(m_stops.begin(), m_stops.end(), compareStops);
 }
 
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h b/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h
index 7b441f4..eeb08c2 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowPrivate.h
@@ -23,7 +23,9 @@
 #include <QTimer>
 #include <QWidget>
 
+QT_BEGIN_NAMESPACE
 class QKeyEvent;
+QT_END_NAMESPACE
 
 namespace WebCore {
 
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp b/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp
index a442a2b..7270785 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp
@@ -61,9 +61,9 @@ void FullScreenVideoWindow::keyPressEvent(QKeyEvent* ev)
 {
     if (m_mediaElement && ev->key() == Qt::Key_Space) {
         if (!m_mediaElement->paused())
-            m_mediaElement->pause();
+            m_mediaElement->pause(true);
         else
-            m_mediaElement->play();
+            m_mediaElement->play(true);
     } else if (ev->key() == Qt::Key_Escape)
         emit closed();
     QWidget::keyPressEvent(ev);
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/FontCacheMac.mm b/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
index c71c411..9f5c44e 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
+++ b/src/3rdparty/webkit/Source/WebCore/platform/graphics/mac/FontCacheMac.mm
@@ -36,22 +36,33 @@
 #import "WebCoreSystemInterface.h"
 #import "WebFontCache.h"
 #import <AppKit/AppKit.h>
+#import <wtf/MainThread.h>
 #import <wtf/StdLibExtras.h>
 
 
 namespace WebCore {
 
+// The "void*" parameter makes the function match the prototype for callbacks from callOnMainThread.
+static void invalidateFontCache(void*)
+{
+    if (!isMainThread()) {
+        callOnMainThread(&invalidateFontCache, 0);
+        return;
+    }
+    fontCache()->invalidate();
+}
+
 #if !defined(BUILDING_ON_LEOPARD)
 static void fontCacheRegisteredFontsChangedNotificationCallback(CFNotificationCenterRef, void* observer, CFStringRef name, const void *, CFDictionaryRef)
 {
     ASSERT_UNUSED(observer, observer == fontCache());
     ASSERT_UNUSED(name, CFEqual(name, kCTFontManagerRegisteredFontsChangedNotification));
-    fontCache()->invalidate();
+    invalidateFontCache(0);
 }
 #else
 static void fontCacheATSNotificationCallback(ATSFontNotificationInfoRef, void*)
 {
-    fontCache()->invalidate();
+    invalidateFontCache(0);
 }
 #endif
 
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreSystemInterface.h b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreSystemInterface.h
index 7ebfaab..9e05840 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreSystemInterface.h
+++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreSystemInterface.h
@@ -70,6 +70,7 @@ typedef struct _NSRect NSRect;
 @class AVAsset;
 @class NSArray;
 @class NSButtonCell;
+@class NSControl;
 @class NSData;
 @class NSDate;
 @class NSEvent;
@@ -85,12 +86,14 @@ typedef struct _NSRect NSRect;
 @class NSURLRequest;
 @class NSURLResponse;
 @class NSView;
+@class NSWindow;
 @class QTMovie;
 @class QTMovieView;
 #else
 class AVAsset;
 class NSArray;
 class NSButtonCell;
+class NSControl;
 class NSData;
 class NSDate;
 class NSEvent;
@@ -107,6 +110,7 @@ class NSTextFieldCell;
 class NSURLConnection;
 class NSURLResponse;
 class NSView;
+class NSWindow;
 class QTMovie;
 class QTMovieView;
 #endif
@@ -151,6 +155,22 @@ extern BOOL (*wkGetNSURLResponseMustRevalidate)(NSURLResponse *response);
 extern void (*wkGetWheelEventDeltas)(NSEvent*, float* deltaX, float* deltaY, BOOL* continuous);
 extern BOOL (*wkHitTestMediaUIPart)(int part, int themeStyle, CGRect bounds, CGPoint point);
 extern void (*wkMeasureMediaUIPart)(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize);
+extern NSView *(*wkCreateMediaUIBackgroundView)(void);
+
+typedef enum {
+    wkMediaUIControlTimeline,
+    wkMediaUIControlSlider,
+    wkMediaUIControlPlayPauseButton,
+    wkMediaUIControlExitFullscreenButton,
+    wkMediaUIControlRewindButton,
+    wkMediaUIControlFastForwardButton,
+    wkMediaUIControlVolumeUpButton,
+    wkMediaUIControlVolumeDownButton
+};
+extern NSControl *(*wkCreateMediaUIControl)(int);
+
+extern void (*wkWindowSetAlpha)(NSWindow *, float);
+extern void (*wkWindowSetScaledFrame)(NSWindow *, NSRect, NSRect);
 extern BOOL (*wkMediaControllerThemeAvailable)(int themeStyle);
 extern void (*wkPopupMenu)(NSMenu*, NSPoint location, float width, NSView*, int selectedItem, NSFont*);
 extern unsigned (*wkQTIncludeOnlyModernMediaFileTypes)(void);
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreSystemInterface.mm b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
index 9cc6677..94191b7 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
+++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebCoreSystemInterface.mm
@@ -46,6 +46,10 @@ void (*wkDrawMediaSliderTrack)(int themeStyle, CGContextRef context, CGRect rect
 BOOL (*wkHitTestMediaUIPart)(int part, int themeStyle, CGRect bounds, CGPoint point);
 void (*wkDrawMediaUIPart)(int part, int themeStyle, CGContextRef context, CGRect rect, unsigned state);
 void (*wkMeasureMediaUIPart)(int part, int themeStyle, CGRect *bounds, CGSize *naturalSize);
+NSView *(*wkCreateMediaUIBackgroundView)(void);
+NSControl *(*wkCreateMediaUIControl)(int);
+void (*wkWindowSetAlpha)(NSWindow *, float);
+void (*wkWindowSetScaledFrame)(NSWindow *, NSRect, NSRect);
 BOOL (*wkMediaControllerThemeAvailable)(int themeStyle);
 NSString* (*wkGetPreferredExtensionForMIMEType)(NSString*);
 CFStringRef (*wkSignedPublicKeyAndChallengeString)(unsigned keySize, CFStringRef challenge, CFStringRef keyDescription);
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenController.h b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenController.h
new file mode 100644
index 0000000..88df1d6
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenController.h
@@ -0,0 +1,72 @@
+/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if ENABLE(VIDEO)
+
+#import <Cocoa/Cocoa.h>
+#import <wtf/RefPtr.h>
+
+namespace WebCore {
+    class HTMLMediaElement;
+}
+
+@protocol WebVideoFullscreenControllerDelegate;
+@class WebVideoFullscreenHUDWindowController;
+@class WebWindowFadeAnimation;
+@class QTMovieLayer;
+
+@interface WebVideoFullscreenController : NSWindowController {
+@private
+    RefPtr<WebCore::HTMLMediaElement> _mediaElement; // (retain)
+    id <WebVideoFullscreenControllerDelegate> _delegate; // (assign)
+
+    NSWindow *_backgroundFullscreenWindow; // (retain)
+    WebVideoFullscreenHUDWindowController *_hudController; // (retain)
+
+    WebWindowFadeAnimation *_fadeAnimation; // (retain)
+
+    BOOL _isEndingFullscreen;
+    BOOL _isWindowLoaded;
+    BOOL _forceDisableAnimation;
+    uint32_t _idleDisplaySleepAssertion;
+    uint32_t _idleSystemSleepAssertion;
+    NSTimer *_tickleTimer;
+    uint32_t _savedUIMode;
+    uint32_t _savedUIOptions;
+}
+
+- (id <WebVideoFullscreenControllerDelegate>)delegate;
+- (void)setDelegate:(id <WebVideoFullscreenControllerDelegate>)delegate;
+
+- (void)setupVideoOverlay:(QTMovieLayer*)layer;
+- (void)setMediaElement:(WebCore::HTMLMediaElement*)mediaElement;
+- (WebCore::HTMLMediaElement*)mediaElement;
+
+- (void)enterFullscreen:(NSScreen *)screen;
+- (void)exitFullscreen;
+
+@end
+
+#endif // ENABLE(VIDEO)
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenController.mm b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenController.mm
new file mode 100644
index 0000000..a943fce
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenController.mm
@@ -0,0 +1,617 @@
+/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+
+#if ENABLE(VIDEO)
+
+#import "WebVideoFullscreenController.h"
+
+#import "WebVideoFullscreenHUDWindowController.h"
+#import "WebWindowAnimation.h"
+#import <Carbon/Carbon.h>
+#import <IOKit/pwr_mgt/IOPMLib.h>
+#import <QTKit/QTKit.h>
+#import <WebCore/HTMLMediaElement.h>
+#import <WebCore/SoftLinking.h>
+#import <objc/objc-runtime.h>
+#import <wtf/UnusedParam.h>
+
+#if USE(GSTREAMER)
+#import <WebCore/GStreamerGWorld.h>
+#endif
+
+SOFT_LINK_FRAMEWORK(QTKit)
+SOFT_LINK_CLASS(QTKit, QTMovieLayer)
+
+SOFT_LINK_POINTER(QTKit, QTMovieRateDidChangeNotification, NSString *)
+
+#define QTMovieRateDidChangeNotification getQTMovieRateDidChangeNotification()
+static const NSTimeInterval tickleTimerInterval = 1.0;
+
+@interface WebVideoFullscreenWindow : NSWindow
+#ifndef BUILDING_ON_LEOPARD
+<NSAnimationDelegate>
+#endif
+{
+    SEL _controllerActionOnAnimationEnd;
+    WebWindowScaleAnimation *_fullscreenAnimation; // (retain)
+}
+- (void)animateFromRect:(NSRect)startRect toRect:(NSRect)endRect withSubAnimation:(NSAnimation *)subAnimation controllerAction:(SEL)controllerAction;
+@end
+
+@interface WebVideoFullscreenController(HUDWindowControllerDelegate) <WebVideoFullscreenHUDWindowControllerDelegate>
+- (void)requestExitFullscreenWithAnimation:(BOOL)animation;
+- (void)updateMenuAndDockForFullscreen;
+- (void)updatePowerAssertions;
+@end
+
+@interface NSWindow(IsOnActiveSpaceAdditionForTigerAndLeopard)
+- (BOOL)isOnActiveSpace;
+@end
+
+@implementation WebVideoFullscreenController
+- (id)init
+{
+    // Do not defer window creation, to make sure -windowNumber is created (needed by WebWindowScaleAnimation).
+    NSWindow *window = [[WebVideoFullscreenWindow alloc] initWithContentRect:NSZeroRect styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
+    self = [super initWithWindow:window];
+    [window release];
+    if (!self)
+        return nil;
+    [self windowDidLoad];
+    return self;
+    
+}
+- (void)dealloc
+{
+    ASSERT(!_backgroundFullscreenWindow);
+    ASSERT(!_fadeAnimation);
+    [_tickleTimer invalidate];
+    [_tickleTimer release];
+    _tickleTimer = nil;
+    [[NSNotificationCenter defaultCenter] removeObserver:self];
+    [super dealloc];
+}
+
+- (WebVideoFullscreenWindow *)fullscreenWindow
+{
+    return (WebVideoFullscreenWindow *)[super window];
+}
+
+- (void)setupVideoOverlay:(QTMovieLayer*)layer
+{
+    WebVideoFullscreenWindow *window = [self fullscreenWindow];
+#if USE(GSTREAMER)
+    if (_mediaElement && _mediaElement->platformMedia().type == WebCore::PlatformMedia::GStreamerGWorldType) {
+        WebCore::GStreamerGWorld* gstGworld = _mediaElement->platformMedia().media.gstreamerGWorld;
+        if (gstGworld->enterFullscreen())
+            [window setContentView:gstGworld->platformVideoWindow()->window()];
+    }
+#else
+    [[window contentView] setLayer:layer];
+    [[window contentView] setWantsLayer:YES];
+    if (_mediaElement && _mediaElement->platformMedia().type == WebCore::PlatformMedia::QTMovieType)
+        [layer setMovie:_mediaElement->platformMedia().media.qtMovie];
+#endif
+}
+
+- (void)windowDidLoad
+{
+    WebVideoFullscreenWindow *window = [self fullscreenWindow];
+    [window setHasShadow:YES]; // This is nicer with a shadow.
+    [window setLevel:NSPopUpMenuWindowLevel-1];
+
+    QTMovieLayer *layer = [[getQTMovieLayerClass() alloc] init];
+    [self setupVideoOverlay:layer];
+    [layer release];
+
+#if !USE(GSTREAMER)
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidResignActive:) name:NSApplicationDidResignActiveNotification object:NSApp];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(applicationDidChangeScreenParameters:) name:NSApplicationDidChangeScreenParametersNotification object:NSApp];
+#endif
+}
+
+- (WebCore::HTMLMediaElement*)mediaElement
+{
+    return _mediaElement.get();
+}
+
+- (void)setMediaElement:(WebCore::HTMLMediaElement*)mediaElement
+{
+    _mediaElement = mediaElement;
+    if ([self isWindowLoaded]) {
+        QTMovieLayer *movieLayer = (QTMovieLayer *)[[[self fullscreenWindow] contentView] layer];
+
+        ASSERT(movieLayer && [movieLayer isKindOfClass:[getQTMovieLayerClass() class]]);
+        [self setupVideoOverlay:movieLayer];
+#if !USE(GSTREAMER)
+        ASSERT([movieLayer movie]);
+        [[NSNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(rateChanged:) 
+                                                     name:QTMovieRateDidChangeNotification 
+                                                   object:[movieLayer movie]];
+#endif
+    }
+}
+
+- (id <WebVideoFullscreenControllerDelegate>)delegate
+{
+    return _delegate;
+}
+
+- (void)setDelegate:(id <WebVideoFullscreenControllerDelegate>)delegate
+{
+    _delegate = delegate;
+}
+
+- (CGFloat)clearFadeAnimation
+{
+    [_fadeAnimation stopAnimation];
+    CGFloat previousAlpha = [_fadeAnimation currentAlpha];
+    [_fadeAnimation setWindow:nil];
+    [_fadeAnimation release];
+    _fadeAnimation = nil;
+    return previousAlpha;
+}
+
+- (void)windowDidExitFullscreen
+{
+#if USE(GSTREAMER)
+    if (_mediaElement && _mediaElement->platformMedia().type == WebCore::PlatformMedia::GStreamerGWorldType)
+        _mediaElement->platformMedia().media.gstreamerGWorld->exitFullscreen();
+#endif
+    [self clearFadeAnimation];
+    [[self window] close];
+    [self setWindow:nil];
+    [self updateMenuAndDockForFullscreen];   
+    [self updatePowerAssertions];
+    [_hudController setDelegate:nil];
+    [_hudController release];
+    _hudController = nil;
+    [_backgroundFullscreenWindow close];
+    [_backgroundFullscreenWindow release];
+    _backgroundFullscreenWindow = nil;
+    
+    [self autorelease]; // Associated -retain is in -exitFullscreen.
+    _isEndingFullscreen = NO;
+}
+
+- (void)windowDidEnterFullscreen
+{
+    [self clearFadeAnimation];
+
+    ASSERT(!_hudController);
+    _hudController = [[WebVideoFullscreenHUDWindowController alloc] init];
+    [_hudController setDelegate:self];
+
+    [self updateMenuAndDockForFullscreen];
+    [self updatePowerAssertions];
+    [NSCursor setHiddenUntilMouseMoves:YES];
+    
+    // Give the HUD keyboard focus initially
+    [_hudController fadeWindowIn];
+}
+
+- (NSRect)mediaElementRect
+{
+    return _mediaElement->screenRect();
+}
+
+- (void)applicationDidResignActive:(NSNotification*)notification
+{   
+    UNUSED_PARAM(notification);
+    // Check to see if the fullscreenWindow is on the active space; this function is available
+    // on 10.6 and later, so default to YES if the function is not available:
+    NSWindow* fullscreenWindow = [self fullscreenWindow];
+    BOOL isOnActiveSpace = ([fullscreenWindow respondsToSelector:@selector(isOnActiveSpace)] ? [fullscreenWindow isOnActiveSpace] : YES);
+
+    // Replicate the QuickTime Player (X) behavior when losing active application status:
+    // Is the fullscreen screen the main screen? (Note: this covers the case where only a 
+    // single screen is available.)  Is the fullscreen screen on the current space? IFF so, 
+    // then exit fullscreen mode.    
+    if ([fullscreenWindow screen] == [[NSScreen screens] objectAtIndex:0] && isOnActiveSpace)
+         [self requestExitFullscreenWithAnimation:NO];
+}
+         
+         
+// MARK: -
+// MARK: Exposed Interface
+
+static void constrainFrameToRatioOfFrame(NSRect *frameToConstrain, const NSRect *frame)
+{
+    // Keep a constrained aspect ratio for the destination window
+    CGFloat originalRatio = frame->size.width / frame->size.height;
+    CGFloat newRatio = frameToConstrain->size.width / frameToConstrain->size.height;
+    if (newRatio > originalRatio) {
+        CGFloat newWidth = originalRatio * frameToConstrain->size.height;
+        CGFloat diff = frameToConstrain->size.width - newWidth;
+        frameToConstrain->size.width = newWidth;
+        frameToConstrain->origin.x += diff / 2;
+    } else {
+        CGFloat newHeight = frameToConstrain->size.width / originalRatio;
+        CGFloat diff = frameToConstrain->size.height - newHeight;
+        frameToConstrain->size.height = newHeight;
+        frameToConstrain->origin.y += diff / 2;
+    }    
+}
+
+static NSWindow *createBackgroundFullscreenWindow(NSRect frame, int level)
+{
+    NSWindow *window = [[NSWindow alloc] initWithContentRect:frame styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
+    [window setOpaque:YES];
+    [window setBackgroundColor:[NSColor blackColor]];
+    [window setLevel:level];
+    [window setReleasedWhenClosed:NO];
+    return window;
+}
+
+- (void)setupFadeAnimationIfNeededAndFadeIn:(BOOL)fadeIn
+{
+    CGFloat initialAlpha = fadeIn ? 0 : 1;
+    if (_fadeAnimation) {
+        // Make sure we support queuing animation if the previous one isn't over yet
+        initialAlpha = [self clearFadeAnimation];
+    }
+    if (!_forceDisableAnimation)
+        _fadeAnimation = [[WebWindowFadeAnimation alloc] initWithDuration:0.2 window:_backgroundFullscreenWindow initialAlpha:initialAlpha finalAlpha:fadeIn ? 1 : 0];
+}
+
+- (void)enterFullscreen:(NSScreen *)screen
+{
+    if (!screen)
+        screen = [NSScreen mainScreen];
+
+    NSRect frame = [self mediaElementRect];
+    NSRect endFrame = [screen frame];
+    constrainFrameToRatioOfFrame(&endFrame, &frame);
+
+    // Create a black window if needed
+    if (!_backgroundFullscreenWindow)
+        _backgroundFullscreenWindow = createBackgroundFullscreenWindow([screen frame], [[self window] level]-1);
+    else
+        [_backgroundFullscreenWindow setFrame:[screen frame] display:NO];
+
+    [self setupFadeAnimationIfNeededAndFadeIn:YES];
+    if (_forceDisableAnimation) {
+        // This will disable scale animation
+        frame = NSZeroRect;
+    }
+    [[self fullscreenWindow] animateFromRect:frame toRect:endFrame withSubAnimation:_fadeAnimation controllerAction:@selector(windowDidEnterFullscreen)];
+
+    [_backgroundFullscreenWindow orderWindow:NSWindowBelow relativeTo:[[self fullscreenWindow] windowNumber]];
+}
+
+- (void)exitFullscreen
+{
+    if (_isEndingFullscreen)
+        return;
+    _isEndingFullscreen = YES;
+    [_hudController closeWindow];
+
+    NSRect endFrame = [self mediaElementRect];
+
+    [self setupFadeAnimationIfNeededAndFadeIn:NO];
+    if (_forceDisableAnimation) {
+        // This will disable scale animation
+        endFrame = NSZeroRect;
+    }
+    
+    // We have to retain ourselves because we want to be alive for the end of the animation.
+    // If our owner releases us we could crash if this is not the case.
+    // Balanced in windowDidExitFullscreen
+    [self retain];    
+    
+    [[self fullscreenWindow] animateFromRect:[[self window] frame] toRect:endFrame withSubAnimation:_fadeAnimation controllerAction:@selector(windowDidExitFullscreen)];
+}
+
+- (void)applicationDidChangeScreenParameters:(NSNotification*)notification
+{
+    UNUSED_PARAM(notification);
+    // The user may have changed the main screen by moving the menu bar, or they may have changed
+    // the Dock's size or location, or they may have changed the fullscreen screen's dimensions.  
+    // Update our presentation parameters, and ensure that the full screen window occupies the 
+    // entire screen:
+    [self updateMenuAndDockForFullscreen];
+    [[self window] setFrame:[[[self window] screen] frame] display:YES];
+}
+
+- (void)updateMenuAndDockForFullscreen
+{
+    // NSApplicationPresentationOptions is available on > 10.6 only:
+#ifndef BUILDING_ON_LEOPARD
+    NSApplicationPresentationOptions options = NSApplicationPresentationDefault;
+    NSScreen* fullscreenScreen = [[self window] screen];
+
+    if (!_isEndingFullscreen) {
+        // Auto-hide the menu bar if the fullscreenScreen contains the menu bar:
+        // NOTE: if the fullscreenScreen contains the menu bar but not the dock, we must still 
+        // auto-hide the dock, or an exception will be thrown.
+        if ([[NSScreen screens] objectAtIndex:0] == fullscreenScreen)
+            options |= (NSApplicationPresentationAutoHideMenuBar | NSApplicationPresentationAutoHideDock);
+        // Check if the current screen contains the dock by comparing the screen's frame to its
+        // visibleFrame; if a dock is present, the visibleFrame will differ.  If the current screen
+        // contains the dock, hide it.
+        else if (!NSEqualRects([fullscreenScreen frame], [fullscreenScreen visibleFrame]))
+            options |= NSApplicationPresentationAutoHideDock;
+    }
+
+    if ([NSApp respondsToSelector:@selector(setPresentationOptions:)])
+        [NSApp setPresentationOptions:options];
+    else
+#endif
+        SetSystemUIMode(_isEndingFullscreen ? kUIModeNormal : kUIModeAllHidden, 0);
+}
+
+- (void)_disableIdleDisplaySleep
+{
+    if (_idleDisplaySleepAssertion == kIOPMNullAssertionID) 
+#if defined(BUILDING_ON_LEOPARD) // IOPMAssertionCreateWithName is not defined in the 10.5 SDK
+        IOPMAssertionCreate(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, &_idleDisplaySleepAssertion);
+#else // IOPMAssertionCreate is depreciated in > 10.5
+        IOPMAssertionCreateWithName(kIOPMAssertionTypeNoDisplaySleep, kIOPMAssertionLevelOn, CFSTR("WebKit playing a video fullscreen."), &_idleDisplaySleepAssertion);
+#endif
+}
+
+- (void)_enableIdleDisplaySleep
+{
+    if (_idleDisplaySleepAssertion != kIOPMNullAssertionID) {
+        IOPMAssertionRelease(_idleDisplaySleepAssertion);
+        _idleDisplaySleepAssertion = kIOPMNullAssertionID;
+    }
+}
+
+- (void)_disableIdleSystemSleep
+{
+    if (_idleSystemSleepAssertion == kIOPMNullAssertionID) 
+#if defined(BUILDING_ON_LEOPARD) // IOPMAssertionCreateWithName is not defined in the 10.5 SDK
+        IOPMAssertionCreate(kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, &_idleSystemSleepAssertion);
+#else // IOPMAssertionCreate is depreciated in > 10.5
+    IOPMAssertionCreateWithName(kIOPMAssertionTypeNoIdleSleep, kIOPMAssertionLevelOn, CFSTR("WebKit playing a video fullscreen."), &_idleSystemSleepAssertion);
+#endif
+}
+
+- (void)_enableIdleSystemSleep
+{
+    if (_idleSystemSleepAssertion != kIOPMNullAssertionID) {
+        IOPMAssertionRelease(_idleSystemSleepAssertion);
+        _idleSystemSleepAssertion = kIOPMNullAssertionID;
+    }
+}
+
+- (void)_enableTickleTimer
+{
+    [_tickleTimer invalidate];
+    [_tickleTimer release];
+    _tickleTimer = [[NSTimer scheduledTimerWithTimeInterval:tickleTimerInterval target:self selector:@selector(_tickleTimerFired) userInfo:nil repeats:YES] retain];
+}
+
+- (void)_disableTickleTimer
+{
+    [_tickleTimer invalidate];
+    [_tickleTimer release];
+    _tickleTimer = nil;
+}
+
+- (void)_tickleTimerFired
+{
+    UpdateSystemActivity(OverallAct);
+}
+
+- (void)updatePowerAssertions
+{
+    float rate = 0;
+    if (_mediaElement && _mediaElement->platformMedia().type == WebCore::PlatformMedia::QTMovieType)
+        rate = [_mediaElement->platformMedia().media.qtMovie rate];
+    
+    if (rate && !_isEndingFullscreen) {
+        [self _disableIdleSystemSleep];
+        [self _disableIdleDisplaySleep];
+        [self _enableTickleTimer];
+    } else {
+        [self _enableIdleSystemSleep];
+        [self _enableIdleDisplaySleep];
+        [self _disableTickleTimer];
+    }
+}
+
+// MARK: -
+// MARK: Window callback
+
+- (void)_requestExit
+{
+    if (_mediaElement)
+        _mediaElement->exitFullscreen();
+    _forceDisableAnimation = NO;
+}
+
+- (void)requestExitFullscreenWithAnimation:(BOOL)animation
+{
+    if (_isEndingFullscreen)
+        return;
+
+    _forceDisableAnimation = !animation;
+    [self performSelector:@selector(_requestExit) withObject:nil afterDelay:0];
+
+}
+
+- (void)requestExitFullscreen
+{
+    [self requestExitFullscreenWithAnimation:YES];
+}
+
+- (void)fadeHUDIn
+{
+    [_hudController fadeWindowIn];
+}
+
+// MARK: -
+// MARK: QTMovie callbacks
+
+- (void)rateChanged:(NSNotification *)unusedNotification
+{
+    UNUSED_PARAM(unusedNotification);
+    [_hudController updateRate];
+    [self updatePowerAssertions];
+}
+
+@end
+
+@implementation WebVideoFullscreenWindow
+
+- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag
+{
+    UNUSED_PARAM(aStyle);
+    self = [super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask backing:bufferingType defer:flag];
+    if (!self)
+        return nil;
+    [self setOpaque:NO];
+    [self setBackgroundColor:[NSColor clearColor]];
+    [self setIgnoresMouseEvents:NO];
+    [self setAcceptsMouseMovedEvents:YES];
+    return self;
+}
+
+- (void)dealloc
+{
+    ASSERT(!_fullscreenAnimation);
+    [super dealloc];
+}
+
+- (BOOL)resignFirstResponder
+{
+    return NO;
+}
+
+- (BOOL)canBecomeKeyWindow
+{
+    return NO;
+}
+
+- (void)mouseDown:(NSEvent *)theEvent
+{
+    UNUSED_PARAM(theEvent);
+}
+
+- (void)cancelOperation:(id)sender
+{
+    UNUSED_PARAM(sender);
+    [[self windowController] requestExitFullscreen];
+}
+
+- (void)animatedResizeDidEnd
+{
+    // Call our windowController.
+    if (_controllerActionOnAnimationEnd)
+        [[self windowController] performSelector:_controllerActionOnAnimationEnd];
+    _controllerActionOnAnimationEnd = NULL;
+}
+
+//
+// This function will animate a change of frame rectangle
+// We support queuing animation, that means that we'll correctly
+// interrupt the running animation, and queue the next one.
+//
+- (void)animateFromRect:(NSRect)startRect toRect:(NSRect)endRect withSubAnimation:(NSAnimation *)subAnimation controllerAction:(SEL)controllerAction
+{
+    _controllerActionOnAnimationEnd = controllerAction;
+
+    BOOL wasAnimating = NO;
+    if (_fullscreenAnimation) {
+        wasAnimating = YES;
+
+        // Interrupt any running animation.
+        [_fullscreenAnimation stopAnimation];
+
+        // Save the current rect to ensure a smooth transition.
+        startRect = [_fullscreenAnimation currentFrame];
+        [_fullscreenAnimation release];
+        _fullscreenAnimation = nil;
+    }
+    
+    if (NSIsEmptyRect(startRect) || NSIsEmptyRect(endRect)) {
+        // Fakely end the subanimation.
+        [subAnimation setCurrentProgress:1];
+        // And remove the weak link to the window.
+        [subAnimation stopAnimation];
+
+        [self setFrame:endRect display:NO];
+        [self makeKeyAndOrderFront:self];
+        [self animatedResizeDidEnd];
+        return;
+    }
+
+    if (!wasAnimating) {
+        // We'll downscale the window during the animation based on the higher resolution rect
+        BOOL higherResolutionIsEndRect = startRect.size.width < endRect.size.width && startRect.size.height < endRect.size.height;
+        [self setFrame:higherResolutionIsEndRect ? endRect : startRect display:NO];        
+    }
+    
+    ASSERT(!_fullscreenAnimation);
+    _fullscreenAnimation = [[WebWindowScaleAnimation alloc] initWithHintedDuration:0.2 window:self initalFrame:startRect finalFrame:endRect];
+    [_fullscreenAnimation setSubAnimation:subAnimation];
+    [_fullscreenAnimation setDelegate:self];
+    
+    // Make sure the animation has scaled the window before showing it.
+    [_fullscreenAnimation setCurrentProgress:0];
+    [self makeKeyAndOrderFront:self];
+
+    [_fullscreenAnimation startAnimation];
+}
+
+- (void)animationDidEnd:(NSAnimation *)animation
+{
+    if (![NSThread isMainThread]) {
+        [self performSelectorOnMainThread:@selector(animationDidEnd:) withObject:animation waitUntilDone:NO];
+        return;
+    }
+    if (animation != _fullscreenAnimation)
+        return;
+
+    // The animation is not really over and was interrupted
+    // Don't send completion events.
+    if ([animation currentProgress] < 1.0)
+        return;
+
+    // Ensure that animation (and subanimation) don't keep
+    // the weak reference to the window ivar that may be destroyed from
+    // now on.
+    [_fullscreenAnimation setWindow:nil];
+
+    [_fullscreenAnimation autorelease];
+    _fullscreenAnimation = nil;
+
+    [self animatedResizeDidEnd];
+}
+
+- (void)mouseMoved:(NSEvent *)theEvent
+{
+    UNUSED_PARAM(theEvent);
+    [[self windowController] fadeHUDIn];
+}
+
+@end
+
+#endif /* ENABLE(VIDEO) */
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.h b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.h
new file mode 100644
index 0000000..92bf776
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.h
@@ -0,0 +1,66 @@
+/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#if ENABLE(VIDEO)
+
+#import <Cocoa/Cocoa.h>
+
+namespace WebCore {
+    class HTMLMediaElement;
+}
+
+@protocol WebVideoFullscreenHUDWindowControllerDelegate;
+
+@interface WebVideoFullscreenHUDWindowController : NSWindowController
+{
+    id <WebVideoFullscreenHUDWindowControllerDelegate> _delegate;
+    NSTimer *_timelineUpdateTimer;
+    NSTrackingArea *_area;
+    BOOL _mouseIsInHUD;
+    BOOL _isEndingFullscreen;
+    BOOL _isScrubbing;
+
+    NSControl *_timeline;
+    NSTextField *_remainingTimeText;
+    NSTextField *_elapsedTimeText;
+    NSControl *_volumeSlider;
+    NSButton *_playButton;
+}
+
+- (id <WebVideoFullscreenHUDWindowControllerDelegate>)delegate;
+- (void)setDelegate:(id <WebVideoFullscreenHUDWindowControllerDelegate>)delegate;
+- (void)fadeWindowIn;
+- (void)fadeWindowOut;
+- (void)closeWindow;
+- (void)updateRate;
+
+@end
+
+@protocol WebVideoFullscreenHUDWindowControllerDelegate <NSObject>
+- (void)requestExitFullscreen;
+- (WebCore::HTMLMediaElement*)mediaElement;
+@end
+
+#endif
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm
new file mode 100644
index 0000000..1637c1c
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebVideoFullscreenHUDWindowController.mm
@@ -0,0 +1,679 @@
+/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+
+#if ENABLE(VIDEO)
+
+#import "WebVideoFullscreenHUDWindowController.h"
+
+#import "FloatConversion.h"
+#import <WebCoreSystemInterface.h>
+#import <WebCore/HTMLMediaElement.h>
+#import <wtf/RetainPtr.h>
+#import <wtf/UnusedParam.h>
+
+using namespace WebCore;
+using namespace std;
+
+static inline CGFloat webkit_CGFloor(CGFloat value)
+{
+    if (sizeof(value) == sizeof(float))
+        return floorf(value);
+    return floor(value);
+}
+
+#define HAVE_MEDIA_CONTROL (!defined(BUILDING_ON_LEOPARD))
+
+@interface WebVideoFullscreenHUDWindowController (Private)
+#if !defined(BUILDING_ON_LEOPARD)
+<NSWindowDelegate>
+#endif
+
+- (void)updateTime;
+- (void)timelinePositionChanged:(id)sender;
+- (float)currentTime;
+- (void)setCurrentTime:(float)currentTime;
+- (double)duration;
+
+- (void)volumeChanged:(id)sender;
+- (float)maxVolume;
+- (float)volume;
+- (void)setVolume:(float)volume;
+- (void)decrementVolume;
+- (void)incrementVolume;
+
+- (void)updatePlayButton;
+- (void)togglePlaying:(id)sender;
+- (BOOL)playing;
+- (void)setPlaying:(BOOL)playing;
+
+- (void)rewind:(id)sender;
+- (void)fastForward:(id)sender;
+
+- (NSString *)remainingTimeText;
+- (NSString *)elapsedTimeText;
+
+- (void)exitFullscreen:(id)sender;
+@end
+
+@interface WebVideoFullscreenHUDWindow : NSWindow
+@end
+
+@implementation WebVideoFullscreenHUDWindow
+
+- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)aStyle backing:(NSBackingStoreType)bufferingType defer:(BOOL)flag
+{
+    UNUSED_PARAM(aStyle);
+    self = [super initWithContentRect:contentRect styleMask:NSBorderlessWindowMask backing:bufferingType defer:flag];
+    if (!self)
+        return nil;
+
+    [self setOpaque:NO];
+    [self setBackgroundColor:[NSColor clearColor]];
+    [self setLevel:NSPopUpMenuWindowLevel];
+    [self setAcceptsMouseMovedEvents:YES];
+    [self setIgnoresMouseEvents:NO];
+    [self setMovableByWindowBackground:YES];
+
+    return self;
+}
+
+- (BOOL)canBecomeKeyWindow
+{
+    return YES;
+}
+
+- (void)cancelOperation:(id)sender
+{
+    UNUSED_PARAM(sender);
+    [[self windowController] exitFullscreen:self];
+}
+
+- (void)center
+{
+    NSRect hudFrame = [self frame];
+    NSRect screenFrame = [[NSScreen mainScreen] frame];
+    [self setFrameTopLeftPoint:NSMakePoint(screenFrame.origin.x + (screenFrame.size.width - hudFrame.size.width) / 2,
+                                           screenFrame.origin.y + (screenFrame.size.height - hudFrame.size.height) / 6)];
+}
+
+- (void)keyDown:(NSEvent *)event
+{
+    [super keyDown:event];
+    [[self windowController] fadeWindowIn];
+}
+
+- (BOOL)resignFirstResponder
+{
+    return NO;
+}
+
+- (BOOL)performKeyEquivalent:(NSEvent *)event
+{
+    // Block all command key events while the fullscreen window is up.
+    if ([event type] != NSKeyDown)
+        return NO;
+    
+    if (!([event modifierFlags] & NSCommandKeyMask))
+        return NO;
+    
+    return YES;
+}
+
+@end
+
+static const CGFloat windowHeight = 59;
+static const CGFloat windowWidth = 438;
+
+static const NSTimeInterval HUDWindowFadeOutDelay = 3;
+
+@implementation WebVideoFullscreenHUDWindowController
+
+- (id)init
+{
+    NSWindow *window = [[WebVideoFullscreenHUDWindow alloc] initWithContentRect:NSMakeRect(0, 0, windowWidth, windowHeight)
+                            styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
+    self = [super initWithWindow:window];
+    [window setDelegate:self];
+    [window release];
+    if (!self)
+        return nil;
+    [self windowDidLoad];
+    return self;
+}
+
+- (void)dealloc
+{
+    ASSERT(!_timelineUpdateTimer);
+    ASSERT(!_area);
+    ASSERT(!_isScrubbing);
+    [_timeline release];
+    [_remainingTimeText release];
+    [_elapsedTimeText release];
+    [_volumeSlider release];
+    [_playButton release];
+    [super dealloc];
+}
+
+- (void)setArea:(NSTrackingArea *)area
+{
+    if (area == _area)
+        return;
+    [_area release];
+    _area = [area retain];
+}
+
+- (void)keyDown:(NSEvent *)event
+{
+    NSString *charactersIgnoringModifiers = [event charactersIgnoringModifiers];
+    if ([charactersIgnoringModifiers length] == 1) {
+        switch ([charactersIgnoringModifiers characterAtIndex:0]) {
+            case ' ':
+                [self togglePlaying:nil];
+                return;
+            case NSUpArrowFunctionKey:
+                if ([event modifierFlags] & NSAlternateKeyMask)
+                    [self setVolume:[self maxVolume]];
+                else
+                    [self incrementVolume];
+                return;
+            case NSDownArrowFunctionKey:
+                if ([event modifierFlags] & NSAlternateKeyMask)
+                    [self setVolume:0];
+                else
+                    [self decrementVolume];
+                return;
+            default:
+                break;
+        }
+    }
+
+    [super keyDown:event];
+}
+
+- (id <WebVideoFullscreenHUDWindowControllerDelegate>)delegate
+{
+    return _delegate;
+}
+
+- (void)setDelegate:(id <WebVideoFullscreenHUDWindowControllerDelegate>)delegate
+{
+    _delegate = delegate;
+}
+
+- (void)scheduleTimeUpdate
+{
+    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(unscheduleTimeUpdate) object:self];
+
+    // First, update right away, then schedule future update
+    [self updateTime];
+    [self updatePlayButton];
+
+    [_timelineUpdateTimer invalidate];
+    [_timelineUpdateTimer release];
+
+    // Note that this creates a retain cycle between the window and us.
+    _timelineUpdateTimer = [[NSTimer timerWithTimeInterval:0.25 target:self selector:@selector(updateTime) userInfo:nil repeats:YES] retain];
+    [[NSRunLoop currentRunLoop] addTimer:_timelineUpdateTimer forMode:NSRunLoopCommonModes];
+}
+
+- (void)unscheduleTimeUpdate
+{
+    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(unscheduleTimeUpdate) object:nil];
+
+    [_timelineUpdateTimer invalidate];
+    [_timelineUpdateTimer release];
+    _timelineUpdateTimer = nil;
+}
+
+- (void)fadeWindowIn
+{
+    NSWindow *window = [self window];
+    if (![window isVisible])
+        [window setAlphaValue:0];
+
+    [window makeKeyAndOrderFront:self];
+    [[window animator] setAlphaValue:1];
+    [self scheduleTimeUpdate];
+
+    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fadeWindowOut) object:nil];
+    if (!_mouseIsInHUD && [self playing])   // Don't fade out when paused.
+        [self performSelector:@selector(fadeWindowOut) withObject:nil afterDelay:HUDWindowFadeOutDelay];
+}
+
+- (void)fadeWindowOut
+{
+    [NSCursor setHiddenUntilMouseMoves:YES];
+    [[[self window] animator] setAlphaValue:0];
+    [self performSelector:@selector(unscheduleTimeUpdate) withObject:nil afterDelay:1];
+}
+
+- (void)closeWindow
+{
+    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fadeWindowOut) object:nil];
+    [self unscheduleTimeUpdate];
+    NSWindow *window = [self window];
+    [[window contentView] removeTrackingArea:_area];
+    [self setArea:nil];
+    [window close];
+    [window setDelegate:nil];
+    [self setWindow:nil];
+}
+
+#ifndef HAVE_MEDIA_CONTROL
+// FIXME: This code is never compiled, because HAVE_MEDIA_CONTROL is always defined to something, even on Leopard.
+// FIXME: Values in this enum have a different order than ones in WKMediaUIControlType.
+enum {
+    WKMediaUIControlPlayPauseButton,
+    WKMediaUIControlRewindButton,
+    WKMediaUIControlFastForwardButton,
+    WKMediaUIControlExitFullscreenButton,
+    WKMediaUIControlVolumeDownButton,
+    WKMediaUIControlSlider,
+    WKMediaUIControlVolumeUpButton,
+    WKMediaUIControlTimeline
+};
+#endif
+
+static NSControl *createControlWithMediaUIControlType(int controlType, NSRect frame)
+{
+#ifdef HAVE_MEDIA_CONTROL
+    NSControl *control = wkCreateMediaUIControl(controlType);
+    [control setFrame:frame];
+    return control;
+#else
+    // FIXME: This code is never compiled, because HAVE_MEDIA_CONTROL is always defined to something, even on Leopard.
+    if (controlType == wkMediaUIControlSlider)
+        return [[NSSlider alloc] initWithFrame:frame];
+    return [[NSControl alloc] initWithFrame:frame];
+#endif
+}
+
+static NSTextField *createTimeTextField(NSRect frame)
+{
+    NSTextField *textField = [[NSTextField alloc] initWithFrame:frame];
+    [textField setTextColor:[NSColor whiteColor]];
+    [textField setBordered:NO];
+    [textField setFont:[NSFont boldSystemFontOfSize:10]];
+    [textField setDrawsBackground:NO];
+    [textField setBezeled:NO];
+    [textField setEditable:NO];
+    [textField setSelectable:NO];
+    return textField;
+}
+
+- (void)windowDidLoad
+{
+    static const CGFloat horizontalMargin = 10;
+    static const CGFloat playButtonWidth = 41;
+    static const CGFloat playButtonHeight = 35;
+    static const CGFloat playButtonTopMargin = 4;
+    static const CGFloat volumeSliderWidth = 50;
+    static const CGFloat volumeSliderHeight = 13;
+    static const CGFloat volumeButtonWidth = 18;
+    static const CGFloat volumeButtonHeight = 16;
+    static const CGFloat volumeUpButtonLeftMargin = 4;
+    static const CGFloat volumeControlsTopMargin = 13;
+    static const CGFloat exitFullscreenButtonWidth = 25;
+    static const CGFloat exitFullscreenButtonHeight = 21;
+    static const CGFloat exitFullscreenButtonTopMargin = 11;
+    static const CGFloat timelineWidth = 315;
+    static const CGFloat timelineHeight = 14;
+    static const CGFloat timelineBottomMargin = 7;
+    static const CGFloat timeTextFieldWidth = 54;
+    static const CGFloat timeTextFieldHeight = 13;
+    static const CGFloat timeTextFieldHorizontalMargin = 7;
+
+    NSWindow *window = [self window];
+    ASSERT(window);
+
+#ifdef HAVE_MEDIA_CONTROL
+    NSView *background = wkCreateMediaUIBackgroundView();
+#else
+    // FIXME: This code is never compiled, because HAVE_MEDIA_CONTROL is always defined to something, even on Leopard.
+    NSView *background = [[NSView alloc] init];
+#endif
+    [window setContentView:background];
+    _area = [[NSTrackingArea alloc] initWithRect:[background bounds] options:NSTrackingMouseEnteredAndExited | NSTrackingActiveAlways owner:self userInfo:nil];
+    [background addTrackingArea:_area];
+    [background release];    
+
+    NSView *contentView = [window contentView];
+
+    CGFloat center = webkit_CGFloor((windowWidth - playButtonWidth) / 2);
+    _playButton = (NSButton *)createControlWithMediaUIControlType(wkMediaUIControlPlayPauseButton, NSMakeRect(center, windowHeight - playButtonTopMargin - playButtonHeight, playButtonWidth, playButtonHeight));
+    ASSERT([_playButton isKindOfClass:[NSButton class]]);
+    [_playButton setTarget:self];
+    [_playButton setAction:@selector(togglePlaying:)];
+    [contentView addSubview:_playButton];
+
+    CGFloat closeToRight = windowWidth - horizontalMargin - exitFullscreenButtonWidth;
+    NSControl *exitFullscreenButton = createControlWithMediaUIControlType(wkMediaUIControlExitFullscreenButton, NSMakeRect(closeToRight, windowHeight - exitFullscreenButtonTopMargin - exitFullscreenButtonHeight, exitFullscreenButtonWidth, exitFullscreenButtonHeight));
+    [exitFullscreenButton setAction:@selector(exitFullscreen:)];
+    [exitFullscreenButton setTarget:self];
+    [contentView addSubview:exitFullscreenButton];
+    [exitFullscreenButton release];
+    
+    CGFloat volumeControlsBottom = windowHeight - volumeControlsTopMargin - volumeButtonHeight;
+    CGFloat left = horizontalMargin;
+    NSControl *volumeDownButton = createControlWithMediaUIControlType(wkMediaUIControlVolumeDownButton, NSMakeRect(left, volumeControlsBottom, volumeButtonWidth, volumeButtonHeight));
+    [contentView addSubview:volumeDownButton];
+    [volumeDownButton setTarget:self];
+    [volumeDownButton setAction:@selector(setVolumeToZero:)];
+    [volumeDownButton release];
+
+    left += volumeButtonWidth;
+    _volumeSlider = createControlWithMediaUIControlType(wkMediaUIControlSlider, NSMakeRect(left, volumeControlsBottom + webkit_CGFloor((volumeButtonHeight - volumeSliderHeight) / 2), volumeSliderWidth, volumeSliderHeight));
+    [_volumeSlider setValue:[NSNumber numberWithDouble:[self maxVolume]] forKey:@"maxValue"];
+    [_volumeSlider setTarget:self];
+    [_volumeSlider setAction:@selector(volumeChanged:)];
+    [contentView addSubview:_volumeSlider];
+
+    left += volumeSliderWidth + volumeUpButtonLeftMargin;
+    NSControl *volumeUpButton = createControlWithMediaUIControlType(wkMediaUIControlVolumeUpButton, NSMakeRect(left, volumeControlsBottom, volumeButtonWidth, volumeButtonHeight));
+    [volumeUpButton setTarget:self];
+    [volumeUpButton setAction:@selector(setVolumeToMaximum:)];
+    [contentView addSubview:volumeUpButton];
+    [volumeUpButton release];
+
+#ifdef HAVE_MEDIA_CONTROL
+    _timeline = wkCreateMediaUIControl(wkMediaUIControlTimeline);
+#else
+    // FIXME: This code is never compiled, because HAVE_MEDIA_CONTROL is always defined to something, even on Leopard.
+    _timeline = [[NSSlider alloc] init];
+#endif
+    [_timeline setTarget:self];
+    [_timeline setAction:@selector(timelinePositionChanged:)];
+    [_timeline setFrame:NSMakeRect(webkit_CGFloor((windowWidth - timelineWidth) / 2), timelineBottomMargin, timelineWidth, timelineHeight)];
+    [contentView addSubview:_timeline];
+
+    _elapsedTimeText = createTimeTextField(NSMakeRect(timeTextFieldHorizontalMargin, timelineBottomMargin, timeTextFieldWidth, timeTextFieldHeight));
+    [_elapsedTimeText setAlignment:NSLeftTextAlignment];
+    [contentView addSubview:_elapsedTimeText];
+
+    _remainingTimeText = createTimeTextField(NSMakeRect(windowWidth - timeTextFieldHorizontalMargin - timeTextFieldWidth, timelineBottomMargin, timeTextFieldWidth, timeTextFieldHeight));
+    [_remainingTimeText setAlignment:NSRightTextAlignment];
+    [contentView addSubview:_remainingTimeText];
+
+    [window recalculateKeyViewLoop];
+    [window setInitialFirstResponder:_playButton];
+    [window center];
+}
+
+- (void)updateVolume
+{
+    [_volumeSlider setFloatValue:[self volume]];
+}
+
+- (void)updateTime
+{
+    [self updateVolume];
+
+    [_timeline setFloatValue:[self currentTime]];
+    [_timeline setValue:[NSNumber numberWithDouble:[self duration]] forKey:@"maxValue"];
+
+    [_remainingTimeText setStringValue:[self remainingTimeText]];
+    [_elapsedTimeText setStringValue:[self elapsedTimeText]];
+}
+
+- (void)endScrubbing
+{
+    ASSERT(_isScrubbing);
+    _isScrubbing = NO;
+    if (HTMLMediaElement* mediaElement = [_delegate mediaElement])
+        mediaElement->endScrubbing();
+}
+
+- (void)timelinePositionChanged:(id)sender
+{
+    UNUSED_PARAM(sender);
+    [self setCurrentTime:[_timeline floatValue]];
+    if (!_isScrubbing) {
+        _isScrubbing = YES;
+        if (HTMLMediaElement* mediaElement = [_delegate mediaElement])
+            mediaElement->beginScrubbing();
+        static NSArray *endScrubbingModes = [[NSArray alloc] initWithObjects:NSDefaultRunLoopMode, NSModalPanelRunLoopMode, nil];
+        // Schedule -endScrubbing for when leaving mouse tracking mode.
+        [[NSRunLoop currentRunLoop] performSelector:@selector(endScrubbing) target:self argument:nil order:0 modes:endScrubbingModes];
+    }
+}
+
+- (float)currentTime
+{
+    return [_delegate mediaElement] ? [_delegate mediaElement]->currentTime() : 0;
+}
+
+- (void)setCurrentTime:(float)currentTime
+{
+    if (![_delegate mediaElement])
+        return;
+    WebCore::ExceptionCode e;
+    [_delegate mediaElement]->setCurrentTime(currentTime, e);
+    [self updateTime];
+}
+
+- (double)duration
+{
+    return [_delegate mediaElement] ? [_delegate mediaElement]->duration() : 0;
+}
+
+- (float)maxVolume
+{
+    // Set the volume slider resolution
+    return 100;
+}
+
+- (void)volumeChanged:(id)sender
+{
+    UNUSED_PARAM(sender);
+    [self setVolume:[_volumeSlider floatValue]];
+}
+
+- (void)setVolumeToZero:(id)sender
+{
+    UNUSED_PARAM(sender);
+    [self setVolume:0];
+}
+
+- (void)setVolumeToMaximum:(id)sender
+{
+    UNUSED_PARAM(sender);
+    [self setVolume:[self maxVolume]];
+}
+
+- (void)decrementVolume
+{
+    if (![_delegate mediaElement])
+        return;
+
+    float volume = [self volume] - 10;
+    [self setVolume:MAX(volume, 0)];
+}
+
+- (void)incrementVolume
+{
+    if (![_delegate mediaElement])
+        return;
+
+    float volume = [self volume] + 10;
+    [self setVolume:min(volume, [self maxVolume])];
+}
+
+- (float)volume
+{
+    return [_delegate mediaElement] ? [_delegate mediaElement]->volume() * [self maxVolume] : 0;
+}
+
+- (void)setVolume:(float)volume
+{
+    if (![_delegate mediaElement])
+        return;
+    WebCore::ExceptionCode e;
+    if ([_delegate mediaElement]->muted())
+        [_delegate mediaElement]->setMuted(false);
+    [_delegate mediaElement]->setVolume(volume / [self maxVolume], e);
+    [self updateVolume];
+}
+
+- (void)updatePlayButton
+{
+    [_playButton setIntValue:[self playing]];
+}
+
+- (void)updateRate
+{
+    BOOL playing = [self playing];
+
+    // Keep the HUD visible when paused.
+    if (!playing)
+        [self fadeWindowIn];
+    else if (!_mouseIsInHUD) {
+        [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(fadeWindowOut) object:nil];
+        [self performSelector:@selector(fadeWindowOut) withObject:nil afterDelay:HUDWindowFadeOutDelay];
+    }
+    [self updatePlayButton];
+}
+
+- (void)togglePlaying:(id)sender
+{
+    UNUSED_PARAM(sender);
+    [self setPlaying:![self playing]];
+}
+
+- (BOOL)playing
+{
+    HTMLMediaElement* mediaElement = [_delegate mediaElement];
+    if (!mediaElement)
+        return NO;
+
+    return !mediaElement->canPlay();
+}
+
+- (void)setPlaying:(BOOL)playing
+{
+    HTMLMediaElement* mediaElement = [_delegate mediaElement];
+
+    if (!mediaElement)
+        return;
+
+    if (playing)
+        mediaElement->play(mediaElement->processingUserGesture());
+    else
+        mediaElement->pause(mediaElement->processingUserGesture());
+}
+
+static NSString *timeToString(double time)
+{
+    ASSERT_ARG(time, time >= 0);
+
+    if (!isfinite(time))
+        time = 0;
+
+    int seconds = narrowPrecisionToFloat(abs(time));
+    int hours = seconds / (60 * 60);
+    int minutes = (seconds / 60) % 60;
+    seconds %= 60;
+
+    if (hours)
+        return [NSString stringWithFormat:@"%d:%02d:%02d", hours, minutes, seconds];
+
+    return [NSString stringWithFormat:@"%02d:%02d", minutes, seconds];    
+}
+
+- (NSString *)remainingTimeText
+{
+    HTMLMediaElement* mediaElement = [_delegate mediaElement];
+    if (!mediaElement)
+        return @"";
+
+    return [@"-" stringByAppendingString:timeToString(mediaElement->duration() - mediaElement->currentTime())];
+}
+
+- (NSString *)elapsedTimeText
+{
+    if (![_delegate mediaElement])
+        return @"";
+
+    return timeToString([_delegate mediaElement]->currentTime());
+}
+
+// MARK: NSResponder
+
+- (void)mouseEntered:(NSEvent *)theEvent
+{
+    UNUSED_PARAM(theEvent);
+    // Make sure the HUD won't be hidden from now
+    _mouseIsInHUD = YES;
+    [self fadeWindowIn];
+}
+
+- (void)mouseExited:(NSEvent *)theEvent
+{
+    UNUSED_PARAM(theEvent);
+    _mouseIsInHUD = NO;
+    [self fadeWindowIn];
+}
+
+- (void)rewind:(id)sender
+{
+    UNUSED_PARAM(sender);
+    if (![_delegate mediaElement])
+        return;
+    [_delegate mediaElement]->rewind(30);
+}
+
+- (void)fastForward:(id)sender
+{
+    UNUSED_PARAM(sender);
+    if (![_delegate mediaElement])
+        return;
+}
+
+- (void)exitFullscreen:(id)sender
+{
+    UNUSED_PARAM(sender);
+    if (_isEndingFullscreen)
+        return;
+    _isEndingFullscreen = YES;
+    [_delegate requestExitFullscreen]; 
+}
+
+// MARK: NSWindowDelegate
+
+- (void)windowDidExpose:(NSNotification *)notification
+{
+    UNUSED_PARAM(notification);
+    [self scheduleTimeUpdate];
+}
+
+- (void)windowDidClose:(NSNotification *)notification
+{
+    UNUSED_PARAM(notification);
+    [self unscheduleTimeUpdate];
+}
+
+@end
+
+#endif
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebWindowAnimation.h b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebWindowAnimation.h
new file mode 100644
index 0000000..ecf975b
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebWindowAnimation.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#import <Cocoa/Cocoa.h>
+
+@interface WebWindowScaleAnimation : NSAnimation {
+@private
+    NSRect _initialFrame, _finalFrame, _realFrame;
+    NSWindow *_window; // (assign)
+    NSAnimation *_subAnimation; // (retain)
+    NSTimeInterval _hintedDuration;
+}
+- (id)initWithHintedDuration:(NSTimeInterval)duration window:(NSWindow *)window initalFrame:(NSRect)initialFrame finalFrame:(NSRect)finalFrame;
+
+- (void)setSubAnimation:(NSAnimation *)animation;
+
+- (NSRect)currentFrame;
+
+// Be sure to call setWindow:nil to clear the weak link _window when appropriate
+- (void)setWindow:(NSWindow *)window;
+@end
+
+
+@interface WebWindowFadeAnimation : NSAnimation {
+@private
+    CGFloat _initialAlpha, _finalAlpha;
+    NSWindow *_window; // (assign)
+    BOOL _isStopped;
+    
+}
+- (id)initWithDuration:(NSTimeInterval)duration window:(NSWindow *)window initialAlpha:(CGFloat)initialAlpha finalAlpha:(CGFloat)finalAlpha;
+
+- (CGFloat)currentAlpha;
+
+// Be sure to call setWindow:nil to clear the weak link _window when appropriate
+- (void)setWindow:(NSWindow *)window;
+@end
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/mac/WebWindowAnimation.mm b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebWindowAnimation.mm
new file mode 100644
index 0000000..1b11894
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/platform/mac/WebWindowAnimation.mm
@@ -0,0 +1,234 @@
+/*
+ * Copyright (C) 2009 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
+ */
+
+#import "config.h"
+
+#import "WebWindowAnimation.h"
+
+#import "FloatConversion.h"
+#import "WebCoreSystemInterface.h"
+#import <wtf/Assertions.h>
+#import <wtf/UnusedParam.h>
+
+using namespace WebCore;
+
+static const CGFloat slowMotionFactor = 10;
+
+static NSTimeInterval WebWindowAnimationDurationFromDuration(NSTimeInterval duration)
+{
+    return ([[NSApp currentEvent] modifierFlags] & NSShiftKeyMask) ? duration * slowMotionFactor : duration;        
+}
+
+static NSRect scaledRect(NSRect _initialFrame, NSRect _finalFrame, CGFloat factor)
+{
+    NSRect currentRect = _initialFrame;
+    currentRect.origin.x += (NSMinX(_finalFrame) - NSMinX(_initialFrame)) * factor;
+    currentRect.origin.y += (NSMinY(_finalFrame) - NSMinY(_initialFrame)) * factor;
+    currentRect.size.width += (NSWidth(_finalFrame) - NSWidth(_initialFrame)) * factor;
+    currentRect.size.height += (NSHeight(_finalFrame) - NSHeight(_initialFrame)) * factor;
+    return currentRect;
+}
+
+static CGFloat squaredDistance(NSPoint point1, NSPoint point2)
+{
+    CGFloat deltaX = point1.x - point2.x;
+    CGFloat deltaY = point1.y - point2.y;
+    return deltaX * deltaX + deltaY * deltaY;
+}
+
+@implementation WebWindowScaleAnimation
+
+- (id)init
+{
+    self = [super init];
+    if (!self)
+        return nil;
+    [self setAnimationBlockingMode:NSAnimationNonblockingThreaded];
+    [self setFrameRate:60];
+    return self;
+}
+
+- (id)initWithHintedDuration:(NSTimeInterval)duration window:(NSWindow *)window initalFrame:(NSRect)initialFrame finalFrame:(NSRect)finalFrame
+{
+    self = [self init];
+    if (!self)
+        return nil;
+    _hintedDuration = duration;
+    _window = window;
+    _initialFrame = initialFrame;
+    _finalFrame = finalFrame;
+    _realFrame = [window frame];
+    return self;
+}
+
+- (void) dealloc
+{
+    [_subAnimation release];
+    [super dealloc];
+}
+
+- (void)setDuration:(NSTimeInterval)duration
+{
+    [super setDuration:WebWindowAnimationDurationFromDuration(duration)];
+}
+
+- (void)setWindow:(NSWindow *)window
+{
+    _window = window;
+}
+
+- (float)currentValue
+{
+    return narrowPrecisionToFloat(0.5 - 0.5 * cos(M_PI * (1 - [self currentProgress])));
+}
+
+- (NSRect)currentFrame
+{
+    return scaledRect(_finalFrame, _initialFrame, [self currentValue]);
+}
+
+- (void)setCurrentProgress:(NSAnimationProgress)progress
+{
+    if (!_window)
+        return;
+
+    [super setCurrentProgress:progress];
+
+    NSRect currentRect = [self currentFrame];
+    wkWindowSetScaledFrame(_window, currentRect, _realFrame);
+    [_subAnimation setCurrentProgress:progress];
+}
+
+- (void)setSubAnimation:(NSAnimation *)animation
+{
+    id oldAnimation = _subAnimation;
+    _subAnimation = [animation retain];
+    [oldAnimation release];
+}
+
+- (NSTimeInterval)additionalDurationNeededToReachFinalFrame
+{
+    static const CGFloat maxAdditionalDuration = 1;
+    static const CGFloat speedFactor = 0.0001f;
+    
+    CGFloat maxDist = squaredDistance(_initialFrame.origin, _finalFrame.origin);
+    CGFloat dist;
+    
+    dist = squaredDistance(NSMakePoint(NSMaxX(_initialFrame), NSMinY(_initialFrame)), NSMakePoint(NSMaxX(_finalFrame), NSMinY(_finalFrame)));
+    if (dist > maxDist)
+        maxDist = dist;
+    
+    dist = squaredDistance(NSMakePoint(NSMaxX(_initialFrame), NSMaxY(_initialFrame)), NSMakePoint(NSMaxX(_finalFrame), NSMaxY(_finalFrame)));
+    if (dist > maxDist)
+        maxDist = dist;
+    
+    dist = squaredDistance(NSMakePoint(NSMinX(_initialFrame), NSMinY(_initialFrame)), NSMakePoint(NSMinX(_finalFrame), NSMinY(_finalFrame)));
+    if (dist > maxDist)
+        maxDist = dist;
+    
+    return MIN(sqrt(maxDist) * speedFactor, maxAdditionalDuration);    
+}
+
+- (void)startAnimation
+{
+    // Compute extra time
+    if (_hintedDuration)
+        [self setDuration:_hintedDuration + [self additionalDurationNeededToReachFinalFrame]];
+    [super startAnimation];
+}
+
+- (void)stopAnimation
+{
+    _window = nil;
+    [super stopAnimation];
+    [_subAnimation stopAnimation];
+}
+
+@end
+
+@implementation WebWindowFadeAnimation
+
+- (id)init
+{
+    self = [super init];
+    if (!self)
+        return nil;
+    [self setAnimationBlockingMode:NSAnimationNonblockingThreaded];
+    [self setFrameRate:60];
+    [self setAnimationCurve:NSAnimationEaseInOut];
+    return self;
+}
+
+- (id)initWithDuration:(NSTimeInterval)duration window:(NSWindow *)window initialAlpha:(CGFloat)initialAlpha finalAlpha:(CGFloat)finalAlpha
+{
+    UNUSED_PARAM(duration);
+    self = [self init];
+    if (!self)
+        return nil;    
+    _window = window;
+    _initialAlpha = initialAlpha;
+    _finalAlpha = finalAlpha;
+    return self;
+}
+
+- (void)setDuration:(NSTimeInterval)duration
+{
+    [super setDuration:WebWindowAnimationDurationFromDuration(duration)];
+}
+
+- (CGFloat)currentAlpha
+{
+    return MAX(0, MIN(1, _initialAlpha + [self currentValue] * (_finalAlpha - _initialAlpha)));
+}
+
+- (void)setCurrentProgress:(NSAnimationProgress)progress
+{
+    if (_isStopped)
+        return;
+
+    ASSERT(_window);
+    [super setCurrentProgress:progress];
+
+    wkWindowSetAlpha(_window, [self currentAlpha]);
+}
+
+- (void)setWindow:(NSWindow*)window
+{
+    _window = window;
+}
+
+- (void)stopAnimation
+{
+    // This is relevant when we are a sub animation of a scale animation.
+    // In this case we are hosted in the animated thread of the parent
+    // and even after [super stopAnimation], the parent might call
+    // setCurrrentProgress.
+    _isStopped = YES;
+
+    [super stopAnimation];
+}
+
+@end
+
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/network/HTTPHeaderMap.cpp b/src/3rdparty/webkit/Source/WebCore/platform/network/HTTPHeaderMap.cpp
index 59cbcbe..3541e1e 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/network/HTTPHeaderMap.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/platform/network/HTTPHeaderMap.cpp
@@ -97,20 +97,32 @@ struct CaseFoldingCStringTranslator {
 
 String HTTPHeaderMap::get(const char* name) const
 {
+#if COMPILER(WINSCW)
+    return HashMap::get((AtomicString)(name));
+#else
     const_iterator i = find<const char*, CaseFoldingCStringTranslator>(name);
     if (i == end())
         return String();
     return i->second;
+#endif
 }
     
 bool HTTPHeaderMap::contains(const char* name) const
 {
+#if COMPILER(WINSCW)
+    return HashMap::contains((AtomicString)(name));
+#else
     return find<const char*, CaseFoldingCStringTranslator>(name) != end();
+#endif
 }
 
 pair<HTTPHeaderMap::iterator, bool> HTTPHeaderMap::add(const char* name, const String& value)
 {
+#if COMPILER(WINSCW)
+    return HashMap::add((AtomicString)(name), value);
+#else
     return HashMap<AtomicString, String, CaseFoldingHash>::add<const char*, CaseFoldingCStringTranslator>(name, value);
+#endif
 }
 
 } // namespace WebCore
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/qt/WebCoreSystemInterface.h b/src/3rdparty/webkit/Source/WebCore/platform/qt/WebCoreSystemInterface.h
index bd530de..e82a6fc 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/qt/WebCoreSystemInterface.h
+++ b/src/3rdparty/webkit/Source/WebCore/platform/qt/WebCoreSystemInterface.h
@@ -38,14 +38,20 @@ typedef struct _NSRect NSRect;
 
 #ifdef __OBJC__
 @class NSArray;
+@class NSControl;
 @class NSString;
 @class NSURL;
+@class NSView;
+@class NSWindow;
 @class QTMovie;
 @class QTMovieView;
 #else
 class NSArray;
+class NSControl;
 class NSString;
 class NSURL;
+class NSView;
+class NSWindow;
 class QTMovie;
 class QTMovieView;
 #endif
@@ -53,6 +59,8 @@ class QTMovieView;
 extern "C" {
 
 // In alphabetical order.
+extern NSView *(*wkCreateMediaUIBackgroundView)(void);
+extern NSControl *(*wkCreateMediaUIControl)(int);
 extern unsigned (*wkQTIncludeOnlyModernMediaFileTypes)(void);
 extern int (*wkQTMovieDataRate)(QTMovie*);
 extern void (*wkQTMovieDisableComponent)(uint32_t[5]);
@@ -68,6 +76,19 @@ extern void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL);
 extern NSArray *(*wkQTGetSitesInMediaDownloadCache)();
 extern void (*wkQTClearMediaDownloadCacheForSite)(NSString *site);
 extern void (*wkQTClearMediaDownloadCache)();
+extern void (*wkWindowSetAlpha)(NSWindow *, float);
+extern void (*wkWindowSetScaledFrame)(NSWindow *, NSRect, NSRect);
+
+typedef enum {
+    wkMediaUIControlTimeline,
+    wkMediaUIControlSlider,
+    wkMediaUIControlPlayPauseButton,
+    wkMediaUIControlExitFullscreenButton,
+    wkMediaUIControlRewindButton,
+    wkMediaUIControlFastForwardButton,
+    wkMediaUIControlVolumeUpButton,
+    wkMediaUIControlVolumeDownButton
+} wkMediaUIControlType;
 
 }
 
diff --git a/src/3rdparty/webkit/Source/WebCore/platform/qt/WebCoreSystemInterface.mm b/src/3rdparty/webkit/Source/WebCore/platform/qt/WebCoreSystemInterface.mm
index 3e26671..868cbd9 100644
--- a/src/3rdparty/webkit/Source/WebCore/platform/qt/WebCoreSystemInterface.mm
+++ b/src/3rdparty/webkit/Source/WebCore/platform/qt/WebCoreSystemInterface.mm
@@ -27,6 +27,8 @@
 #import "WebCoreSystemInterface.h"
 #import <Foundation/Foundation.h>
 
+NSView *(*wkCreateMediaUIBackgroundView)(void);
+NSControl *(*wkCreateMediaUIControl)(int);
 unsigned (*wkQTIncludeOnlyModernMediaFileTypes)(void);
 int (*wkQTMovieDataRate)(QTMovie*);
 void (*wkQTMovieDisableComponent)(uint32_t[5]);
@@ -42,4 +44,6 @@ void (*wkQTMovieViewSetDrawSynchronously)(QTMovieView*, BOOL);
 NSArray *(*wkQTGetSitesInMediaDownloadCache)();
 void (*wkQTClearMediaDownloadCacheForSite)(NSString *site);
 void (*wkQTClearMediaDownloadCache)();
+void (*wkWindowSetAlpha)(NSWindow *, float);
+void (*wkWindowSetScaledFrame)(NSWindow *, NSRect, NSRect);
 
diff --git a/src/3rdparty/webkit/Source/WebCore/plugins/PluginView.cpp b/src/3rdparty/webkit/Source/WebCore/plugins/PluginView.cpp
index fd2b0b0..b020946 100644
--- a/src/3rdparty/webkit/Source/WebCore/plugins/PluginView.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/plugins/PluginView.cpp
@@ -909,8 +909,9 @@ void PluginView::focusPluginElement()
 {
     // Focus the plugin
     if (Page* page = m_parentFrame->page())
-        page->focusController()->setFocusedFrame(m_parentFrame);
-    m_parentFrame->document()->setFocusedNode(m_element);
+        page->focusController()->setFocusedNode(m_element, m_parentFrame);
+    else
+        m_parentFrame->document()->setFocusedNode(m_element);
 }
 
 void PluginView::didReceiveResponse(const ResourceResponse& response)
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/CounterNode.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/CounterNode.cpp
index 323f5db..8a88fc9 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/CounterNode.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/CounterNode.cpp
@@ -44,6 +44,49 @@ CounterNode::CounterNode(RenderObject* o, bool hasResetType, int value)
 
 CounterNode::~CounterNode()
 {
+    // Ideally this would be an assert and this would never be reached. In reality this happens a lot
+    // so we need to handle these cases. The node is still connected to the tree so we need to detach it.
+    if (m_parent || m_previousSibling || m_nextSibling || m_firstChild || m_lastChild) {
+        CounterNode* oldParent = 0;
+        CounterNode* oldPreviousSibling = 0;
+        // Instead of calling removeChild() we do this safely as the tree is likely broken if we get here.
+        if (m_parent) {
+            if (m_parent->m_firstChild == this)
+                m_parent->m_firstChild = m_nextSibling;
+            if (m_parent->m_lastChild == this)
+                m_parent->m_lastChild = m_previousSibling;
+            oldParent = m_parent;
+            m_parent = 0;
+        }
+        if (m_previousSibling) {
+            if (m_previousSibling->m_nextSibling == this)
+                m_previousSibling->m_nextSibling = m_nextSibling;
+            oldPreviousSibling = m_previousSibling;
+            m_previousSibling = 0;
+        }
+        if (m_nextSibling) {
+            if (m_nextSibling->m_previousSibling == this)
+                m_nextSibling->m_previousSibling = oldPreviousSibling;
+            m_nextSibling = 0;
+        }
+        if (m_firstChild) {
+            // The node's children are reparented to the old parent.
+            for (CounterNode* child = m_firstChild; child; ) {
+                CounterNode* nextChild = child->m_nextSibling;
+                CounterNode* nextSibling = 0;
+                child->m_parent = oldParent;
+                if (oldPreviousSibling) {
+                    nextSibling = oldPreviousSibling->m_nextSibling;
+                    child->m_previousSibling = oldPreviousSibling;
+                    oldPreviousSibling->m_nextSibling = child;
+                    child->m_nextSibling = nextSibling;
+                    nextSibling->m_previousSibling = child;
+                    oldPreviousSibling = child;
+                }
+                child = nextChild;
+            }
+        }
+    }
     resetRenderers();
 }
 
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlock.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlock.cpp
index a212dd4..4ad1bfe 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlock.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlock.cpp
@@ -184,7 +184,7 @@ void RenderBlock::destroy()
                         childBox->remove();
                 }
             }
-        } else if (isInline() && parent())
+        } else if (parent())
             parent()->dirtyLinesFromChangedChild(this);
     }
 
@@ -241,21 +241,7 @@ void RenderBlock::styleDidChange(StyleDifference diff, const RenderStyle* oldSty
         }
     }
 
-    // FIXME: We could save this call when the change only affected non-inherited properties
-    for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
-        if (child->isAnonymousBlock()) {
-            RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyle(style());
-            if (style()->specifiesColumns()) {
-                if (child->style()->specifiesColumns())
-                    newStyle->inheritColumnPropertiesFrom(style());
-                if (child->style()->columnSpan())
-                    newStyle->setColumnSpan(true);
-            }
-            newStyle->setDisplay(BLOCK);
-            child->setStyle(newStyle.release());
-        }
-    }
-
+    propagateStyleToAnonymousChildren(true);    
     m_lineHeight = -1;
 
     // Update pseudos for :before and :after now.
@@ -654,8 +640,22 @@ RenderBlock* RenderBlock::columnsBlockForSpanningElement(RenderObject* newChild)
         && !newChild->isInline() && !isAnonymousColumnSpanBlock()) {
         if (style()->specifiesColumns())
             columnsBlockAncestor = this;
-        else if (!isInline() && parent() && parent()->isRenderBlock())
+        else if (!isInline() && parent() && parent()->isRenderBlock()) {
             columnsBlockAncestor = toRenderBlock(parent())->containingColumnsBlock(false);
+            
+            if (columnsBlockAncestor) {
+                // Make sure that none of the parent ancestors have a continuation.
+                // If yes, we do not want split the block into continuations.
+                RenderObject* curr = this;
+                while (curr && curr != columnsBlockAncestor) {
+                    if (curr->isRenderBlock() && toRenderBlock(curr)->continuation()) {
+                        columnsBlockAncestor = 0;
+                        break;
+                    }
+                    curr = curr->parent();
+                }
+            }
+        }
     }
     return columnsBlockAncestor;
 }
@@ -665,10 +665,10 @@ void RenderBlock::addChildIgnoringAnonymousColumnBlocks(RenderObject* newChild,
     // Make sure we don't append things after :after-generated content if we have it.
     if (!beforeChild) {
         RenderObject* lastRenderer = lastChild();
-        if (isAfterContent(lastRenderer))
+        while (lastRenderer && lastRenderer->isAnonymous() && !isAfterContent(lastRenderer))
+            lastRenderer = lastRenderer->lastChild();
+        if (lastRenderer && isAfterContent(lastRenderer))
             beforeChild = lastRenderer;
-        else if (lastRenderer && lastRenderer->isAnonymousBlock() && isAfterContent(lastRenderer->lastChild()))
-            beforeChild = lastRenderer->lastChild();
     }
 
     // If the requested beforeChild is not one of our children, then this is because
@@ -3204,8 +3204,10 @@ void RenderBlock::removeFloatingObject(RenderBox* o)
                     logicalBottom = max(logicalBottom, logicalTop + 1);
                 }
                 if (r->m_originatingLine) {
-                    ASSERT(r->m_originatingLine->renderer() == this);
-                    r->m_originatingLine->markDirty();
+                    if (!selfNeedsLayout()) {
+                        ASSERT(r->m_originatingLine->renderer() == this);
+                        r->m_originatingLine->markDirty();
+                    }
 #if !ASSERT_DISABLED
                     r->m_originatingLine = 0;
 #endif
@@ -3668,7 +3670,7 @@ void RenderBlock::clearFloats()
                     }
 
                     floatMap.remove(f->m_renderer);
-                    if (oldFloatingObject->m_originatingLine) {
+                    if (oldFloatingObject->m_originatingLine && !selfNeedsLayout()) {
                         ASSERT(oldFloatingObject->m_originatingLine->renderer() == this);
                         oldFloatingObject->m_originatingLine->markDirty();
                     }
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
index b0b10e3..2e92801 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderBlockLineLayout.cpp
@@ -1768,7 +1768,7 @@ void TrailingObjects::updateMidpointsForTrailingBoxes(LineMidpointState& lineMid
     if (lineMidpointState.numMidpoints % 2) {
         // Find the trailing space object's midpoint.
         int trailingSpaceMidpoint = lineMidpointState.numMidpoints - 1;
-        for ( ; trailingSpaceMidpoint >= 0 && lineMidpointState.midpoints[trailingSpaceMidpoint].m_obj != m_whitespace; --trailingSpaceMidpoint) { }
+        for ( ; trailingSpaceMidpoint > 0 && lineMidpointState.midpoints[trailingSpaceMidpoint].m_obj != m_whitespace; --trailingSpaceMidpoint) { }
         ASSERT(trailingSpaceMidpoint >= 0);
         if (collapseFirstSpace == CollapseFirstSpace)
             lineMidpointState.midpoints[trailingSpaceMidpoint].m_pos--;
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderBox.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderBox.cpp
index 0b33abe..f052ee7 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderBox.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderBox.cpp
@@ -204,6 +204,11 @@ void RenderBox::destroy()
     if (style() && (style()->logicalHeight().isPercent() || style()->logicalMinHeight().isPercent() || style()->logicalMaxHeight().isPercent()))
         RenderBlock::removePercentHeightDescendant(this);
 
+    // If this renderer is owning renderer for the frameview's custom scrollbars,
+    // we need to clear it from the scrollbar. See webkit bug 64737.
+    if (style() && style()->hasPseudoStyle(SCROLLBAR) && frame() && frame()->view())
+        frame()->view()->clearOwningRendererForCustomScrollbars(this);
+
     RenderBoxModelObject::destroy();
 }
 
@@ -1372,6 +1377,8 @@ void RenderBox::positionLineBox(InlineBox* box)
         box->destroy(renderArena());
     } else if (isReplaced()) {
         setLocation(lroundf(box->x()), lroundf(box->y()));
+        if (m_inlineBoxWrapper)
+            deleteLineBoxWrapper();
         m_inlineBoxWrapper = box;
     }
 }
@@ -3200,7 +3207,7 @@ bool RenderBox::shrinkToAvoidFloats() const
 
 bool RenderBox::avoidsFloats() const
 {
-    return isReplaced() || hasOverflowClip() || isHR() || isLegend() || isWritingModeRoot();
+    return isReplaced() || hasOverflowClip() || isHR() || isLegend() || isWritingModeRoot() || isDeprecatedFlexItem();
 }
 
 void RenderBox::addShadowOverflow()
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderBox.h b/src/3rdparty/webkit/Source/WebCore/rendering/RenderBox.h
index 258f213..08dc922 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderBox.h
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderBox.h
@@ -378,6 +378,8 @@ public:
     virtual void markForPaginationRelayoutIfNeeded() { }
 
     bool isWritingModeRoot() const { return !parent() || parent()->style()->writingMode() != style()->writingMode(); }
+
+    bool isDeprecatedFlexItem() const { return !isInline() && !isFloatingOrPositioned() && parent() && parent()->isFlexibleBox(); }
     
     virtual int lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
     virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderFlexibleBox.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderFlexibleBox.cpp
index b55bd9d..2a3b32c 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderFlexibleBox.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderFlexibleBox.cpp
@@ -90,8 +90,8 @@ public:
                 current = forward ? current->nextSiblingBox() : current->previousSiblingBox();
             if (current && current->style()->boxOrdinalGroup() > lastOrdinal)
                 lastOrdinal = current->style()->boxOrdinalGroup();
-        } while (!current || current->style()->boxOrdinalGroup() != currentOrdinal ||
-                 current->style()->visibility() == COLLAPSE);
+        } while (!current || (!current->isAnonymous()
+                 && (current->style()->boxOrdinalGroup() != currentOrdinal || current->style()->visibility() == COLLAPSE)));
         return current;
     }
 
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderIFrame.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderIFrame.cpp
index 366d9e7..1ce79d4 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderIFrame.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderIFrame.cpp
@@ -102,8 +102,9 @@ bool RenderIFrame::flattenFrame()
     if (!view)
         return false;
 
-    // Do not flatten offscreen inner frames during frame flattening.
-    return absoluteBoundingBoxRect().intersects(IntRect(IntPoint(0, 0), view->contentsSize()));
+    // Do not flatten offscreen inner frames during frame flattening, as flattening might make them visible.
+    IntRect boundingRect = absoluteBoundingBoxRect();
+    return boundingRect.maxX() > 0 && boundingRect.maxY() > 0;
 }
 
 void RenderIFrame::layout()
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderInline.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderInline.cpp
index 5fb8683..5bd726d 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderInline.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderInline.cpp
@@ -99,8 +99,7 @@ void RenderInline::destroy()
                 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
                     box->remove();
             }
-        } else if (isInline() && parent())
-            parent()->dirtyLinesFromChangedChild(this);
+        }
     }
 
     m_lineBoxes.deleteLineBoxes(renderArena());
@@ -845,11 +844,9 @@ InlineBox* RenderInline::culledInlineFirstLineBox() const
             
         // We want to get the margin box in the inline direction, and then use our font ascent/descent in the block
         // direction (aligned to the root box's baseline).
-        if (curr->isBox()) {
-            RenderBox* currBox = toRenderBox(curr);
-            if (currBox->inlineBoxWrapper())
-                return currBox->inlineBoxWrapper();
-        } else if (curr->isRenderInline()) {
+        if (curr->isBox())
+            return toRenderBox(curr)->inlineBoxWrapper();
+        if (curr->isRenderInline()) {
             RenderInline* currInline = toRenderInline(curr);
             InlineBox* result = currInline->firstLineBoxIncludingCulling();
             if (result)
@@ -871,11 +868,9 @@ InlineBox* RenderInline::culledInlineLastLineBox() const
             
         // We want to get the margin box in the inline direction, and then use our font ascent/descent in the block
         // direction (aligned to the root box's baseline).
-        if (curr->isBox()) {
-            RenderBox* currBox = toRenderBox(curr);
-            if (currBox->inlineBoxWrapper())
-                return currBox->inlineBoxWrapper();
-        } else if (curr->isRenderInline()) {
+        if (curr->isBox())
+            return toRenderBox(curr)->inlineBoxWrapper();
+        if (curr->isRenderInline()) {
             RenderInline* currInline = toRenderInline(curr);
             InlineBox* result = currInline->lastLineBoxIncludingCulling();
             if (result)
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderLineBoxList.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderLineBoxList.cpp
index 32f133c..4b50acb 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderLineBoxList.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderLineBoxList.cpp
@@ -355,8 +355,21 @@ void RenderLineBoxList::dirtyLinesFromChangedChild(RenderObject* container, Rend
         if (box)
             break;
     }
-    if (!box)
+    if (!box) {
+        if (inlineContainer && !inlineContainer->alwaysCreateLineBoxes()) {
+            // https://bugs.webkit.org/show_bug.cgi?id=60778
+            // We may have just removed a <br> with no line box that was our first child. In this case
+            // we won't find a previous sibling, but firstBox can be pointing to a following sibling.
+            // This isn't good enough, since we won't locate the root line box that encloses the removed
+            // <br>. We have to just over-invalidate a bit and go up to our parent.
+            if (!inlineContainer->parent()->selfNeedsLayout()) {
+                inlineContainer->parent()->dirtyLinesFromChangedChild(inlineContainer);
+                inlineContainer->setNeedsLayout(true); // Mark the container as needing layout to avoid dirtying the same lines again across multiple destroy() calls of the same subtree.
+            }
+            return;
+        }
         box = firstBox->root();
+    }
 
     // If we found a line box, then dirty it.
     if (box) {
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderObject.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderObject.cpp
index a81e668..c1f5ba0 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderObject.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderObject.cpp
@@ -1811,6 +1811,24 @@ void RenderObject::styleDidChange(StyleDifference diff, const RenderStyle* oldSt
     }
 }
 
+void RenderObject::propagateStyleToAnonymousChildren(bool blockChildrenOnly)
+{
+    // FIXME: We could save this call when the change only affected non-inherited properties.
+    for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
+        if (blockChildrenOnly ? child->isAnonymousBlock() : child->isAnonymous() && !child->isBeforeOrAfterContent()) {
+            RefPtr<RenderStyle> newStyle = RenderStyle::createAnonymousStyle(style());
+            if (style()->specifiesColumns()) {
+                if (child->style()->specifiesColumns())
+                    newStyle->inheritColumnPropertiesFrom(style());
+                if (child->style()->columnSpan())
+                    newStyle->setColumnSpan(true);
+            }
+            newStyle->setDisplay(blockChildrenOnly ? BLOCK : child->style()->display());
+            child->setStyle(newStyle.release());
+        }
+    }
+}
+
 void RenderObject::updateFillImages(const FillLayer* oldLayers, const FillLayer* newLayers)
 {
     // Optimize the common case
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderObject.h b/src/3rdparty/webkit/Source/WebCore/rendering/RenderObject.h
index 537f08a..2ba0114 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderObject.h
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderObject.h
@@ -322,8 +322,10 @@ public:
 
     inline bool isBeforeContent() const;
     inline bool isAfterContent() const;
+    inline bool isBeforeOrAfterContent() const;
     static inline bool isBeforeContent(const RenderObject* obj) { return obj && obj->isBeforeContent(); }
     static inline bool isAfterContent(const RenderObject* obj) { return obj && obj->isAfterContent(); }
+    static inline bool isBeforeOrAfterContent(const RenderObject* obj) { return obj && obj->isBeforeOrAfterContent(); }
 
     bool childrenInline() const { return m_childrenInline; }
     void setChildrenInline(bool b = true) { m_childrenInline = b; }
@@ -791,6 +793,7 @@ protected:
     virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
     // Overrides should call the superclass at the start
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+    void propagateStyleToAnonymousChildren(bool blockChildrenOnly = false);
 
     void drawLineForBoxSide(GraphicsContext*, int x1, int y1, int x2, int y2, BoxSide,
                             Color, EBorderStyle, int adjbw1, int adjbw2, bool antialias = false);
@@ -932,6 +935,11 @@ inline bool RenderObject::isAfterContent() const
     return true;
 }
 
+inline bool RenderObject::isBeforeOrAfterContent() const
+{
+    return isBeforeContent() || isAfterContent();
+}
+
 inline void RenderObject::setNeedsLayout(bool b, bool markParents)
 {
     bool alreadyNeededLayout = m_needsLayout;
@@ -1022,10 +1030,13 @@ inline void RenderObject::markContainingBlocksForLayout(bool scheduleRelayout, R
         if (!container && !o->isRenderView())
             return;
         if (!last->isText() && (last->style()->position() == FixedPosition || last->style()->position() == AbsolutePosition)) {
+            bool willSkipRelativelyPositionedInlines = !o->isRenderBlock();
             while (o && !o->isRenderBlock()) // Skip relatively positioned inlines and get to the enclosing RenderBlock.
                 o = o->container();
             if (!o || o->m_posChildNeedsLayout)
                 return;
+            if (willSkipRelativelyPositionedInlines)
+                container = o->container();
             o->m_posChildNeedsLayout = true;
             simplifiedNormalFlowLayout = true;
             ASSERT(!o->isSetNeedsLayoutForbidden());
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderObjectChildList.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderObjectChildList.cpp
index ff9ff15..28703c5 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderObjectChildList.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderObjectChildList.cpp
@@ -271,7 +271,12 @@ RenderObject* RenderObjectChildList::beforePseudoElementRenderer(const RenderObj
     do {
         // Skip list markers and generated run-ins
         first = first->firstChild();
-        while (first && (first->isListMarker() || (first->isRenderInline() && first->isRunIn() && first->isAnonymous())))
+        while (first && first->isListMarker()) {
+            if (first->parent() != owner && first->parent()->isAnonymousBlock())
+                first = first->parent();
+            first = first->nextSibling();
+        }
+        while (first && first->isRenderInline() && first->isRunIn())
             first = first->nextSibling();
     } while (first && first->isAnonymous() && first->style()->styleType() == NOPSEUDO);
 
@@ -293,7 +298,7 @@ RenderObject* RenderObjectChildList::beforePseudoElementRenderer(const RenderObj
         // We still need to skip any list markers that could exist before the run-in.
         while (first && first->isListMarker())
             first = first->nextSibling();
-        if (first && first->style()->styleType() == BEFORE && first->isRenderInline() && first->isRunIn() && first->isAnonymous())
+        if (first && first->style()->styleType() == BEFORE && first->isRenderInline() && first->isRunIn())
             return first;
     }
     return 0;
@@ -388,6 +393,21 @@ void RenderObjectChildList::updateBeforeAfterContent(RenderObject* owner, Pseudo
             if (!beforeAfterParent)
                 return;
 
+            // When beforeAfterParent is not equal to child (e.g. in tables),
+            // we need to create new styles inheriting from pseudoElementStyle 
+            // on all the intermediate parents (leaving their display same).
+            if (beforeAfterParent != child) {
+                RenderObject* curr = beforeAfterParent;
+                while (curr && curr != child) {
+                    ASSERT(curr->isAnonymous());
+                    RefPtr<RenderStyle> newStyle = RenderStyle::create();
+                    newStyle->inheritFrom(pseudoElementStyle);
+                    newStyle->setDisplay(curr->style()->display());
+                    curr->setStyle(newStyle);
+                    curr = curr->parent();
+                }
+            }
+
             // Note that if we ever support additional types of generated content (which should be way off
             // in the future), this code will need to be patched.
             for (RenderObject* genChild = beforeAfterParent->firstChild(); genChild; genChild = genChild->nextSibling()) {
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderReplaced.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderReplaced.cpp
index c27d336..09a7944 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderReplaced.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderReplaced.cpp
@@ -57,6 +57,14 @@ RenderReplaced::~RenderReplaced()
 {
 }
 
+void RenderReplaced::destroy()
+{
+    if (!documentBeingDestroyed() && parent())
+        parent()->dirtyLinesFromChangedChild(this);
+
+    RenderBox::destroy();
+}
+
 void RenderReplaced::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
     RenderBox::styleDidChange(diff, oldStyle);
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderReplaced.h b/src/3rdparty/webkit/Source/WebCore/rendering/RenderReplaced.h
index d6ebba6..29fc71c 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderReplaced.h
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderReplaced.h
@@ -32,6 +32,8 @@ public:
     RenderReplaced(Node*, const IntSize& intrinsicSize);
     virtual ~RenderReplaced();
 
+    virtual void destroy();
+
 protected:
     virtual void layout();
 
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderRuby.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderRuby.cpp
index e0137de..41604d6 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderRuby.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderRuby.cpp
@@ -119,6 +119,12 @@ RenderRubyAsInline::~RenderRubyAsInline()
 {
 }
 
+void RenderRubyAsInline::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
+{
+    RenderInline::styleDidChange(diff, oldStyle);
+    propagateStyleToAnonymousChildren();
+}
+
 void RenderRubyAsInline::addChild(RenderObject* child, RenderObject* beforeChild)
 {
     // Insert :before and :after content before/after the RenderRubyRun(s)
@@ -220,6 +226,12 @@ RenderRubyAsBlock::~RenderRubyAsBlock()
 {
 }
 
+void RenderRubyAsBlock::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
+{
+    RenderBlock::styleDidChange(diff, oldStyle);
+    propagateStyleToAnonymousChildren();
+}
+
 void RenderRubyAsBlock::addChild(RenderObject* child, RenderObject* beforeChild)
 {
     // Insert :before and :after content before/after the RenderRubyRun(s)
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderRuby.h b/src/3rdparty/webkit/Source/WebCore/rendering/RenderRuby.h
index 24ac0db..2ab964c 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderRuby.h
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderRuby.h
@@ -59,6 +59,9 @@ public:
     virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
     virtual void removeChild(RenderObject* child);
 
+protected:
+    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+
 private:
     virtual bool isRuby() const { return true; }
     virtual const char* renderName() const { return "RenderRuby (inline)"; }
@@ -75,6 +78,9 @@ public:
     virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
     virtual void removeChild(RenderObject* child);
 
+protected:
+    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+
 private:
     virtual bool isRuby() const { return true; }
     virtual const char* renderName() const { return "RenderRuby (block)"; }
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderScrollbar.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderScrollbar.cpp
index 962024c..7a75b2e 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderScrollbar.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderScrollbar.cpp
@@ -149,7 +149,7 @@ ScrollbarPart RenderScrollbar::partForStyleResolve()
 
 PassRefPtr<RenderStyle> RenderScrollbar::getScrollbarPseudoStyle(ScrollbarPart partType, PseudoId pseudoId)
 {
-    if (!m_owner)
+    if (!owningRenderer())
         return 0;
 
     s_styleResolvePart = partType;
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderTable.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderTable.cpp
index 4e90ffc..73b0801 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderTable.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderTable.cpp
@@ -73,6 +73,7 @@ RenderTable::~RenderTable()
 void RenderTable::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
     RenderBlock::styleDidChange(diff, oldStyle);
+    propagateStyleToAnonymousChildren();
 
     ETableLayout oldTableLayout = oldStyle ? oldStyle->tableLayout() : TAUTO;
 
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderTableRow.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderTableRow.cpp
index 2edcfc4..686bc3a 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderTableRow.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderTableRow.cpp
@@ -74,10 +74,10 @@ void RenderTableRow::updateBeforeAndAfterContent()
 void RenderTableRow::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
 {
     RenderBox::styleDidChange(diff, oldStyle);
+    propagateStyleToAnonymousChildren();
 
     if (parent())
         updateBeforeAndAfterContent();
-
 }
 
 void RenderTableRow::addChild(RenderObject* child, RenderObject* beforeChild)
@@ -90,7 +90,7 @@ void RenderTableRow::addChild(RenderObject* child, RenderObject* beforeChild)
         RenderObject* last = beforeChild;
         if (!last)
             last = lastChild();
-        if (last && last->isAnonymous() && last->isTableCell()) {
+        if (last && last->isAnonymous() && last->isTableCell() && !last->isBeforeOrAfterContent()) {
             if (beforeChild == last)
                 beforeChild = last->firstChild();
             last->addChild(child, beforeChild);
@@ -98,7 +98,7 @@ void RenderTableRow::addChild(RenderObject* child, RenderObject* beforeChild)
         }
 
         // If beforeChild is inside an anonymous cell, insert into the cell.
-        if (last && !last->isTableCell() && last->parent() && last->parent()->isAnonymous()) {
+        if (last && !last->isTableCell() && last->parent() && last->parent()->isAnonymous() && !last->parent()->isBeforeOrAfterContent()) {
             last->parent()->addChild(child, beforeChild);
             return;
         }
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderTableSection.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderTableSection.cpp
index 6b080b8..7d414a0 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderTableSection.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderTableSection.cpp
@@ -74,6 +74,12 @@ RenderTableSection::~RenderTableSection()
     clearGrid();
 }
 
+void RenderTableSection::styleDidChange(StyleDifference diff, const RenderStyle* oldStyle)
+{
+    RenderBox::styleDidChange(diff, oldStyle);
+    propagateStyleToAnonymousChildren();
+}
+
 void RenderTableSection::destroy()
 {
     RenderTable* recalcTable = table();
@@ -96,7 +102,7 @@ void RenderTableSection::addChild(RenderObject* child, RenderObject* beforeChild
         RenderObject* last = beforeChild;
         if (!last)
             last = lastChild();
-        if (last && last->isAnonymous()) {
+        if (last && last->isAnonymous() && !last->isBeforeOrAfterContent()) {
             if (beforeChild == last)
                 beforeChild = last->firstChild();
             last->addChild(child, beforeChild);
@@ -108,7 +114,7 @@ void RenderTableSection::addChild(RenderObject* child, RenderObject* beforeChild
         RenderObject* lastBox = last;
         while (lastBox && lastBox->parent()->isAnonymous() && !lastBox->isTableRow())
             lastBox = lastBox->parent();
-        if (lastBox && lastBox->isAnonymous()) {
+        if (lastBox && lastBox->isAnonymous() && !lastBox->isBeforeOrAfterContent()) {
             lastBox->addChild(child, beforeChild);
             return;
         }
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderTableSection.h b/src/3rdparty/webkit/Source/WebCore/rendering/RenderTableSection.h
index cc969e8..db6edc2 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderTableSection.h
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderTableSection.h
@@ -118,6 +118,9 @@ public:
 
     int getBaseline(int row) { return m_grid[row].baseline; }
 
+protected:
+    virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
+
 private:
     virtual RenderObjectChildList* virtualChildren() { return children(); }
     virtual const RenderObjectChildList* virtualChildren() const { return children(); }
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderText.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderText.cpp
index 3d20df4..556379e 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderText.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderText.cpp
@@ -37,6 +37,7 @@
 #include "RenderCombineText.h"
 #include "RenderLayer.h"
 #include "RenderView.h"
+#include "Settings.h"
 #include "Text.h"
 #include "TextBreakIterator.h"
 #include "TextResourceDecoder.h"
@@ -53,6 +54,37 @@ using namespace Unicode;
 
 namespace WebCore {
 
+class SecureTextTimer;
+typedef HashMap<RenderText*, SecureTextTimer*> SecureTextTimerMap;
+static SecureTextTimerMap* gSecureTextTimers = 0;
+
+class SecureTextTimer : public TimerBase {
+public:
+    SecureTextTimer(RenderText* renderText)
+        : m_renderText(renderText)
+        , m_lastTypedCharacterOffset(-1)
+    {
+    }
+
+    void restartWithNewText(unsigned lastTypedCharacterOffset)
+    {
+        m_lastTypedCharacterOffset = lastTypedCharacterOffset;
+        startOneShot(m_renderText->document()->settings()->passwordEchoDurationInSeconds());
+    }
+    void invalidate() { m_lastTypedCharacterOffset = -1; }
+    unsigned lastTypedCharacterOffset() { return m_lastTypedCharacterOffset; }
+
+private:
+    virtual void fired()
+    {
+        ASSERT(gSecureTextTimers->contains(m_renderText));
+        m_renderText->setText(m_renderText->text(), true /* forcing setting text as it may be masked later */);
+    }
+
+    RenderText* m_renderText;
+    int m_lastTypedCharacterOffset;
+};
+
 static void makeCapitalized(String* string, UChar previous)
 {
     if (string->isNull())
@@ -196,6 +228,9 @@ void RenderText::removeAndDestroyTextBoxes()
 
 void RenderText::destroy()
 {
+    if (SecureTextTimer* secureTextTimer = gSecureTextTimers ? gSecureTextTimers->take(this) : 0)
+        delete secureTextTimer;
+
     removeAndDestroyTextBoxes();
     RenderObject::destroy();
 }
@@ -1158,13 +1193,13 @@ void RenderText::setTextInternal(PassRefPtr<StringImpl> text)
         case TSNONE:
             break;
         case TSCIRCLE:
-            m_text.makeSecure(whiteBullet);
+            secureText(whiteBullet);
             break;
         case TSDISC:
-            m_text.makeSecure(bullet);
+            secureText(bullet);
             break;
         case TSSQUARE:
-            m_text.makeSecure(blackSquare);
+            secureText(blackSquare);
         }
     }
 
@@ -1174,6 +1209,28 @@ void RenderText::setTextInternal(PassRefPtr<StringImpl> text)
     m_isAllASCII = m_text.containsOnlyASCII();
 }
 
+void RenderText::secureText(UChar mask)
+{
+    if (!m_text.length())
+        return;
+
+    int lastTypedCharacterOffsetToReveal = -1;
+    String revealedText;
+    SecureTextTimer* secureTextTimer = gSecureTextTimers ? gSecureTextTimers->get(this) : 0;
+    if (secureTextTimer && secureTextTimer->isActive()) {
+        lastTypedCharacterOffsetToReveal = secureTextTimer->lastTypedCharacterOffset();
+        if (lastTypedCharacterOffsetToReveal >= 0)
+            revealedText.append(m_text[lastTypedCharacterOffsetToReveal]);
+    }
+
+    m_text.fill(mask);
+    if (lastTypedCharacterOffsetToReveal >= 0) {
+        m_text.replace(lastTypedCharacterOffsetToReveal, 1, revealedText);
+        // m_text may be updated later before timer fires. We invalidate the lastTypedCharacterOffset to avoid inconsistency.
+        secureTextTimer->invalidate();
+    }
+}
+
 void RenderText::setText(PassRefPtr<StringImpl> text, bool force)
 {
     ASSERT(text);
@@ -1597,4 +1654,17 @@ void RenderText::checkConsistency() const
 
 #endif
 
+void RenderText::momentarilyRevealLastTypedCharacter(unsigned lastTypedCharacterOffset)
+{
+    if (!gSecureTextTimers)
+        gSecureTextTimers = new SecureTextTimerMap;
+
+    SecureTextTimer* secureTextTimer = gSecureTextTimers->get(this);
+    if (!secureTextTimer) {
+        secureTextTimer = new SecureTextTimer(this);
+        gSecureTextTimers->add(this, secureTextTimer);
+    }
+    secureTextTimer->restartWithNewText(lastTypedCharacterOffset);
+}
+
 } // namespace WebCore
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderText.h b/src/3rdparty/webkit/Source/WebCore/rendering/RenderText.h
index 2008dad..f89a762 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderText.h
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderText.h
@@ -117,6 +117,9 @@ public:
 
     bool containsReversedText() const { return m_containsReversedText; }
 
+    bool isSecure() const { return style()->textSecurity() != TSNONE; }
+    void momentarilyRevealLastTypedCharacter(unsigned lastTypedCharacterOffset);
+
     InlineTextBox* findNextInlineTextBox(int offset, int& pos) const;
 
     bool allowTabs() const { return !style()->collapseWhiteSpace(); }
@@ -158,6 +161,7 @@ private:
     void updateNeedsTranscoding();
 
     inline void transformText(String&) const;
+    void secureText(UChar mask);
 
     float m_minWidth; // here to minimize padding in 64-bit.
 
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderThemeWinCE.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderThemeWinCE.cpp
index a56ab3e..a22ed8c 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderThemeWinCE.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderThemeWinCE.cpp
@@ -479,7 +479,7 @@ static HTMLMediaElement* mediaElementParent(Node* node)
     if (!node)
         return 0;
     Node* mediaNode = node->shadowAncestorNode();
-    if (!mediaNode || (!mediaNode->hasTagName(HTMLNames::videoTag) && !mediaNode->hasTagName(HTMLNames::audioTag)))
+    if (!mediaNode || !mediaNode->isElementNode() || !static_cast<Element*>(mediaNode)->isMediaElement())
         return 0;
 
     return static_cast<HTMLMediaElement*>(mediaNode);
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/RenderWidget.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/RenderWidget.cpp
index 894d689..5a00374 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/RenderWidget.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/RenderWidget.cpp
@@ -125,6 +125,10 @@ void RenderWidget::destroy()
         document()->axObjectCache()->childrenChanged(this->parent());
         document()->axObjectCache()->remove(this);
     }
+
+    if (!documentBeingDestroyed() && parent()) 
+        parent()->dirtyLinesFromChangedChild(this);
+
     remove();
 
     if (m_hasCounterNodeMap)
@@ -139,6 +143,11 @@ void RenderWidget::destroy()
     if (style() && (style()->logicalHeight().isPercent() || style()->logicalMinHeight().isPercent() || style()->logicalMaxHeight().isPercent()))
         RenderBlock::removePercentHeightDescendant(this);
 
+    // If this renderer is owning renderer for the frameview's custom scrollbars,
+    // we need to clear it from the scrollbar. See webkit bug 64737.
+    if (style() && style()->hasPseudoStyle(SCROLLBAR) && frame() && frame()->view())
+        frame()->view()->clearOwningRendererForCustomScrollbars(this);
+
     if (hasLayer()) {
         layer()->clearClipRects();
         setHasLayer(false);
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/svg/RenderSVGInline.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/svg/RenderSVGInline.cpp
index 02a85ce..fdfd92d 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/svg/RenderSVGInline.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/svg/RenderSVGInline.cpp
@@ -95,6 +95,9 @@ void RenderSVGInline::absoluteQuads(Vector<FloatQuad>& quads)
 
 void RenderSVGInline::destroy()
 {
+    if (RenderSVGText* textRenderer = RenderSVGText::locateRenderSVGTextAncestor(this))
+        textRenderer->setNeedsPositioningValuesUpdate();
+
     SVGResourcesCache::clientDestroyed(this);
     RenderInline::destroy();
 }
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp
index 79e8e1e..db4027b 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/svg/RenderSVGResourceContainer.cpp
@@ -168,7 +168,7 @@ void RenderSVGResourceContainer::registerResource()
     const SVGDocumentExtensions::SVGPendingElements::const_iterator end = clients->end();
     for (SVGDocumentExtensions::SVGPendingElements::const_iterator it = clients->begin(); it != end; ++it) {
         ASSERT((*it)->hasPendingResources());
-        (*it)->setHasPendingResources(false);
+        (*it)->clearHasPendingResourcesIfPossible();
         RenderObject* renderer = (*it)->renderer();
         if (!renderer)
             continue;
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/svg/SVGInlineFlowBox.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/svg/SVGInlineFlowBox.cpp
index 1d0043b..8992a2a 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/svg/SVGInlineFlowBox.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/svg/SVGInlineFlowBox.cpp
@@ -74,8 +74,11 @@ void SVGInlineFlowBox::paint(PaintInfo& paintInfo, int, int, int, int)
 IntRect SVGInlineFlowBox::calculateBoundaries() const
 {
     IntRect childRect;
-    for (InlineBox* child = firstChild(); child; child = child->nextOnLine())
+    for (InlineBox* child = firstChild(); child; child = child->nextOnLine()) {
+        if (!child->isSVGInlineTextBox() && !child->isSVGInlineFlowBox())
+            continue;
         childRect.unite(child->calculateBoundaries());
+    }
     return childRect;
 }
 
diff --git a/src/3rdparty/webkit/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp b/src/3rdparty/webkit/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
index 42eb8e8..4121723 100644
--- a/src/3rdparty/webkit/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/rendering/svg/SVGTextLayoutAttributesBuilder.cpp
@@ -39,7 +39,11 @@ void SVGTextLayoutAttributesBuilder::buildLayoutAttributesForTextSubtree(RenderS
 {
     ASSERT(textRoot);
 
-    // Build list of x/y/dx/dy/rotate values for each subtree element that may define these values (tspan/textPath etc).
+    // We always clear our current attribute as we don't want to keep any stale ones that could survive DOM modification.
+    Vector<SVGTextLayoutAttributes>& allAttributes = textRoot->layoutAttributes();
+    allAttributes.clear();
+
+     // Build list of x/y/dx/dy/rotate values for each subtree element that may define these values (tspan/textPath etc).
     unsigned atCharacter = 0;
     UChar lastCharacter = '\0';
     collectTextPositioningElements(textRoot, atCharacter, lastCharacter);
@@ -51,8 +55,6 @@ void SVGTextLayoutAttributesBuilder::buildLayoutAttributesForTextSubtree(RenderS
     buildLayoutAttributesForAllCharacters(textRoot, atCharacter);
 
     // Propagate layout attributes to each RenderSVGInlineText object, and the whole list to the RenderSVGText root.
-    Vector<SVGTextLayoutAttributes>& allAttributes = textRoot->layoutAttributes();
-    allAttributes.clear();
     atCharacter = 0;
     lastCharacter = '\0';
     propagateLayoutAttributes(textRoot, allAttributes, atCharacter, lastCharacter);
diff --git a/src/3rdparty/webkit/Source/WebCore/storage/IDBRequest.cpp b/src/3rdparty/webkit/Source/WebCore/storage/IDBRequest.cpp
index f8d818a..96abd87 100644
--- a/src/3rdparty/webkit/Source/WebCore/storage/IDBRequest.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/storage/IDBRequest.cpp
@@ -66,7 +66,7 @@ IDBRequest::IDBRequest(ScriptExecutionContext* context, PassRefPtr<IDBAny> sourc
 
 IDBRequest::~IDBRequest()
 {
-    ASSERT(m_readyState == DONE || m_readyState == EarlyDeath);
+    ASSERT(m_readyState == DONE || m_readyState == EarlyDeath || !scriptExecutionContext());
     if (m_transaction)
         m_transaction->unregisterRequest(this);
 }
@@ -149,8 +149,11 @@ void IDBRequest::abort()
         ASSERT(m_readyState == DONE);
         return;
     }
+    // FIXME: Remove isDocument check when
+    // https://bugs.webkit.org/show_bug.cgi?id=57789 is resolved.
+    if (!scriptExecutionContext() || !scriptExecutionContext()->isDocument())
+        return;
 
-    ASSERT(scriptExecutionContext()->isDocument());
     EventQueue* eventQueue = static_cast<Document*>(scriptExecutionContext())->eventQueue();
     for (size_t i = 0; i < m_enqueuedEvents.size(); ++i) {
         bool removed = eventQueue->cancelEvent(m_enqueuedEvents[i].get());
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp b/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp
index d74f646..4b339ca 100644..100755
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.cpp
@@ -227,7 +227,7 @@ void SVGDocumentExtensions::addPendingResource(const AtomicString& id, SVGStyled
         m_pendingResources.add(id, set);
     }
 
-    element->setHasPendingResources(true);
+    element->setHasPendingResources();
 }
 
 bool SVGDocumentExtensions::hasPendingResources(const AtomicString& id) const
@@ -238,6 +238,24 @@ bool SVGDocumentExtensions::hasPendingResources(const AtomicString& id) const
     return m_pendingResources.contains(id);
 }
 
+bool SVGDocumentExtensions::isElementInPendingResources(SVGStyledElement* element) const
+{
+    ASSERT(element);
+
+    if (m_pendingResources.isEmpty())
+        return false;
+
+    HashMap<AtomicString, SVGPendingElements*>::const_iterator end = m_pendingResources.end();
+    for (HashMap<AtomicString, SVGPendingElements*>::const_iterator it = m_pendingResources.begin(); it != end; ++it) {
+        SVGPendingElements* elements = it->second;
+        ASSERT(elements);
+
+        if (elements->contains(element))
+            return true;
+    }
+    return false;
+}
+
 void SVGDocumentExtensions::removeElementFromPendingResources(SVGStyledElement* element)
 {
     ASSERT(element);
@@ -245,8 +263,6 @@ void SVGDocumentExtensions::removeElementFromPendingResources(SVGStyledElement*
     if (m_pendingResources.isEmpty() || !element->hasPendingResources())
         return;
 
-    element->setHasPendingResources(false);
-
     Vector<AtomicString> toBeRemoved;
     HashMap<AtomicString, SVGPendingElements*>::iterator end = m_pendingResources.end();
     for (HashMap<AtomicString, SVGPendingElements*>::iterator it = m_pendingResources.begin(); it != end; ++it) {
@@ -259,6 +275,8 @@ void SVGDocumentExtensions::removeElementFromPendingResources(SVGStyledElement*
             toBeRemoved.append(it->first);
     }
 
+    element->clearHasPendingResourcesIfPossible();
+
     if (toBeRemoved.isEmpty())
         return;
 
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h b/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h
index a66b066..8ad44f8 100644..100755
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGDocumentExtensions.h
@@ -81,6 +81,7 @@ public:
     // For instance, dynamically build gradients / patterns / clippers...
     void addPendingResource(const AtomicString& id, SVGStyledElement*);
     bool hasPendingResources(const AtomicString& id) const;
+    bool isElementInPendingResources(SVGStyledElement*) const;
     void removeElementFromPendingResources(SVGStyledElement*);
     PassOwnPtr<SVGPendingElements> removePendingResource(const AtomicString& id);
 };
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGElementInstance.cpp b/src/3rdparty/webkit/Source/WebCore/svg/SVGElementInstance.cpp
index 6b9c085..0fba66b 100644
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGElementInstance.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGElementInstance.cpp
@@ -70,6 +70,11 @@ SVGElementInstance::~SVGElementInstance()
     // Deregister as instance for passed element.
     m_element->removeInstanceMapping(this);
 
+    clearChildren();
+}
+
+void SVGElementInstance::clearChildren()
+{
     removeAllChildrenInContainer<SVGElementInstance, SVGElementInstance>(this);
 }
 
@@ -105,8 +110,10 @@ void SVGElementInstance::invalidateAllInstancesOfElement(SVGElement* element)
     const HashSet<SVGElementInstance*>::const_iterator end = set.end();
     for (HashSet<SVGElementInstance*>::const_iterator it = set.begin(); it != end; ++it) {
         ASSERT((*it)->correspondingElement() == element);
-        if (SVGUseElement* element = (*it)->correspondingUseElement())
+        if (SVGUseElement* element = (*it)->correspondingUseElement()) {
+            ASSERT(element->inDocument());
             element->invalidateShadowTree();
+        }
     }
 
     // Be sure to rebuild use trees, if needed
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGElementInstance.h b/src/3rdparty/webkit/Source/WebCore/svg/SVGElementInstance.h
index 2a8c52f..f24c16f 100644
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGElementInstance.h
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGElementInstance.h
@@ -59,6 +59,7 @@ public:
     SVGUseElement* correspondingUseElement() const { return m_correspondingUseElement; }
     SVGUseElement* directUseElement() const { return m_directUseElement; }
     SVGElement* shadowTreeElement() const { return m_shadowTreeElement.get(); }
+    void clearChildren();
     void clearUseElements()
     {
         m_directUseElement = 0;
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyleElement.cpp b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyleElement.cpp
index 042af1c..01adb35 100644
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyleElement.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyleElement.cpp
@@ -42,8 +42,7 @@ inline SVGStyleElement::SVGStyleElement(const QualifiedName& tagName, Document*
 
 SVGStyleElement::~SVGStyleElement()
 {
-    if (m_sheet)
-        m_sheet->clearOwnerNode();
+    StyleElement::clearDocumentData(document(), this);
 }
 
 PassRefPtr<SVGStyleElement> SVGStyleElement::create(const QualifiedName& tagName, Document* document, bool createdByParser)
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp
index c1a6449..0693eb0 100644..100755
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.cpp
@@ -380,7 +380,7 @@ void SVGStyledElement::insertedIntoDocument()
     for (SVGDocumentExtensions::SVGPendingElements::const_iterator it = clients->begin(); it != end; ++it) {
         ASSERT((*it)->hasPendingResources());
         (*it)->buildPendingResource();
-        (*it)->setHasPendingResources(false);
+        (*it)->clearHasPendingResourcesIfPossible();
     }
 }
 
@@ -453,9 +453,15 @@ bool SVGStyledElement::hasPendingResources() const
     return hasRareSVGData() && rareSVGData()->hasPendingResources();
 }
 
-void SVGStyledElement::setHasPendingResources(bool value)
+void SVGStyledElement::setHasPendingResources()
 {
-    ensureRareSVGData()->setHasPendingResources(value);
+    ensureRareSVGData()->setHasPendingResources(true);
+}
+
+void SVGStyledElement::clearHasPendingResourcesIfPossible()
+{
+    if (!document()->accessSVGExtensions()->isElementInPendingResources(this))
+        ensureRareSVGData()->setHasPendingResources(false);
 }
 
 AffineTransform SVGStyledElement::localCoordinateSpaceTransform(SVGLocatable::CTMScope) const
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h
index f48513c..fdad347 100644..100755
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGStyledElement.h
@@ -53,7 +53,8 @@ public:
     void setInstanceUpdatesBlocked(bool);
 
     bool hasPendingResources() const;
-    void setHasPendingResources(bool);
+    void setHasPendingResources();
+    void clearHasPendingResourcesIfPossible();
 
     AnimatedAttributeType animatedPropertyTypeForCSSProperty(const QualifiedName&);
     static bool isAnimatableCSSProperty(const QualifiedName&);
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGTextContentElement.cpp b/src/3rdparty/webkit/Source/WebCore/svg/SVGTextContentElement.cpp
index 4021b4f..35f0401 100644
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGTextContentElement.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGTextContentElement.cpp
@@ -28,6 +28,7 @@
 #include "Frame.h"
 #include "RenderObject.h"
 #include "RenderSVGResource.h"
+#include "RenderSVGText.h"
 #include "SVGDocumentExtensions.h"
 #include "SVGNames.h"
 #include "SVGTextQuery.h"
@@ -292,6 +293,17 @@ SVGTextContentElement* SVGTextContentElement::elementFromRenderer(RenderObject*
     return static_cast<SVGTextContentElement*>(node);
 }
 
+void SVGTextContentElement::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
+{
+    SVGStyledElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
+
+    if (changedByParser || !renderer())
+        return;
+
+    if (RenderSVGText* textRenderer = RenderSVGText::locateRenderSVGTextAncestor(renderer()))
+        textRenderer->setNeedsPositioningValuesUpdate();
+}
+
 }
 
 #endif // ENABLE(SVG)
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGTextContentElement.h b/src/3rdparty/webkit/Source/WebCore/svg/SVGTextContentElement.h
index 94bba70..222a06d 100644
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGTextContentElement.h
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGTextContentElement.h
@@ -71,6 +71,7 @@ protected:
     void fillPassedAttributeToPropertyTypeMap(AttributeToPropertyTypeMap&);
 
     virtual bool selfHasRelativeLengths() const;
+    virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
 
 private:
     virtual bool isTextContent() const { return true; }
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGTextPositioningElement.cpp b/src/3rdparty/webkit/Source/WebCore/svg/SVGTextPositioningElement.cpp
index cd714c3..ebd4789 100644
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGTextPositioningElement.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGTextPositioningElement.cpp
@@ -75,30 +75,6 @@ void SVGTextPositioningElement::parseMappedAttribute(Attribute* attr)
         SVGTextContentElement::parseMappedAttribute(attr);
 }
 
-static inline void updatePositioningValuesInRenderer(RenderObject* renderer)
-{
-    RenderSVGText* textRenderer = 0;
-
-    if (renderer->isSVGText())
-        textRenderer = toRenderSVGText(renderer);
-    else {
-        // Locate RenderSVGText parent renderer.
-        RenderObject* parent = renderer->parent();
-        while (parent && !parent->isSVGText())
-            parent = parent->parent();
-
-        if (parent) {
-            ASSERT(parent->isSVGText());
-            textRenderer = toRenderSVGText(parent);
-        }
-    }
-
-    if (!textRenderer)
-        return;
-
-    textRenderer->setNeedsPositioningValuesUpdate();
-}
-
 void SVGTextPositioningElement::svgAttributeChanged(const QualifiedName& attrName)
 {
     SVGTextContentElement::svgAttributeChanged(attrName);
@@ -116,23 +92,13 @@ void SVGTextPositioningElement::svgAttributeChanged(const QualifiedName& attrNam
         return;
 
     if (updateRelativeLengths || attrName == SVGNames::rotateAttr) {
-        updatePositioningValuesInRenderer(renderer);
+        if (RenderSVGText* textRenderer = RenderSVGText::locateRenderSVGTextAncestor(renderer))
+            textRenderer->setNeedsPositioningValuesUpdate();
         RenderSVGResource::markForLayoutAndParentResourceInvalidation(renderer);
         return;
     }
 }
 
-void SVGTextPositioningElement::childrenChanged(bool changedByParser, Node* beforeChange, Node* afterChange, int childCountDelta)
-{
-    SVGTextContentElement::childrenChanged(changedByParser, beforeChange, afterChange, childCountDelta);
-
-    if (changedByParser)
-        return;
-
-    if (RenderObject* object = renderer())
-        updatePositioningValuesInRenderer(object);
-}
-
 void SVGTextPositioningElement::synchronizeProperty(const QualifiedName& attrName)
 {
     SVGTextContentElement::synchronizeProperty(attrName);
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGTextPositioningElement.h b/src/3rdparty/webkit/Source/WebCore/svg/SVGTextPositioningElement.h
index 5e6dadc..aa8792f 100644
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGTextPositioningElement.h
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGTextPositioningElement.h
@@ -36,7 +36,6 @@ protected:
     SVGTextPositioningElement(const QualifiedName&, Document*);
 
     virtual void parseMappedAttribute(Attribute*);
-    virtual void childrenChanged(bool changedByParser = false, Node* beforeChange = 0, Node* afterChange = 0, int childCountDelta = 0);
     virtual void svgAttributeChanged(const QualifiedName&);
     virtual void synchronizeProperty(const QualifiedName&);
     void fillPassedAttributeToPropertyTypeMap(AttributeToPropertyTypeMap&);
diff --git a/src/3rdparty/webkit/Source/WebCore/svg/SVGUseElement.cpp b/src/3rdparty/webkit/Source/WebCore/svg/SVGUseElement.cpp
index cea8f0d..7de1f4c 100644
--- a/src/3rdparty/webkit/Source/WebCore/svg/SVGUseElement.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/svg/SVGUseElement.cpp
@@ -172,11 +172,11 @@ void SVGUseElement::svgAttributeChanged(const QualifiedName& attrName)
             const SVGDocumentExtensions::SVGPendingElements::const_iterator end = clients->end();
             for (SVGDocumentExtensions::SVGPendingElements::const_iterator it = clients->begin(); it != end; ++it) {
                 ASSERT((*it)->hasPendingResources());
-                (*it)->setHasPendingResources(false);
+                (*it)->clearHasPendingResourcesIfPossible();
             }
 
             m_resourceId = String();
-            setHasPendingResources(false);
+            clearHasPendingResourcesIfPossible();
         }
 
         invalidateShadowTree();
@@ -644,6 +644,7 @@ void SVGUseElement::detachInstance()
     if (!m_targetElementInstance)
         return;
     m_targetElementInstance->clearUseElements();
+    m_targetElementInstance->clearChildren();
     m_targetElementInstance = 0;
 }
 
diff --git a/src/3rdparty/webkit/Source/WebCore/testing/Internals.cpp b/src/3rdparty/webkit/Source/WebCore/testing/Internals.cpp
new file mode 100644
index 0000000..caa1274
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/testing/Internals.cpp
@@ -0,0 +1,97 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "Internals.h"
+
+#include "Document.h"
+#include "ExceptionCode.h"
+#include "Settings.h"
+
+namespace WebCore {
+
+const char* Internals::internalsId = "internals";
+
+PassRefPtr<Internals> Internals::create()
+{
+    return adoptRef(new Internals);
+}
+
+Internals::~Internals()
+{
+}
+
+Internals::Internals()
+    : passwordEchoDurationInSecondsBackedUp(false)
+    , passwordEchoEnabledBackedUp(false)
+{
+}
+
+void Internals::setPasswordEchoEnabled(Document* document, bool enabled, ExceptionCode& ec)
+{
+    if (!document || !document->settings()) {
+        ec = INVALID_ACCESS_ERR;
+        return;
+    }
+
+    if (!passwordEchoEnabledBackedUp) {
+        passwordEchoEnabledBackup = document->settings()->passwordEchoEnabled();
+        passwordEchoEnabledBackedUp = true;
+    }
+    document->settings()->setPasswordEchoEnabled(enabled);
+}
+
+void Internals::setPasswordEchoDurationInSeconds(Document* document, double durationInSeconds, ExceptionCode& ec)
+{
+    if (!document || !document->settings()) {
+        ec = INVALID_ACCESS_ERR;
+        return;
+    }
+
+    if (!passwordEchoDurationInSecondsBackedUp) {
+        passwordEchoDurationInSecondsBackup = document->settings()->passwordEchoDurationInSeconds();
+        passwordEchoDurationInSecondsBackedUp = true;
+    }
+    document->settings()->setPasswordEchoDurationInSeconds(durationInSeconds);
+}
+
+void Internals::reset(Document* document)
+{
+    if (!document || !document->settings())
+        return;
+
+    if (passwordEchoDurationInSecondsBackedUp) {
+        document->settings()->setPasswordEchoDurationInSeconds(passwordEchoDurationInSecondsBackup);
+        passwordEchoDurationInSecondsBackedUp = false;
+    }
+
+    if (passwordEchoEnabledBackedUp) {
+        document->settings()->setPasswordEchoEnabled(passwordEchoEnabledBackup);
+        passwordEchoEnabledBackedUp = false;
+    }
+}
+
+}
+
diff --git a/src/3rdparty/webkit/Source/WebCore/testing/Internals.h b/src/3rdparty/webkit/Source/WebCore/testing/Internals.h
new file mode 100644
index 0000000..a56240a
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/testing/Internals.h
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef Internals_h
+#define Internals_h
+
+#include "ExceptionCode.h"
+#include <wtf/PassRefPtr.h>
+#include <wtf/RefCounted.h>
+
+namespace WebCore {
+
+class Document;
+
+class Internals : public RefCounted<Internals> {
+public:
+    static PassRefPtr<Internals> create();
+    virtual ~Internals();
+
+    void reset(Document*);
+
+    void setPasswordEchoEnabled(Document*, bool enabled, ExceptionCode&);
+    void setPasswordEchoDurationInSeconds(Document*, double durationInSeconds, ExceptionCode&);
+
+    static const char* internalsId;
+
+private:
+    Internals();
+
+    double passwordEchoDurationInSecondsBackup;
+    bool passwordEchoEnabledBackup : 1;
+    bool passwordEchoDurationInSecondsBackedUp : 1;
+    bool passwordEchoEnabledBackedUp : 1;
+};
+
+} // namespace WebCore
+
+#endif
diff --git a/src/3rdparty/webkit/Source/WebCore/testing/Internals.idl b/src/3rdparty/webkit/Source/WebCore/testing/Internals.idl
new file mode 100644
index 0000000..e647c9c
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/testing/Internals.idl
@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+module window {
+    interface [OmitConstructor] Internals {
+        void setPasswordEchoEnabled(in Document document, in boolean enabled) raises(DOMException);
+        void setPasswordEchoDurationInSeconds(in Document document, in double durationInSeconds) raises(DOMException);
+    };
+}
diff --git a/src/3rdparty/webkit/Source/WebCore/testing/js/WebCoreTestSupport.cpp b/src/3rdparty/webkit/Source/WebCore/testing/js/WebCoreTestSupport.cpp
new file mode 100644
index 0000000..8a795bf
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/testing/js/WebCoreTestSupport.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebCoreTestSupport.h"
+
+#include "Internals.h"
+#include "JSDOMGlobalObject.h"
+#include "JSDocument.h"
+#include "JSInternals.h"
+#include <JavaScriptCore/APICast.h>
+#include <interpreter/CallFrame.h>
+
+using namespace JSC;
+using namespace WebCore;
+
+namespace WebCoreTestSupport {
+
+void injectInternalsObject(JSContextRef context)
+{
+    JSLock lock(SilenceAssertionsOnly);
+    ExecState* exec = toJS(context);
+    JSDOMGlobalObject* globalObject = static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject());
+    globalObject->putDirect(exec->globalData(), Identifier(exec, Internals::internalsId), toJS(exec, globalObject, Internals::create()));
+}
+
+void resetInternalsObject(JSContextRef context)
+{
+    JSLock lock(SilenceAssertionsOnly);
+    ExecState* exec = toJS(context);
+    JSDOMGlobalObject* globalObject = static_cast<JSDOMGlobalObject*>(exec->lexicalGlobalObject());
+    Internals * internals = toInternals(globalObject->getDirect(exec->globalData(), Identifier(exec, Internals::internalsId)));
+    if (internals) {
+        ScriptExecutionContext* scriptContext = globalObject->scriptExecutionContext();
+        if (scriptContext->isDocument())
+            internals->reset(static_cast<Document*>(scriptContext));
+    }
+}
+
+}
diff --git a/src/3rdparty/webkit/Source/WebCore/testing/js/WebCoreTestSupport.h b/src/3rdparty/webkit/Source/WebCore/testing/js/WebCoreTestSupport.h
new file mode 100644
index 0000000..bfd8a8b
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/testing/js/WebCoreTestSupport.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebCoreTestSupport_h
+#define WebCoreTestSupport_h
+
+typedef const struct OpaqueJSContext* JSContextRef;
+
+namespace WebCoreTestSupport {
+
+void injectInternalsObject(JSContextRef);
+void resetInternalsObject(JSContextRef);
+
+} // namespace WebCore
+
+#endif
diff --git a/src/3rdparty/webkit/Source/WebCore/testing/v8/WebCoreTestSupport.cpp b/src/3rdparty/webkit/Source/WebCore/testing/v8/WebCoreTestSupport.cpp
new file mode 100644
index 0000000..1f2c2e5
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/testing/v8/WebCoreTestSupport.cpp
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WebCoreTestSupport.h"
+
+#include "Document.h"
+#include "Internals.h"
+#include "ScriptExecutionContext.h"
+#include "V8Internals.h"
+
+#include <v8.h>
+
+using namespace WebCore;
+
+namespace WebCoreTestSupport {
+
+void injectInternalsObject(v8::Local<v8::Context> context)
+{
+    v8::Context::Scope contextScope(context);
+    v8::HandleScope scope;
+
+    context->Global()->Set(v8::String::New(Internals::internalsId), toV8(Internals::create()));
+}
+
+void resetInternalsObject(v8::Local<v8::Context> context)
+{
+    v8::Context::Scope contextScope(context);
+    v8::HandleScope scope;
+
+    v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(context->Global()->Get(v8::String::New(Internals::internalsId)));
+    Internals * internals = V8Internals::toNative(object);
+    if (internals) {
+        ScriptExecutionContext* scriptContext = getScriptExecutionContext();
+        if (scriptContext->isDocument())
+            internals->reset(static_cast<Document*>(scriptContext));
+    }
+}
+
+}
diff --git a/src/3rdparty/webkit/Source/WebCore/testing/v8/WebCoreTestSupport.h b/src/3rdparty/webkit/Source/WebCore/testing/v8/WebCoreTestSupport.h
new file mode 100644
index 0000000..fa49c60
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebCore/testing/v8/WebCoreTestSupport.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2011 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebCoreTestSupport_h
+#define WebCoreTestSupport_h
+
+namespace v8 {
+class Context;
+template <class T> class Local;
+}
+
+namespace WebCoreTestSupport {
+
+void injectInternalsObject(v8::Local<v8::Context>);
+void resetInternalsObject(v8::Local<v8::Context>);
+
+} // namespace WebCore
+
+#endif
diff --git a/src/3rdparty/webkit/Source/WebCore/xml/XPathFunctions.cpp b/src/3rdparty/webkit/Source/WebCore/xml/XPathFunctions.cpp
index d343a59..1807172 100644
--- a/src/3rdparty/webkit/Source/WebCore/xml/XPathFunctions.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/xml/XPathFunctions.cpp
@@ -39,6 +39,12 @@
 #include "XPathValue.h"
 #include <wtf/MathExtras.h>
 
+#if COMPILER(WINSCW)
+#define BOOL_TO_VALUE_CAST (unsigned long)
+#else
+#define BOOL_TO_VALUE_CAST
+#endif
+
 namespace WebCore {
 namespace XPath {
 
@@ -453,9 +459,9 @@ Value FunStartsWith::evaluate() const
     String s2 = arg(1)->evaluate().toString();
 
     if (s2.isEmpty())
-        return true;
+        return BOOL_TO_VALUE_CAST true;
 
-    return s1.startsWith(s2);
+    return BOOL_TO_VALUE_CAST (s1.startsWith(s2));
 }
 
 Value FunContains::evaluate() const
@@ -463,10 +469,10 @@ Value FunContains::evaluate() const
     String s1 = arg(0)->evaluate().toString();
     String s2 = arg(1)->evaluate().toString();
 
-    if (s2.isEmpty()) 
-        return true;
+    if (s2.isEmpty())
+        return BOOL_TO_VALUE_CAST true;
 
-    return s1.contains(s2) != 0;
+    return BOOL_TO_VALUE_CAST (s1.contains(s2) != 0);
 }
 
 Value FunSubstringBefore::evaluate() const
@@ -571,17 +577,17 @@ Value FunTranslate::evaluate() const
 
 Value FunBoolean::evaluate() const
 {
-    return arg(0)->evaluate().toBoolean();
+    return BOOL_TO_VALUE_CAST (arg(0)->evaluate().toBoolean());
 }
 
 Value FunNot::evaluate() const
 {
-    return !arg(0)->evaluate().toBoolean();
+    return BOOL_TO_VALUE_CAST (!arg(0)->evaluate().toBoolean());
 }
 
 Value FunTrue::evaluate() const
 {
-    return true;
+    return BOOL_TO_VALUE_CAST true;
 }
 
 Value FunLang::evaluate() const
@@ -600,12 +606,12 @@ Value FunLang::evaluate() const
     }
 
     if (!languageAttribute)
-        return false;
+        return BOOL_TO_VALUE_CAST false;
 
     String langValue = languageAttribute->value();
     while (true) {
         if (equalIgnoringCase(langValue, lang))
-            return true;
+            return BOOL_TO_VALUE_CAST true;
 
         // Remove suffixes one by one.
         size_t index = langValue.reverseFind('-');
@@ -614,12 +620,12 @@ Value FunLang::evaluate() const
         langValue = langValue.left(index);
     }
 
-    return false;
+    return BOOL_TO_VALUE_CAST false;
 }
 
 Value FunFalse::evaluate() const
 {
-    return false;
+    return BOOL_TO_VALUE_CAST false;
 }
 
 Value FunNumber::evaluate() const
diff --git a/src/3rdparty/webkit/Source/WebCore/xml/XPathPredicate.cpp b/src/3rdparty/webkit/Source/WebCore/xml/XPathPredicate.cpp
index 2a6482f..d70d309 100644
--- a/src/3rdparty/webkit/Source/WebCore/xml/XPathPredicate.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/xml/XPathPredicate.cpp
@@ -38,6 +38,12 @@
 #include <math.h>
 #include <wtf/MathExtras.h>
 
+#if COMPILER(WINSCW)
+#define BOOL_TO_VALUE_CAST (unsigned long)
+#else
+#define BOOL_TO_VALUE_CAST
+#endif
+
 namespace WebCore {
 namespace XPath {
         
@@ -142,7 +148,7 @@ bool EqTestOp::compare(const Value& lhs, const Value& rhs) const
             // If one object to be compared is a node-set and the other is a boolean, then the comparison will be true
             // if and only if the result of performing the comparison on the boolean and on the result of converting
             // the node-set to a boolean using the boolean function is true.
-            return compare(lhs.toBoolean(), rhs);
+            return compare(BOOL_TO_VALUE_CAST (lhs.toBoolean()), rhs);
         }
         ASSERT(0);
     }
@@ -161,7 +167,7 @@ bool EqTestOp::compare(const Value& lhs, const Value& rhs) const
             return false;
         }
         if (lhs.isBoolean())
-            return compare(lhs, rhs.toBoolean());
+            return compare(lhs, BOOL_TO_VALUE_CAST (rhs.toBoolean()));
         ASSERT(0);
     }
     
@@ -198,7 +204,7 @@ Value EqTestOp::evaluate() const
     Value lhs(subExpr(0)->evaluate());
     Value rhs(subExpr(1)->evaluate());
 
-    return compare(lhs, rhs);
+    return BOOL_TO_VALUE_CAST compare(lhs, rhs);
 }
 
 LogicalOp::LogicalOp(Opcode opcode, Expression* lhs, Expression* rhs)
@@ -224,9 +230,9 @@ Value LogicalOp::evaluate() const
     // dictates that we must do short-circuit evaluation
     bool lhsBool = lhs.toBoolean();
     if (lhsBool == shortCircuitOn())
-        return lhsBool;
+        return BOOL_TO_VALUE_CAST lhsBool;
 
-    return subExpr(1)->evaluate().toBoolean();
+    return BOOL_TO_VALUE_CAST (subExpr(1)->evaluate().toBoolean());
 }
 
 Value Union::evaluate() const
diff --git a/src/3rdparty/webkit/Source/WebCore/xml/XPathResult.cpp b/src/3rdparty/webkit/Source/WebCore/xml/XPathResult.cpp
index 1dcde2e..7377509 100644
--- a/src/3rdparty/webkit/Source/WebCore/xml/XPathResult.cpp
+++ b/src/3rdparty/webkit/Source/WebCore/xml/XPathResult.cpp
@@ -35,6 +35,12 @@
 #include "XPathEvaluator.h"
 #include "XPathException.h"
 
+#if COMPILER(WINSCW)
+#define BOOL_TO_VALUE_CAST (unsigned long)
+#else
+#define BOOL_TO_VALUE_CAST
+#endif
+
 namespace WebCore {
 
 using namespace XPath;
@@ -84,7 +90,7 @@ void XPathResult::convertTo(unsigned short type, ExceptionCode& ec)
             break;
         case BOOLEAN_TYPE:
             m_resultType = type;
-            m_value = m_value.toBoolean();
+            m_value = BOOL_TO_VALUE_CAST (m_value.toBoolean());
             break;
         case UNORDERED_NODE_ITERATOR_TYPE:
         case UNORDERED_NODE_SNAPSHOT_TYPE:
diff --git a/src/3rdparty/webkit/Source/WebKit.pri b/src/3rdparty/webkit/Source/WebKit.pri
index 309357c..5bd9577 100644
--- a/src/3rdparty/webkit/Source/WebKit.pri
+++ b/src/3rdparty/webkit/Source/WebKit.pri
@@ -71,6 +71,7 @@ CONFIG(release, debug|release) {
 
 INCLUDEPATH += \
     $$PWD \
+    $$PWD/../include \
     $$OUTPUT_DIR/include/QtWebKit \
     $$OUTPUT_DIR/include \
     $$QT.script.includes
@@ -157,6 +158,7 @@ disable_uitools: DEFINES *= QT_NO_UITOOLS
 # Disable a few warnings on Windows. The warnings are also
 # disabled in WebKitLibraries/win/tools/vsprops/common.vsprops
 win32-msvc*|wince*: QMAKE_CXXFLAGS += -wd4291 -wd4344 -wd4396 -wd4503 -wd4800 -wd4819 -wd4996
+win32-icc: QMAKE_CXXFLAGS += -wd873
 
 CONFIG(qt_minimal) {
     DEFINES *= QT_NO_ANIMATION
diff --git a/src/3rdparty/webkit/Source/WebKit/ChangeLog b/src/3rdparty/webkit/Source/WebKit/ChangeLog
index ac05a54..20f61f5 100644
--- a/src/3rdparty/webkit/Source/WebKit/ChangeLog
+++ b/src/3rdparty/webkit/Source/WebKit/ChangeLog
@@ -1,3 +1,29 @@
+2011-06-01  Jer Noble  <jer.noble@apple.com>
+
+        Reviewed by Eric Carlson.
+
+        Move Full Screen Controllers into WebCore.
+
+        Remove dependency on QTKit from wekitExitFullscreen()
+        https://bugs.webkit.org/show_bug.cgi?id=61843
+
+        WebVideoFullscreenController, WebVideoFullscreenHUDController, and WebWindowAnimation
+        have been moved into WebCore.
+
+        * WebKit.xcodeproj/project.pbxproj:
+
+2011-06-30  Leandro Pereira  <leandro@profusion.mobi>
+
+        Reviewed by Simon Hausmann.
+
+        generate-webkitversion.pl should not "use Switch"
+        https://bugs.webkit.org/show_bug.cgi?id=63628
+
+        Switch got deprecated on recent Perl versions and the script wasn't
+        using the switch statement.
+        
+        * scripts/generate-webkitversion.pl: Remove "use Switch;" line.
+
 2011-04-18  Timothy Hatcher  <timothy@apple.com>
 
         Make update-webkit-localizable-strings put WebKit/win strings in WebCore
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebframe.cpp b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebframe.cpp
index 026a7df..5ea7059 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebframe.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebframe.cpp
@@ -751,8 +751,10 @@ QMultiMap<QString, QString> QWebFrame::metaData() const
 
 static inline void clearCoreFrame(WebCore::Frame* frame)
 {
-    frame->loader()->activeDocumentLoader()->writer()->begin();
-    frame->loader()->activeDocumentLoader()->writer()->end();
+    WebCore::DocumentLoader* documentLoader = frame->loader()->activeDocumentLoader();
+    Q_ASSERT(documentLoader);
+    documentLoader->writer()->begin();
+    documentLoader->writer()->end();
 }
 
 static inline bool isCoreFrameClear(WebCore::Frame* frame)
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebsettings.cpp
index 3606764..9123ede 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebsettings.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebsettings.cpp
@@ -273,6 +273,11 @@ void QWebSettingsPrivate::apply()
         settings->setNeedsSiteSpecificQuirks(value);
 
         settings->setUsesPageCache(WebCore::pageCache()->capacity());
+
+#if ENABLE(PASSWORD_ECHO)
+        settings->setPasswordEchoEnabled(true);
+        settings->setPasswordEchoDurationInSeconds(1);
+#endif
     } else {
         QList<QWebSettingsPrivate*> settings = *::allSettings();
         for (int i = 0; i < settings.count(); ++i)
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebview.cpp
index f4b23f3..76b927b 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebview.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebview.cpp
@@ -372,7 +372,7 @@ void QWebViewPrivate::detachCurrentPage()
     Makes \a page the new web page of the web view.
 
     The parent QObject of the provided page remains the owner
-    of the object. If the current document is a child of the web
+    of the object. If the current page is a child of the web
     view, it will be deleted.
 
     \sa page()
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog
index d702142..32428f1 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog
@@ -1,35 +1,386 @@
-2011-06-29  Alexis Menard  <alexis.menard@openbossa.org>
+2011-09-06  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
+
+        [Qt][Symbian] REGRESSION[94105] DumpRenderTree.exe doesn't build on Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=67644
+
+        Reviewed by Csaba Osztrogonác.
+
+        * symbian/eabi/QtWebKitu.def: add missing entry for
+        FrameLoaderClientQt::dumpProgressFinishedCallback(bool)
+
+2011-08-31  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        [Qt] Unskip API test for load signals order
+        https://bugs.webkit.org/show_bug.cgi?id=67285
+
+        Reviewed by Andreas Kling.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::loadSignalsOrder):
+
+2011-08-30  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Emit last progress notification before calling dispatchDidFinishLoad
+        https://bugs.webkit.org/show_bug.cgi?id=28851
+
+        Reviewed by Adam Barth.
+
+        Add infrastructure to dump progressFinishedNotification callback in DRT.
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::dumpProgressFinishedCallback):
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::postProgressFinishedNotification):
+        * WebCoreSupport/FrameLoaderClientQt.h:
+
+2011-09-02  Jade Han  <jade.han@nokia.com>
+
+        [Qt][Symbian] REGRESSION(93235) Missing .def update
+        https://bugs.webkit.org/show_bug.cgi?id=67307
+
+        Reviewed by Laszlo Gombos.
+
+        * symbian/eabi/QtWebKitu.def:
+
+2011-08-12  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        [Qt] Add test for correct order of load signals in QWebPage
+        https://bugs.webkit.org/show_bug.cgi?id=66016
 
         Reviewed by Benjamin Poulain.
 
-        [Qt] Add Qt dependencies in QtWebKit's main pro file.
-        https://bugs.webkit.org/show_bug.cgi?id=63639
+        Add API test to ensure the order of load signals: loadStarted() needs to be emitted
+        first, then loadProgress(100), followed by loadFinished().
 
-        syncqt, the script which generates the headers inside Qt parses
-        the main pro file of QtWebKit to check the Qt dependencies. It used
-        to be WebCore.pro but after the build reorganization QtWebKit.pro is
-        the new main pro file so we need to add the network dependency just like
-        we did in WebCore.pro.
+        The test is skipped since this right now is broken, the bug
+        https://bugs.webkit.org/show_bug.cgi?id=28851 tracks one possible way to fix.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (SpyForLoadSignalsOrder::SpyForLoadSignalsOrder):
+        (SpyForLoadSignalsOrder::isFinished):
+        (SpyForLoadSignalsOrder::onLoadProgress):
+        (tst_QWebPage::loadSignalsOrder_data):
+        (tst_QWebPage::loadSignalsOrder):
+
+2011-08-25  Ademar de Souza Reis Jr.  <ademar.reis@openbossa.org>
+
+        Unreviewed QtWebKit.pro fix for when building inside Qt
+
+        Patch by Simo Fält <simo.falt@nokia.com>
+
+        The QtWebKit version was being overwritten by a global Qt version when
+        QtWebKit was built inside Qt. Fixed by moving the version
+        definition after the inclusion of qbase.pri.
 
         * QtWebKit.pro:
 
-2011-06-23  Csaba Osztrogonác  <ossy@webkit.org>
+2011-08-18  Chang Shu  <cshu@webkit.org>
 
-        Rubber-stamped by Andreas Kling.
+        Add support of setPasswordEchoEnabled and setPasswordEchoDuration for password echo feature
+        https://bugs.webkit.org/show_bug.cgi?id=66052
 
-        [Qt] Fix tst_QWebFrame::setHtmlWithResource() API test
-        https://bugs.webkit.org/show_bug.cgi?id=63235
+        Reviewed by Alexey Proskuryakov.
+
+        Enable password echo under the build flag.
+
+        * Api/qwebsettings.cpp:
+        (QWebSettingsPrivate::apply):
+
+2011-08-16  Chang Shu  <cshu@webkit.org>
+
+        Support reset in WebCore::Internals
+        https://bugs.webkit.org/show_bug.cgi?id=66307
+
+        Reviewed by Dimitri Glazkov.
+
+        Added framework code in WebKit.
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::resetInternalsObject):
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
+2011-06-09  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Andreas Kling.
+
+        Teach Qt about window.internals
+        https://bugs.webkit.org/show_bug.cgi?id=61074
+
+        * WebCoreSupport/DumpRenderTreeSupportQt.cpp:
+        (DumpRenderTreeSupportQt::injectInternalsObject):
+        * WebCoreSupport/DumpRenderTreeSupportQt.h:
+
+2011-08-23  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        [Qt] Fix build on Lion
+
+        https://bugs.webkit.org/show_bug.cgi?id=66770
+
+        Reviewed by Andreas Kling.
+
+        We were mistakenly picking up mac/WebCoreSystemInterface.h instead of
+        the Qt one, and building on Lion revealed this when a typedef for
+        IOSurfaceRef was wrapped in PLATFORM(MAC).
+
+        For now we fix this by including WebCoreSystemInterface using
+        brackets, so that we'll pick up the right file based on the
+        include paths. This also means exposing a few missing enums
+        in our own version of the file, so those were added.
+
+        Lasty, we need to link against the right system interface library
+        on Lion.
+
+        * QtWebKit.pro:
+
+2011-08-05  Dawit Alemayehu  <adawit@kde.org>
+
+        Reviewed by Andreas Kling.
+
+        Reverted commit r87797, http://trac.webkit.org/changeset/87797, because it
+        causes the regression reported under bug# 63582.
+
+        [Qt] REGRESSION(r87797): Broke KDEWebKit's custom QNAM.
+        https://bugs.webkit.org/show_bug.cgi?id=63582
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::setFrame):
+
+2011-07-26  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Change default backend to use GStreamer on Linux and QuickTime on Mac.
+        https://bugs.webkit.org/show_bug.cgi?id=63472
+
+        Use the flag WTF_USE_QTKIT=1 rather than USE_QTKIT=1 because that flag doesn't
+        exist anymore, it's the default. Ditto for GStreamer.
+
+        * QtWebKit.pro:
+
+2011-06-23  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Eric Carlson.
+
+        [Qt] Implement fullscreen support on Mac with the QuickTime backend.
+        https://bugs.webkit.org/show_bug.cgi?id=61728
+
+        Implement fullscreen support for Qt when using the QuickTime backend.
+        We mostly use what is already done for the Mac port.
+
+        * QtWebKit.pro:
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::ChromeClientQt):
+        (WebCore::ChromeClientQt::~ChromeClientQt):
+        * WebCoreSupport/ChromeClientQt.h:
+        * WebCoreSupport/FullScreenVideoQt.cpp:
+        (WebCore::FullScreenVideoQt::FullScreenVideoQt):
+        (WebCore::FullScreenVideoQt::~FullScreenVideoQt):
+        (WebCore::FullScreenVideoQt::enterFullScreenForNode):
+        (WebCore::FullScreenVideoQt::exitFullScreenForNode):
+        (WebCore::FullScreenVideoQt::requiresFullScreenForVideoPlayback):
+        (WebCore::FullScreenVideoQt::isValid):
+        * WebCoreSupport/FullScreenVideoQt.h:
+        * WebCoreSupport/QTKitFullScreenVideoHandler.h: Added.
+        * WebCoreSupport/QTKitFullScreenVideoHandler.mm: Added.
+        (QTKitFullScreenVideoHandler::QTKitFullScreenVideoHandler):
+        (QTKitFullScreenVideoHandler::~QTKitFullScreenVideoHandler):
+        (QTKitFullScreenVideoHandler::enterFullScreen):
+        (QTKitFullScreenVideoHandler::exitFullScreen):
+        * WebCoreSupport/WebSystemInterface.mm:
+        (InitWebCoreSystemInterface):
+
+2011-07-27  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        [Qt] QtWebkit never finishes loading sites when they are loaded after an initial QUrl fails to load.
+        https://bugs.webkit.org/show_bug.cgi?id=61328
+
+        Reviewed by Andreas Kling.
+
+        Change the hooks in FrameLoaderClient we use for emitting signals. Instead of
+        emitting signals in the progress notification functions, we use the
+        dispatchDid{Start,Finish,Fail}* functions. The main reason behind this change is
+        that loading code is prepared to handle load() when inside those functions.
+
+        The crash was being caused by setUrl() (and load()) being called when
+        loadFinished(false) was emitted. The problem here is that when
+        postProgressFinishedNotification the FrameLoader wasn't ready for taking a load()
+        call again, because it was still the ProvisionalLoadState but with the
+        provisionalDocumentLoader already removed.
+
+        To emulate the same behavior that QtWebKit had when using
+        postProgressFinishedNotification, we now keep track of the frame originating the
+        load, and emit the signals when this frame's client is called.
+
+        The patch keeps the existing semantics for QWebPage signals, but we now emit the
+        QWebFrame signals everytime, not only when they are the originating frame for
+        loading.
+
+        * Api/qwebframe.cpp:
+        (clearCoreFrame): Document our assumption that activeDocumentLoader will exist.
+
+        * WebCoreSupport/FrameLoaderClientQt.h: Remove m_loadError, add a boolean to keep
+        track whether the frame is originating the load. Remove the signals from
+        FrameLoaderClientQt since we will emit QWebFrame and QWebPage signals directly.
+
+        * WebCoreSupport/FrameLoaderClientQt.cpp:
+        (WebCore::FrameLoaderClientQt::FrameLoaderClientQt): Initialize m_isOriginatingLoad.
+
+        (WebCore::FrameLoaderClientQt::setFrame): Do not connect QWebFrame and QWebPage
+        signals to our signals for load/finished, signal emission will be done manually.
+
+        (WebCore::FrameLoaderClientQt::dispatchDidStartProvisionalLoad): Emit
+        loadStarted() signal and make the first notification of estimation change, that
+        Qt API tests expect to exist and notify 10%.
+
+        (WebCore::FrameLoaderClientQt::dispatchDidFinishLoad): Remove reference to
+        m_loadError and emit loadFinished() signal.
+
+        (WebCore::FrameLoaderClientQt::postProgressStartedNotification): Remove signal
+        emission and mark the originating load as true, since only the originating frame
+        gets this call in its client.
+
+        (WebCore::FrameLoaderClientQt::postProgressFinishedNotification): Remove signal
+        emission.
+
+        (WebCore::FrameLoaderClientQt::callErrorPageExtension): Return whether the call
+        was successful or not. This wasn't necessary before because a successful call for
+        error page would lead to a load(), that cleared the m_loadError.
+        (WebCore::FrameLoaderClientQt::dispatchDidFailProvisionalLoad): Remove reference
+        to m_loadError and emit finished signal indicating error if ErrorPage extension
+        doesn't handle it.
+        (WebCore::FrameLoaderClientQt::dispatchDidFailLoad): Ditto.
+
+        (WebCore::FrameLoaderClientQt::emitLoadStarted): Emit the loadStarted() signal
+        for the QWebFrame, and if the originating load also do for the QWebPage.
+
+        (WebCore::FrameLoaderClientQt::emitLoadFinished): Same as before but for
+        loadFinished(). Take care to reset the originating load flag before the signals
+        are emitted, since they might want to set it back again.
+
+        * tests/qwebframe/tst_qwebframe.cpp:
+        (URLSetter::URLSetter): Object that sets the url using either load() or setUrl()
+        when a certain signal is emitted in the frame.
+
+        (URLSetter::execute):
+        (tst_QWebFrame::loadInSignalHandlers_data):
+        (tst_QWebFrame::loadInSignalHandlers): New test inspired by the bug test case. This test
+        crashes without this patch applied.
+
+2011-07-25  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        [Qt] Add more tests to cover the behavior of loadFinished() signal
+        https://bugs.webkit.org/show_bug.cgi?id=63490
+
+        Reviewed by Benjamin Poulain.
+
+        * tests/qwebframe/tst_qwebframe.cpp:
+        (FakeReply::FakeReply):
+        (FakeNetworkManager::createRequest): Add a fake reply that gives 404 error code.
+
+        (tst_QWebFrame::loadFinishedAfterNotFoundError): Verify that we get loadFinished(false)
+        after a 404 error without contents.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::errorPageExtensionLoadFinished): Verify if the argument of loadFinished()
+        is true when we use error page extension to produce our own error pages.
+
+2011-07-12  Hui Huang  <Hui.2.Huang@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] Fix compiling errors with QtWebkit 2.2 WINSCW build.
+        https://bugs.webkit.org/show_bug.cgi?id=64391
+
+        (QtWebKit-2.2 only, patch not in webkit trunk)
+
+        * symbian/bwins/QtWebKitu.def:
+
+2011-07-19  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        [Qt] Improve documentation of QWebView::setPage()
+        https://bugs.webkit.org/show_bug.cgi?id=64827
+
+        Reviewed by Noam Rosenthal.
+
+        * Api/qwebview.cpp: Use the word 'page' to refer to a QWebPage instead of 'document'.
+
+2011-05-16  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        plugins/invalidate_rect.html fails on linux ports
+
+        Add ChromeClientQt::allowsAcceleratedCompositing().
+
+        https://bugs.webkit.org/show_bug.cgi?id=54051
+
+        * WebCoreSupport/ChromeClientQt.cpp:
+        (WebCore::ChromeClientQt::allowsAcceleratedCompositing):
+        * WebCoreSupport/ChromeClientQt.h:
+
+2011-07-01  Jade Han  <jade.han@nokia.com>
+
+        [Qt][Symbian] Update .def file for Symbian to build Tools
+        https://bugs.webkit.org/show_bug.cgi?id=61200
+
+        Reviewed by Laszlo Gombos.
+
+        Add newly introduced symbols to fix building the Tools directory for Symbian.
+
+        * symbian/eabi/QtWebKitu.def:
+
+2011-06-30  Rafael Brandao  <rafael.lobo@openbossa.org>
+
+        Reviewed by Benjamin Poulain.
 
         [Qt] Fix tst_QWebFrame::renderGeometry() API test
         https://bugs.webkit.org/show_bug.cgi?id=63236
+        
+        This test required a security origin with granted permission to request local resources.
+        By default, only local files can load local resources. So modified baseUrl to be a local file.
 
-        [Qt] Fix tst_QWebFrame::setUrlWithPendingLoads() API test
-        https://bugs.webkit.org/show_bug.cgi?id=63237
-
-        * tests/qwebframe/tst_qwebframe.cpp: Mark failing test cases as expected fails until real fix.
-        (tst_QWebFrame::setHtmlWithResource):
+        * tests/qwebframe/tst_qwebframe.cpp:
         (tst_QWebFrame::renderGeometry):
 
+2011-07-01  Jade Han  <jade.han@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt][Symbian] Update .def file for Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=61200
+
+        Add newly introduced symbols to fix the Symbian build.
+
+        * symbian/eabi/QtWebKitu.def:
+
+2011-06-30  Fabrizio Machado  <fabrizio.machado@nokia.com>
+
+        Reviewed by Benjamin Poulain.
+        
+        [Qt] QML Webview causes performance drops
+        https://bugs.webkit.org/show_bug.cgi?id=57554
+
+        Remove tiledBackingStoreEnabled from QML WebView.
+        
+        * declarative/qdeclarativewebview.cpp:
+        (QDeclarativeWebView::setPage):
+
+2011-06-29  Alexis Menard  <alexis.menard@openbossa.org>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] Add Qt dependencies in QtWebKit's main pro file.
+        https://bugs.webkit.org/show_bug.cgi?id=63639
+
+        syncqt, the script which generates the headers inside Qt parses
+        the main pro file of QtWebKit to check the Qt dependencies. It used
+        to be WebCore.pro but after the build reorganization QtWebKit.pro is
+        the new main pro file so we need to add the network dependency just like
+        we did in WebCore.pro.
+
+        * QtWebKit.pro:
+
 2011-06-23  Csaba Osztrogonác  <ossy@webkit.org>
 
         Rubber-stamped by Andreas Kling.
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro b/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro
index e07f699..41b0d39 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro
+++ b/src/3rdparty/webkit/Source/WebKit/qt/QtWebKit.pro
@@ -42,10 +42,6 @@ win32*:!win32-msvc* {
     contains(DEFINES, ENABLE_WEBGL=1)|contains(CONFIG, texmap): LIBS += $$QMAKE_LIBS_OPENGL
 }
 
-moduleFile=$$PWD/qt_webkit_version.pri
-isEmpty(QT_BUILD_TREE):include($$moduleFile)
-VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}
-
 include_webinspector: RESOURCES += $$SOURCE_DIR/WebCore/inspector/front-end/WebKit.qrc $$WC_GENERATED_SOURCES_DIR/InspectorBackendStub.qrc
 
 # Extract sources to build from the generator definitions
@@ -87,6 +83,9 @@ CONFIG(QTDIR_build) {
     symbian: TARGET =$$TARGET$${QT_LIBINFIX}
 }
 
+moduleFile=$$PWD/qt_webkit_version.pri
+isEmpty(QT_BUILD_TREE):include($$moduleFile)
+VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}
 
 symbian {
     TARGET.EPOCALLOWDLLDATA=1
@@ -218,31 +217,39 @@ contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
 }
 
 contains(DEFINES, ENABLE_VIDEO=1) {
-    !contains(DEFINES, USE_QTKIT=1):!contains(DEFINES, USE_GSTREAMER=1):contains(MOBILITY_CONFIG, multimedia) {
+    !contains(DEFINES, WTF_USE_QTKIT=1):!contains(DEFINES, WTF_USE_GSTREAMER=1):contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
         HEADERS += $$PWD/WebCoreSupport/FullScreenVideoWidget.h
         SOURCES += $$PWD/WebCoreSupport/FullScreenVideoWidget.cpp
     }
 
-    contains(DEFINES, USE_GSTREAMER=1) | contains(MOBILITY_CONFIG, multimedia) {
+    contains(DEFINES, WTF_USE_QTKIT=1) | contains(DEFINES, WTF_USE_GSTREAMER=1) | contains(DEFINES, WTF_USE_QT_MULTIMEDIA=1) {
         HEADERS += $$PWD/WebCoreSupport/FullScreenVideoQt.h
         SOURCES += $$PWD/WebCoreSupport/FullScreenVideoQt.cpp
     }
 
-    contains(DEFINES, USE_QTKIT=1) {
-        INCLUDEPATH += $$SOURCE_DIR/WebCore/platform/qt/
-        INCLUDEPATH += $$SOURCE_DIR/../WebKitLibraries/
+    contains(DEFINES, WTF_USE_QTKIT=1) {
+        INCLUDEPATH += $$SOURCE_DIR/WebCore/platform/qt/ \
+                       $$SOURCE_DIR/WebCore/platform/mac/ \
+                       $$SOURCE_DIR/../WebKitLibraries/
+
         DEFINES+=NSGEOMETRY_TYPES_SAME_AS_CGGEOMETRY_TYPES
-        HEADERS += $$PWD/WebCoreSupport/WebSystemInterface.h
-        SOURCES += $$PWD/WebCoreSupport/WebSystemInterface.mm
+
+        HEADERS += $$PWD/WebCoreSupport/WebSystemInterface.h \
+                   $$PWD/WebCoreSupport/QTKitFullScreenVideoHandler.h
+
+        OBJECTIVE_SOURCES += $$PWD/WebCoreSupport/WebSystemInterface.mm \
+                   $$PWD/WebCoreSupport/QTKitFullScreenVideoHandler.mm
+
+        LIBS+= -framework Security -framework IOKit
         # We can know the Mac OS version by using the Darwin major version
         DARWIN_VERSION = $$split(QMAKE_HOST.version, ".")
         DARWIN_MAJOR_VERSION = $$first(DARWIN_VERSION)
-        equals(DARWIN_MAJOR_VERSION, "10") {
-            LIBS+= $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a -framework Security
-        } else {
-            equals(DARWIN_MAJOR_VERSION, "9") {
-                LIBS+= $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a -framework Security
-            }
+        equals(DARWIN_MAJOR_VERSION, "11") {
+            LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLion.a
+        } else:equals(DARWIN_MAJOR_VERSION, "10") {
+            LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
+        } else:equals(DARWIN_MAJOR_VERSION, "9") {
+            LIBS += $$SOURCE_DIR/../WebKitLibraries/libWebKitSystemInterfaceLeopard.a
         }
     }
 }
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
index ea2c826..a199f78 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.cpp
@@ -75,7 +75,7 @@
 #include <qtooltip.h>
 #include <wtf/OwnPtr.h>
 
-#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA))
+#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
 #include "FullScreenVideoQt.h"
 #include "HTMLMediaElement.h"
 #include "HTMLNames.h"
@@ -92,7 +92,7 @@ bool ChromeClientQt::dumpVisitedLinksCallbacks = false;
 ChromeClientQt::ChromeClientQt(QWebPage* webPage)
     : m_webPage(webPage)
     , m_eventLoop(0)
-#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA))
+#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
     , m_fullScreenVideo(0)
 #endif
 {
@@ -104,7 +104,7 @@ ChromeClientQt::~ChromeClientQt()
     if (m_eventLoop)
         m_eventLoop->exit();
 
-#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA))
+#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
     delete m_fullScreenVideo;
 #endif
 }
@@ -129,6 +129,13 @@ FloatRect ChromeClientQt::windowRect()
     return platformPageClient()->windowRect();
 }
 
+bool ChromeClientQt::allowsAcceleratedCompositing() const
+{
+    if (!platformPageClient())
+        return false;
+    return platformPageClient()->allowsAcceleratedCompositing();
+}
+
 FloatRect ChromeClientQt::pageRect()
 {
     if (!m_webPage)
@@ -661,7 +668,7 @@ IntRect ChromeClientQt::visibleRectForTiledBackingStore() const
 }
 #endif
 
-#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA))
+#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
 FullScreenVideoQt* ChromeClientQt::fullScreenVideo()
 {
     if (!m_fullScreenVideo)
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
index 814a192..f1b7b8e 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
+++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h
@@ -155,6 +155,7 @@ public:
     virtual void scheduleCompositingLayerSync();
     virtual CompositingTriggerFlags allowedCompositingTriggers() const;
 #endif
+    virtual bool allowsAcceleratedCompositing() const;
 
 #if ENABLE(TILED_BACKING_STORE)
     virtual IntRect visibleRectForTiledBackingStore() const;
@@ -164,7 +165,7 @@ public:
     virtual void needTouchEvents(bool) { }
 #endif
  
-#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA))
+#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
     virtual bool supportsFullscreenForNode(const Node*);
     virtual void enterFullscreenForNode(Node*);
     virtual void exitFullscreenForNode(Node*);
@@ -203,7 +204,7 @@ public:
     bool menuBarVisible;
     QEventLoop* m_eventLoop;
 
-#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA))
+#if ENABLE(VIDEO) && (USE(GSTREAMER) || USE(QT_MULTIMEDIA) || USE(QTKIT))
     FullScreenVideoQt* m_fullScreenVideo;
 #endif
 
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
index 9d0b4f9..5d4bf6d 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.cpp
@@ -23,6 +23,9 @@
 #include "config.h"
 #include "DumpRenderTreeSupportQt.h"
 
+#if USE(JSC)
+#include "APICast.h"
+#endif
 #include "ApplicationCacheStorage.h"
 #include "CSSComputedStyleDeclaration.h"
 #include "ChromeClientQt.h"
@@ -74,6 +77,7 @@
 #include "SVGSMILElement.h"
 #endif
 #include "TextIterator.h"
+#include "WebCoreTestSupport.h"
 #include "WorkerThread.h"
 #include <wtf/CurrentTime.h>
 
@@ -673,6 +677,11 @@ void DumpRenderTreeSupportQt::dumpFrameLoader(bool b)
     FrameLoaderClientQt::dumpFrameLoaderCallbacks = b;
 }
 
+void DumpRenderTreeSupportQt::dumpProgressFinishedCallback(bool b)
+{
+    FrameLoaderClientQt::dumpProgressFinishedCallback = b;
+}
+
 void DumpRenderTreeSupportQt::dumpUserGestureInFrameLoader(bool b)
 {
     FrameLoaderClientQt::dumpUserGestureInFrameLoaderCallbacks = b;
@@ -1109,6 +1118,44 @@ void DumpRenderTreeSupportQt::removeShadowRoot(const QWebElement& element)
     webElement->removeShadowRoot();
 }
 
+void DumpRenderTreeSupportQt::injectInternalsObject(QWebFrame* frame)
+{
+    WebCore::Frame* coreFrame = QWebFramePrivate::core(frame);
+#if USE(JSC)
+    JSC::JSLock lock(JSC::SilenceAssertionsOnly);
+
+    JSDOMWindow* window = toJSDOMWindow(coreFrame, mainThreadNormalWorld());
+    Q_ASSERT(window);
+
+    JSC::ExecState* exec = window->globalExec();
+    Q_ASSERT(exec);
+
+    JSContextRef context = toRef(exec);
+    WebCoreTestSupport::injectInternalsObject(context);
+#elif USE(V8)
+    WebCoreTestSupport::injectInternalsObject(V8Proxy::mainWorldContext(coreFrame));
+#endif
+}
+
+void DumpRenderTreeSupportQt::resetInternalsObject(QWebFrame* frame)
+{
+    WebCore::Frame* coreFrame = QWebFramePrivate::core(frame);
+#if USE(JSC)
+    JSC::JSLock lock(JSC::SilenceAssertionsOnly);
+
+    JSDOMWindow* window = toJSDOMWindow(coreFrame, mainThreadNormalWorld());
+    Q_ASSERT(window);
+
+    JSC::ExecState* exec = window->globalExec();
+    Q_ASSERT(exec);
+
+    JSContextRef context = toRef(exec);
+    WebCoreTestSupport::resetInternalsObject(context);
+#elif USE(V8)
+    WebCoreTestSupport::resetInternalsObject(V8Proxy::mainWorldContext(coreFrame));
+#endif
+}
+
 // Provide a backward compatibility with previously exported private symbols as of QtWebKit 4.6 release
 
 void QWEBKIT_EXPORT qt_resumeActiveDOMObjects(QWebFrame* frame)
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
index c93942c..f485cb5 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
+++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/DumpRenderTreeSupportQt.h
@@ -163,6 +163,7 @@ public:
     static QString plainText(const QVariant& rng);
 
     static void dumpFrameLoader(bool b);
+    static void dumpProgressFinishedCallback(bool);
     static void dumpUserGestureInFrameLoader(bool b);
     static void dumpResourceLoadCallbacks(bool b);
     static void dumpResourceResponseMIMETypes(bool b);
@@ -218,6 +219,7 @@ public:
     static QString layerTreeAsText(QWebFrame*);
 
     static void injectInternalsObject(QWebFrame*);
+    static void resetInternalsObject(QWebFrame*);
 };
 
 #endif
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
index 68aecda..5e0a2e6 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
@@ -170,6 +170,7 @@ static QString drtDescriptionSuitableForTestResult(const RefPtr<WebCore::Node> n
 namespace WebCore {
 
 bool FrameLoaderClientQt::dumpFrameLoaderCallbacks = false;
+bool FrameLoaderClientQt::dumpProgressFinishedCallback = false;
 bool FrameLoaderClientQt::dumpUserGestureInFrameLoaderCallbacks = false;
 bool FrameLoaderClientQt::dumpResourceLoadCallbacks = false;
 bool FrameLoaderClientQt::sendRequestReturnsNullOnRedirect = false;
@@ -210,7 +211,7 @@ FrameLoaderClientQt::FrameLoaderClientQt()
     , m_pluginView(0)
     , m_hasSentResponseToPlugin(false)
     , m_hasRepresentation(false)
-    , m_loadError(ResourceError())
+    , m_isOriginatingLoad(false)
 {
 }
 
@@ -229,22 +230,12 @@ void FrameLoaderClientQt::setFrame(QWebFrame* webFrame, Frame* frame)
         return;
     }
 
-    connect(this, SIGNAL(loadStarted()),
-            m_webFrame->page(), SIGNAL(loadStarted()));
-    connect(this, SIGNAL(loadStarted()),
-            m_webFrame, SIGNAL(loadStarted()));
     connect(this, SIGNAL(loadProgress(int)),
             m_webFrame->page(), SIGNAL(loadProgress(int)));
-    connect(this, SIGNAL(loadFinished(bool)),
-            m_webFrame->page(), SIGNAL(loadFinished(bool)));
 
-    // FIXME: The queued connection here is needed because of a problem with QNetworkAccessManager.
-    //        See http://bugreports.qt.nokia.com/browse/QTBUG-18718
     connect(this, SIGNAL(unsupportedContent(QNetworkReply*)),
-            m_webFrame->page(), SIGNAL(unsupportedContent(QNetworkReply*)), Qt::QueuedConnection);
+            m_webFrame->page(), SIGNAL(unsupportedContent(QNetworkReply*)));
 
-    connect(this, SIGNAL(loadFinished(bool)),
-            m_webFrame, SIGNAL(loadFinished(bool)));
     connect(this, SIGNAL(titleChanged(QString)),
             m_webFrame, SIGNAL(titleChanged(QString)));
 }
@@ -448,8 +439,11 @@ void FrameLoaderClientQt::dispatchDidStartProvisionalLoad()
 
     m_lastRequestedUrl = m_frame->loader()->activeDocumentLoader()->requestURL();
 
-    if (m_webFrame)
-        emit m_webFrame->provisionalLoad();
+    if (!m_webFrame)
+        return;
+    emitLoadStarted();
+    postProgressEstimateChangedNotification();
+    emit m_webFrame->provisionalLoad();
 }
 
 
@@ -526,12 +520,11 @@ void FrameLoaderClientQt::dispatchDidFinishLoad()
     if (dumpFrameLoaderCallbacks)
         printf("%s - didFinishLoadForFrame\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
 
-    // Clears the previous error.
-    m_loadError = ResourceError();
-
     if (!m_webFrame)
         return;
+
     m_webFrame->page()->d->updateNavigationActions();
+    emitLoadFinished(true);
 }
 
 
@@ -579,12 +572,8 @@ void FrameLoaderClientQt::revertToProvisionalState(DocumentLoader*)
 
 void FrameLoaderClientQt::postProgressStartedNotification()
 {
-    if (m_webFrame && m_frame->page()) {
-        // As a new load have started, clear the previous error.
-        m_loadError = ResourceError();
-        emit loadStarted();
-        postProgressEstimateChangedNotification();
-    }
+    if (m_webFrame && m_frame->page())
+        m_isOriginatingLoad = true;
     if (m_frame->tree()->parent() || !m_webFrame)
         return;
     m_webFrame->page()->d->updateNavigationActions();
@@ -598,6 +587,9 @@ void FrameLoaderClientQt::postProgressEstimateChangedNotification()
 
 void FrameLoaderClientQt::postProgressFinishedNotification()
 {
+    if (dumpProgressFinishedCallback)
+        printf("postProgressFinishedNotification\n");
+
     // Send a mousemove event to:
     // (1) update the cursor to change according to whatever is underneath the mouse cursor right now;
     // (2) display the tool tip if the mouse hovers a node which has a tool tip.
@@ -611,9 +603,6 @@ void FrameLoaderClientQt::postProgressFinishedNotification()
             }
         }
     }
-
-    if (m_webFrame && m_frame->page())
-        emit loadFinished(m_loadError.isNull());
 }
 
 void FrameLoaderClientQt::setMainFrameDocumentReady(bool)
@@ -1133,38 +1122,39 @@ bool FrameLoaderClientQt::dispatchDidLoadResourceFromMemoryCache(WebCore::Docume
     return false;
 }
 
-void FrameLoaderClientQt::callErrorPageExtension(const WebCore::ResourceError& error)
+bool FrameLoaderClientQt::callErrorPageExtension(const WebCore::ResourceError& error)
 {
     QWebPage* page = m_webFrame->page();
-    if (page->supportsExtension(QWebPage::ErrorPageExtension)) {
-        QWebPage::ErrorPageExtensionOption option;
-
-        if (error.domain() == "QtNetwork")
-            option.domain = QWebPage::QtNetwork;
-        else if (error.domain() == "HTTP")
-            option.domain = QWebPage::Http;
-        else if (error.domain() == "WebKit")
-            option.domain = QWebPage::WebKit;
-        else
-            return;
+    if (!page->supportsExtension(QWebPage::ErrorPageExtension))
+        return false;
+
+    QWebPage::ErrorPageExtensionOption option;
+    if (error.domain() == "QtNetwork")
+        option.domain = QWebPage::QtNetwork;
+    else if (error.domain() == "HTTP")
+        option.domain = QWebPage::Http;
+    else if (error.domain() == "WebKit")
+        option.domain = QWebPage::WebKit;
+    else
+        return false;
 
-        option.url = QUrl(error.failingURL());
-        option.frame = m_webFrame;
-        option.error = error.errorCode();
-        option.errorString = error.localizedDescription();
+    option.url = QUrl(error.failingURL());
+    option.frame = m_webFrame;
+    option.error = error.errorCode();
+    option.errorString = error.localizedDescription();
 
-        QWebPage::ErrorPageExtensionReturn output;
-        if (!page->extension(QWebPage::ErrorPageExtension, &option, &output))
-            return;
+    QWebPage::ErrorPageExtensionReturn output;
+    if (!page->extension(QWebPage::ErrorPageExtension, &option, &output))
+        return false;
 
-        KURL baseUrl(output.baseUrl);
-        KURL failingUrl(option.url);
+    KURL baseUrl(output.baseUrl);
+    KURL failingUrl(option.url);
 
-        WebCore::ResourceRequest request(baseUrl);
-        WTF::RefPtr<WebCore::SharedBuffer> buffer = WebCore::SharedBuffer::create(output.content.constData(), output.content.length());
-        WebCore::SubstituteData substituteData(buffer, output.contentType, output.encoding, failingUrl);
-        m_frame->loader()->load(request, substituteData, false);
-    }
+    WebCore::ResourceRequest request(baseUrl);
+    WTF::RefPtr<WebCore::SharedBuffer> buffer = WebCore::SharedBuffer::create(output.content.constData(), output.content.length());
+    WebCore::SubstituteData substituteData(buffer, output.contentType, output.encoding, failingUrl);
+    m_frame->loader()->load(request, substituteData, false);
+    return true;
 }
 
 void FrameLoaderClientQt::dispatchDidFailProvisionalLoad(const WebCore::ResourceError& error)
@@ -1172,9 +1162,13 @@ void FrameLoaderClientQt::dispatchDidFailProvisionalLoad(const WebCore::Resource
     if (dumpFrameLoaderCallbacks)
         printf("%s - didFailProvisionalLoadWithError\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
 
-    m_loadError = error;
-    if (!error.isNull() && !error.isCancellation())
-        callErrorPageExtension(error);
+    if (!error.isNull() && !error.isCancellation()) {
+        if (callErrorPageExtension(error))
+            return;
+    }
+
+    if (m_webFrame)
+        emitLoadFinished(false);
 }
 
 void FrameLoaderClientQt::dispatchDidFailLoad(const WebCore::ResourceError& error)
@@ -1182,9 +1176,13 @@ void FrameLoaderClientQt::dispatchDidFailLoad(const WebCore::ResourceError& erro
     if (dumpFrameLoaderCallbacks)
         printf("%s - didFailLoadWithError\n", qPrintable(drtDescriptionSuitableForTestResult(m_frame)));
 
-    m_loadError = error;
-    if (!error.isNull() && !error.isCancellation())
-        callErrorPageExtension(error);
+    if (!error.isNull() && !error.isCancellation()) {
+        if (callErrorPageExtension(error))
+            return;
+    }
+
+    if (m_webFrame)
+        emitLoadFinished(false);
 }
 
 WebCore::Frame* FrameLoaderClientQt::dispatchCreatePage(const WebCore::NavigationAction&)
@@ -1682,6 +1680,26 @@ PassRefPtr<FrameNetworkingContext> FrameLoaderClientQt::createNetworkingContext(
     return FrameNetworkingContextQt::create(m_frame, m_webFrame, !MIMESniffingDisabled, m_webFrame->page()->networkAccessManager());
 }
 
+void FrameLoaderClientQt::emitLoadStarted()
+{
+    QWebPage* webPage = m_webFrame->page();
+    if (m_isOriginatingLoad && webPage)
+        emit webPage->loadStarted();
+    emit m_webFrame->loadStarted();
+}
+
+void FrameLoaderClientQt::emitLoadFinished(bool ok)
+{
+    // Signal handlers can lead to a new load, that will use the member again.
+    const bool wasOriginatingLoad = m_isOriginatingLoad;
+    m_isOriginatingLoad = false;
+
+    QWebPage* webPage = m_webFrame->page();
+    if (wasOriginatingLoad && webPage)
+        emit webPage->loadFinished(ok);
+    emit m_webFrame->loadFinished(ok);
+}
+
 }
 
 #include "moc_FrameLoaderClientQt.cpp"
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
index 6cfd9c1..1b9d3b8 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
+++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h
@@ -67,11 +67,10 @@ class FrameLoaderClientQt : public QObject, public FrameLoaderClient {
 
     friend class ::QWebFrame;
     void callPolicyFunction(FramePolicyFunction function, PolicyAction action);
-    void callErrorPageExtension(const ResourceError&);
+    bool callErrorPageExtension(const ResourceError&);
+
 signals:
-    void loadStarted();
     void loadProgress(int d);
-    void loadFinished(bool);
     void titleChanged(const QString& title);
     void unsupportedContent(QNetworkReply*);
 
@@ -248,6 +247,7 @@ public:
     const KURL& lastRequestedUrl() const { return m_lastRequestedUrl; }
 
     static bool dumpFrameLoaderCallbacks;
+    static bool dumpProgressFinishedCallback;
     static bool dumpUserGestureInFrameLoaderCallbacks;
     static bool dumpResourceLoadCallbacks;
     static bool dumpResourceResponseMIMETypes;
@@ -265,6 +265,9 @@ private slots:
     void onIconLoadedForPageURL(const QString&);
 
 private:
+    void emitLoadStarted();
+    void emitLoadFinished(bool ok);
+
     Frame *m_frame;
     QWebFrame *m_webFrame;
     ResourceResponse m_response;
@@ -279,7 +282,7 @@ private:
     bool m_hasRepresentation;
 
     KURL m_lastRequestedUrl;
-    ResourceError m_loadError;
+    bool m_isOriginatingLoad;
 };
 
 }
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
index ef97f3a..b1a6e0f 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
@@ -35,6 +35,10 @@
 #include "PlatformVideoWindowPrivate.h"
 #endif
 
+#if USE(QTKIT)
+#include "QTKitFullScreenVideoHandler.h"
+#endif
+
 #if USE(QT_MULTIMEDIA)
 #include <QGraphicsVideoItem>
 #include <QMediaPlayer>
@@ -147,6 +151,10 @@ FullScreenVideoQt::FullScreenVideoQt(ChromeClientQt* chromeClient)
 #if USE(GSTREAMER)
     m_FullScreenVideoHandlerGStreamer = new GStreamerFullScreenVideoHandler;
 #endif
+
+#if USE(QTKIT)
+    m_FullScreenVideoHandlerQTKit = new QTKitFullScreenVideoHandler;
+#endif
 }
 
 FullScreenVideoQt::~FullScreenVideoQt()
@@ -157,6 +165,9 @@ FullScreenVideoQt::~FullScreenVideoQt()
 #if USE(GSTREAMER)
     delete m_FullScreenVideoHandlerGStreamer;
 #endif
+#if USE(QTKIT)
+    delete m_FullScreenVideoHandlerQTKit;
+#endif
 }
 
 void FullScreenVideoQt::enterFullScreenForNode(Node* node)
@@ -185,6 +196,10 @@ void FullScreenVideoQt::enterFullScreenForNode(Node* node)
     m_FullScreenVideoHandlerGStreamer->setVideoElement(m_videoElement);
     m_FullScreenVideoHandlerGStreamer->enterFullScreen();
 #endif
+
+#if USE(QTKIT)
+    m_FullScreenVideoHandlerQTKit->enterFullScreen(m_videoElement);
+#endif
 }
 
 void FullScreenVideoQt::exitFullScreenForNode(Node* node)
@@ -211,6 +226,11 @@ void FullScreenVideoQt::exitFullScreenForNode(Node* node)
 #if USE(GSTREAMER)
     m_FullScreenVideoHandlerGStreamer->exitFullScreen();
 #endif
+
+#if USE(QTKIT)
+    m_FullScreenVideoHandlerQTKit->exitFullScreen();
+#endif
+
 }
 
 void FullScreenVideoQt::aboutToClose()
@@ -232,9 +252,6 @@ bool FullScreenVideoQt::requiresFullScreenForVideoPlayback()
 {
 #if USE(QT_MULTIMEDIA)
     return m_FullScreenVideoHandler ? m_FullScreenVideoHandler->requiresFullScreenForVideoPlayback() : false;
-#endif
-#if USE(GSTREAMER)
-    return false;
 #else
     return false;
 #endif
@@ -247,6 +264,8 @@ bool FullScreenVideoQt::isValid() const
 #endif
 #if USE(GSTREAMER)
     return m_FullScreenVideoHandlerGStreamer;
+#elif USE(QTKIT)
+    return m_FullScreenVideoHandlerQTKit;
 #else
     return 0;
 #endif
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
index fda153d..06438ea 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
+++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
@@ -38,6 +38,9 @@ class Node;
 #if USE(QT_MULTIMEDIA)
 class MediaPlayerPrivateQt;
 #endif
+#if USE(QTKIT)
+class QTKitFullScreenVideoHandler;
+#endif
 
 // We do not use ENABLE or USE because moc does not expand these macros.
 #if defined(WTF_USE_GSTREAMER) && WTF_USE_GSTREAMER
@@ -109,6 +112,9 @@ private:
 #if USE(GSTREAMER)
     GStreamerFullScreenVideoHandler* m_FullScreenVideoHandlerGStreamer;
 #endif
+#if USE(QTKIT)
+    QTKitFullScreenVideoHandler* m_FullScreenVideoHandlerQTKit;
+#endif
 };
 
 }
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QTKitFullScreenVideoHandler.h b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QTKitFullScreenVideoHandler.h
new file mode 100644
index 0000000..39af101
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QTKitFullScreenVideoHandler.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef QTKitFullScreenVideoHandler_h
+#define QTKitFullScreenVideoHandler_h
+
+#include <OwnPtr.h>
+
+namespace WebCore {
+
+class HTMLVideoElement;
+
+class QTKitFullScreenVideoHandler {
+    class QTKitFullScreenVideoHandlerPrivate;
+public:
+    QTKitFullScreenVideoHandler();
+    ~QTKitFullScreenVideoHandler();
+    void enterFullScreen(HTMLVideoElement*);
+    void exitFullScreen();
+
+private:
+    OwnPtr<QTKitFullScreenVideoHandlerPrivate> privateData;
+};
+
+}
+
+#endif // QTKitFullScreenVideoHandler_h
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QTKitFullScreenVideoHandler.mm b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QTKitFullScreenVideoHandler.mm
new file mode 100644
index 0000000..5e94442
--- /dev/null
+++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/QTKitFullScreenVideoHandler.mm
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "config.h"
+
+#include "QTKitFullScreenVideoHandler.h"
+
+#import <Cocoa/Cocoa.h>
+
+#include "HTMLVideoElement.h"
+#include "WebVideoFullscreenController.h"
+
+using namespace WebCore;
+
+class QTKitFullScreenVideoHandler::QTKitFullScreenVideoHandlerPrivate {
+public :
+    WebVideoFullscreenController* m_FullScreenController;
+};
+
+QTKitFullScreenVideoHandler::QTKitFullScreenVideoHandler()
+    : privateData (adoptPtr(new QTKitFullScreenVideoHandlerPrivate))
+{
+    privateData->m_FullScreenController = nil;
+}
+
+QTKitFullScreenVideoHandler::~QTKitFullScreenVideoHandler()
+{
+    exitFullScreen();
+}
+
+void QTKitFullScreenVideoHandler::enterFullScreen(HTMLVideoElement* videoElement)
+{
+    if (privateData->m_FullScreenController) {
+        // First exit fullscreen for the old mediaElement.
+        exitFullScreen();
+        ASSERT(!privateData->m_FullScreenController);
+    }
+    if (!privateData->m_FullScreenController) {
+        privateData->m_FullScreenController = [[WebVideoFullscreenController alloc] init];
+        [privateData->m_FullScreenController setMediaElement:videoElement];
+        NSScreen* currentScreen = [NSScreen mainScreen];
+        [privateData->m_FullScreenController enterFullscreen:currentScreen];
+    }
+}
+
+void QTKitFullScreenVideoHandler::exitFullScreen()
+{
+    [privateData->m_FullScreenController exitFullscreen];
+    [privateData->m_FullScreenController release];
+    privateData->m_FullScreenController = nil;
+}
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebSystemInterface.mm b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebSystemInterface.mm
index 7ff2ec8..8354af9 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebSystemInterface.mm
+++ b/src/3rdparty/webkit/Source/WebKit/qt/WebCoreSupport/WebSystemInterface.mm
@@ -57,6 +57,10 @@ void InitWebCoreSystemInterface(void)
     INIT(QTGetSitesInMediaDownloadCache);
     INIT(QTClearMediaDownloadCacheForSite);
     INIT(QTClearMediaDownloadCache);
+    INIT(CreateMediaUIBackgroundView);
+    INIT(CreateMediaUIControl);
+    INIT(WindowSetAlpha);
+    INIT(WindowSetScaledFrame);
 
     didInit = true;
 }
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/declarative/qdeclarativewebview.cpp b/src/3rdparty/webkit/Source/WebKit/qt/declarative/qdeclarativewebview.cpp
index 6ba1346..22ee579d 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/declarative/qdeclarativewebview.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/declarative/qdeclarativewebview.cpp
@@ -782,7 +782,9 @@ void QDeclarativeWebView::setPage(QWebPage* page)
 
     connect(page->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), this, SLOT(windowObjectCleared()));
 
+#if !defined(Q_OS_SYMBIAN)
     page->settings()->setAttribute(QWebSettings::TiledBackingStoreEnabled, true);
+#endif
 
 }
 
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/symbian/bwins/QtWebKitu.def b/src/3rdparty/webkit/Source/WebKit/qt/symbian/bwins/QtWebKitu.def
index f1a545e..c93213c 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/symbian/bwins/QtWebKitu.def
+++ b/src/3rdparty/webkit/Source/WebKit/qt/symbian/bwins/QtWebKitu.def
@@ -368,7 +368,7 @@ EXPORTS
 	?qWebKitMinorVersion@@YAHXZ @ 367 NONAME ; int qWebKitMinorVersion(void)
 	?qWebKitVersion@@YA?AVQString@@XZ @ 368 NONAME ; class QString qWebKitVersion(void)
 	?qt_drt_clearFrameName@@YAXPAVQWebFrame@@@Z @ 369 NONAME ; void qt_drt_clearFrameName(class QWebFrame *)
-	?qt_drt_counterValueForElementById@@YA?AVQString@@PAVQWebFrame@@ABV1@@Z @ 370 NONAME ; class QString qt_drt_counterValueForElementById(class QWebFrame *, class QString const &)
+	?qt_drt_counterValueForElementById@@YA?AVQString@@PAVQWebFrame@@ABV1@@Z @ 370 NONAME ABSENT ; class QString qt_drt_counterValueForElementById(class QWebFrame *, class QString const &)
 	?qt_drt_garbageCollector_collect@@YAXXZ @ 371 NONAME ; void qt_drt_garbageCollector_collect(void)
 	?qt_drt_garbageCollector_collectOnAlternateThread@@YAX_N@Z @ 372 NONAME ; void qt_drt_garbageCollector_collectOnAlternateThread(bool)
 	?qt_drt_javaScriptObjectsCount@@YAHXZ @ 373 NONAME ; int qt_drt_javaScriptObjectsCount(void)
@@ -628,21 +628,21 @@ EXPORTS
 	?inspectorUrl@QWebSettings@@QBE?AVQUrl@@XZ @ 627 NONAME ABSENT ; class QUrl QWebSettings::inspectorUrl(void) const
 	?isTiledBackingStoreFrozen@QGraphicsWebView@@QBE_NXZ @ 628 NONAME ; bool QGraphicsWebView::isTiledBackingStoreFrozen(void) const
 	?pageChanged@QWebFrame@@IAEXXZ @ 629 NONAME ; void QWebFrame::pageChanged(void)
-	?qt_drt_enableCaretBrowsing@@YAXPAVQWebPage@@_N@Z @ 630 NONAME ; void qt_drt_enableCaretBrowsing(class QWebPage *, bool)
-	?qt_drt_evaluateScriptInIsolatedWorld@@YAXPAVQWebFrame@@HABVQString@@@Z @ 631 NONAME ; void qt_drt_evaluateScriptInIsolatedWorld(class QWebFrame *, int, class QString const &)
-	?qt_drt_hasDocumentElement@@YA_NPAVQWebFrame@@@Z @ 632 NONAME ; bool qt_drt_hasDocumentElement(class QWebFrame *)
-	?qt_drt_numberOfPages@@YAHPAVQWebFrame@@MM@Z @ 633 NONAME ; int qt_drt_numberOfPages(class QWebFrame *, float, float)
-	?qt_drt_pageNumberForElementById@@YAHPAVQWebFrame@@ABVQString@@MM@Z @ 634 NONAME ; int qt_drt_pageNumberForElementById(class QWebFrame *, class QString const &, float, float)
-	?qt_drt_pauseSVGAnimation@@YA_NPAVQWebFrame@@ABVQString@@N1@Z @ 635 NONAME ; bool qt_drt_pauseSVGAnimation(class QWebFrame *, class QString const &, double, class QString const &)
-	?qt_drt_setDomainRelaxationForbiddenForURLScheme@@YAX_NABVQString@@@Z @ 636 NONAME ; void qt_drt_setDomainRelaxationForbiddenForURLScheme(bool, class QString const &)
-	?qt_drt_setFrameFlatteningEnabled@@YAXPAVQWebPage@@_N@Z @ 637 NONAME ; void qt_drt_setFrameFlatteningEnabled(class QWebPage *, bool)
-	?qt_drt_setMediaType@@YAXPAVQWebFrame@@ABVQString@@@Z @ 638 NONAME ; void qt_drt_setMediaType(class QWebFrame *, class QString const &)
-	?qt_drt_setTimelineProfilingEnabled@@YAXPAVQWebPage@@_N@Z @ 639 NONAME ; void qt_drt_setTimelineProfilingEnabled(class QWebPage *, bool)
-	?qt_drt_webinspector_close@@YAXPAVQWebPage@@@Z @ 640 NONAME ; void qt_drt_webinspector_close(class QWebPage *)
-	?qt_drt_webinspector_executeScript@@YAXPAVQWebPage@@JABVQString@@@Z @ 641 NONAME ; void qt_drt_webinspector_executeScript(class QWebPage *, long, class QString const &)
-	?qt_drt_webinspector_show@@YAXPAVQWebPage@@@Z @ 642 NONAME ; void qt_drt_webinspector_show(class QWebPage *)
-	?qt_drt_workerThreadCount@@YAHXZ @ 643 NONAME ; int qt_drt_workerThreadCount(void)
-	?qt_wrt_setViewMode@@YAXPAVQWebPage@@ABVQString@@@Z @ 644 NONAME ; void qt_wrt_setViewMode(class QWebPage *, class QString const &)
+	?qt_drt_enableCaretBrowsing@@YAXPAVQWebPage@@_N@Z @ 630 NONAME ABSENT ; void qt_drt_enableCaretBrowsing(class QWebPage *, bool)
+	?qt_drt_evaluateScriptInIsolatedWorld@@YAXPAVQWebFrame@@HABVQString@@@Z @ 631 NONAME ABSENT ; void qt_drt_evaluateScriptInIsolatedWorld(class QWebFrame *, int, class QString const &)
+	?qt_drt_hasDocumentElement@@YA_NPAVQWebFrame@@@Z @ 632 NONAME ABSENT ; bool qt_drt_hasDocumentElement(class QWebFrame *)
+	?qt_drt_numberOfPages@@YAHPAVQWebFrame@@MM@Z @ 633 NONAME ABSENT ; int qt_drt_numberOfPages(class QWebFrame *, float, float)
+	?qt_drt_pageNumberForElementById@@YAHPAVQWebFrame@@ABVQString@@MM@Z @ 634 NONAME ABSENT ; int qt_drt_pageNumberForElementById(class QWebFrame *, class QString const &, float, float)
+	?qt_drt_pauseSVGAnimation@@YA_NPAVQWebFrame@@ABVQString@@N1@Z @ 635 NONAME ABSENT ; bool qt_drt_pauseSVGAnimation(class QWebFrame *, class QString const &, double, class QString const &)
+	?qt_drt_setDomainRelaxationForbiddenForURLScheme@@YAX_NABVQString@@@Z @ 636 NONAME ABSENT ; void qt_drt_setDomainRelaxationForbiddenForURLScheme(bool, class QString const &)
+	?qt_drt_setFrameFlatteningEnabled@@YAXPAVQWebPage@@_N@Z @ 637 NONAME ABSENT ; void qt_drt_setFrameFlatteningEnabled(class QWebPage *, bool)
+	?qt_drt_setMediaType@@YAXPAVQWebFrame@@ABVQString@@@Z @ 638 NONAME ABSENT ; void qt_drt_setMediaType(class QWebFrame *, class QString const &)
+	?qt_drt_setTimelineProfilingEnabled@@YAXPAVQWebPage@@_N@Z @ 639 NONAME ABSENT ; void qt_drt_setTimelineProfilingEnabled(class QWebPage *, bool)
+	?qt_drt_webinspector_close@@YAXPAVQWebPage@@@Z @ 640 NONAME ABSENT ; void qt_drt_webinspector_close(class QWebPage *)
+	?qt_drt_webinspector_executeScript@@YAXPAVQWebPage@@JABVQString@@@Z @ 641 NONAME ABSENT ; void qt_drt_webinspector_executeScript(class QWebPage *, long, class QString const &)
+	?qt_drt_webinspector_show@@YAXPAVQWebPage@@@Z @ 642 NONAME ABSENT ; void qt_drt_webinspector_show(class QWebPage *)
+	?qt_drt_workerThreadCount@@YAHXZ @ 643 NONAME ABSENT ; int qt_drt_workerThreadCount(void)
+	?qt_wrt_setViewMode@@YAXPAVQWebPage@@ABVQString@@@Z @ 644 NONAME ABSENT ; void qt_wrt_setViewMode(class QWebPage *, class QString const &)
 	?qtwebkit_webframe_scrollRecursively@@YAXPAVQWebFrame@@HHABVQPoint@@@Z @ 645 NONAME ; void qtwebkit_webframe_scrollRecursively(class QWebFrame *, int, int, class QPoint const &)
 	?resizesToContents@QGraphicsWebView@@QBE_NXZ @ 646 NONAME ; bool QGraphicsWebView::resizesToContents(void) const
 	?scrollToAnchor@QWebFrame@@QAEXABVQString@@@Z @ 647 NONAME ; void QWebFrame::scrollToAnchor(class QString const &)
@@ -650,4 +650,148 @@ EXPORTS
 	?setResizesToContents@QGraphicsWebView@@QAEX_N@Z @ 649 NONAME ; void QGraphicsWebView::setResizesToContents(bool)
 	?setTiledBackingStoreFrozen@QGraphicsWebView@@QAEX_N@Z @ 650 NONAME ; void QGraphicsWebView::setTiledBackingStoreFrozen(bool)
 	?qtwebkit_webframe_scrollOverflow@@YA_NPAVQWebFrame@@HHABVQPoint@@@Z @ 651 NONAME ; bool qtwebkit_webframe_scrollOverflow(QWebFrame *, int, int, const QPoint&)
-        ?qtwebkit_setPluginCreatedCallback@@YAXP6AXPAVQWebFrame@@PAX1@Z@Z @ 652 NONAME ; void qtwebkit_setPluginCreatedCallback(void (*)(class QWebFrame *, void *, void *))
+  ?qtwebkit_setPluginCreatedCallback@@YAXP6AXPAVQWebFrame@@PAX1@Z@Z @ 652 NONAME ; void qtwebkit_setPluginCreatedCallback(void (*)(class QWebFrame *, void *, void *))
+  ?mediaContentUrlByElementId@DumpRenderTreeSupportQt@@SA?AVQUrl@@PAVQWebFrame@@ABVQString@@@Z @ 653 NONAME ; class QUrl DumpRenderTreeSupportQt::mediaContentUrlByElementId(QWebFrame *, const QString &)
+  ?webPageSetGroupName@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@ABVQString@@@Z @ 654 NONAME ; void DumpRenderTreeSupportQt::webPageSetGroupName(class QWebPage *, class QString const &)
+  ?webPageGroupName@DumpRenderTreeSupportQt@@SA?AVQString@@PAVQWebPage@@@Z @ 655 NONAME ; class QString DumpRenderTreeSupportQt::webPageGroupName(class QWebPage *)
+  ?renderHints@QGraphicsWebView@@QBE?AV?$QFlags@W4RenderHint@QPainter@@@@XZ @ 656 NONAME ; class QFlags<enum QPainter::RenderHint> QGraphicsWebView::renderHints(void) const
+  ?setRenderHint@QGraphicsWebView@@QAEXW4RenderHint@QPainter@@_N@Z @ 657 NONAME ; void QGraphicsWebView::setRenderHint(enum QPainter::RenderHint, bool)
+  ?selectedHtml@QWebPage@@QBE?AVQString@@XZ @ 658 NONAME ; class QString QWebPage::selectedHtml(void) const
+  ?hasSelection@QWebPage@@QBE_NXZ @ 659 NONAME ; bool QWebPage::hasSelection(void) const
+  ?garbageCollectorCollect@DumpRenderTreeSupportQt@@SAXXZ @ 660 NONAME ; void DumpRenderTreeSupportQt::garbageCollectorCollect(void)
+  ?supportedContentTypes@QWebPage@@QBE?AVQStringList@@XZ @ 661 NONAME ; class QStringList QWebPage::supportedContentTypes(void) const
+  ?supportsContentType@QWebPage@@QBE_NABVQString@@@Z @ 662 NONAME ; bool QWebPage::supportsContentType(class QString const &) const
+  ?setFeaturePermission@QWebPage@@QAEXPAVQWebFrame@@W4Feature@1@W4PermissionPolicy@1@@Z @ 663 NONAME ; void QWebPage::setFeaturePermission(class QWebFrame *, enum QWebPage::Feature, enum QWebPage::PermissionPolicy)
+ 	strnstr @ 664  NONAME
+  ??1QWebScriptWorld@@QAE@XZ @ 665  NONAME ; QWebScriptWorld::~QWebScriptWorld(void)
+  ??_EQWebSettings@@QAE@I@Z @ 666  NONAME ; QWebSettings::~QWebSettings(unsigned int)
+  ?setSelectTrailingWhitespaceEnabled@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@_N@Z @ 667  NONAME ; void DumpRenderTreeSupportQt::setSelectTrailingWhitespaceEnabled(class QWebPage *, bool)
+  ?webInspectorShow@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@@Z @ 668  NONAME ; void DumpRenderTreeSupportQt::webInspectorShow(class QWebPage *)
+  ?firstRectForCharacterRange@DumpRenderTreeSupportQt@@SA?AV?$QList@VQVariant@@@@PAVQWebPage@@HH@Z @ 669  NONAME ; class QList<class QVariant> DumpRenderTreeSupportQt::firstRectForCharacterRange(class QWebPage *, int, int)
+  ?whiteListAccessFromOrigin@DumpRenderTreeSupportQt@@SAXABVQString@@00_N@Z @ 670  NONAME ; void DumpRenderTreeSupportQt::whiteListAccessFromOrigin(class QString const &, class QString const &, class QString const &, bool)
+  ?dumpResourceLoadCallbacks@DumpRenderTreeSupportQt@@SAX_N@Z @ 671  NONAME ; void DumpRenderTreeSupportQt::dumpResourceLoadCallbacks(bool)
+  ?setWillSendRequestClearHeaders@DumpRenderTreeSupportQt@@SAXABVQStringList@@@Z @ 672  NONAME ; void DumpRenderTreeSupportQt::setWillSendRequestClearHeaders(class QStringList const &)
+  ?dumpResourceLoadCallbacksPath@DumpRenderTreeSupportQt@@SAXABVQString@@@Z @ 673  NONAME ; void DumpRenderTreeSupportQt::dumpResourceLoadCallbacksPath(class QString const &)
+  ?featurePermissionRequestCanceled@QWebPage@@IAEXPAVQWebFrame@@W4Feature@1@@Z @ 674  NONAME ; void QWebPage::featurePermissionRequestCanceled(class QWebFrame *, enum QWebPage::Feature)
+  ??0ViewportAttributes@QWebPage@@QAE@ABV01@@Z @ 675  NONAME ; QWebPage::ViewportAttributes::ViewportAttributes(class QWebPage::ViewportAttributes const &)
+  ?getChildHistoryItems@DumpRenderTreeSupportQt@@SA?AV?$QMap@VQString@@VQWebHistoryItem@@@@ABVQWebHistoryItem@@@Z @ 676  NONAME ; class QMap<class QString, class QWebHistoryItem> DumpRenderTreeSupportQt::getChildHistoryItems(class QWebHistoryItem const &)
+  ??_EQWebHistoryItem@@QAE@I@Z @ 677  NONAME ; QWebHistoryItem::~QWebHistoryItem(unsigned int)
+  ?viewportAttributesForSize@QWebPage@@QBE?AVViewportAttributes@1@ABVQSize@@@Z @ 678  NONAME ; class QWebPage::ViewportAttributes QWebPage::viewportAttributesForSize(class QSize const &) const
+  ?selectedRange@DumpRenderTreeSupportQt@@SA?AV?$QList@VQVariant@@@@PAVQWebPage@@@Z @ 679  NONAME ; class QList<class QVariant> DumpRenderTreeSupportQt::selectedRange(class QWebPage *)
+  ?selectedHtml@QWebView@@QBE?AVQString@@XZ @ 680  NONAME ; class QString QWebView::selectedHtml(void) const
+  ?pageNumberForElementById@DumpRenderTreeSupportQt@@SAHPAVQWebFrame@@ABVQString@@MM@Z @ 681  NONAME ; int DumpRenderTreeSupportQt::pageNumberForElementById(class QWebFrame *, class QString const &, float, float)
+  ??1ViewportAttributes@QWebPage@@QAE@XZ @ 682  NONAME ; QWebPage::ViewportAttributes::~ViewportAttributes(void)
+  ?resumeActiveDOMObjects@DumpRenderTreeSupportQt@@SAXPAVQWebFrame@@@Z @ 683  NONAME ; void DumpRenderTreeSupportQt::resumeActiveDOMObjects(class QWebFrame *)
+  ?suspendAnimations@DumpRenderTreeSupportQt@@SAXPAVQWebFrame@@@Z @ 684  NONAME ; void DumpRenderTreeSupportQt::suspendAnimations(class QWebFrame *)
+  ?initialScaleFactor@ViewportAttributes@QWebPage@@QBEMXZ @ 685  NONAME ; float QWebPage::ViewportAttributes::initialScaleFactor(void) const
+  ?setSmartInsertDeleteEnabled@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@_N@Z @ 686  NONAME ; void DumpRenderTreeSupportQt::setSmartInsertDeleteEnabled(class QWebPage *, bool)
+  ?nodesFromRect@DumpRenderTreeSupportQt@@SA?AV?$QList@VQVariant@@@@ABVQWebElement@@HHIIII_N@Z @ 687  NONAME ; class QList<class QVariant> DumpRenderTreeSupportQt::nodesFromRect(class QWebElement const &, int, int, unsigned int, unsigned int, unsigned int, unsigned int, bool)
+  ?setJavaScriptProfilingEnabled@DumpRenderTreeSupportQt@@SAXPAVQWebFrame@@_N@Z @ 688  NONAME ; void DumpRenderTreeSupportQt::setJavaScriptProfilingEnabled(class QWebFrame *, bool)
+  ?shouldClose@DumpRenderTreeSupportQt@@SA_NPAVQWebFrame@@@Z @ 689  NONAME ; bool DumpRenderTreeSupportQt::shouldClose(class QWebFrame *)
+  ?clearOpener@DumpRenderTreeSupportQt@@SAXPAVQWebFrame@@@Z @ 690  NONAME ; void DumpRenderTreeSupportQt::clearOpener(class QWebFrame *)
+  ?isTargetItem@DumpRenderTreeSupportQt@@SA_NABVQWebHistoryItem@@@Z @ 691  NONAME ; bool DumpRenderTreeSupportQt::isTargetItem(class QWebHistoryItem const &)
+  ?setWillSendRequestReturnsNullOnRedirect@DumpRenderTreeSupportQt@@SAX_N@Z @ 692  NONAME ; void DumpRenderTreeSupportQt::setWillSendRequestReturnsNullOnRedirect(bool)
+  ??0DumpRenderTreeSupportQt@@QAE@XZ @ 693  NONAME ; DumpRenderTreeSupportQt::DumpRenderTreeSupportQt(void)
+  ?isUserScalable@ViewportAttributes@QWebPage@@QBE_NXZ @ 694  NONAME ; bool QWebPage::ViewportAttributes::isUserScalable(void) const
+  ?clearFrameName@DumpRenderTreeSupportQt@@SAXPAVQWebFrame@@@Z @ 695  NONAME ; void DumpRenderTreeSupportQt::clearFrameName(class QWebFrame *)
+  ??0QWebScriptWorld@@QAE@XZ @ 696  NONAME ; QWebScriptWorld::QWebScriptWorld(void)
+  ??4ViewportAttributes@QWebPage@@QAEAAV01@ABV01@@Z @ 697  NONAME ; class QWebPage::ViewportAttributes & QWebPage::ViewportAttributes::operator=(class QWebPage::ViewportAttributes const &)
+  ?dumpNotification@DumpRenderTreeSupportQt@@SAX_N@Z @ 698  NONAME ; void DumpRenderTreeSupportQt::dumpNotification(bool)
+  ?setDeferMainResourceDataLoad@DumpRenderTreeSupportQt@@SAX_N@Z @ 699  NONAME ; void DumpRenderTreeSupportQt::setDeferMainResourceDataLoad(bool)
+  ?webInspectorClose@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@@Z @ 700  NONAME ; void DumpRenderTreeSupportQt::webInspectorClose(class QWebPage *)
+  ?defaultMinimumTimerInterval@DumpRenderTreeSupportQt@@SANXZ @ 701  NONAME ; double DumpRenderTreeSupportQt::defaultMinimumTimerInterval(void)
+  ??0ViewportAttributes@QWebPage@@QAE@XZ @ 702  NONAME ; QWebPage::ViewportAttributes::ViewportAttributes(void)
+  ?counterValueForElementById@DumpRenderTreeSupportQt@@SA?AVQString@@PAVQWebFrame@@ABV2@@Z @ 703  NONAME ; class QString DumpRenderTreeSupportQt::counterValueForElementById(class QWebFrame *, class QString const &)
+  ??_EQWebElement@@QAE@I@Z @ 704  NONAME ; QWebElement::~QWebElement(unsigned int)
+  ?setMinimumTimerInterval@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@N@Z @ 705  NONAME ; void DumpRenderTreeSupportQt::setMinimumTimerInterval(class QWebPage *, double)
+  ?activeMockDeviceOrientationClient@DumpRenderTreeSupportQt@@SAX_N@Z @ 706  NONAME ; void DumpRenderTreeSupportQt::activeMockDeviceOrientationClient(bool)
+  ?addUserStyleSheet@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@ABVQString@@@Z @ 707  NONAME ; void DumpRenderTreeSupportQt::addUserStyleSheet(class QWebPage *, class QString const &)
+  ?devicePixelRatio@ViewportAttributes@QWebPage@@QBEMXZ @ 708  NONAME ; float QWebPage::ViewportAttributes::devicePixelRatio(void) const
+  ?setMockDeviceOrientation@DumpRenderTreeSupportQt@@SAX_NN0N0N@Z @ 709  NONAME ; void DumpRenderTreeSupportQt::setMockDeviceOrientation(bool, double, bool, double, bool, double)
+  ?size@ViewportAttributes@QWebPage@@QBE?AVQSize@@XZ @ 710  NONAME ; class QSize QWebPage::ViewportAttributes::size(void) const
+  ?setCustomPolicyDelegate@DumpRenderTreeSupportQt@@SAX_N0@Z @ 711  NONAME ; void DumpRenderTreeSupportQt::setCustomPolicyDelegate(bool, bool)
+  ?viewportChangeRequested@QWebPage@@IAEXXZ @ 712  NONAME ; void QWebPage::viewportChangeRequested(void)
+  ?hasDocumentElement@DumpRenderTreeSupportQt@@SA_NPAVQWebFrame@@@Z @ 713  NONAME ; bool DumpRenderTreeSupportQt::hasDocumentElement(class QWebFrame *)
+  ?numberOfPages@DumpRenderTreeSupportQt@@SAHPAVQWebFrame@@MM@Z @ 714  NONAME ; int DumpRenderTreeSupportQt::numberOfPages(class QWebFrame *, float, float)
+  ?numberOfActiveAnimations@DumpRenderTreeSupportQt@@SAHPAVQWebFrame@@@Z @ 715  NONAME ; int DumpRenderTreeSupportQt::numberOfActiveAnimations(class QWebFrame *)
+  ?contextMenu@DumpRenderTreeSupportQt@@SA?AVQStringList@@PAVQWebPage@@@Z @ 716  NONAME ; class QStringList DumpRenderTreeSupportQt::contextMenu(class QWebPage *)
+  ?setWillSendRequestReturnsNull@DumpRenderTreeSupportQt@@SAX_N@Z @ 717  NONAME ; void DumpRenderTreeSupportQt::setWillSendRequestReturnsNull(bool)
+  ?resumeAnimations@DumpRenderTreeSupportQt@@SAXPAVQWebFrame@@@Z @ 718  NONAME ; void DumpRenderTreeSupportQt::resumeAnimations(class QWebFrame *)
+  ?addURLToRedirect@DumpRenderTreeSupportQt@@SAXABVQString@@0@Z @ 719  NONAME ; void DumpRenderTreeSupportQt::addURLToRedirect(class QString const &, class QString const &)
+  ??_EQWebDatabase@@QAE@I@Z @ 720  NONAME ; QWebDatabase::~QWebDatabase(unsigned int)
+  ?workerThreadCount@DumpRenderTreeSupportQt@@SAHXZ @ 721  NONAME ; int DumpRenderTreeSupportQt::workerThreadCount(void)
+  ?render@QWebElement@@QAEXPAVQPainter@@ABVQRect@@@Z @ 722  NONAME ; void QWebElement::render(class QPainter *, class QRect const &)
+  ?setFrameFlatteningEnabled@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@_N@Z @ 723  NONAME ; void DumpRenderTreeSupportQt::setFrameFlatteningEnabled(class QWebPage *, bool)
+  ?dumpResourceResponseMIMETypes@DumpRenderTreeSupportQt@@SAX_N@Z @ 724  NONAME ; void DumpRenderTreeSupportQt::dumpResourceResponseMIMETypes(bool)
+  ?pageProperty@DumpRenderTreeSupportQt@@SA?AVQString@@PAVQWebFrame@@ABV2@H@Z @ 725  NONAME ; class QString DumpRenderTreeSupportQt::pageProperty(class QWebFrame *, class QString const &, int)
+  ??0QDRTNode@@QAE@XZ @ 726  NONAME ; QDRTNode::QDRTNode(void)
+  ?hasSelection@QWebView@@QBE_NXZ @ 727  NONAME ; bool QWebView::hasSelection(void) const
+  ??_EQDRTNode@@QAE@I@Z @ 728  NONAME ; QDRTNode::~QDRTNode(unsigned int)
+  ?garbageCollectorCollectOnAlternateThread@DumpRenderTreeSupportQt@@SAX_N@Z @ 729  NONAME ; void DumpRenderTreeSupportQt::garbageCollectorCollectOnAlternateThread(bool)
+  ?setRenderHints@QGraphicsWebView@@QAEXV?$QFlags@W4RenderHint@QPainter@@@@@Z @ 730  NONAME ; void QGraphicsWebView::setRenderHints(class QFlags<enum QPainter::RenderHint>)
+  ?setAlternateHtml@DumpRenderTreeSupportQt@@SAXPAVQWebFrame@@ABVQString@@ABVQUrl@@2@Z @ 731  NONAME ; void DumpRenderTreeSupportQt::setAlternateHtml(class QWebFrame *, class QString const &, class QUrl const &, class QUrl const &)
+  ?webInspectorExecuteScript@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@JABVQString@@@Z @ 732  NONAME ; void DumpRenderTreeSupportQt::webInspectorExecuteScript(class QWebPage *, long, class QString const &)
+  ?pauseTransitionOfProperty@DumpRenderTreeSupportQt@@SA_NPAVQWebFrame@@ABVQString@@N1@Z @ 733  NONAME ; bool DumpRenderTreeSupportQt::pauseTransitionOfProperty(class QWebFrame *, class QString const &, double, class QString const &)
+  ?numberOfPendingGeolocationPermissionRequests@DumpRenderTreeSupportQt@@SAHPAVQWebPage@@@Z @ 734  NONAME ; int DumpRenderTreeSupportQt::numberOfPendingGeolocationPermissionRequests(class QWebPage *)
+  ?setEditingBehavior@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@ABVQString@@@Z @ 735  NONAME ; void DumpRenderTreeSupportQt::setEditingBehavior(class QWebPage *, class QString const &)
+  ?findString@DumpRenderTreeSupportQt@@SA_NPAVQWebPage@@ABVQString@@ABVQStringList@@@Z @ 736  NONAME ; bool DumpRenderTreeSupportQt::findString(class QWebPage *, class QString const &, class QStringList const &)
+  ?setCaretBrowsingEnabled@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@_N@Z @ 737  NONAME ; void DumpRenderTreeSupportQt::setCaretBrowsingEnabled(class QWebPage *, bool)
+  ?historyItemTarget@DumpRenderTreeSupportQt@@SA?AVQString@@ABVQWebHistoryItem@@@Z @ 738  NONAME ; class QString DumpRenderTreeSupportQt::historyItemTarget(class QWebHistoryItem const &)
+  ??1QDRTNode@@QAE@XZ @ 739  NONAME ; QDRTNode::~QDRTNode(void)
+  ?clearAllApplicationCaches@DumpRenderTreeSupportQt@@SAXXZ @ 740  NONAME ; void DumpRenderTreeSupportQt::clearAllApplicationCaches(void)
+  ?isValid@ViewportAttributes@QWebPage@@QBE_NXZ @ 741  NONAME ; bool QWebPage::ViewportAttributes::isValid(void) const
+  ?dumpVisitedLinksCallbacks@DumpRenderTreeSupportQt@@SAX_N@Z @ 742  NONAME ; void DumpRenderTreeSupportQt::dumpVisitedLinksCallbacks(bool)
+  ?resetOriginAccessWhiteLists@DumpRenderTreeSupportQt@@SAXXZ @ 743  NONAME ; void DumpRenderTreeSupportQt::resetOriginAccessWhiteLists(void)
+  ??_EQWebSecurityOrigin@@QAE@I@Z @ 744  NONAME ; QWebSecurityOrigin::~QWebSecurityOrigin(unsigned int)
+  ?dumpFrameLoader@DumpRenderTreeSupportQt@@SAX_N@Z @ 745  NONAME ; void DumpRenderTreeSupportQt::dumpFrameLoader(bool)
+  ?markerTextForListItem@DumpRenderTreeSupportQt@@SA?AVQString@@ABVQWebElement@@@Z @ 746  NONAME ; class QString DumpRenderTreeSupportQt::markerTextForListItem(class QWebElement const &)
+  ?elementDoesAutoCompleteForElementWithId@DumpRenderTreeSupportQt@@SA_NPAVQWebFrame@@ABVQString@@@Z @ 747  NONAME ; bool DumpRenderTreeSupportQt::elementDoesAutoCompleteForElementWithId(class QWebFrame *, class QString const &)
+  ?applicationCacheQuotaExceeded@QWebPage@@IAEXPAVQWebSecurityOrigin@@_K@Z @ 748  NONAME ; void QWebPage::applicationCacheQuotaExceeded(class QWebSecurityOrigin *, unsigned long long)
+  ?setTimelineProfilingEnabled@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@_N@Z @ 749  NONAME ; void DumpRenderTreeSupportQt::setTimelineProfilingEnabled(class QWebPage *, bool)
+  ??0QDRTNode@@AAE@PAVNode@WebCore@@@Z @ 750  NONAME ; QDRTNode::QDRTNode(class WebCore::Node *)
+  ?setMockGeolocationPermission@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@_N@Z @ 751  NONAME ; void DumpRenderTreeSupportQt::setMockGeolocationPermission(class QWebPage *, bool)
+  ?setMockGeolocationError@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@HABVQString@@@Z @ 752  NONAME ; void DumpRenderTreeSupportQt::setMockGeolocationError(class QWebPage *, int, class QString const &)
+  ?clearScriptWorlds@DumpRenderTreeSupportQt@@SAXXZ @ 753  NONAME ; void DumpRenderTreeSupportQt::clearScriptWorlds(void)
+  ?maximumScaleFactor@ViewportAttributes@QWebPage@@QBEMXZ @ 754  NONAME ; float QWebPage::ViewportAttributes::maximumScaleFactor(void) const
+  ?dumpHistoryCallbacks@DumpRenderTreeSupportQt@@SAX_N@Z @ 755  NONAME ; void DumpRenderTreeSupportQt::dumpHistoryCallbacks(bool)
+  ??0MimeType@QWebPluginFactory@@QAE@XZ @ 756  NONAME ; QWebPluginFactory::MimeType::MimeType(void)
+  ?pauseSVGAnimation@DumpRenderTreeSupportQt@@SA_NPAVQWebFrame@@ABVQString@@N1@Z @ 757  NONAME ; bool DumpRenderTreeSupportQt::pauseSVGAnimation(class QWebFrame *, class QString const &, double, class QString const &)
+  ?featurePermissionRequested@QWebPage@@IAEXPAVQWebFrame@@W4Feature@1@@Z @ 758  NONAME ; void QWebPage::featurePermissionRequested(class QWebFrame *, enum QWebPage::Feature)
+  ?removeShadowRoot@DumpRenderTreeSupportQt@@SAXABVQWebElement@@@Z @ 759  NONAME ; void DumpRenderTreeSupportQt::removeShadowRoot(class QWebElement const &)
+  ??_EQWebPluginInfo@@QAE@I@Z @ 760  NONAME ; QWebPluginInfo::~QWebPluginInfo(unsigned int)
+  ?pageSizeAndMarginsInPixels@DumpRenderTreeSupportQt@@SA?AVQString@@PAVQWebFrame@@HHHHHHH@Z @ 761  NONAME ; class QString DumpRenderTreeSupportQt::pageSizeAndMarginsInPixels(class QWebFrame *, int, int, int, int, int, int, int)
+  ?suspendActiveDOMObjects@DumpRenderTreeSupportQt@@SAXPAVQWebFrame@@@Z @ 762  NONAME ; void DumpRenderTreeSupportQt::suspendActiveDOMObjects(class QWebFrame *)
+  ?dumpUserGestureInFrameLoader@DumpRenderTreeSupportQt@@SAX_N@Z @ 763  NONAME ; void DumpRenderTreeSupportQt::dumpUserGestureInFrameLoader(bool)
+  ??0QWebScriptWorld@@QAE@ABV0@@Z @ 764  NONAME ; QWebScriptWorld::QWebScriptWorld(class QWebScriptWorld const &)
+  ?setDumpRenderTreeModeEnabled@DumpRenderTreeSupportQt@@SAX_N@Z @ 765  NONAME ; void DumpRenderTreeSupportQt::setDumpRenderTreeModeEnabled(bool)
+  ?evaluateScriptInIsolatedWorld@DumpRenderTreeSupportQt@@SAXPAVQWebFrame@@HABVQString@@@Z @ 766  NONAME ; void DumpRenderTreeSupportQt::evaluateScriptInIsolatedWorld(class QWebFrame *, int, class QString const &)
+  ?setApplicationCacheQuota@QWebSecurityOrigin@@QAEX_J@Z @ 767  NONAME ; void QWebSecurityOrigin::setApplicationCacheQuota(long long)
+  ?plainText@DumpRenderTreeSupportQt@@SA?AVQString@@ABVQVariant@@@Z @ 768  NONAME ; class QString DumpRenderTreeSupportQt::plainText(class QVariant const &)
+  ??1DumpRenderTreeSupportQt@@QAE@XZ @ 769  NONAME ; DumpRenderTreeSupportQt::~DumpRenderTreeSupportQt(void)
+  ?viewportAsText@DumpRenderTreeSupportQt@@SA?AVQString@@PAVQWebPage@@HABVQSize@@1@Z @ 770  NONAME ; class QString DumpRenderTreeSupportQt::viewportAsText(class QWebPage *, int, class QSize const &, class QSize const &)
+  ?setDomainRelaxationForbiddenForURLScheme@DumpRenderTreeSupportQt@@SAX_NABVQString@@@Z @ 771  NONAME ; void DumpRenderTreeSupportQt::setDomainRelaxationForbiddenForURLScheme(bool, class QString const &)
+  ?setMediaType@DumpRenderTreeSupportQt@@SAXPAVQWebFrame@@ABVQString@@@Z @ 772  NONAME ; void DumpRenderTreeSupportQt::setMediaType(class QWebFrame *, class QString const &)
+  ?computedStyleIncludingVisitedInfo@DumpRenderTreeSupportQt@@SA?AV?$QMap@VQString@@VQVariant@@@@ABVQWebElement@@@Z @ 773  NONAME ; class QMap<class QString, class QVariant> DumpRenderTreeSupportQt::computedStyleIncludingVisitedInfo(class QWebElement const &)
+  ?overwritePluginDirectories@DumpRenderTreeSupportQt@@SAXXZ @ 774  NONAME ; void DumpRenderTreeSupportQt::overwritePluginDirectories(void)
+  ?minimumScaleFactor@ViewportAttributes@QWebPage@@QBEMXZ @ 775  NONAME ; float QWebPage::ViewportAttributes::minimumScaleFactor(void) const
+  ?setAutofilled@DumpRenderTreeSupportQt@@SAXABVQWebElement@@_N@Z @ 776  NONAME ; void DumpRenderTreeSupportQt::setAutofilled(class QWebElement const &, bool)
+  ?dumpSetAcceptsEditing@DumpRenderTreeSupportQt@@SAX_N@Z @ 777  NONAME ; void DumpRenderTreeSupportQt::dumpSetAcceptsEditing(bool)
+  ?pauseAnimation@DumpRenderTreeSupportQt@@SA_NPAVQWebFrame@@ABVQString@@N1@Z @ 778  NONAME ; bool DumpRenderTreeSupportQt::pauseAnimation(class QWebFrame *, class QString const &, double, class QString const &)
+  ?isPageBoxVisible@DumpRenderTreeSupportQt@@SA_NPAVQWebFrame@@H@Z @ 779  NONAME ; bool DumpRenderTreeSupportQt::isPageBoxVisible(class QWebFrame *, int)
+  ?shadowRoot@DumpRenderTreeSupportQt@@SA?AVQVariant@@ABVQWebElement@@@Z @ 780  NONAME ; class QVariant DumpRenderTreeSupportQt::shadowRoot(class QWebElement const &)
+  ??4QDRTNode@@QAEAAV0@ABV0@@Z @ 781  NONAME ; class QDRTNode & QDRTNode::operator=(class QDRTNode const &)
+  ?responseMimeType@DumpRenderTreeSupportQt@@SA?AVQString@@PAVQWebFrame@@@Z @ 782  NONAME ; class QString DumpRenderTreeSupportQt::responseMimeType(class QWebFrame *)
+  ?setMockGeolocationPosition@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@NNN@Z @ 783  NONAME ; void DumpRenderTreeSupportQt::setMockGeolocationPosition(class QWebPage *, double, double, double)
+  ?isCommandEnabled@DumpRenderTreeSupportQt@@SA_NPAVQWebPage@@ABVQString@@@Z @ 784  NONAME ; bool DumpRenderTreeSupportQt::isCommandEnabled(class QWebPage *, class QString const &)
+  ?dumpEditingCallbacks@DumpRenderTreeSupportQt@@SAX_N@Z @ 785  NONAME ; void DumpRenderTreeSupportQt::dumpEditingCallbacks(bool)
+  ?setActualVisibleContentRect@QWebPage@@QBEXABVQRect@@@Z @ 786  NONAME ; void QWebPage::setActualVisibleContentRect(class QRect const &) const
+  ?executeCoreCommandByName@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@ABVQString@@1@Z @ 787  NONAME ; void DumpRenderTreeSupportQt::executeCoreCommandByName(class QWebPage *, class QString const &, class QString const &)
+  ?resetGeolocationMock@DumpRenderTreeSupportQt@@SAXPAVQWebPage@@@Z @ 788  NONAME ; void DumpRenderTreeSupportQt::resetGeolocationMock(class QWebPage *)
+  ?removeWhiteListAccessFromOrigin@DumpRenderTreeSupportQt@@SAXABVQString@@00_N@Z @ 789  NONAME ; void DumpRenderTreeSupportQt::removeWhiteListAccessFromOrigin(class QString const &, class QString const &, class QString const &, bool)
+  ??0QDRTNode@@QAE@ABV0@@Z @ 790  NONAME ; QDRTNode::QDRTNode(class QDRTNode const &)
+  ?removeMockDeviceOrientation@DumpRenderTreeSupportQt@@SAXXZ @ 791  NONAME ; void DumpRenderTreeSupportQt::removeMockDeviceOrientation(void)
+  ??4QWebScriptWorld@@QAEAAV0@ABV0@@Z @ 792  NONAME ; class QWebScriptWorld & QWebScriptWorld::operator=(class QWebScriptWorld const &)
+  ?javaScriptObjectsCount@DumpRenderTreeSupportQt@@SAHXZ @ 793  NONAME ; int DumpRenderTreeSupportQt::javaScriptObjectsCount(void)
+  ?world@QWebScriptWorld@@QBEPAVDOMWrapperWorld@WebCore@@XZ @ 794  NONAME ; class WebCore::DOMWrapperWorld * QWebScriptWorld::world(void) const
+  ?simulateDesktopNotificationClick@DumpRenderTreeSupportQt@@SAXABVQString@@@Z @ 795  NONAME ; void DumpRenderTreeSupportQt::simulateDesktopNotificationClick(class QString const &)
+  ?ensureShadowRoot@DumpRenderTreeSupportQt@@SA?AVQVariant@@ABVQWebElement@@@Z @ 796  NONAME ; class QVariant DumpRenderTreeSupportQt::ensureShadowRoot(class QWebElement const &)
\ No newline at end of file
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/symbian/eabi/QtWebKitu.def b/src/3rdparty/webkit/Source/WebKit/qt/symbian/eabi/QtWebKitu.def
index 176b9a1..b67d3f8 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/symbian/eabi/QtWebKitu.def
+++ b/src/3rdparty/webkit/Source/WebKit/qt/symbian/eabi/QtWebKitu.def
@@ -1,847 +1,883 @@
-EXPORTS
-	_Z10qt_drt_runb @ 1 NONAME
-	_Z14qWebKitVersionv @ 2 NONAME
-	_Z19qWebKitMajorVersionv @ 3 NONAME
-	_Z19qWebKitMinorVersionv @ 4 NONAME
-	_Z20qt_dump_frame_loaderb @ 5 NONAME
-	_Z20qt_webpage_groupNameP8QWebPage @ 6 NONAME
-	_Z21qt_drt_clearFrameNameP9QWebFrame @ 7 NONAME
-	_Z21qt_drt_pauseAnimationP9QWebFrameRK7QStringdS3_ @ 8 NONAME
-	_Z23qt_webpage_setGroupNameP8QWebPageRK7QString @ 9 NONAME
-	_Z25qt_dump_editing_callbacksb @ 10 NONAME
-	_Z27qt_dump_set_accepts_editingb @ 11 NONAME
-	_Z29qt_drt_javaScriptObjectsCountv @ 12 NONAME
-	_Z31qt_drt_garbageCollector_collectv @ 13 NONAME
-	_Z31qt_drt_numberOfActiveAnimationsP9QWebFrame @ 14 NONAME
-	_Z31qt_dump_resource_load_callbacksb @ 15 NONAME
-	_Z32qt_drt_pauseTransitionOfPropertyP9QWebFrameRK7QStringdS3_ @ 16 NONAME
-	_Z33qt_drt_overwritePluginDirectoriesv @ 17 NONAME
-	_Z36qt_drt_setJavaScriptProfilingEnabledP9QWebFrameb @ 18 NONAME
-	_Z48qt_drt_garbageCollector_collectOnAlternateThreadb @ 19 NONAME
-	_ZN11QWebElement11encloseWithERK7QString @ 20 NONAME
-	_ZN11QWebElement11encloseWithERKS_ @ 21 NONAME
-	_ZN11QWebElement11removeClassERK7QString @ 22 NONAME
-	_ZN11QWebElement11setInnerXmlERK7QString @ 23 NONAME
-	_ZN11QWebElement11setOuterXmlERK7QString @ 24 NONAME
-	_ZN11QWebElement11toggleClassERK7QString @ 25 NONAME
-	_ZN11QWebElement12appendInsideERK7QString @ 26 NONAME
-	_ZN11QWebElement12appendInsideERKS_ @ 27 NONAME
-	_ZN11QWebElement12setAttributeERK7QStringS2_ @ 28 NONAME
-	_ZN11QWebElement12setPlainTextERK7QString @ 29 NONAME
-	_ZN11QWebElement13appendOutsideERK7QString @ 30 NONAME
-	_ZN11QWebElement13appendOutsideERKS_ @ 31 NONAME
-	_ZN11QWebElement13prependInsideERK7QString @ 32 NONAME
-	_ZN11QWebElement13prependInsideERKS_ @ 33 NONAME
-	_ZN11QWebElement14prependOutsideERK7QString @ 34 NONAME
-	_ZN11QWebElement14prependOutsideERKS_ @ 35 NONAME
-	_ZN11QWebElement14removeChildrenEv @ 36 NONAME ABSENT
-	_ZN11QWebElement14setAttributeNSERK7QStringS2_S2_ @ 37 NONAME
-	_ZN11QWebElement15removeAttributeERK7QString @ 38 NONAME
-	_ZN11QWebElement16enclosingElementEPN7WebCore4NodeE @ 39 NONAME
-	_ZN11QWebElement16setStylePropertyERK7QStringS2_ @ 40 NONAME
-	_ZN11QWebElement16takeFromDocumentEv @ 41 NONAME
-	_ZN11QWebElement17removeAttributeNSERK7QStringS2_ @ 42 NONAME
-	_ZN11QWebElement18evaluateJavaScriptERK7QString @ 43 NONAME
-	_ZN11QWebElement18removeFromDocumentEv @ 44 NONAME
-	_ZN11QWebElement19encloseContentsWithERK7QString @ 45 NONAME
-	_ZN11QWebElement19encloseContentsWithERKS_ @ 46 NONAME
-	_ZN11QWebElement7replaceERK7QString @ 47 NONAME
-	_ZN11QWebElement7replaceERKS_ @ 48 NONAME
-	_ZN11QWebElement8addClassERK7QString @ 49 NONAME
-	_ZN11QWebElement8setFocusEv @ 50 NONAME
-	_ZN11QWebElementC1EPN7WebCore4NodeE @ 51 NONAME
-	_ZN11QWebElementC1EPN7WebCore7ElementE @ 52 NONAME
-	_ZN11QWebElementC1ERKS_ @ 53 NONAME
-	_ZN11QWebElementC1Ev @ 54 NONAME
-	_ZN11QWebElementC2EPN7WebCore4NodeE @ 55 NONAME
-	_ZN11QWebElementC2EPN7WebCore7ElementE @ 56 NONAME
-	_ZN11QWebElementC2ERKS_ @ 57 NONAME
-	_ZN11QWebElementC2Ev @ 58 NONAME
-	_ZN11QWebElementD1Ev @ 59 NONAME
-	_ZN11QWebElementD2Ev @ 60 NONAME
-	_ZN11QWebElementaSERKS_ @ 61 NONAME
-	_ZN11QWebHistory12restoreStateERK10QByteArray @ 62 NONAME ABSENT
-	_ZN11QWebHistory19setMaximumItemCountEi @ 63 NONAME
-	_ZN11QWebHistory4backEv @ 64 NONAME
-	_ZN11QWebHistory5clearEv @ 65 NONAME
-	_ZN11QWebHistory7forwardEv @ 66 NONAME
-	_ZN11QWebHistory8goToItemERK15QWebHistoryItem @ 67 NONAME
-	_ZN11QWebHistoryC1Ev @ 68 NONAME
-	_ZN11QWebHistoryC2Ev @ 69 NONAME
-	_ZN11QWebHistoryD1Ev @ 70 NONAME
-	_ZN11QWebHistoryD2Ev @ 71 NONAME
-	_ZN12QWebDatabase14removeDatabaseERKS_ @ 72 NONAME
-	_ZN12QWebDatabase18removeAllDatabasesEv @ 73 NONAME
-	_ZN12QWebDatabaseC1EP19QWebDatabasePrivate @ 74 NONAME
-	_ZN12QWebDatabaseC1ERKS_ @ 75 NONAME
-	_ZN12QWebDatabaseC2EP19QWebDatabasePrivate @ 76 NONAME
-	_ZN12QWebDatabaseC2ERKS_ @ 77 NONAME
-	_ZN12QWebDatabaseD1Ev @ 78 NONAME
-	_ZN12QWebDatabaseD2Ev @ 79 NONAME
-	_ZN12QWebDatabaseaSERKS_ @ 80 NONAME
-	_ZN12QWebSettings10iconForUrlERK4QUrl @ 81 NONAME
-	_ZN12QWebSettings10webGraphicENS_10WebGraphicE @ 82 NONAME
-	_ZN12QWebSettings11setFontSizeENS_8FontSizeEi @ 83 NONAME
-	_ZN12QWebSettings12setAttributeENS_12WebAttributeEb @ 84 NONAME
-	_ZN12QWebSettings13resetFontSizeENS_8FontSizeE @ 85 NONAME
-	_ZN12QWebSettings13setFontFamilyENS_10FontFamilyERK7QString @ 86 NONAME
-	_ZN12QWebSettings13setWebGraphicENS_10WebGraphicERK7QPixmap @ 87 NONAME
-	_ZN12QWebSettings14globalSettingsEv @ 88 NONAME
-	_ZN12QWebSettings14pluginDatabaseEv @ 89 NONAME ABSENT
-	_ZN12QWebSettings14resetAttributeENS_12WebAttributeE @ 90 NONAME
-	_ZN12QWebSettings15resetFontFamilyENS_10FontFamilyE @ 91 NONAME
-	_ZN12QWebSettings16iconDatabasePathEv @ 92 NONAME
-	_ZN12QWebSettings17clearIconDatabaseEv @ 93 NONAME
-	_ZN12QWebSettings17clearMemoryCachesEv @ 94 NONAME
-	_ZN12QWebSettings18offlineStoragePathEv @ 95 NONAME
-	_ZN12QWebSettings19maximumPagesInCacheEv @ 96 NONAME
-	_ZN12QWebSettings19setIconDatabasePathERK7QString @ 97 NONAME
-	_ZN12QWebSettings19setLocalStoragePathERK7QString @ 98 NONAME
-	_ZN12QWebSettings20setUserStyleSheetUrlERK4QUrl @ 99 NONAME
-	_ZN12QWebSettings21setOfflineStoragePathERK7QString @ 100 NONAME
-	_ZN12QWebSettings22setDefaultTextEncodingERK7QString @ 101 NONAME
-	_ZN12QWebSettings22setMaximumPagesInCacheEi @ 102 NONAME
-	_ZN12QWebSettings23enablePersistentStorageERK7QString @ 103 NONAME
-	_ZN12QWebSettings24setObjectCacheCapacitiesEiii @ 104 NONAME
-	_ZN12QWebSettings26offlineStorageDefaultQuotaEv @ 105 NONAME
-	_ZN12QWebSettings29setOfflineStorageDefaultQuotaEx @ 106 NONAME
-	_ZN12QWebSettings30offlineWebApplicationCachePathEv @ 107 NONAME
-	_ZN12QWebSettings31offlineWebApplicationCacheQuotaEv @ 108 NONAME
-	_ZN12QWebSettings33setOfflineWebApplicationCachePathERK7QString @ 109 NONAME
-	_ZN12QWebSettings34setOfflineWebApplicationCacheQuotaEx @ 110 NONAME
-	_ZN12QWebSettingsC1EPN7WebCore8SettingsE @ 111 NONAME
-	_ZN12QWebSettingsC1Ev @ 112 NONAME
-	_ZN12QWebSettingsC2EPN7WebCore8SettingsE @ 113 NONAME
-	_ZN12QWebSettingsC2Ev @ 114 NONAME
-	_ZN12QWebSettingsD1Ev @ 115 NONAME
-	_ZN12QWebSettingsD2Ev @ 116 NONAME
-	_ZN13QWebInspector11qt_metacallEN11QMetaObject4CallEiPPv @ 117 NONAME
-	_ZN13QWebInspector11qt_metacastEPKc @ 118 NONAME
-	_ZN13QWebInspector11resizeEventEP12QResizeEvent @ 119 NONAME
-	_ZN13QWebInspector16staticMetaObjectE @ 120 NONAME DATA 16
-	_ZN13QWebInspector18windowTitleChangedERK7QString @ 121 NONAME ABSENT
-	_ZN13QWebInspector19getStaticMetaObjectEv @ 122 NONAME
-	_ZN13QWebInspector5eventEP6QEvent @ 123 NONAME
-	_ZN13QWebInspector7setPageEP8QWebPage @ 124 NONAME
-	_ZN13QWebInspector9hideEventEP10QHideEvent @ 125 NONAME
-	_ZN13QWebInspector9showEventEP10QShowEvent @ 126 NONAME
-	_ZN13QWebInspectorC1EP7QWidget @ 127 NONAME
-	_ZN13QWebInspectorC2EP7QWidget @ 128 NONAME
-	_ZN13QWebInspectorD0Ev @ 129 NONAME
-	_ZN13QWebInspectorD1Ev @ 130 NONAME
-	_ZN13QWebInspectorD2Ev @ 131 NONAME
-	_ZN14QWebPluginInfo10setEnabledEb @ 132 NONAME
-	_ZN14QWebPluginInfoC1EPN7WebCore13PluginPackageE @ 133 NONAME
-	_ZN14QWebPluginInfoC1ERKS_ @ 134 NONAME
-	_ZN14QWebPluginInfoC1Ev @ 135 NONAME
-	_ZN14QWebPluginInfoC2EPN7WebCore13PluginPackageE @ 136 NONAME
-	_ZN14QWebPluginInfoC2ERKS_ @ 137 NONAME
-	_ZN14QWebPluginInfoC2Ev @ 138 NONAME
-	_ZN14QWebPluginInfoD1Ev @ 139 NONAME
-	_ZN14QWebPluginInfoD2Ev @ 140 NONAME
-	_ZN14QWebPluginInfoaSERKS_ @ 141 NONAME
-	_ZN15QWebHistoryItem11setUserDataERK8QVariant @ 142 NONAME
-	_ZN15QWebHistoryItemC1EP22QWebHistoryItemPrivate @ 143 NONAME
-	_ZN15QWebHistoryItemC1ERKS_ @ 144 NONAME
-	_ZN15QWebHistoryItemC2EP22QWebHistoryItemPrivate @ 145 NONAME
-	_ZN15QWebHistoryItemC2ERKS_ @ 146 NONAME
-	_ZN15QWebHistoryItemD1Ev @ 147 NONAME
-	_ZN15QWebHistoryItemD2Ev @ 148 NONAME
-	_ZN15QWebHistoryItemaSERKS_ @ 149 NONAME
-	_ZN16QGraphicsWebView10loadFailedEv @ 150 NONAME ABSENT
-	_ZN16QGraphicsWebView10sceneEventEP6QEvent @ 151 NONAME
-	_ZN16QGraphicsWebView10setContentERK10QByteArrayRK7QStringRK4QUrl @ 152 NONAME
-	_ZN16QGraphicsWebView10urlChangedERK4QUrl @ 153 NONAME
-	_ZN16QGraphicsWebView10wheelEventEP24QGraphicsSceneWheelEvent @ 154 NONAME
-	_ZN16QGraphicsWebView11iconChangedEv @ 155 NONAME
-	_ZN16QGraphicsWebView11loadStartedEv @ 156 NONAME
-	_ZN16QGraphicsWebView11qt_metacallEN11QMetaObject4CallEiPPv @ 157 NONAME
-	_ZN16QGraphicsWebView11qt_metacastEPKc @ 158 NONAME
-	_ZN16QGraphicsWebView11setGeometryERK6QRectF @ 159 NONAME
-	_ZN16QGraphicsWebView12focusInEventEP11QFocusEvent @ 160 NONAME
-	_ZN16QGraphicsWebView12loadFinishedEv @ 161 NONAME ABSENT
-	_ZN16QGraphicsWebView12titleChangedERK7QString @ 162 NONAME
-	_ZN16QGraphicsWebView13dragMoveEventEP27QGraphicsSceneDragDropEvent @ 163 NONAME
-	_ZN16QGraphicsWebView13focusOutEventEP11QFocusEvent @ 164 NONAME
-	_ZN16QGraphicsWebView13keyPressEventEP9QKeyEvent @ 165 NONAME
-	_ZN16QGraphicsWebView13setZoomFactorEf @ 166 NONAME
-	_ZN16QGraphicsWebView13statusChangedEv @ 167 NONAME ABSENT
-	_ZN16QGraphicsWebView14dragEnterEventEP27QGraphicsSceneDragDropEvent @ 168 NONAME
-	_ZN16QGraphicsWebView14dragLeaveEventEP27QGraphicsSceneDragDropEvent @ 169 NONAME
-	_ZN16QGraphicsWebView14hoverMoveEventEP24QGraphicsSceneHoverEvent @ 170 NONAME
-	_ZN16QGraphicsWebView14mouseMoveEventEP24QGraphicsSceneMouseEvent @ 171 NONAME
-	_ZN16QGraphicsWebView14setInteractiveEb @ 172 NONAME ABSENT
-	_ZN16QGraphicsWebView14updateGeometryEv @ 173 NONAME
-	_ZN16QGraphicsWebView15hoverLeaveEventEP24QGraphicsSceneHoverEvent @ 174 NONAME
-	_ZN16QGraphicsWebView15keyReleaseEventEP9QKeyEvent @ 175 NONAME
-	_ZN16QGraphicsWebView15mousePressEventEP24QGraphicsSceneMouseEvent @ 176 NONAME
-	_ZN16QGraphicsWebView15progressChangedEf @ 177 NONAME ABSENT
-	_ZN16QGraphicsWebView16contextMenuEventEP30QGraphicsSceneContextMenuEvent @ 178 NONAME
-	_ZN16QGraphicsWebView16inputMethodEventEP17QInputMethodEvent @ 179 NONAME
-	_ZN16QGraphicsWebView16staticMetaObjectE @ 180 NONAME DATA 16
-	_ZN16QGraphicsWebView17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 181 NONAME
-	_ZN16QGraphicsWebView17zoomFactorChangedEv @ 182 NONAME ABSENT
-	_ZN16QGraphicsWebView18focusNextPrevChildEb @ 183 NONAME
-	_ZN16QGraphicsWebView19getStaticMetaObjectEv @ 184 NONAME
-	_ZN16QGraphicsWebView20interactivityChangedEv @ 185 NONAME ABSENT
-	_ZN16QGraphicsWebView21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent @ 186 NONAME
-	_ZN16QGraphicsWebView4backEv @ 187 NONAME
-	_ZN16QGraphicsWebView4loadERK15QNetworkRequestN21QNetworkAccessManager9OperationERK10QByteArray @ 188 NONAME
-	_ZN16QGraphicsWebView4loadERK4QUrl @ 189 NONAME
-	_ZN16QGraphicsWebView4stopEv @ 190 NONAME
-	_ZN16QGraphicsWebView5eventEP6QEvent @ 191 NONAME
-	_ZN16QGraphicsWebView5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 192 NONAME
-	_ZN16QGraphicsWebView6reloadEv @ 193 NONAME
-	_ZN16QGraphicsWebView6setUrlERK4QUrl @ 194 NONAME
-	_ZN16QGraphicsWebView7forwardEv @ 195 NONAME
-	_ZN16QGraphicsWebView7setHtmlERK7QStringRK4QUrl @ 196 NONAME
-	_ZN16QGraphicsWebView7setPageEP8QWebPage @ 197 NONAME
-	_ZN16QGraphicsWebView9dropEventEP27QGraphicsSceneDragDropEvent @ 198 NONAME
-	_ZN16QGraphicsWebViewC1EP13QGraphicsItem @ 199 NONAME
-	_ZN16QGraphicsWebViewC2EP13QGraphicsItem @ 200 NONAME
-	_ZN16QGraphicsWebViewD0Ev @ 201 NONAME
-	_ZN16QGraphicsWebViewD1Ev @ 202 NONAME
-	_ZN16QGraphicsWebViewD2Ev @ 203 NONAME
-	_ZN17QWebHitTestResultC1EP24QWebHitTestResultPrivate @ 204 NONAME
-	_ZN17QWebHitTestResultC1ERKS_ @ 205 NONAME
-	_ZN17QWebHitTestResultC1Ev @ 206 NONAME
-	_ZN17QWebHitTestResultC2EP24QWebHitTestResultPrivate @ 207 NONAME
-	_ZN17QWebHitTestResultC2ERKS_ @ 208 NONAME
-	_ZN17QWebHitTestResultC2Ev @ 209 NONAME
-	_ZN17QWebHitTestResultD1Ev @ 210 NONAME
-	_ZN17QWebHitTestResultD2Ev @ 211 NONAME
-	_ZN17QWebHitTestResultaSERKS_ @ 212 NONAME
-	_ZN17QWebPluginFactory11qt_metacallEN11QMetaObject4CallEiPPv @ 213 NONAME
-	_ZN17QWebPluginFactory11qt_metacastEPKc @ 214 NONAME
-	_ZN17QWebPluginFactory14refreshPluginsEv @ 215 NONAME
-	_ZN17QWebPluginFactory16staticMetaObjectE @ 216 NONAME DATA 16
-	_ZN17QWebPluginFactory19getStaticMetaObjectEv @ 217 NONAME
-	_ZN17QWebPluginFactory9extensionENS_9ExtensionEPKNS_15ExtensionOptionEPNS_15ExtensionReturnE @ 218 NONAME
-	_ZN17QWebPluginFactoryC2EP7QObject @ 219 NONAME
-	_ZN17QWebPluginFactoryD0Ev @ 220 NONAME
-	_ZN17QWebPluginFactoryD1Ev @ 221 NONAME
-	_ZN17QWebPluginFactoryD2Ev @ 222 NONAME
-	_ZN18QWebPluginDatabase11qt_metacallEN11QMetaObject4CallEiPPv @ 223 NONAME
-	_ZN18QWebPluginDatabase11qt_metacastEPKc @ 224 NONAME
-	_ZN18QWebPluginDatabase13addSearchPathERK7QString @ 225 NONAME
-	_ZN18QWebPluginDatabase14setSearchPathsERK11QStringList @ 226 NONAME
-	_ZN18QWebPluginDatabase16staticMetaObjectE @ 227 NONAME DATA 16
-	_ZN18QWebPluginDatabase17pluginForMimeTypeERK7QString @ 228 NONAME
-	_ZN18QWebPluginDatabase18defaultSearchPathsEv @ 229 NONAME
-	_ZN18QWebPluginDatabase19getStaticMetaObjectEv @ 230 NONAME
-	_ZN18QWebPluginDatabase29setPreferredPluginForMimeTypeERK7QStringRK14QWebPluginInfo @ 231 NONAME
-	_ZN18QWebPluginDatabase7refreshEv @ 232 NONAME
-	_ZN18QWebPluginDatabaseC1EP7QObject @ 233 NONAME
-	_ZN18QWebPluginDatabaseC2EP7QObject @ 234 NONAME
-	_ZN18QWebPluginDatabaseD0Ev @ 235 NONAME
-	_ZN18QWebPluginDatabaseD1Ev @ 236 NONAME
-	_ZN18QWebPluginDatabaseD2Ev @ 237 NONAME
-	_ZN18QWebSecurityOrigin10allOriginsEv @ 238 NONAME
-	_ZN18QWebSecurityOrigin12localSchemesEv @ 239 NONAME
-	_ZN18QWebSecurityOrigin14addLocalSchemeERK7QString @ 240 NONAME
-	_ZN18QWebSecurityOrigin16setDatabaseQuotaEx @ 241 NONAME
-	_ZN18QWebSecurityOrigin17removeLocalSchemeERK7QString @ 242 NONAME
-	_ZN18QWebSecurityOrigin25whiteListAccessFromOriginERK7QStringS2_S2_b @ 243 NONAME ABSENT
-	_ZN18QWebSecurityOrigin27resetOriginAccessWhiteListsEv @ 244 NONAME ABSENT
-	_ZN18QWebSecurityOriginC1EP25QWebSecurityOriginPrivate @ 245 NONAME
-	_ZN18QWebSecurityOriginC1ERKS_ @ 246 NONAME
-	_ZN18QWebSecurityOriginC2EP25QWebSecurityOriginPrivate @ 247 NONAME
-	_ZN18QWebSecurityOriginC2ERKS_ @ 248 NONAME
-	_ZN18QWebSecurityOriginD1Ev @ 249 NONAME
-	_ZN18QWebSecurityOriginD2Ev @ 250 NONAME
-	_ZN18QWebSecurityOriginaSERKS_ @ 251 NONAME
-	_ZN20QWebHistoryInterface11qt_metacallEN11QMetaObject4CallEiPPv @ 252 NONAME
-	_ZN20QWebHistoryInterface11qt_metacastEPKc @ 253 NONAME
-	_ZN20QWebHistoryInterface16defaultInterfaceEv @ 254 NONAME
-	_ZN20QWebHistoryInterface16staticMetaObjectE @ 255 NONAME DATA 16
-	_ZN20QWebHistoryInterface19getStaticMetaObjectEv @ 256 NONAME
-	_ZN20QWebHistoryInterface19setDefaultInterfaceEPS_ @ 257 NONAME
-	_ZN20QWebHistoryInterfaceC2EP7QObject @ 258 NONAME
-	_ZN20QWebHistoryInterfaceD0Ev @ 259 NONAME
-	_ZN20QWebHistoryInterfaceD1Ev @ 260 NONAME
-	_ZN20QWebHistoryInterfaceD2Ev @ 261 NONAME
-	_ZN8QWebPage10chooseFileEP9QWebFrameRK7QString @ 262 NONAME
-	_ZN8QWebPage10setPaletteERK8QPalette @ 263 NONAME
-	_ZN8QWebPage11linkClickedERK4QUrl @ 264 NONAME
-	_ZN8QWebPage11linkHoveredERK7QStringS2_S2_ @ 265 NONAME
-	_ZN8QWebPage11loadStartedEv @ 266 NONAME
-	_ZN8QWebPage11qt_metacallEN11QMetaObject4CallEiPPv @ 267 NONAME
-	_ZN8QWebPage11qt_metacastEPKc @ 268 NONAME
-	_ZN8QWebPage12createPluginERK7QStringRK4QUrlRK11QStringListS8_ @ 269 NONAME
-	_ZN8QWebPage12createWindowENS_13WebWindowTypeE @ 270 NONAME
-	_ZN8QWebPage12frameCreatedEP9QWebFrame @ 271 NONAME
-	_ZN8QWebPage12loadFinishedEb @ 272 NONAME
-	_ZN8QWebPage12loadProgressEi @ 273 NONAME
-	_ZN8QWebPage13triggerActionENS_9WebActionEb @ 274 NONAME
-	_ZN8QWebPage14printRequestedEP9QWebFrame @ 275 NONAME
-	_ZN8QWebPage15contentsChangedEv @ 276 NONAME
-	_ZN8QWebPage15javaScriptAlertEP9QWebFrameRK7QString @ 277 NONAME
-	_ZN8QWebPage15scrollRequestedEiiRK5QRect @ 278 NONAME
-	_ZN8QWebPage16javaScriptPromptEP9QWebFrameRK7QStringS4_PS2_ @ 279 NONAME
-	_ZN8QWebPage16repaintRequestedERK5QRect @ 280 NONAME
-	_ZN8QWebPage16selectionChangedEv @ 281 NONAME
-	_ZN8QWebPage16setPluginFactoryEP17QWebPluginFactory @ 282 NONAME
-	_ZN8QWebPage16staticMetaObjectE @ 283 NONAME DATA 16
-	_ZN8QWebPage16statusBarMessageERK7QString @ 284 NONAME
-	_ZN8QWebPage17downloadRequestedERK15QNetworkRequest @ 285 NONAME
-	_ZN8QWebPage17javaScriptConfirmEP9QWebFrameRK7QString @ 286 NONAME
-	_ZN8QWebPage17microFocusChangedEv @ 287 NONAME
-	_ZN8QWebPage18focusNextPrevChildEb @ 288 NONAME
-	_ZN8QWebPage18setContentEditableEb @ 289 NONAME
-	_ZN8QWebPage18unsupportedContentEP13QNetworkReply @ 290 NONAME
-	_ZN8QWebPage19getStaticMetaObjectEv @ 291 NONAME
-	_ZN8QWebPage20windowCloseRequestedEv @ 292 NONAME
-	_ZN8QWebPage21databaseQuotaExceededEP9QWebFrame7QString @ 293 NONAME
-	_ZN8QWebPage21webInspectorTriggeredERK11QWebElement @ 294 NONAME ABSENT
-	_ZN8QWebPage23acceptNavigationRequestEP9QWebFrameRK15QNetworkRequestNS_14NavigationTypeE @ 295 NONAME
-	_ZN8QWebPage23geometryChangeRequestedERK5QRect @ 296 NONAME
-	_ZN8QWebPage23saveFrameStateRequestedEP9QWebFrameP15QWebHistoryItem @ 297 NONAME
-	_ZN8QWebPage23setLinkDelegationPolicyENS_20LinkDelegationPolicyE @ 298 NONAME
-	_ZN8QWebPage23setNetworkAccessManagerEP21QNetworkAccessManager @ 299 NONAME
-	_ZN8QWebPage23swallowContextMenuEventEP17QContextMenuEvent @ 300 NONAME
-	_ZN8QWebPage24javaScriptConsoleMessageERK7QStringiS2_ @ 301 NONAME
-	_ZN8QWebPage25createStandardContextMenuEv @ 302 NONAME
-	_ZN8QWebPage25shouldInterruptJavaScriptEv @ 303 NONAME
-	_ZN8QWebPage26restoreFrameStateRequestedEP9QWebFrame @ 304 NONAME
-	_ZN8QWebPage28setForwardUnsupportedContentEb @ 305 NONAME
-	_ZN8QWebPage30updatePositionDependentActionsERK6QPoint @ 306 NONAME
-	_ZN8QWebPage32menuBarVisibilityChangeRequestedEb @ 307 NONAME
-	_ZN8QWebPage32toolBarVisibilityChangeRequestedEb @ 308 NONAME
-	_ZN8QWebPage34statusBarVisibilityChangeRequestedEb @ 309 NONAME
-	_ZN8QWebPage5eventEP6QEvent @ 310 NONAME
-	_ZN8QWebPage7setViewEP7QWidget @ 311 NONAME
-	_ZN8QWebPage8findTextERK7QString6QFlagsINS_8FindFlagEE @ 312 NONAME
-	_ZN8QWebPage9extensionENS_9ExtensionEPKNS_15ExtensionOptionEPNS_15ExtensionReturnE @ 313 NONAME
-	_ZN8QWebPageC1EP7QObject @ 314 NONAME
-	_ZN8QWebPageC2EP7QObject @ 315 NONAME
-	_ZN8QWebPageD0Ev @ 316 NONAME
-	_ZN8QWebPageD1Ev @ 317 NONAME
-	_ZN8QWebPageD2Ev @ 318 NONAME
-	_ZN8QWebView10paintEventEP11QPaintEvent @ 319 NONAME
-	_ZN8QWebView10setContentERK10QByteArrayRK7QStringRK4QUrl @ 320 NONAME
-	_ZN8QWebView10urlChangedERK4QUrl @ 321 NONAME
-	_ZN8QWebView10wheelEventEP11QWheelEvent @ 322 NONAME
-	_ZN8QWebView11changeEventEP6QEvent @ 323 NONAME
-	_ZN8QWebView11iconChangedEv @ 324 NONAME
-	_ZN8QWebView11linkClickedERK4QUrl @ 325 NONAME
-	_ZN8QWebView11loadStartedEv @ 326 NONAME
-	_ZN8QWebView11qt_metacallEN11QMetaObject4CallEiPPv @ 327 NONAME
-	_ZN8QWebView11qt_metacastEPKc @ 328 NONAME
-	_ZN8QWebView11resizeEventEP12QResizeEvent @ 329 NONAME
-	_ZN8QWebView12createWindowEN8QWebPage13WebWindowTypeE @ 330 NONAME
-	_ZN8QWebView12focusInEventEP11QFocusEvent @ 331 NONAME
-	_ZN8QWebView12loadFinishedEb @ 332 NONAME
-	_ZN8QWebView12loadProgressEi @ 333 NONAME
-	_ZN8QWebView12titleChangedERK7QString @ 334 NONAME
-	_ZN8QWebView13dragMoveEventEP14QDragMoveEvent @ 335 NONAME
-	_ZN8QWebView13focusOutEventEP11QFocusEvent @ 336 NONAME
-	_ZN8QWebView13keyPressEventEP9QKeyEvent @ 337 NONAME
-	_ZN8QWebView13setRenderHintEN8QPainter10RenderHintEb @ 338 NONAME
-	_ZN8QWebView13setZoomFactorEf @ 339 NONAME
-	_ZN8QWebView14dragEnterEventEP15QDragEnterEvent @ 340 NONAME
-	_ZN8QWebView14dragLeaveEventEP15QDragLeaveEvent @ 341 NONAME
-	_ZN8QWebView14mouseMoveEventEP11QMouseEvent @ 342 NONAME
-	_ZN8QWebView14setRenderHintsE6QFlagsIN8QPainter10RenderHintEE @ 343 NONAME
-	_ZN8QWebView15keyReleaseEventEP9QKeyEvent @ 344 NONAME
-	_ZN8QWebView15mousePressEventEP11QMouseEvent @ 345 NONAME
-	_ZN8QWebView16contextMenuEventEP17QContextMenuEvent @ 346 NONAME
-	_ZN8QWebView16inputMethodEventEP17QInputMethodEvent @ 347 NONAME
-	_ZN8QWebView16selectionChangedEv @ 348 NONAME
-	_ZN8QWebView16staticMetaObjectE @ 349 NONAME DATA 16
-	_ZN8QWebView16statusBarMessageERK7QString @ 350 NONAME
-	_ZN8QWebView17mouseReleaseEventEP11QMouseEvent @ 351 NONAME
-	_ZN8QWebView17triggerPageActionEN8QWebPage9WebActionEb @ 352 NONAME
-	_ZN8QWebView18focusNextPrevChildEb @ 353 NONAME
-	_ZN8QWebView18guessUrlFromStringERK7QString @ 354 NONAME ABSENT
-	_ZN8QWebView19getStaticMetaObjectEv @ 355 NONAME
-	_ZN8QWebView21mouseDoubleClickEventEP11QMouseEvent @ 356 NONAME
-	_ZN8QWebView21setTextSizeMultiplierEf @ 357 NONAME
-	_ZN8QWebView4backEv @ 358 NONAME
-	_ZN8QWebView4loadERK15QNetworkRequestN21QNetworkAccessManager9OperationERK10QByteArray @ 359 NONAME
-	_ZN8QWebView4loadERK4QUrl @ 360 NONAME
-	_ZN8QWebView4stopEv @ 361 NONAME
-	_ZN8QWebView5eventEP6QEvent @ 362 NONAME
-	_ZN8QWebView6reloadEv @ 363 NONAME
-	_ZN8QWebView6setUrlERK4QUrl @ 364 NONAME
-	_ZN8QWebView7forwardEv @ 365 NONAME
-	_ZN8QWebView7setHtmlERK7QStringRK4QUrl @ 366 NONAME
-	_ZN8QWebView7setPageEP8QWebPage @ 367 NONAME
-	_ZN8QWebView8findTextERK7QString6QFlagsIN8QWebPage8FindFlagEE @ 368 NONAME
-	_ZN8QWebView9dropEventEP10QDropEvent @ 369 NONAME
-	_ZN8QWebViewC1EP7QWidget @ 370 NONAME
-	_ZN8QWebViewC2EP7QWidget @ 371 NONAME
-	_ZN8QWebViewD0Ev @ 372 NONAME
-	_ZN8QWebViewD1Ev @ 373 NONAME
-	_ZN8QWebViewD2Ev @ 374 NONAME
-	_ZN9QWebFrame10setContentERK10QByteArrayRK7QStringRK4QUrl @ 375 NONAME
-	_ZN9QWebFrame10urlChangedERK4QUrl @ 376 NONAME
-	_ZN9QWebFrame11iconChangedEv @ 377 NONAME
-	_ZN9QWebFrame11loadStartedEv @ 378 NONAME
-	_ZN9QWebFrame11qt_metacallEN11QMetaObject4CallEiPPv @ 379 NONAME
-	_ZN9QWebFrame11qt_metacastEPKc @ 380 NONAME
-	_ZN9QWebFrame12loadFinishedEb @ 381 NONAME
-	_ZN9QWebFrame12titleChangedERK7QString @ 382 NONAME
-	_ZN9QWebFrame13setZoomFactorEf @ 383 NONAME
-	_ZN9QWebFrame15provisionalLoadEv @ 384 NONAME
-	_ZN9QWebFrame16staticMetaObjectE @ 385 NONAME DATA 16
-	_ZN9QWebFrame17setScrollBarValueEN2Qt11OrientationEi @ 386 NONAME
-	_ZN9QWebFrame17setScrollPositionERK6QPoint @ 387 NONAME
-	_ZN9QWebFrame18evaluateJavaScriptERK7QString @ 388 NONAME
-	_ZN9QWebFrame18setScrollBarPolicyEN2Qt11OrientationENS0_15ScrollBarPolicyE @ 389 NONAME
-	_ZN9QWebFrame19contentsSizeChangedERK5QSize @ 390 NONAME
-	_ZN9QWebFrame19getStaticMetaObjectEv @ 391 NONAME
-	_ZN9QWebFrame21setTextSizeMultiplierEf @ 392 NONAME
-	_ZN9QWebFrame22initialLayoutCompletedEv @ 393 NONAME
-	_ZN9QWebFrame23setClipRenderToViewportEb @ 394 NONAME ABSENT
-	_ZN9QWebFrame27addToJavaScriptWindowObjectERK7QStringP7QObject @ 395 NONAME
-	_ZN9QWebFrame27addToJavaScriptWindowObjectERK7QStringP7QObjectN13QScriptEngine14ValueOwnershipE @ 396 NONAME
-	_ZN9QWebFrame29javaScriptWindowObjectClearedEv @ 397 NONAME
-	_ZN9QWebFrame4loadERK15QNetworkRequestN21QNetworkAccessManager9OperationERK10QByteArray @ 398 NONAME
-	_ZN9QWebFrame4loadERK4QUrl @ 399 NONAME
-	_ZN9QWebFrame5eventEP6QEvent @ 400 NONAME
-	_ZN9QWebFrame6renderEP8QPainter @ 401 NONAME
-	_ZN9QWebFrame6renderEP8QPainterRK7QRegion @ 402 NONAME
-	_ZN9QWebFrame6scrollEii @ 403 NONAME
-	_ZN9QWebFrame6setUrlERK4QUrl @ 404 NONAME
-	_ZN9QWebFrame7setHtmlERK7QStringRK4QUrl @ 405 NONAME
-	_ZN9QWebFrame8setFocusEv @ 406 NONAME
-	_ZN9QWebFrameC1EP8QWebPageP13QWebFrameData @ 407 NONAME
-	_ZN9QWebFrameC1EPS_P13QWebFrameData @ 408 NONAME
-	_ZN9QWebFrameC2EP8QWebPageP13QWebFrameData @ 409 NONAME
-	_ZN9QWebFrameC2EPS_P13QWebFrameData @ 410 NONAME
-	_ZN9QWebFrameD0Ev @ 411 NONAME
-	_ZN9QWebFrameD1Ev @ 412 NONAME
-	_ZN9QWebFrameD2Ev @ 413 NONAME
-	_ZNK11QWebElement10firstChildEv @ 414 NONAME
-	_ZNK11QWebElement10toInnerXmlEv @ 415 NONAME
-	_ZNK11QWebElement10toOuterXmlEv @ 416 NONAME
-	_ZNK11QWebElement11attributeNSERK7QStringS2_S2_ @ 417 NONAME
-	_ZNK11QWebElement11nextSiblingEv @ 418 NONAME
-	_ZNK11QWebElement11toPlainTextEv @ 419 NONAME
-	_ZNK11QWebElement12hasAttributeERK7QString @ 420 NONAME
-	_ZNK11QWebElement12namespaceUriEv @ 421 NONAME
-	_ZNK11QWebElement13hasAttributesEv @ 422 NONAME
-	_ZNK11QWebElement13stylePropertyERK7QStringNS_20StyleResolveStrategyE @ 423 NONAME
-	_ZNK11QWebElement14hasAttributeNSERK7QStringS2_ @ 424 NONAME
-	_ZNK11QWebElement15previousSiblingEv @ 425 NONAME
-	_ZNK11QWebElement5cloneEv @ 426 NONAME
-	_ZNK11QWebElement6isNullEv @ 427 NONAME
-	_ZNK11QWebElement6parentEv @ 428 NONAME
-	_ZNK11QWebElement6prefixEv @ 429 NONAME
-	_ZNK11QWebElement7classesEv @ 430 NONAME
-	_ZNK11QWebElement7findAllERK7QString @ 431 NONAME
-	_ZNK11QWebElement7tagNameEv @ 432 NONAME
-	_ZNK11QWebElement8documentEv @ 433 NONAME
-	_ZNK11QWebElement8geometryEv @ 434 NONAME
-	_ZNK11QWebElement8hasClassERK7QString @ 435 NONAME
-	_ZNK11QWebElement8hasFocusEv @ 436 NONAME
-	_ZNK11QWebElement8webFrameEv @ 437 NONAME
-	_ZNK11QWebElement9attributeERK7QStringS2_ @ 438 NONAME
-	_ZNK11QWebElement9findFirstERK7QString @ 439 NONAME
-	_ZNK11QWebElement9lastChildEv @ 440 NONAME
-	_ZNK11QWebElement9localNameEv @ 441 NONAME
-	_ZNK11QWebElementeqERKS_ @ 442 NONAME
-	_ZNK11QWebElementneERKS_ @ 443 NONAME
-	_ZNK11QWebHistory11currentItemEv @ 444 NONAME
-	_ZNK11QWebHistory11forwardItemEv @ 445 NONAME
-	_ZNK11QWebHistory12canGoForwardEv @ 446 NONAME
-	_ZNK11QWebHistory12forwardItemsEi @ 447 NONAME
-	_ZNK11QWebHistory16currentItemIndexEv @ 448 NONAME
-	_ZNK11QWebHistory16maximumItemCountEv @ 449 NONAME
-	_ZNK11QWebHistory5countEv @ 450 NONAME
-	_ZNK11QWebHistory5itemsEv @ 451 NONAME
-	_ZNK11QWebHistory6itemAtEi @ 452 NONAME
-	_ZNK11QWebHistory8backItemEv @ 453 NONAME
-	_ZNK11QWebHistory9backItemsEi @ 454 NONAME
-	_ZNK11QWebHistory9canGoBackEv @ 455 NONAME
-	_ZNK11QWebHistory9saveStateENS_19HistoryStateVersionE @ 456 NONAME ABSENT
-	_ZNK12QWebDatabase11displayNameEv @ 457 NONAME
-	_ZNK12QWebDatabase12expectedSizeEv @ 458 NONAME
-	_ZNK12QWebDatabase4nameEv @ 459 NONAME
-	_ZNK12QWebDatabase4sizeEv @ 460 NONAME
-	_ZNK12QWebDatabase6originEv @ 461 NONAME
-	_ZNK12QWebDatabase8fileNameEv @ 462 NONAME
-	_ZNK12QWebSettings10fontFamilyENS_10FontFamilyE @ 463 NONAME
-	_ZNK12QWebSettings13testAttributeENS_12WebAttributeE @ 464 NONAME
-	_ZNK12QWebSettings16localStoragePathEv @ 465 NONAME
-	_ZNK12QWebSettings17userStyleSheetUrlEv @ 466 NONAME
-	_ZNK12QWebSettings19defaultTextEncodingEv @ 467 NONAME
-	_ZNK12QWebSettings8fontSizeENS_8FontSizeE @ 468 NONAME
-	_ZNK13QWebInspector10metaObjectEv @ 469 NONAME
-	_ZNK13QWebInspector4pageEv @ 470 NONAME
-	_ZNK13QWebInspector8sizeHintEv @ 471 NONAME
-	_ZNK14QWebPluginInfo11descriptionEv @ 472 NONAME
-	_ZNK14QWebPluginInfo16supportsMimeTypeERK7QString @ 473 NONAME
-	_ZNK14QWebPluginInfo4nameEv @ 474 NONAME
-	_ZNK14QWebPluginInfo4pathEv @ 475 NONAME
-	_ZNK14QWebPluginInfo6isNullEv @ 476 NONAME
-	_ZNK14QWebPluginInfo9isEnabledEv @ 477 NONAME
-	_ZNK14QWebPluginInfo9mimeTypesEv @ 478 NONAME
-	_ZNK14QWebPluginInfoeqERKS_ @ 479 NONAME
-	_ZNK14QWebPluginInfoneERKS_ @ 480 NONAME
-	_ZNK15QWebHistoryItem11lastVisitedEv @ 481 NONAME
-	_ZNK15QWebHistoryItem11originalUrlEv @ 482 NONAME
-	_ZNK15QWebHistoryItem3urlEv @ 483 NONAME
-	_ZNK15QWebHistoryItem4iconEv @ 484 NONAME
-	_ZNK15QWebHistoryItem5titleEv @ 485 NONAME
-	_ZNK15QWebHistoryItem7isValidEv @ 486 NONAME
-	_ZNK15QWebHistoryItem8userDataEv @ 487 NONAME
-	_ZNK16QGraphicsWebView10metaObjectEv @ 488 NONAME
-	_ZNK16QGraphicsWebView10zoomFactorEv @ 489 NONAME
-	_ZNK16QGraphicsWebView13isInteractiveEv @ 490 NONAME ABSENT
-	_ZNK16QGraphicsWebView3urlEv @ 491 NONAME
-	_ZNK16QGraphicsWebView4iconEv @ 492 NONAME
-	_ZNK16QGraphicsWebView4pageEv @ 493 NONAME
-	_ZNK16QGraphicsWebView5titleEv @ 494 NONAME
-	_ZNK16QGraphicsWebView6statusEv @ 495 NONAME ABSENT
-	_ZNK16QGraphicsWebView6toHtmlEv @ 496 NONAME ABSENT
-	_ZNK16QGraphicsWebView7historyEv @ 497 NONAME
-	_ZNK16QGraphicsWebView8progressEv @ 498 NONAME ABSENT
-	_ZNK16QGraphicsWebView8settingsEv @ 499 NONAME
-	_ZNK17QWebHitTestResult11linkElementEv @ 500 NONAME
-	_ZNK17QWebHitTestResult12boundingRectEv @ 501 NONAME
-	_ZNK17QWebHitTestResult13alternateTextEv @ 502 NONAME
-	_ZNK17QWebHitTestResult15linkTargetFrameEv @ 503 NONAME
-	_ZNK17QWebHitTestResult17isContentEditableEv @ 504 NONAME
-	_ZNK17QWebHitTestResult17isContentSelectedEv @ 505 NONAME
-	_ZNK17QWebHitTestResult21enclosingBlockElementEv @ 506 NONAME
-	_ZNK17QWebHitTestResult3posEv @ 507 NONAME
-	_ZNK17QWebHitTestResult5frameEv @ 508 NONAME
-	_ZNK17QWebHitTestResult5titleEv @ 509 NONAME
-	_ZNK17QWebHitTestResult6isNullEv @ 510 NONAME
-	_ZNK17QWebHitTestResult6pixmapEv @ 511 NONAME
-	_ZNK17QWebHitTestResult7elementEv @ 512 NONAME
-	_ZNK17QWebHitTestResult7linkUrlEv @ 513 NONAME
-	_ZNK17QWebHitTestResult8imageUrlEv @ 514 NONAME
-	_ZNK17QWebHitTestResult8linkTextEv @ 515 NONAME
-	_ZNK17QWebHitTestResult9linkTitleEv @ 516 NONAME
-	_ZNK17QWebPluginFactory10metaObjectEv @ 517 NONAME
-	_ZNK17QWebPluginFactory17supportsExtensionENS_9ExtensionE @ 518 NONAME
-	_ZNK17QWebPluginFactory8MimeTypeeqERKS0_ @ 519 NONAME
-	_ZNK18QWebPluginDatabase10metaObjectEv @ 520 NONAME
-	_ZNK18QWebPluginDatabase11searchPathsEv @ 521 NONAME
-	_ZNK18QWebPluginDatabase7pluginsEv @ 522 NONAME
-	_ZNK18QWebSecurityOrigin13databaseQuotaEv @ 523 NONAME
-	_ZNK18QWebSecurityOrigin13databaseUsageEv @ 524 NONAME
-	_ZNK18QWebSecurityOrigin4hostEv @ 525 NONAME
-	_ZNK18QWebSecurityOrigin4portEv @ 526 NONAME
-	_ZNK18QWebSecurityOrigin6schemeEv @ 527 NONAME
-	_ZNK18QWebSecurityOrigin9databasesEv @ 528 NONAME
-	_ZNK20QWebHistoryInterface10metaObjectEv @ 529 NONAME
-	_ZNK8QWebPage10isModifiedEv @ 530 NONAME
-	_ZNK8QWebPage10metaObjectEv @ 531 NONAME
-	_ZNK8QWebPage10totalBytesEv @ 532 NONAME
-	_ZNK8QWebPage12currentFrameEv @ 533 NONAME
-	_ZNK8QWebPage12selectedTextEv @ 534 NONAME
-	_ZNK8QWebPage12viewportSizeEv @ 535 NONAME
-	_ZNK8QWebPage13bytesReceivedEv @ 536 NONAME
-	_ZNK8QWebPage13pluginFactoryEv @ 537 NONAME
-	_ZNK8QWebPage15setViewportSizeERK5QSize @ 538 NONAME
-	_ZNK8QWebPage15userAgentForUrlERK4QUrl @ 539 NONAME
-	_ZNK8QWebPage16inputMethodQueryEN2Qt16InputMethodQueryE @ 540 NONAME
-	_ZNK8QWebPage17fixedContentsSizeEv @ 541 NONAME ABSENT
-	_ZNK8QWebPage17isContentEditableEv @ 542 NONAME
-	_ZNK8QWebPage17supportsExtensionENS_9ExtensionE @ 543 NONAME
-	_ZNK8QWebPage20linkDelegationPolicyEv @ 544 NONAME
-	_ZNK8QWebPage20networkAccessManagerEv @ 545 NONAME
-	_ZNK8QWebPage20setFixedContentsSizeERK5QSize @ 546 NONAME ABSENT
-	_ZNK8QWebPage25forwardUnsupportedContentEv @ 547 NONAME
-	_ZNK8QWebPage4viewEv @ 548 NONAME
-	_ZNK8QWebPage6actionENS_9WebActionE @ 549 NONAME
-	_ZNK8QWebPage7frameAtERK6QPoint @ 550 NONAME
-	_ZNK8QWebPage7historyEv @ 551 NONAME
-	_ZNK8QWebPage7paletteEv @ 552 NONAME
-	_ZNK8QWebPage8settingsEv @ 553 NONAME
-	_ZNK8QWebPage9mainFrameEv @ 554 NONAME
-	_ZNK8QWebPage9undoStackEv @ 555 NONAME
-	_ZNK8QWebView10isModifiedEv @ 556 NONAME
-	_ZNK8QWebView10metaObjectEv @ 557 NONAME
-	_ZNK8QWebView10pageActionEN8QWebPage9WebActionE @ 558 NONAME
-	_ZNK8QWebView10zoomFactorEv @ 559 NONAME
-	_ZNK8QWebView11renderHintsEv @ 560 NONAME
-	_ZNK8QWebView12selectedTextEv @ 561 NONAME
-	_ZNK8QWebView16inputMethodQueryEN2Qt16InputMethodQueryE @ 562 NONAME
-	_ZNK8QWebView18textSizeMultiplierEv @ 563 NONAME
-	_ZNK8QWebView3urlEv @ 564 NONAME
-	_ZNK8QWebView4iconEv @ 565 NONAME
-	_ZNK8QWebView4pageEv @ 566 NONAME
-	_ZNK8QWebView5printEP8QPrinter @ 567 NONAME
-	_ZNK8QWebView5titleEv @ 568 NONAME
-	_ZNK8QWebView7historyEv @ 569 NONAME
-	_ZNK8QWebView8settingsEv @ 570 NONAME
-	_ZNK8QWebView8sizeHintEv @ 571 NONAME
-	_ZNK9QWebFrame10metaObjectEv @ 572 NONAME
-	_ZNK9QWebFrame10zoomFactorEv @ 573 NONAME
-	_ZNK9QWebFrame11childFramesEv @ 574 NONAME
-	_ZNK9QWebFrame11parentFrameEv @ 575 NONAME
-	_ZNK9QWebFrame11toPlainTextEv @ 576 NONAME
-	_ZNK9QWebFrame12contentsSizeEv @ 577 NONAME
-	_ZNK9QWebFrame12requestedUrlEv @ 578 NONAME
-	_ZNK9QWebFrame14hitTestContentERK6QPoint @ 579 NONAME
-	_ZNK9QWebFrame14renderTreeDumpEv @ 580 NONAME
-	_ZNK9QWebFrame14scrollBarValueEN2Qt11OrientationE @ 581 NONAME
-	_ZNK9QWebFrame14scrollPositionEv @ 582 NONAME
-	_ZNK9QWebFrame14securityOriginEv @ 583 NONAME
-	_ZNK9QWebFrame15documentElementEv @ 584 NONAME
-	_ZNK9QWebFrame15findAllElementsERK7QString @ 585 NONAME
-	_ZNK9QWebFrame15scrollBarPolicyEN2Qt11OrientationE @ 586 NONAME
-	_ZNK9QWebFrame16findFirstElementERK7QString @ 587 NONAME
-	_ZNK9QWebFrame16scrollBarMaximumEN2Qt11OrientationE @ 588 NONAME
-	_ZNK9QWebFrame16scrollBarMinimumEN2Qt11OrientationE @ 589 NONAME
-	_ZNK9QWebFrame17scrollBarGeometryEN2Qt11OrientationE @ 590 NONAME
-	_ZNK9QWebFrame18textSizeMultiplierEv @ 591 NONAME
-	_ZNK9QWebFrame20clipRenderToViewportEv @ 592 NONAME ABSENT
-	_ZNK9QWebFrame3posEv @ 593 NONAME
-	_ZNK9QWebFrame3urlEv @ 594 NONAME
-	_ZNK9QWebFrame4iconEv @ 595 NONAME
-	_ZNK9QWebFrame4pageEv @ 596 NONAME
-	_ZNK9QWebFrame5titleEv @ 597 NONAME
-	_ZNK9QWebFrame6toHtmlEv @ 598 NONAME
-	_ZNK9QWebFrame7baseUrlEv @ 599 NONAME
-	_ZNK9QWebFrame8geometryEv @ 600 NONAME
-	_ZNK9QWebFrame8hasFocusEv @ 601 NONAME
-	_ZNK9QWebFrame8metaDataEv @ 602 NONAME
-	_ZNK9QWebFrame9frameNameEv @ 603 NONAME
-	_ZTI13QWebInspector @ 604 NONAME
-	_ZTI16QGraphicsWebView @ 605 NONAME
-	_ZTI17QWebPluginFactory @ 606 NONAME
-	_ZTI18QWebPluginDatabase @ 607 NONAME
-	_ZTI20QWebHistoryInterface @ 608 NONAME
-	_ZTI8QWebPage @ 609 NONAME
-	_ZTI8QWebView @ 610 NONAME
-	_ZTI9QWebFrame @ 611 NONAME
-	_ZTV13QWebInspector @ 612 NONAME
-	_ZTV16QGraphicsWebView @ 613 NONAME
-	_ZTV17QWebPluginFactory @ 614 NONAME
-	_ZTV18QWebPluginDatabase @ 615 NONAME
-	_ZTV20QWebHistoryInterface @ 616 NONAME
-	_ZTV8QWebPage @ 617 NONAME
-	_ZTV8QWebView @ 618 NONAME
-	_ZTV9QWebFrame @ 619 NONAME
-	_ZThn16_N16QGraphicsWebView11setGeometryERK6QRectF @ 620 NONAME
-	_ZThn16_N16QGraphicsWebView14updateGeometryEv @ 621 NONAME
-	_ZThn16_N16QGraphicsWebViewD0Ev @ 622 NONAME
-	_ZThn16_N16QGraphicsWebViewD1Ev @ 623 NONAME
-	_ZThn8_N13QWebInspectorD0Ev @ 624 NONAME
-	_ZThn8_N13QWebInspectorD1Ev @ 625 NONAME
-	_ZThn8_N16QGraphicsWebView10sceneEventEP6QEvent @ 626 NONAME
-	_ZThn8_N16QGraphicsWebView10wheelEventEP24QGraphicsSceneWheelEvent @ 627 NONAME
-	_ZThn8_N16QGraphicsWebView12focusInEventEP11QFocusEvent @ 628 NONAME
-	_ZThn8_N16QGraphicsWebView13dragMoveEventEP27QGraphicsSceneDragDropEvent @ 629 NONAME
-	_ZThn8_N16QGraphicsWebView13focusOutEventEP11QFocusEvent @ 630 NONAME
-	_ZThn8_N16QGraphicsWebView13keyPressEventEP9QKeyEvent @ 631 NONAME
-	_ZThn8_N16QGraphicsWebView14dragEnterEventEP27QGraphicsSceneDragDropEvent @ 632 NONAME
-	_ZThn8_N16QGraphicsWebView14dragLeaveEventEP27QGraphicsSceneDragDropEvent @ 633 NONAME
-	_ZThn8_N16QGraphicsWebView14hoverMoveEventEP24QGraphicsSceneHoverEvent @ 634 NONAME
-	_ZThn8_N16QGraphicsWebView14mouseMoveEventEP24QGraphicsSceneMouseEvent @ 635 NONAME
-	_ZThn8_N16QGraphicsWebView15hoverLeaveEventEP24QGraphicsSceneHoverEvent @ 636 NONAME
-	_ZThn8_N16QGraphicsWebView15keyReleaseEventEP9QKeyEvent @ 637 NONAME
-	_ZThn8_N16QGraphicsWebView15mousePressEventEP24QGraphicsSceneMouseEvent @ 638 NONAME
-	_ZThn8_N16QGraphicsWebView16contextMenuEventEP30QGraphicsSceneContextMenuEvent @ 639 NONAME
-	_ZThn8_N16QGraphicsWebView16inputMethodEventEP17QInputMethodEvent @ 640 NONAME
-	_ZThn8_N16QGraphicsWebView17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 641 NONAME
-	_ZThn8_N16QGraphicsWebView21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent @ 642 NONAME
-	_ZThn8_N16QGraphicsWebView5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 643 NONAME
-	_ZThn8_N16QGraphicsWebView9dropEventEP27QGraphicsSceneDragDropEvent @ 644 NONAME
-	_ZThn8_N16QGraphicsWebViewD0Ev @ 645 NONAME
-	_ZThn8_N16QGraphicsWebViewD1Ev @ 646 NONAME
-	_ZThn8_N8QWebViewD0Ev @ 647 NONAME
-	_ZThn8_N8QWebViewD1Ev @ 648 NONAME
-	_ZlsR11QDataStreamRK11QWebHistory @ 649 NONAME
-	_ZrsR11QDataStreamR11QWebHistory @ 650 NONAME
-	_Z32qt_drt_whiteListAccessFromOriginRK7QStringS1_S1_b @ 651 NONAME
-	_Z33qt_drt_counterValueForElementByIdP9QWebFrameRK7QString @ 652 NONAME ABSENT
-	_Z34qt_drt_resetOriginAccessWhiteListsv @ 653 NONAME
-	_ZN11QWebElement17removeAllChildrenEv @ 654 NONAME
-	_ZN11QWebElement6renderEP8QPainter @ 655 NONAME
-	_ZN12QWebSettings30setPrintingMaximumShrinkFactorEf @ 656 NONAME ABSENT
-	_ZN12QWebSettings30setPrintingMinimumShrinkFactorEf @ 657 NONAME ABSENT
-	_ZN16QGraphicsWebView10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 658 NONAME
-	_ZN16QGraphicsWebView11linkClickedERK4QUrl @ 659 NONAME
-	_ZN16QGraphicsWebView12loadFinishedEb @ 660 NONAME
-	_ZN16QGraphicsWebView12loadProgressEi @ 661 NONAME
-	_ZN16QGraphicsWebView16statusBarMessageERK7QString @ 662 NONAME
-	_ZN16QGraphicsWebView17triggerPageActionEN8QWebPage9WebActionEb @ 663 NONAME
-	_ZN16QGraphicsWebView8findTextERK7QString6QFlagsIN8QWebPage8FindFlagEE @ 664 NONAME
-	_ZN21QWebElementCollection6appendERKS_ @ 665 NONAME
-	_ZN21QWebElementCollectionC1ERK11QWebElementRK7QString @ 666 NONAME
-	_ZN21QWebElementCollectionC1ERKS_ @ 667 NONAME
-	_ZN21QWebElementCollectionC1Ev @ 668 NONAME
-	_ZN21QWebElementCollectionC2ERK11QWebElementRK7QString @ 669 NONAME
-	_ZN21QWebElementCollectionC2ERKS_ @ 670 NONAME
-	_ZN21QWebElementCollectionC2Ev @ 671 NONAME
-	_ZN21QWebElementCollectionD1Ev @ 672 NONAME
-	_ZN21QWebElementCollectionD2Ev @ 673 NONAME
-	_ZN21QWebElementCollectionaSERKS_ @ 674 NONAME
-	_ZN9QWebFrame6renderEP8QPainterNS_11RenderLayerERK7QRegion @ 675 NONAME
-	_ZNK12QWebSettings27printingMaximumShrinkFactorEv @ 676 NONAME ABSENT
-	_ZNK12QWebSettings27printingMinimumShrinkFactorEv @ 677 NONAME ABSENT
-	_ZNK16QGraphicsWebView10isModifiedEv @ 678 NONAME
-	_ZNK16QGraphicsWebView10pageActionEN8QWebPage9WebActionE @ 679 NONAME
-	_ZNK16QGraphicsWebView16inputMethodQueryEN2Qt16InputMethodQueryE @ 680 NONAME
-	_ZNK16QGraphicsWebView8sizeHintEN2Qt8SizeHintERK6QSizeF @ 681 NONAME
-	_ZNK21QWebElementCollection2atEi @ 682 NONAME
-	_ZNK21QWebElementCollection5countEv @ 683 NONAME
-	_ZNK21QWebElementCollection6toListEv @ 684 NONAME
-	_ZNK21QWebElementCollectionplERKS_ @ 685 NONAME
-	_ZNK8QWebPage21preferredContentsSizeEv @ 686 NONAME
-	_ZNK8QWebPage24setPreferredContentsSizeERK5QSize @ 687 NONAME
-	_ZThn16_NK16QGraphicsWebView8sizeHintEN2Qt8SizeHintERK6QSizeF @ 688 NONAME
-	_ZThn8_N16QGraphicsWebView10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 689 NONAME
-	_ZThn8_NK16QGraphicsWebView16inputMethodQueryEN2Qt16InputMethodQueryE @ 690 NONAME
-	_ZNK11QWebElement14attributeNamesERK7QString @ 691 NONAME
-	_Z23qt_networkAccessAllowedb @ 692 NONAME
-	_Z25qt_resumeActiveDOMObjectsP9QWebFrame @ 693 NONAME
-	_Z26qt_suspendActiveDOMObjectsP9QWebFrame @ 694 NONAME
-	_Z35qtwebkit_webframe_scrollRecursivelyP9QWebFrameii @ 695 NONAME ABSENT
-	_Z35qtwebkit_webframe_scrollRecursivelyP9QWebFrameiiRK6QPoint @ 696 NONAME
-	_ZN9QWebFrame17scrollRecursivelyEii @ 697 NONAME ABSENT
-	_ZN16QGraphicsWebView20setResizesToContentsEb @ 698 NONAME
-	_ZNK16QGraphicsWebView17resizesToContentsEv @ 699 NONAME
-	_Z20qt_drt_numberOfPagesP9QWebFrameff @ 700 NONAME ABSENT
-	_Z24qt_drt_pauseSVGAnimationP9QWebFrameRK7QStringdS3_ @ 701 NONAME ABSENT
-	_Z24qt_drt_webinspector_showP8QWebPage @ 702 NONAME ABSENT
-	_Z24qt_drt_workerThreadCountv @ 703 NONAME ABSENT
-	_Z25qt_drt_hasDocumentElementP9QWebFrame @ 704 NONAME ABSENT
-	_Z25qt_drt_webinspector_closeP8QWebPage @ 705 NONAME ABSENT
-	_Z31qt_drt_pageNumberForElementByIdP9QWebFrameRK7QStringff @ 706 NONAME ABSENT
-	_Z33qt_drt_webinspector_executeScriptP8QWebPagelRK7QString @ 707 NONAME ABSENT
-	_Z34qt_drt_setTimelineProfilingEnabledP8QWebPageb @ 708 NONAME ABSENT
-	_Z32qt_drt_setFrameFlatteningEnabledP8QWebPageb @ 709 NONAME ABSENT
-	_Z36qt_drt_evaluateScriptInIsolatedWorldP9QWebFrameiRK7QString @ 710 NONAME ABSENT
-	_Z47qt_drt_setDomainRelaxationForbiddenForURLSchemebRK7QString @ 711 NONAME ABSENT
-	_ZN9QWebFrame11pageChangedEv @ 712 NONAME
-	_ZN9QWebFrame14scrollToAnchorERK7QString @ 713 NONAME
-	_ZN12QWebSettings15setInspectorUrlERK4QUrl @ 714 NONAME ABSENT
-	_ZN13QWebInspector10closeEventEP11QCloseEvent @ 715 NONAME
-	_ZN16QGraphicsWebView26setTiledBackingStoreFrozenEb @ 716 NONAME
-	_ZNK16QGraphicsWebView25isTiledBackingStoreFrozenEv @ 717 NONAME
-	_Z18qt_wrt_setViewModeP8QWebPageRK7QString @ 718 NONAME ABSENT
-	_Z19qt_drt_setMediaTypeP9QWebFrameRK7QString @ 719 NONAME ABSENT
-	_Z26qt_drt_enableCaretBrowsingP8QWebPageb @ 720 NONAME ABSENT
-	_ZNK12QWebSettings12inspectorUrlEv @ 721 NONAME ABSENT
-	_ZN23DumpRenderTreeSupportQt19webPageSetGroupNameEP8QWebPageRK7QString @ 722 NONAME
-	_ZN23DumpRenderTreeSupportQt16webPageGroupNameEP8QWebPage @ 723 NONAME
-	_ZN23DumpRenderTreeSupportQt23garbageCollectorCollectEv @ 724 NONAME
-	_Z32qtwebkit_webframe_scrollOverflowP9QWebFrameiiRK6QPoint @ 725 NONAME
-	_ZN23DumpRenderTreeSupportQt12setMediaTypeEP9QWebFrameRK7QString @ 726 NONAME
-	_ZN23DumpRenderTreeSupportQt13numberOfPagesEP9QWebFrameff @ 727 NONAME
-	_ZN23DumpRenderTreeSupportQt13selectedRangeEP8QWebPage @ 728 NONAME
-	_ZN23DumpRenderTreeSupportQt14clearFrameNameEP9QWebFrame @ 729 NONAME
-	_ZN23DumpRenderTreeSupportQt14pauseAnimationEP9QWebFrameRK7QStringdS4_ @ 730 NONAME
-	_ZN23DumpRenderTreeSupportQt15dumpFrameLoaderEb @ 731 NONAME
-	_ZN23DumpRenderTreeSupportQt16dumpNotificationEb @ 732 NONAME
-	_ZN23DumpRenderTreeSupportQt16isCommandEnabledEP8QWebPageRK7QString @ 733 NONAME
-	_ZN23DumpRenderTreeSupportQt16webInspectorShowEP8QWebPage @ 734 NONAME
-	_ZN23DumpRenderTreeSupportQt17pauseSVGAnimationEP9QWebFrameRK7QStringdS4_ @ 735 NONAME
-	_ZN23DumpRenderTreeSupportQt17webInspectorCloseEP8QWebPage @ 736 NONAME
-	_ZN23DumpRenderTreeSupportQt17workerThreadCountEv @ 737 NONAME
-	_ZN23DumpRenderTreeSupportQt18hasDocumentElementEP9QWebFrame @ 738 NONAME
-	_ZN23DumpRenderTreeSupportQt20dumpEditingCallbacksEb @ 739 NONAME
-	_ZN23DumpRenderTreeSupportQt21markerTextForListItemERK11QWebElement @ 740 NONAME
-	_ZN23DumpRenderTreeSupportQt22javaScriptObjectsCountEv @ 741 NONAME
-	_ZN23DumpRenderTreeSupportQt23setCaretBrowsingEnabledEP8QWebPageb @ 742 NONAME
-	_ZN23DumpRenderTreeSupportQt24executeCoreCommandByNameEP8QWebPageRK7QStringS4_ @ 743 NONAME
-	_ZN23DumpRenderTreeSupportQt21dumpSetAcceptsEditingEb @ 744 NONAME
-	_ZN23DumpRenderTreeSupportQt22resumeActiveDOMObjectsEP9QWebFrame @ 745 NONAME
-	_ZN23DumpRenderTreeSupportQt23suspendActiveDOMObjectsEP9QWebFrame @ 746 NONAME
-	_ZN23DumpRenderTreeSupportQt24numberOfActiveAnimationsEP9QWebFrame @ 747 NONAME
-	_ZN23DumpRenderTreeSupportQt24pageNumberForElementByIdEP9QWebFrameRK7QStringff @ 748 NONAME
-	_ZN23DumpRenderTreeSupportQt25dumpResourceLoadCallbacksEb @ 749 NONAME
-	_ZN23DumpRenderTreeSupportQt25pauseTransitionOfPropertyEP9QWebFrameRK7QStringdS4_ @ 750 NONAME
-	_ZN23DumpRenderTreeSupportQt25setFrameFlatteningEnabledEP8QWebPageb @ 751 NONAME
-	_ZN23DumpRenderTreeSupportQt25webInspectorExecuteScriptEP8QWebPagelRK7QString @ 752 NONAME
-	_ZN23DumpRenderTreeSupportQt25whiteListAccessFromOriginERK7QStringS2_S2_b @ 753 NONAME
-	_ZN23DumpRenderTreeSupportQt26counterValueForElementByIdEP9QWebFrameRK7QString @ 754 NONAME
-	_ZN23DumpRenderTreeSupportQt26firstRectForCharacterRangeEP8QWebPageii @ 755 NONAME
-	_ZN23DumpRenderTreeSupportQt26overwritePluginDirectoriesEv @ 756 NONAME
-	_ZN23DumpRenderTreeSupportQt27resetOriginAccessWhiteListsEv @ 757 NONAME
-	_ZN23DumpRenderTreeSupportQt27setSmartInsertDeleteEnabledEP8QWebPageb @ 758 NONAME
-	_ZN23DumpRenderTreeSupportQt27setTimelineProfilingEnabledEP8QWebPageb @ 759 NONAME
-	_ZN23DumpRenderTreeSupportQt28setDumpRenderTreeModeEnabledEb @ 760 NONAME
-	_ZN23DumpRenderTreeSupportQt29dumpResourceLoadCallbacksPathERK7QString @ 761 NONAME
-	_ZN23DumpRenderTreeSupportQt29evaluateScriptInIsolatedWorldEP9QWebFrameiRK7QString @ 762 NONAME
-	_ZN23DumpRenderTreeSupportQt29setJavaScriptProfilingEnabledEP9QWebFrameb @ 763 NONAME
-	_ZN23DumpRenderTreeSupportQt29setWillSendRequestReturnsNullEb @ 764 NONAME
-	_ZN23DumpRenderTreeSupportQt30setWillSendRequestClearHeadersERK11QStringList @ 765 NONAME
-	_ZN23DumpRenderTreeSupportQt33computedStyleIncludingVisitedInfoERK11QWebElement @ 766 NONAME
-	_ZN23DumpRenderTreeSupportQt34setSelectTrailingWhitespaceEnabledEP8QWebPageb @ 767 NONAME
-	_ZN23DumpRenderTreeSupportQt39elementDoesAutoCompleteForElementWithIdEP9QWebFrameRK7QString @ 768 NONAME
-	_ZN23DumpRenderTreeSupportQt39setWillSendRequestReturnsNullOnRedirectEb @ 769 NONAME
-	_ZN23DumpRenderTreeSupportQt40garbageCollectorCollectOnAlternateThreadEb @ 770 NONAME
-	_ZN23DumpRenderTreeSupportQt40setDomainRelaxationForbiddenForURLSchemeEbRK7QString @ 771 NONAME
-	_ZN23DumpRenderTreeSupportQt18setEditingBehaviorEP8QWebPageRK7QString @ 772 NONAME
-	_ZN23DumpRenderTreeSupportQt24setNotificationsReceiverEP7QObject @ 773 NONAME ABSENT
-	_ZN23DumpRenderTreeSupportQt26allowNotificationForOriginERK7QString @ 774 NONAME ABSENT
-	_ZN23DumpRenderTreeSupportQt26setCheckPermissionFunctionEPFvP7QObjectRK4QUrlR22NotificationPermissionE @ 775 NONAME ABSENT
-	_ZN23DumpRenderTreeSupportQt28setRequestPermissionFunctionEPFvP7QObjectRK7QStringE @ 776 NONAME ABSENT
-	_ZN23DumpRenderTreeSupportQt31removeWhiteListAccessFromOriginERK7QStringS2_S2_b @ 777 NONAME
-	_ZN23DumpRenderTreeSupportQt11shouldCloseEP9QWebFrame @ 778 NONAME
-	_ZN23DumpRenderTreeSupportQt12isTargetItemERK15QWebHistoryItem @ 779 NONAME
-	_ZN23DumpRenderTreeSupportQt17historyItemTargetERK15QWebHistoryItem @ 780 NONAME
-	_ZN23DumpRenderTreeSupportQt20getChildHistoryItemsERK15QWebHistoryItem @ 781 NONAME
-	_ZN23DumpRenderTreeSupportQt23setMockGeolocationErrorEiRK7QString @ 782 NONAME ABSENT
-	_ZN23DumpRenderTreeSupportQt26setMockGeolocationPositionEddd @ 783 NONAME ABSENT
-	_ZN23DumpRenderTreeSupportQt17clearScriptWorldsEv @ 784 NONAME
-	_ZN23DumpRenderTreeSupportQt23setCustomPolicyDelegateEbb @ 785 NONAME
-	_ZN15QWebScriptWorldC1ERKS_ @ 786 NONAME
-	_ZN15QWebScriptWorldC1Ev @ 787 NONAME
-	_ZN15QWebScriptWorldC2ERKS_ @ 788 NONAME
-	_ZN15QWebScriptWorldC2Ev @ 789 NONAME
-	_ZN15QWebScriptWorldD1Ev @ 790 NONAME
-	_ZN15QWebScriptWorldD2Ev @ 791 NONAME
-	_ZN15QWebScriptWorldaSERKS_ @ 792 NONAME
-	_ZN23DumpRenderTreeSupportQt29dumpResourceResponseMIMETypesEb @ 793 NONAME
-	_ZN23DumpRenderTreeSupportQtC1Ev @ 794 NONAME
-	_ZN23DumpRenderTreeSupportQtC2Ev @ 795 NONAME
-	_ZN23DumpRenderTreeSupportQtD1Ev @ 796 NONAME
-	_ZN23DumpRenderTreeSupportQtD2Ev @ 797 NONAME
-	_ZN8QWebPage23allowGeolocationRequestEP9QWebFrame @ 798 NONAME ABSENT
-	_ZN8QWebPage23viewportChangeRequestedERKNS_13ViewportHintsE @ 799 NONAME ABSENT
-	_ZNK15QWebScriptWorld5worldEv @ 800 NONAME
-	_ZN16QGraphicsWebView13setDeviceSizeERK5QSize @ 801 NONAME ABSENT
-	_ZN23DumpRenderTreeSupportQt12pagePropertyEP9QWebFrameRK7QStringi @ 802 NONAME
-	_ZN23DumpRenderTreeSupportQt16isPageBoxVisibleEP9QWebFramei @ 803 NONAME
-	_ZN23DumpRenderTreeSupportQt16resumeAnimationsEP9QWebFrame @ 804 NONAME
-	_ZN23DumpRenderTreeSupportQt17addUserStyleSheetEP8QWebPageRK7QString @ 805 NONAME
-	_ZN23DumpRenderTreeSupportQt17suspendAnimationsEP9QWebFrame @ 806 NONAME
-	_ZN23DumpRenderTreeSupportQt26pageSizeAndMarginsInPixelsEP9QWebFrameiiiiiii @ 807 NONAME
-	_ZN23DumpRenderTreeSupportQt28setDeferMainResourceDataLoadEb @ 808 NONAME
-	_ZN8QWebPage17setUserPermissionEP9QWebFrameNS_16PermissionDomainENS_16PermissionPolicyE @ 809 NONAME ABSENT
-	_ZN8QWebPage23checkPermissionFromUserEP9QWebFrameNS_16PermissionDomainERNS_16PermissionPolicyE @ 810 NONAME ABSENT
-	_ZN8QWebPage25requestPermissionFromUserEP9QWebFrameNS_16PermissionDomainE @ 811 NONAME ABSENT
-	_ZN8QWebPage27cancelRequestsForPermissionEP9QWebFrameNS_16PermissionDomainE @ 812 NONAME ABSENT
-	_ZNK16QGraphicsWebView10deviceSizeEv @ 813 NONAME ABSENT
-	_ZN23DumpRenderTreeSupportQt14viewportAsTextEP8QWebPageRK5QSize @ 814 NONAME
-	_ZN23DumpRenderTreeSupportQt32simulateDesktopNotificationClickERK7QString @ 815 NONAME
-	_ZN8QWebPage23viewportChangeRequestedEv @ 816 NONAME
-	_ZNK8QWebPage28viewportConfigurationForSizeERK5QSize @ 817 NONAME ABSENT
-	_ZN23DumpRenderTreeSupportQt20dumpHistoryCallbacksEb @ 818 NONAME
-	_ZN23DumpRenderTreeSupportQt25dumpVisitedLinksCallbacksEb @ 819 NONAME
-	_ZN23DumpRenderTreeSupportQt9plainTextERK8QVariant @ 820 NONAME
-	_ZNK8QWebPage25viewportAttributesForSizeERK5QSize @ 821 NONAME
-	_ZN8QWebPage18ViewportAttributesC1ERKS0_ @ 822 NONAME
-	_ZN8QWebPage18ViewportAttributesC1Ev @ 823 NONAME
-	_ZN8QWebPage18ViewportAttributesC2ERKS0_ @ 824 NONAME
-	_ZN8QWebPage18ViewportAttributesC2Ev @ 825 NONAME
-	_ZN8QWebPage18ViewportAttributesD1Ev @ 826 NONAME
-	_ZN8QWebPage18ViewportAttributesD2Ev @ 827 NONAME
-	_ZN8QWebPage18ViewportAttributesaSERKS0_ @ 828 NONAME
-	_ZN23DumpRenderTreeSupportQt13nodesFromRectERK11QWebElementiijjjjb @ 829 NONAME
-	_ZN23DumpRenderTreeSupportQt28dumpUserGestureInFrameLoaderEb @ 830 NONAME
-	_ZNK8QWebPage19supportsContentTypeERK7QString @ 831 NONAME
-	_ZNK8QWebPage21supportedContentTypesEv @ 832 NONAME
-	_ZNK8QWebPage27setActualVisibleContentRectERK5QRect @ 833 NONAME
-	_ZN8QWebPage20setFeaturePermissionEP9QWebFrameNS_7FeatureENS_16PermissionPolicyE @ 834 NONAME
-	_ZN8QWebPage26featurePermissionRequestedEP9QWebFrameNS_7FeatureE @ 835 NONAME
-	_ZN8QWebPage32featurePermissionRequestCanceledEP9QWebFrameNS_7FeatureE @ 836 NONAME
-	_Z33qtwebkit_setPluginCreatedCallbackPFvP9QWebFramePvS1_E @ 837 NONAME
-	_ZN23DumpRenderTreeSupportQt23setMockGeolocationErrorEP8QWebPageiRK7QString @ 838 NONAME
-	_ZN23DumpRenderTreeSupportQt26setMockGeolocationPositionEP8QWebPageddd @ 839 NONAME
-	_ZN23DumpRenderTreeSupportQt14viewportAsTextEP8QWebPageiRK5QSizeS4_ @ 840 NONAME
-	_ZN23DumpRenderTreeSupportQt13nodesFromRectERK11QWebElementiijjjjb @ 841 NONAME
-	_ZN23DumpRenderTreeSupportQt9plainTextERK8QVariant @ 842 NONAME
-	_ZN23DumpRenderTreeSupportQt26mediaContentUrlByElementIdEP9QWebFrameRK7QString @ 843 NONAME
-	_ZNK8QWebPage12hasSelectionEv @ 844 NONAME
-	_ZNK8QWebPage12selectedHtmlEv @ 845 NONAME
-	_ZN11QWebElement6renderEP8QPainterRK5QRect @ 846 NONAME
+EXPORTS

+	_Z10qt_drt_runb @ 1 NONAME

+	_Z14qWebKitVersionv @ 2 NONAME

+	_Z19qWebKitMajorVersionv @ 3 NONAME

+	_Z19qWebKitMinorVersionv @ 4 NONAME

+	_Z20qt_dump_frame_loaderb @ 5 NONAME

+	_Z20qt_webpage_groupNameP8QWebPage @ 6 NONAME

+	_Z21qt_drt_clearFrameNameP9QWebFrame @ 7 NONAME

+	_Z21qt_drt_pauseAnimationP9QWebFrameRK7QStringdS3_ @ 8 NONAME

+	_Z23qt_webpage_setGroupNameP8QWebPageRK7QString @ 9 NONAME

+	_Z25qt_dump_editing_callbacksb @ 10 NONAME

+	_Z27qt_dump_set_accepts_editingb @ 11 NONAME

+	_Z29qt_drt_javaScriptObjectsCountv @ 12 NONAME

+	_Z31qt_drt_garbageCollector_collectv @ 13 NONAME

+	_Z31qt_drt_numberOfActiveAnimationsP9QWebFrame @ 14 NONAME

+	_Z31qt_dump_resource_load_callbacksb @ 15 NONAME

+	_Z32qt_drt_pauseTransitionOfPropertyP9QWebFrameRK7QStringdS3_ @ 16 NONAME

+	_Z33qt_drt_overwritePluginDirectoriesv @ 17 NONAME

+	_Z36qt_drt_setJavaScriptProfilingEnabledP9QWebFrameb @ 18 NONAME

+	_Z48qt_drt_garbageCollector_collectOnAlternateThreadb @ 19 NONAME

+	_ZN11QWebElement11encloseWithERK7QString @ 20 NONAME

+	_ZN11QWebElement11encloseWithERKS_ @ 21 NONAME

+	_ZN11QWebElement11removeClassERK7QString @ 22 NONAME

+	_ZN11QWebElement11setInnerXmlERK7QString @ 23 NONAME

+	_ZN11QWebElement11setOuterXmlERK7QString @ 24 NONAME

+	_ZN11QWebElement11toggleClassERK7QString @ 25 NONAME

+	_ZN11QWebElement12appendInsideERK7QString @ 26 NONAME

+	_ZN11QWebElement12appendInsideERKS_ @ 27 NONAME

+	_ZN11QWebElement12setAttributeERK7QStringS2_ @ 28 NONAME

+	_ZN11QWebElement12setPlainTextERK7QString @ 29 NONAME

+	_ZN11QWebElement13appendOutsideERK7QString @ 30 NONAME

+	_ZN11QWebElement13appendOutsideERKS_ @ 31 NONAME

+	_ZN11QWebElement13prependInsideERK7QString @ 32 NONAME

+	_ZN11QWebElement13prependInsideERKS_ @ 33 NONAME

+	_ZN11QWebElement14prependOutsideERK7QString @ 34 NONAME

+	_ZN11QWebElement14prependOutsideERKS_ @ 35 NONAME

+	_ZN11QWebElement14removeChildrenEv @ 36 NONAME ABSENT

+	_ZN11QWebElement14setAttributeNSERK7QStringS2_S2_ @ 37 NONAME

+	_ZN11QWebElement15removeAttributeERK7QString @ 38 NONAME

+	_ZN11QWebElement16enclosingElementEPN7WebCore4NodeE @ 39 NONAME

+	_ZN11QWebElement16setStylePropertyERK7QStringS2_ @ 40 NONAME

+	_ZN11QWebElement16takeFromDocumentEv @ 41 NONAME

+	_ZN11QWebElement17removeAttributeNSERK7QStringS2_ @ 42 NONAME

+	_ZN11QWebElement18evaluateJavaScriptERK7QString @ 43 NONAME

+	_ZN11QWebElement18removeFromDocumentEv @ 44 NONAME

+	_ZN11QWebElement19encloseContentsWithERK7QString @ 45 NONAME

+	_ZN11QWebElement19encloseContentsWithERKS_ @ 46 NONAME

+	_ZN11QWebElement7replaceERK7QString @ 47 NONAME

+	_ZN11QWebElement7replaceERKS_ @ 48 NONAME

+	_ZN11QWebElement8addClassERK7QString @ 49 NONAME

+	_ZN11QWebElement8setFocusEv @ 50 NONAME

+	_ZN11QWebElementC1EPN7WebCore4NodeE @ 51 NONAME

+	_ZN11QWebElementC1EPN7WebCore7ElementE @ 52 NONAME

+	_ZN11QWebElementC1ERKS_ @ 53 NONAME

+	_ZN11QWebElementC1Ev @ 54 NONAME

+	_ZN11QWebElementC2EPN7WebCore4NodeE @ 55 NONAME

+	_ZN11QWebElementC2EPN7WebCore7ElementE @ 56 NONAME

+	_ZN11QWebElementC2ERKS_ @ 57 NONAME

+	_ZN11QWebElementC2Ev @ 58 NONAME

+	_ZN11QWebElementD1Ev @ 59 NONAME

+	_ZN11QWebElementD2Ev @ 60 NONAME

+	_ZN11QWebElementaSERKS_ @ 61 NONAME

+	_ZN11QWebHistory12restoreStateERK10QByteArray @ 62 NONAME ABSENT

+	_ZN11QWebHistory19setMaximumItemCountEi @ 63 NONAME

+	_ZN11QWebHistory4backEv @ 64 NONAME

+	_ZN11QWebHistory5clearEv @ 65 NONAME

+	_ZN11QWebHistory7forwardEv @ 66 NONAME

+	_ZN11QWebHistory8goToItemERK15QWebHistoryItem @ 67 NONAME

+	_ZN11QWebHistoryC1Ev @ 68 NONAME

+	_ZN11QWebHistoryC2Ev @ 69 NONAME

+	_ZN11QWebHistoryD1Ev @ 70 NONAME

+	_ZN11QWebHistoryD2Ev @ 71 NONAME

+	_ZN12QWebDatabase14removeDatabaseERKS_ @ 72 NONAME

+	_ZN12QWebDatabase18removeAllDatabasesEv @ 73 NONAME

+	_ZN12QWebDatabaseC1EP19QWebDatabasePrivate @ 74 NONAME

+	_ZN12QWebDatabaseC1ERKS_ @ 75 NONAME

+	_ZN12QWebDatabaseC2EP19QWebDatabasePrivate @ 76 NONAME

+	_ZN12QWebDatabaseC2ERKS_ @ 77 NONAME

+	_ZN12QWebDatabaseD1Ev @ 78 NONAME

+	_ZN12QWebDatabaseD2Ev @ 79 NONAME

+	_ZN12QWebDatabaseaSERKS_ @ 80 NONAME

+	_ZN12QWebSettings10iconForUrlERK4QUrl @ 81 NONAME

+	_ZN12QWebSettings10webGraphicENS_10WebGraphicE @ 82 NONAME

+	_ZN12QWebSettings11setFontSizeENS_8FontSizeEi @ 83 NONAME

+	_ZN12QWebSettings12setAttributeENS_12WebAttributeEb @ 84 NONAME

+	_ZN12QWebSettings13resetFontSizeENS_8FontSizeE @ 85 NONAME

+	_ZN12QWebSettings13setFontFamilyENS_10FontFamilyERK7QString @ 86 NONAME

+	_ZN12QWebSettings13setWebGraphicENS_10WebGraphicERK7QPixmap @ 87 NONAME

+	_ZN12QWebSettings14globalSettingsEv @ 88 NONAME

+	_ZN12QWebSettings14pluginDatabaseEv @ 89 NONAME ABSENT

+	_ZN12QWebSettings14resetAttributeENS_12WebAttributeE @ 90 NONAME

+	_ZN12QWebSettings15resetFontFamilyENS_10FontFamilyE @ 91 NONAME

+	_ZN12QWebSettings16iconDatabasePathEv @ 92 NONAME

+	_ZN12QWebSettings17clearIconDatabaseEv @ 93 NONAME

+	_ZN12QWebSettings17clearMemoryCachesEv @ 94 NONAME

+	_ZN12QWebSettings18offlineStoragePathEv @ 95 NONAME

+	_ZN12QWebSettings19maximumPagesInCacheEv @ 96 NONAME

+	_ZN12QWebSettings19setIconDatabasePathERK7QString @ 97 NONAME

+	_ZN12QWebSettings19setLocalStoragePathERK7QString @ 98 NONAME

+	_ZN12QWebSettings20setUserStyleSheetUrlERK4QUrl @ 99 NONAME

+	_ZN12QWebSettings21setOfflineStoragePathERK7QString @ 100 NONAME

+	_ZN12QWebSettings22setDefaultTextEncodingERK7QString @ 101 NONAME

+	_ZN12QWebSettings22setMaximumPagesInCacheEi @ 102 NONAME

+	_ZN12QWebSettings23enablePersistentStorageERK7QString @ 103 NONAME

+	_ZN12QWebSettings24setObjectCacheCapacitiesEiii @ 104 NONAME

+	_ZN12QWebSettings26offlineStorageDefaultQuotaEv @ 105 NONAME

+	_ZN12QWebSettings29setOfflineStorageDefaultQuotaEx @ 106 NONAME

+	_ZN12QWebSettings30offlineWebApplicationCachePathEv @ 107 NONAME

+	_ZN12QWebSettings31offlineWebApplicationCacheQuotaEv @ 108 NONAME

+	_ZN12QWebSettings33setOfflineWebApplicationCachePathERK7QString @ 109 NONAME

+	_ZN12QWebSettings34setOfflineWebApplicationCacheQuotaEx @ 110 NONAME

+	_ZN12QWebSettingsC1EPN7WebCore8SettingsE @ 111 NONAME

+	_ZN12QWebSettingsC1Ev @ 112 NONAME

+	_ZN12QWebSettingsC2EPN7WebCore8SettingsE @ 113 NONAME

+	_ZN12QWebSettingsC2Ev @ 114 NONAME

+	_ZN12QWebSettingsD1Ev @ 115 NONAME

+	_ZN12QWebSettingsD2Ev @ 116 NONAME

+	_ZN13QWebInspector11qt_metacallEN11QMetaObject4CallEiPPv @ 117 NONAME

+	_ZN13QWebInspector11qt_metacastEPKc @ 118 NONAME

+	_ZN13QWebInspector11resizeEventEP12QResizeEvent @ 119 NONAME

+	_ZN13QWebInspector16staticMetaObjectE @ 120 NONAME DATA 16

+	_ZN13QWebInspector18windowTitleChangedERK7QString @ 121 NONAME ABSENT

+	_ZN13QWebInspector19getStaticMetaObjectEv @ 122 NONAME

+	_ZN13QWebInspector5eventEP6QEvent @ 123 NONAME

+	_ZN13QWebInspector7setPageEP8QWebPage @ 124 NONAME

+	_ZN13QWebInspector9hideEventEP10QHideEvent @ 125 NONAME

+	_ZN13QWebInspector9showEventEP10QShowEvent @ 126 NONAME

+	_ZN13QWebInspectorC1EP7QWidget @ 127 NONAME

+	_ZN13QWebInspectorC2EP7QWidget @ 128 NONAME

+	_ZN13QWebInspectorD0Ev @ 129 NONAME

+	_ZN13QWebInspectorD1Ev @ 130 NONAME

+	_ZN13QWebInspectorD2Ev @ 131 NONAME

+	_ZN14QWebPluginInfo10setEnabledEb @ 132 NONAME

+	_ZN14QWebPluginInfoC1EPN7WebCore13PluginPackageE @ 133 NONAME

+	_ZN14QWebPluginInfoC1ERKS_ @ 134 NONAME

+	_ZN14QWebPluginInfoC1Ev @ 135 NONAME

+	_ZN14QWebPluginInfoC2EPN7WebCore13PluginPackageE @ 136 NONAME

+	_ZN14QWebPluginInfoC2ERKS_ @ 137 NONAME

+	_ZN14QWebPluginInfoC2Ev @ 138 NONAME

+	_ZN14QWebPluginInfoD1Ev @ 139 NONAME

+	_ZN14QWebPluginInfoD2Ev @ 140 NONAME

+	_ZN14QWebPluginInfoaSERKS_ @ 141 NONAME

+	_ZN15QWebHistoryItem11setUserDataERK8QVariant @ 142 NONAME

+	_ZN15QWebHistoryItemC1EP22QWebHistoryItemPrivate @ 143 NONAME

+	_ZN15QWebHistoryItemC1ERKS_ @ 144 NONAME

+	_ZN15QWebHistoryItemC2EP22QWebHistoryItemPrivate @ 145 NONAME

+	_ZN15QWebHistoryItemC2ERKS_ @ 146 NONAME

+	_ZN15QWebHistoryItemD1Ev @ 147 NONAME

+	_ZN15QWebHistoryItemD2Ev @ 148 NONAME

+	_ZN15QWebHistoryItemaSERKS_ @ 149 NONAME

+	_ZN16QGraphicsWebView10loadFailedEv @ 150 NONAME ABSENT

+	_ZN16QGraphicsWebView10sceneEventEP6QEvent @ 151 NONAME

+	_ZN16QGraphicsWebView10setContentERK10QByteArrayRK7QStringRK4QUrl @ 152 NONAME

+	_ZN16QGraphicsWebView10urlChangedERK4QUrl @ 153 NONAME

+	_ZN16QGraphicsWebView10wheelEventEP24QGraphicsSceneWheelEvent @ 154 NONAME

+	_ZN16QGraphicsWebView11iconChangedEv @ 155 NONAME

+	_ZN16QGraphicsWebView11loadStartedEv @ 156 NONAME

+	_ZN16QGraphicsWebView11qt_metacallEN11QMetaObject4CallEiPPv @ 157 NONAME

+	_ZN16QGraphicsWebView11qt_metacastEPKc @ 158 NONAME

+	_ZN16QGraphicsWebView11setGeometryERK6QRectF @ 159 NONAME

+	_ZN16QGraphicsWebView12focusInEventEP11QFocusEvent @ 160 NONAME

+	_ZN16QGraphicsWebView12loadFinishedEv @ 161 NONAME ABSENT

+	_ZN16QGraphicsWebView12titleChangedERK7QString @ 162 NONAME

+	_ZN16QGraphicsWebView13dragMoveEventEP27QGraphicsSceneDragDropEvent @ 163 NONAME

+	_ZN16QGraphicsWebView13focusOutEventEP11QFocusEvent @ 164 NONAME

+	_ZN16QGraphicsWebView13keyPressEventEP9QKeyEvent @ 165 NONAME

+	_ZN16QGraphicsWebView13setZoomFactorEf @ 166 NONAME

+	_ZN16QGraphicsWebView13statusChangedEv @ 167 NONAME ABSENT

+	_ZN16QGraphicsWebView14dragEnterEventEP27QGraphicsSceneDragDropEvent @ 168 NONAME

+	_ZN16QGraphicsWebView14dragLeaveEventEP27QGraphicsSceneDragDropEvent @ 169 NONAME

+	_ZN16QGraphicsWebView14hoverMoveEventEP24QGraphicsSceneHoverEvent @ 170 NONAME

+	_ZN16QGraphicsWebView14mouseMoveEventEP24QGraphicsSceneMouseEvent @ 171 NONAME

+	_ZN16QGraphicsWebView14setInteractiveEb @ 172 NONAME ABSENT

+	_ZN16QGraphicsWebView14updateGeometryEv @ 173 NONAME

+	_ZN16QGraphicsWebView15hoverLeaveEventEP24QGraphicsSceneHoverEvent @ 174 NONAME

+	_ZN16QGraphicsWebView15keyReleaseEventEP9QKeyEvent @ 175 NONAME

+	_ZN16QGraphicsWebView15mousePressEventEP24QGraphicsSceneMouseEvent @ 176 NONAME

+	_ZN16QGraphicsWebView15progressChangedEf @ 177 NONAME ABSENT

+	_ZN16QGraphicsWebView16contextMenuEventEP30QGraphicsSceneContextMenuEvent @ 178 NONAME

+	_ZN16QGraphicsWebView16inputMethodEventEP17QInputMethodEvent @ 179 NONAME

+	_ZN16QGraphicsWebView16staticMetaObjectE @ 180 NONAME DATA 16

+	_ZN16QGraphicsWebView17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 181 NONAME

+	_ZN16QGraphicsWebView17zoomFactorChangedEv @ 182 NONAME ABSENT

+	_ZN16QGraphicsWebView18focusNextPrevChildEb @ 183 NONAME

+	_ZN16QGraphicsWebView19getStaticMetaObjectEv @ 184 NONAME

+	_ZN16QGraphicsWebView20interactivityChangedEv @ 185 NONAME ABSENT

+	_ZN16QGraphicsWebView21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent @ 186 NONAME

+	_ZN16QGraphicsWebView4backEv @ 187 NONAME

+	_ZN16QGraphicsWebView4loadERK15QNetworkRequestN21QNetworkAccessManager9OperationERK10QByteArray @ 188 NONAME

+	_ZN16QGraphicsWebView4loadERK4QUrl @ 189 NONAME

+	_ZN16QGraphicsWebView4stopEv @ 190 NONAME

+	_ZN16QGraphicsWebView5eventEP6QEvent @ 191 NONAME

+	_ZN16QGraphicsWebView5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 192 NONAME

+	_ZN16QGraphicsWebView6reloadEv @ 193 NONAME

+	_ZN16QGraphicsWebView6setUrlERK4QUrl @ 194 NONAME

+	_ZN16QGraphicsWebView7forwardEv @ 195 NONAME

+	_ZN16QGraphicsWebView7setHtmlERK7QStringRK4QUrl @ 196 NONAME

+	_ZN16QGraphicsWebView7setPageEP8QWebPage @ 197 NONAME

+	_ZN16QGraphicsWebView9dropEventEP27QGraphicsSceneDragDropEvent @ 198 NONAME

+	_ZN16QGraphicsWebViewC1EP13QGraphicsItem @ 199 NONAME

+	_ZN16QGraphicsWebViewC2EP13QGraphicsItem @ 200 NONAME

+	_ZN16QGraphicsWebViewD0Ev @ 201 NONAME

+	_ZN16QGraphicsWebViewD1Ev @ 202 NONAME

+	_ZN16QGraphicsWebViewD2Ev @ 203 NONAME

+	_ZN17QWebHitTestResultC1EP24QWebHitTestResultPrivate @ 204 NONAME

+	_ZN17QWebHitTestResultC1ERKS_ @ 205 NONAME

+	_ZN17QWebHitTestResultC1Ev @ 206 NONAME

+	_ZN17QWebHitTestResultC2EP24QWebHitTestResultPrivate @ 207 NONAME

+	_ZN17QWebHitTestResultC2ERKS_ @ 208 NONAME

+	_ZN17QWebHitTestResultC2Ev @ 209 NONAME

+	_ZN17QWebHitTestResultD1Ev @ 210 NONAME

+	_ZN17QWebHitTestResultD2Ev @ 211 NONAME

+	_ZN17QWebHitTestResultaSERKS_ @ 212 NONAME

+	_ZN17QWebPluginFactory11qt_metacallEN11QMetaObject4CallEiPPv @ 213 NONAME

+	_ZN17QWebPluginFactory11qt_metacastEPKc @ 214 NONAME

+	_ZN17QWebPluginFactory14refreshPluginsEv @ 215 NONAME

+	_ZN17QWebPluginFactory16staticMetaObjectE @ 216 NONAME DATA 16

+	_ZN17QWebPluginFactory19getStaticMetaObjectEv @ 217 NONAME

+	_ZN17QWebPluginFactory9extensionENS_9ExtensionEPKNS_15ExtensionOptionEPNS_15ExtensionReturnE @ 218 NONAME

+	_ZN17QWebPluginFactoryC2EP7QObject @ 219 NONAME

+	_ZN17QWebPluginFactoryD0Ev @ 220 NONAME

+	_ZN17QWebPluginFactoryD1Ev @ 221 NONAME

+	_ZN17QWebPluginFactoryD2Ev @ 222 NONAME

+	_ZN18QWebPluginDatabase11qt_metacallEN11QMetaObject4CallEiPPv @ 223 NONAME

+	_ZN18QWebPluginDatabase11qt_metacastEPKc @ 224 NONAME

+	_ZN18QWebPluginDatabase13addSearchPathERK7QString @ 225 NONAME

+	_ZN18QWebPluginDatabase14setSearchPathsERK11QStringList @ 226 NONAME

+	_ZN18QWebPluginDatabase16staticMetaObjectE @ 227 NONAME DATA 16

+	_ZN18QWebPluginDatabase17pluginForMimeTypeERK7QString @ 228 NONAME

+	_ZN18QWebPluginDatabase18defaultSearchPathsEv @ 229 NONAME

+	_ZN18QWebPluginDatabase19getStaticMetaObjectEv @ 230 NONAME

+	_ZN18QWebPluginDatabase29setPreferredPluginForMimeTypeERK7QStringRK14QWebPluginInfo @ 231 NONAME

+	_ZN18QWebPluginDatabase7refreshEv @ 232 NONAME

+	_ZN18QWebPluginDatabaseC1EP7QObject @ 233 NONAME

+	_ZN18QWebPluginDatabaseC2EP7QObject @ 234 NONAME

+	_ZN18QWebPluginDatabaseD0Ev @ 235 NONAME

+	_ZN18QWebPluginDatabaseD1Ev @ 236 NONAME

+	_ZN18QWebPluginDatabaseD2Ev @ 237 NONAME

+	_ZN18QWebSecurityOrigin10allOriginsEv @ 238 NONAME

+	_ZN18QWebSecurityOrigin12localSchemesEv @ 239 NONAME

+	_ZN18QWebSecurityOrigin14addLocalSchemeERK7QString @ 240 NONAME

+	_ZN18QWebSecurityOrigin16setDatabaseQuotaEx @ 241 NONAME

+	_ZN18QWebSecurityOrigin17removeLocalSchemeERK7QString @ 242 NONAME

+	_ZN18QWebSecurityOrigin25whiteListAccessFromOriginERK7QStringS2_S2_b @ 243 NONAME ABSENT

+	_ZN18QWebSecurityOrigin27resetOriginAccessWhiteListsEv @ 244 NONAME ABSENT

+	_ZN18QWebSecurityOriginC1EP25QWebSecurityOriginPrivate @ 245 NONAME

+	_ZN18QWebSecurityOriginC1ERKS_ @ 246 NONAME

+	_ZN18QWebSecurityOriginC2EP25QWebSecurityOriginPrivate @ 247 NONAME

+	_ZN18QWebSecurityOriginC2ERKS_ @ 248 NONAME

+	_ZN18QWebSecurityOriginD1Ev @ 249 NONAME

+	_ZN18QWebSecurityOriginD2Ev @ 250 NONAME

+	_ZN18QWebSecurityOriginaSERKS_ @ 251 NONAME

+	_ZN20QWebHistoryInterface11qt_metacallEN11QMetaObject4CallEiPPv @ 252 NONAME

+	_ZN20QWebHistoryInterface11qt_metacastEPKc @ 253 NONAME

+	_ZN20QWebHistoryInterface16defaultInterfaceEv @ 254 NONAME

+	_ZN20QWebHistoryInterface16staticMetaObjectE @ 255 NONAME DATA 16

+	_ZN20QWebHistoryInterface19getStaticMetaObjectEv @ 256 NONAME

+	_ZN20QWebHistoryInterface19setDefaultInterfaceEPS_ @ 257 NONAME

+	_ZN20QWebHistoryInterfaceC2EP7QObject @ 258 NONAME

+	_ZN20QWebHistoryInterfaceD0Ev @ 259 NONAME

+	_ZN20QWebHistoryInterfaceD1Ev @ 260 NONAME

+	_ZN20QWebHistoryInterfaceD2Ev @ 261 NONAME

+	_ZN8QWebPage10chooseFileEP9QWebFrameRK7QString @ 262 NONAME

+	_ZN8QWebPage10setPaletteERK8QPalette @ 263 NONAME

+	_ZN8QWebPage11linkClickedERK4QUrl @ 264 NONAME

+	_ZN8QWebPage11linkHoveredERK7QStringS2_S2_ @ 265 NONAME

+	_ZN8QWebPage11loadStartedEv @ 266 NONAME

+	_ZN8QWebPage11qt_metacallEN11QMetaObject4CallEiPPv @ 267 NONAME

+	_ZN8QWebPage11qt_metacastEPKc @ 268 NONAME

+	_ZN8QWebPage12createPluginERK7QStringRK4QUrlRK11QStringListS8_ @ 269 NONAME

+	_ZN8QWebPage12createWindowENS_13WebWindowTypeE @ 270 NONAME

+	_ZN8QWebPage12frameCreatedEP9QWebFrame @ 271 NONAME

+	_ZN8QWebPage12loadFinishedEb @ 272 NONAME

+	_ZN8QWebPage12loadProgressEi @ 273 NONAME

+	_ZN8QWebPage13triggerActionENS_9WebActionEb @ 274 NONAME

+	_ZN8QWebPage14printRequestedEP9QWebFrame @ 275 NONAME

+	_ZN8QWebPage15contentsChangedEv @ 276 NONAME

+	_ZN8QWebPage15javaScriptAlertEP9QWebFrameRK7QString @ 277 NONAME

+	_ZN8QWebPage15scrollRequestedEiiRK5QRect @ 278 NONAME

+	_ZN8QWebPage16javaScriptPromptEP9QWebFrameRK7QStringS4_PS2_ @ 279 NONAME

+	_ZN8QWebPage16repaintRequestedERK5QRect @ 280 NONAME

+	_ZN8QWebPage16selectionChangedEv @ 281 NONAME

+	_ZN8QWebPage16setPluginFactoryEP17QWebPluginFactory @ 282 NONAME

+	_ZN8QWebPage16staticMetaObjectE @ 283 NONAME DATA 16

+	_ZN8QWebPage16statusBarMessageERK7QString @ 284 NONAME

+	_ZN8QWebPage17downloadRequestedERK15QNetworkRequest @ 285 NONAME

+	_ZN8QWebPage17javaScriptConfirmEP9QWebFrameRK7QString @ 286 NONAME

+	_ZN8QWebPage17microFocusChangedEv @ 287 NONAME

+	_ZN8QWebPage18focusNextPrevChildEb @ 288 NONAME

+	_ZN8QWebPage18setContentEditableEb @ 289 NONAME

+	_ZN8QWebPage18unsupportedContentEP13QNetworkReply @ 290 NONAME

+	_ZN8QWebPage19getStaticMetaObjectEv @ 291 NONAME

+	_ZN8QWebPage20windowCloseRequestedEv @ 292 NONAME

+	_ZN8QWebPage21databaseQuotaExceededEP9QWebFrame7QString @ 293 NONAME

+	_ZN8QWebPage21webInspectorTriggeredERK11QWebElement @ 294 NONAME ABSENT

+	_ZN8QWebPage23acceptNavigationRequestEP9QWebFrameRK15QNetworkRequestNS_14NavigationTypeE @ 295 NONAME

+	_ZN8QWebPage23geometryChangeRequestedERK5QRect @ 296 NONAME

+	_ZN8QWebPage23saveFrameStateRequestedEP9QWebFrameP15QWebHistoryItem @ 297 NONAME

+	_ZN8QWebPage23setLinkDelegationPolicyENS_20LinkDelegationPolicyE @ 298 NONAME

+	_ZN8QWebPage23setNetworkAccessManagerEP21QNetworkAccessManager @ 299 NONAME

+	_ZN8QWebPage23swallowContextMenuEventEP17QContextMenuEvent @ 300 NONAME

+	_ZN8QWebPage24javaScriptConsoleMessageERK7QStringiS2_ @ 301 NONAME

+	_ZN8QWebPage25createStandardContextMenuEv @ 302 NONAME

+	_ZN8QWebPage25shouldInterruptJavaScriptEv @ 303 NONAME

+	_ZN8QWebPage26restoreFrameStateRequestedEP9QWebFrame @ 304 NONAME

+	_ZN8QWebPage28setForwardUnsupportedContentEb @ 305 NONAME

+	_ZN8QWebPage30updatePositionDependentActionsERK6QPoint @ 306 NONAME

+	_ZN8QWebPage32menuBarVisibilityChangeRequestedEb @ 307 NONAME

+	_ZN8QWebPage32toolBarVisibilityChangeRequestedEb @ 308 NONAME

+	_ZN8QWebPage34statusBarVisibilityChangeRequestedEb @ 309 NONAME

+	_ZN8QWebPage5eventEP6QEvent @ 310 NONAME

+	_ZN8QWebPage7setViewEP7QWidget @ 311 NONAME

+	_ZN8QWebPage8findTextERK7QString6QFlagsINS_8FindFlagEE @ 312 NONAME

+	_ZN8QWebPage9extensionENS_9ExtensionEPKNS_15ExtensionOptionEPNS_15ExtensionReturnE @ 313 NONAME

+	_ZN8QWebPageC1EP7QObject @ 314 NONAME

+	_ZN8QWebPageC2EP7QObject @ 315 NONAME

+	_ZN8QWebPageD0Ev @ 316 NONAME

+	_ZN8QWebPageD1Ev @ 317 NONAME

+	_ZN8QWebPageD2Ev @ 318 NONAME

+	_ZN8QWebView10paintEventEP11QPaintEvent @ 319 NONAME

+	_ZN8QWebView10setContentERK10QByteArrayRK7QStringRK4QUrl @ 320 NONAME

+	_ZN8QWebView10urlChangedERK4QUrl @ 321 NONAME

+	_ZN8QWebView10wheelEventEP11QWheelEvent @ 322 NONAME

+	_ZN8QWebView11changeEventEP6QEvent @ 323 NONAME

+	_ZN8QWebView11iconChangedEv @ 324 NONAME

+	_ZN8QWebView11linkClickedERK4QUrl @ 325 NONAME

+	_ZN8QWebView11loadStartedEv @ 326 NONAME

+	_ZN8QWebView11qt_metacallEN11QMetaObject4CallEiPPv @ 327 NONAME

+	_ZN8QWebView11qt_metacastEPKc @ 328 NONAME

+	_ZN8QWebView11resizeEventEP12QResizeEvent @ 329 NONAME

+	_ZN8QWebView12createWindowEN8QWebPage13WebWindowTypeE @ 330 NONAME

+	_ZN8QWebView12focusInEventEP11QFocusEvent @ 331 NONAME

+	_ZN8QWebView12loadFinishedEb @ 332 NONAME

+	_ZN8QWebView12loadProgressEi @ 333 NONAME

+	_ZN8QWebView12titleChangedERK7QString @ 334 NONAME

+	_ZN8QWebView13dragMoveEventEP14QDragMoveEvent @ 335 NONAME

+	_ZN8QWebView13focusOutEventEP11QFocusEvent @ 336 NONAME

+	_ZN8QWebView13keyPressEventEP9QKeyEvent @ 337 NONAME

+	_ZN8QWebView13setRenderHintEN8QPainter10RenderHintEb @ 338 NONAME

+	_ZN8QWebView13setZoomFactorEf @ 339 NONAME

+	_ZN8QWebView14dragEnterEventEP15QDragEnterEvent @ 340 NONAME

+	_ZN8QWebView14dragLeaveEventEP15QDragLeaveEvent @ 341 NONAME

+	_ZN8QWebView14mouseMoveEventEP11QMouseEvent @ 342 NONAME

+	_ZN8QWebView14setRenderHintsE6QFlagsIN8QPainter10RenderHintEE @ 343 NONAME

+	_ZN8QWebView15keyReleaseEventEP9QKeyEvent @ 344 NONAME

+	_ZN8QWebView15mousePressEventEP11QMouseEvent @ 345 NONAME

+	_ZN8QWebView16contextMenuEventEP17QContextMenuEvent @ 346 NONAME

+	_ZN8QWebView16inputMethodEventEP17QInputMethodEvent @ 347 NONAME

+	_ZN8QWebView16selectionChangedEv @ 348 NONAME

+	_ZN8QWebView16staticMetaObjectE @ 349 NONAME DATA 16

+	_ZN8QWebView16statusBarMessageERK7QString @ 350 NONAME

+	_ZN8QWebView17mouseReleaseEventEP11QMouseEvent @ 351 NONAME

+	_ZN8QWebView17triggerPageActionEN8QWebPage9WebActionEb @ 352 NONAME

+	_ZN8QWebView18focusNextPrevChildEb @ 353 NONAME

+	_ZN8QWebView18guessUrlFromStringERK7QString @ 354 NONAME ABSENT

+	_ZN8QWebView19getStaticMetaObjectEv @ 355 NONAME

+	_ZN8QWebView21mouseDoubleClickEventEP11QMouseEvent @ 356 NONAME

+	_ZN8QWebView21setTextSizeMultiplierEf @ 357 NONAME

+	_ZN8QWebView4backEv @ 358 NONAME

+	_ZN8QWebView4loadERK15QNetworkRequestN21QNetworkAccessManager9OperationERK10QByteArray @ 359 NONAME

+	_ZN8QWebView4loadERK4QUrl @ 360 NONAME

+	_ZN8QWebView4stopEv @ 361 NONAME

+	_ZN8QWebView5eventEP6QEvent @ 362 NONAME

+	_ZN8QWebView6reloadEv @ 363 NONAME

+	_ZN8QWebView6setUrlERK4QUrl @ 364 NONAME

+	_ZN8QWebView7forwardEv @ 365 NONAME

+	_ZN8QWebView7setHtmlERK7QStringRK4QUrl @ 366 NONAME

+	_ZN8QWebView7setPageEP8QWebPage @ 367 NONAME

+	_ZN8QWebView8findTextERK7QString6QFlagsIN8QWebPage8FindFlagEE @ 368 NONAME

+	_ZN8QWebView9dropEventEP10QDropEvent @ 369 NONAME

+	_ZN8QWebViewC1EP7QWidget @ 370 NONAME

+	_ZN8QWebViewC2EP7QWidget @ 371 NONAME

+	_ZN8QWebViewD0Ev @ 372 NONAME

+	_ZN8QWebViewD1Ev @ 373 NONAME

+	_ZN8QWebViewD2Ev @ 374 NONAME

+	_ZN9QWebFrame10setContentERK10QByteArrayRK7QStringRK4QUrl @ 375 NONAME

+	_ZN9QWebFrame10urlChangedERK4QUrl @ 376 NONAME

+	_ZN9QWebFrame11iconChangedEv @ 377 NONAME

+	_ZN9QWebFrame11loadStartedEv @ 378 NONAME

+	_ZN9QWebFrame11qt_metacallEN11QMetaObject4CallEiPPv @ 379 NONAME

+	_ZN9QWebFrame11qt_metacastEPKc @ 380 NONAME

+	_ZN9QWebFrame12loadFinishedEb @ 381 NONAME

+	_ZN9QWebFrame12titleChangedERK7QString @ 382 NONAME

+	_ZN9QWebFrame13setZoomFactorEf @ 383 NONAME

+	_ZN9QWebFrame15provisionalLoadEv @ 384 NONAME

+	_ZN9QWebFrame16staticMetaObjectE @ 385 NONAME DATA 16

+	_ZN9QWebFrame17setScrollBarValueEN2Qt11OrientationEi @ 386 NONAME

+	_ZN9QWebFrame17setScrollPositionERK6QPoint @ 387 NONAME

+	_ZN9QWebFrame18evaluateJavaScriptERK7QString @ 388 NONAME

+	_ZN9QWebFrame18setScrollBarPolicyEN2Qt11OrientationENS0_15ScrollBarPolicyE @ 389 NONAME

+	_ZN9QWebFrame19contentsSizeChangedERK5QSize @ 390 NONAME

+	_ZN9QWebFrame19getStaticMetaObjectEv @ 391 NONAME

+	_ZN9QWebFrame21setTextSizeMultiplierEf @ 392 NONAME

+	_ZN9QWebFrame22initialLayoutCompletedEv @ 393 NONAME

+	_ZN9QWebFrame23setClipRenderToViewportEb @ 394 NONAME ABSENT

+	_ZN9QWebFrame27addToJavaScriptWindowObjectERK7QStringP7QObject @ 395 NONAME

+	_ZN9QWebFrame27addToJavaScriptWindowObjectERK7QStringP7QObjectN13QScriptEngine14ValueOwnershipE @ 396 NONAME

+	_ZN9QWebFrame29javaScriptWindowObjectClearedEv @ 397 NONAME

+	_ZN9QWebFrame4loadERK15QNetworkRequestN21QNetworkAccessManager9OperationERK10QByteArray @ 398 NONAME

+	_ZN9QWebFrame4loadERK4QUrl @ 399 NONAME

+	_ZN9QWebFrame5eventEP6QEvent @ 400 NONAME

+	_ZN9QWebFrame6renderEP8QPainter @ 401 NONAME

+	_ZN9QWebFrame6renderEP8QPainterRK7QRegion @ 402 NONAME

+	_ZN9QWebFrame6scrollEii @ 403 NONAME

+	_ZN9QWebFrame6setUrlERK4QUrl @ 404 NONAME

+	_ZN9QWebFrame7setHtmlERK7QStringRK4QUrl @ 405 NONAME

+	_ZN9QWebFrame8setFocusEv @ 406 NONAME

+	_ZN9QWebFrameC1EP8QWebPageP13QWebFrameData @ 407 NONAME

+	_ZN9QWebFrameC1EPS_P13QWebFrameData @ 408 NONAME

+	_ZN9QWebFrameC2EP8QWebPageP13QWebFrameData @ 409 NONAME

+	_ZN9QWebFrameC2EPS_P13QWebFrameData @ 410 NONAME

+	_ZN9QWebFrameD0Ev @ 411 NONAME

+	_ZN9QWebFrameD1Ev @ 412 NONAME

+	_ZN9QWebFrameD2Ev @ 413 NONAME

+	_ZNK11QWebElement10firstChildEv @ 414 NONAME

+	_ZNK11QWebElement10toInnerXmlEv @ 415 NONAME

+	_ZNK11QWebElement10toOuterXmlEv @ 416 NONAME

+	_ZNK11QWebElement11attributeNSERK7QStringS2_S2_ @ 417 NONAME

+	_ZNK11QWebElement11nextSiblingEv @ 418 NONAME

+	_ZNK11QWebElement11toPlainTextEv @ 419 NONAME

+	_ZNK11QWebElement12hasAttributeERK7QString @ 420 NONAME

+	_ZNK11QWebElement12namespaceUriEv @ 421 NONAME

+	_ZNK11QWebElement13hasAttributesEv @ 422 NONAME

+	_ZNK11QWebElement13stylePropertyERK7QStringNS_20StyleResolveStrategyE @ 423 NONAME

+	_ZNK11QWebElement14hasAttributeNSERK7QStringS2_ @ 424 NONAME

+	_ZNK11QWebElement15previousSiblingEv @ 425 NONAME

+	_ZNK11QWebElement5cloneEv @ 426 NONAME

+	_ZNK11QWebElement6isNullEv @ 427 NONAME

+	_ZNK11QWebElement6parentEv @ 428 NONAME

+	_ZNK11QWebElement6prefixEv @ 429 NONAME

+	_ZNK11QWebElement7classesEv @ 430 NONAME

+	_ZNK11QWebElement7findAllERK7QString @ 431 NONAME

+	_ZNK11QWebElement7tagNameEv @ 432 NONAME

+	_ZNK11QWebElement8documentEv @ 433 NONAME

+	_ZNK11QWebElement8geometryEv @ 434 NONAME

+	_ZNK11QWebElement8hasClassERK7QString @ 435 NONAME

+	_ZNK11QWebElement8hasFocusEv @ 436 NONAME

+	_ZNK11QWebElement8webFrameEv @ 437 NONAME

+	_ZNK11QWebElement9attributeERK7QStringS2_ @ 438 NONAME

+	_ZNK11QWebElement9findFirstERK7QString @ 439 NONAME

+	_ZNK11QWebElement9lastChildEv @ 440 NONAME

+	_ZNK11QWebElement9localNameEv @ 441 NONAME

+	_ZNK11QWebElementeqERKS_ @ 442 NONAME

+	_ZNK11QWebElementneERKS_ @ 443 NONAME

+	_ZNK11QWebHistory11currentItemEv @ 444 NONAME

+	_ZNK11QWebHistory11forwardItemEv @ 445 NONAME

+	_ZNK11QWebHistory12canGoForwardEv @ 446 NONAME

+	_ZNK11QWebHistory12forwardItemsEi @ 447 NONAME

+	_ZNK11QWebHistory16currentItemIndexEv @ 448 NONAME

+	_ZNK11QWebHistory16maximumItemCountEv @ 449 NONAME

+	_ZNK11QWebHistory5countEv @ 450 NONAME

+	_ZNK11QWebHistory5itemsEv @ 451 NONAME

+	_ZNK11QWebHistory6itemAtEi @ 452 NONAME

+	_ZNK11QWebHistory8backItemEv @ 453 NONAME

+	_ZNK11QWebHistory9backItemsEi @ 454 NONAME

+	_ZNK11QWebHistory9canGoBackEv @ 455 NONAME

+	_ZNK11QWebHistory9saveStateENS_19HistoryStateVersionE @ 456 NONAME ABSENT

+	_ZNK12QWebDatabase11displayNameEv @ 457 NONAME

+	_ZNK12QWebDatabase12expectedSizeEv @ 458 NONAME

+	_ZNK12QWebDatabase4nameEv @ 459 NONAME

+	_ZNK12QWebDatabase4sizeEv @ 460 NONAME

+	_ZNK12QWebDatabase6originEv @ 461 NONAME

+	_ZNK12QWebDatabase8fileNameEv @ 462 NONAME

+	_ZNK12QWebSettings10fontFamilyENS_10FontFamilyE @ 463 NONAME

+	_ZNK12QWebSettings13testAttributeENS_12WebAttributeE @ 464 NONAME

+	_ZNK12QWebSettings16localStoragePathEv @ 465 NONAME

+	_ZNK12QWebSettings17userStyleSheetUrlEv @ 466 NONAME

+	_ZNK12QWebSettings19defaultTextEncodingEv @ 467 NONAME

+	_ZNK12QWebSettings8fontSizeENS_8FontSizeE @ 468 NONAME

+	_ZNK13QWebInspector10metaObjectEv @ 469 NONAME

+	_ZNK13QWebInspector4pageEv @ 470 NONAME

+	_ZNK13QWebInspector8sizeHintEv @ 471 NONAME

+	_ZNK14QWebPluginInfo11descriptionEv @ 472 NONAME

+	_ZNK14QWebPluginInfo16supportsMimeTypeERK7QString @ 473 NONAME

+	_ZNK14QWebPluginInfo4nameEv @ 474 NONAME

+	_ZNK14QWebPluginInfo4pathEv @ 475 NONAME

+	_ZNK14QWebPluginInfo6isNullEv @ 476 NONAME

+	_ZNK14QWebPluginInfo9isEnabledEv @ 477 NONAME

+	_ZNK14QWebPluginInfo9mimeTypesEv @ 478 NONAME

+	_ZNK14QWebPluginInfoeqERKS_ @ 479 NONAME

+	_ZNK14QWebPluginInfoneERKS_ @ 480 NONAME

+	_ZNK15QWebHistoryItem11lastVisitedEv @ 481 NONAME

+	_ZNK15QWebHistoryItem11originalUrlEv @ 482 NONAME

+	_ZNK15QWebHistoryItem3urlEv @ 483 NONAME

+	_ZNK15QWebHistoryItem4iconEv @ 484 NONAME

+	_ZNK15QWebHistoryItem5titleEv @ 485 NONAME

+	_ZNK15QWebHistoryItem7isValidEv @ 486 NONAME

+	_ZNK15QWebHistoryItem8userDataEv @ 487 NONAME

+	_ZNK16QGraphicsWebView10metaObjectEv @ 488 NONAME

+	_ZNK16QGraphicsWebView10zoomFactorEv @ 489 NONAME

+	_ZNK16QGraphicsWebView13isInteractiveEv @ 490 NONAME ABSENT

+	_ZNK16QGraphicsWebView3urlEv @ 491 NONAME

+	_ZNK16QGraphicsWebView4iconEv @ 492 NONAME

+	_ZNK16QGraphicsWebView4pageEv @ 493 NONAME

+	_ZNK16QGraphicsWebView5titleEv @ 494 NONAME

+	_ZNK16QGraphicsWebView6statusEv @ 495 NONAME ABSENT

+	_ZNK16QGraphicsWebView6toHtmlEv @ 496 NONAME ABSENT

+	_ZNK16QGraphicsWebView7historyEv @ 497 NONAME

+	_ZNK16QGraphicsWebView8progressEv @ 498 NONAME ABSENT

+	_ZNK16QGraphicsWebView8settingsEv @ 499 NONAME

+	_ZNK17QWebHitTestResult11linkElementEv @ 500 NONAME

+	_ZNK17QWebHitTestResult12boundingRectEv @ 501 NONAME

+	_ZNK17QWebHitTestResult13alternateTextEv @ 502 NONAME

+	_ZNK17QWebHitTestResult15linkTargetFrameEv @ 503 NONAME

+	_ZNK17QWebHitTestResult17isContentEditableEv @ 504 NONAME

+	_ZNK17QWebHitTestResult17isContentSelectedEv @ 505 NONAME

+	_ZNK17QWebHitTestResult21enclosingBlockElementEv @ 506 NONAME

+	_ZNK17QWebHitTestResult3posEv @ 507 NONAME

+	_ZNK17QWebHitTestResult5frameEv @ 508 NONAME

+	_ZNK17QWebHitTestResult5titleEv @ 509 NONAME

+	_ZNK17QWebHitTestResult6isNullEv @ 510 NONAME

+	_ZNK17QWebHitTestResult6pixmapEv @ 511 NONAME

+	_ZNK17QWebHitTestResult7elementEv @ 512 NONAME

+	_ZNK17QWebHitTestResult7linkUrlEv @ 513 NONAME

+	_ZNK17QWebHitTestResult8imageUrlEv @ 514 NONAME

+	_ZNK17QWebHitTestResult8linkTextEv @ 515 NONAME

+	_ZNK17QWebHitTestResult9linkTitleEv @ 516 NONAME

+	_ZNK17QWebPluginFactory10metaObjectEv @ 517 NONAME

+	_ZNK17QWebPluginFactory17supportsExtensionENS_9ExtensionE @ 518 NONAME

+	_ZNK17QWebPluginFactory8MimeTypeeqERKS0_ @ 519 NONAME

+	_ZNK18QWebPluginDatabase10metaObjectEv @ 520 NONAME

+	_ZNK18QWebPluginDatabase11searchPathsEv @ 521 NONAME

+	_ZNK18QWebPluginDatabase7pluginsEv @ 522 NONAME

+	_ZNK18QWebSecurityOrigin13databaseQuotaEv @ 523 NONAME

+	_ZNK18QWebSecurityOrigin13databaseUsageEv @ 524 NONAME

+	_ZNK18QWebSecurityOrigin4hostEv @ 525 NONAME

+	_ZNK18QWebSecurityOrigin4portEv @ 526 NONAME

+	_ZNK18QWebSecurityOrigin6schemeEv @ 527 NONAME

+	_ZNK18QWebSecurityOrigin9databasesEv @ 528 NONAME

+	_ZNK20QWebHistoryInterface10metaObjectEv @ 529 NONAME

+	_ZNK8QWebPage10isModifiedEv @ 530 NONAME

+	_ZNK8QWebPage10metaObjectEv @ 531 NONAME

+	_ZNK8QWebPage10totalBytesEv @ 532 NONAME

+	_ZNK8QWebPage12currentFrameEv @ 533 NONAME

+	_ZNK8QWebPage12selectedTextEv @ 534 NONAME

+	_ZNK8QWebPage12viewportSizeEv @ 535 NONAME

+	_ZNK8QWebPage13bytesReceivedEv @ 536 NONAME

+	_ZNK8QWebPage13pluginFactoryEv @ 537 NONAME

+	_ZNK8QWebPage15setViewportSizeERK5QSize @ 538 NONAME

+	_ZNK8QWebPage15userAgentForUrlERK4QUrl @ 539 NONAME

+	_ZNK8QWebPage16inputMethodQueryEN2Qt16InputMethodQueryE @ 540 NONAME

+	_ZNK8QWebPage17fixedContentsSizeEv @ 541 NONAME ABSENT

+	_ZNK8QWebPage17isContentEditableEv @ 542 NONAME

+	_ZNK8QWebPage17supportsExtensionENS_9ExtensionE @ 543 NONAME

+	_ZNK8QWebPage20linkDelegationPolicyEv @ 544 NONAME

+	_ZNK8QWebPage20networkAccessManagerEv @ 545 NONAME

+	_ZNK8QWebPage20setFixedContentsSizeERK5QSize @ 546 NONAME ABSENT

+	_ZNK8QWebPage25forwardUnsupportedContentEv @ 547 NONAME

+	_ZNK8QWebPage4viewEv @ 548 NONAME

+	_ZNK8QWebPage6actionENS_9WebActionE @ 549 NONAME

+	_ZNK8QWebPage7frameAtERK6QPoint @ 550 NONAME

+	_ZNK8QWebPage7historyEv @ 551 NONAME

+	_ZNK8QWebPage7paletteEv @ 552 NONAME

+	_ZNK8QWebPage8settingsEv @ 553 NONAME

+	_ZNK8QWebPage9mainFrameEv @ 554 NONAME

+	_ZNK8QWebPage9undoStackEv @ 555 NONAME

+	_ZNK8QWebView10isModifiedEv @ 556 NONAME

+	_ZNK8QWebView10metaObjectEv @ 557 NONAME

+	_ZNK8QWebView10pageActionEN8QWebPage9WebActionE @ 558 NONAME

+	_ZNK8QWebView10zoomFactorEv @ 559 NONAME

+	_ZNK8QWebView11renderHintsEv @ 560 NONAME

+	_ZNK8QWebView12selectedTextEv @ 561 NONAME

+	_ZNK8QWebView16inputMethodQueryEN2Qt16InputMethodQueryE @ 562 NONAME

+	_ZNK8QWebView18textSizeMultiplierEv @ 563 NONAME

+	_ZNK8QWebView3urlEv @ 564 NONAME

+	_ZNK8QWebView4iconEv @ 565 NONAME

+	_ZNK8QWebView4pageEv @ 566 NONAME

+	_ZNK8QWebView5printEP8QPrinter @ 567 NONAME

+	_ZNK8QWebView5titleEv @ 568 NONAME

+	_ZNK8QWebView7historyEv @ 569 NONAME

+	_ZNK8QWebView8settingsEv @ 570 NONAME

+	_ZNK8QWebView8sizeHintEv @ 571 NONAME

+	_ZNK9QWebFrame10metaObjectEv @ 572 NONAME

+	_ZNK9QWebFrame10zoomFactorEv @ 573 NONAME

+	_ZNK9QWebFrame11childFramesEv @ 574 NONAME

+	_ZNK9QWebFrame11parentFrameEv @ 575 NONAME

+	_ZNK9QWebFrame11toPlainTextEv @ 576 NONAME

+	_ZNK9QWebFrame12contentsSizeEv @ 577 NONAME

+	_ZNK9QWebFrame12requestedUrlEv @ 578 NONAME

+	_ZNK9QWebFrame14hitTestContentERK6QPoint @ 579 NONAME

+	_ZNK9QWebFrame14renderTreeDumpEv @ 580 NONAME

+	_ZNK9QWebFrame14scrollBarValueEN2Qt11OrientationE @ 581 NONAME

+	_ZNK9QWebFrame14scrollPositionEv @ 582 NONAME

+	_ZNK9QWebFrame14securityOriginEv @ 583 NONAME

+	_ZNK9QWebFrame15documentElementEv @ 584 NONAME

+	_ZNK9QWebFrame15findAllElementsERK7QString @ 585 NONAME

+	_ZNK9QWebFrame15scrollBarPolicyEN2Qt11OrientationE @ 586 NONAME

+	_ZNK9QWebFrame16findFirstElementERK7QString @ 587 NONAME

+	_ZNK9QWebFrame16scrollBarMaximumEN2Qt11OrientationE @ 588 NONAME

+	_ZNK9QWebFrame16scrollBarMinimumEN2Qt11OrientationE @ 589 NONAME

+	_ZNK9QWebFrame17scrollBarGeometryEN2Qt11OrientationE @ 590 NONAME

+	_ZNK9QWebFrame18textSizeMultiplierEv @ 591 NONAME

+	_ZNK9QWebFrame20clipRenderToViewportEv @ 592 NONAME ABSENT

+	_ZNK9QWebFrame3posEv @ 593 NONAME

+	_ZNK9QWebFrame3urlEv @ 594 NONAME

+	_ZNK9QWebFrame4iconEv @ 595 NONAME

+	_ZNK9QWebFrame4pageEv @ 596 NONAME

+	_ZNK9QWebFrame5titleEv @ 597 NONAME

+	_ZNK9QWebFrame6toHtmlEv @ 598 NONAME

+	_ZNK9QWebFrame7baseUrlEv @ 599 NONAME

+	_ZNK9QWebFrame8geometryEv @ 600 NONAME

+	_ZNK9QWebFrame8hasFocusEv @ 601 NONAME

+	_ZNK9QWebFrame8metaDataEv @ 602 NONAME

+	_ZNK9QWebFrame9frameNameEv @ 603 NONAME

+	_ZTI13QWebInspector @ 604 NONAME

+	_ZTI16QGraphicsWebView @ 605 NONAME

+	_ZTI17QWebPluginFactory @ 606 NONAME

+	_ZTI18QWebPluginDatabase @ 607 NONAME

+	_ZTI20QWebHistoryInterface @ 608 NONAME

+	_ZTI8QWebPage @ 609 NONAME

+	_ZTI8QWebView @ 610 NONAME

+	_ZTI9QWebFrame @ 611 NONAME

+	_ZTV13QWebInspector @ 612 NONAME

+	_ZTV16QGraphicsWebView @ 613 NONAME

+	_ZTV17QWebPluginFactory @ 614 NONAME

+	_ZTV18QWebPluginDatabase @ 615 NONAME

+	_ZTV20QWebHistoryInterface @ 616 NONAME

+	_ZTV8QWebPage @ 617 NONAME

+	_ZTV8QWebView @ 618 NONAME

+	_ZTV9QWebFrame @ 619 NONAME

+	_ZThn16_N16QGraphicsWebView11setGeometryERK6QRectF @ 620 NONAME

+	_ZThn16_N16QGraphicsWebView14updateGeometryEv @ 621 NONAME

+	_ZThn16_N16QGraphicsWebViewD0Ev @ 622 NONAME

+	_ZThn16_N16QGraphicsWebViewD1Ev @ 623 NONAME

+	_ZThn8_N13QWebInspectorD0Ev @ 624 NONAME

+	_ZThn8_N13QWebInspectorD1Ev @ 625 NONAME

+	_ZThn8_N16QGraphicsWebView10sceneEventEP6QEvent @ 626 NONAME

+	_ZThn8_N16QGraphicsWebView10wheelEventEP24QGraphicsSceneWheelEvent @ 627 NONAME

+	_ZThn8_N16QGraphicsWebView12focusInEventEP11QFocusEvent @ 628 NONAME

+	_ZThn8_N16QGraphicsWebView13dragMoveEventEP27QGraphicsSceneDragDropEvent @ 629 NONAME

+	_ZThn8_N16QGraphicsWebView13focusOutEventEP11QFocusEvent @ 630 NONAME

+	_ZThn8_N16QGraphicsWebView13keyPressEventEP9QKeyEvent @ 631 NONAME

+	_ZThn8_N16QGraphicsWebView14dragEnterEventEP27QGraphicsSceneDragDropEvent @ 632 NONAME

+	_ZThn8_N16QGraphicsWebView14dragLeaveEventEP27QGraphicsSceneDragDropEvent @ 633 NONAME

+	_ZThn8_N16QGraphicsWebView14hoverMoveEventEP24QGraphicsSceneHoverEvent @ 634 NONAME

+	_ZThn8_N16QGraphicsWebView14mouseMoveEventEP24QGraphicsSceneMouseEvent @ 635 NONAME

+	_ZThn8_N16QGraphicsWebView15hoverLeaveEventEP24QGraphicsSceneHoverEvent @ 636 NONAME

+	_ZThn8_N16QGraphicsWebView15keyReleaseEventEP9QKeyEvent @ 637 NONAME

+	_ZThn8_N16QGraphicsWebView15mousePressEventEP24QGraphicsSceneMouseEvent @ 638 NONAME

+	_ZThn8_N16QGraphicsWebView16contextMenuEventEP30QGraphicsSceneContextMenuEvent @ 639 NONAME

+	_ZThn8_N16QGraphicsWebView16inputMethodEventEP17QInputMethodEvent @ 640 NONAME

+	_ZThn8_N16QGraphicsWebView17mouseReleaseEventEP24QGraphicsSceneMouseEvent @ 641 NONAME

+	_ZThn8_N16QGraphicsWebView21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent @ 642 NONAME

+	_ZThn8_N16QGraphicsWebView5paintEP8QPainterPK24QStyleOptionGraphicsItemP7QWidget @ 643 NONAME

+	_ZThn8_N16QGraphicsWebView9dropEventEP27QGraphicsSceneDragDropEvent @ 644 NONAME

+	_ZThn8_N16QGraphicsWebViewD0Ev @ 645 NONAME

+	_ZThn8_N16QGraphicsWebViewD1Ev @ 646 NONAME

+	_ZThn8_N8QWebViewD0Ev @ 647 NONAME

+	_ZThn8_N8QWebViewD1Ev @ 648 NONAME

+	_ZlsR11QDataStreamRK11QWebHistory @ 649 NONAME

+	_ZrsR11QDataStreamR11QWebHistory @ 650 NONAME

+	_Z32qt_drt_whiteListAccessFromOriginRK7QStringS1_S1_b @ 651 NONAME

+	_Z33qt_drt_counterValueForElementByIdP9QWebFrameRK7QString @ 652 NONAME ABSENT

+	_Z34qt_drt_resetOriginAccessWhiteListsv @ 653 NONAME

+	_ZN11QWebElement17removeAllChildrenEv @ 654 NONAME

+	_ZN11QWebElement6renderEP8QPainter @ 655 NONAME

+	_ZN12QWebSettings30setPrintingMaximumShrinkFactorEf @ 656 NONAME ABSENT

+	_ZN12QWebSettings30setPrintingMinimumShrinkFactorEf @ 657 NONAME ABSENT

+	_ZN16QGraphicsWebView10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 658 NONAME

+	_ZN16QGraphicsWebView11linkClickedERK4QUrl @ 659 NONAME

+	_ZN16QGraphicsWebView12loadFinishedEb @ 660 NONAME

+	_ZN16QGraphicsWebView12loadProgressEi @ 661 NONAME

+	_ZN16QGraphicsWebView16statusBarMessageERK7QString @ 662 NONAME

+	_ZN16QGraphicsWebView17triggerPageActionEN8QWebPage9WebActionEb @ 663 NONAME

+	_ZN16QGraphicsWebView8findTextERK7QString6QFlagsIN8QWebPage8FindFlagEE @ 664 NONAME

+	_ZN21QWebElementCollection6appendERKS_ @ 665 NONAME

+	_ZN21QWebElementCollectionC1ERK11QWebElementRK7QString @ 666 NONAME

+	_ZN21QWebElementCollectionC1ERKS_ @ 667 NONAME

+	_ZN21QWebElementCollectionC1Ev @ 668 NONAME

+	_ZN21QWebElementCollectionC2ERK11QWebElementRK7QString @ 669 NONAME

+	_ZN21QWebElementCollectionC2ERKS_ @ 670 NONAME

+	_ZN21QWebElementCollectionC2Ev @ 671 NONAME

+	_ZN21QWebElementCollectionD1Ev @ 672 NONAME

+	_ZN21QWebElementCollectionD2Ev @ 673 NONAME

+	_ZN21QWebElementCollectionaSERKS_ @ 674 NONAME

+	_ZN9QWebFrame6renderEP8QPainterNS_11RenderLayerERK7QRegion @ 675 NONAME

+	_ZNK12QWebSettings27printingMaximumShrinkFactorEv @ 676 NONAME ABSENT

+	_ZNK12QWebSettings27printingMinimumShrinkFactorEv @ 677 NONAME ABSENT

+	_ZNK16QGraphicsWebView10isModifiedEv @ 678 NONAME

+	_ZNK16QGraphicsWebView10pageActionEN8QWebPage9WebActionE @ 679 NONAME

+	_ZNK16QGraphicsWebView16inputMethodQueryEN2Qt16InputMethodQueryE @ 680 NONAME

+	_ZNK16QGraphicsWebView8sizeHintEN2Qt8SizeHintERK6QSizeF @ 681 NONAME

+	_ZNK21QWebElementCollection2atEi @ 682 NONAME

+	_ZNK21QWebElementCollection5countEv @ 683 NONAME

+	_ZNK21QWebElementCollection6toListEv @ 684 NONAME

+	_ZNK21QWebElementCollectionplERKS_ @ 685 NONAME

+	_ZNK8QWebPage21preferredContentsSizeEv @ 686 NONAME

+	_ZNK8QWebPage24setPreferredContentsSizeERK5QSize @ 687 NONAME

+	_ZThn16_NK16QGraphicsWebView8sizeHintEN2Qt8SizeHintERK6QSizeF @ 688 NONAME

+	_ZThn8_N16QGraphicsWebView10itemChangeEN13QGraphicsItem18GraphicsItemChangeERK8QVariant @ 689 NONAME

+	_ZThn8_NK16QGraphicsWebView16inputMethodQueryEN2Qt16InputMethodQueryE @ 690 NONAME

+	_ZNK11QWebElement14attributeNamesERK7QString @ 691 NONAME

+	_Z23qt_networkAccessAllowedb @ 692 NONAME

+	_Z25qt_resumeActiveDOMObjectsP9QWebFrame @ 693 NONAME

+	_Z26qt_suspendActiveDOMObjectsP9QWebFrame @ 694 NONAME

+	_Z35qtwebkit_webframe_scrollRecursivelyP9QWebFrameii @ 695 NONAME ABSENT

+	_Z35qtwebkit_webframe_scrollRecursivelyP9QWebFrameiiRK6QPoint @ 696 NONAME

+	_ZN9QWebFrame17scrollRecursivelyEii @ 697 NONAME ABSENT

+	_ZN16QGraphicsWebView20setResizesToContentsEb @ 698 NONAME

+	_ZNK16QGraphicsWebView17resizesToContentsEv @ 699 NONAME

+	_Z20qt_drt_numberOfPagesP9QWebFrameff @ 700 NONAME ABSENT

+	_Z24qt_drt_pauseSVGAnimationP9QWebFrameRK7QStringdS3_ @ 701 NONAME ABSENT

+	_Z24qt_drt_webinspector_showP8QWebPage @ 702 NONAME ABSENT

+	_Z24qt_drt_workerThreadCountv @ 703 NONAME ABSENT

+	_Z25qt_drt_hasDocumentElementP9QWebFrame @ 704 NONAME ABSENT

+	_Z25qt_drt_webinspector_closeP8QWebPage @ 705 NONAME ABSENT

+	_Z31qt_drt_pageNumberForElementByIdP9QWebFrameRK7QStringff @ 706 NONAME ABSENT

+	_Z33qt_drt_webinspector_executeScriptP8QWebPagelRK7QString @ 707 NONAME ABSENT

+	_Z34qt_drt_setTimelineProfilingEnabledP8QWebPageb @ 708 NONAME ABSENT

+	_Z32qt_drt_setFrameFlatteningEnabledP8QWebPageb @ 709 NONAME ABSENT

+	_Z36qt_drt_evaluateScriptInIsolatedWorldP9QWebFrameiRK7QString @ 710 NONAME ABSENT

+	_Z47qt_drt_setDomainRelaxationForbiddenForURLSchemebRK7QString @ 711 NONAME ABSENT

+	_ZN9QWebFrame11pageChangedEv @ 712 NONAME

+	_ZN9QWebFrame14scrollToAnchorERK7QString @ 713 NONAME

+	_ZN12QWebSettings15setInspectorUrlERK4QUrl @ 714 NONAME ABSENT

+	_ZN13QWebInspector10closeEventEP11QCloseEvent @ 715 NONAME

+	_ZN16QGraphicsWebView26setTiledBackingStoreFrozenEb @ 716 NONAME

+	_ZNK16QGraphicsWebView25isTiledBackingStoreFrozenEv @ 717 NONAME

+	_Z18qt_wrt_setViewModeP8QWebPageRK7QString @ 718 NONAME ABSENT

+	_Z19qt_drt_setMediaTypeP9QWebFrameRK7QString @ 719 NONAME ABSENT

+	_Z26qt_drt_enableCaretBrowsingP8QWebPageb @ 720 NONAME ABSENT

+	_ZNK12QWebSettings12inspectorUrlEv @ 721 NONAME ABSENT

+	_ZN23DumpRenderTreeSupportQt19webPageSetGroupNameEP8QWebPageRK7QString @ 722 NONAME

+	_ZN23DumpRenderTreeSupportQt16webPageGroupNameEP8QWebPage @ 723 NONAME

+	_ZN23DumpRenderTreeSupportQt23garbageCollectorCollectEv @ 724 NONAME

+	_Z32qtwebkit_webframe_scrollOverflowP9QWebFrameiiRK6QPoint @ 725 NONAME

+	_ZN23DumpRenderTreeSupportQt12setMediaTypeEP9QWebFrameRK7QString @ 726 NONAME

+	_ZN23DumpRenderTreeSupportQt13numberOfPagesEP9QWebFrameff @ 727 NONAME

+	_ZN23DumpRenderTreeSupportQt13selectedRangeEP8QWebPage @ 728 NONAME

+	_ZN23DumpRenderTreeSupportQt14clearFrameNameEP9QWebFrame @ 729 NONAME

+	_ZN23DumpRenderTreeSupportQt14pauseAnimationEP9QWebFrameRK7QStringdS4_ @ 730 NONAME

+	_ZN23DumpRenderTreeSupportQt15dumpFrameLoaderEb @ 731 NONAME

+	_ZN23DumpRenderTreeSupportQt16dumpNotificationEb @ 732 NONAME

+	_ZN23DumpRenderTreeSupportQt16isCommandEnabledEP8QWebPageRK7QString @ 733 NONAME

+	_ZN23DumpRenderTreeSupportQt16webInspectorShowEP8QWebPage @ 734 NONAME

+	_ZN23DumpRenderTreeSupportQt17pauseSVGAnimationEP9QWebFrameRK7QStringdS4_ @ 735 NONAME

+	_ZN23DumpRenderTreeSupportQt17webInspectorCloseEP8QWebPage @ 736 NONAME

+	_ZN23DumpRenderTreeSupportQt17workerThreadCountEv @ 737 NONAME

+	_ZN23DumpRenderTreeSupportQt18hasDocumentElementEP9QWebFrame @ 738 NONAME

+	_ZN23DumpRenderTreeSupportQt20dumpEditingCallbacksEb @ 739 NONAME

+	_ZN23DumpRenderTreeSupportQt21markerTextForListItemERK11QWebElement @ 740 NONAME

+	_ZN23DumpRenderTreeSupportQt22javaScriptObjectsCountEv @ 741 NONAME

+	_ZN23DumpRenderTreeSupportQt23setCaretBrowsingEnabledEP8QWebPageb @ 742 NONAME

+	_ZN23DumpRenderTreeSupportQt24executeCoreCommandByNameEP8QWebPageRK7QStringS4_ @ 743 NONAME

+	_ZN23DumpRenderTreeSupportQt21dumpSetAcceptsEditingEb @ 744 NONAME

+	_ZN23DumpRenderTreeSupportQt22resumeActiveDOMObjectsEP9QWebFrame @ 745 NONAME

+	_ZN23DumpRenderTreeSupportQt23suspendActiveDOMObjectsEP9QWebFrame @ 746 NONAME

+	_ZN23DumpRenderTreeSupportQt24numberOfActiveAnimationsEP9QWebFrame @ 747 NONAME

+	_ZN23DumpRenderTreeSupportQt24pageNumberForElementByIdEP9QWebFrameRK7QStringff @ 748 NONAME

+	_ZN23DumpRenderTreeSupportQt25dumpResourceLoadCallbacksEb @ 749 NONAME

+	_ZN23DumpRenderTreeSupportQt25pauseTransitionOfPropertyEP9QWebFrameRK7QStringdS4_ @ 750 NONAME

+	_ZN23DumpRenderTreeSupportQt25setFrameFlatteningEnabledEP8QWebPageb @ 751 NONAME

+	_ZN23DumpRenderTreeSupportQt25webInspectorExecuteScriptEP8QWebPagelRK7QString @ 752 NONAME

+	_ZN23DumpRenderTreeSupportQt25whiteListAccessFromOriginERK7QStringS2_S2_b @ 753 NONAME

+	_ZN23DumpRenderTreeSupportQt26counterValueForElementByIdEP9QWebFrameRK7QString @ 754 NONAME

+	_ZN23DumpRenderTreeSupportQt26firstRectForCharacterRangeEP8QWebPageii @ 755 NONAME

+	_ZN23DumpRenderTreeSupportQt26overwritePluginDirectoriesEv @ 756 NONAME

+	_ZN23DumpRenderTreeSupportQt27resetOriginAccessWhiteListsEv @ 757 NONAME

+	_ZN23DumpRenderTreeSupportQt27setSmartInsertDeleteEnabledEP8QWebPageb @ 758 NONAME

+	_ZN23DumpRenderTreeSupportQt27setTimelineProfilingEnabledEP8QWebPageb @ 759 NONAME

+	_ZN23DumpRenderTreeSupportQt28setDumpRenderTreeModeEnabledEb @ 760 NONAME

+	_ZN23DumpRenderTreeSupportQt29dumpResourceLoadCallbacksPathERK7QString @ 761 NONAME

+	_ZN23DumpRenderTreeSupportQt29evaluateScriptInIsolatedWorldEP9QWebFrameiRK7QString @ 762 NONAME

+	_ZN23DumpRenderTreeSupportQt29setJavaScriptProfilingEnabledEP9QWebFrameb @ 763 NONAME

+	_ZN23DumpRenderTreeSupportQt29setWillSendRequestReturnsNullEb @ 764 NONAME

+	_ZN23DumpRenderTreeSupportQt30setWillSendRequestClearHeadersERK11QStringList @ 765 NONAME

+	_ZN23DumpRenderTreeSupportQt33computedStyleIncludingVisitedInfoERK11QWebElement @ 766 NONAME

+	_ZN23DumpRenderTreeSupportQt34setSelectTrailingWhitespaceEnabledEP8QWebPageb @ 767 NONAME

+	_ZN23DumpRenderTreeSupportQt39elementDoesAutoCompleteForElementWithIdEP9QWebFrameRK7QString @ 768 NONAME

+	_ZN23DumpRenderTreeSupportQt39setWillSendRequestReturnsNullOnRedirectEb @ 769 NONAME

+	_ZN23DumpRenderTreeSupportQt40garbageCollectorCollectOnAlternateThreadEb @ 770 NONAME

+	_ZN23DumpRenderTreeSupportQt40setDomainRelaxationForbiddenForURLSchemeEbRK7QString @ 771 NONAME

+	_ZN23DumpRenderTreeSupportQt18setEditingBehaviorEP8QWebPageRK7QString @ 772 NONAME

+	_ZN23DumpRenderTreeSupportQt24setNotificationsReceiverEP7QObject @ 773 NONAME ABSENT

+	_ZN23DumpRenderTreeSupportQt26allowNotificationForOriginERK7QString @ 774 NONAME ABSENT

+	_ZN23DumpRenderTreeSupportQt26setCheckPermissionFunctionEPFvP7QObjectRK4QUrlR22NotificationPermissionE @ 775 NONAME ABSENT

+	_ZN23DumpRenderTreeSupportQt28setRequestPermissionFunctionEPFvP7QObjectRK7QStringE @ 776 NONAME ABSENT

+	_ZN23DumpRenderTreeSupportQt31removeWhiteListAccessFromOriginERK7QStringS2_S2_b @ 777 NONAME

+	_ZN23DumpRenderTreeSupportQt11shouldCloseEP9QWebFrame @ 778 NONAME

+	_ZN23DumpRenderTreeSupportQt12isTargetItemERK15QWebHistoryItem @ 779 NONAME

+	_ZN23DumpRenderTreeSupportQt17historyItemTargetERK15QWebHistoryItem @ 780 NONAME

+	_ZN23DumpRenderTreeSupportQt20getChildHistoryItemsERK15QWebHistoryItem @ 781 NONAME

+	_ZN23DumpRenderTreeSupportQt23setMockGeolocationErrorEiRK7QString @ 782 NONAME ABSENT

+	_ZN23DumpRenderTreeSupportQt26setMockGeolocationPositionEddd @ 783 NONAME ABSENT

+	_ZN23DumpRenderTreeSupportQt17clearScriptWorldsEv @ 784 NONAME

+	_ZN23DumpRenderTreeSupportQt23setCustomPolicyDelegateEbb @ 785 NONAME

+	_ZN15QWebScriptWorldC1ERKS_ @ 786 NONAME

+	_ZN15QWebScriptWorldC1Ev @ 787 NONAME

+	_ZN15QWebScriptWorldC2ERKS_ @ 788 NONAME

+	_ZN15QWebScriptWorldC2Ev @ 789 NONAME

+	_ZN15QWebScriptWorldD1Ev @ 790 NONAME

+	_ZN15QWebScriptWorldD2Ev @ 791 NONAME

+	_ZN15QWebScriptWorldaSERKS_ @ 792 NONAME

+	_ZN23DumpRenderTreeSupportQt29dumpResourceResponseMIMETypesEb @ 793 NONAME

+	_ZN23DumpRenderTreeSupportQtC1Ev @ 794 NONAME

+	_ZN23DumpRenderTreeSupportQtC2Ev @ 795 NONAME

+	_ZN23DumpRenderTreeSupportQtD1Ev @ 796 NONAME

+	_ZN23DumpRenderTreeSupportQtD2Ev @ 797 NONAME

+	_ZN8QWebPage23allowGeolocationRequestEP9QWebFrame @ 798 NONAME ABSENT

+	_ZN8QWebPage23viewportChangeRequestedERKNS_13ViewportHintsE @ 799 NONAME ABSENT

+	_ZNK15QWebScriptWorld5worldEv @ 800 NONAME

+	_ZN16QGraphicsWebView13setDeviceSizeERK5QSize @ 801 NONAME ABSENT

+	_ZN23DumpRenderTreeSupportQt12pagePropertyEP9QWebFrameRK7QStringi @ 802 NONAME

+	_ZN23DumpRenderTreeSupportQt16isPageBoxVisibleEP9QWebFramei @ 803 NONAME

+	_ZN23DumpRenderTreeSupportQt16resumeAnimationsEP9QWebFrame @ 804 NONAME

+	_ZN23DumpRenderTreeSupportQt17addUserStyleSheetEP8QWebPageRK7QString @ 805 NONAME

+	_ZN23DumpRenderTreeSupportQt17suspendAnimationsEP9QWebFrame @ 806 NONAME

+	_ZN23DumpRenderTreeSupportQt26pageSizeAndMarginsInPixelsEP9QWebFrameiiiiiii @ 807 NONAME

+	_ZN23DumpRenderTreeSupportQt28setDeferMainResourceDataLoadEb @ 808 NONAME

+	_ZN8QWebPage17setUserPermissionEP9QWebFrameNS_16PermissionDomainENS_16PermissionPolicyE @ 809 NONAME ABSENT

+	_ZN8QWebPage23checkPermissionFromUserEP9QWebFrameNS_16PermissionDomainERNS_16PermissionPolicyE @ 810 NONAME ABSENT

+	_ZN8QWebPage25requestPermissionFromUserEP9QWebFrameNS_16PermissionDomainE @ 811 NONAME ABSENT

+	_ZN8QWebPage27cancelRequestsForPermissionEP9QWebFrameNS_16PermissionDomainE @ 812 NONAME ABSENT

+	_ZNK16QGraphicsWebView10deviceSizeEv @ 813 NONAME ABSENT

+	_ZN23DumpRenderTreeSupportQt14viewportAsTextEP8QWebPageRK5QSize @ 814 NONAME ABSENT

+	_ZN23DumpRenderTreeSupportQt32simulateDesktopNotificationClickERK7QString @ 815 NONAME

+	_ZN8QWebPage23viewportChangeRequestedEv @ 816 NONAME

+	_ZNK8QWebPage28viewportConfigurationForSizeERK5QSize @ 817 NONAME ABSENT

+	_ZN23DumpRenderTreeSupportQt20dumpHistoryCallbacksEb @ 818 NONAME

+	_ZN23DumpRenderTreeSupportQt25dumpVisitedLinksCallbacksEb @ 819 NONAME

+	_ZN23DumpRenderTreeSupportQt9plainTextERK8QVariant @ 820 NONAME

+	_ZNK8QWebPage25viewportAttributesForSizeERK5QSize @ 821 NONAME

+	_ZN8QWebPage18ViewportAttributesC1ERKS0_ @ 822 NONAME

+	_ZN8QWebPage18ViewportAttributesC1Ev @ 823 NONAME

+	_ZN8QWebPage18ViewportAttributesC2ERKS0_ @ 824 NONAME

+	_ZN8QWebPage18ViewportAttributesC2Ev @ 825 NONAME

+	_ZN8QWebPage18ViewportAttributesD1Ev @ 826 NONAME

+	_ZN8QWebPage18ViewportAttributesD2Ev @ 827 NONAME

+	_ZN8QWebPage18ViewportAttributesaSERKS0_ @ 828 NONAME

+	_ZN23DumpRenderTreeSupportQt13nodesFromRectERK11QWebElementiijjjjb @ 829 NONAME

+	_ZN23DumpRenderTreeSupportQt28dumpUserGestureInFrameLoaderEb @ 830 NONAME

+	_ZNK8QWebPage19supportsContentTypeERK7QString @ 831 NONAME

+	_ZNK8QWebPage21supportedContentTypesEv @ 832 NONAME

+	_ZNK8QWebPage27setActualVisibleContentRectERK5QRect @ 833 NONAME

+	_ZN8QWebPage20setFeaturePermissionEP9QWebFrameNS_7FeatureENS_16PermissionPolicyE @ 834 NONAME

+	_ZN8QWebPage26featurePermissionRequestedEP9QWebFrameNS_7FeatureE @ 835 NONAME

+	_ZN8QWebPage32featurePermissionRequestCanceledEP9QWebFrameNS_7FeatureE @ 836 NONAME

+	_Z33qtwebkit_setPluginCreatedCallbackPFvP9QWebFramePvS1_E @ 837 NONAME

+	_ZN23DumpRenderTreeSupportQt23setMockGeolocationErrorEP8QWebPageiRK7QString @ 838 NONAME

+	_ZN23DumpRenderTreeSupportQt26setMockGeolocationPositionEP8QWebPageddd @ 839 NONAME

+	_ZN23DumpRenderTreeSupportQt14viewportAsTextEP8QWebPageiRK5QSizeS4_ @ 840 NONAME

+	_ZN23DumpRenderTreeSupportQt26mediaContentUrlByElementIdEP9QWebFrameRK7QString @ 841 NONAME

+	_ZNK8QWebPage12hasSelectionEv @ 842 NONAME

+	_ZNK8QWebPage12selectedHtmlEv @ 843 NONAME

+	_ZN11QWebElement6renderEP8QPainterRK5QRect @ 844 NONAME

+	_ZN16QGraphicsWebView13setRenderHintEN8QPainter10RenderHintEb @ 845 NONAME

+	_ZN16QGraphicsWebView14setRenderHintsE6QFlagsIN8QPainter10RenderHintEE @ 846 NONAME

+	_ZNK16QGraphicsWebView11renderHintsEv @ 847 NONAME

+	_ZN18QWebSecurityOrigin24setApplicationCacheQuotaEx @ 848 NONAME

+	_ZN8QWebPage29applicationCacheQuotaExceededEP18QWebSecurityOriginy @ 849 NONAME

+	_ZNK8QWebView12hasSelectionEv @ 850 NONAME

+	_ZNK8QWebView12selectedHtmlEv @ 851 NONAME

+	_ZN23DumpRenderTreeSupportQt10findStringEP8QWebPageRK7QStringRK11QStringList @ 852 NONAME

+	_ZN23DumpRenderTreeSupportQt10shadowRootERK11QWebElement @ 853 NONAME

+	_ZN23DumpRenderTreeSupportQt11clearOpenerEP9QWebFrame @ 854 NONAME

+	_ZN23DumpRenderTreeSupportQt11contextMenuEP8QWebPage @ 855 NONAME

+	_ZN23DumpRenderTreeSupportQt13setAutofilledERK11QWebElementb @ 856 NONAME

+	_ZN23DumpRenderTreeSupportQt16addURLToRedirectERK7QStringS2_ @ 857 NONAME

+	_ZN23DumpRenderTreeSupportQt16ensureShadowRootERK11QWebElement @ 858 NONAME

+	_ZN23DumpRenderTreeSupportQt16removeShadowRootERK11QWebElement @ 859 NONAME

+	_ZN23DumpRenderTreeSupportQt16responseMimeTypeEP9QWebFrame @ 860 NONAME

+	_ZN23DumpRenderTreeSupportQt16setAlternateHtmlEP9QWebFrameRK7QStringRK4QUrlS7_ @ 861 NONAME

+	_ZN23DumpRenderTreeSupportQt20resetGeolocationMockEP8QWebPage @ 862 NONAME

+	_ZN23DumpRenderTreeSupportQt23setMinimumTimerIntervalEP8QWebPaged @ 863 NONAME

+	_ZN23DumpRenderTreeSupportQt24setMockDeviceOrientationEbdbdbd @ 864 NONAME

+	_ZN23DumpRenderTreeSupportQt25clearAllApplicationCachesEv @ 865 NONAME

+	_ZN23DumpRenderTreeSupportQt27defaultMinimumTimerIntervalEv @ 866 NONAME

+	_ZN23DumpRenderTreeSupportQt27removeMockDeviceOrientationEv @ 867 NONAME

+	_ZN23DumpRenderTreeSupportQt28setMockGeolocationPermissionEP8QWebPageb @ 868 NONAME

+	_ZN23DumpRenderTreeSupportQt33activeMockDeviceOrientationClientEb @ 869 NONAME

+	_ZN23DumpRenderTreeSupportQt44numberOfPendingGeolocationPermissionRequestsEP8QWebPage @ 870 NONAME

+	_ZN8QDRTNodeC1EPN7WebCore4NodeE @ 871 NONAME

+	_ZN8QDRTNodeC1ERKS_ @ 872 NONAME

+	_ZN8QDRTNodeC1Ev @ 873 NONAME

+	_ZN8QDRTNodeC2EPN7WebCore4NodeE @ 874 NONAME

+	_ZN8QDRTNodeC2ERKS_ @ 875 NONAME

+	_ZN8QDRTNodeC2Ev @ 876 NONAME

+	_ZN8QDRTNodeD1Ev @ 877 NONAME

+	_ZN8QDRTNodeD2Ev @ 878 NONAME

+	_ZN8QDRTNodeaSERKS_ @ 879 NONAME

+	_ZN23DumpRenderTreeSupportQt21injectInternalsObjectEP9QWebFrame @ 880 NONAME

+	_ZN23DumpRenderTreeSupportQt20resetInternalsObjectEP9QWebFrame @ 881 NONAME

+	_ZN23DumpRenderTreeSupportQt28dumpProgressFinishedCallbackEb @ 882 NONAME

diff --git a/src/3rdparty/webkit/Source/WebKit/qt/symbian/platformplugin/qss/OverlayWidget.qss b/src/3rdparty/webkit/Source/WebKit/qt/symbian/platformplugin/qss/OverlayWidget.qss
index b01d43f..2a4ee9d 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/symbian/platformplugin/qss/OverlayWidget.qss
+++ b/src/3rdparty/webkit/Source/WebKit/qt/symbian/platformplugin/qss/OverlayWidget.qss
@@ -1,59 +1,59 @@
-QSlider::groove {
-    border: 2px solid black;
-    border-radius: 5px;
-    background: white;
-}
-
-QSlider::handle {
-    border: 2px solid black;
-    border-radius: 8px;
-    background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #eee, stop:1 #ccc);
-}
-
-QSlider::add-page {
-    border: 2px solid black;
-    border-radius: 5px;
-}
-
-QSlider::sub-page {
-    border: 2px solid black;
-    border-radius: 5px;
-}
-
-QSlider::groove:horizontal { 
-    height: 10px;
-}
-
-QSlider::handle:horizontal {
-    width: 40px;
-    margin-top: -15px;
-    margin-bottom: -15px;
-}
-
-QSlider::add-page:horizontal {
-    height: 10px;
-    background: white;
-}
-
-QSlider::sub-page:horizontal {
-    height: 10px;
-    background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #eee, stop:1 #ccc);
-}
-
-QSlider::groove:vertical {
-    width: 10px;
-}
-
-QSlider::handle:vertical {
-    height: 40px; margin-left: -15px; margin-right: -15px;
-}
-
-QSlider::add-page:vertical {
-    width: 10px;
-    background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #eee, stop:1 #ccc);
-}
-
-QSlider::sub-page:vertical {
-    width: 10px;
-    background: white;
+QSlider::groove {

+    border: 2px solid black;

+    border-radius: 5px;

+    background: white;

+}

+

+QSlider::handle {

+    border: 2px solid black;

+    border-radius: 8px;

+    background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #eee, stop:1 #ccc);

+}

+

+QSlider::add-page {

+    border: 2px solid black;

+    border-radius: 5px;

+}

+

+QSlider::sub-page {

+    border: 2px solid black;

+    border-radius: 5px;

+}

+

+QSlider::groove:horizontal { 

+    height: 10px;

+}

+

+QSlider::handle:horizontal {

+    width: 40px;

+    margin-top: -15px;

+    margin-bottom: -15px;

+}

+

+QSlider::add-page:horizontal {

+    height: 10px;

+    background: white;

+}

+

+QSlider::sub-page:horizontal {

+    height: 10px;

+    background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #eee, stop:1 #ccc);

+}

+

+QSlider::groove:vertical {

+    width: 10px;

+}

+

+QSlider::handle:vertical {

+    height: 40px; margin-left: -15px; margin-right: -15px;

+}

+

+QSlider::add-page:vertical {

+    width: 10px;

+    background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #eee, stop:1 #ccc);

+}

+

+QSlider::sub-page:vertical {

+    width: 10px;

+    background: white;

 }
\ No newline at end of file
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/tests/MIMESniffing/resources/application_postscript b/src/3rdparty/webkit/Source/WebKit/qt/tests/MIMESniffing/resources/application_postscript
index 41107c3..c4b9ae6 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/tests/MIMESniffing/resources/application_postscript
+++ b/src/3rdparty/webkit/Source/WebKit/qt/tests/MIMESniffing/resources/application_postscript
@@ -1,137 +1,137 @@
-%!PS-Adobe-2.0 EPSF-1.2
-%%Creator: HiJaak 2.1
-%%CreationDate: 12/29/93 13:52:08
-%%BoundingBox:126 216 486 576
-%%EndComments
-/ld {load def} bind def
-/s /stroke ld /f /fill ld /m /moveto ld /l /lineto ld /c /curveto ld /rgb {255 div 3 1 roll 255 div 3 1 roll 255 div 3 1 roll setrgbcolor} def
-126 216 translate
-360.0000 360.0000 scale
-/picstr 124 string def
-124 124 8 [124 0 0 -124 0 124] {currentfile picstr readhexstring pop} image
-65656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565ADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADAD1B1B1B1B1B1B1B1B1B1BFF
-65656565656565656565656565656565656565656565656565656565656565006565656565006565656500656565656565000000656565656565656565656565656565656565656565656565656565656565ADADAD00ADADAD000000ADAD00ADADADADAD00AD00ADADADAD00ADADADAD00000000001B1B001B1B1BFF
-65656565656565656565656565656565656565656565656565656565656565000065656500006565650065006565656500656565006565656565656565656565656565656565656565656565656565656565ADADAD00ADAD00ADADAD00ADAD00ADADAD00ADAD0000ADADAD00ADADADAD001B1B1B1B001B001B1B1BFF
-65656565656565656565656565656565656565656565656565656565656565000065656500006565650065006565650065656565650065656565656565656565656565656565656565656565656565656565ADADAD00AD00ADADADADADADAD00ADADAD00ADAD00AD00ADAD00ADADADAD001B1B1B1B001B001B1B1BFF
-65656565656565656565656565656565656565656565656565656565656565006500650065006565650065006565650065656565656565656565656565656565656565656565656565656565656565656565ADADAD00AD00ADADADADADADADAD00AD00ADADAD00AD00ADAD00ADADADAD00000000001B1B001B1B1BFF
-65656565656565656565656565656565656565656565656565656565656565006500650065006565006565650065650065656500000065656565656565656565656565656565656565656565656565656565ADADAD00AD00ADADADADADADADADAD00ADADADAD00ADAD00AD00ADADADAD001B1B1B1B001B001B1B1BFF
-65656565656565656565656565656565656565656565656565656565656565006500650065006565000000000065650065656565650065656565656565656565656565656565656565656565656565656565ADADAD00AD00ADADADADADADADADAD00ADADADAD00ADAD00AD00ADADADAD001B1B1B1B001B001B1B1BFF
-65656565656565656565656565656565656565656565656565656565656565006565006565006500656565656500656500656565006565656565656565656565656565656565656565656565656565656565ADADAD00ADAD00ADADAD00ADADADAD00ADADADAD00ADADAD0000ADADADAD001B1B1B1B001B001B1B1BFF
-65656565656565656565656565656565656565656565656565656565656565006565006565006500656565656500656565000000656565656565656565656565656565656565656565656565656565656565ADADAD00ADADAD000000ADADADADAD00ADADADAD00ADADADAD00ADADADAD00000000001B1B00000000FF
-65656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565ADADAD00ADADADADADADADADADADADADADADADADADADADADADADADADADADAD1B1B1B1B1B1B1B1B1B1BFF
-65656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565ADADAD00ADADADADADADADADADADADADADADADADADADADADADADADADADADAD1B1B1B1B1B1B1B1B1B1BFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC0000DCDC0000DC0000000000DC0000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292000000009292000000000092920000929200009292929292ADADADAD00000000ADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC0000DCDC0000DC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929200009292000092000092920000920000929200009292929292ADADAD0000ADAD0000ADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC00DCDC00DCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292920000929292929292000092920000920000009200009292929292ADAD0000ADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC00000000DCDC0000000000DC0000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292920000929292929292000092920000920000009200009292929292ADAD0000ADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC0000DCDCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292920000929200000092000000000092920000920000009292929292ADAD0000ADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC0000DCDCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292920000929292000092000092000092920000920000009292929292ADAD0000ADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC0000DCDCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929200009292000092000092920000920000929200009292929292ADADAD0000ADAD0000ADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC0000DCDCDC0000000000DC000000000000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292000000009292000092929200000000929200009292929292ADADADAD00000000ADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00000000004A4A00000000004A00000000004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDC0000DCDC0000DC0000000000DC0000DCDCDCDCDCDCDCDCDCDCDC00000065656500000065FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00004A4A00004A00004A4A4A4A00004A4A00004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDC0000DCDC0000DC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDC00000065656500000065FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00004A4A00004A00004A4A4A4A00004A4A00004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDC00DCDC00DCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDC00000000650000000065FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00004A4A00004A00000000004A00004A4A00004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDC00000000DCDC0000000000DC0000DCDCDCDCDCDCDCDCDCDCDC00000000650000000065FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00000000004A4A00004A4A4A4A00004A4A00004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDC0000DCDCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDC00006500650065000065FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00004A00004A4A00004A4A4A4A00004A4A00004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDC0000DCDCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDC00006500000065000065FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00004A4A00004A00004A4A4A4A00004A4A00004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDC0000DCDCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDC00006500000065000065FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00004A4A4A000000000000004A00000000004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDC0000DCDCDC0000000000DC000000000000DCDCDCDCDCDCDC00006565006565000065FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A00000000004A4A4A4A0000004A4A4A00000000004A4A4A4A004A4A4A4A4A00000000004A00000000004A00000000004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A004A4A4A4A004A4A004A4A4A004A4A4A4A004A4A4A4A4A4A004A4A4A4A4A004A4A4A4A4A004A4A4A4A4A4A4A004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A004A4A4A4A004A004A4A4A4A4A004A4A4A004A4A4A4A4A4A004A4A4A4A4A004A4A4A4A4A004A4A4A4A4A4A4A004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A00000000004A4A004A4A4A4A4A004A4A4A004A4A4A4A4A4A004A4A4A4A4A00000000004A000000004A4A4A4A004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A004A4A4A4A004A004A4A4A4A4A004A4A4A004A4A4A4A4A4A004A4A4A4A4A004A4A4A4A4A004A4A4A4A4A4A4A004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A004A4A4A4A004A004A4A4A4A4A004A4A4A004A4A4A4A4A4A004A4A4A4A4A004A4A4A4A4A004A4A4A4A4A4A4A004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A004A4A4A4A004A4A004A4A4A004A4A4A4A004A4A4A4A4A4A004A4A4A4A4A004A4A4A4A4A004A4A4A4A4A4A4A004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A00000000004A4A4A4A0000004A4A4A4A4A004A4A4A4A4A4A00000000004A00000000004A004A4A4A4A4A4A4A004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF
-showpage
+%!PS-Adobe-2.0 EPSF-1.2

+%%Creator: HiJaak 2.1

+%%CreationDate: 12/29/93 13:52:08

+%%BoundingBox:126 216 486 576

+%%EndComments

+/ld {load def} bind def

+/s /stroke ld /f /fill ld /m /moveto ld /l /lineto ld /c /curveto ld /rgb {255 div 3 1 roll 255 div 3 1 roll 255 div 3 1 roll setrgbcolor} def

+126 216 translate

+360.0000 360.0000 scale

+/picstr 124 string def

+124 124 8 [124 0 0 -124 0 124] {currentfile picstr readhexstring pop} image

+65656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565ADADADADADADADADADADADADADADADADADADADADADADADADADADADADADADAD1B1B1B1B1B1B1B1B1B1BFF

+65656565656565656565656565656565656565656565656565656565656565006565656565006565656500656565656565000000656565656565656565656565656565656565656565656565656565656565ADADAD00ADADAD000000ADAD00ADADADADAD00AD00ADADADAD00ADADADAD00000000001B1B001B1B1BFF

+65656565656565656565656565656565656565656565656565656565656565000065656500006565650065006565656500656565006565656565656565656565656565656565656565656565656565656565ADADAD00ADAD00ADADAD00ADAD00ADADAD00ADAD0000ADADAD00ADADADAD001B1B1B1B001B001B1B1BFF

+65656565656565656565656565656565656565656565656565656565656565000065656500006565650065006565650065656565650065656565656565656565656565656565656565656565656565656565ADADAD00AD00ADADADADADADAD00ADADAD00ADAD00AD00ADAD00ADADADAD001B1B1B1B001B001B1B1BFF

+65656565656565656565656565656565656565656565656565656565656565006500650065006565650065006565650065656565656565656565656565656565656565656565656565656565656565656565ADADAD00AD00ADADADADADADADAD00AD00ADADAD00AD00ADAD00ADADADAD00000000001B1B001B1B1BFF

+65656565656565656565656565656565656565656565656565656565656565006500650065006565006565650065650065656500000065656565656565656565656565656565656565656565656565656565ADADAD00AD00ADADADADADADADADAD00ADADADAD00ADAD00AD00ADADADAD001B1B1B1B001B001B1B1BFF

+65656565656565656565656565656565656565656565656565656565656565006500650065006565000000000065650065656565650065656565656565656565656565656565656565656565656565656565ADADAD00AD00ADADADADADADADADAD00ADADADAD00ADAD00AD00ADADADAD001B1B1B1B001B001B1B1BFF

+65656565656565656565656565656565656565656565656565656565656565006565006565006500656565656500656500656565006565656565656565656565656565656565656565656565656565656565ADADAD00ADAD00ADADAD00ADADADAD00ADADADAD00ADADAD0000ADADADAD001B1B1B1B001B001B1B1BFF

+65656565656565656565656565656565656565656565656565656565656565006565006565006500656565656500656565000000656565656565656565656565656565656565656565656565656565656565ADADAD00ADADAD000000ADADADADAD00ADADADAD00ADADADAD00ADADADAD00000000001B1B00000000FF

+65656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565ADADAD00ADADADADADADADADADADADADADADADADADADADADADADADADADADAD1B1B1B1B1B1B1B1B1B1BFF

+65656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565656565ADADAD00ADADADADADADADADADADADADADADADADADADADADADADADADADADAD1B1B1B1B1B1B1B1B1B1BFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC0000DCDC0000DC0000000000DC0000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292000000009292000000000092920000929200009292929292ADADADAD00000000ADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC0000DCDC0000DC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929200009292000092000092920000920000929200009292929292ADADAD0000ADAD0000ADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC00DCDC00DCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292920000929292929292000092920000920000009200009292929292ADAD0000ADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC00000000DCDC0000000000DC0000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292920000929292929292000092920000920000009200009292929292ADAD0000ADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC0000DCDCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292920000929200000092000000000092920000920000009292929292ADAD0000ADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC0000DCDCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292920000929292000092000092000092920000920000009292929292ADAD0000ADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC0000DCDCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929200009292000092000092920000920000929200009292929292ADADAD0000ADAD0000ADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC0000DCDCDC0000000000DC000000000000DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292000000009292000092929200000000929200009292929292ADADADAD00000000ADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+DCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC92929292929292929292929292929292929292929292929292929292929292ADADADADADADADADADADFF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00000000004A4A00000000004A00000000004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDC0000DCDC0000DC0000000000DC0000DCDCDCDCDCDCDCDCDCDCDC00000065656500000065FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00004A4A00004A00004A4A4A4A00004A4A00004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDC0000DCDC0000DC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDC00000065656500000065FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00004A4A00004A00004A4A4A4A00004A4A00004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDC00DCDC00DCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDC00000000650000000065FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00004A4A00004A00000000004A00004A4A00004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDC00000000DCDC0000000000DC0000DCDCDCDCDCDCDCDCDCDCDC00000000650000000065FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00000000004A4A00004A4A4A4A00004A4A00004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDC0000DCDCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDC00006500650065000065FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00004A00004A4A00004A4A4A4A00004A4A00004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDC0000DCDCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDC00006500000065000065FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00004A4A00004A00004A4A4A4A00004A4A00004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDC0000DCDCDC0000DCDCDCDC0000DCDCDCDCDCDCDCDCDCDCDC00006500000065000065FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A00004A4A4A000000000000004A00000000004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDC0000DCDCDC0000000000DC000000000000DCDCDCDCDCDCDC00006565006565000065FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A00000000004A4A4A4A0000004A4A4A00000000004A4A4A4A004A4A4A4A4A00000000004A00000000004A00000000004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A004A4A4A4A004A4A004A4A4A004A4A4A4A004A4A4A4A4A4A004A4A4A4A4A004A4A4A4A4A004A4A4A4A4A4A4A004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A004A4A4A4A004A004A4A4A4A4A004A4A4A004A4A4A4A4A4A004A4A4A4A4A004A4A4A4A4A004A4A4A4A4A4A4A004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A00000000004A4A004A4A4A4A4A004A4A4A004A4A4A4A4A4A004A4A4A4A4A00000000004A000000004A4A4A4A004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A004A4A4A4A004A004A4A4A4A4A004A4A4A004A4A4A4A4A4A004A4A4A4A4A004A4A4A4A4A004A4A4A4A4A4A4A004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A004A4A4A4A004A004A4A4A4A4A004A4A4A004A4A4A4A4A4A004A4A4A4A4A004A4A4A4A4A004A4A4A4A4A4A4A004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A004A4A4A4A004A4A004A4A4A004A4A4A4A004A4A4A4A4A4A004A4A4A4A4A004A4A4A4A4A004A4A4A4A4A4A4A004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A00000000004A4A4A4A0000004A4A4A4A4A004A4A4A4A4A4A00000000004A00000000004A004A4A4A4A4A4A4A004A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4A4ADCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDCDC65656565656565656565FF

+showpage

 
\ No newline at end of file
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/tests/MIMESniffing/resources/text_xml b/src/3rdparty/webkit/Source/WebKit/qt/tests/MIMESniffing/resources/text_xml
index dd4f6fd..38a9fe5 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/tests/MIMESniffing/resources/text_xml
+++ b/src/3rdparty/webkit/Source/WebKit/qt/tests/MIMESniffing/resources/text_xml
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<CATALOG>
-	<CD>
-		<TITLE>Empire Burlesque</TITLE>
-		<ARTIST>Bob Dylan</ARTIST>
-		<COUNTRY>USA</COUNTRY>
-		<COMPANY>Columbia</COMPANY>
-		<PRICE>10.90</PRICE>
-		<YEAR>1985</YEAR>
-	</CD>
-	<CD>
-		<TITLE>Unchain my heart</TITLE>
-		<ARTIST>Joe Cocker</ARTIST>
-		<COUNTRY>USA</COUNTRY>
-		<COMPANY>EMI</COMPANY>
-		<PRICE>8.20</PRICE>
-		<YEAR>1987</YEAR>
-	</CD>
-</CATALOG>
+<?xml version="1.0" encoding="ISO-8859-1"?>

+<CATALOG>

+	<CD>

+		<TITLE>Empire Burlesque</TITLE>

+		<ARTIST>Bob Dylan</ARTIST>

+		<COUNTRY>USA</COUNTRY>

+		<COMPANY>Columbia</COMPANY>

+		<PRICE>10.90</PRICE>

+		<YEAR>1985</YEAR>

+	</CD>

+	<CD>

+		<TITLE>Unchain my heart</TITLE>

+		<ARTIST>Joe Cocker</ARTIST>

+		<COUNTRY>USA</COUNTRY>

+		<COMPANY>EMI</COMPANY>

+		<PRICE>8.20</PRICE>

+		<YEAR>1987</YEAR>

+	</CD>

+</CATALOG>

diff --git a/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/resources/testiframe.html b/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/resources/testiframe.html
index 4b0e30c..ee0f64d 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/resources/testiframe.html
+++ b/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/resources/testiframe.html
@@ -1,53 +1,53 @@
-<html>
-<head>
-<title></title>
-<style type="text/css">
-<!--
-#header {
-  background: #0f0;
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  width: 800px;
-  height: 100px;
-}
-#content1 {
-  background: #ff0;
-  position: absolute;
-  top: 101px;
-  left: 0px;
-  width: 400px;
-  height: 400px;
-  overflow: scroll;
-}
-#content2 {
-  background: #ff7;
-  position: absolute;
-  top: 101px;
-  left: 401px;
-  width: 400px;
-  height: 400px;
-}
-#footer {
-  background: #0f0;
-  position: absolute;
-  top: 502px;
-  left: 0px;
-  width: 800px;
-  height: 200px;
-}
--->
-</style>
-</head>
-<body>
-<div id="header"></div>
-<div id="content1">You can use the overflow property when you want to have better control of the layout. Try to change the overflow property to: visible, hidden, auto, or inherit and see what happens. The default value is visible.
-You can use the overflow property when you want to have better control of the layout. Try to change the overflow property to: visible, hidden, auto, or inherit and see what happens. The default value is visible.
-You can use the overflow property when you want to have better control of the layout. Try to change the overflow property to: visible, hidden, auto, or inherit and see what happens. The default value is visible.
-You can use the overflow property when you want to have better control of the layout. Try to change the overflow property to: visible, hidden, auto, or inherit and see what happens. The default value is visible.
-You can use the overflow property when you want to have better control of the layout. Try to change the overflow property to: visible, hidden, auto, or inherit and see what happens. The default value is visible.
-You can use the overflow property when you want to have better control of the layout. Try to change the overflow property to: visible, hidden, auto, or inherit and see what happens. The default value is visible.</div>
-<iframe id="content2" name="control" src="testiframe2.html"> </iframe>
-<div id="footer"></div>
-</body>
+<html>

+<head>

+<title></title>

+<style type="text/css">

+<!--

+#header {

+  background: #0f0;

+  position: absolute;

+  top: 0px;

+  left: 0px;

+  width: 800px;

+  height: 100px;

+}

+#content1 {

+  background: #ff0;

+  position: absolute;

+  top: 101px;

+  left: 0px;

+  width: 400px;

+  height: 400px;

+  overflow: scroll;

+}

+#content2 {

+  background: #ff7;

+  position: absolute;

+  top: 101px;

+  left: 401px;

+  width: 400px;

+  height: 400px;

+}

+#footer {

+  background: #0f0;

+  position: absolute;

+  top: 502px;

+  left: 0px;

+  width: 800px;

+  height: 200px;

+}

+-->

+</style>

+</head>

+<body>

+<div id="header"></div>

+<div id="content1">You can use the overflow property when you want to have better control of the layout. Try to change the overflow property to: visible, hidden, auto, or inherit and see what happens. The default value is visible.

+You can use the overflow property when you want to have better control of the layout. Try to change the overflow property to: visible, hidden, auto, or inherit and see what happens. The default value is visible.

+You can use the overflow property when you want to have better control of the layout. Try to change the overflow property to: visible, hidden, auto, or inherit and see what happens. The default value is visible.

+You can use the overflow property when you want to have better control of the layout. Try to change the overflow property to: visible, hidden, auto, or inherit and see what happens. The default value is visible.

+You can use the overflow property when you want to have better control of the layout. Try to change the overflow property to: visible, hidden, auto, or inherit and see what happens. The default value is visible.

+You can use the overflow property when you want to have better control of the layout. Try to change the overflow property to: visible, hidden, auto, or inherit and see what happens. The default value is visible.</div>

+<iframe id="content2" name="control" src="testiframe2.html"> </iframe>

+<div id="footer"></div>

+</body>

 </html>
\ No newline at end of file
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/resources/testiframe2.html b/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/resources/testiframe2.html
index 8957a5d..483e94e 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/resources/testiframe2.html
+++ b/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/resources/testiframe2.html
@@ -1,20 +1,20 @@
-<html>
-<head>
-<title></title>
-<style type="text/css">
-<!--
-#content {
-  background: #fff;
-  position: absolute;
-  top: 0px;
-  left: 0px;
-  width: 800px;
-  height: 800px;
-}
--->
-</style>
-</head>
-<body>
-<div id="content"> </div>
-</body>
+<html>

+<head>

+<title></title>

+<style type="text/css">

+<!--

+#content {

+  background: #fff;

+  position: absolute;

+  top: 0px;

+  left: 0px;

+  width: 800px;

+  height: 800px;

+}

+-->

+</style>

+</head>

+<body>

+<div id="content"> </div>

+</body>

 </html>
\ No newline at end of file
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp b/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
index f2bdcee..c9e862a 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebframe/tst_qwebframe.cpp
@@ -649,7 +649,7 @@ private slots:
     void setContent_data();
     void setContent();
     void setCacheLoadControlAttribute();
-    //void setUrlWithPendingLoads();
+    void setUrlWithPendingLoads();
     void setUrlWithFragment_data();
     void setUrlWithFragment();
     void setUrlToEmpty();
@@ -658,6 +658,9 @@ private slots:
     void setUrlSameUrl();
     void setUrlThenLoads_data();
     void setUrlThenLoads();
+    void loadFinishedAfterNotFoundError();
+    void loadInSignalHandlers_data();
+    void loadInSignalHandlers();
 
 private:
     QString  evalJS(const QString&s) {
@@ -2301,6 +2304,8 @@ class FakeReply : public QNetworkReply {
     Q_OBJECT
 
 public:
+    static const QUrl urlFor404ErrorWithoutContents;
+
     FakeReply(const QNetworkRequest& request, QObject* parent = 0)
         : QNetworkReply(parent)
     {
@@ -2320,6 +2325,10 @@ public:
         else if (request.url().host() == QLatin1String("abcdef.abcdef")) {
             setError(QNetworkReply::HostNotFoundError, tr("Invalid URL"));
             QTimer::singleShot(0, this, SLOT(continueError()));
+        } else if (request.url() == FakeReply::urlFor404ErrorWithoutContents) {
+            setError(QNetworkReply::ContentNotFoundError, "Not found");
+            setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 404);
+            QTimer::singleShot(0, this, SLOT(continueError()));
         }
 
         open(QIODevice::ReadOnly);
@@ -2351,6 +2360,8 @@ private slots:
     }
 };
 
+const QUrl FakeReply::urlFor404ErrorWithoutContents = QUrl("http://this.will/return-http-404-error-without-contents.html");
+
 class FakeNetworkManager : public QNetworkAccessManager {
     Q_OBJECT
 
@@ -2362,17 +2373,17 @@ protected:
     {
         QString url = request.url().toString();
         if (op == QNetworkAccessManager::GetOperation) {
-            if (url == "qrc:/test1.html" ||  url == "http://abcdef.abcdef/")
-                return new FakeReply(request, this);
 #ifndef QT_NO_OPENSSL
-            else if (url == "qrc:/fake-ssl-error.html") {
+            if (url == "qrc:/fake-ssl-error.html") {
                 FakeReply* reply = new FakeReply(request, this);
                 QList<QSslError> errors;
                 emit sslErrors(reply, errors << QSslError(QSslError::UnspecifiedError));
                 return reply;
             }
 #endif
-       }
+            if (url == "qrc:/test1.html" || url == "http://abcdef.abcdef/" || request.url() == FakeReply::urlFor404ErrorWithoutContents)
+                return new FakeReply(request, this);
+        }
 
         return QNetworkAccessManager::createRequest(op, request, outgoingData);
     }
@@ -2502,9 +2513,7 @@ void tst_QWebFrame::setHtmlWithResource()
     QCOMPARE(spy.count(), 1);
 
     QCOMPARE(frame->evaluateJavaScript("document.images.length").toInt(), 1);
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=63235", Continue);
     QCOMPARE(frame->evaluateJavaScript("document.images[0].width").toInt(), 128);
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=63235", Continue);
     QCOMPARE(frame->evaluateJavaScript("document.images[0].height").toInt(), 128);
 
     QString html2 =
@@ -2523,7 +2532,6 @@ void tst_QWebFrame::setHtmlWithResource()
     QCOMPARE(spy.size(), 2);
 
     QWebElement p = frame->documentElement().findAll("p").at(0);
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=63235", Continue);
     QCOMPARE(p.styleProperty("color", QWebElement::CascadedStyle), QLatin1String("red"));
 }
 
@@ -2898,7 +2906,10 @@ void tst_QWebFrame::renderGeometry()
     QList<QWebFrame*> frames = page.mainFrame()->childFrames();
     QWebFrame *frame = frames.at(0);
     QString innerHtml("<body style='margin: 0px;'><img src='qrc:/image.png'/></body>");
-    frame->setHtml(innerHtml);
+
+    // By default, only security origins of local files can load local resources.
+    // So we should specify baseUrl to be a local file in order to get a proper origin.
+    frame->setHtml(innerHtml, QUrl("file:///path/to/file"));
     waitForSignal(frame, SIGNAL(loadFinished(bool)), 200);
 
     QPicture picture;
@@ -2911,9 +2922,7 @@ void tst_QWebFrame::renderGeometry()
     frame->render(&painter1, QWebFrame::ContentsLayer);
     painter1.end();
 
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=63236", Continue);
     QCOMPARE(size.width(), picture.boundingRect().width() + frame->scrollBarGeometry(Qt::Vertical).width());
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=63236", Continue);
     QCOMPARE(size.height(), picture.boundingRect().height() + frame->scrollBarGeometry(Qt::Horizontal).height());
 
     // render everything, should be the size of the iframe
@@ -2921,9 +2930,7 @@ void tst_QWebFrame::renderGeometry()
     frame->render(&painter2, QWebFrame::AllLayers);
     painter2.end();
 
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=63236", Continue);
     QCOMPARE(size.width(), picture.boundingRect().width());   // width: 100px
-    QEXPECT_FAIL("", "https://bugs.webkit.org/show_bug.cgi?id=63236", Continue);
     QCOMPARE(size.height(), picture.boundingRect().height()); // height: 100px
 }
 
@@ -3359,16 +3366,12 @@ void tst_QWebFrame::webElementSlotOnly()
     QCOMPARE(evalJS("myWebElementSlotObject.tagName"), QString("BODY"));
 }
 
-// [Qt] Fix tst_QWebFrame::setUrlWithPendingLoads() API test
-// https://bugs.webkit.org/show_bug.cgi?id=63237
-/*
 void tst_QWebFrame::setUrlWithPendingLoads()
 {
     QWebPage page;
     page.mainFrame()->setHtml("<img src='dummy:'/>");
     page.mainFrame()->setUrl(QUrl("about:blank"));
 }
-*/
 
 void tst_QWebFrame::setUrlWithFragment_data()
 {
@@ -3658,5 +3661,113 @@ void tst_QWebFrame::setUrlThenLoads()
     QCOMPARE(frame->baseUrl(), extractBaseUrl(urlToLoad2));
 }
 
+void tst_QWebFrame::loadFinishedAfterNotFoundError()
+{
+    QWebPage page;
+    QWebFrame* frame = page.mainFrame();
+
+    QSignalSpy spy(&page, SIGNAL(loadFinished(bool)));
+    FakeNetworkManager* networkManager = new FakeNetworkManager(&page);
+    page.setNetworkAccessManager(networkManager);
+
+    frame->setUrl(FakeReply::urlFor404ErrorWithoutContents);
+    QTRY_COMPARE(spy.count(), 1);
+    const bool wasLoadOk = spy.at(0).at(0).toBool();
+    QVERIFY(!wasLoadOk);
+}
+
+class URLSetter : public QObject {
+    Q_OBJECT
+
+public:
+    enum Signal {
+        LoadStarted,
+        LoadFinished,
+        ProvisionalLoad
+    };
+
+    enum Type {
+        UseLoad,
+        UseSetUrl
+    };
+
+    URLSetter(QWebFrame*, Signal, Type, const QUrl&);
+
+public slots:
+    void execute();
+
+signals:
+    void finished();
+
+private:
+    QWebFrame* m_frame;
+    QUrl m_url;
+    Type m_type;
+};
+
+Q_DECLARE_METATYPE(URLSetter::Signal)
+Q_DECLARE_METATYPE(URLSetter::Type)
+
+URLSetter::URLSetter(QWebFrame* frame, Signal signal, URLSetter::Type type, const QUrl& url)
+    : m_frame(frame), m_url(url), m_type(type)
+{
+    if (signal == LoadStarted)
+        connect(m_frame, SIGNAL(loadStarted()), SLOT(execute()));
+    else if (signal == LoadFinished)
+        connect(m_frame, SIGNAL(loadFinished(bool)), SLOT(execute()));
+    else
+        connect(m_frame, SIGNAL(provisionalLoad()), SLOT(execute()));
+}
+
+void URLSetter::execute()
+{
+    // We track only the first emission.
+    m_frame->disconnect(this);
+    if (m_type == URLSetter::UseLoad)
+        m_frame->load(m_url);
+    else
+        m_frame->setUrl(m_url);
+    connect(m_frame, SIGNAL(loadFinished(bool)), SIGNAL(finished()));
+}
+
+void tst_QWebFrame::loadInSignalHandlers_data()
+{
+    QTest::addColumn<URLSetter::Type>("type");
+    QTest::addColumn<URLSetter::Signal>("signal");
+    QTest::addColumn<QUrl>("url");
+
+    const QUrl validUrl("qrc:/test2.html");
+    const QUrl invalidUrl("qrc:/invalid");
+
+    QTest::newRow("call load() in loadStarted() after valid url") << URLSetter::UseLoad << URLSetter::LoadStarted << validUrl;
+    QTest::newRow("call load() in loadStarted() after invalid url") << URLSetter::UseLoad << URLSetter::LoadStarted << invalidUrl;
+    QTest::newRow("call load() in loadFinished() after valid url") << URLSetter::UseLoad << URLSetter::LoadFinished << validUrl;
+    QTest::newRow("call load() in loadFinished() after invalid url") << URLSetter::UseLoad << URLSetter::LoadFinished << invalidUrl;
+    QTest::newRow("call load() in provisionalLoad() after valid url") << URLSetter::UseLoad << URLSetter::ProvisionalLoad << validUrl;
+    QTest::newRow("call load() in provisionalLoad() after invalid url") << URLSetter::UseLoad << URLSetter::ProvisionalLoad << invalidUrl;
+
+    QTest::newRow("call setUrl() in loadStarted() after valid url") << URLSetter::UseSetUrl << URLSetter::LoadStarted << validUrl;
+    QTest::newRow("call setUrl() in loadStarted() after invalid url") << URLSetter::UseSetUrl << URLSetter::LoadStarted << invalidUrl;
+    QTest::newRow("call setUrl() in loadFinished() after valid url") << URLSetter::UseSetUrl << URLSetter::LoadFinished << validUrl;
+    QTest::newRow("call setUrl() in loadFinished() after invalid url") << URLSetter::UseSetUrl << URLSetter::LoadFinished << invalidUrl;
+    QTest::newRow("call setUrl() in provisionalLoad() after valid url") << URLSetter::UseSetUrl << URLSetter::ProvisionalLoad << validUrl;
+    QTest::newRow("call setUrl() in provisionalLoad() after invalid url") << URLSetter::UseSetUrl << URLSetter::ProvisionalLoad << invalidUrl;
+}
+
+void tst_QWebFrame::loadInSignalHandlers()
+{
+    QFETCH(URLSetter::Type, type);
+    QFETCH(URLSetter::Signal, signal);
+    QFETCH(QUrl, url);
+
+    QWebFrame* frame = m_page->mainFrame();
+    const QUrl urlForSetter("qrc:/test1.html");
+    URLSetter setter(frame, signal, type, urlForSetter);
+
+    frame->load(url);
+    waitForSignal(&setter, SIGNAL(finished()), 200);
+    QCOMPARE(frame->url(), urlForSetter);
+}
+
 QTEST_MAIN(tst_QWebFrame)
 #include "tst_qwebframe.moc"
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 359ef05..6102102 100644
--- a/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/src/3rdparty/webkit/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -28,6 +28,7 @@
 #include <QMainWindow>
 #include <QMenu>
 #include <QPushButton>
+#include <QStateMachine>
 #include <QStyle>
 #include <QtTest/QtTest>
 #include <QTextCharFormat>
@@ -130,6 +131,7 @@ private slots:
     void errorPageExtension();
     void errorPageExtensionInIFrames();
     void errorPageExtensionInFrameset();
+    void errorPageExtensionLoadFinished();
     void userAgentApplicationName();
 
     void viewModes();
@@ -154,6 +156,8 @@ private slots:
     void navigatorCookieEnabled();
     void deleteQWebViewTwice();
     void renderOnRepaintRequestedShouldNotRecurse();
+    void loadSignalsOrder_data();
+    void loadSignalsOrder();
 
 #ifdef Q_OS_MAC
     void macCopyUnicodeToClipboard();
@@ -2572,6 +2576,35 @@ void tst_QWebPage::errorPageExtensionInFrameset()
     m_view->setPage(0);
 }
 
+void tst_QWebPage::errorPageExtensionLoadFinished()
+{
+    ErrorPage page;
+    m_view->setPage(&page);
+
+    QSignalSpy spyLoadFinished(m_view, SIGNAL(loadFinished(bool)));
+    QSignalSpy spyFrameLoadFinished(m_view->page()->mainFrame(), SIGNAL(loadFinished(bool)));
+
+    m_view->setUrl(QUrl("data:text/html,foo"));
+    QTRY_COMPARE(spyLoadFinished.count(), 1);
+    QTRY_COMPARE(spyFrameLoadFinished.count(), 1);
+
+    const bool loadSucceded = spyLoadFinished.at(0).at(0).toBool();
+    QVERIFY(loadSucceded);
+    const bool frameLoadSucceded = spyFrameLoadFinished.at(0).at(0).toBool();
+    QVERIFY(frameLoadSucceded);
+
+    m_view->page()->mainFrame()->setUrl(QUrl("http://non.existent/url"));
+    QTRY_COMPARE(spyLoadFinished.count(), 2);
+    QTRY_COMPARE(spyFrameLoadFinished.count(), 2);
+
+    const bool nonExistantLoadSucceded = spyLoadFinished.at(1).at(0).toBool();
+    QVERIFY(nonExistantLoadSucceded);
+    const bool nonExistantFrameLoadSucceded = spyFrameLoadFinished.at(1).at(0).toBool();
+    QVERIFY(nonExistantFrameLoadSucceded);
+
+    m_view->setPage(0);
+}
+
 class FriendlyWebPage : public QWebPage
 {
 public:
@@ -3035,5 +3068,57 @@ void tst_QWebPage::renderOnRepaintRequestedShouldNotRecurse()
     QVERIFY(::waitForSignal(&r, SIGNAL(finished())));
 }
 
+class SpyForLoadSignalsOrder : public QStateMachine {
+    Q_OBJECT
+public:
+    SpyForLoadSignalsOrder(QWebPage* page, QObject* parent = 0)
+        : QStateMachine(parent)
+    {
+        connect(page, SIGNAL(loadProgress(int)), SLOT(onLoadProgress(int)));
+
+        QState* waitingForLoadStarted = new QState(this);
+        QState* waitingForLastLoadProgress = new QState(this);
+        QState* waitingForLoadFinished = new QState(this);
+        QFinalState* final = new QFinalState(this);
+
+        waitingForLoadStarted->addTransition(page, SIGNAL(loadStarted()), waitingForLastLoadProgress);
+        waitingForLastLoadProgress->addTransition(this, SIGNAL(lastLoadProgress()), waitingForLoadFinished);
+        waitingForLoadFinished->addTransition(page, SIGNAL(loadFinished(bool)), final);
+
+        setInitialState(waitingForLoadStarted);
+        start();
+    }
+    bool isFinished() const
+    {
+        return !isRunning();
+    }
+public Q_SLOTS:
+    void onLoadProgress(int progress)
+    {
+        if (progress == 100)
+            emit lastLoadProgress();
+    }
+signals:
+    void lastLoadProgress();
+};
+
+void tst_QWebPage::loadSignalsOrder_data()
+{
+    QTest::addColumn<QUrl>("url");
+    QTest::newRow("inline data") << QUrl("data:text/html,This is first page");
+    QTest::newRow("simple page") << QUrl("qrc:///resources/content.html");
+    QTest::newRow("frameset page") << QUrl("qrc:///resources/index.html");
+}
+
+void tst_QWebPage::loadSignalsOrder()
+{
+    QFETCH(QUrl, url);
+    QWebPage page;
+    SpyForLoadSignalsOrder loadSpy(&page);
+    waitForSignal(&loadSpy, SIGNAL(started()));
+    page.mainFrame()->load(url);
+    QTRY_VERIFY(loadSpy.isFinished());
+}
+
 QTEST_MAIN(tst_QWebPage)
 #include "tst_qwebpage.moc"
diff --git a/src/3rdparty/webkit/Source/WebKit2/ChangeLog b/src/3rdparty/webkit/Source/WebKit2/ChangeLog
index b6e5afe..be0c43d 100644
--- a/src/3rdparty/webkit/Source/WebKit2/ChangeLog
+++ b/src/3rdparty/webkit/Source/WebKit2/ChangeLog
@@ -1,3 +1,30 @@
+2011-08-06  Aron Rosenberg  <arosenberg@logitech.com>
+
+        Reviewed by Benjamin Poulain.
+
+        [Qt] Fix build with Intel compiler on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=65088
+
+        Intel compiler needs .lib suffixes instead of .a
+
+        * WebKit2.pri:
+
+2011-06-23  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Windowless Plugins : <input> cursor blinks even after transferring focus to plugin
+        https://bugs.webkit.org/show_bug.cgi?id=30355
+
+        PluginView needs to use page->focusController()->setFocusedNode() when focusing a plugin
+        in order to clear the FrameSelection in the currently focused node. In its platform-specific
+        code Chromium already does this (WebPluginContainerImpl.cpp).
+
+        * WebProcess/Plugins/PluginView.cpp:
+        (WebCore::PluginView::focusPluginElement): Using FocusController::setFocusedNode() makes
+                                                   the call to FocusController:setFocusedFrame() redundant, since the
+                                                   former calls it.
+
 2011-06-27  Huang Dongsung  <luxtella@company100.net>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/src/3rdparty/webkit/Source/WebKit2/WebKit2.pri b/src/3rdparty/webkit/Source/WebKit2/WebKit2.pri
index 32c25e1..3122326 100644
--- a/src/3rdparty/webkit/Source/WebKit2/WebKit2.pri
+++ b/src/3rdparty/webkit/Source/WebKit2/WebKit2.pri
@@ -73,7 +73,7 @@ symbian {
 defineTest(prependWebKit2Lib) {
     pathToWebKit2Output = $$ARGS/$$WEBKIT2_DESTDIR
 
-    win32-msvc*|wince* {
+    win32-msvc*|wince*|win32-icc {
         LIBS = -l$$WEBKIT2_TARGET $$LIBS
         LIBS = -L$$pathToWebKit2Output $$LIBS
         POST_TARGETDEPS += $${pathToWebKit2Output}$${QMAKE_DIR_SEP}$${WEBKIT2_TARGET}.lib
diff --git a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/PluginView.cpp b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/PluginView.cpp
index feb1e5c..1962d8c 100644
--- a/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/PluginView.cpp
+++ b/src/3rdparty/webkit/Source/WebKit2/WebProcess/Plugins/PluginView.cpp
@@ -638,8 +638,9 @@ void PluginView::focusPluginElement()
     ASSERT(frame());
     
     if (Page* page = frame()->page())
-        page->focusController()->setFocusedFrame(frame());
-    frame()->document()->setFocusedNode(m_pluginElement);
+       page->focusController()->setFocusedNode(m_pluginElement.get(), frame());
+    else
+       frame()->document()->setFocusedNode(m_pluginElement);
 }
 
 void PluginView::pendingURLRequestsTimerFired()
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 85f9e4f..6a40345 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from
 
 and has the sha1 checksum
 
-        a52dbae362a295e0adfb7ee4fdc21734ae4b7b45
+        64cce100215c71575f19ca0b090c65fa97d4ba10
diff --git a/src/3rdparty/webkit/WebKitLibraries/libWebCoreSQLite3.a b/src/3rdparty/webkit/WebKitLibraries/libWebCoreSQLite3.a
new file mode 100644
index 0000000..2e5fd15
--- /dev/null
+++ b/src/3rdparty/webkit/WebKitLibraries/libWebCoreSQLite3.a
diff --git a/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceLeopard.a b/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
new file mode 100644
index 0000000..43b6043
--- /dev/null
+++ b/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceLeopard.a
diff --git a/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceLion.a b/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceLion.a
new file mode 100644
index 0000000..345860c
--- /dev/null
+++ b/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceLion.a
diff --git a/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a b/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
new file mode 100644
index 0000000..845ca54
--- /dev/null
+++ b/src/3rdparty/webkit/WebKitLibraries/libWebKitSystemInterfaceSnowLeopard.a
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/APICast.h b/src/3rdparty/webkit/include/JavaScriptCore/APICast.h
new file mode 100644
index 0000000..237bfc8
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/APICast.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/API/APICast.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/Error.h b/src/3rdparty/webkit/include/JavaScriptCore/Error.h
new file mode 100644
index 0000000..4635063
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/Error.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/runtime/Error.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/FunctionPrototype.h b/src/3rdparty/webkit/include/JavaScriptCore/FunctionPrototype.h
new file mode 100644
index 0000000..a2829fb
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/FunctionPrototype.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/runtime/FunctionPrototype.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/InternalFunction.h b/src/3rdparty/webkit/include/JavaScriptCore/InternalFunction.h
new file mode 100644
index 0000000..7c549e0
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/InternalFunction.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/runtime/InternalFunction.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/JSBase.h b/src/3rdparty/webkit/include/JavaScriptCore/JSBase.h
new file mode 100644
index 0000000..9c3826e
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/JSBase.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/API/JSBase.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/JSContextRef.h b/src/3rdparty/webkit/include/JavaScriptCore/JSContextRef.h
new file mode 100644
index 0000000..f2f0c47
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/JSContextRef.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/API/JSContextRef.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/JSGlobalObject.h b/src/3rdparty/webkit/include/JavaScriptCore/JSGlobalObject.h
new file mode 100644
index 0000000..ebbffb4
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/JSGlobalObject.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/runtime/JSGlobalObject.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/JSLock.h b/src/3rdparty/webkit/include/JavaScriptCore/JSLock.h
new file mode 100644
index 0000000..7934695
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/JSLock.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/runtime/JSLock.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/JSObject.h b/src/3rdparty/webkit/include/JavaScriptCore/JSObject.h
new file mode 100644
index 0000000..e6767cf
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/JSObject.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/runtime/JSObject.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/JSObjectWithGlobalObject.h b/src/3rdparty/webkit/include/JavaScriptCore/JSObjectWithGlobalObject.h
new file mode 100644
index 0000000..2125f2d
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/JSObjectWithGlobalObject.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/runtime/JSObjectWithGlobalObject.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/JSStringRef.h b/src/3rdparty/webkit/include/JavaScriptCore/JSStringRef.h
new file mode 100644
index 0000000..6141f13
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/JSStringRef.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/API/JSStringRef.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/JSValueRef.h b/src/3rdparty/webkit/include/JavaScriptCore/JSValueRef.h
new file mode 100644
index 0000000..a038672
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/JSValueRef.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/API/JSValueRef.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/JavaScript.h b/src/3rdparty/webkit/include/JavaScriptCore/JavaScript.h
new file mode 100644
index 0000000..d5e2b25
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/JavaScript.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/API/JavaScript.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/ObjectPrototype.h b/src/3rdparty/webkit/include/JavaScriptCore/ObjectPrototype.h
new file mode 100644
index 0000000..d66b76c
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/ObjectPrototype.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/runtime/ObjectPrototype.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/SourceCode.h b/src/3rdparty/webkit/include/JavaScriptCore/SourceCode.h
new file mode 100644
index 0000000..148829a
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/SourceCode.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/parser/SourceCode.h"
diff --git a/src/3rdparty/webkit/include/JavaScriptCore/Strong.h b/src/3rdparty/webkit/include/JavaScriptCore/Strong.h
new file mode 100644
index 0000000..bb611f9
--- /dev/null
+++ b/src/3rdparty/webkit/include/JavaScriptCore/Strong.h
@@ -0,0 +1 @@
+#include "JavaScriptCore/heap/Strong.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QGraphicsWebView b/src/3rdparty/webkit/include/QtWebKit/QGraphicsWebView
new file mode 100644
index 0000000..508a397
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QGraphicsWebView
@@ -0,0 +1 @@
+#include "qgraphicswebview.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebDatabase b/src/3rdparty/webkit/include/QtWebKit/QWebDatabase
new file mode 100644
index 0000000..ec02742
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebDatabase
@@ -0,0 +1 @@
+#include "qwebdatabase.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebElement b/src/3rdparty/webkit/include/QtWebKit/QWebElement
new file mode 100644
index 0000000..32a17d0
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebElement
@@ -0,0 +1 @@
+#include "qwebelement.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebElementCollection b/src/3rdparty/webkit/include/QtWebKit/QWebElementCollection
new file mode 100644
index 0000000..32a17d0
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebElementCollection
@@ -0,0 +1 @@
+#include "qwebelement.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebFrame b/src/3rdparty/webkit/include/QtWebKit/QWebFrame
new file mode 100644
index 0000000..0748fde
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebFrame
@@ -0,0 +1 @@
+#include "qwebframe.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebHistory b/src/3rdparty/webkit/include/QtWebKit/QWebHistory
new file mode 100644
index 0000000..35e9da5
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebHistory
@@ -0,0 +1 @@
+#include "qwebhistory.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebHistoryInterface b/src/3rdparty/webkit/include/QtWebKit/QWebHistoryInterface
new file mode 100644
index 0000000..7352319
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebHistoryInterface
@@ -0,0 +1 @@
+#include "qwebhistoryinterface.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebHistoryItem b/src/3rdparty/webkit/include/QtWebKit/QWebHistoryItem
new file mode 100644
index 0000000..35e9da5
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebHistoryItem
@@ -0,0 +1 @@
+#include "qwebhistory.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebHitTestResult b/src/3rdparty/webkit/include/QtWebKit/QWebHitTestResult
new file mode 100644
index 0000000..0748fde
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebHitTestResult
@@ -0,0 +1 @@
+#include "qwebframe.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebInspector b/src/3rdparty/webkit/include/QtWebKit/QWebInspector
new file mode 100644
index 0000000..0923bb7
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebInspector
@@ -0,0 +1 @@
+#include "qwebinspector.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebPage b/src/3rdparty/webkit/include/QtWebKit/QWebPage
new file mode 100644
index 0000000..e8e8c10
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebPage
@@ -0,0 +1 @@
+#include "qwebpage.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebPluginFactory b/src/3rdparty/webkit/include/QtWebKit/QWebPluginFactory
new file mode 100644
index 0000000..3e4ee81
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebPluginFactory
@@ -0,0 +1 @@
+#include "qwebpluginfactory.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebSecurityOrigin b/src/3rdparty/webkit/include/QtWebKit/QWebSecurityOrigin
new file mode 100644
index 0000000..6427a3b
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebSecurityOrigin
@@ -0,0 +1 @@
+#include "qwebsecurityorigin.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebSettings b/src/3rdparty/webkit/include/QtWebKit/QWebSettings
new file mode 100644
index 0000000..f50c1a2
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebSettings
@@ -0,0 +1 @@
+#include "qwebsettings.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QWebView b/src/3rdparty/webkit/include/QtWebKit/QWebView
new file mode 100644
index 0000000..3ec1eb9
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QWebView
@@ -0,0 +1 @@
+#include "qwebview.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/QtWebKit b/src/3rdparty/webkit/include/QtWebKit/QtWebKit
new file mode 100644
index 0000000..155a551
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/QtWebKit
@@ -0,0 +1,19 @@
+#ifndef QT_QTWEBKIT_MODULE_H
+#define QT_QTWEBKIT_MODULE_H
+#include <QtNetwork/QtNetwork>
+#include "qwebframe.h"
+#include "qgraphicswebview.h"
+#include "qwebkitglobal.h"
+#include "qwebkitplatformplugin.h"
+#include "qwebpage.h"
+#include "qwebview.h"
+#include "qwebsettings.h"
+#include "qwebhistoryinterface.h"
+#include "qwebdatabase.h"
+#include "qwebsecurityorigin.h"
+#include "qwebelement.h"
+#include "qwebpluginfactory.h"
+#include "qwebhistory.h"
+#include "qwebinspector.h"
+#include "qwebkitversion.h"
+#endif // QT_QTWEBKIT_MODULE_H
diff --git a/src/3rdparty/webkit/include/QtWebKit/ViewportAttributes b/src/3rdparty/webkit/include/QtWebKit/ViewportAttributes
new file mode 100644
index 0000000..e8e8c10
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/ViewportAttributes
@@ -0,0 +1 @@
+#include "qwebpage.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/classheaders.pri b/src/3rdparty/webkit/include/QtWebKit/classheaders.pri
new file mode 100644
index 0000000..0e13e75
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/classheaders.pri
@@ -0,0 +1 @@
+WEBKIT_CLASS_HEADERS = $$PWD/QtWebKit $$PWD/QWebHitTestResult $$PWD/QWebFrame $$PWD/QGraphicsWebView $$PWD/QWebPage $$PWD/ViewportAttributes $$PWD/QWebView $$PWD/QWebSettings $$PWD/QWebHistoryInterface $$PWD/QWebDatabase $$PWD/QWebSecurityOrigin $$PWD/QWebElement $$PWD/QWebElementCollection $$PWD/QWebPluginFactory $$PWD/QWebHistoryItem $$PWD/QWebHistory $$PWD/QWebInspector
diff --git a/src/3rdparty/webkit/include/QtWebKit/qgraphicswebview.h b/src/3rdparty/webkit/include/QtWebKit/qgraphicswebview.h
new file mode 100644
index 0000000..0584f1d
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qgraphicswebview.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qgraphicswebview.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebdatabase.h b/src/3rdparty/webkit/include/QtWebKit/qwebdatabase.h
new file mode 100644
index 0000000..f23fed4
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebdatabase.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebdatabase.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebelement.h b/src/3rdparty/webkit/include/QtWebKit/qwebelement.h
new file mode 100644
index 0000000..e11a84b
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebelement.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebelement.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebframe.h b/src/3rdparty/webkit/include/QtWebKit/qwebframe.h
new file mode 100644
index 0000000..d1393c5
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebframe.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebframe.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebhistory.h b/src/3rdparty/webkit/include/QtWebKit/qwebhistory.h
new file mode 100644
index 0000000..edf6f81
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebhistory.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebhistory.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebhistoryinterface.h b/src/3rdparty/webkit/include/QtWebKit/qwebhistoryinterface.h
new file mode 100644
index 0000000..da1a6a9
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebhistoryinterface.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebhistoryinterface.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebinspector.h b/src/3rdparty/webkit/include/QtWebKit/qwebinspector.h
new file mode 100644
index 0000000..4742105
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebinspector.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebinspector.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebkitglobal.h b/src/3rdparty/webkit/include/QtWebKit/qwebkitglobal.h
new file mode 100644
index 0000000..b9b2650
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebkitglobal.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebkitglobal.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebkitplatformplugin.h b/src/3rdparty/webkit/include/QtWebKit/qwebkitplatformplugin.h
new file mode 100644
index 0000000..db4e554
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebkitplatformplugin.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebkitplatformplugin.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebkitversion.h b/src/3rdparty/webkit/include/QtWebKit/qwebkitversion.h
new file mode 100644
index 0000000..af7be3b
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebkitversion.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebkitversion.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebpage.h b/src/3rdparty/webkit/include/QtWebKit/qwebpage.h
new file mode 100644
index 0000000..2053ccb
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebpage.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebpage.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebpluginfactory.h b/src/3rdparty/webkit/include/QtWebKit/qwebpluginfactory.h
new file mode 100644
index 0000000..db095b7
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebpluginfactory.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebpluginfactory.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebsecurityorigin.h b/src/3rdparty/webkit/include/QtWebKit/qwebsecurityorigin.h
new file mode 100644
index 0000000..1ce553c
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebsecurityorigin.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebsecurityorigin.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebsettings.h b/src/3rdparty/webkit/include/QtWebKit/qwebsettings.h
new file mode 100644
index 0000000..cdedc07
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebsettings.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebsettings.h"
diff --git a/src/3rdparty/webkit/include/QtWebKit/qwebview.h b/src/3rdparty/webkit/include/QtWebKit/qwebview.h
new file mode 100644
index 0000000..3490665
--- /dev/null
+++ b/src/3rdparty/webkit/include/QtWebKit/qwebview.h
@@ -0,0 +1 @@
+#include "../../WebKit/qt/Api/qwebview.h"
diff --git a/src/3rdparty/webkit/include/WebCore/AXObjectCache.h b/src/3rdparty/webkit/include/WebCore/AXObjectCache.h
new file mode 100644
index 0000000..19e50c5
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/AXObjectCache.h
@@ -0,0 +1 @@
+#include "WebCore/accessibility/AXObjectCache.h"
diff --git a/src/3rdparty/webkit/include/WebCore/AbstractDatabase.h b/src/3rdparty/webkit/include/WebCore/AbstractDatabase.h
new file mode 100644
index 0000000..e845a89
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/AbstractDatabase.h
@@ -0,0 +1 @@
+#include "WebCore/storage/AbstractDatabase.h"
diff --git a/src/3rdparty/webkit/include/WebCore/AnimationController.h b/src/3rdparty/webkit/include/WebCore/AnimationController.h
new file mode 100644
index 0000000..5a0fc36
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/AnimationController.h
@@ -0,0 +1 @@
+#include "WebCore/page/animation/AnimationController.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ApplicationCache.h b/src/3rdparty/webkit/include/WebCore/ApplicationCache.h
new file mode 100644
index 0000000..1c73afe
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ApplicationCache.h
@@ -0,0 +1 @@
+#include "WebCore/loader/appcache/ApplicationCache.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ApplicationCacheStorage.h b/src/3rdparty/webkit/include/WebCore/ApplicationCacheStorage.h
new file mode 100644
index 0000000..f5bf232
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ApplicationCacheStorage.h
@@ -0,0 +1 @@
+#include "WebCore/loader/appcache/ApplicationCacheStorage.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ArchiveResource.h b/src/3rdparty/webkit/include/WebCore/ArchiveResource.h
new file mode 100644
index 0000000..aa854cb
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ArchiveResource.h
@@ -0,0 +1 @@
+#include "WebCore/loader/archive/ArchiveResource.h"
diff --git a/src/3rdparty/webkit/include/WebCore/AuthenticationClient.h b/src/3rdparty/webkit/include/WebCore/AuthenticationClient.h
new file mode 100644
index 0000000..6dc6438
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/AuthenticationClient.h
@@ -0,0 +1 @@
+#include "WebCore/platform/network/AuthenticationClient.h"
diff --git a/src/3rdparty/webkit/include/WebCore/BackForwardController.h b/src/3rdparty/webkit/include/WebCore/BackForwardController.h
new file mode 100644
index 0000000..f352699
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/BackForwardController.h
@@ -0,0 +1 @@
+#include "WebCore/history/BackForwardController.h"
diff --git a/src/3rdparty/webkit/include/WebCore/BackForwardList.h b/src/3rdparty/webkit/include/WebCore/BackForwardList.h
new file mode 100644
index 0000000..211f9a3
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/BackForwardList.h
@@ -0,0 +1 @@
+#include "WebCore/history/BackForwardList.h"
diff --git a/src/3rdparty/webkit/include/WebCore/BitmapImage.h b/src/3rdparty/webkit/include/WebCore/BitmapImage.h
new file mode 100644
index 0000000..fd77e4e
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/BitmapImage.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/BitmapImage.h"
diff --git a/src/3rdparty/webkit/include/WebCore/CSSComputedStyleDeclaration.h b/src/3rdparty/webkit/include/WebCore/CSSComputedStyleDeclaration.h
new file mode 100644
index 0000000..89eef12
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/CSSComputedStyleDeclaration.h
@@ -0,0 +1 @@
+#include "WebCore/css/CSSComputedStyleDeclaration.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Chrome.h b/src/3rdparty/webkit/include/WebCore/Chrome.h
new file mode 100644
index 0000000..0d9d432
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Chrome.h
@@ -0,0 +1 @@
+#include "WebCore/page/Chrome.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ChromeClient.h b/src/3rdparty/webkit/include/WebCore/ChromeClient.h
new file mode 100644
index 0000000..6c49eb7
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ChromeClient.h
@@ -0,0 +1 @@
+#include "WebCore/page/ChromeClient.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Color.h b/src/3rdparty/webkit/include/WebCore/Color.h
new file mode 100644
index 0000000..0b177c5
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Color.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/Color.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ContextMenu.h b/src/3rdparty/webkit/include/WebCore/ContextMenu.h
new file mode 100644
index 0000000..5eb190d
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ContextMenu.h
@@ -0,0 +1 @@
+#include "WebCore/platform/ContextMenu.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ContextMenuClient.h b/src/3rdparty/webkit/include/WebCore/ContextMenuClient.h
new file mode 100644
index 0000000..5471ea8
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ContextMenuClient.h
@@ -0,0 +1 @@
+#include "WebCore/page/ContextMenuClient.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ContextMenuController.h b/src/3rdparty/webkit/include/WebCore/ContextMenuController.h
new file mode 100644
index 0000000..463f01a
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ContextMenuController.h
@@ -0,0 +1 @@
+#include "WebCore/page/ContextMenuController.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ContextMenuItem.h b/src/3rdparty/webkit/include/WebCore/ContextMenuItem.h
new file mode 100644
index 0000000..0ee8088
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ContextMenuItem.h
@@ -0,0 +1 @@
+#include "WebCore/platform/ContextMenuItem.h"
diff --git a/src/3rdparty/webkit/include/WebCore/CookieJar.h b/src/3rdparty/webkit/include/WebCore/CookieJar.h
new file mode 100644
index 0000000..4da688b
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/CookieJar.h
@@ -0,0 +1 @@
+#include "WebCore/platform/CookieJar.h"
diff --git a/src/3rdparty/webkit/include/WebCore/CookieStorage.h b/src/3rdparty/webkit/include/WebCore/CookieStorage.h
new file mode 100644
index 0000000..a087fc5
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/CookieStorage.h
@@ -0,0 +1 @@
+#include "WebCore/platform/network/CookieStorage.h"
diff --git a/src/3rdparty/webkit/include/WebCore/CookiesStrategy.h b/src/3rdparty/webkit/include/WebCore/CookiesStrategy.h
new file mode 100644
index 0000000..ee0f80b
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/CookiesStrategy.h
@@ -0,0 +1 @@
+#include "WebCore/platform/CookiesStrategy.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Credential.h b/src/3rdparty/webkit/include/WebCore/Credential.h
new file mode 100644
index 0000000..358cc97
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Credential.h
@@ -0,0 +1 @@
+#include "WebCore/platform/network/Credential.h"
diff --git a/src/3rdparty/webkit/include/WebCore/CrossOriginPreflightResultCache.h b/src/3rdparty/webkit/include/WebCore/CrossOriginPreflightResultCache.h
new file mode 100644
index 0000000..511572c
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/CrossOriginPreflightResultCache.h
@@ -0,0 +1 @@
+#include "WebCore/loader/CrossOriginPreflightResultCache.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Cursor.h b/src/3rdparty/webkit/include/WebCore/Cursor.h
new file mode 100644
index 0000000..416929f
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Cursor.h
@@ -0,0 +1 @@
+#include "WebCore/platform/Cursor.h"
diff --git a/src/3rdparty/webkit/include/WebCore/DOMImplementation.h b/src/3rdparty/webkit/include/WebCore/DOMImplementation.h
new file mode 100644
index 0000000..9e37ed5
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/DOMImplementation.h
@@ -0,0 +1 @@
+#include "WebCore/dom/DOMImplementation.h"
diff --git a/src/3rdparty/webkit/include/WebCore/DOMWrapperWorld.h b/src/3rdparty/webkit/include/WebCore/DOMWrapperWorld.h
new file mode 100644
index 0000000..15450f6
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/DOMWrapperWorld.h
@@ -0,0 +1 @@
+#include "WebCore/bindings/js/DOMWrapperWorld.h"
diff --git a/src/3rdparty/webkit/include/WebCore/DatabaseDetails.h b/src/3rdparty/webkit/include/WebCore/DatabaseDetails.h
new file mode 100644
index 0000000..1759bd3
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/DatabaseDetails.h
@@ -0,0 +1 @@
+#include "WebCore/storage/DatabaseDetails.h"
diff --git a/src/3rdparty/webkit/include/WebCore/DatabaseTracker.h b/src/3rdparty/webkit/include/WebCore/DatabaseTracker.h
new file mode 100644
index 0000000..e4e9f82
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/DatabaseTracker.h
@@ -0,0 +1 @@
+#include "WebCore/storage/DatabaseTracker.h"
diff --git a/src/3rdparty/webkit/include/WebCore/DatabaseTrackerClient.h b/src/3rdparty/webkit/include/WebCore/DatabaseTrackerClient.h
new file mode 100644
index 0000000..d020ce1
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/DatabaseTrackerClient.h
@@ -0,0 +1 @@
+#include "WebCore/storage/DatabaseTrackerClient.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Document.h b/src/3rdparty/webkit/include/WebCore/Document.h
new file mode 100644
index 0000000..064119d
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Document.h
@@ -0,0 +1 @@
+#include "WebCore/dom/Document.h"
diff --git a/src/3rdparty/webkit/include/WebCore/DocumentFragment.h b/src/3rdparty/webkit/include/WebCore/DocumentFragment.h
new file mode 100644
index 0000000..4ff6d72
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/DocumentFragment.h
@@ -0,0 +1 @@
+#include "WebCore/dom/DocumentFragment.h"
diff --git a/src/3rdparty/webkit/include/WebCore/DocumentLoader.h b/src/3rdparty/webkit/include/WebCore/DocumentLoader.h
new file mode 100644
index 0000000..b93cbb0
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/DocumentLoader.h
@@ -0,0 +1 @@
+#include "WebCore/loader/DocumentLoader.h"
diff --git a/src/3rdparty/webkit/include/WebCore/DocumentMarkerController.h b/src/3rdparty/webkit/include/WebCore/DocumentMarkerController.h
new file mode 100644
index 0000000..74f9fc4
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/DocumentMarkerController.h
@@ -0,0 +1 @@
+#include "WebCore/dom/DocumentMarkerController.h"
diff --git a/src/3rdparty/webkit/include/WebCore/DragActions.h b/src/3rdparty/webkit/include/WebCore/DragActions.h
new file mode 100644
index 0000000..8e4d0b3
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/DragActions.h
@@ -0,0 +1 @@
+#include "WebCore/page/DragActions.h"
diff --git a/src/3rdparty/webkit/include/WebCore/DragClient.h b/src/3rdparty/webkit/include/WebCore/DragClient.h
new file mode 100644
index 0000000..e9a96a5
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/DragClient.h
@@ -0,0 +1 @@
+#include "WebCore/page/DragClient.h"
diff --git a/src/3rdparty/webkit/include/WebCore/DragController.h b/src/3rdparty/webkit/include/WebCore/DragController.h
new file mode 100644
index 0000000..30de072
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/DragController.h
@@ -0,0 +1 @@
+#include "WebCore/page/DragController.h"
diff --git a/src/3rdparty/webkit/include/WebCore/DragData.h b/src/3rdparty/webkit/include/WebCore/DragData.h
new file mode 100644
index 0000000..d66db38
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/DragData.h
@@ -0,0 +1 @@
+#include "WebCore/platform/DragData.h"
diff --git a/src/3rdparty/webkit/include/WebCore/EditAction.h b/src/3rdparty/webkit/include/WebCore/EditAction.h
new file mode 100644
index 0000000..75200b2
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/EditAction.h
@@ -0,0 +1 @@
+#include "WebCore/editing/EditAction.h"
diff --git a/src/3rdparty/webkit/include/WebCore/EditCommand.h b/src/3rdparty/webkit/include/WebCore/EditCommand.h
new file mode 100644
index 0000000..06d9145
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/EditCommand.h
@@ -0,0 +1 @@
+#include "WebCore/editing/EditCommand.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Editor.h b/src/3rdparty/webkit/include/WebCore/Editor.h
new file mode 100644
index 0000000..1d2a300
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Editor.h
@@ -0,0 +1 @@
+#include "WebCore/editing/Editor.h"
diff --git a/src/3rdparty/webkit/include/WebCore/EditorClient.h b/src/3rdparty/webkit/include/WebCore/EditorClient.h
new file mode 100644
index 0000000..027fb4e
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/EditorClient.h
@@ -0,0 +1 @@
+#include "WebCore/page/EditorClient.h"
diff --git a/src/3rdparty/webkit/include/WebCore/EditorInsertAction.h b/src/3rdparty/webkit/include/WebCore/EditorInsertAction.h
new file mode 100644
index 0000000..7fc8a54
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/EditorInsertAction.h
@@ -0,0 +1 @@
+#include "WebCore/editing/EditorInsertAction.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Element.h b/src/3rdparty/webkit/include/WebCore/Element.h
new file mode 100644
index 0000000..ead3556
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Element.h
@@ -0,0 +1 @@
+#include "WebCore/dom/Element.h"
diff --git a/src/3rdparty/webkit/include/WebCore/EmptyProtocolDefinitions.h b/src/3rdparty/webkit/include/WebCore/EmptyProtocolDefinitions.h
new file mode 100644
index 0000000..c75e216
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/EmptyProtocolDefinitions.h
@@ -0,0 +1 @@
+#include "WebCore/platform/mac/EmptyProtocolDefinitions.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Event.h b/src/3rdparty/webkit/include/WebCore/Event.h
new file mode 100644
index 0000000..3a79434
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Event.h
@@ -0,0 +1 @@
+#include "WebCore/dom/Event.h"
diff --git a/src/3rdparty/webkit/include/WebCore/EventHandler.h b/src/3rdparty/webkit/include/WebCore/EventHandler.h
new file mode 100644
index 0000000..afb7092
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/EventHandler.h
@@ -0,0 +1 @@
+#include "WebCore/page/EventHandler.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FileChooser.h b/src/3rdparty/webkit/include/WebCore/FileChooser.h
new file mode 100644
index 0000000..e968b5c
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FileChooser.h
@@ -0,0 +1 @@
+#include "WebCore/platform/FileChooser.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FileSystem.h b/src/3rdparty/webkit/include/WebCore/FileSystem.h
new file mode 100644
index 0000000..27195b9
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FileSystem.h
@@ -0,0 +1 @@
+#include "WebCore/platform/FileSystem.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FloatPoint.h b/src/3rdparty/webkit/include/WebCore/FloatPoint.h
new file mode 100644
index 0000000..9246f21
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FloatPoint.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/FloatPoint.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FloatRect.h b/src/3rdparty/webkit/include/WebCore/FloatRect.h
new file mode 100644
index 0000000..b18898f
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FloatRect.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/FloatRect.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FloatSize.h b/src/3rdparty/webkit/include/WebCore/FloatSize.h
new file mode 100644
index 0000000..0178b44
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FloatSize.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/FloatSize.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FocusController.h b/src/3rdparty/webkit/include/WebCore/FocusController.h
new file mode 100644
index 0000000..4fb9ab7
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FocusController.h
@@ -0,0 +1 @@
+#include "WebCore/page/FocusController.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FocusDirection.h b/src/3rdparty/webkit/include/WebCore/FocusDirection.h
new file mode 100644
index 0000000..1c76ae5
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FocusDirection.h
@@ -0,0 +1 @@
+#include "WebCore/page/FocusDirection.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Font.h b/src/3rdparty/webkit/include/WebCore/Font.h
new file mode 100644
index 0000000..84ae5e6
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Font.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/Font.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FontRenderingMode.h b/src/3rdparty/webkit/include/WebCore/FontRenderingMode.h
new file mode 100644
index 0000000..3f2925c
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FontRenderingMode.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/FontRenderingMode.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FormState.h b/src/3rdparty/webkit/include/WebCore/FormState.h
new file mode 100644
index 0000000..2be503d
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FormState.h
@@ -0,0 +1 @@
+#include "WebCore/loader/FormState.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Frame.h b/src/3rdparty/webkit/include/WebCore/Frame.h
new file mode 100644
index 0000000..447a563
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Frame.h
@@ -0,0 +1 @@
+#include "WebCore/page/Frame.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FrameLoadRequest.h b/src/3rdparty/webkit/include/WebCore/FrameLoadRequest.h
new file mode 100644
index 0000000..3744166
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FrameLoadRequest.h
@@ -0,0 +1 @@
+#include "WebCore/page/FrameLoadRequest.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FrameLoader.h b/src/3rdparty/webkit/include/WebCore/FrameLoader.h
new file mode 100644
index 0000000..d5f7c97
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FrameLoader.h
@@ -0,0 +1 @@
+#include "WebCore/loader/FrameLoader.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FrameLoaderClient.h b/src/3rdparty/webkit/include/WebCore/FrameLoaderClient.h
new file mode 100644
index 0000000..140b7a1
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FrameLoaderClient.h
@@ -0,0 +1 @@
+#include "WebCore/loader/FrameLoaderClient.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FrameLoaderTypes.h b/src/3rdparty/webkit/include/WebCore/FrameLoaderTypes.h
new file mode 100644
index 0000000..5b12e86
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FrameLoaderTypes.h
@@ -0,0 +1 @@
+#include "WebCore/loader/FrameLoaderTypes.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FrameNetworkingContext.h b/src/3rdparty/webkit/include/WebCore/FrameNetworkingContext.h
new file mode 100644
index 0000000..1e37ea8
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FrameNetworkingContext.h
@@ -0,0 +1 @@
+#include "WebCore/loader/FrameNetworkingContext.h"
diff --git a/src/3rdparty/webkit/include/WebCore/FrameView.h b/src/3rdparty/webkit/include/WebCore/FrameView.h
new file mode 100644
index 0000000..0e85324
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/FrameView.h
@@ -0,0 +1 @@
+#include "WebCore/page/FrameView.h"
diff --git a/src/3rdparty/webkit/include/WebCore/GCController.h b/src/3rdparty/webkit/include/WebCore/GCController.h
new file mode 100644
index 0000000..c528ce0
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/GCController.h
@@ -0,0 +1 @@
+#include "WebCore/bindings/js/GCController.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Geolocation.h b/src/3rdparty/webkit/include/WebCore/Geolocation.h
new file mode 100644
index 0000000..3fe78ca
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Geolocation.h
@@ -0,0 +1 @@
+#include "WebCore/page/Geolocation.h"
diff --git a/src/3rdparty/webkit/include/WebCore/GeolocationClient.h b/src/3rdparty/webkit/include/WebCore/GeolocationClient.h
new file mode 100644
index 0000000..f77eb42
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/GeolocationClient.h
@@ -0,0 +1 @@
+#include "WebCore/page/GeolocationClient.h"
diff --git a/src/3rdparty/webkit/include/WebCore/GeolocationController.h b/src/3rdparty/webkit/include/WebCore/GeolocationController.h
new file mode 100644
index 0000000..e929b83
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/GeolocationController.h
@@ -0,0 +1 @@
+#include "WebCore/page/GeolocationController.h"
diff --git a/src/3rdparty/webkit/include/WebCore/GeolocationError.h b/src/3rdparty/webkit/include/WebCore/GeolocationError.h
new file mode 100644
index 0000000..657e27c
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/GeolocationError.h
@@ -0,0 +1 @@
+#include "WebCore/page/GeolocationError.h"
diff --git a/src/3rdparty/webkit/include/WebCore/GeolocationPosition.h b/src/3rdparty/webkit/include/WebCore/GeolocationPosition.h
new file mode 100644
index 0000000..19f09cc
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/GeolocationPosition.h
@@ -0,0 +1 @@
+#include "WebCore/page/GeolocationPosition.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Gradient.h b/src/3rdparty/webkit/include/WebCore/Gradient.h
new file mode 100644
index 0000000..33ab685
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Gradient.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/Gradient.h"
diff --git a/src/3rdparty/webkit/include/WebCore/GraphicsContext.h b/src/3rdparty/webkit/include/WebCore/GraphicsContext.h
new file mode 100644
index 0000000..e82ec75
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/GraphicsContext.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/GraphicsContext.h"
diff --git a/src/3rdparty/webkit/include/WebCore/GraphicsContextCG.h b/src/3rdparty/webkit/include/WebCore/GraphicsContextCG.h
new file mode 100644
index 0000000..c71753f
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/GraphicsContextCG.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/cg/GraphicsContextCG.h"
diff --git a/src/3rdparty/webkit/include/WebCore/GraphicsLayer.h b/src/3rdparty/webkit/include/WebCore/GraphicsLayer.h
new file mode 100644
index 0000000..3387101
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/GraphicsLayer.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/GraphicsLayer.h"
diff --git a/src/3rdparty/webkit/include/WebCore/GraphicsLayerCA.h b/src/3rdparty/webkit/include/WebCore/GraphicsLayerCA.h
new file mode 100644
index 0000000..314d55c
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/GraphicsLayerCA.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/ca/GraphicsLayerCA.h"
diff --git a/src/3rdparty/webkit/include/WebCore/GraphicsLayerClient.h b/src/3rdparty/webkit/include/WebCore/GraphicsLayerClient.h
new file mode 100644
index 0000000..10e9e60
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/GraphicsLayerClient.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/GraphicsLayerClient.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HTMLAppletElement.h b/src/3rdparty/webkit/include/WebCore/HTMLAppletElement.h
new file mode 100644
index 0000000..c0bacf1
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HTMLAppletElement.h
@@ -0,0 +1 @@
+#include "WebCore/html/HTMLAppletElement.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HTMLFormElement.h b/src/3rdparty/webkit/include/WebCore/HTMLFormElement.h
new file mode 100644
index 0000000..83db912
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HTMLFormElement.h
@@ -0,0 +1 @@
+#include "WebCore/html/HTMLFormElement.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HTMLFrameElement.h b/src/3rdparty/webkit/include/WebCore/HTMLFrameElement.h
new file mode 100644
index 0000000..2a59d8c
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HTMLFrameElement.h
@@ -0,0 +1 @@
+#include "WebCore/html/HTMLFrameElement.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HTMLFrameOwnerElement.h b/src/3rdparty/webkit/include/WebCore/HTMLFrameOwnerElement.h
new file mode 100644
index 0000000..1219a12
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HTMLFrameOwnerElement.h
@@ -0,0 +1 @@
+#include "WebCore/html/HTMLFrameOwnerElement.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HTMLIFrameElement.h b/src/3rdparty/webkit/include/WebCore/HTMLIFrameElement.h
new file mode 100644
index 0000000..fe96ccf
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HTMLIFrameElement.h
@@ -0,0 +1 @@
+#include "WebCore/html/HTMLIFrameElement.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HTMLInputElement.h b/src/3rdparty/webkit/include/WebCore/HTMLInputElement.h
new file mode 100644
index 0000000..60100aa
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HTMLInputElement.h
@@ -0,0 +1 @@
+#include "WebCore/html/HTMLInputElement.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HTMLMediaElement.h b/src/3rdparty/webkit/include/WebCore/HTMLMediaElement.h
new file mode 100644
index 0000000..d332c0a
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HTMLMediaElement.h
@@ -0,0 +1 @@
+#include "WebCore/html/HTMLMediaElement.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HTMLPlugInElement.h b/src/3rdparty/webkit/include/WebCore/HTMLPlugInElement.h
new file mode 100644
index 0000000..c3eb10f
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HTMLPlugInElement.h
@@ -0,0 +1 @@
+#include "WebCore/html/HTMLPlugInElement.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HTMLPlugInImageElement.h b/src/3rdparty/webkit/include/WebCore/HTMLPlugInImageElement.h
new file mode 100644
index 0000000..38c638c
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HTMLPlugInImageElement.h
@@ -0,0 +1 @@
+#include "WebCore/html/HTMLPlugInImageElement.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HTMLTableCellElement.h b/src/3rdparty/webkit/include/WebCore/HTMLTableCellElement.h
new file mode 100644
index 0000000..2e3e09d
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HTMLTableCellElement.h
@@ -0,0 +1 @@
+#include "WebCore/html/HTMLTableCellElement.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HTMLTextAreaElement.h b/src/3rdparty/webkit/include/WebCore/HTMLTextAreaElement.h
new file mode 100644
index 0000000..6613ae6
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HTMLTextAreaElement.h
@@ -0,0 +1 @@
+#include "WebCore/html/HTMLTextAreaElement.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HTTPHeaderMap.h b/src/3rdparty/webkit/include/WebCore/HTTPHeaderMap.h
new file mode 100644
index 0000000..a48b2ce
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HTTPHeaderMap.h
@@ -0,0 +1 @@
+#include "WebCore/platform/network/HTTPHeaderMap.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HistoryItem.h b/src/3rdparty/webkit/include/WebCore/HistoryItem.h
new file mode 100644
index 0000000..284e4b9
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HistoryItem.h
@@ -0,0 +1 @@
+#include "WebCore/history/HistoryItem.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HitTestRequest.h b/src/3rdparty/webkit/include/WebCore/HitTestRequest.h
new file mode 100644
index 0000000..6f1f0d8
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HitTestRequest.h
@@ -0,0 +1 @@
+#include "WebCore/rendering/HitTestRequest.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HitTestResult.h b/src/3rdparty/webkit/include/WebCore/HitTestResult.h
new file mode 100644
index 0000000..50e3246
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HitTestResult.h
@@ -0,0 +1 @@
+#include "WebCore/rendering/HitTestResult.h"
diff --git a/src/3rdparty/webkit/include/WebCore/HostWindow.h b/src/3rdparty/webkit/include/WebCore/HostWindow.h
new file mode 100644
index 0000000..82bd27f
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/HostWindow.h
@@ -0,0 +1 @@
+#include "WebCore/platform/HostWindow.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Icon.h b/src/3rdparty/webkit/include/WebCore/Icon.h
new file mode 100644
index 0000000..3b027fc
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Icon.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/Icon.h"
diff --git a/src/3rdparty/webkit/include/WebCore/IconDatabase.h b/src/3rdparty/webkit/include/WebCore/IconDatabase.h
new file mode 100644
index 0000000..ba2985a
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/IconDatabase.h
@@ -0,0 +1 @@
+#include "WebCore/loader/icon/IconDatabase.h"
diff --git a/src/3rdparty/webkit/include/WebCore/IconDatabaseBase.h b/src/3rdparty/webkit/include/WebCore/IconDatabaseBase.h
new file mode 100644
index 0000000..9cc3e82
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/IconDatabaseBase.h
@@ -0,0 +1 @@
+#include "WebCore/loader/icon/IconDatabaseBase.h"
diff --git a/src/3rdparty/webkit/include/WebCore/IconDatabaseClient.h b/src/3rdparty/webkit/include/WebCore/IconDatabaseClient.h
new file mode 100644
index 0000000..f70b84e
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/IconDatabaseClient.h
@@ -0,0 +1 @@
+#include "WebCore/loader/icon/IconDatabaseClient.h"
diff --git a/src/3rdparty/webkit/include/WebCore/IdentifierRep.h b/src/3rdparty/webkit/include/WebCore/IdentifierRep.h
new file mode 100644
index 0000000..51a75d6
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/IdentifierRep.h
@@ -0,0 +1 @@
+#include "WebCore/bridge/IdentifierRep.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Image.h b/src/3rdparty/webkit/include/WebCore/Image.h
new file mode 100644
index 0000000..9e713f4
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Image.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/Image.h"
diff --git a/src/3rdparty/webkit/include/WebCore/InspectorClient.h b/src/3rdparty/webkit/include/WebCore/InspectorClient.h
new file mode 100644
index 0000000..7cc8863
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/InspectorClient.h
@@ -0,0 +1 @@
+#include "WebCore/inspector/InspectorClient.h"
diff --git a/src/3rdparty/webkit/include/WebCore/InspectorController.h b/src/3rdparty/webkit/include/WebCore/InspectorController.h
new file mode 100644
index 0000000..f3bf6a7
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/InspectorController.h
@@ -0,0 +1 @@
+#include "WebCore/inspector/InspectorController.h"
diff --git a/src/3rdparty/webkit/include/WebCore/InspectorFrontendClientLocal.h b/src/3rdparty/webkit/include/WebCore/InspectorFrontendClientLocal.h
new file mode 100644
index 0000000..de2f131
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/InspectorFrontendClientLocal.h
@@ -0,0 +1 @@
+#include "WebCore/inspector/InspectorFrontendClientLocal.h"
diff --git a/src/3rdparty/webkit/include/WebCore/IntPoint.h b/src/3rdparty/webkit/include/WebCore/IntPoint.h
new file mode 100644
index 0000000..6738be4
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/IntPoint.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/IntPoint.h"
diff --git a/src/3rdparty/webkit/include/WebCore/IntRect.h b/src/3rdparty/webkit/include/WebCore/IntRect.h
new file mode 100644
index 0000000..9ff65c1
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/IntRect.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/IntRect.h"
diff --git a/src/3rdparty/webkit/include/WebCore/IntRectHash.h b/src/3rdparty/webkit/include/WebCore/IntRectHash.h
new file mode 100644
index 0000000..f21fc99
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/IntRectHash.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/IntRectHash.h"
diff --git a/src/3rdparty/webkit/include/WebCore/IntSize.h b/src/3rdparty/webkit/include/WebCore/IntSize.h
new file mode 100644
index 0000000..1ed1253
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/IntSize.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/IntSize.h"
diff --git a/src/3rdparty/webkit/include/WebCore/JSCSSStyleDeclaration.h b/src/3rdparty/webkit/include/WebCore/JSCSSStyleDeclaration.h
new file mode 100644
index 0000000..9b6643c
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/JSCSSStyleDeclaration.h
@@ -0,0 +1 @@
+#include "WebCore/generated/JSCSSStyleDeclaration.h"
diff --git a/src/3rdparty/webkit/include/WebCore/JSPluginElementFunctions.h b/src/3rdparty/webkit/include/WebCore/JSPluginElementFunctions.h
new file mode 100644
index 0000000..be5c4e6
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/JSPluginElementFunctions.h
@@ -0,0 +1 @@
+#include "WebCore/bindings/js/JSPluginElementFunctions.h"
diff --git a/src/3rdparty/webkit/include/WebCore/KURL.h b/src/3rdparty/webkit/include/WebCore/KURL.h
new file mode 100644
index 0000000..66540b2
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/KURL.h
@@ -0,0 +1 @@
+#include "WebCore/platform/KURL.h"
diff --git a/src/3rdparty/webkit/include/WebCore/KeyboardEvent.h b/src/3rdparty/webkit/include/WebCore/KeyboardEvent.h
new file mode 100644
index 0000000..10fe215
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/KeyboardEvent.h
@@ -0,0 +1 @@
+#include "WebCore/dom/KeyboardEvent.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Language.h b/src/3rdparty/webkit/include/WebCore/Language.h
new file mode 100644
index 0000000..fb27338
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Language.h
@@ -0,0 +1 @@
+#include "WebCore/platform/Language.h"
diff --git a/src/3rdparty/webkit/include/WebCore/LinkHash.h b/src/3rdparty/webkit/include/WebCore/LinkHash.h
new file mode 100644
index 0000000..c5c7438
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/LinkHash.h
@@ -0,0 +1 @@
+#include "WebCore/platform/LinkHash.h"
diff --git a/src/3rdparty/webkit/include/WebCore/LocalizedStrings.h b/src/3rdparty/webkit/include/WebCore/LocalizedStrings.h
new file mode 100644
index 0000000..1a0a77a
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/LocalizedStrings.h
@@ -0,0 +1 @@
+#include "WebCore/platform/LocalizedStrings.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Logging.h b/src/3rdparty/webkit/include/WebCore/Logging.h
new file mode 100644
index 0000000..b85d7b8
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Logging.h
@@ -0,0 +1 @@
+#include "WebCore/platform/Logging.h"
diff --git a/src/3rdparty/webkit/include/WebCore/MIMETypeRegistry.h b/src/3rdparty/webkit/include/WebCore/MIMETypeRegistry.h
new file mode 100644
index 0000000..0c39b17
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/MIMETypeRegistry.h
@@ -0,0 +1 @@
+#include "WebCore/platform/MIMETypeRegistry.h"
diff --git a/src/3rdparty/webkit/include/WebCore/MediaCanStartListener.h b/src/3rdparty/webkit/include/WebCore/MediaCanStartListener.h
new file mode 100644
index 0000000..7c78efc
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/MediaCanStartListener.h
@@ -0,0 +1 @@
+#include "WebCore/page/MediaCanStartListener.h"
diff --git a/src/3rdparty/webkit/include/WebCore/MemoryCache.h b/src/3rdparty/webkit/include/WebCore/MemoryCache.h
new file mode 100644
index 0000000..c903f1d
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/MemoryCache.h
@@ -0,0 +1 @@
+#include "WebCore/loader/cache/MemoryCache.h"
diff --git a/src/3rdparty/webkit/include/WebCore/MouseEvent.h b/src/3rdparty/webkit/include/WebCore/MouseEvent.h
new file mode 100644
index 0000000..5f43397
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/MouseEvent.h
@@ -0,0 +1 @@
+#include "WebCore/dom/MouseEvent.h"
diff --git a/src/3rdparty/webkit/include/WebCore/NavigationAction.h b/src/3rdparty/webkit/include/WebCore/NavigationAction.h
new file mode 100644
index 0000000..ca0f93c
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/NavigationAction.h
@@ -0,0 +1 @@
+#include "WebCore/loader/NavigationAction.h"
diff --git a/src/3rdparty/webkit/include/WebCore/NetscapePlugInStreamLoader.h b/src/3rdparty/webkit/include/WebCore/NetscapePlugInStreamLoader.h
new file mode 100644
index 0000000..8047c20
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/NetscapePlugInStreamLoader.h
@@ -0,0 +1 @@
+#include "WebCore/loader/NetscapePlugInStreamLoader.h"
diff --git a/src/3rdparty/webkit/include/WebCore/NetworkingContext.h b/src/3rdparty/webkit/include/WebCore/NetworkingContext.h
new file mode 100644
index 0000000..7a2e974
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/NetworkingContext.h
@@ -0,0 +1 @@
+#include "WebCore/platform/network/NetworkingContext.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Node.h b/src/3rdparty/webkit/include/WebCore/Node.h
new file mode 100644
index 0000000..eca5439
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Node.h
@@ -0,0 +1 @@
+#include "WebCore/dom/Node.h"
diff --git a/src/3rdparty/webkit/include/WebCore/NotImplemented.h b/src/3rdparty/webkit/include/WebCore/NotImplemented.h
new file mode 100644
index 0000000..d9198fc
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/NotImplemented.h
@@ -0,0 +1 @@
+#include "WebCore/platform/NotImplemented.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Page.h b/src/3rdparty/webkit/include/WebCore/Page.h
new file mode 100644
index 0000000..ea3c5b3
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Page.h
@@ -0,0 +1 @@
+#include "WebCore/page/Page.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PageCache.h b/src/3rdparty/webkit/include/WebCore/PageCache.h
new file mode 100644
index 0000000..3210b0e
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PageCache.h
@@ -0,0 +1 @@
+#include "WebCore/history/PageCache.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PageGroup.h b/src/3rdparty/webkit/include/WebCore/PageGroup.h
new file mode 100644
index 0000000..2dd1abd
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PageGroup.h
@@ -0,0 +1 @@
+#include "WebCore/page/PageGroup.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Path.h b/src/3rdparty/webkit/include/WebCore/Path.h
new file mode 100644
index 0000000..add6db3
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Path.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/Path.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PlatformCALayer.h b/src/3rdparty/webkit/include/WebCore/PlatformCALayer.h
new file mode 100644
index 0000000..bfa9258
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PlatformCALayer.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/ca/PlatformCALayer.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PlatformContextCairo.h b/src/3rdparty/webkit/include/WebCore/PlatformContextCairo.h
new file mode 100644
index 0000000..ccd6a92
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PlatformContextCairo.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/cairo/PlatformContextCairo.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PlatformGestureEvent.h b/src/3rdparty/webkit/include/WebCore/PlatformGestureEvent.h
new file mode 100644
index 0000000..377e5cb
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PlatformGestureEvent.h
@@ -0,0 +1 @@
+#include "WebCore/platform/PlatformGestureEvent.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PlatformKeyboardEvent.h b/src/3rdparty/webkit/include/WebCore/PlatformKeyboardEvent.h
new file mode 100644
index 0000000..19d8251
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PlatformKeyboardEvent.h
@@ -0,0 +1 @@
+#include "WebCore/platform/PlatformKeyboardEvent.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PlatformMouseEvent.h b/src/3rdparty/webkit/include/WebCore/PlatformMouseEvent.h
new file mode 100644
index 0000000..9d0abba
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PlatformMouseEvent.h
@@ -0,0 +1 @@
+#include "WebCore/platform/PlatformMouseEvent.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PlatformStrategies.h b/src/3rdparty/webkit/include/WebCore/PlatformStrategies.h
new file mode 100644
index 0000000..641c5d2
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PlatformStrategies.h
@@ -0,0 +1 @@
+#include "WebCore/platform/PlatformStrategies.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PlatformTouchEvent.h b/src/3rdparty/webkit/include/WebCore/PlatformTouchEvent.h
new file mode 100644
index 0000000..7628c0a
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PlatformTouchEvent.h
@@ -0,0 +1 @@
+#include "WebCore/platform/PlatformTouchEvent.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PlatformTouchPoint.h b/src/3rdparty/webkit/include/WebCore/PlatformTouchPoint.h
new file mode 100644
index 0000000..ef0c316
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PlatformTouchPoint.h
@@ -0,0 +1 @@
+#include "WebCore/platform/PlatformTouchPoint.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PlatformWheelEvent.h b/src/3rdparty/webkit/include/WebCore/PlatformWheelEvent.h
new file mode 100644
index 0000000..23a8af9
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PlatformWheelEvent.h
@@ -0,0 +1 @@
+#include "WebCore/platform/PlatformWheelEvent.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PluginData.h b/src/3rdparty/webkit/include/WebCore/PluginData.h
new file mode 100644
index 0000000..26ad15a
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PluginData.h
@@ -0,0 +1 @@
+#include "WebCore/plugins/PluginData.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PluginStrategy.h b/src/3rdparty/webkit/include/WebCore/PluginStrategy.h
new file mode 100644
index 0000000..4c84db0
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PluginStrategy.h
@@ -0,0 +1 @@
+#include "WebCore/plugins/PluginStrategy.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PluginViewBase.h b/src/3rdparty/webkit/include/WebCore/PluginViewBase.h
new file mode 100644
index 0000000..c5d0535
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PluginViewBase.h
@@ -0,0 +1 @@
+#include "WebCore/plugins/PluginViewBase.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PolicyChecker.h b/src/3rdparty/webkit/include/WebCore/PolicyChecker.h
new file mode 100644
index 0000000..98c0626
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PolicyChecker.h
@@ -0,0 +1 @@
+#include "WebCore/loader/PolicyChecker.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PopupMenu.h b/src/3rdparty/webkit/include/WebCore/PopupMenu.h
new file mode 100644
index 0000000..e4764a8
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PopupMenu.h
@@ -0,0 +1 @@
+#include "WebCore/platform/PopupMenu.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PopupMenuClient.h b/src/3rdparty/webkit/include/WebCore/PopupMenuClient.h
new file mode 100644
index 0000000..dba5017
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PopupMenuClient.h
@@ -0,0 +1 @@
+#include "WebCore/platform/PopupMenuClient.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PopupMenuStyle.h b/src/3rdparty/webkit/include/WebCore/PopupMenuStyle.h
new file mode 100644
index 0000000..e51de9b
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PopupMenuStyle.h
@@ -0,0 +1 @@
+#include "WebCore/platform/PopupMenuStyle.h"
diff --git a/src/3rdparty/webkit/include/WebCore/PrintContext.h b/src/3rdparty/webkit/include/WebCore/PrintContext.h
new file mode 100644
index 0000000..f234cb6
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/PrintContext.h
@@ -0,0 +1 @@
+#include "WebCore/page/PrintContext.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ProgressTracker.h b/src/3rdparty/webkit/include/WebCore/ProgressTracker.h
new file mode 100644
index 0000000..3fff316
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ProgressTracker.h
@@ -0,0 +1 @@
+#include "WebCore/loader/ProgressTracker.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ProtectionSpace.h b/src/3rdparty/webkit/include/WebCore/ProtectionSpace.h
new file mode 100644
index 0000000..be6afe5
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ProtectionSpace.h
@@ -0,0 +1 @@
+#include "WebCore/platform/network/ProtectionSpace.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ProxyServer.h b/src/3rdparty/webkit/include/WebCore/ProxyServer.h
new file mode 100644
index 0000000..a933b78
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ProxyServer.h
@@ -0,0 +1 @@
+#include "WebCore/platform/network/ProxyServer.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Range.h b/src/3rdparty/webkit/include/WebCore/Range.h
new file mode 100644
index 0000000..21ebad8
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Range.h
@@ -0,0 +1 @@
+#include "WebCore/dom/Range.h"
diff --git a/src/3rdparty/webkit/include/WebCore/RenderEmbeddedObject.h b/src/3rdparty/webkit/include/WebCore/RenderEmbeddedObject.h
new file mode 100644
index 0000000..31be6c9
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/RenderEmbeddedObject.h
@@ -0,0 +1 @@
+#include "WebCore/rendering/RenderEmbeddedObject.h"
diff --git a/src/3rdparty/webkit/include/WebCore/RenderLayer.h b/src/3rdparty/webkit/include/WebCore/RenderLayer.h
new file mode 100644
index 0000000..aefe178
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/RenderLayer.h
@@ -0,0 +1 @@
+#include "WebCore/rendering/RenderLayer.h"
diff --git a/src/3rdparty/webkit/include/WebCore/RenderTheme.h b/src/3rdparty/webkit/include/WebCore/RenderTheme.h
new file mode 100644
index 0000000..324d109
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/RenderTheme.h
@@ -0,0 +1 @@
+#include "WebCore/rendering/RenderTheme.h"
diff --git a/src/3rdparty/webkit/include/WebCore/RenderTreeAsText.h b/src/3rdparty/webkit/include/WebCore/RenderTreeAsText.h
new file mode 100644
index 0000000..7ae5171
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/RenderTreeAsText.h
@@ -0,0 +1 @@
+#include "WebCore/rendering/RenderTreeAsText.h"
diff --git a/src/3rdparty/webkit/include/WebCore/RenderView.h b/src/3rdparty/webkit/include/WebCore/RenderView.h
new file mode 100644
index 0000000..3402a57
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/RenderView.h
@@ -0,0 +1 @@
+#include "WebCore/rendering/RenderView.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ReplaceSelectionCommand.h b/src/3rdparty/webkit/include/WebCore/ReplaceSelectionCommand.h
new file mode 100644
index 0000000..e320498
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ReplaceSelectionCommand.h
@@ -0,0 +1 @@
+#include "WebCore/editing/ReplaceSelectionCommand.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ResourceHandle.h b/src/3rdparty/webkit/include/WebCore/ResourceHandle.h
new file mode 100644
index 0000000..42a0e20
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ResourceHandle.h
@@ -0,0 +1 @@
+#include "WebCore/platform/network/ResourceHandle.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ResourceLoadScheduler.h b/src/3rdparty/webkit/include/WebCore/ResourceLoadScheduler.h
new file mode 100644
index 0000000..5cf5d4b
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ResourceLoadScheduler.h
@@ -0,0 +1 @@
+#include "WebCore/loader/ResourceLoadScheduler.h"
diff --git a/src/3rdparty/webkit/include/WebCore/RuntimeEnabledFeatures.h b/src/3rdparty/webkit/include/WebCore/RuntimeEnabledFeatures.h
new file mode 100644
index 0000000..a8e879b
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/RuntimeEnabledFeatures.h
@@ -0,0 +1 @@
+#include "WebCore/bindings/generic/RuntimeEnabledFeatures.h"
diff --git a/src/3rdparty/webkit/include/WebCore/SchemeRegistry.h b/src/3rdparty/webkit/include/WebCore/SchemeRegistry.h
new file mode 100644
index 0000000..6c89b6a
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/SchemeRegistry.h
@@ -0,0 +1 @@
+#include "WebCore/platform/SchemeRegistry.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ScriptController.h b/src/3rdparty/webkit/include/WebCore/ScriptController.h
new file mode 100644
index 0000000..5bd55f4
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ScriptController.h
@@ -0,0 +1 @@
+#include "WebCore/bindings/js/ScriptController.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ScriptValue.h b/src/3rdparty/webkit/include/WebCore/ScriptValue.h
new file mode 100644
index 0000000..4afbad7
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ScriptValue.h
@@ -0,0 +1 @@
+#include "WebCore/bindings/js/ScriptValue.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ScrollTypes.h b/src/3rdparty/webkit/include/WebCore/ScrollTypes.h
new file mode 100644
index 0000000..c35b2f3
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ScrollTypes.h
@@ -0,0 +1 @@
+#include "WebCore/platform/ScrollTypes.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ScrollView.h b/src/3rdparty/webkit/include/WebCore/ScrollView.h
new file mode 100644
index 0000000..6b4f7f6
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ScrollView.h
@@ -0,0 +1 @@
+#include "WebCore/platform/ScrollView.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ScrollableArea.h b/src/3rdparty/webkit/include/WebCore/ScrollableArea.h
new file mode 100644
index 0000000..11afb5f
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ScrollableArea.h
@@ -0,0 +1 @@
+#include "WebCore/platform/ScrollableArea.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Scrollbar.h b/src/3rdparty/webkit/include/WebCore/Scrollbar.h
new file mode 100644
index 0000000..9fe1514
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Scrollbar.h
@@ -0,0 +1 @@
+#include "WebCore/platform/Scrollbar.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ScrollbarTheme.h b/src/3rdparty/webkit/include/WebCore/ScrollbarTheme.h
new file mode 100644
index 0000000..fc4e762
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ScrollbarTheme.h
@@ -0,0 +1 @@
+#include "WebCore/platform/ScrollbarTheme.h"
diff --git a/src/3rdparty/webkit/include/WebCore/SearchPopupMenu.h b/src/3rdparty/webkit/include/WebCore/SearchPopupMenu.h
new file mode 100644
index 0000000..637ad39
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/SearchPopupMenu.h
@@ -0,0 +1 @@
+#include "WebCore/platform/SearchPopupMenu.h"
diff --git a/src/3rdparty/webkit/include/WebCore/SecurityOrigin.h b/src/3rdparty/webkit/include/WebCore/SecurityOrigin.h
new file mode 100644
index 0000000..5b00657
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/SecurityOrigin.h
@@ -0,0 +1 @@
+#include "WebCore/page/SecurityOrigin.h"
diff --git a/src/3rdparty/webkit/include/WebCore/SecurityOriginHash.h b/src/3rdparty/webkit/include/WebCore/SecurityOriginHash.h
new file mode 100644
index 0000000..dac6640
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/SecurityOriginHash.h
@@ -0,0 +1 @@
+#include "WebCore/page/SecurityOriginHash.h"
diff --git a/src/3rdparty/webkit/include/WebCore/SerializedScriptValue.h b/src/3rdparty/webkit/include/WebCore/SerializedScriptValue.h
new file mode 100644
index 0000000..2186c56
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/SerializedScriptValue.h
@@ -0,0 +1 @@
+#include "WebCore/bindings/js/SerializedScriptValue.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Settings.h b/src/3rdparty/webkit/include/WebCore/Settings.h
new file mode 100644
index 0000000..3a29adc
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Settings.h
@@ -0,0 +1 @@
+#include "WebCore/page/Settings.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ShadowRoot.h b/src/3rdparty/webkit/include/WebCore/ShadowRoot.h
new file mode 100644
index 0000000..1a832bb
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ShadowRoot.h
@@ -0,0 +1 @@
+#include "WebCore/dom/ShadowRoot.h"
diff --git a/src/3rdparty/webkit/include/WebCore/SharedBuffer.h b/src/3rdparty/webkit/include/WebCore/SharedBuffer.h
new file mode 100644
index 0000000..95eedd0
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/SharedBuffer.h
@@ -0,0 +1 @@
+#include "WebCore/platform/SharedBuffer.h"
diff --git a/src/3rdparty/webkit/include/WebCore/SimpleFontData.h b/src/3rdparty/webkit/include/WebCore/SimpleFontData.h
new file mode 100644
index 0000000..3d90d29
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/SimpleFontData.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/SimpleFontData.h"
diff --git a/src/3rdparty/webkit/include/WebCore/SoftLinking.h b/src/3rdparty/webkit/include/WebCore/SoftLinking.h
new file mode 100644
index 0000000..3ceb0c0
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/SoftLinking.h
@@ -0,0 +1 @@
+#include "WebCore/platform/mac/SoftLinking.h"
diff --git a/src/3rdparty/webkit/include/WebCore/SpellingCorrectionController.h b/src/3rdparty/webkit/include/WebCore/SpellingCorrectionController.h
new file mode 100644
index 0000000..d7c0571
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/SpellingCorrectionController.h
@@ -0,0 +1 @@
+#include "WebCore/editing/SpellingCorrectionController.h"
diff --git a/src/3rdparty/webkit/include/WebCore/StorageTracker.h b/src/3rdparty/webkit/include/WebCore/StorageTracker.h
new file mode 100644
index 0000000..55d240a
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/StorageTracker.h
@@ -0,0 +1 @@
+#include "WebCore/storage/StorageTracker.h"
diff --git a/src/3rdparty/webkit/include/WebCore/SubstituteData.h b/src/3rdparty/webkit/include/WebCore/SubstituteData.h
new file mode 100644
index 0000000..47db253
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/SubstituteData.h
@@ -0,0 +1 @@
+#include "WebCore/loader/SubstituteData.h"
diff --git a/src/3rdparty/webkit/include/WebCore/TextAffinity.h b/src/3rdparty/webkit/include/WebCore/TextAffinity.h
new file mode 100644
index 0000000..e97160c
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/TextAffinity.h
@@ -0,0 +1 @@
+#include "WebCore/editing/TextAffinity.h"
diff --git a/src/3rdparty/webkit/include/WebCore/TextCheckerClient.h b/src/3rdparty/webkit/include/WebCore/TextCheckerClient.h
new file mode 100644
index 0000000..860e675
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/TextCheckerClient.h
@@ -0,0 +1 @@
+#include "WebCore/platform/text/TextCheckerClient.h"
diff --git a/src/3rdparty/webkit/include/WebCore/TextDirection.h b/src/3rdparty/webkit/include/WebCore/TextDirection.h
new file mode 100644
index 0000000..de842d6
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/TextDirection.h
@@ -0,0 +1 @@
+#include "WebCore/platform/text/TextDirection.h"
diff --git a/src/3rdparty/webkit/include/WebCore/TextIterator.h b/src/3rdparty/webkit/include/WebCore/TextIterator.h
new file mode 100644
index 0000000..193bbd8
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/TextIterator.h
@@ -0,0 +1 @@
+#include "WebCore/editing/TextIterator.h"
diff --git a/src/3rdparty/webkit/include/WebCore/TextResourceDecoder.h b/src/3rdparty/webkit/include/WebCore/TextResourceDecoder.h
new file mode 100644
index 0000000..75eae5c
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/TextResourceDecoder.h
@@ -0,0 +1 @@
+#include "WebCore/loader/TextResourceDecoder.h"
diff --git a/src/3rdparty/webkit/include/WebCore/TextRun.h b/src/3rdparty/webkit/include/WebCore/TextRun.h
new file mode 100644
index 0000000..8e2a041
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/TextRun.h
@@ -0,0 +1 @@
+#include "WebCore/platform/graphics/TextRun.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Timer.h b/src/3rdparty/webkit/include/WebCore/Timer.h
new file mode 100644
index 0000000..62727b1
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Timer.h
@@ -0,0 +1 @@
+#include "WebCore/platform/Timer.h"
diff --git a/src/3rdparty/webkit/include/WebCore/UIEventWithKeyState.h b/src/3rdparty/webkit/include/WebCore/UIEventWithKeyState.h
new file mode 100644
index 0000000..c0ac9aa
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/UIEventWithKeyState.h
@@ -0,0 +1 @@
+#include "WebCore/dom/UIEventWithKeyState.h"
diff --git a/src/3rdparty/webkit/include/WebCore/UserContentTypes.h b/src/3rdparty/webkit/include/WebCore/UserContentTypes.h
new file mode 100644
index 0000000..cf75a72
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/UserContentTypes.h
@@ -0,0 +1 @@
+#include "WebCore/page/UserContentTypes.h"
diff --git a/src/3rdparty/webkit/include/WebCore/UserContentURLPattern.h b/src/3rdparty/webkit/include/WebCore/UserContentURLPattern.h
new file mode 100644
index 0000000..877c9cb
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/UserContentURLPattern.h
@@ -0,0 +1 @@
+#include "WebCore/page/UserContentURLPattern.h"
diff --git a/src/3rdparty/webkit/include/WebCore/UserGestureIndicator.h b/src/3rdparty/webkit/include/WebCore/UserGestureIndicator.h
new file mode 100644
index 0000000..384902e
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/UserGestureIndicator.h
@@ -0,0 +1 @@
+#include "WebCore/dom/UserGestureIndicator.h"
diff --git a/src/3rdparty/webkit/include/WebCore/UserScriptTypes.h b/src/3rdparty/webkit/include/WebCore/UserScriptTypes.h
new file mode 100644
index 0000000..bdd9ec8
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/UserScriptTypes.h
@@ -0,0 +1 @@
+#include "WebCore/page/UserScriptTypes.h"
diff --git a/src/3rdparty/webkit/include/WebCore/UserTypingGestureIndicator.h b/src/3rdparty/webkit/include/WebCore/UserTypingGestureIndicator.h
new file mode 100644
index 0000000..b7a34a4
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/UserTypingGestureIndicator.h
@@ -0,0 +1 @@
+#include "WebCore/dom/UserTypingGestureIndicator.h"
diff --git a/src/3rdparty/webkit/include/WebCore/ViewportArguments.h b/src/3rdparty/webkit/include/WebCore/ViewportArguments.h
new file mode 100644
index 0000000..dd0911d
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/ViewportArguments.h
@@ -0,0 +1 @@
+#include "WebCore/dom/ViewportArguments.h"
diff --git a/src/3rdparty/webkit/include/WebCore/VisiblePosition.h b/src/3rdparty/webkit/include/WebCore/VisiblePosition.h
new file mode 100644
index 0000000..5575815
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/VisiblePosition.h
@@ -0,0 +1 @@
+#include "WebCore/editing/VisiblePosition.h"
diff --git a/src/3rdparty/webkit/include/WebCore/VisitedLinkStrategy.h b/src/3rdparty/webkit/include/WebCore/VisitedLinkStrategy.h
new file mode 100644
index 0000000..f5b8a57
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/VisitedLinkStrategy.h
@@ -0,0 +1 @@
+#include "WebCore/platform/VisitedLinkStrategy.h"
diff --git a/src/3rdparty/webkit/include/WebCore/WebCoreKeyboardUIMode.h b/src/3rdparty/webkit/include/WebCore/WebCoreKeyboardUIMode.h
new file mode 100644
index 0000000..8b748d3
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/WebCoreKeyboardUIMode.h
@@ -0,0 +1 @@
+#include "WebCore/page/WebCoreKeyboardUIMode.h"
diff --git a/src/3rdparty/webkit/include/WebCore/Widget.h b/src/3rdparty/webkit/include/WebCore/Widget.h
new file mode 100644
index 0000000..d4e2687
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/Widget.h
@@ -0,0 +1 @@
+#include "WebCore/platform/Widget.h"
diff --git a/src/3rdparty/webkit/include/WebCore/WindowFeatures.h b/src/3rdparty/webkit/include/WebCore/WindowFeatures.h
new file mode 100644
index 0000000..bb349fd
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/WindowFeatures.h
@@ -0,0 +1 @@
+#include "WebCore/page/WindowFeatures.h"
diff --git a/src/3rdparty/webkit/include/WebCore/markup.h b/src/3rdparty/webkit/include/WebCore/markup.h
new file mode 100644
index 0000000..05cdeea
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/markup.h
@@ -0,0 +1 @@
+#include "WebCore/editing/markup.h"
diff --git a/src/3rdparty/webkit/include/WebCore/npapi.h b/src/3rdparty/webkit/include/WebCore/npapi.h
new file mode 100644
index 0000000..ec1c3b0
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/npapi.h
@@ -0,0 +1 @@
+#include "WebCore/bridge/npapi.h"
diff --git a/src/3rdparty/webkit/include/WebCore/npfunctions.h b/src/3rdparty/webkit/include/WebCore/npfunctions.h
new file mode 100644
index 0000000..151ef69
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/npfunctions.h
@@ -0,0 +1 @@
+#include "WebCore/plugins/npfunctions.h"
diff --git a/src/3rdparty/webkit/include/WebCore/npruntime.h b/src/3rdparty/webkit/include/WebCore/npruntime.h
new file mode 100644
index 0000000..271e548
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/npruntime.h
@@ -0,0 +1 @@
+#include "WebCore/bridge/npruntime.h"
diff --git a/src/3rdparty/webkit/include/WebCore/npruntime_internal.h b/src/3rdparty/webkit/include/WebCore/npruntime_internal.h
new file mode 100644
index 0000000..255abc3
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebCore/npruntime_internal.h
@@ -0,0 +1 @@
+#include "WebCore/bridge/npruntime_internal.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/RunLoop.h b/src/3rdparty/webkit/include/WebKit2/RunLoop.h
new file mode 100644
index 0000000..d6f6d5f
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/RunLoop.h
@@ -0,0 +1 @@
+#include "WebKit2/Platform/RunLoop.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKArray.h b/src/3rdparty/webkit/include/WebKit2/WKArray.h
new file mode 100644
index 0000000..b3841b0
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKArray.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKArray.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKBackForwardList.h b/src/3rdparty/webkit/include/WebKit2/WKBackForwardList.h
new file mode 100644
index 0000000..26f2e74
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKBackForwardList.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKBackForwardList.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKBackForwardListItem.h b/src/3rdparty/webkit/include/WebKit2/WKBackForwardListItem.h
new file mode 100644
index 0000000..e609686
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKBackForwardListItem.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKBackForwardListItem.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKBase.h b/src/3rdparty/webkit/include/WebKit2/WKBase.h
new file mode 100644
index 0000000..c859bf9
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKBase.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKBase.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKContext.h b/src/3rdparty/webkit/include/WebKit2/WKContext.h
new file mode 100644
index 0000000..c884b67
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKContext.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKContext.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKContextMenuItemTypes.h b/src/3rdparty/webkit/include/WebKit2/WKContextMenuItemTypes.h
new file mode 100644
index 0000000..62e0aa9
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKContextMenuItemTypes.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKContextMenuItemTypes.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKCookieManager.h b/src/3rdparty/webkit/include/WebKit2/WKCookieManager.h
new file mode 100644
index 0000000..3ff208f
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKCookieManager.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKCookieManager.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKCredentialTypes.h b/src/3rdparty/webkit/include/WebKit2/WKCredentialTypes.h
new file mode 100644
index 0000000..6221bc7
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKCredentialTypes.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKCredentialTypes.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKData.h b/src/3rdparty/webkit/include/WebKit2/WKData.h
new file mode 100644
index 0000000..794eedf
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKData.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKData.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKDictionary.h b/src/3rdparty/webkit/include/WebKit2/WKDictionary.h
new file mode 100644
index 0000000..570f234
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKDictionary.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKDictionary.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKError.h b/src/3rdparty/webkit/include/WebKit2/WKError.h
new file mode 100644
index 0000000..4cf78d6
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKError.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKError.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKEvent.h b/src/3rdparty/webkit/include/WebKit2/WKEvent.h
new file mode 100644
index 0000000..e58bc1c
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKEvent.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKEvent.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKFindOptions.h b/src/3rdparty/webkit/include/WebKit2/WKFindOptions.h
new file mode 100644
index 0000000..1e4ef92
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKFindOptions.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKFindOptions.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKFormSubmissionListener.h b/src/3rdparty/webkit/include/WebKit2/WKFormSubmissionListener.h
new file mode 100644
index 0000000..b4cceb7
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKFormSubmissionListener.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKFormSubmissionListener.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKFrame.h b/src/3rdparty/webkit/include/WebKit2/WKFrame.h
new file mode 100644
index 0000000..3ac6529
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKFrame.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKFrame.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKFramePolicyListener.h b/src/3rdparty/webkit/include/WebKit2/WKFramePolicyListener.h
new file mode 100644
index 0000000..7916c38
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKFramePolicyListener.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKFramePolicyListener.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKGeolocationManager.h b/src/3rdparty/webkit/include/WebKit2/WKGeolocationManager.h
new file mode 100644
index 0000000..3e503e6
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKGeolocationManager.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKGeolocationManager.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKGeolocationPermissionRequest.h b/src/3rdparty/webkit/include/WebKit2/WKGeolocationPermissionRequest.h
new file mode 100644
index 0000000..5205a0e
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKGeolocationPermissionRequest.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKGeolocationPermissionRequest.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKGeolocationPosition.h b/src/3rdparty/webkit/include/WebKit2/WKGeolocationPosition.h
new file mode 100644
index 0000000..cff7f23
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKGeolocationPosition.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKGeolocationPosition.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKGeometry.h b/src/3rdparty/webkit/include/WebKit2/WKGeometry.h
new file mode 100644
index 0000000..b84460c
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKGeometry.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKGeometry.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKGraphicsContext.h b/src/3rdparty/webkit/include/WebKit2/WKGraphicsContext.h
new file mode 100644
index 0000000..fbccdc9
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKGraphicsContext.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKGraphicsContext.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKImage.h b/src/3rdparty/webkit/include/WebKit2/WKImage.h
new file mode 100644
index 0000000..a02314d
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKImage.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKImage.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKMutableArray.h b/src/3rdparty/webkit/include/WebKit2/WKMutableArray.h
new file mode 100644
index 0000000..a47af3b
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKMutableArray.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKMutableArray.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKMutableDictionary.h b/src/3rdparty/webkit/include/WebKit2/WKMutableDictionary.h
new file mode 100644
index 0000000..0c345f5
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKMutableDictionary.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKMutableDictionary.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKNativeEvent.h b/src/3rdparty/webkit/include/WebKit2/WKNativeEvent.h
new file mode 100644
index 0000000..deeb2a5
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKNativeEvent.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKNativeEvent.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKNavigationData.h b/src/3rdparty/webkit/include/WebKit2/WKNavigationData.h
new file mode 100644
index 0000000..9607b97
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKNavigationData.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKNavigationData.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKNumber.h b/src/3rdparty/webkit/include/WebKit2/WKNumber.h
new file mode 100644
index 0000000..7924588
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKNumber.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKNumber.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKOpenPanelParameters.h b/src/3rdparty/webkit/include/WebKit2/WKOpenPanelParameters.h
new file mode 100644
index 0000000..b0c4134
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKOpenPanelParameters.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKOpenPanelParameters.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKOpenPanelResultListener.h b/src/3rdparty/webkit/include/WebKit2/WKOpenPanelResultListener.h
new file mode 100644
index 0000000..a3b015d
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKOpenPanelResultListener.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKOpenPanelResultListener.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKPage.h b/src/3rdparty/webkit/include/WebKit2/WKPage.h
new file mode 100644
index 0000000..75d785c
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKPage.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKPage.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKPageGroup.h b/src/3rdparty/webkit/include/WebKit2/WKPageGroup.h
new file mode 100644
index 0000000..eefeb25
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKPageGroup.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKPageGroup.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKPageLoadTypes.h b/src/3rdparty/webkit/include/WebKit2/WKPageLoadTypes.h
new file mode 100644
index 0000000..cd39b9d
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKPageLoadTypes.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKPageLoadTypes.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKPreferences.h b/src/3rdparty/webkit/include/WebKit2/WKPreferences.h
new file mode 100644
index 0000000..5777a3a
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKPreferences.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKPreferences.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKProtectionSpaceTypes.h b/src/3rdparty/webkit/include/WebKit2/WKProtectionSpaceTypes.h
new file mode 100644
index 0000000..025ce94
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKProtectionSpaceTypes.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/C/WKProtectionSpaceTypes.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKRetainPtr.h b/src/3rdparty/webkit/include/WebKit2/WKRetainPtr.h
new file mode 100644
index 0000000..5e58f97
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKRetainPtr.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/cpp/WKRetainPtr.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKString.h b/src/3rdparty/webkit/include/WebKit2/WKString.h
new file mode 100644
index 0000000..381b3c6
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKString.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKString.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKType.h b/src/3rdparty/webkit/include/WebKit2/WKType.h
new file mode 100644
index 0000000..addabdd
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKType.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKType.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKURL.h b/src/3rdparty/webkit/include/WebKit2/WKURL.h
new file mode 100644
index 0000000..d7f765b
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKURL.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKURL.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKURLRequest.h b/src/3rdparty/webkit/include/WebKit2/WKURLRequest.h
new file mode 100644
index 0000000..21d3b70
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKURLRequest.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKURLRequest.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKURLResponse.h b/src/3rdparty/webkit/include/WebKit2/WKURLResponse.h
new file mode 100644
index 0000000..f62c0f5
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKURLResponse.h
@@ -0,0 +1 @@
+#include "WebKit2/Shared/API/c/WKURLResponse.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WKView.h b/src/3rdparty/webkit/include/WebKit2/WKView.h
new file mode 100644
index 0000000..4247dc6
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WKView.h
@@ -0,0 +1 @@
+#include "WebKit2/UIProcess/API/mac/WKView.h"
diff --git a/src/3rdparty/webkit/include/WebKit2/WebProcess.h b/src/3rdparty/webkit/include/WebKit2/WebProcess.h
new file mode 100644
index 0000000..9b8eb4a
--- /dev/null
+++ b/src/3rdparty/webkit/include/WebKit2/WebProcess.h
@@ -0,0 +1 @@
+#include "WebKit2/WebProcess/WebProcess.h"
diff --git a/src/corelib/arch/generic/qatomic_generic_windows.cpp b/src/corelib/arch/generic/qatomic_generic_windows.cpp
index 7ce0eea..123b823 100644
--- a/src/corelib/arch/generic/qatomic_generic_windows.cpp
+++ b/src/corelib/arch/generic/qatomic_generic_windows.cpp
@@ -43,6 +43,7 @@
 
 #include <QtCore/qatomic.h>
 
+QT_BEGIN_NAMESPACE
 
 class QCriticalSection
 {
@@ -129,3 +130,5 @@ void *QBasicAtomicPointer_fetchAndAddOrdered(void * volatile *_q_value, qptrdiff
         qAtomicCriticalSection.unlock();
     return returnValue;
 }
+
+QT_END_NAMESPACE
diff --git a/src/corelib/arch/qatomic_armv6.h b/src/corelib/arch/qatomic_armv6.h
index 96b561e..dd465db 100644
--- a/src/corelib/arch/qatomic_armv6.h
+++ b/src/corelib/arch/qatomic_armv6.h
@@ -152,6 +152,7 @@ inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue)
     asm volatile("0:\n"
                  "ldrex %[result], [%[_q_value]]\n"
                  "eors %[result], %[result], %[expectedValue]\n"
+                 "itt eq\n"
                  "strexeq %[result], %[newValue], [%[_q_value]]\n"
                  "teqeq %[result], #1\n"
                  "beq 0b\n"
@@ -210,6 +211,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer<T>::testAndSetRelaxed(T *expectedValu
     asm volatile("0:\n"
                  "ldrex %[result], [%[_q_value]]\n"
                  "eors %[result], %[result], %[expectedValue]\n"
+                 "itt eq\n"
                  "strexeq %[result], %[newValue], [%[_q_value]]\n"
                  "teqeq %[result], #1\n"
                  "beq 0b\n"
diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp
index 985f515..dd06a2a 100644
--- a/src/corelib/codecs/qtextcodec.cpp
+++ b/src/corelib/codecs/qtextcodec.cpp
@@ -213,12 +213,13 @@ QTextCodecCleanup::~QTextCodecCleanup()
     destroying_is_ok = true;
 #endif
 
-    for (QList<QTextCodec *>::const_iterator it = all->constBegin()
-            ; it != all->constEnd(); ++it) {
+    QList<QTextCodec *> *myAll = all;
+    all = 0; // Otherwise the d'tor destroys the iterator
+    for (QList<QTextCodec *>::const_iterator it = myAll->constBegin()
+            ; it != myAll->constEnd(); ++it) {
         delete *it;
     }
-    delete all;
-    all = 0;
+    delete myAll;
     localeMapper = 0;
 
 #ifdef Q_DEBUG_TEXTCODEC
diff --git a/src/corelib/codecs/qutfcodec.cpp b/src/corelib/codecs/qutfcodec.cpp
index f59f404..aaebec3 100644
--- a/src/corelib/codecs/qutfcodec.cpp
+++ b/src/corelib/codecs/qutfcodec.cpp
@@ -90,8 +90,8 @@ QByteArray QUtf8::convertFromUnicode(const QChar *uc, int len, QTextCodec::Conve
     while (ch < end) {
         uint u = ch->unicode();
         if (surrogate_high >= 0) {
-            if (u >= 0xdc00 && u < 0xe000) {
-                u = (surrogate_high - 0xd800)*0x400 + (u - 0xdc00) + 0x10000;
+            if (ch->isLowSurrogate()) {
+                u = QChar::surrogateToUcs4(surrogate_high, u);
                 surrogate_high = -1;
             } else {
                 // high surrogate without low
@@ -101,13 +101,13 @@ QByteArray QUtf8::convertFromUnicode(const QChar *uc, int len, QTextCodec::Conve
                 surrogate_high = -1;
                 continue;
             }
-        } else if (u >= 0xdc00 && u < 0xe000) {
+        } else if (ch->isLowSurrogate()) {
             // low surrogate without high
             *cursor = replacement;
             ++ch;
             ++invalid;
             continue;
-        } else if (u >= 0xd800 && u < 0xdc00) {
+        } else if (ch->isHighSurrogate()) {
             surrogate_high = u;
             ++ch;
             continue;
diff --git a/src/corelib/concurrent/qfuturewatcher.cpp b/src/corelib/concurrent/qfuturewatcher.cpp
index 0bef4a6..a70f56b 100644
--- a/src/corelib/concurrent/qfuturewatcher.cpp
+++ b/src/corelib/concurrent/qfuturewatcher.cpp
@@ -600,5 +600,8 @@ void QFutureWatcherBase::setPaused(bool) { }
 void QFutureWatcherBase::pause() { }
 void QFutureWatcherBase::resume() { }
 void QFutureWatcherBase::togglePaused() { }
+bool QFutureWatcherBase::event(QEvent *) { return false; }
+void QFutureWatcherBase::connectNotify(const char *) { }
+void QFutureWatcherBase::disconnectNotify(const char *) { }
 
 #endif // QT_NO_QFUTURE
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index dc92866..03e0d1f 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -539,7 +539,7 @@
     string, "ddd MMM d yyyy". See QDate::toString() for more information.
 
     \value ISODate \l{ISO 8601} extended format: either \c{YYYY-MM-DD} for dates or
-    \c{YYYY-MM-DDTHH:MM:SS}, \c{YYYY-MM-DDTHH:MM:SSTZD} (e.g., 1997-07-16T19:20:30+01:00)
+    \c{YYYY-MM-DDTHH:mm:ss}, \c{YYYY-MM-DDTHH:mm:ssTZD} (e.g., 1997-07-16T19:20:30+01:00)
     for combined dates and times.
 
     \value SystemLocaleShortDate The \l{QLocale::ShortFormat}{short format} used
@@ -2560,7 +2560,7 @@
     will imply to use the layout direction set on the parent widget or QApplication. This
     has the same effect as QWidget::unsetLayoutDirection().
 
-    When LayoutDirectoinAuto is used in conjunction with text layouting, it will imply that the text
+    When LayoutDirectionAuto is used in conjunction with text layouting, it will imply that the text
     directionality is determined from the content of the string to be layouted.
 
     \sa QApplication::setLayoutDirection(), QWidget::setLayoutDirection(), QTextOption::setTextDirection(), QString::isRightToLeft()
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri
index e411f8f..78993a0 100644
--- a/src/corelib/io/io.pri
+++ b/src/corelib/io/io.pri
@@ -118,5 +118,7 @@ win32 {
 }
 integrity {
 	SOURCES += io/qfsfileengine_unix.cpp \
-	           io/qfsfileengine_iterator_unix.cpp
+            io/qfsfileengine_iterator.cpp \
+            io/qfilesystemengine_unix.cpp \
+            io/qfilesystemiterator_unix.cpp
 }
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 9081e31..4ba8e06 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -2019,7 +2019,7 @@ QString QDir::cleanPath(const QString &path)
     const QChar *p = name.unicode();
     for (int i = 0, last = -1, iwrite = 0; i < len; ++i) {
         if (p[i] == QLatin1Char('/')) {
-            while (i < len-1 && p[i+1] == QLatin1Char('/')) {
+            while (i+1 < len && p[i+1] == QLatin1Char('/')) {
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) //allow unc paths
                 if (!i)
                     break;
@@ -2027,9 +2027,9 @@ QString QDir::cleanPath(const QString &path)
                 i++;
             }
             bool eaten = false;
-            if (i < len - 1 && p[i+1] == QLatin1Char('.')) {
+            if (i+1 < len && p[i+1] == QLatin1Char('.')) {
                 int dotcount = 1;
-                if (i < len - 2 && p[i+2] == QLatin1Char('.'))
+                if (i+2 < len && p[i+2] == QLatin1Char('.'))
                     dotcount++;
                 if (i == len - dotcount - 1) {
                     if (dotcount == 1) {
diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp
index 929b2f9..06c403a 100644
--- a/src/corelib/io/qfile.cpp
+++ b/src/corelib/io/qfile.cpp
@@ -366,9 +366,11 @@ QFilePrivate::setError(QFile::FileError err, int errNum)
 
     \value AutoCloseHandle The file handle passed into open() should be
     closed by close(), the default behaviour is that close just flushes
-    the file and the app is responsible for closing the file handle. When
-    opening a file by name, this flag is ignored as Qt always "owns" the
+    the file and the application is responsible for closing the file handle.
+    When opening a file by name, this flag is ignored as Qt always "owns" the
     file handle and must close it.
+    \value DontCloseHandle The file handle passed into open() will not be
+    closed by Qt. The application must ensure that close() is called.
  */
 
 #ifdef QT3_SUPPORT
@@ -1210,7 +1212,7 @@ bool QFile::open(int fd, OpenMode mode)
     Returns true if successful; otherwise returns false.
 
     When a QFile is opened using this function, behaviour of close() is
-    controlled by the AutoCloseHandle flag.
+    controlled by the \a handleFlags argument.
     If AutoCloseHandle is specified, and this function succeeds,
     then calling close() closes the adopted handle.
     Otherwise, close() does not actually close the file, but only flushes it.
@@ -1269,7 +1271,7 @@ bool QFile::open(int fd, OpenMode mode, FileHandleFlags handleFlags)
     Returns true if successful; otherwise returns false.
 
     When a QFile is opened using this function, behaviour of close() is
-    controlled by the AutoCloseHandle flag.
+    controlled by the \a handleFlags argument.
     If AutoCloseHandle is specified, and this function succeeds,
     then calling close() closes the adopted handle.
     Otherwise, close() does not actually close the file, but only flushes it.
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
index cfb17de..b1b5e7e 100644
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
@@ -264,12 +264,14 @@ QString QFileSystemEngine::resolveUserName(uint userId)
 #endif
 
     struct passwd *pw = 0;
+#if !defined(Q_OS_INTEGRITY)
 #if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
     struct passwd entry;
     getpwuid_r(userId, &entry, buf.data(), buf.size(), &pw);
 #else
     pw = getpwuid(userId);
 #endif
+#endif
     if (pw)
         return QFile::decodeName(QByteArray(pw->pw_name));
     return QString();
@@ -286,6 +288,7 @@ QString QFileSystemEngine::resolveGroupName(uint groupId)
 #endif
 
     struct group *gr = 0;
+#if !defined(Q_OS_INTEGRITY)
 #if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
     size_max = sysconf(_SC_GETGR_R_SIZE_MAX);
     if (size_max == -1)
@@ -305,6 +308,7 @@ QString QFileSystemEngine::resolveGroupName(uint groupId)
 #else
     gr = getgrgid(groupId);
 #endif
+#endif
     if (gr)
         return QFile::decodeName(QByteArray(gr->gr_name));
     return QString();
diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp
index 548f9cf..dd4c40f 100644
--- a/src/corelib/io/qfsfileengine.cpp
+++ b/src/corelib/io/qfsfileengine.cpp
@@ -120,9 +120,12 @@ void QFSFileEnginePrivate::init()
     openMode = QIODevice::NotOpen;
     fd = -1;
     fh = 0;
-#if defined (Q_OS_SYMBIAN) && !defined(QT_SYMBIAN_USE_NATIVE_FILEMAP)
+#if defined (Q_OS_SYMBIAN)
+    symbianFilePos = 0;
+#if !defined(QT_SYMBIAN_USE_NATIVE_FILEMAP)
     fileHandleForMaps = -1;
 #endif
+#endif
     lastIOCommand = IOFlushCommand;
     lastFlushFailed = false;
     closeFileHandle = false;
@@ -233,6 +236,14 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode, FILE *fh)
     return open(openMode, fh, QFile::DontCloseHandle);
 }
 
+/*!
+    Opens the file handle \a fh in \a openMode mode. Returns true
+    on success; otherwise returns false.
+
+    The \a handleFlags argument specifies whether the file handle will be
+    closed by Qt. See the QFile::FileHandleFlags documentation for more
+    information.
+*/
 bool QFSFileEngine::open(QIODevice::OpenMode openMode, FILE *fh, QFile::FileHandleFlags handleFlags)
 {
     Q_D(QFSFileEngine);
@@ -294,6 +305,14 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode, int fd)
     return open(openMode, fd, QFile::DontCloseHandle);
 }
 
+/*!
+    Opens the file descriptor \a fd in \a openMode mode. Returns true
+    on success; otherwise returns false.
+
+    The \a handleFlags argument specifies whether the file handle will be
+    closed by Qt. See the QFile::FileHandleFlags documentation for more
+    information.
+*/
 bool QFSFileEngine::open(QIODevice::OpenMode openMode, int fd, QFile::FileHandleFlags handleFlags)
 {
     Q_D(QFSFileEngine);
diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp
index 9de282a..4961722 100644
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
@@ -252,6 +252,14 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode)
     return true;
 }
 
+/*!
+    Opens the file descriptor specified by \a file in the mode given by
+    \a openMode. Returns true on success; otherwise returns false.
+
+    The \a handleFlags argument specifies whether the file handle will be
+    closed by Qt. See the QFile::FileHandleFlags documentation for more
+    information.
+*/
 bool QFSFileEngine::open(QIODevice::OpenMode openMode, const RFile &file, QFile::FileHandleFlags handleFlags)
 {
     Q_D(QFSFileEngine);
diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp
index ea00cb4..dae4e82 100644
--- a/src/corelib/io/qiodevice.cpp
+++ b/src/corelib/io/qiodevice.cpp
@@ -423,6 +423,8 @@ QIODevice::~QIODevice()
     seeking backwards and forwards in the data stream. Regular files
     are non-sequential.
 
+    The QIODevice implementation returns false.
+
     \sa bytesAvailable()
 */
 bool QIODevice::isSequential() const
diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp
index 5568920..d5ce56b 100644
--- a/src/corelib/io/qnoncontiguousbytedevice.cpp
+++ b/src/corelib/io/qnoncontiguousbytedevice.cpp
@@ -501,8 +501,6 @@ QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QIODevice *dev
 }
 
 /*!
-    \fn static QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QRingBuffer *ringBuffer);
-
     Create a QNonContiguousByteDevice out of a QRingBuffer.
 
     \internal
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp
index 79b2728..ab8cc39 100644
--- a/src/corelib/io/qsettings.cpp
+++ b/src/corelib/io/qsettings.cpp
@@ -66,13 +66,12 @@
 
 #ifndef QT_NO_QOBJECT
 #include "qcoreapplication.h"
+#endif
 
 #ifdef Q_OS_WIN // for homedirpath reading from registry
 #include "qt_windows.h"
 #include <private/qsystemlibrary_p.h>
-
-#endif // Q_OS_WIN
-#endif // QT_NO_QOBJECT
+#endif
 
 #ifdef Q_OS_VXWORKS
 #  include <ioLib.h>
@@ -1024,9 +1023,6 @@ static QString windowsConfigPath(int type)
 {
     QString result;
 
-#ifndef QT_NO_QOBJECT
-    // We can't use QLibrary if there is QT_NO_QOBJECT is defined
-    // This only happens when bootstrapping qmake.
 #ifndef Q_OS_WINCE
     QSystemLibrary library(QLatin1String("shell32"));
 #else
@@ -1040,8 +1036,6 @@ static QString windowsConfigPath(int type)
         result = QString::fromWCharArray(path);
     }
 
-#endif // QT_NO_QOBJECT
-
     if (result.isEmpty()) {
         switch (type) {
 #ifndef Q_OS_WINCE
@@ -1114,11 +1108,11 @@ static void initDefaultPaths(QMutexLocker *locker)
             userPath += QLatin1String(".config");
 #endif
         } else if (*env == '/') {
-            userPath = QLatin1String(env);
+            userPath = QFile::decodeName(env);
         } else {
             userPath = homePath;
             userPath += QLatin1Char('/');
-            userPath += QLatin1String(env);
+            userPath += QFile::decodeName(env);
         }
         userPath += QLatin1Char('/');
 
@@ -2338,6 +2332,25 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
     %COMMON_APPDATA% path is usually \tt{C:\\Documents and
     Settings\\All Users\\Application Data}.
 
+    On Symbian, the following files are used for both IniFormat and
+    NativeFormat (in this example, we assume that the application is
+    installed on the \c e-drive and its Secure ID is \c{0xECB00931}):
+
+    \list 1
+    \o \c{c:\data\.config\MySoft\Star Runner.conf}
+    \o \c{c:\data\.config\MySoft.conf}
+    \o \c{e:\private\ecb00931\MySoft\Star Runner.conf}
+    \o \c{e:\private\ecb00931\MySoft.conf}
+    \endlist
+
+    The SystemScope settings location is determined from the installation
+    drive and Secure ID (UID3) of the application. If the application is
+    built-in on the ROM, the drive used for SystemScope is \c c:.
+
+    \note Symbian SystemScope settings are by default private to the
+    application and not shared between applications, unlike other
+    environments.
+
     The paths for the \c .ini and \c .conf files can be changed using
     setPath(). On Unix and Mac OS X, the user can override them by by
     setting the \c XDG_CONFIG_HOME environment variable; see
@@ -2395,6 +2408,32 @@ void QConfFileSettingsPrivate::ensureSectionParsed(QConfFile *confFile,
     On other platforms than Windows, "Default" and "." would be
     treated as regular subkeys.
 
+    \section2 Securing application settings in Symbian
+
+    UserScope settings in Symbian are writable by any application by
+    default. To protect the application settings from access and tampering
+    by other applications, the settings need to be placed in the private
+    secure area of the application. This can be done by specifying the
+    settings storage path directly to the private area. The following
+    snippet changes the UserScope to \c{c:/private/ecb00931/MySoft.conf}
+    (provided the application is installed on the \c{c-drive} and its
+    Secure ID is \c{0xECB00931}:
+
+    \snippet doc/src/snippets/code/src_corelib_io_qsettings.cpp 30
+
+    Framework libraries (like Qt itself) may store configuration and cache
+    settings using UserScope, which is accessible and writable by other
+    applications. If the application is very security sensitive or uses
+    high platform security capabilities, it may be prudent to also force
+    framework settings to be stored in the private directory of the
+    application. This can be done by changing the default path of UserScope
+    before QApplication is created:
+
+    \snippet doc/src/snippets/code/src_corelib_io_qsettings.cpp 31
+
+    Note that this may affect framework libraries' functionality if they expect
+    the settings to be shared between applications.
+
     \section2 Platform Limitations
 
     While QSettings attempts to smooth over the differences between
@@ -3429,6 +3468,8 @@ void QSettings::setUserIniPath(const QString &dir)
     \row                                                        \o SystemScope \o \c /etc/xdg
     \row    \o{1,2} Mac OS X    \o{1,2} IniFormat               \o UserScope   \o \c $HOME/.config
     \row                                                        \o SystemScope \o \c /etc/xdg
+    \row    \o{1,2} Symbian     \o{1,2} NativeFormat, IniFormat \o UserScope   \o \c c:/data/.config
+    \row                                                        \o SystemScope \o \c <drive>/private/<uid>
     \endtable
 
     The default UserScope paths on Unix and Mac OS X (\c
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 4226f9e..60a4ce3 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -63,8 +63,9 @@
     unencoded representation is suitable for showing to users, but
     the encoded representation is typically what you would send to
     a web server. For example, the unencoded URL
-    "http://b\uuml\c{}hler.example.com" would be sent to the server as
-    "http://xn--bhler-kva.example.com/List%20of%20applicants.xml".
+    "http://b\uuml\c{}hler.example.com/List of applicants.xml" would be sent to the server as
+    "http://xn--bhler-kva.example.com/List%20of%20applicants.xml",
+    and this can be verified by calling the toEncoded() function.
 
     A URL can also be constructed piece by piece by calling
     setScheme(), setUserName(), setPassword(), setHost(), setPort(),
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 18a5eae..752bbaa 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -273,6 +273,29 @@ bool QCoreApplicationPrivate::is_app_closing = false;
 // initialized in qcoreapplication and in qtextstream autotest when setlocale is called.
 Q_CORE_EXPORT bool qt_locale_initialized = false;
 
+#ifdef Q_OS_SYMBIAN
+// The global QSettings needs to be cleaned where cleanup stack is available, which is not
+// normally the case when global static destructors are run.
+// Declare a custom QGlobalStaticDeleter for QSettings to handle that case.
+template<>
+class QGlobalStaticDeleter<QSettings>
+{
+public:
+    QGlobalStatic<QSettings> &globalStatic;
+    QGlobalStaticDeleter(QGlobalStatic<QSettings> &_globalStatic)
+        : globalStatic(_globalStatic)
+    { }
+
+    inline ~QGlobalStaticDeleter()
+    {
+        CTrapCleanup *cleanup = CTrapCleanup::New();
+        delete globalStatic.pointer;
+        delete cleanup;
+        globalStatic.pointer = 0;
+        globalStatic.destroyed = true;
+    }
+};
+#endif
 
 /*
   Create an instance of Trolltech.conf. This ensures that the settings will not
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index b4c37f4..8597fa3 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -432,9 +432,10 @@ int QMetaObject::constructorCount() const
 }
 
 /*!
-    Returns the number of methods in this class, including the number of
-    properties provided by each base class. These include signals and slots
-    as well as normal member functions.
+    Returns the number of methods known to the meta-object system in this class,
+    including the number of properties provided by each base class. These
+    include signals and slots as well as member functions declared with the
+    Q_INVOKABLE macro.
 
     Use code like the following to obtain a QStringList containing the methods
     specific to a given class:
@@ -1245,6 +1246,10 @@ bool QMetaObject::invokeMethod(QObject *obj,
     tag(), and an access() specifier. You can use invoke() to invoke
     the method on an arbitrary QObject.
 
+    A method will only be registered with the meta-object system if it
+    is a slot, a signal, or declared with the Q_INVOKABLE macro.
+    Constructors can also be registered with Q_INVOKABLE.
+
     \sa QMetaObject, QMetaEnum, QMetaProperty, {Qt's Property System}
 */
 
diff --git a/src/corelib/kernel/qsystemsemaphore_win.cpp b/src/corelib/kernel/qsystemsemaphore_win.cpp
index 0e9d645..76b57b9 100644
--- a/src/corelib/kernel/qsystemsemaphore_win.cpp
+++ b/src/corelib/kernel/qsystemsemaphore_win.cpp
@@ -133,6 +133,6 @@ bool QSystemSemaphorePrivate::modifySemaphore(int count)
     return true;
 }
 
-#endif // QT_NO_SYSTEMSEMAPHORE
-
 QT_END_NAMESPACE
+
+#endif // QT_NO_SYSTEMSEMAPHORE
diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp
index eb29e6e..83c6194 100644
--- a/src/corelib/plugin/quuid.cpp
+++ b/src/corelib/plugin/quuid.cpp
@@ -387,17 +387,17 @@ QUuid::QUuid(const QByteArray &text)
 #endif
 
 /*!
-  Creates a QUuid object from the binary representation of the UUID, as
-  specified by RFC 4122 section 4.1.2. See toRfc4122() for a further
-  explanation of the order of bytes required.
+  \since 4.8
 
-  The byte array accepted is NOT a human readable format.
+  Creates a QUuid object from the binary representation of the UUID given
+  by \a bytes, as specified by RFC 4122 section 4.1.2. See toRfc4122() for a
+  further explanation of the order of bytes required.
 
-  If the conversion fails, a null UUID is created.
+  The byte array accepted is \e not a human readable format.
 
-    \since 4.8
+  If the conversion fails, a null UUID is created.
 
-    \sa toRfc4122(), QUuid()
+  \sa toRfc4122(), QUuid()
 */
 QUuid QUuid::fromRfc4122(const QByteArray &bytes)
 {
@@ -901,6 +901,12 @@ QUuid QUuid::createUuid()
             uint randNumber = 0;
             for (int filled = 0; filled < intbits; filled += randbits)
                 randNumber |= qrand()<<filled;
+#if defined(Q_OS_SYMBIAN)
+            // Symbian does not have /dev/urandom, so entropy is low.
+            // Add more entropy from the kernel tick count (1ms resolution).
+            // big multipler used to splatter the tick count bits over the whole 32 bits
+            randNumber ^= User::NTickCount() * 0x3b9aca07;
+#endif
             *(data+chunks) = randNumber;
         }
     }
diff --git a/src/corelib/thread/qthread_symbian.cpp b/src/corelib/thread/qthread_symbian.cpp
index 46339a6..2ea1b44 100644
--- a/src/corelib/thread/qthread_symbian.cpp
+++ b/src/corelib/thread/qthread_symbian.cpp
@@ -324,13 +324,14 @@ void *QThreadPrivate::start(void *arg)
     data->threadId = QThread::currentThreadId();
     set_thread_data(data);
 
+    CTrapCleanup *cleanup = CTrapCleanup::New();
+    q_check_ptr(cleanup);
+
     {
         QMutexLocker locker(&thr->d_func()->mutex);
         data->quitNow = thr->d_func()->exited;
     }
 
-    CTrapCleanup *cleanup = CTrapCleanup::New();
-
     // ### TODO: allow the user to create a custom event dispatcher
     createEventDispatcher(data);
 
diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h
index 16861c9..2408cd3 100644
--- a/src/corelib/tools/qcache.h
+++ b/src/corelib/tools/qcache.h
@@ -205,8 +205,7 @@ void QCache<Key,T>::trim(int m)
     while (n && total > m) {
         Node *u = n;
         n = n->p;
-        if (qIsDetached(*u->t))
-            unlink(*u);
+        unlink(*u);
     }
 }
 
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index a6fee43..e1b4232 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -1538,7 +1538,7 @@ int QTime::msec() const
 
     If \a format is Qt::ISODate, the string format corresponds to the
     ISO 8601 extended specification for representations of dates,
-    which is also HH:MM:SS. (However, contrary to ISO 8601, dates
+    which is also HH:mm:ss. (However, contrary to ISO 8601, dates
     before 15 October 1582 are handled as Julian dates, not Gregorian
     dates. See \l{QDate G and J} {Use of Gregorian and Julian
     Calendars}. This might change in a future version of Qt.)
@@ -2461,7 +2461,7 @@ void QDateTime::setTime_t(uint secsSince1Jan1970UTC)
 
     If the \a format is Qt::ISODate, the string format corresponds
     to the ISO 8601 extended specification for representations of
-    dates and times, taking the form YYYY-MM-DDTHH:MM:SS[Z|[+|-]HH:MM],
+    dates and times, taking the form YYYY-MM-DDTHH:mm:ss[Z|[+|-]HH:mm],
     depending on the timeSpec() of the QDateTime. If the timeSpec()
     is Qt::UTC, Z will be appended to the string; if the timeSpec() is
     Qt::OffsetFromUTC the offset in hours and minutes from UTC will
@@ -2788,6 +2788,8 @@ int QDateTime::secsTo(const QDateTime &other) const
 }
 
 /*!
+    \since 4.7
+
     Returns the number of milliseconds from this datetime to the \a other
     datetime. If the \a other datetime is earlier than this datetime,
     the value returned is negative.
@@ -4040,8 +4042,11 @@ static QDateTimePrivate::Spec utcToLocal(QDate &date, QTime &time)
             RTz tz;
             User::LeaveIfError(tz.Connect());
             CleanupClosePushL(tz);
-            res.tm_isdst = tz.IsDaylightSavingOnL(*tz.GetTimeZoneIdL(),utcTTime);
+            CTzId *tzId = tz.GetTimeZoneIdL();
+            CleanupStack::PushL(tzId);
+            res.tm_isdst = tz.IsDaylightSavingOnL(*tzId,utcTTime);
             User::LeaveIfError(tz.ConvertToLocalTime(utcTTime));
+            CleanupStack::PopAndDestroy(tzId);
             CleanupStack::PopAndDestroy(&tz));
         if (KErrNone == err) {
             TDateTime localDateTime = utcTTime.DateTime();
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp
index e68ddd5..18bfe24 100644
--- a/src/corelib/tools/qlist.cpp
+++ b/src/corelib/tools/qlist.cpp
@@ -460,8 +460,8 @@ void **QListData::erase(void **xi)
 
     Note that the internal array only ever gets bigger over the life
     of the list. It never shrinks. The internal array is deallocated
-    by the destructor and by the assignment operator, when one list
-    is assigned to another.
+    by the destructor, by clear(), and by the assignment operator,
+    when one list is assigned to another.
 
     Here's an example of a QList that stores integers and
     a QList that stores QDate values:
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index 4eb05d6..9f7b23f 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -769,25 +769,32 @@ Q_OUTOFLINE_TEMPLATE void QList<T>::clear()
 template <typename T>
 Q_OUTOFLINE_TEMPLATE int QList<T>::removeAll(const T &_t)
 {
-    detachShared();
+    int index = indexOf(_t);
+    if (index == -1)
+        return 0;
+
     const T t = _t;
-    int removedCount=0, i=0;
-    Node *n;
-    while (i < p.size())
-        if ((n = reinterpret_cast<Node *>(p.at(i)))->t() == t) {
-            node_destruct(n);
-            p.remove(i);
-            ++removedCount;
-        } else {
-            ++i;
-        }
+    detach();
+
+    Node *i = reinterpret_cast<Node *>(p.at(index));
+    Node *e = reinterpret_cast<Node *>(p.end());
+    Node *n = i;
+    node_destruct(i);
+    while (++i != e) {
+        if (i->t() == t)
+            node_destruct(i);
+        else
+            *n++ = *i;
+    }
+
+    int removedCount = e - n;
+    d->end -= removedCount;
     return removedCount;
 }
 
 template <typename T>
 Q_OUTOFLINE_TEMPLATE bool QList<T>::removeOne(const T &_t)
 {
-    detachShared();
     int index = indexOf(_t);
     if (index != -1) {
         removeAt(index);
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc
index 5d4f305..95a7165 100644
--- a/src/corelib/tools/qlocale.qdoc
+++ b/src/corelib/tools/qlocale.qdoc
@@ -806,6 +806,10 @@
     \internal
 */
 /*!
+    \fn QSystemLocale::CurrencyToStringArgument::CurrencyToStringArgument(const QVariant &v, const QString &s)
+    \internal
+*/
+/*!
     \variable QSystemLocale::CurrencyToStringArgument::value
 
     An input value that should be converted to its string representation.
diff --git a/src/corelib/tools/qlocale_symbian.cpp b/src/corelib/tools/qlocale_symbian.cpp
index cdf0ab1..1214e46 100644
--- a/src/corelib/tools/qlocale_symbian.cpp
+++ b/src/corelib/tools/qlocale_symbian.cpp
@@ -195,7 +195,9 @@ QByteArray qt_symbianLocaleName(int code)
     return qt_resolveSymbianLocaleName(code, ISO);
 }
 
-// order is: normal, abbr, nmode, nmode+abbr
+// Rows are: normal, abbr, nmode, nmode+abbr
+// First three values on a row are used for three component date,
+// while the last two are used for two component date (i.e. no year).
 static const char *us_locale_dep[] = {
     "MM", "dd", "yyyy", "MM", "dd",
     "M", "d", "yy", "M", "d",
@@ -214,6 +216,13 @@ static const char *jp_locale_dep[] = {
     "yyyy", "MMMM", "dd", "MMMM", "dd",
     "yy", "MMM", "d", "MMM", "d" };
 
+// 0 = day, 1 = month, 2 = year
+static const int digit_map[] = {
+    1, 0, 2, 1, 0, // American
+    0, 1, 2, 0, 1, // European
+    2, 1, 0, 1, 0  // Japanese
+};
+
 /*!
     Returns a Qt version of the given \a sys_fmt Symbian locale format string.
 */
@@ -229,6 +238,9 @@ static QString s60ToQtFormat(const QString &sys_fmt)
     int i = 0;
     bool open_escape = false;
     bool abbrev_next = false;
+    bool abbrev_day = false;
+    bool abbrev_month = false;
+    bool abbrev_year = false;
     bool locale_indep_ordering = false;
     bool minus_mode = false;
     bool plus_mode = false;
@@ -305,8 +317,11 @@ static QString s60ToQtFormat(const QString &sys_fmt)
 
                 case 'D':
                 {
-                    if (!locale_indep_ordering)
+                    if (!locale_indep_ordering) {
+                        if (abbrev_next)
+                            abbrev_day = true;
                         break;
+                    }
 
                     if (!abbrev_next)
                         result += QLatin1String("dd");
@@ -318,8 +333,11 @@ static QString s60ToQtFormat(const QString &sys_fmt)
 
                 case 'M':
                 {
-                    if (!locale_indep_ordering)
+                    if (!locale_indep_ordering) {
+                        if (abbrev_next)
+                            abbrev_month = true;
                         break;
+                    }
 
                     if (!n_mode) {
                         if (!abbrev_next)
@@ -340,8 +358,11 @@ static QString s60ToQtFormat(const QString &sys_fmt)
                 {
                     n_mode = true;
 
-                    if (!locale_indep_ordering)
+                    if (!locale_indep_ordering) {
+                        if (abbrev_next)
+                            abbrev_month = true;
                         break;
+                    }
 
                     if (!abbrev_next)
                         result += QLatin1String("MMMM");
@@ -353,8 +374,11 @@ static QString s60ToQtFormat(const QString &sys_fmt)
 
                 case 'Y':
                 {
-                    if (!locale_indep_ordering)
+                    if (!locale_indep_ordering) {
+                        if (abbrev_next)
+                            abbrev_year = true;
                         break;
+                    }
 
                     if (!abbrev_next)
                         result += QLatin1String("yyyy");
@@ -522,7 +546,9 @@ static QString s60ToQtFormat(const QString &sys_fmt)
 
                     const char **locale_dep;
                     switch (df) {
-                        default: // fallthru to american
+                        default:
+                            df = EDateAmerican;
+                            // fallthru to american
                         case EDateAmerican:
                             locale_dep = us_locale_dep;
                             break;
@@ -534,12 +560,33 @@ static QString s60ToQtFormat(const QString &sys_fmt)
                             break;
                     }
                     int offset = 0;
-                    if (abbrev_next)
+                    int adjustedDigit = c.digitValue() - 1;
+
+                    bool abbrev_this = abbrev_next;
+                    // If abbreviation specified for this digit, use that.
+                    // Otherwise abbreviate according to %D, %M, and %Y specified previously.
+                    if (!abbrev_this) {
+                        switch (digit_map[adjustedDigit + (static_cast<int>(df) * 5)]) {
+                            case 0:
+                                abbrev_this = abbrev_day;
+                                break;
+                            case 1:
+                                abbrev_this = abbrev_month;
+                                break;
+                            case 2:
+                                abbrev_this = abbrev_year;
+                                break;
+                            default:
+                                break; // never happens
+                        }
+                    }
+
+                    if (abbrev_this)
                         offset += 5;
                     if (n_mode)
                         offset += 10;
 
-                    result += QLatin1String(locale_dep[offset + (c.digitValue()-1)]);
+                    result += QLatin1String(locale_dep[offset + (adjustedDigit)]);
                     break;
                 }
 
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp
index 187ad67..9f68313 100644
--- a/src/dbus/qdbusabstractinterface.cpp
+++ b/src/dbus/qdbusabstractinterface.cpp
@@ -88,6 +88,7 @@ QDBusAbstractInterfacePrivate::QDBusAbstractInterfacePrivate(const QString &serv
     : connection(con), service(serv), path(p), interface(iface),
       lastError(checkIfValid(serv, p, iface, isDynamic, (connectionPrivate() &&
                                                          connectionPrivate()->mode == QDBusConnectionPrivate::PeerMode))),
+      timeout(-1),
       isValid(!lastError.isValid())
 {
     if (!isValid)
@@ -144,7 +145,7 @@ void QDBusAbstractInterfacePrivate::property(const QMetaProperty &mp, QVariant &
                                                       QLatin1String("Get"));
     QDBusMessagePrivate::setParametersValidated(msg, true);
     msg << interface << QString::fromUtf8(mp.name());
-    QDBusMessage reply = connection.call(msg, QDBus::Block);
+    QDBusMessage reply = connection.call(msg, QDBus::Block, timeout);
 
     if (reply.type() != QDBusMessage::ReplyMessage) {
         lastError = reply;
@@ -210,7 +211,7 @@ bool QDBusAbstractInterfacePrivate::setProperty(const QMetaProperty &mp, const Q
                                                 QLatin1String("Set"));
     QDBusMessagePrivate::setParametersValidated(msg, true);
     msg << interface << QString::fromUtf8(mp.name()) << QVariant::fromValue(QDBusVariant(value));
-    QDBusMessage reply = connection.call(msg, QDBus::Block);
+    QDBusMessage reply = connection.call(msg, QDBus::Block, timeout);
 
     if (reply.type() != QDBusMessage::ReplyMessage) {
         lastError = reply;
@@ -384,6 +385,28 @@ QDBusError QDBusAbstractInterface::lastError() const
 }
 
 /*!
+    Sets the timeout in seconds for all future DBus calls to \a timeout.
+    -1 means the default DBus timeout (usually 25 seconds).
+
+    \since 4.8
+*/
+void QDBusAbstractInterface::setTimeout(int timeout)
+{
+    d_func()->timeout = timeout;
+}
+
+/*!
+    Returns the current value of the timeout in seconds.
+    -1 means the default DBus timeout (usually 25 seconds).
+
+    \since 4.8
+*/
+int QDBusAbstractInterface::timeout() const
+{
+    return d_func()->timeout;
+}
+
+/*!
     Places a call to the remote method specified by \a method on this interface, using \a args as
     arguments. This function returns the message that was received as a reply, which can be a normal
     QDBusMessage::ReplyMessage (indicating success) or QDBusMessage::ErrorMessage (if the call
@@ -442,7 +465,7 @@ QDBusMessage QDBusAbstractInterface::callWithArgumentList(QDBus::CallMode mode,
     QDBusMessagePrivate::setParametersValidated(msg, true);
     msg.setArguments(args);
 
-    QDBusMessage reply = d->connection.call(msg, mode);
+    QDBusMessage reply = d->connection.call(msg, mode, d->timeout);
     if (thread() == QThread::currentThread())
         d->lastError = reply;       // will clear if reply isn't an error
 
@@ -475,7 +498,7 @@ QDBusPendingCall QDBusAbstractInterface::asyncCallWithArgumentList(const QString
     QDBusMessage msg = QDBusMessage::createMethodCall(service(), path(), interface(), method);
     QDBusMessagePrivate::setParametersValidated(msg, true);
     msg.setArguments(args);
-    return d->connection.asyncCall(msg);
+    return d->connection.asyncCall(msg, d->timeout);
 }
 
 /*!
diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h
index 72b922e..34ff410 100644
--- a/src/dbus/qdbusabstractinterface.h
+++ b/src/dbus/qdbusabstractinterface.h
@@ -95,6 +95,9 @@ public:
 
     QDBusError lastError() const;
 
+    void setTimeout(int timeout);
+    int timeout() const;
+
     QDBusMessage call(const QString &method,
                       const QVariant &arg1 = QVariant(),
                       const QVariant &arg2 = QVariant(),
diff --git a/src/dbus/qdbusabstractinterface_p.h b/src/dbus/qdbusabstractinterface_p.h
index a000daf..4f96165 100644
--- a/src/dbus/qdbusabstractinterface_p.h
+++ b/src/dbus/qdbusabstractinterface_p.h
@@ -77,6 +77,7 @@ public:
     QString path;
     QString interface;
     mutable QDBusError lastError;
+    int timeout;
 
     // this is set during creation and never changed
     // it can't be const because QDBusInterfacePrivate has one more check
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
index 4b4efb6..d3bab7a 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage.cpp
@@ -289,6 +289,12 @@ void QDeclarativeBorderImage::setSource(const QUrl &url)
         load();
 }
 
+void QDeclarativeBorderImage::setSourceSize(const QSize& size)
+{
+    Q_UNUSED(size);
+    qmlInfo(this) << "Setting sourceSize for borderImage not supported";
+}
+
 void QDeclarativeBorderImage::load()
 {
     Q_D(QDeclarativeBorderImage);
diff --git a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
index 6a50c3c..6b05608 100644
--- a/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeborderimage_p.h
@@ -63,9 +63,6 @@ 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,10 +80,11 @@ public:
     void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
     void setSource(const QUrl &url);
 
+    void setSourceSize(const QSize&);
+
 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 fd2dc45..ca6c496 100644
--- a/src/declarative/graphicsitems/qdeclarativeflickable.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeflickable.cpp
@@ -1532,7 +1532,7 @@ bool QDeclarativeFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event)
             d->handleMouseMoveEvent(&mouseEvent);
             break;
         case QEvent::GraphicsSceneMousePress:
-            if (d->pressed) // we are already pressed - this is a delayed replay
+            if (d->pressed && !event->spontaneous()) // we are already pressed - this is a delayed replay
                 return false;
 
             d->handleMousePressEvent(&mouseEvent);
diff --git a/src/declarative/graphicsitems/qdeclarativegridview.cpp b/src/declarative/graphicsitems/qdeclarativegridview.cpp
index e53472d..023737d 100644
--- a/src/declarative/graphicsitems/qdeclarativegridview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativegridview.cpp
@@ -1066,6 +1066,8 @@ void QDeclarativeGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
         highlightEnd = highlightRangeEnd;
     }
 
+    bool strictHighlightRange = haveHighlightRange && highlightRange == QDeclarativeGridView::StrictlyEnforceRange;
+
     if (snapMode != QDeclarativeGridView::NoSnap) {
         qreal tempPosition = isRightToLeftTopToBottom() ? -position()-size() : position();
         if (snapMode == QDeclarativeGridView::SnapOneRow && moveReason == Mouse) {
@@ -1083,7 +1085,7 @@ void QDeclarativeGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
         FxGridItem *topItem = snapItemAt(tempPosition+highlightStart);
         FxGridItem *bottomItem = snapItemAt(tempPosition+highlightEnd);
         qreal pos;
-        if (topItem && bottomItem && haveHighlightRange && highlightRange == QDeclarativeGridView::StrictlyEnforceRange) {
+        if (topItem && bottomItem && strictHighlightRange) {
             qreal topPos = qMin(topItem->rowPos() - highlightStart, -maxExtent);
             qreal bottomPos = qMax(bottomItem->rowPos() - highlightEnd, -minExtent);
             pos = qAbs(data.move + topPos) < qAbs(data.move + bottomPos) ? topPos : bottomPos;
@@ -1091,7 +1093,7 @@ void QDeclarativeGridViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
             qreal headerPos = 0;
             if (header)
                 headerPos = isRightToLeftTopToBottom() ? header->rowPos() + cellWidth - headerSize() : header->rowPos();
-            if (topItem->index == 0 && header && tempPosition+highlightStart < headerPos+headerSize()/2) {
+            if (topItem->index == 0 && header && tempPosition+highlightStart < headerPos+headerSize()/2 && !strictHighlightRange) {
                 pos = isRightToLeftTopToBottom() ? - headerPos + highlightStart - size() : headerPos - highlightStart;
             } else {
                 if (isRightToLeftTopToBottom())
diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index d36d163..b9d231e 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -3600,8 +3600,8 @@ void QDeclarativeItem::setSize(const QSizeF &size)
 bool QDeclarativeItem::hasActiveFocus() const
 {
     Q_D(const QDeclarativeItem);
-    return focusItem() == this ||
-           (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0);
+    return (focusItem() && focusItem()->isVisible()) && (focusItem() == this ||
+           (d->flags & QGraphicsItem::ItemIsFocusScope && focusItem() != 0));
 }
 
 /*!
diff --git a/src/declarative/graphicsitems/qdeclarativelistview.cpp b/src/declarative/graphicsitems/qdeclarativelistview.cpp
index f0fc96b..6a91e5f 100644
--- a/src/declarative/graphicsitems/qdeclarativelistview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativelistview.cpp
@@ -1295,6 +1295,7 @@ void QDeclarativeListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
 
     correctFlick = false;
     fixupMode = moveReason == Mouse ? fixupMode : Immediate;
+    bool strictHighlightRange = haveHighlightRange && highlightRange == QDeclarativeListView::StrictlyEnforceRange;
 
     qreal highlightStart;
     qreal highlightEnd;
@@ -1327,9 +1328,9 @@ void QDeclarativeListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
         FxListItem *topItem = snapItemAt(tempPosition+highlightStart);
         FxListItem *bottomItem = snapItemAt(tempPosition+highlightEnd);
         qreal pos;
-        bool isInBounds = -position() > maxExtent && -position() < minExtent;
+        bool isInBounds = -position() > maxExtent && -position() <= minExtent;
         if (topItem && isInBounds) {
-            if (topItem->index == 0 && header && tempPosition+highlightStart < header->position()+header->size()/2) {
+            if (topItem->index == 0 && header && tempPosition+highlightStart < header->position()+header->size()/2 && !strictHighlightRange) {
                 pos = isRightToLeft() ? - header->position() + highlightStart - size() : header->position() - highlightStart;
             } else {
                 if (isRightToLeft())
@@ -1358,7 +1359,7 @@ void QDeclarativeListViewPrivate::fixup(AxisData &data, qreal minExtent, qreal m
             }
             vTime = timeline.time();
         }
-    } else if (currentItem && haveHighlightRange && highlightRange == QDeclarativeListView::StrictlyEnforceRange
+    } else if (currentItem && strictHighlightRange
                 && moveReason != QDeclarativeListViewPrivate::SetIndex) {
         updateHighlight();
         qreal pos = currentItem->itemPosition();
diff --git a/src/declarative/graphicsitems/qdeclarativetextedit.cpp b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
index ca7e948..1e30e78 100644
--- a/src/declarative/graphicsitems/qdeclarativetextedit.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextedit.cpp
@@ -546,7 +546,15 @@ bool QDeclarativeTextEditPrivate::determineHorizontalAlignment()
 {
     Q_Q(QDeclarativeTextEdit);
     if (hAlignImplicit && q->isComponentComplete()) {
-        bool alignToRight = text.isEmpty() ? QApplication::keyboardInputDirection() == Qt::RightToLeft : rightToLeftText;
+        bool alignToRight;
+        if (text.isEmpty()) {
+            const QString preeditText = control->textCursor().block().layout()->preeditAreaText();
+            alignToRight = preeditText.isEmpty()
+                    ? QApplication::keyboardInputDirection() == Qt::RightToLeft
+                    : preeditText.isRightToLeft();
+        } else {
+            alignToRight = rightToLeftText;
+        }
         return setHAlign(alignToRight ? QDeclarativeTextEdit::AlignRight : QDeclarativeTextEdit::AlignLeft);
     }
     return false;
@@ -1581,6 +1589,7 @@ void QDeclarativeTextEdit::q_textChanged()
 void QDeclarativeTextEdit::moveCursorDelegate()
 {
     Q_D(QDeclarativeTextEdit);
+    d->determineHorizontalAlignment();
     updateMicroFocus();
     emit cursorRectangleChanged();
     if(!d->cursor)
@@ -1703,7 +1712,9 @@ void QDeclarativeTextEdit::updateSize()
             setImplicitWidth(newWidth);
         else if (d->requireImplicitWidth)
             setImplicitWidth(naturalWidth);
-        qreal newHeight = d->document->isEmpty() ? fm.height() : (int)d->document->size().height();
+        qreal newHeight = d->document->size().height();
+        if (newHeight == 0)
+            newHeight = fm.height();
         setImplicitHeight(newHeight);
 
         d->paintedSize = QSize(newWidth, newHeight);
diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
index 5245236..5928d31 100644
--- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp
@@ -407,7 +407,11 @@ bool QDeclarativeTextInputPrivate::determineHorizontalAlignment()
     if (hAlignImplicit) {
         // if no explicit alignment has been set, follow the natural layout direction of the text
         QString text = control->text();
-        bool isRightToLeft = text.isEmpty() ? QApplication::keyboardInputDirection() == Qt::RightToLeft : text.isRightToLeft();
+        if (text.isEmpty())
+            text = control->preeditAreaText();
+        bool isRightToLeft = text.isEmpty()
+                ? QApplication::keyboardInputDirection() == Qt::RightToLeft
+                : text.isRightToLeft();
         return setHAlign(isRightToLeft ? QDeclarativeTextInput::AlignRight : QDeclarativeTextInput::AlignLeft);
     }
     return false;
@@ -874,7 +878,8 @@ void QDeclarativeTextInputPrivate::updateInputMethodHints()
     \o TextInput.Normal - Displays the text as it is. (Default)
     \o TextInput.Password - Displays asterixes instead of characters.
     \o TextInput.NoEcho - Displays nothing.
-    \o TextInput.PasswordEchoOnEdit - Displays all but the current character as asterixes.
+    \o TextInput.PasswordEchoOnEdit - Displays characters as they are entered
+    while editing, otherwise displays asterisks.
     \endlist
 */
 QDeclarativeTextInput::EchoMode QDeclarativeTextInput::echoMode() const
@@ -1906,6 +1911,7 @@ void QDeclarativeTextInput::cursorPosChanged()
 void QDeclarativeTextInput::updateCursorRectangle()
 {
     Q_D(QDeclarativeTextInput);
+    d->determineHorizontalAlignment();
     d->updateHorizontalScroll();
     updateRect();//TODO: Only update rect between pos's
     updateMicroFocus();
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index 26757b5..b896a77 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -1375,7 +1375,7 @@ void QDeclarativeVisualDataModel::_q_rowsMoved(const QModelIndex &sourceParent,
     Q_D(QDeclarativeVisualDataModel);
     const int count = sourceEnd - sourceStart + 1;
     if (destinationParent == d->m_root && sourceParent == d->m_root) {
-        _q_itemsMoved(sourceStart, sourceStart > destinationRow ? destinationRow : destinationRow-1, count);
+        _q_itemsMoved(sourceStart, sourceStart > destinationRow ? destinationRow : destinationRow-count, count);
     } else if (sourceParent == d->m_root) {
         _q_itemsRemoved(sourceStart, count);
     } else if (destinationParent == d->m_root) {
diff --git a/src/declarative/qml/qdeclarativebinding.cpp b/src/declarative/qml/qdeclarativebinding.cpp
index 689cd00..9359196 100644
--- a/src/declarative/qml/qdeclarativebinding.cpp
+++ b/src/declarative/qml/qdeclarativebinding.cpp
@@ -254,6 +254,8 @@ QDeclarativeBinding::createBinding(Identifier id, QObject *obj, QDeclarativeCont
         cdata = typeData->compiledData();
     }
     QDeclarativeBinding *rv = cdata ? new QDeclarativeBinding((void*)cdata->datas.at(id).constData(), cdata, obj, ctxtdata, url, lineNumber, parent) : 0;
+    if (cdata)
+        cdata->release();
     if (typeData)
         typeData->release();
     return rv;
diff --git a/src/declarative/qml/qdeclarativecompiledbindings.cpp b/src/declarative/qml/qdeclarativecompiledbindings.cpp
index 51ffc10..72a3e53 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings.cpp
+++ b/src/declarative/qml/qdeclarativecompiledbindings.cpp
@@ -235,6 +235,7 @@ public:
     void run(Binding *, QDeclarativePropertyPrivate::WriteFlags flags);
 
     const char *programData;
+    QDeclarativeRefCount *dataRef;
     Binding *m_bindings;
     quint32 *m_signalTable;
 
@@ -267,7 +268,7 @@ public:
 };
 
 QDeclarativeCompiledBindingsPrivate::QDeclarativeCompiledBindingsPrivate()
-: subscriptions(0), identifiers(0)
+: subscriptions(0), identifiers(0), programData(0), dataRef(0), m_bindings(0), m_signalTable(0)
 {
 }
 
@@ -275,11 +276,16 @@ QDeclarativeCompiledBindingsPrivate::~QDeclarativeCompiledBindingsPrivate()
 {
     delete [] subscriptions; subscriptions = 0;
     delete [] identifiers; identifiers = 0;
+    if (dataRef) { 
+        dataRef->release(); 
+        dataRef = 0; 
+    }
 }
 
 int QDeclarativeCompiledBindingsPrivate::methodCount = -1;
 
-QDeclarativeCompiledBindings::QDeclarativeCompiledBindings(const char *program, QDeclarativeContextData *context)
+QDeclarativeCompiledBindings::QDeclarativeCompiledBindings(const char *program, QDeclarativeContextData *context, 
+                                                           QDeclarativeRefCount *dataRef)
 : QObject(*(new QDeclarativeCompiledBindingsPrivate))
 {
     Q_D(QDeclarativeCompiledBindings);
@@ -288,6 +294,8 @@ QDeclarativeCompiledBindings::QDeclarativeCompiledBindings(const char *program,
         d->methodCount = QDeclarativeCompiledBindings::staticMetaObject.methodCount();
 
     d->programData = program;
+    d->dataRef = dataRef;
+    if (d->dataRef) d->dataRef->addref();
 
     d->init();
 
diff --git a/src/declarative/qml/qdeclarativecompiledbindings_p.h b/src/declarative/qml/qdeclarativecompiledbindings_p.h
index e7b6937..8ec0ac3 100644
--- a/src/declarative/qml/qdeclarativecompiledbindings_p.h
+++ b/src/declarative/qml/qdeclarativecompiledbindings_p.h
@@ -95,7 +95,7 @@ class QDeclarativeCompiledBindingsPrivate;
 class QDeclarativeCompiledBindings : public QObject, public QDeclarativeAbstractExpression, public QDeclarativeRefCount
 {
 public:
-    QDeclarativeCompiledBindings(const char *program, QDeclarativeContextData *context);
+    QDeclarativeCompiledBindings(const char *program, QDeclarativeContextData *context, QDeclarativeRefCount *);
     virtual ~QDeclarativeCompiledBindings();
 
     QDeclarativeAbstractBinding *configBinding(int index, QObject *target, QObject *scope, int property);
diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp
index 168c151..82197dc 100644
--- a/src/declarative/qml/qdeclarativetypeloader.cpp
+++ b/src/declarative/qml/qdeclarativetypeloader.cpp
@@ -65,6 +65,11 @@ The QDeclarativeDataLoader invokes callbacks on the QDeclarativeDataBlob as data
 */
 
 /*!
+    \class QDeclarativeTypeLoader
+    \internal
+*/
+
+/*!
 \enum QDeclarativeDataBlob::Status
 
 This enum describes the status of the data blob.
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index a23f89d..8cf97d2 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -209,7 +209,7 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEObjectStack &stack,
                 if (instr.init.contextCache != -1) 
                     ctxt->setIdPropertyData(comp->contextCaches.at(instr.init.contextCache));
                 if (instr.init.compiledBinding != -1) 
-                    ctxt->optimizedBindings = new QDeclarativeCompiledBindings(datas.at(instr.init.compiledBinding).constData(), ctxt);
+                    ctxt->optimizedBindings = new QDeclarativeCompiledBindings(datas.at(instr.init.compiledBinding).constData(), ctxt, comp);
             }
             break;
 
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 28c2df6..9604117 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -784,6 +784,7 @@ void QDeclarativeListModelParser::setCustomData(QObject *obj, const QByteArray &
     QDeclarativeListModel *rv = static_cast<QDeclarativeListModel *>(obj);
 
     ModelNode *root = new ModelNode(rv->m_nested);
+    rv->m_nested->m_ownsRoot = true;
     rv->m_nested->_root = root;
     QStack<ModelNode *> nodes;
     nodes << root;
diff --git a/src/declarative/util/qdeclarativestate.cpp b/src/declarative/util/qdeclarativestate.cpp
index 9f56ccb..ee3d06b 100644
--- a/src/declarative/util/qdeclarativestate.cpp
+++ b/src/declarative/util/qdeclarativestate.cpp
@@ -173,6 +173,18 @@ QDeclarativeState::~QDeclarativeState()
     Q_D(QDeclarativeState);
     if (d->group)
         d->group->removeState(this);
+
+    /*
+      destroying an active state does not return us to the
+      base state, so we need to clean up our revert list to
+      prevent leaks. In the future we may want to redconsider
+      this overall architecture.
+    */
+    for (int i = 0; i < d->revertList.count(); ++i) {
+        if (d->revertList.at(i).binding()) {
+            d->revertList.at(i).binding()->destroy();
+        }
+    }
 }
 
 /*!
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index bab991b..45995ce 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -319,6 +319,8 @@ QDeclarativeView::~QDeclarativeView()
 
     Ensure that the URL provided is full and correct, in particular, use
     \l QUrl::fromLocalFile() when loading a file from the local filesystem.
+
+    \sa {Network Transparency}{Loading Resources in QML}
  */
 
 /*!
diff --git a/src/gui/accessible/qaccessible_unix.cpp b/src/gui/accessible/qaccessible_unix.cpp
index 19fbe78..1c1eb2a 100644
--- a/src/gui/accessible/qaccessible_unix.cpp
+++ b/src/gui/accessible/qaccessible_unix.cpp
@@ -96,7 +96,7 @@ void QAccessible::updateAccessibility(QObject *o, int who, Event reason)
     }
 
     initialize();
-    if (bridges()->isEmpty())
+    if (!bridges() || bridges()->isEmpty())
         return;
 
     QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(o);
diff --git a/src/gui/accessible/qaccessible_win.cpp b/src/gui/accessible/qaccessible_win.cpp
index 79ac442..1fd1bfd 100644
--- a/src/gui/accessible/qaccessible_win.cpp
+++ b/src/gui/accessible/qaccessible_win.cpp
@@ -600,6 +600,35 @@ HRESULT STDMETHODCALLTYPE QWindowsEnumerate::Skip(unsigned long celt)
     return S_OK;
 }
 
+struct AccessibleElement {
+    AccessibleElement(int entryId, QAccessibleInterface *accessible) {
+        if (entryId < 0) {
+            QPair<QObject*, int> ref = qAccessibleRecentSentEvents()->value(entryId);
+            iface = QAccessible::queryAccessibleInterface(ref.first);
+            entry = ref.second;
+            cleanupInterface = true;
+        } else {
+            iface = accessible;
+            entry = entryId;
+            cleanupInterface = false;
+        }
+    }
+
+    QString text(QAccessible::Text t) const {
+        return iface ? iface->text(t, entry) : QString();
+    }
+
+    ~AccessibleElement() {
+        if (cleanupInterface)
+            delete iface;
+    }
+
+    QAccessibleInterface *iface;
+    int entry;
+private:
+    bool cleanupInterface;
+};
+
 /*
 */
 class QWindowsAccessible : public IAccessible, IOleWindow, QAccessible
@@ -998,7 +1027,8 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::accLocation(long *pxLeft, long *py
     if (!accessible->isValid())
         return E_FAIL;
 
-    QRect rect = accessible->rect(varID.lVal);
+    AccessibleElement elem(varID.lVal, accessible);
+    QRect rect = elem.iface ? elem.iface->rect(elem.entry) : QRect();
     if (rect.isValid()) {
         *pxLeft = rect.x();
         *pyTop = rect.y();
@@ -1101,25 +1131,12 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::get_accChild(VARIANT varChildID, I
     int childIndex = varChildID.lVal;
     QAccessibleInterface *acc = 0;
 
-    if (childIndex < 0) {
-        const int entry = childIndex;
-        QPair<QObject*, int> ref = qAccessibleRecentSentEvents()->value(entry);
-        if (ref.first) {
-            acc = queryAccessibleInterface(ref.first);
-            if (acc && ref.second) {
-                if (ref.second) {
-                    QAccessibleInterface *res;
-                    int index = acc->navigate(Child, ref.second, &res);
-                    delete acc;
-                    if (index == -1)
-                        return E_INVALIDARG;
-                    acc = res;
-                }
-            }
-        }
-    } else {
-        RelationFlag rel = childIndex ? Child : Self;
-        accessible->navigate(rel, childIndex, &acc);
+    AccessibleElement elem(childIndex, accessible);
+    if (elem.iface) {
+        RelationFlag rel = elem.entry ? Child : Self;
+        int index = elem.iface->navigate(rel, elem.entry, &acc);
+        if (index == -1)
+            return E_INVALIDARG;
     }
 
     if (acc) {
@@ -1171,7 +1188,9 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::accDoDefaultAction(VARIANT varID)
     if (!accessible->isValid())
         return E_FAIL;
 
-    return accessible->doAction(DefaultAction, varID.lVal, QVariantList()) ? S_OK : S_FALSE;
+    AccessibleElement elem(varID.lVal, accessible);
+    const bool res = elem.iface ? elem.iface->doAction(DefaultAction, elem.entry, QVariantList()) : false;
+    return res ? S_OK : S_FALSE;
 }
 
 HRESULT STDMETHODCALLTYPE QWindowsAccessible::get_accDefaultAction(VARIANT varID, BSTR* pszDefaultAction)
@@ -1180,7 +1199,8 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::get_accDefaultAction(VARIANT varID
     if (!accessible->isValid())
         return E_FAIL;
 
-    QString def = accessible->actionText(DefaultAction, Name, varID.lVal);
+    AccessibleElement elem(varID.lVal, accessible);
+    QString def = elem.iface ? elem.iface->actionText(DefaultAction, Name, elem.entry) : QString();
     if (def.isEmpty()) {
         *pszDefaultAction = 0;
         return S_FALSE;
@@ -1196,7 +1216,8 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::get_accDescription(VARIANT varID,
     if (!accessible->isValid())
         return E_FAIL;
 
-    QString descr = accessible->text(Description, varID.lVal);
+    AccessibleElement elem(varID.lVal, accessible);
+    QString descr = elem.text(Description);
     if (descr.size()) {
         *pszDescription = QStringToBSTR(descr);
         return S_OK;
@@ -1212,7 +1233,8 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::get_accHelp(VARIANT varID, BSTR *p
     if (!accessible->isValid())
         return E_FAIL;
 
-    QString help = accessible->text(Help, varID.lVal);
+    AccessibleElement elem(varID.lVal, accessible);
+    QString help = elem.text(Help);
     if (help.size()) {
         *pszHelp = QStringToBSTR(help);
         return S_OK;
@@ -1233,7 +1255,8 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::get_accKeyboardShortcut(VARIANT va
     if (!accessible->isValid())
         return E_FAIL;
 
-    QString sc = accessible->text(Accelerator, varID.lVal);
+    AccessibleElement elem(varID.lVal, accessible);
+    QString sc = elem.text(Accelerator);
     if (sc.size()) {
         *pszKeyboardShortcut = QStringToBSTR(sc);
         return S_OK;
@@ -1249,7 +1272,8 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::get_accName(VARIANT varID, BSTR* p
     if (!accessible->isValid())
         return E_FAIL;
 
-    QString n = accessible->text(Name, varID.lVal);
+    AccessibleElement elem(varID.lVal, accessible);
+    QString n = elem.text(Name);
     if (n.size()) {
         *pszName = QStringToBSTR(n);
         return S_OK;
@@ -1271,7 +1295,8 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::get_accRole(VARIANT varID, VARIANT
     if (!accessible->isValid())
         return E_FAIL;
 
-    Role role = accessible->role(varID.lVal);
+    AccessibleElement elem(varID.lVal, accessible);
+    Role role = elem.iface ? elem.iface->role(elem.entry) : NoRole;
     if (role != NoRole) {
         if (role == LayeredPane)
             role = QAccessible::Pane;
@@ -1290,7 +1315,8 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::get_accState(VARIANT varID, VARIAN
         return E_FAIL;
 
     (*pvarState).vt = VT_I4;
-    (*pvarState).lVal = accessible->state(varID.lVal);
+    AccessibleElement elem(varID.lVal, accessible);
+    (*pvarState).lVal = elem.iface ? elem.iface->state(elem.entry) : State(Normal);
     return S_OK;
 }
 
@@ -1300,7 +1326,8 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::get_accValue(VARIANT varID, BSTR*
     if (!accessible->isValid())
         return E_FAIL;
 
-    QString value = accessible->text(Value, varID.lVal);
+    AccessibleElement elem(varID.lVal, accessible);
+    QString value = elem.text(Value);
     if (!value.isNull()) {
         *pszValue = QStringToBSTR(value);
         return S_OK;
@@ -1324,19 +1351,23 @@ HRESULT STDMETHODCALLTYPE QWindowsAccessible::accSelect(long flagsSelect, VARIAN
 
     bool res = false;
 
-    if (flagsSelect & SELFLAG_TAKEFOCUS)
-        res = accessible->doAction(SetFocus, varID.lVal, QVariantList());
-    if (flagsSelect & SELFLAG_TAKESELECTION) {
-        accessible->doAction(ClearSelection, 0, QVariantList());
-        res = accessible->doAction(AddToSelection, varID.lVal, QVariantList());
+    AccessibleElement elem(varID.lVal, accessible);
+    QAccessibleInterface *acc = elem.iface;
+    if (acc) {
+        const int entry = elem.entry;
+        if (flagsSelect & SELFLAG_TAKEFOCUS)
+            res = acc->doAction(SetFocus, entry, QVariantList());
+        if (flagsSelect & SELFLAG_TAKESELECTION) {
+            acc->doAction(ClearSelection, 0, QVariantList());   //### bug, 0 should be entry??
+            res = acc->doAction(AddToSelection, entry, QVariantList());
+        }
+        if (flagsSelect & SELFLAG_EXTENDSELECTION)
+            res = acc->doAction(ExtendSelection, entry, QVariantList());
+        if (flagsSelect & SELFLAG_ADDSELECTION)
+            res = acc->doAction(AddToSelection, entry, QVariantList());
+        if (flagsSelect & SELFLAG_REMOVESELECTION)
+            res = acc->doAction(RemoveSelection, entry, QVariantList());
     }
-    if (flagsSelect & SELFLAG_EXTENDSELECTION)
-        res = accessible->doAction(ExtendSelection, varID.lVal, QVariantList());
-    if (flagsSelect & SELFLAG_ADDSELECTION)
-        res = accessible->doAction(AddToSelection, varID.lVal, QVariantList());
-    if (flagsSelect & SELFLAG_REMOVESELECTION)
-        res = accessible->doAction(RemoveSelection, varID.lVal, QVariantList());
-
     return res ? S_OK : S_FALSE;
 }
 
diff --git a/src/gui/dialogs/qfiledialog_win_p.h b/src/gui/dialogs/qfiledialog_win_p.h
index 1ff29d2..1408057 100644
--- a/src/gui/dialogs/qfiledialog_win_p.h
+++ b/src/gui/dialogs/qfiledialog_win_p.h
@@ -240,4 +240,4 @@ DECLARE_INTERFACE_(IFileOpenDialog, IFileDialog)
     STDMETHOD(GetResults)(THIS_ IShellItemArray **ppenum) PURE;
     STDMETHOD(GetSelectedItems)(THIS_ IShellItemArray **ppsai) PURE;
 };
-#endif
\ No newline at end of file
+#endif
diff --git a/src/gui/embedded/qscreen_qws.cpp b/src/gui/embedded/qscreen_qws.cpp
index 2c10357..b17ade0 100644
--- a/src/gui/embedded/qscreen_qws.cpp
+++ b/src/gui/embedded/qscreen_qws.cpp
@@ -1545,6 +1545,7 @@ QImage::Format QScreenPrivate::preferredImageFormat() const
     \value SvgalibClass QSvgalibScreen
     \value ProxyClass QProxyScreen
     \value GLClass QGLScreen
+    \value IntfbClass QIntfbScreen
     \value CustomClass Unknown QScreen subclass
 
     \sa classId()
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index eaa8ac2..deda3ff 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -2966,11 +2966,12 @@ bool QGraphicsAnchorLayoutPrivate::solvePreferred(const QList<QSimplexConstraint
             AnchorData *ad = variables.at(i);
             ad->sizeAtPreferred = ad->result - g_offset;
         }
-
-        // Make sure we delete the simplex solver -before- we delete the
-        // constraints used by it.
-        delete simplex;
     }
+
+    // Make sure we delete the simplex solver -before- we delete the
+    // constraints used by it.
+    delete simplex;
+
     // Delete constraints and variables we created.
     qDeleteAll(preferredConstraints);
     qDeleteAll(preferredVariables);
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index 2ac2bdf..9092593 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -1171,24 +1171,26 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent, const Q
     // Update focus scope item ptr in new scope.
     QGraphicsItem *newFocusScopeItem = subFocusItem ? subFocusItem : parentFocusScopeItem;
     if (newFocusScopeItem && newParent) {
-        if (subFocusItem) {
-            // Find the subFocusItem's topmost focus scope.
-            QGraphicsItem *ancestorScope = 0;
-            QGraphicsItem *p = subFocusItem->d_ptr->parent;
-            while (p) {
-                if (p->d_ptr->flags & QGraphicsItem::ItemIsFocusScope)
-                    ancestorScope = p;
-                if (p->d_ptr->flags & QGraphicsItem::ItemIsPanel)
-                    break;
-                p = p->d_ptr->parent;
-            }
-            if (ancestorScope)
-                newFocusScopeItem = ancestorScope;
-        }
-
         QGraphicsItem *p = newParent;
         while (p) {
             if (p->d_ptr->flags & QGraphicsItem::ItemIsFocusScope) {
+                if (subFocusItem && subFocusItem != q_ptr) {
+                    // Find the subFocusItem's topmost focus scope within the new parent's focusscope
+                    QGraphicsItem *ancestorScope = 0;
+                    QGraphicsItem *p2 = subFocusItem->d_ptr->parent;
+                    while (p2 && p2 != p) {
+                        if (p2->d_ptr->flags & QGraphicsItem::ItemIsFocusScope)
+                            ancestorScope = p2;
+                        if (p2->d_ptr->flags & QGraphicsItem::ItemIsPanel)
+                            break;
+                        if (p2 == q_ptr)
+                            break;
+                        p2 = p2->d_ptr->parent;
+                    }
+                    if (ancestorScope)
+                        newFocusScopeItem = ancestorScope;
+                }
+
                 p->d_ptr->focusScopeItem = newFocusScopeItem;
                 newFocusScopeItem->d_ptr->focusScopeItemChange(true);
                 // Ensure the new item is no longer the subFocusItem. The
@@ -3297,7 +3299,7 @@ void QGraphicsItemPrivate::setFocusHelper(Qt::FocusReason focusReason, bool clim
     }
 
     if (climb) {
-        while (f->d_ptr->focusScopeItem && f->d_ptr->focusScopeItem->isVisible() && f->d_ptr->focusScopeItem != f)
+        while (f->d_ptr->focusScopeItem && f->d_ptr->focusScopeItem->isVisible())
             f = f->d_ptr->focusScopeItem;
     }
 
@@ -5376,11 +5378,9 @@ void QGraphicsItemPrivate::invalidateParentGraphicsEffectsRecursively()
 {
     QGraphicsItemPrivate *itemPrivate = this;
     do {
-        if (itemPrivate->graphicsEffect) {
+        if (itemPrivate->graphicsEffect && !itemPrivate->updateDueToGraphicsEffect) {
             itemPrivate->notifyInvalidated = 1;
-
-            if (!itemPrivate->updateDueToGraphicsEffect)
-                static_cast<QGraphicsItemEffectSourcePrivate *>(itemPrivate->graphicsEffect->d_func()->source->d_func())->invalidateCache();
+            static_cast<QGraphicsItemEffectSourcePrivate *>(itemPrivate->graphicsEffect->d_func()->source->d_func())->invalidateCache();
         }
     } while ((itemPrivate = itemPrivate->parent ? itemPrivate->parent->d_ptr.data() : 0));
 }
@@ -5688,21 +5688,27 @@ void QGraphicsItem::update(const QRectF &rect)
     d_ptr->invalidateParentGraphicsEffectsRecursively();
 #endif //QT_NO_GRAPHICSEFFECT
 
-    if (CacheMode(d_ptr->cacheMode) != NoCache) {
-        // Invalidate cache.
-        QGraphicsItemCache *cache = d_ptr->extraItemCache();
-        if (!cache->allExposed) {
-            if (rect.isNull()) {
-                cache->allExposed = true;
-                cache->exposed.clear();
-            } else {
-                cache->exposed.append(rect);
+#ifndef QT_NO_GRAPHICSEFFECT
+    if (!d_ptr->updateDueToGraphicsEffect) {
+#endif
+        if (CacheMode(d_ptr->cacheMode) != NoCache) {
+            // Invalidate cache.
+            QGraphicsItemCache *cache = d_ptr->extraItemCache();
+            if (!cache->allExposed) {
+                if (rect.isNull()) {
+                    cache->allExposed = true;
+                    cache->exposed.clear();
+                } else {
+                    cache->exposed.append(rect);
+                }
             }
+            // Only invalidate cache; item is already dirty.
+            if (d_ptr->fullUpdatePending)
+                return;
         }
-        // Only invalidate cache; item is already dirty.
-        if (d_ptr->fullUpdatePending)
-            return;
+#ifndef QT_NO_GRAPHICSEFFECT
     }
+#endif
 
     if (d_ptr->scene)
         d_ptr->scene->d_func()->markDirty(this, rect);
diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp
index 1551944..867880c 100644
--- a/src/gui/graphicsview/qgraphicsscene.cpp
+++ b/src/gui/graphicsview/qgraphicsscene.cpp
@@ -3504,7 +3504,9 @@ bool QGraphicsScene::event(QEvent *event)
         }
         break;
     case QEvent::WindowDeactivate:
-        if (!--d->activationRefCount) {
+        if (d->activationRefCount > 0)
+            --d->activationRefCount;
+        if (!d->activationRefCount) {
             if (d->activePanel) {
                 // Deactivate the active panel (but keep it so we can
                 // reactivate it later).
diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp
index 965b1b34..c275968 100644
--- a/src/gui/graphicsview/qgraphicswidget.cpp
+++ b/src/gui/graphicsview/qgraphicswidget.cpp
@@ -152,7 +152,7 @@ QT_BEGIN_NAMESPACE
     \row    \o Qt::WA_SetPalette
                     \o Set by setPalette().
     \row    \o Qt::WA_SetFont
-                    \o Set by setPalette().
+                    \o Set by setFont().
     \row    \o Qt::WA_WindowPropagation
                     \o Enables propagation to window widgets.
     \endtable
@@ -1173,6 +1173,12 @@ QVariant QGraphicsWidget::itemChange(GraphicsItemChange change, const QVariant &
         QApplication::sendEvent(this, &event);
         break;
     }
+    case ItemChildAddedChange: {
+        QGraphicsItem *child = qVariantValue<QGraphicsItem *>(value);
+        if (child->isWidget())
+            static_cast<QGraphicsWidget *>(child)->d_func()->resolveLayoutDirection();
+        break;
+    }
     default:
         break;
     }
@@ -1668,7 +1674,7 @@ void QGraphicsWidget::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 
 /*!
     This event handler, for \a event, can be reimplemented in a subclass to
-    receive notifications for Qt::GrabMouse events.
+    receive notifications for QEvent::GrabMouse events.
 
     \sa grabMouse(), grabKeyboard()
 */
@@ -1679,7 +1685,7 @@ void QGraphicsWidget::grabMouseEvent(QEvent *event)
 
 /*!
     This event handler, for \a event, can be reimplemented in a subclass to
-    receive notifications for Qt::UngrabMouse events.
+    receive notifications for QEvent::UngrabMouse events.
 
     \sa ungrabMouse(), ungrabKeyboard()
 */
@@ -1690,7 +1696,7 @@ void QGraphicsWidget::ungrabMouseEvent(QEvent *event)
 
 /*!
     This event handler, for \a event, can be reimplemented in a subclass to
-    receive notifications for Qt::GrabKeyboard events.
+    receive notifications for QEvent::GrabKeyboard events.
 
     \sa grabKeyboard(), grabMouse()
 */
@@ -1701,7 +1707,7 @@ void QGraphicsWidget::grabKeyboardEvent(QEvent *event)
 
 /*!
     This event handler, for \a event, can be reimplemented in a subclass to
-    receive notifications for Qt::UngrabKeyboard events.
+    receive notifications for QEvent::UngrabKeyboard events.
 
     \sa ungrabKeyboard(), ungrabMouse()
 */
diff --git a/src/gui/image/qjpeghandler.cpp b/src/gui/image/qjpeghandler.cpp
index 673a6d6..8fea456 100644
--- a/src/gui/image/qjpeghandler.cpp
+++ b/src/gui/image/qjpeghandler.cpp
@@ -74,6 +74,11 @@ extern "C" {
 #endif
 }
 
+#if defined(JPEG_TRUE) && !defined(HAVE_BOOLEAN)
+// this jpeglib.h uses JPEG_boolean
+typedef JPEG_boolean boolean;
+#endif
+
 QT_BEGIN_NAMESPACE
 
 void QT_FASTCALL convert_rgb888_to_rgb32_C(quint32 *dst, const uchar *src, int len)
diff --git a/src/gui/image/qpixmap_mac.cpp b/src/gui/image/qpixmap_mac.cpp
index bdf1f90..47b6eef 100644
--- a/src/gui/image/qpixmap_mac.cpp
+++ b/src/gui/image/qpixmap_mac.cpp
@@ -851,7 +851,33 @@ static void qt_mac_grabDisplayRect(CGDirectDisplayID display, const QRect &displ
     ptrCGLDestroyContext(glContextObj); // and destroy the context
 }
 
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
 // Returns a pixmap containing the screen contents at rect.
+static QPixmap qt_mac_grabScreenRect_10_6(const QRect &rect)
+{
+    const int maxDisplays = 128; // 128 displays should be enough for everyone.
+    CGDirectDisplayID displays[maxDisplays];
+    CGDisplayCount displayCount;
+    const CGRect cgRect = CGRectMake(rect.x(), rect.y(), rect.width(), rect.height());
+    const CGDisplayErr err = CGGetDisplaysWithRect(cgRect, maxDisplays, displays, &displayCount);
+
+    if (err && displayCount == 0)
+        return QPixmap();
+    QPixmap windowPixmap(rect.size());
+    for (uint i = 0; i < displayCount; ++i) {
+        const CGRect bounds = CGDisplayBounds(displays[i]);
+        // Translate to display-local coordinates
+        QRect displayRect = rect.translated(qRound(-bounds.origin.x), qRound(-bounds.origin.y));
+        QCFType<CGImageRef> image = CGDisplayCreateImageForRect(displays[i],
+            CGRectMake(displayRect.x(), displayRect.y(), displayRect.width(), displayRect.height()));
+        QPixmap pix = QPixmap::fromMacCGImageRef(image);
+        QPainter painter(&windowPixmap);
+        painter.drawPixmap(-bounds.origin.x, -bounds.origin.y, pix);
+    }
+    return windowPixmap;
+}
+#endif
+
 static QPixmap qt_mac_grabScreenRect(const QRect &rect)
 {
     if (!resolveOpenGLSymbols())
@@ -927,7 +953,12 @@ QPixmap QPixmap::grabWindow(WId window, int x, int y, int w, int h)
     QRect rect(globalCoord.x() + x, globalCoord.y() + y, w, h);
 
 #ifdef QT_MAC_USE_COCOA
-    return qt_mac_grabScreenRect(rect);
+#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6)
+    if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_6)
+        return qt_mac_grabScreenRect_10_6(rect);
+    else
+#endif
+        return qt_mac_grabScreenRect(rect);
 #else
 #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
     if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_4) {
diff --git a/src/gui/image/qpnghandler.cpp b/src/gui/image/qpnghandler.cpp
index f7d07a5..1714442 100644
--- a/src/gui/image/qpnghandler.cpp
+++ b/src/gui/image/qpnghandler.cpp
@@ -58,6 +58,29 @@
 #include <pngconf.h>
 #endif
 
+#if PNG_LIBPNG_VER >= 10400 && PNG_LIBPNG_VER <= 10502 \
+        && defined(PNG_PEDANTIC_WARNINGS_SUPPORTED)
+/*
+    Versions 1.4.0 to 1.5.2 of libpng declare png_longjmp_ptr to
+    have a noreturn attribute if PNG_PEDANTIC_WARNINGS_SUPPORTED
+    is enabled, but most declarations of longjmp in the wild do
+    not add this attribute. This causes problems when the png_jmpbuf
+    macro expands to calling png_set_longjmp_fn with a mismatched
+    longjmp, as compilers such as Clang will treat this as an error.
+
+    To work around this we override the png_jmpbuf macro to cast
+    longjmp to a png_longjmp_ptr.
+*/
+#   undef png_jmpbuf
+#   ifdef PNG_SETJMP_SUPPORTED
+#       define png_jmpbuf(png_ptr) \
+            (*png_set_longjmp_fn((png_ptr), (png_longjmp_ptr)longjmp, sizeof(jmp_buf)))
+#   else
+#       define png_jmpbuf(png_ptr) \
+            (LIBPNG_WAS_COMPILED_WITH__PNG_NO_SETJMP)
+#   endif
+#endif
+
 #ifdef Q_OS_WINCE
 #define CALLBACK_CALL_TYPE        __cdecl
 #else
diff --git a/src/gui/inputmethod/qcoefepinputcontext_p.h b/src/gui/inputmethod/qcoefepinputcontext_p.h
index 9857015..8c30838 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_p.h
+++ b/src/gui/inputmethod/qcoefepinputcontext_p.h
@@ -154,6 +154,7 @@ private:
     TUint m_textCapabilities;
     bool m_inDestruction;
     bool m_pendingInputCapabilitiesChanged;
+    bool m_pendingTransactionCancel;
     int m_cursorVisibility;
     int m_inlinePosition;
     MFepInlineTextFormatRetriever *m_formatRetriever;
diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
index 7beaa76..56338b2 100644
--- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
+++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp
@@ -64,6 +64,8 @@
 #define QT_EAknCursorPositionChanged MAknEdStateObserver::EAknEdwinStateEvent(6)
 // MAknEdStateObserver::EAknActivatePenInputRequest
 #define QT_EAknActivatePenInputRequest MAknEdStateObserver::EAknEdwinStateEvent(7)
+// MAknEdStateObserver::EAknClosePenInputRequest
+#define QT_EAknClosePenInputRequest MAknEdStateObserver::EAknEdwinStateEvent(10)
 
 // EAknEditorFlagSelectionVisible is only valid from 3.2 onwards.
 // Sym^3 AVKON FEP manager expects that this flag is used for FEP-aware editors
@@ -107,6 +109,7 @@ QCoeFepInputContext::QCoeFepInputContext(QObject *parent)
       m_textCapabilities(TCoeInputCapabilities::EAllText),
       m_inDestruction(false),
       m_pendingInputCapabilitiesChanged(false),
+      m_pendingTransactionCancel(false),
       m_cursorVisibility(1),
       m_inlinePosition(0),
       m_formatRetriever(0),
@@ -252,9 +255,6 @@ bool QCoeFepInputContext::needsInputPanel()
 
 bool QCoeFepInputContext::filterEvent(const QEvent *event)
 {
-    // The CloseSoftwareInputPanel event is not handled here, because the VK will automatically
-    // close when it discovers that the underlying widget does not have input capabilities.
-
     if (!focusWidget())
         return false;
 
@@ -318,6 +318,12 @@ bool QCoeFepInputContext::filterEvent(const QEvent *event)
     if (!needsInputPanel())
         return false;
 
+    if ((event->type() == QEvent::CloseSoftwareInputPanel)
+        && (QSysInfo::s60Version() > QSysInfo::SV_S60_5_0)) {
+        m_fepState->ReportAknEdStateEventL(QT_EAknClosePenInputRequest);
+        return false;
+    }
+
     if (event->type() == QEvent::RequestSoftwareInputPanel) {
         // Only request virtual keyboard if it is not yet active or if this is the first time
         // panel is requested for this application.
@@ -354,10 +360,6 @@ bool QCoeFepInputContext::filterEvent(const QEvent *event)
             if (sControl) {
                 sControl->setIgnoreFocusChanged(false);
             }
-            //If m_pointerHandler has already been set, it means that fep inline editing is in progress.
-            //When this is happening, do not filter out pointer events.
-            if (!m_pointerHandler)
-                return true;
         }
     }
 
@@ -473,8 +475,8 @@ void QCoeFepInputContext::resetSplitViewWidget(bool keepInputWidget)
     windowToMove->setUpdatesEnabled(false);
 
     if (!alwaysResize) {
-        if (gv->scene()) {
-            if (gv->scene()->focusItem() && S60->partial_keyboardAutoTranslation) {
+        if (gv->scene() && S60->partial_keyboardAutoTranslation) {
+            if (gv->scene()->focusItem()) {
                 // Check if the widget contains cursorPositionChanged signal and disconnect from it.
                 QByteArray signal = QMetaObject::normalizedSignature(SIGNAL(cursorPositionChanged()));
                 int index = gv->scene()->focusItem()->toGraphicsObject()->metaObject()->indexOfSignal(signal.right(signal.length() - 1));
@@ -1062,15 +1064,24 @@ void QCoeFepInputContext::CancelFepInlineEdit()
     // We are not supposed to ever have a tempPreeditString and a real preedit string
     // from S60 at the same time, so it should be safe to rely on this test to determine
     // whether we should honor S60's request to clear the text or not.
-    if (m_hasTempPreeditString)
+    if (m_hasTempPreeditString || m_pendingTransactionCancel)
         return;
 
+    m_pendingTransactionCancel = true;
+
     QList<QInputMethodEvent::Attribute> attributes;
     QInputMethodEvent event(QLatin1String(""), attributes);
     event.setCommitString(QLatin1String(""), 0, 0);
     m_preeditString.clear();
     m_inlinePosition = 0;
     sendEvent(event);
+
+    // Sync with native side editor state. Native side can then do various operations
+    // based on editor state, such as removing 'exact word bubble'.
+    if (!m_pendingInputCapabilitiesChanged)
+        ReportAknEdStateEvent(MAknEdStateObserver::EAknSyncEdwinState);
+
+    m_pendingTransactionCancel = false;
 }
 
 TInt QCoeFepInputContext::DocumentLengthForFep() const
@@ -1080,7 +1091,18 @@ TInt QCoeFepInputContext::DocumentLengthForFep() const
         return 0;
 
     QVariant variant = w->inputMethodQuery(Qt::ImSurroundingText);
-    return variant.value<QString>().size() + m_preeditString.size();
+
+    int size = variant.value<QString>().size() + m_preeditString.size();
+
+    // To fix an issue with backspaces not being generated if document size is zero,
+    // fake document length to be at least one always, except when dealing with
+    // hidden text widgets, where this faking would generate extra asterisk. Since the
+    // primary use of hidden text widgets is password fields, they are unlikely to
+    // support multiple lines anyway.
+    if (size == 0 && !(m_textCapabilities & TCoeInputCapabilities::ESecretText))
+        size = 1;
+
+    return size;
 }
 
 TInt QCoeFepInputContext::DocumentMaximumLengthForFep() const
@@ -1163,6 +1185,12 @@ void QCoeFepInputContext::GetEditorContentForFep(TDes& aEditorContent, TInt aDoc
     // FEP expects the preedit string to be part of the editor content, so let's mix it in.
     int cursor = w->inputMethodQuery(Qt::ImCursorPosition).toInt();
     text.insert(cursor, m_preeditString);
+
+    // Add additional space to empty non-password text to compensate
+    // for the fake length we specified in DocumentLengthForFep().
+    if (text.size() == 0 && !(m_textCapabilities & TCoeInputCapabilities::ESecretText))
+        text += QChar(0x20);
+
     aEditorContent.Copy(qt_QString2TPtrC(text.mid(aDocumentPosition, aLengthToRetrieve)));
 }
 
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index cd13894..15d37c3 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -3321,7 +3321,7 @@ bool QApplication::desktopSettingsAware()
     one of the above events. If no keys are being held Qt::NoModifier is
     returned.
 
-    \sa mouseButtons()
+    \sa mouseButtons(), queryKeyboardModifiers()
 */
 
 Qt::KeyboardModifiers QApplication::keyboardModifiers()
@@ -3330,6 +3330,25 @@ Qt::KeyboardModifiers QApplication::keyboardModifiers()
 }
 
 /*!
+    \fn Qt::KeyboardModifiers QApplication::queryKeyboardModifiers()
+
+    Queries and returns the state of the modifier keys on the keyboard.
+    Unlike keyboardModifiers, this method returns the actual keys held
+    on the input device at the time of calling the method.
+
+    It does not rely on the keypress events having been received by this
+    process, which makes it possible to check the modifiers while moving
+    a window, for instance. Note that in most cases, you should use
+    keyboardModifiers(), which is faster and more accurate since it contains
+    the state of the modifiers as they were when the currently processed
+    event was received.
+
+    \sa keyboardModifiers()
+
+    \since 4.8
+*/
+
+/*!
     Returns the current state of the buttons on the mouse. The current state is
     updated syncronously as the event queue is emptied of events that will
     spontaneously change the mouse state (QEvent::MouseButtonPress and
diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h
index 01a246a..1548849 100644
--- a/src/gui/kernel/qapplication.h
+++ b/src/gui/kernel/qapplication.h
@@ -198,6 +198,7 @@ public:
     static void alert(QWidget *widget, int duration = 0);
 
     static Qt::KeyboardModifiers keyboardModifiers();
+    static Qt::KeyboardModifiers queryKeyboardModifiers();
     static Qt::MouseButtons mouseButtons();
 
     static void setDesktopSettingsAware(bool);
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm
index c5ff799..1f75f09 100644
--- a/src/gui/kernel/qapplication_mac.mm
+++ b/src/gui/kernel/qapplication_mac.mm
@@ -1395,6 +1395,11 @@ void QApplication::restoreOverrideCursor()
 }
 #endif // QT_NO_CURSOR
 
+Qt::KeyboardModifiers QApplication::queryKeyboardModifiers()
+{
+    return qt_mac_get_modifiers(GetCurrentEventKeyModifiers());
+}
+
 QWidget *QApplication::topLevelAt(const QPoint &p)
 {
 #ifndef QT_MAC_USE_COCOA
diff --git a/src/gui/kernel/qapplication_qws.cpp b/src/gui/kernel/qapplication_qws.cpp
index 3b6a075..193dfcd 100644
--- a/src/gui/kernel/qapplication_qws.cpp
+++ b/src/gui/kernel/qapplication_qws.cpp
@@ -2699,6 +2699,11 @@ void QApplication::alert(QWidget *, int)
 {
 }
 
+Qt::KeyboardModifiers QApplication::queryKeyboardModifiers()
+{
+    return keyboardModifiers(); // TODO proper implementation
+}
+
 int QApplication::qwsProcessEvent(QWSEvent* event)
 {
     Q_D(QApplication);
diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp
index 5ac9803..80bcdf0 100644
--- a/src/gui/kernel/qapplication_s60.cpp
+++ b/src/gui/kernel/qapplication_s60.cpp
@@ -115,6 +115,8 @@ QWidget *qt_button_down = 0;                     // widget got last button-down
 
 QSymbianControl *QSymbianControl::lastFocusedControl = 0;
 
+static Qt::KeyboardModifiers app_keyboardModifiers = Qt::NoModifier;
+
 QS60Data* qGlobalS60Data()
 {
     return qt_s60Data();
@@ -580,13 +582,20 @@ QPoint QSymbianControl::translatePointForFixedNativeOrientation(const TPoint &po
 {
     QPoint pos(pointerEventPos.iX, pointerEventPos.iY);
     if (qwidget->d_func()->fixNativeOrientationCalled) {
-        QSize wsize = qwidget->size();
-        TSize size = Size();
+        QSize wsize = qwidget->size(); // always same as the size in the native orientation
+        TSize size = Size(); // depends on the current orientation
         if (size.iWidth == wsize.height() && size.iHeight == wsize.width()) {
             qreal x = pos.x();
             qreal y = pos.y();
-            pos.setX(size.iHeight - y);
-            pos.setY(x);
+            if (S60->screenRotation == QS60Data::ScreenRotation90) {
+                // DisplayRightUp
+                pos.setX(size.iHeight - y);
+                pos.setY(x);
+            } else if (S60->screenRotation == QS60Data::ScreenRotation270) {
+                // DisplayLeftUp
+                pos.setX(y);
+                pos.setY(size.iWidth - x);
+            }
         }
     }
     return pos;
@@ -735,6 +744,7 @@ void QSymbianControl::HandlePointerEvent(const TPointerEvent& pEvent)
     Qt::MouseButton button;
     mapS60MouseEventTypeToQt(&type, &button, &pEvent);
     Qt::KeyboardModifiers modifiers = mapToQtModifiers(pEvent.iModifiers);
+    app_keyboardModifiers = modifiers;
 
     QPoint widgetPos = translatePointForFixedNativeOrientation(pEvent.iPosition);
     TPoint controlScreenPos = PositionRelativeToScreen();
@@ -2590,6 +2600,11 @@ void QApplication::setEffectEnabled(Qt::UIEffect /* effect */, bool /* enable */
     // TODO: Implement QApplication::setEffectEnabled(Qt::UIEffect effect, bool enable)
 }
 
+Qt::KeyboardModifiers QApplication::queryKeyboardModifiers()
+{
+    return app_keyboardModifiers;
+}
+
 TUint QApplicationPrivate::resolveS60ScanCode(TInt scanCode, TUint keysym)
 {
     if (!scanCode)
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index c34e75f..756cb56 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -1319,6 +1319,11 @@ Qt::KeyboardModifiers qt_win_getKeyboardModifiers()
     return modifiers;
 }
 
+Qt::KeyboardModifiers QApplication::queryKeyboardModifiers()
+{
+    return qt_win_getKeyboardModifiers();
+}
+
 /*****************************************************************************
   Routines to find a Qt widget from a screen position
  *****************************************************************************/
diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 666fe85..ef8e2b8 100644
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -3058,6 +3058,21 @@ void QApplicationPrivate::_q_alertTimeOut()
     }
 }
 
+Qt::KeyboardModifiers QApplication::queryKeyboardModifiers()
+{
+    Window root;
+    Window child;
+    int root_x, root_y, win_x, win_y;
+    uint keybstate;
+    for (int i = 0; i < ScreenCount(X11->display); ++i) {
+        if (XQueryPointer(X11->display, QX11Info::appRootWindow(i), &root, &child,
+                          &root_x, &root_y, &win_x, &win_y, &keybstate))
+            return X11->translateModifiers(keybstate & 0x00ff);
+    }
+    return 0;
+
+}
+
 /*****************************************************************************
   Special lookup functions for windows that have been reparented recently
  *****************************************************************************/
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index e32fdeb..0fbae59 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -66,9 +66,14 @@
 #include <qdebug.h>
 
 @interface NSEvent (Qt_Compile_Leopard_DeviceDelta)
+  // SnowLeopard:
   - (CGFloat)deviceDeltaX;
   - (CGFloat)deviceDeltaY;
   - (CGFloat)deviceDeltaZ;
+  // Lion:
+  - (CGFloat)scrollingDeltaX;
+  - (CGFloat)scrollingDeltaY;
+  - (CGFloat)scrollingDeltaZ;
 @end
 
 @interface NSEvent (Qt_Compile_Leopard_Gestures)
@@ -614,7 +619,6 @@ static int qCocoaViewCount = 0;
 
     int deltaX = 0;
     int deltaY = 0;
-    int deltaZ = 0;
 
     const EventRef carbonEvent = (EventRef)[theEvent eventRef];
     const UInt32 carbonEventKind = carbonEvent ? ::GetEventKind(carbonEvent) : 0;
@@ -627,15 +631,20 @@ static int qCocoaViewCount = 0;
         // It looks like 1/4 degrees per pixel behaves most native.
         // (NB: Qt expects the unit for delta to be 8 per degree):
         const int pixelsToDegrees = 2; // 8 * 1/4
-        deltaX = [theEvent deviceDeltaX] * pixelsToDegrees;
-        deltaY = [theEvent deviceDeltaY] * pixelsToDegrees;
-        deltaZ = [theEvent deviceDeltaZ] * pixelsToDegrees;
+        if (QSysInfo::MacintoshVersion <= QSysInfo::MV_10_6) {
+            // Mac OS 10.6
+            deltaX = [theEvent deviceDeltaX] * pixelsToDegrees;
+            deltaY = [theEvent deviceDeltaY] * pixelsToDegrees;
+        } else {
+            // Mac OS 10.7+
+            deltaX = [theEvent scrollingDeltaX] * pixelsToDegrees;
+            deltaY = [theEvent scrollingDeltaY] * pixelsToDegrees;
+        }
     } else {
         // carbonEventKind == kEventMouseWheelMoved
         // Remove acceleration, and use either -120 or 120 as delta:
         deltaX = qBound(-120, int([theEvent deltaX] * 10000), 120);
         deltaY = qBound(-120, int([theEvent deltaY] * 10000), 120);
-        deltaZ = qBound(-120, int([theEvent deltaZ] * 10000), 120);
     }
 
 #ifndef QT_NO_WHEELEVENT
@@ -654,13 +663,6 @@ static int qCocoaViewCount = 0;
         qt_sendSpontaneousEvent(widgetToGetMouse, &qwe);
     }
 
-    if (deltaZ != 0) {
-        // Qt doesn't explicitly support wheels with a Z component. In a misguided attempt to
-        // try to be ahead of the pack, I'm adding this extra value.
-        QWheelEvent qwe(qlocal, qglobal, deltaZ, buttons, keyMods, (Qt::Orientation)3);
-        qt_sendSpontaneousEvent(widgetToGetMouse, &qwe);
-    }
-
     if (deltaX != 0 && deltaY != 0)
         QMacScrollOptimization::performDelayedScroll();
 #endif //QT_NO_WHEELEVENT
diff --git a/src/gui/kernel/qdnd_x11.cpp b/src/gui/kernel/qdnd_x11.cpp
index 0c683b4..5847021 100644
--- a/src/gui/kernel/qdnd_x11.cpp
+++ b/src/gui/kernel/qdnd_x11.cpp
@@ -1112,21 +1112,6 @@ void qt_xdnd_send_leave()
     waiting_for_status = false;
 }
 
-// TODO: remove and use QApplication::currentKeyboardModifiers() in Qt 4.8.
-static Qt::KeyboardModifiers currentKeyboardModifiers()
-{
-    Window root;
-    Window child;
-    int root_x, root_y, win_x, win_y;
-    uint keybstate;
-    for (int i = 0; i < ScreenCount(X11->display); ++i) {
-        if (XQueryPointer(X11->display, QX11Info::appRootWindow(i), &root, &child,
-                          &root_x, &root_y, &win_x, &win_y, &keybstate))
-            return X11->translateModifiers(keybstate & 0x00ff);
-    }
-    return 0;
-}
-
 void QX11Data::xdndHandleDrop(QWidget *, const XEvent * xe, bool passive)
 {
     DEBUG("xdndHandleDrop");
@@ -1183,7 +1168,7 @@ void QX11Data::xdndHandleDrop(QWidget *, const XEvent * xe, bool passive)
 
         // Drop coming from another app? Update keyboard modifiers.
         if (!qt_xdnd_dragging) {
-            QApplicationPrivate::modifier_buttons = currentKeyboardModifiers();
+            QApplicationPrivate::modifier_buttons = QApplication::queryKeyboardModifiers();
         }
 
         QDropEvent de(qt_xdnd_current_position, possible_actions, dropData,
diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index de2d87e..e1df267 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -142,8 +142,7 @@ QInputEvent::~QInputEvent()
     and QWidget::mouseMoveEvent() to receive mouse events in your own
     widgets.
 
-    \sa QWidget::setMouseTracking() QWidget::grabMouse()
-    QCursor::pos()
+    \sa QWidget::setMouseTracking() QWidget::grabMouse() QCursor::pos()
 */
 
 /*!
diff --git a/src/gui/kernel/qeventdispatcher_qpa.cpp b/src/gui/kernel/qeventdispatcher_qpa.cpp
index 200696d..3f2e8b2 100644
--- a/src/gui/kernel/qeventdispatcher_qpa.cpp
+++ b/src/gui/kernel/qeventdispatcher_qpa.cpp
@@ -284,7 +284,7 @@ int QEventDispatcherQPA::select(int nfds, fd_set *readfds, fd_set *writefds, fd_
     Q_D(QEventDispatcherQPA);
     int retVal = 0;
     if (d->hasIntegration()) {
-        qint64 timeoutmsec = 0;
+        qint64 timeoutmsec = 1000; // wait a second if we don't have timers
         if (timeout)
             timeoutmsec = timeout->tv_sec * 1000 + (timeout->tv_usec/1000);
         d->selectReturnMutex->lock();
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index 5fc72d4..469973f 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -1381,11 +1381,11 @@ QString QKeySequencePrivate::encodeString(int key, QKeySequence::SequenceFormat
     QString p;
 
     if (key && key < Qt::Key_Escape && key != Qt::Key_Space) {
-        if (key < 0x10000) {
-            p = QChar(key & 0xffff).toUpper();
+        if (!QChar::requiresSurrogates(key)) {
+            p = QChar(ushort(key)).toUpper();
         } else {
-            p = QChar((key-0x10000)/0x400+0xd800);
-            p += QChar((key-0x10000)%400+0xdc00);
+            p += QChar(QChar::highSurrogate(key));
+            p += QChar(QChar::lowSurrogate(key));
         }
     } else if (key >= Qt::Key_F1 && key <= Qt::Key_F35) {
             p = nativeText ? QShortcut::tr("F%1").arg(key - Qt::Key_F1 + 1)
@@ -1418,11 +1418,11 @@ NonSymbol:
             // Or else characters like Qt::Key_aring may not get displayed
             // (Really depends on you locale)
             if (!keyname[i].name) {
-                if (key < 0x10000) {
-                    p = QChar(key & 0xffff).toUpper();
+                if (!QChar::requiresSurrogates(key)) {
+                    p = QChar(ushort(key)).toUpper();
                 } else {
-                    p = QChar((key-0x10000)/0x400+0xd800);
-                    p += QChar((key-0x10000)%400+0xdc00);
+                    p += QChar(QChar::highSurrogate(key));
+                    p += QChar(QChar::lowSurrogate(key));
                 }
             }
         }
diff --git a/src/gui/kernel/qt_s60_p.h b/src/gui/kernel/qt_s60_p.h
index 3ec4052..96b8141 100644
--- a/src/gui/kernel/qt_s60_p.h
+++ b/src/gui/kernel/qt_s60_p.h
@@ -77,6 +77,7 @@
 #include <akncontext.h>             // CAknContextPane
 #include <eikspane.h>               // CEikStatusPane
 #include <AknPopupFader.h>          // MAknFadedComponent and TAknPopupFader
+#include <bitstd.h>                 // EGraphicsOrientation constants
 #ifdef QT_SYMBIAN_HAVE_AKNTRANSEFFECT_H
 #include <gfxtranseffect/gfxtranseffect.h> // BeginFullScreen
 #include <akntranseffect.h> // BeginFullScreen
@@ -213,6 +214,14 @@ public:
     int nativeScreenWidthInPixels;
     int nativeScreenHeightInPixels;
 
+    enum ScreenRotation {
+        ScreenRotation0, // portrait (or the native orientation)
+        ScreenRotation90, // typically DisplayLeftUp landscape
+        ScreenRotation180, // not used
+        ScreenRotation270 // DisplayRightUp landscape when 3-way orientation is supported
+    };
+    ScreenRotation screenRotation;
+
     int beginFullScreenCalled : 1;
     int endFullScreenCalled : 1;
 };
@@ -384,6 +393,24 @@ inline void QS60Data::updateScreenSize()
     inches = S60->screenWidthInTwips / (TReal)KTwipsPerInch;
     S60->defaultDpiX = S60->screenWidthInPixels / inches;
 
+    switch (params.iRotation) {
+    case CFbsBitGc::EGraphicsOrientationNormal:
+        S60->screenRotation = ScreenRotation0;
+        break;
+    case CFbsBitGc::EGraphicsOrientationRotated90:
+        S60->screenRotation = ScreenRotation90;
+        break;
+    case CFbsBitGc::EGraphicsOrientationRotated180:
+        S60->screenRotation = ScreenRotation180;
+        break;
+    case CFbsBitGc::EGraphicsOrientationRotated270:
+        S60->screenRotation = ScreenRotation270;
+        break;
+    default:
+        S60->screenRotation = ScreenRotation0;
+        break;
+    }
+
     int screens = S60->screenCount();
     for (int i = 0; i < screens; ++i) {
         CWsScreenDevice *dev = S60->screenDevice(i);
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index ad8fbb7..0aa1dfa 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -345,6 +345,10 @@ QWidgetPrivate::QWidgetPrivate(int version)
 
 QWidgetPrivate::~QWidgetPrivate()
 {
+#ifdef Q_OS_SYMBIAN
+    _q_cleanupWinIds();
+#endif
+
     if (widgetItem)
         widgetItem->wid = 0;
 
@@ -12668,9 +12672,11 @@ void QWidget::clearMask()
 */
 
 #ifdef Q_OS_SYMBIAN
-void QWidgetPrivate::_q_delayedDestroy(WId winId)
+void QWidgetPrivate::_q_cleanupWinIds()
 {
-    delete winId;
+    foreach (WId wid, widCleanupList)
+        delete wid;
+    widCleanupList.clear();
 }
 #endif
 
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index 1a9987d..8306ed4 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -806,7 +806,7 @@ private:
     Q_DISABLE_COPY(QWidget)
     Q_PRIVATE_SLOT(d_func(), void _q_showIfNotHidden())
 #ifdef Q_OS_SYMBIAN
-    Q_PRIVATE_SLOT(d_func(), void _q_delayedDestroy(WId winId))
+    Q_PRIVATE_SLOT(d_func(), void void _q_cleanupWinIds())
 #endif
 
     QWidgetData *data;
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm
index a51e295..632df78 100644
--- a/src/gui/kernel/qwidget_mac.mm
+++ b/src/gui/kernel/qwidget_mac.mm
@@ -5031,7 +5031,7 @@ void QWidgetPrivate::registerTouchWindow(bool enable)
     if (enable == touchEventsEnabled)
         return;
 
-    QCocoaView *view = static_cast<QCocoaView *>(qt_mac_effectiveview_for(q));
+    QT_MANGLE_NAMESPACE(QCocoaView) *view = static_cast<QT_MANGLE_NAMESPACE(QCocoaView) *>(qt_mac_effectiveview_for(q));
     if (!view)
         return;
 
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index ad65274..aefffb6 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -419,7 +419,7 @@ public:
 #ifdef Q_OS_SYMBIAN
     void setSoftKeys_sys(const QList<QAction*> &softkeys);
     void activateSymbianWindow(WId wid = 0);
-    void _q_delayedDestroy(WId winId);
+    void _q_cleanupWinIds();
 #endif
 
     void raise_sys();
@@ -914,6 +914,7 @@ public:
     void s60UpdateIsOpaque();
     void reparentChildren();
     void registerTouchWindow();
+    QList<WId> widCleanupList;
 #endif
 
 };
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index 807f68e..e06b625 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -58,9 +58,7 @@
 #endif
 
 // This is necessary in order to be able to perform delayed invocation on slots
-// which take arguments of type WId.  One example is
-// QWidgetPrivate::_q_delayedDestroy, which is used to delay destruction of
-// CCoeControl objects until after the CONE event handler has finished running.
+// which take arguments of type WId.
 Q_DECLARE_METATYPE(WId)
 
 // Workaround for the fact that S60 SDKs 3.x do not contain the akntoolbar.h
@@ -86,21 +84,6 @@ CEikButtonGroupContainer *QS60Data::cba = 0;
 
 int qt_symbian_create_desktop_on_screen = -1;
 
-static bool isEqual(const QList<QAction*>& a, const QList<QAction*>& b)
-{
-    if ( a.count() != b.count())
-        return false;
-    int index=0;
-    while (index<a.count()) {
-        if (a.at(index)->softKeyRole() != b.at(index)->softKeyRole())
-            return false;
-        if (a.at(index)->text().compare(b.at(index)->text())!=0)
-            return false;
-        index++;
-    }
-    return true;
-}
-
 void QWidgetPrivate::setWSGeometry(bool dontShow, const QRect &)
 {
     // Note: based on x11 implementation
@@ -233,7 +216,6 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
 
     QPoint oldPos(q->pos());
     QSize oldSize(q->size());
-    QRect oldGeom(data.crect);
 
     bool checkExtra = true;
     if (q->isWindow() && (data.window_state & (Qt::WindowFullScreen | Qt::WindowMaximized))) {
@@ -350,11 +332,7 @@ void QWidgetPrivate::create_sys(WId window, bool /* initializeWindow */, bool de
 
     bool topLevel = (flags & Qt::Window);
     bool popup = (type == Qt::Popup);
-    bool dialog = (type == Qt::Dialog
-                   || type == Qt::Sheet
-                   || (flags & Qt::MSWindowsFixedSizeDialogHint));
     bool desktop = (type == Qt::Desktop);
-    //bool tool = (type == Qt::Tool || type == Qt::Drawer);
 
     if (popup)
         flags |= Qt::WindowStaysOnTopHint; // a popup stays on top
@@ -491,8 +469,8 @@ void QWidgetPrivate::create_sys(WId window, bool /* initializeWindow */, bool de
         // Delay deletion of the control in case this function is called in the
         // context of a CONE event handler such as
         // CCoeControl::ProcessPointerEventL
-        QMetaObject::invokeMethod(q, "_q_delayedDestroy",
-            Qt::QueuedConnection, Q_ARG(WId, destroyw));
+        widCleanupList << destroyw;
+        QMetaObject::invokeMethod(q, "_q_cleanupWinIds", Qt::QueuedConnection);
     }
 
     if (q->testAttribute(Qt::WA_AcceptTouchEvents))
@@ -1077,7 +1055,7 @@ void QWidgetPrivate::registerTouchWindow()
 int QWidget::metric(PaintDeviceMetric m) const
 {
     Q_D(const QWidget);
-    int val;
+    int val = 0;
     if (m == PdmWidth) {
         val = data->crect.width();
     } else if (m == PdmHeight) {
diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp
index dbe957e..3528e6f 100644
--- a/src/gui/painting/qcosmeticstroker.cpp
+++ b/src/gui/painting/qcosmeticstroker.cpp
@@ -425,13 +425,12 @@ void QCosmeticStroker::calculateLastPoint(qreal rx1, qreal ry1, qreal rx2, qreal
             swapped = true;
             qSwap(y1, y2);
             qSwap(x1, x2);
-            --x1; --x2; --y1; --y2;
         }
         int xinc = F16Dot16FixedDiv(x2 - x1, y2 - y1);
         int x = x1 << 10;
 
-        int y = (y1+32) >> 6;
-        int ys = (y2+32) >> 6;
+        int y = y1 >> 6;
+        int ys = y2 >> 6;
 
         if (y != ys) {
             x += ( ((((y << 6) + 32 - y1)))  * xinc ) >> 6;
@@ -457,13 +456,12 @@ void QCosmeticStroker::calculateLastPoint(qreal rx1, qreal ry1, qreal rx2, qreal
             swapped = true;
             qSwap(x1, x2);
             qSwap(y1, y2);
-            --x1; --x2; --y1; --y2;
         }
         int yinc = F16Dot16FixedDiv(y2 - y1, x2 - x1);
         int y = y1 << 10;
 
-        int x = (x1+32) >> 6;
-        int xs = (x2+32) >> 6;
+        int x = x1 >> 6;
+        int xs = x2 >> 6;
 
         if (x != xs) {
             y += ( ((((x << 6) + 32 - x1)))  * yinc ) >> 6;
@@ -716,10 +714,11 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2,
 
     QCosmeticStroker::Point last = stroker->lastPixel;
 
-//    qDebug() << "stroke" << x1/64. << y1/64. << x2/64. << y2/64. << capString(caps);
+//    qDebug() << "stroke" << x1/64. << y1/64. << x2/64. << y2/64.;
 
     if (dx < dy) {
         // vertical
+        QCosmeticStroker::Direction dir = QCosmeticStroker::TopToBottom;
 
         bool swapped = false;
         if (y1 > y2) {
@@ -727,30 +726,31 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2,
             qSwap(y1, y2);
             qSwap(x1, x2);
             caps = swapCaps(caps);
-            --x1; --x2; --y1; --y2;
+            dir = QCosmeticStroker::BottomToTop;
         }
         int xinc = F16Dot16FixedDiv(x2 - x1, y2 - y1);
         int x = x1 << 10;
 
+        if ((stroker->lastDir ^ QCosmeticStroker::VerticalMask) == dir)
+            caps |= swapped ? QCosmeticStroker::CapEnd : QCosmeticStroker::CapBegin;
+
         capAdjust(caps, y1, y2, x, xinc);
 
-        int y = (y1+32) >> 6;
-        int ys = (y2+32) >> 6;
+        int y = y1 >> 6;
+        int ys = y2 >> 6;
 
         if (y != ys) {
             x += ( ((((y << 6) + 32 - y1)))  * xinc ) >> 6;
 
             // calculate first and last pixel and perform dropout control
-            QCosmeticStroker::Direction dir = QCosmeticStroker::TopToBottom;
             QCosmeticStroker::Point first;
             first.x = x >> 16;
             first.y = y;
             last.x = (x + (ys - y - 1)*xinc) >> 16;
             last.y = ys - 1;
-            if (swapped) {
+            if (swapped)
                 qSwap(first, last);
-                dir = QCosmeticStroker::BottomToTop;
-            }
+
             bool axisAligned = qAbs(xinc) < (1 << 14);
             if (stroker->lastPixel.x >= 0) {
                 if (first.x == stroker->lastPixel.x &&
@@ -765,7 +765,7 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2,
                 } else if (stroker->lastDir != dir &&
                            (((axisAligned && stroker->lastAxisAligned) &&
                              stroker->lastPixel.x != first.x && stroker->lastPixel.y != first.y) ||
-                            (qAbs(stroker->lastPixel.x - first.x) > 1 &&
+                            (qAbs(stroker->lastPixel.x - first.x) > 1 ||
                              qAbs(stroker->lastPixel.y - first.y) > 1))) {
                     // have a missing pixel, insert it
                     if (swapped) {
@@ -793,37 +793,39 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2,
         if (!dx)
             return;
 
+        QCosmeticStroker::Direction dir = QCosmeticStroker::LeftToRight;
+
         bool swapped = false;
         if (x1 > x2) {
             swapped = true;
             qSwap(x1, x2);
             qSwap(y1, y2);
             caps = swapCaps(caps);
-            --x1; --x2; --y1; --y2;
+            dir = QCosmeticStroker::RightToLeft;
         }
         int yinc = F16Dot16FixedDiv(y2 - y1, x2 - x1);
         int y = y1 << 10;
 
-        capAdjust(caps, x1, x2, y, yinc);
+        if ((stroker->lastDir ^ QCosmeticStroker::HorizontalMask) == dir)
+            caps |= swapped ? QCosmeticStroker::CapEnd : QCosmeticStroker::CapBegin;
 
-        int x = (x1+32) >> 6;
-        int xs = (x2+32) >> 6;
+        capAdjust(caps, x1, x2, y, yinc);
 
+        int x = x1 >> 6;
+        int xs = x2 >> 6;
 
         if (x != xs) {
             y += ( ((((x << 6) + 32 - x1)))  * yinc ) >> 6;
 
             // calculate first and last pixel to perform dropout control
-            QCosmeticStroker::Direction dir = QCosmeticStroker::LeftToRight;
             QCosmeticStroker::Point first;
             first.x = x;
             first.y = y >> 16;
             last.x = xs - 1;
             last.y = (y + (xs - x - 1)*yinc) >> 16;
-            if (swapped) {
+            if (swapped)
                 qSwap(first, last);
-                dir = QCosmeticStroker::RightToLeft;
-            }
+
             bool axisAligned = qAbs(yinc) < (1 << 14);
             if (stroker->lastPixel.x >= 0) {
                 if (first.x == stroker->lastPixel.x && first.y == stroker->lastPixel.y) {
@@ -837,7 +839,7 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2,
                 } else if (stroker->lastDir != dir &&
                            (((axisAligned && stroker->lastAxisAligned) &&
                              stroker->lastPixel.x != first.x && stroker->lastPixel.y != first.y) ||
-                            (qAbs(stroker->lastPixel.x - first.x) > 1 &&
+                            (qAbs(stroker->lastPixel.x - first.x) > 1 ||
                              qAbs(stroker->lastPixel.y - first.y) > 1))) {
                     // have a missing pixel, insert it
                     if (swapped) {
diff --git a/src/gui/painting/qcosmeticstroker_p.h b/src/gui/painting/qcosmeticstroker_p.h
index d7bd79a..53cdf2c 100644
--- a/src/gui/painting/qcosmeticstroker_p.h
+++ b/src/gui/painting/qcosmeticstroker_p.h
@@ -78,10 +78,12 @@ public:
 
     // used to avoid drop outs or duplicated points
     enum Direction {
-        TopToBottom,
-        BottomToTop,
-        LeftToRight,
-        RightToLeft
+        TopToBottom = 0x1,
+        BottomToTop = 0x2,
+        LeftToRight = 0x4,
+        RightToLeft = 0x8,
+        VerticalMask = 0x3,
+        HorizontalMask = 0xc
     };
 
     QCosmeticStroker(QRasterPaintEngineState *s, const QRect &dr)
diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp
index c46513a..38ba6f9 100644
--- a/src/gui/painting/qpaintengine.cpp
+++ b/src/gui/painting/qpaintengine.cpp
@@ -756,14 +756,15 @@ void QPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem)
     path.setFillRule(Qt::WindingFill);
 #endif
     if (ti.glyphs.numGlyphs)
-        ti.fontEngine->addOutlineToPath(p.x(), p.y(), ti.glyphs, &path, ti.flags);
+        ti.fontEngine->addOutlineToPath(0, 0, ti.glyphs, &path, ti.flags);
     if (!path.isEmpty()) {
-        bool oldAA = painter()->renderHints() & QPainter::Antialiasing;
+        painter()->save();
         painter()->setRenderHint(QPainter::Antialiasing,
                                  bool((painter()->renderHints() & QPainter::TextAntialiasing)
                                       && !(painter()->font().styleStrategy() & QFont::NoAntialias)));
+        painter()->translate(p.x(), p.y());
         painter()->fillPath(path, state->pen().brush());
-        painter()->setRenderHint(QPainter::Antialiasing, oldAA);
+        painter()->restore();
     }
 }
 
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 76d7316..bcc5f9d 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -3098,7 +3098,7 @@ void QRasterPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textIte
     ensurePen();
     ensureState();
 
-#if defined (Q_WS_WIN) || defined(Q_WS_MAC)
+#if defined (Q_WS_WIN) || defined(Q_WS_MAC) || (defined(Q_OS_MAC) && defined(Q_WS_QPA))
 
     if (!supportsTransformations(ti.fontEngine)) {
         QVarLengthArray<QFixedPoint> positions;
@@ -3438,7 +3438,7 @@ bool QRasterPaintEngine::supportsTransformations(const QFontEngine *fontEngine)
 
 bool QRasterPaintEngine::supportsTransformations(qreal pixelSize, const QTransform &m) const
 {
-#if defined(Q_WS_MAC)
+#if defined(Q_WS_MAC) || (defined(Q_OS_MAC) && defined(Q_WS_QPA))
     // Mac font engines don't support scaling and rotation
     if (m.type() > QTransform::TxTranslate)
 #else
@@ -3552,7 +3552,7 @@ void QRasterPaintEngine::drawBitmap(const QPointF &pos, const QImage &image, QSp
                     spans[n].y = y;
                     spans[n].coverage = 255;
                     int len = 1;
-                    while (src_x < w-1 && src[(src_x+1) >> 3] & (0x1 << ((src_x+1) & 7))) {
+                    while (src_x+1 < w && src[(src_x+1) >> 3] & (0x1 << ((src_x+1) & 7))) {
                         ++src_x;
                         ++len;
                     }
@@ -3578,7 +3578,7 @@ void QRasterPaintEngine::drawBitmap(const QPointF &pos, const QImage &image, QSp
                     spans[n].y = y;
                     spans[n].coverage = 255;
                     int len = 1;
-                    while (src_x < w-1 && src[(src_x+1) >> 3] & (0x80 >> ((src_x+1) & 7))) {
+                    while (src_x+1 < w && src[(src_x+1) >> 3] & (0x80 >> ((src_x+1) & 7))) {
                         ++src_x;
                         ++len;
                     }
@@ -3764,6 +3764,11 @@ extern "C" {
     int q_gray_rendered_spans(QT_FT_Raster raster);
 }
 
+static inline uchar *alignAddress(uchar *address, quintptr alignmentMask)
+{
+    return (uchar *)(((quintptr)address + alignmentMask) & ~alignmentMask);
+}
+
 void QRasterPaintEnginePrivate::rasterize(QT_FT_Outline *outline,
                                           ProcessSpans callback,
                                           void *userData, QRasterBuffer *)
@@ -3791,19 +3796,10 @@ void QRasterPaintEnginePrivate::rasterize(QT_FT_Outline *outline,
     // minimize memory reallocations. However if initial size for
     // raster pool is changed for lower value, reallocations will
     // occur normally.
-    const int rasterPoolInitialSize = MINIMUM_POOL_SIZE;
-    int rasterPoolSize = rasterPoolInitialSize;
-    unsigned char *rasterPoolBase;
-#if defined(Q_WS_WIN64)
-    rasterPoolBase =
-        // We make use of setjmp and longjmp in qgrayraster.c which requires
-        // 16-byte alignment, hence we hardcode this requirement here..
-        (unsigned char *) _aligned_malloc(rasterPoolSize, sizeof(void*) * 2);
-#else
-    unsigned char rasterPoolOnStack[rasterPoolInitialSize];
-    rasterPoolBase = rasterPoolOnStack;
-#endif
-    Q_CHECK_PTR(rasterPoolBase);
+    int rasterPoolSize = MINIMUM_POOL_SIZE;
+    uchar rasterPoolOnStack[MINIMUM_POOL_SIZE + 0xf];
+    uchar *rasterPoolBase = alignAddress(rasterPoolOnStack, 0xf);
+    uchar *rasterPoolOnHeap = 0;
 
     qt_ft_grays_raster.raster_reset(*grayRaster.data(), rasterPoolBase, rasterPoolSize);
 
@@ -3839,31 +3835,20 @@ void QRasterPaintEnginePrivate::rasterize(QT_FT_Outline *outline,
 
         // Out of memory, reallocate some more and try again...
         if (error == -6) { // ErrRaster_OutOfMemory from qgrayraster.c
-            int new_size = rasterPoolSize * 2;
-            if (new_size > 1024 * 1024) {
+            rasterPoolSize *= 2;
+            if (rasterPoolSize > 1024 * 1024) {
                 qWarning("QPainter: Rasterization of primitive failed");
                 break;
             }
 
             rendered_spans += q_gray_rendered_spans(*grayRaster.data());
 
-#if defined(Q_WS_WIN64)
-            _aligned_free(rasterPoolBase);
-#else
-            if (rasterPoolBase != rasterPoolOnStack) // initially on the stack
-                free(rasterPoolBase);
-#endif
+            free(rasterPoolOnHeap);
+            rasterPoolOnHeap = (uchar *)malloc(rasterPoolSize + 0xf);
 
-            rasterPoolSize = new_size;
-            rasterPoolBase =
-#if defined(Q_WS_WIN64)
-                // We make use of setjmp and longjmp in qgrayraster.c which requires
-                // 16-byte alignment, hence we hardcode this requirement here..
-                (unsigned char *) _aligned_malloc(rasterPoolSize, sizeof(void*) * 2);
-#else
-                (unsigned char *) malloc(rasterPoolSize);
-#endif
-            Q_CHECK_PTR(rasterPoolBase); // note: we just freed the old rasterPoolBase. I hope it's not fatal.
+            Q_CHECK_PTR(rasterPoolOnHeap); // note: we just freed the old rasterPoolBase. I hope it's not fatal.
+
+            rasterPoolBase = alignAddress(rasterPoolOnHeap, 0xf);
 
             qt_ft_grays_raster.raster_done(*grayRaster.data());
             qt_ft_grays_raster.raster_new(grayRaster.data());
@@ -3873,12 +3858,7 @@ void QRasterPaintEnginePrivate::rasterize(QT_FT_Outline *outline,
         }
     }
 
-#if defined(Q_WS_WIN64)
-    _aligned_free(rasterPoolBase);
-#else
-    if (rasterPoolBase != rasterPoolOnStack) // initially on the stack
-        free(rasterPoolBase);
-#endif
+    free(rasterPoolOnHeap);
 }
 
 void QRasterPaintEnginePrivate::recalculateFastImages()
diff --git a/src/gui/painting/qpaintengine_x11.cpp b/src/gui/painting/qpaintengine_x11.cpp
index 147d2ec..17d141c 100644
--- a/src/gui/painting/qpaintengine_x11.cpp
+++ b/src/gui/painting/qpaintengine_x11.cpp
@@ -2333,7 +2333,7 @@ static QPainterPath path_for_glyphs(const QVarLengthArray<glyph_t> &glyphs,
                 bool set = src[x >> 3] & (0x80 >> (x & 7));
                 if (set) {
                     QRect r(xp + x, yp - h, 1, 1);
-                    while (x < glyph->width-1 && src[(x+1) >> 3] & (0x80 >> ((x+1) & 7))) {
+                    while (x+1 < glyph->width && src[(x+1) >> 3] & (0x80 >> ((x+1) & 7))) {
                         ++x;
                         r.setRight(r.right()+1);
                     }
diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp
index 8e64f3b..efb016e 100644
--- a/src/gui/painting/qpainter.cpp
+++ b/src/gui/painting/qpainter.cpp
@@ -5792,16 +5792,19 @@ void QPainter::drawImage(const QRectF &targetRect, const QImage &image, const QR
     d->engine->drawImage(QRectF(x, y, w, h), image, QRectF(sx, sy, sw, sh), flags);
 }
 
+#if !defined(QT_NO_RAWFONT)
 /*!
-    Draws the glyphs represented by \a glyphs at \a position. The \a position gives the
-    edge of the baseline for the string of glyphs. The glyphs will be retrieved from the font
-    selected on \a glyphs and at offsets given by the positions in \a glyphs.
+    \fn void QPainter::drawGlyphRun(const QPointF &position, const QGlyphRun &glyphs)
+
+    Draws the specified \a glyphs at the given \a position.
+    The \a position gives the edge of the baseline for the string of glyphs.
+    The glyphs will be retrieved from the font selected by \a glyphs and at
+    offsets given by the positions in \a glyphs.
 
     \since 4.8
 
     \sa QGlyphRun::setRawFont(), QGlyphRun::setPositions(), QGlyphRun::setGlyphIndexes()
 */
-#if !defined(QT_NO_RAWFONT)
 void QPainter::drawGlyphRun(const QPointF &position, const QGlyphRun &glyphRun)
 {
     Q_D(QPainter);
@@ -9251,9 +9254,9 @@ void QPainter::drawPixmapFragments(const PixmapFragment *fragments, int fragment
     \since 4.8
 
     This function is used to draw the same \a pixmap with multiple target
-    and source rectangles. If \a sourceRects is 0, the whole pixmap will be
-    rendered at each of the target rectangles. The \a hints parameter can be
-    used to pass in drawing hints.
+    and source rectangles specified by \a targetRects. If \a sourceRects is 0,
+    the whole pixmap will be rendered at each of the target rectangles.
+    The \a hints parameter can be used to pass in drawing hints.
 
     This function is potentially faster than multiple calls to drawPixmap(),
     since the backend can optimize state changes.
diff --git a/src/gui/painting/qtessellator.cpp b/src/gui/painting/qtessellator.cpp
index c469438..94a5128 100644
--- a/src/gui/painting/qtessellator.cpp
+++ b/src/gui/painting/qtessellator.cpp
@@ -893,7 +893,7 @@ void QTessellatorPrivate::processIntersections()
             QDEBUG() << "    adding edge on left";
             --min;
         }
-        while (max < scanline.size - 1 && scanline.edges[max + 1]->positionAt(y) <=  xmax) {
+        while (max + 1 < scanline.size && scanline.edges[max + 1]->positionAt(y) <=  xmax) {
             QDEBUG() << "    adding edge on right";
             ++max;
         }
diff --git a/src/gui/painting/qwindowsurface_raster.cpp b/src/gui/painting/qwindowsurface_raster.cpp
index d972384..15ff044 100644
--- a/src/gui/painting/qwindowsurface_raster.cpp
+++ b/src/gui/painting/qwindowsurface_raster.cpp
@@ -229,7 +229,6 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
     QRegion wrgn(rgn);
     if (!wOffset.isNull())
         wrgn.translate(-wOffset);
-    QRect wbr = wrgn.boundingRect();
 
     if (wrgn.rectCount() != 1) {
         int num;
@@ -237,23 +236,25 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
         XSetClipRectangles(X11->display, d_ptr->gc, 0, 0, rects, num, YXBanded);
     }
 
-    QRect br = rgn.boundingRect().translated(offset);
+    QPoint widgetOffset = offset + wOffset;
+    QRect clipRect = widget->rect().translated(widgetOffset).intersected(d_ptr->image->image.rect());
+
+    QRect br = rgn.boundingRect().translated(offset).intersected(clipRect);
+    QPoint wpos = br.topLeft() - widgetOffset;
+
 #ifndef QT_NO_MITSHM
     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());
+                  br.x(), br.y(), br.width(), br.height(), wpos.x(), wpos.y());
         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);
+                     br.x(), br.y(), wpos.x(), wpos.y(), br.width(), br.height(), False);
         d_ptr->needsSync = true;
     } else
 #endif
     {
         const QImage &src = d->image->image;
-        br = br.intersected(src.rect());
         if (src.format() != QImage::Format_RGB32 || widget->x11Info().depth() < 24) {
             Q_ASSERT(src.depth() >= 16);
             const QImage sub_src(src.scanLine(br.y()) + br.x() * (uint(src.depth()) / 8),
@@ -262,11 +263,11 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
             data->xinfo = widget->x11Info();
             data->fromImage(sub_src, Qt::NoOpaqueDetection);
             QPixmap pm = QPixmap(data);
-            XCopyArea(X11->display, pm.handle(), widget->handle(), d_ptr->gc, 0 , 0 , br.width(), br.height(), wbr.x(), wbr.y());
+            XCopyArea(X11->display, pm.handle(), widget->handle(), d_ptr->gc, 0 , 0 , br.width(), br.height(), wpos.x(), wpos.y());
         } else {
             // qpaintengine_x11.cpp
             extern void qt_x11_drawImage(const QRect &rect, const QPoint &pos, const QImage &image, Drawable hd, GC gc, Display *dpy, Visual *visual, int depth);
-            qt_x11_drawImage(br, wbr.topLeft(), src, widget->handle(), d_ptr->gc, X11->display, (Visual *)widget->x11Info().visual(), widget->x11Info().depth());
+            qt_x11_drawImage(br, wpos, src, widget->handle(), d_ptr->gc, X11->display, (Visual *)widget->x11Info().visual(), widget->x11Info().depth());
         }
     }
 
@@ -311,7 +312,7 @@ void QRasterWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoi
     }
     CGContextClip(context);
 
-    QRect r = rgn.boundingRect();
+    QRect r = rgn.boundingRect().intersected(d->image->image.rect());
     const CGRect area = CGRectMake(r.x(), r.y(), r.width(), r.height());
     CGImageRef image = CGBitmapContextCreateImage(d->image->cg);
     CGImageRef subImage = CGImageCreateWithImageInRect(image, area);
diff --git a/src/gui/s60framework/s60framework.pri b/src/gui/s60framework/s60framework.pri
index e30d2c0..4e94c21 100644
--- a/src/gui/s60framework/s60framework.pri
+++ b/src/gui/s60framework/s60framework.pri
@@ -2,8 +2,7 @@ SOURCES += s60framework/qs60mainapplication.cpp \
     s60framework/qs60mainappui.cpp \
     s60framework/qs60maindocument.cpp \
     s60framework/qs60keycapture.cpp
-HEADERS += qs60keycapture_p.h \
-    s60framework/qs60mainapplication_p.h \
+HEADERS += s60framework/qs60mainapplication_p.h \
     s60framework/qs60mainapplication.h \
     s60framework/qs60mainappui.h \
     s60framework/qs60maindocument.h \
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index ad0e151..327bedf 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -837,14 +837,12 @@ static void drawArrow(const QStyle *style, const QStyleOptionToolButton *toolbut
 
 QSize QCommonStylePrivate::viewItemSize(const QStyleOptionViewItemV4 *option, int role) const
 {
-    Q_Q(const QCommonStyle);
-
     const QWidget *widget = option->widget;
     switch (role) {
     case Qt::CheckStateRole:
         if (option->features & QStyleOptionViewItemV2::HasCheckIndicator)
-            return QSize(q->pixelMetric(QStyle::PM_IndicatorWidth, option, widget),
-                         q->pixelMetric(QStyle::PM_IndicatorHeight, option, widget));
+            return QSize(proxyStyle->pixelMetric(QStyle::PM_IndicatorWidth, option, widget),
+                         proxyStyle->pixelMetric(QStyle::PM_IndicatorHeight, option, widget));
         break;
     case Qt::DisplayRole:
         if (option->features & QStyleOptionViewItemV2::HasDisplay) {
@@ -855,7 +853,7 @@ QSize QCommonStylePrivate::viewItemSize(const QStyleOptionViewItemV4 *option, in
             textLayout.setFont(option->font);
             textLayout.setText(option->text);
             const bool wrapText = option->features & QStyleOptionViewItemV2::WrapText;
-            const int textMargin = q->pixelMetric(QStyle::PM_FocusFrameHMargin, option, widget) + 1;
+            const int textMargin = proxyStyle->pixelMetric(QStyle::PM_FocusFrameHMargin, option, widget) + 1;
             QRect bounds = option->rect;
             switch (option->decorationPosition) {
             case QStyleOptionViewItem::Left:
@@ -919,9 +917,8 @@ static QSizeF viewItemTextLayout(QTextLayout &textLayout, int lineWidth)
 
 void QCommonStylePrivate::viewItemDrawText(QPainter *p, const QStyleOptionViewItemV4 *option, const QRect &rect) const
 {
-    Q_Q(const QCommonStyle);
     const QWidget *widget = option->widget;
-    const int textMargin = q->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, widget) + 1;
+    const int textMargin = proxyStyle->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, widget) + 1;
 
     QRect textRect = rect.adjusted(textMargin, 0, -textMargin, 0); // remove width padding
     const bool wrapText = option->features & QStyleOptionViewItemV2::WrapText;
@@ -999,7 +996,6 @@ void QCommonStylePrivate::viewItemDrawText(QPainter *p, const QStyleOptionViewIt
 void QCommonStylePrivate::viewItemLayout(const QStyleOptionViewItemV4 *opt,  QRect *checkRect,
                                          QRect *pixmapRect, QRect *textRect, bool sizehint) const
 {
-    Q_Q(const QCommonStyle);
     Q_ASSERT(checkRect && pixmapRect && textRect);
     *pixmapRect = QRect(QPoint(0, 0), viewItemSize(opt, Qt::DecorationRole));
     *textRect = QRect(QPoint(0, 0), viewItemSize(opt, Qt::DisplayRole));
@@ -1009,9 +1005,9 @@ void QCommonStylePrivate::viewItemLayout(const QStyleOptionViewItemV4 *opt,  QRe
     const bool hasCheck = checkRect->isValid();
     const bool hasPixmap = pixmapRect->isValid();
     const bool hasText = textRect->isValid();
-    const int textMargin = hasText ? q->pixelMetric(QStyle::PM_FocusFrameHMargin, opt, widget) + 1 : 0;
-    const int pixmapMargin = hasPixmap ? q->pixelMetric(QStyle::PM_FocusFrameHMargin, opt, widget) + 1 : 0;
-    const int checkMargin = hasCheck ? q->pixelMetric(QStyle::PM_FocusFrameHMargin, opt, widget) + 1 : 0;
+    const int textMargin = hasText ? proxyStyle->pixelMetric(QStyle::PM_FocusFrameHMargin, opt, widget) + 1 : 0;
+    const int pixmapMargin = hasPixmap ? proxyStyle->pixelMetric(QStyle::PM_FocusFrameHMargin, opt, widget) + 1 : 0;
+    const int checkMargin = hasCheck ? proxyStyle->pixelMetric(QStyle::PM_FocusFrameHMargin, opt, widget) + 1 : 0;
     int x = opt->rect.left();
     int y = opt->rect.top();
     int w, h;
diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm
index 8436856..1c1713c 100644
--- a/src/gui/styles/qmacstyle_mac.mm
+++ b/src/gui/styles/qmacstyle_mac.mm
@@ -1063,7 +1063,7 @@ bool qt_mac_buttonIsRenderedFlat(const QPushButton *pushButton, const QStyleOpti
 {
     QMacStyle *macStyle = qobject_cast<QMacStyle *>(pushButton->style());
     if (!macStyle)
-        return false;
+        return true;    // revert to 'flat' behavior if not Mac style
     HIThemeButtonDrawInfo bdi;
     macStyle->d->initHIThemePushButton(option, pushButton, kThemeStateActive, &bdi);
     return bdi.kind == kThemeBevelButton;
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index e9f7a86..eec2d15 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -101,12 +101,9 @@ const int QS60StylePrivate::m_numberOfLayouts =
 
 const short QS60StylePrivate::data[][MAX_PIXELMETRICS] = {
 // *** generated pixel metrics ***
-{5,0,-909,0,0,2,0,2,-1,7,12,22,15,15,7,198,-909,-909,-909,20,13,2,0,0,21,7,18,30,3,3,1,-909,-909,0,1,0,0,12,20,15,15,18,18,1,115,18,0,-909,-909,-909,-909,0,0,16,2,-909,0,0,-909,16,-909,-909,-909,-909,32,18,55,24,55,4,4,4,9,13,-909,5,51,11,5,0,3,3,6,8,3,3,-909,2,-909,-909,-909,-909,5,5,3,1,106,30,30},
-{5,0,-909,0,0,1,0,2,-1,8,14,22,15,15,7,164,-909,-909,-909,19,15,2,0,0,21,8,27,28,4,4,1,-909,-909,0,7,6,0,13,23,17,17,21,21,7,115,21,0,-909,-909,-909,-909,0,0,15,1,-909,0,0,-909,15,-909,-909,-909,-909,32,21,65,27,65,3,3,5,10,15,-909,5,58,13,5,0,4,4,7,9,4,4,-909,2,-909,-909,-909,-909,6,6,3,1,106,30,30},
-{7,0,-909,0,0,2,0,5,-1,25,69,46,37,37,9,258,-909,-909,-909,23,19,11,0,0,32,25,72,44,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,3,3,6,8,19,-909,7,74,19,7,0,5,5,8,12,5,5,-909,3,-909,-909,-909,-909,7,7,3,1,135,30,30},
-{7,0,-909,0,0,2,0,5,-1,25,68,46,37,37,9,258,-909,-909,-909,31,19,13,0,0,32,25,60,52,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,96,35,96,3,3,6,8,19,-909,7,74,22,7,0,5,5,8,12,5,5,-909,3,-909,-909,-909,-909,7,7,3,1,135,30,30},
-{7,0,-909,0,0,2,0,2,-1,10,20,27,18,18,9,301,-909,-909,-909,29,18,5,0,0,35,7,32,30,5,5,2,-909,-909,0,2,8,0,16,28,21,21,26,26,2,170,26,0,-909,-909,-909,-909,0,0,21,6,-909,0,0,-909,-909,-909,-909,-909,-909,54,26,265,34,265,5,5,6,3,18,-909,7,72,19,7,0,5,6,8,11,6,5,-909,2,-909,-909,-909,-909,5,5,3,1,106,30,30},
-{9,0,-909,0,0,2,0,5,-1,30,99,76,51,51,25,352,-909,-909,-909,29,25,7,0,0,43,34,42,76,7,7,2,-909,-909,0,9,14,0,23,39,30,30,37,37,9,391,40,0,-909,-909,-909,-909,0,0,29,2,-909,0,0,-909,29,-909,-909,-909,-909,115,37,96,48,96,2,2,9,1,25,-909,9,101,24,9,0,7,7,7,16,7,7,-909,3,-909,-909,-909,-909,9,9,3,1,184,30,30}
+{7,0,-909,0,0,2,5,5,-1,25,69,46,37,37,9,258,-909,-909,-909,23,19,11,0,0,32,25,72,44,5,5,2,-909,-909,0,7,21,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,25,2,-909,0,0,-909,25,-909,-909,-909,-909,87,27,77,35,77,3,3,6,8,19,-909,7,74,19,7,0,5,5,8,5,5,5,-909,3,-909,-909,-909,-909,7,7,3,1,135,30,30},
+{7,0,-909,0,0,2,5,5,-1,25,68,46,37,37,9,258,-909,-909,-909,31,19,13,0,0,32,25,60,52,5,5,2,-909,-909,0,7,32,0,17,29,22,22,27,27,7,173,29,0,-909,-909,-909,-909,0,0,26,2,-909,0,0,-909,26,-909,-909,-909,-909,87,27,96,35,96,3,3,6,8,19,-909,7,74,22,7,0,5,5,8,5,5,5,-909,3,-909,-909,-909,-909,7,7,3,1,135,30,30},
+{9,0,-909,0,0,2,5,5,-1,30,99,76,51,51,25,352,-909,-909,-909,29,25,7,0,0,43,34,42,76,7,7,2,-909,-909,0,9,14,0,23,39,30,30,37,37,9,391,40,0,-909,-909,-909,-909,0,0,29,2,-909,0,0,-909,29,-909,-909,-909,-909,115,37,96,48,96,2,2,9,1,25,-909,9,101,24,9,0,7,7,7,7,7,7,-909,3,-909,-909,-909,-909,9,9,3,1,184,30,30}
 // *** End of generated data ***
 };
 
@@ -845,6 +842,7 @@ void QS60StylePrivate::setThemePaletteHash(QPalette *palette)
     webPalette.setColor(QPalette::WindowText, Qt::black);
     webPalette.setColor(QPalette::Text, Qt::black);
     webPalette.setBrush(QPalette::Base, Qt::white);
+    webPalette.setBrush(QPalette::Window, Qt::white);
 
     QApplication::setPalette(webPalette, "QWebView");
     QApplication::setPalette(webPalette, "QGraphicsWebView");
@@ -1520,9 +1518,9 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
                 if (tabOverlap > borderThickness)
                     tabOverlap -= borderThickness;
 
-                const bool usesScrollButtons = 
+                const bool usesScrollButtons =
                     (widget) ? (qobject_cast<const QTabBar*>(widget))->usesScrollButtons() : false;
-                const int roomForScrollButton = 
+                const int roomForScrollButton =
                     usesScrollButtons ? QS60StylePrivate::pixelMetric(PM_TabBarScrollButtonWidth) : 0;
 
                 // adjust for overlapping tabs and scrollbuttons, if necessary
@@ -1563,9 +1561,9 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
             int tabOverlap = pixelMetric(PM_TabBarTabOverlap);
             if (tabOverlap > borderThickness)
                 tabOverlap -= borderThickness;
-            const bool usesScrollButtons = 
+            const bool usesScrollButtons =
                 (widget) ? (qobject_cast<const QTabBar*>(widget))->usesScrollButtons() : false;
-            const int roomForScrollButton = 
+            const int roomForScrollButton =
                 usesScrollButtons ? QS60StylePrivate::pixelMetric(PM_TabBarScrollButtonWidth) : 0;
 
             switch (tab->shape) {
@@ -1771,7 +1769,7 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
             //highlight and then it needs one to separate it whatever is shown after it (text/icon/both).
             const int moveByX = optionCheckBox.rect.width() + 2 * vSpacing;
             optionCheckBox.rect.moveCenter(QPoint(
-                    optionCheckBox.rect.center().x() + moveByX >> 1, 
+                    optionCheckBox.rect.center().x() + moveByX >> 1,
                     menuItem->rect.center().y()));
 
             if (optionMenuItem.direction != Qt::LeftToRight)
@@ -1785,11 +1783,11 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
                 const int end = optionMenuItem.rect.right() - spacing;
                 //-1 adjustment to avoid highlight being on top of possible separator item
                 const QRect highlightRect = QRect(
-                        QPoint(start, option->rect.top()), 
+                        QPoint(start, option->rect.top()),
                         QPoint(end, option->rect.bottom() - 1));
                 QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_ListHighlight, painter, highlightRect, flags);
             }
-            
+
             if (checkable && !ignoreCheckMark)
                 drawPrimitive(PE_IndicatorMenuCheckMark, &optionCheckBox, painter, widget);
 
@@ -2072,8 +2070,8 @@ void QS60Style::drawPrimitive(PrimitiveElement element, const QStyleOption *opti
                 if ((qstyleoption_cast<const QStyleOptionFocusRect *>(option) &&
                     (qobject_cast<const QRadioButton *>(widget) || qobject_cast<const QCheckBox *>(widget))))
                         QS60StylePrivate::drawSkinElement(
-                            QS60StylePrivate::isWidgetPressed(widget) ? 
-                                QS60StylePrivate::SE_ListItemPressed : 
+                            QS60StylePrivate::isWidgetPressed(widget) ?
+                                QS60StylePrivate::SE_ListItemPressed :
                                 QS60StylePrivate::SE_ListHighlight, painter, option->rect, flags);
             } else {
                 commonStyleDraws = true;
@@ -2506,11 +2504,13 @@ int QS60Style::pixelMetric(PixelMetric metric, const QStyleOption *option, const
             metricValue = QS60StylePrivate::pixelMetric(PM_LayoutLeftMargin);
     }
 
-    if (widget && (metric == PM_LayoutTopMargin || metric == PM_LayoutLeftMargin || metric == PM_LayoutRightMargin))
-        if (widget->windowType() == Qt::Dialog)
-            //double the layout margins (except bottom) for dialogs, it is very close to real value
+    if (widget && (metric == PM_LayoutTopMargin || metric == PM_LayoutBottomMargin
+                   || metric == PM_LayoutRightMargin || metric == PM_LayoutLeftMargin))
+        if (widget->windowType() == Qt::Dialog) {
+            //double the layout margins for dialogs, it is very close to real value
             //without having to define custom pixel metric
             metricValue *= 2;
+        }
 
 #if defined(Q_WS_S60)
     if (metric == PM_TabBarTabOverlap && (QSysInfo::s60Version() > QSysInfo::SV_S60_5_2))
@@ -2537,13 +2537,17 @@ QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt,
             //Make toolbuttons in toolbar stretch the whole screen area
             if (widget && qobject_cast<const QToolBar *>(widget->parentWidget())) {
                 const QToolBar *tb = qobject_cast<const QToolBar *>(widget->parentWidget());
-                const bool parentCanGrowHorizontally = !(tb->sizePolicy().horizontalPolicy() == QSizePolicy::Fixed ||
-                        tb->sizePolicy().horizontalPolicy() == QSizePolicy::Maximum) && tb->orientation() == Qt::Horizontal;
+                bool parentCanGrowHorizontally = false;
+                if (tb) {
+                    parentCanGrowHorizontally = !(tb->sizePolicy().horizontalPolicy() == QSizePolicy::Fixed
+                       || tb->sizePolicy().horizontalPolicy() == QSizePolicy::Maximum)
+                       && tb->orientation() == Qt::Horizontal;
+                }
 
                 if (parentCanGrowHorizontally) {
                     int buttons = 0;
                     //Make the auto-stretch to happen only for horizontal orientation
-                    if (tb && tb->orientation() == Qt::Horizontal) {
+                    if (tb->orientation() == Qt::Horizontal) {
                         QList<QAction*> actionList =  tb->actions();
                         for (int i = 0; i < actionList.count(); i++) {
                             buttons++;
@@ -2603,7 +2607,7 @@ QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt,
             break;
         case CT_LineEdit:
             if (const QStyleOptionFrame *f = qstyleoption_cast<const QStyleOptionFrame *>(opt))
-                sz += QSize(2 * f->lineWidth, 4 * f->lineWidth);
+                sz += QSize(2 * f->lineWidth, 4 * f->lineWidth + 2 * pixelMetric(PM_FocusFrameHMargin));
             break;
         case CT_TabBarTab: {
                 sz = QCommonStyle::sizeFromContents(ct, opt, csz, widget);
@@ -2648,6 +2652,12 @@ QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt,
             }
             break;
 #endif
+#ifndef QT_NO_SPINBOX
+        case CT_SpinBox:
+            // Add margin to the spinbox height
+            sz.setHeight(sz.height() + 2 * pixelMetric(PM_SpinBoxFrameWidth));
+            break;
+#endif
         default:
             sz = QCommonStyle::sizeFromContents( ct, opt, csz, widget);
             break;
@@ -2821,7 +2831,7 @@ QRect QS60Style::subControlRect(ComplexControl control, const QStyleOptionComple
             // Thus, side-by-side buttons would take half of the total width.
             const int maxSize = qMax(spinbox->rect.width() / 4, buttonContentWidth);
             QSize buttonSize;
-            buttonSize.setHeight(qMin(maxSize, qMax(8, spinbox->rect.height() - frameThickness)));
+            buttonSize.setHeight(qMin(maxSize, qMax(8, spinbox->rect.height() - 2 * frameThickness)));
             //width should at least be equal to height
             buttonSize.setWidth(qMax(buttonSize.height(), buttonContentWidth));
             buttonSize = buttonSize.expandedTo(QApplication::globalStrut());
@@ -2829,9 +2839,9 @@ QRect QS60Style::subControlRect(ComplexControl control, const QStyleOptionComple
             // Normally spinbuttons should be side-by-side, but if spinbox grows very big
             // and spinbuttons reach their maximum size, they can be deployed one top of the other.
             const bool sideBySide = (buttonSize.height() * 2 < spinbox->rect.height()) ? false : true;
-            const int y = frameThickness + spinbox->rect.y() +  
+            const int y = spinbox->rect.y() +
                           (spinbox->rect.height() - (sideBySide ? 1 : 2) * buttonSize.height()) / 2;
-            const int x = spinbox->rect.x() + 
+            const int x = spinbox->rect.x() +
                           spinbox->rect.width() - frameThickness - (sideBySide ? 2 : 1) * buttonSize.width();
 
             switch (scontrol) {
@@ -2843,8 +2853,8 @@ QRect QS60Style::subControlRect(ComplexControl control, const QStyleOptionComple
                 case SC_SpinBoxDown:
                     if (spinbox->buttonSymbols == QAbstractSpinBox::NoButtons)
                         return QRect();
-                    ret = QRect(x + (sideBySide ? buttonSize.width() : 0), 
-                                y + (sideBySide ? 0 : buttonSize.height()), 
+                    ret = QRect(x + (sideBySide ? buttonSize.width() : 0),
+                                y + (sideBySide ? 0 : buttonSize.height()),
                                 buttonSize.width(), buttonSize.height());
                     break;
                 case SC_SpinBoxEditField:
@@ -3778,7 +3788,7 @@ QIcon QS60Style::standardIconImplementation(StandardPixmap standardIcon,
 
     const QS60StylePrivate::SkinElementFlags flags = adjustedFlags;
     const int iconDimension = QS60StylePrivate::pixelMetric(metric);
-    const QRect iconSize = (!option) ? 
+    const QRect iconSize = (!option) ?
         QRect(0, 0, iconDimension * iconWidthMultiplier, iconDimension * iconHeightMultiplier) : option->rect;
     const QPixmap cachedPixMap(QS60StylePrivate::cachedPart(part, iconSize.size(), 0, flags));
     return cachedPixMap.isNull() ?
diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp
index 913352a..cfb10fa 100644
--- a/src/gui/styles/qs60style_s60.cpp
+++ b/src/gui/styles/qs60style_s60.cpp
@@ -91,6 +91,7 @@ enum TSupportRelease {
     ES60_5_1      = 0x0008,
     ES60_5_2      = 0x0010,
     ES60_5_3      = 0x0020,
+    ES60_5_4      = 0x0040,
     ES60_3_X      = ES60_3_1 | ES60_3_2,
     // Releases before Symbian Foundation
     ES60_PreSF    = ES60_3_1 | ES60_3_2 | ES60_5_0,
@@ -98,8 +99,10 @@ enum TSupportRelease {
     ES60_Pre52    = ES60_3_1 | ES60_3_2 | ES60_5_0 | ES60_5_1,
     // Releases before S60 5.3
     ES60_Pre53    = ES60_3_1 | ES60_3_2 | ES60_5_0 | ES60_5_1 | ES60_5_2,
+    // Releases before S60 5.4
+    ES60_Pre54    = ES60_3_1 | ES60_3_2 | ES60_5_0 | ES60_5_1 | ES60_5_2 | ES60_5_3,
     // Add all new releases here
-    ES60_All = ES60_3_1 | ES60_3_2 | ES60_5_0 | ES60_5_1 | ES60_5_2 | ES60_5_3
+    ES60_All = ES60_3_1 | ES60_3_2 | ES60_5_0 | ES60_5_1 | ES60_5_2 | ES60_5_3 | ES60_5_4
 };
 
 typedef struct {
@@ -107,7 +110,7 @@ typedef struct {
     TDrawType drawType; // Determines which native drawing routine is used to draw this item.
     int supportInfo;    // Defines the S60 versions that use the default graphics.
     // These two, define new graphics that are used in releases other than partMapEntry.supportInfo defined releases.
-    // In general, these are given in numeric form to allow style compilation in earlier 
+    // In general, these are given in numeric form to allow style compilation in earlier
     // native releases that do not contain the new graphics.
     int newMajorSkinId;
     int newMinorSkinId;
@@ -707,7 +710,7 @@ QPixmap QS60StyleModeSpecifics::colorSkinnedGraphicsLX(
         colorIndex,
         icon,
         iconMask,
-        AknIconUtils::AvkonIconFileName(),
+        (fallbackGraphicID != KErrNotFound ? AknIconUtils::AvkonIconFileName() : KNullDesC),
         fallbackGraphicID,
         fallbackGraphicsMaskID,
         defaultColor);
@@ -922,10 +925,20 @@ QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsLX(
                 skinId,
                 icon,
                 iconMask,
-                AknIconUtils::AvkonIconFileName(),
+                (fallbackGraphicID != KErrNotFound ? AknIconUtils::AvkonIconFileName() : KNullDesC),
                 fallbackGraphicID ,
                 fallbackGraphicsMaskID);
 
+            // If drawing fails, re-try without a mask.
+            if (!icon) {
+                AknsUtils::CreateIconL(
+                    skinInstance,
+                    skinId,
+                    icon,
+                    (fallbackGraphicID != KErrNotFound ? AknIconUtils::AvkonIconFileName() : KNullDesC),
+                    fallbackGraphicID);
+            }
+
             result = fromFbsBitmap(icon, iconMask, flags, targetSize);
             delete icon;
             delete iconMask;
@@ -958,17 +971,22 @@ QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsLX(
                 targetSize,
                 drawParam);
 
-            if (drawn)
+            if (drawn) {
                 result = fromFbsBitmap(background, NULL, flags, targetSize);
-            // if drawing fails in skin server, just ignore the background (probably OOM case)
+            } else {
+                // if drawing fails in skin server, draw background as white
+                QPixmap defaultBg = QPixmap(targetSize.iWidth, targetSize.iHeight);
+                defaultBg.fill(Qt::white);
+                result = defaultBg;
+            }
 
             CleanupStack::PopAndDestroy(4, background); //background, dev, gc, bgContext
     //        QS60WindowSurface::lockBitmapHeap();
             break;
         }
         case EDrawAnimation: {
-            CFbsBitmap* animationFrame;
-            CFbsBitmap* frameMask;
+            CFbsBitmap* animationFrame = 0;
+            CFbsBitmap* frameMask = 0;
             CAknBitmapAnimation* aknAnimation = 0;
             TBool constructedFromTheme = ETrue;
 
@@ -1016,7 +1034,7 @@ QPixmap QS60StyleModeSpecifics::createSkinnedGraphicsLX(
                     KAknsIIDDefault, //animation is not themed, lets force fallback graphics
                     animationFrame,
                     frameMask,
-                    AknIconUtils::AvkonIconFileName(),
+                    (fallbackGraphicID != KErrNotFound ? AknIconUtils::AvkonIconFileName() : KNullDesC),
                     fallbackGraphicID ,
                     fallbackGraphicsMaskID);
             }
@@ -1222,13 +1240,17 @@ TRect QS60StyleModeSpecifics::innerRectFromElement(QS60StylePrivate::SkinFrameEl
 
 bool QS60StyleModeSpecifics::checkSupport(const int supportedRelease)
 {
+    if (supportedRelease == ES60_All)
+        return true;
+
     const QSysInfo::S60Version currentRelease = QSysInfo::s60Version();
     return ( (currentRelease == QSysInfo::SV_S60_3_1 && supportedRelease & ES60_3_1) ||
              (currentRelease == QSysInfo::SV_S60_3_2 && supportedRelease & ES60_3_2) ||
              (currentRelease == QSysInfo::SV_S60_5_0 && supportedRelease & ES60_5_0) ||
              (currentRelease == QSysInfo::SV_S60_5_1 && supportedRelease & ES60_5_1) ||
              (currentRelease == QSysInfo::SV_S60_5_2 && supportedRelease & ES60_5_2) ||
-             (currentRelease == QSysInfo::SV_S60_5_3 && supportedRelease & ES60_5_3) );
+             (currentRelease == QSysInfo::SV_S60_5_3 && supportedRelease & ES60_5_3) ||
+             (currentRelease == QSysInfo::SV_S60_5_4 && supportedRelease & ES60_5_4) );
 }
 
 TAknsItemID QS60StyleModeSpecifics::partSpecificThemeId(int part)
diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp
index c099273..9732c7e 100644
--- a/src/gui/styles/qwindowsstyle.cpp
+++ b/src/gui/styles/qwindowsstyle.cpp
@@ -177,11 +177,14 @@ bool QWindowsStyle::eventFilter(QObject *o, QEvent *e)
 
             // Alt has been pressed - find all widgets that care
             QList<QWidget *> l = widget->findChildren<QWidget *>();
-            for (int pos=0 ; pos < l.size() ; ++pos) {
+            for (int pos=0 ; pos < l.size() ;) {
                 QWidget *w = l.at(pos);
                 if (w->isWindow() || !w->isVisible() ||
-                    w->style()->styleHint(SH_UnderlineShortcut, 0, w))
+                    w->style()->styleHint(SH_UnderlineShortcut, 0, w)) {
                     l.removeAt(pos);
+                    continue;
+                }
+                pos++;
             }
             // Update states before repainting
             d->seenAlt.append(widget);
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 2d6af3b..2df88e2 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -919,8 +919,9 @@ QString QFont::styleName() const
 /*!
     \since 4.8
 
-    Sets the style name of the font. When set, other style properties
-    like \a style() and \a weight() will be ignored for font matching.
+    Sets the style name of the font to the given \a styleName.
+    When set, other style properties like style() and weight() will be ignored
+    for font matching.
 
     \sa styleName()
 */
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 79503f9..1d463c4 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -1943,8 +1943,9 @@ bool  QFontDatabase::isScalable(const QString &family,
 
 
 /*!
-    Returns a list of the point sizes available for the font that has
-    family \a family and style \a style. The list may be empty.
+    \fn QList<int> QFontDatabase::pointSizes(const QString &family, const QString &style)
+    Returns a list of the point sizes available for the font with the
+    given \a family and \a style. The list may be empty.
 
     \sa smoothSizes(), standardSizes()
 */
@@ -2052,8 +2053,9 @@ QFont QFontDatabase::font(const QString &family, const QString &style,
 
 
 /*!
-    Returns the point sizes of a font that has family \a family and
-    style \a style that will look attractive. The list may be empty.
+    \fn QList<int> QFontDatabase::smoothSizes(const QString &family, const QString &style)
+    Returns the point sizes of a font with the given \a family and \a style
+    that will look attractive. The list may be empty.
     For non-scalable fonts and bitmap scalable fonts, this function
     is equivalent to pointSizes().
 
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index dec0982..c9b672b 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -280,6 +280,8 @@ void QFontEngine::getGlyphPositions(const QGlyphLayout &glyphs, const QTransform
         int i = glyphs.numGlyphs;
         int totalKashidas = 0;
         while(i--) {
+            if (glyphs.attributes[i].dontPrint)
+                continue;
             xpos += glyphs.advances_x[i] + QFixed::fromFixed(glyphs.justifications[i].space_18d6);
             ypos += glyphs.advances_y[i];
             totalKashidas += glyphs.justifications[i].nKashidas;
@@ -1335,8 +1337,7 @@ bool QFontEngineMulti::stringToCMap(const QChar *str, int len,
 
     int glyph_pos = 0;
     for (int i = 0; i < len; ++i) {
-        bool surrogate = (str[i].unicode() >= 0xd800 && str[i].unicode() < 0xdc00 && i < len-1
-                          && str[i+1].unicode() >= 0xdc00 && str[i+1].unicode() < 0xe000);
+        bool surrogate = (str[i].isHighSurrogate() && i < len-1 && str[i+1].isLowSurrogate());
 
         if (glyphs->glyphs[glyph_pos] == 0 && str[i].category() != QChar::Separator_Line) {
             QGlyphLayoutInstance tmp = glyphs->instance(glyph_pos);
diff --git a/src/gui/text/qfontengine_coretext.mm b/src/gui/text/qfontengine_coretext.mm
index 64d4a24..153451e 100644
--- a/src/gui/text/qfontengine_coretext.mm
+++ b/src/gui/text/qfontengine_coretext.mm
@@ -135,7 +135,7 @@ void QCoreTextFontEngineMulti::init(bool kerning)
     attributeDict = CFDictionaryCreateMutable(0, 2,
                                        &kCFTypeDictionaryKeyCallBacks,
                                        &kCFTypeDictionaryValueCallBacks);
-    CFDictionaryAddValue(attributeDict, NSFontAttributeName, ctfont);
+    CFDictionaryAddValue(attributeDict, kCTFontAttributeName, ctfont);
     if (!kerning) {
         float zero = 0.0;
         QCFType<CFNumberRef> noKern = CFNumberCreate(kCFAllocatorDefault, kCFNumberFloatType, &zero);
@@ -257,7 +257,7 @@ bool QCoreTextFontEngineMulti::stringToCMap(const QChar *str, int len, QGlyphLay
             //NSLog(@"Dictionary %@", runAttribs);
             if (!runAttribs)
                 runAttribs = attributeDict;
-            CTFontRef runFont = static_cast<CTFontRef>(CFDictionaryGetValue(runAttribs, NSFontAttributeName));
+            CTFontRef runFont = static_cast<CTFontRef>(CFDictionaryGetValue(runAttribs, kCTFontAttributeName));
             uint fontIndex = fontIndexForFont(runFont);
             const QFontEngine *engine = engineAt(fontIndex);
             fontIndex <<= 24;
@@ -547,7 +547,6 @@ glyph_metrics_t QCoreTextFontEngine::boundingBox(glyph_t glyph)
         ret.xoff = ret.xoff.round();
         ret.yoff = ret.yoff.round();
     }
-
     return ret;
 }
 
@@ -723,7 +722,12 @@ QImage QCoreTextFontEngine::imageForGlyph(glyph_t glyph, QFixed subPixelPosition
     QImage im(qRound(br.width) + 2, qRound(br.height) + 2, QImage::Format_RGB32);
     im.fill(0);
 
-    CGColorSpaceRef colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
+    CGColorSpaceRef colorspace =
+#ifdef Q_WS_MAC
+            CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
+#else
+            CGColorSpaceCreateDeviceRGB();
+#endif
     uint cgflags = kCGImageAlphaNoneSkipFirst;
 #ifdef kCGBitmapByteOrder32Host //only needed because CGImage.h added symbols in the minor version
     cgflags |= kCGBitmapByteOrder32Host;
diff --git a/src/gui/text/qfontengine_coretext_p.h b/src/gui/text/qfontengine_coretext_p.h
index efe8295..4bd80be 100644
--- a/src/gui/text/qfontengine_coretext_p.h
+++ b/src/gui/text/qfontengine_coretext_p.h
@@ -44,8 +44,18 @@
 
 #include <private/qfontengine_p.h>
 
+#ifdef QT_NO_CORESERVICES
+#include <CoreText/CoreText.h>
+#include <CoreGraphics/CoreGraphics.h>
+#include <private/qcore_mac_p.h>
+#endif
+
 #if !defined(Q_WS_MAC) || (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
 
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
 class QRawFontPrivate;
 class QCoreTextFontEngineMulti;
 class QCoreTextFontEngine : public QFontEngine
@@ -140,6 +150,10 @@ private:
 
 CGAffineTransform qt_transform_from_fontdef(const QFontDef &fontDef);
 
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
 #endif// !defined(Q_WS_MAC) || (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5)
 
 #endif // QFONTENGINE_CORETEXT_P_H
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index 9a5d9d6..e20aa25 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -78,6 +78,10 @@
 #include FT_ERRORS_H
 #endif
 
+#if !defined(QT_MAX_CACHED_GLYPH_SIZE)
+#  define QT_MAX_CACHED_GLYPH_SIZE 64
+#endif
+
 QT_BEGIN_NAMESPACE
 
 /*
@@ -373,7 +377,7 @@ void QFreetypeFace::computeSize(const QFontDef &fontDef, int *xsize, int *ysize,
                 *xsize = *ysize = 0;
         }
     } else {
-        *outline_drawing = (*xsize > (64<<6) || *ysize > (64<<6));
+        *outline_drawing = (*xsize > (QT_MAX_CACHED_GLYPH_SIZE<<6) || *ysize > (QT_MAX_CACHED_GLYPH_SIZE<<6));
     }
 }
 
@@ -1317,7 +1321,7 @@ QFontEngineFT::QGlyphSet *QFontEngineFT::loadTransformedGlyphSet(const QTransfor
 
     if (!gs) {
         // don't try to load huge fonts
-        bool draw_as_outline = fontDef.pixelSize * qSqrt(qAbs(matrix.det())) >= 64;
+        bool draw_as_outline = fontDef.pixelSize * qSqrt(qAbs(matrix.det())) >= QT_MAX_CACHED_GLYPH_SIZE;
         if (draw_as_outline)
             return 0;
 
@@ -1418,15 +1422,12 @@ void QFontEngineFT::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_me
 
 static inline unsigned int getChar(const QChar *str, int &i, const int len)
 {
-    unsigned int uc = str[i].unicode();
-    if (uc >= 0xd800 && uc < 0xdc00 && i < len-1) {
-        uint low = str[i+1].unicode();
-       if (low >= 0xdc00 && low < 0xe000) {
-            uc = (uc - 0xd800)*0x400 + (low - 0xdc00) + 0x10000;
-            ++i;
-        }
+    uint ucs4 = str[i].unicode();
+    if (str[i].isHighSurrogate() && i < len-1 && str[i+1].isLowSurrogate()) {
+        ++i;
+        ucs4 = QChar::surrogateToUcs4(ucs4, str[i].unicode());
     }
-    return uc;
+    return ucs4;
 }
 
 bool QFontEngineFT::canRender(const QChar *string, int len)
diff --git a/src/gui/text/qfontengine_ft_p.h b/src/gui/text/qfontengine_ft_p.h
index 57811fa..95e5b82 100644
--- a/src/gui/text/qfontengine_ft_p.h
+++ b/src/gui/text/qfontengine_ft_p.h
@@ -196,12 +196,7 @@ public:
         inline bool useFastGlyphData(glyph_t index, QFixed subPixelPosition) const {
             return (index < 256 && subPixelPosition == 0);
         }
-        inline Glyph *getGlyph(glyph_t index, QFixed subPixelPosition = 0) const
-        {
-            if (useFastGlyphData(index, subPixelPosition))
-                return fast_glyph_data[index];
-            return glyph_data.value(GlyphAndSubPixelPosition(index, subPixelPosition));
-        }
+        inline Glyph *getGlyph(glyph_t index, QFixed subPixelPosition = 0) const;
         void setGlyph(glyph_t index, QFixed spp, Glyph *glyph);
 
 private:
@@ -376,6 +371,14 @@ inline uint qHash(const QFontEngineFT::GlyphAndSubPixelPosition &g)
     return (g.glyph << 8)  | (g.subPixelPosition * 10).round().toInt();
 }
 
+inline QFontEngineFT::Glyph *QFontEngineFT::QGlyphSet::getGlyph(glyph_t index, QFixed subPixelPosition) const
+{
+    if (useFastGlyphData(index, subPixelPosition))
+        return fast_glyph_data[index];
+    return glyph_data.value(GlyphAndSubPixelPosition(index, subPixelPosition));
+}
+
+
 QT_END_NAMESPACE
 
 #endif // QT_NO_FREETYPE
diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm
index 9d9eaed..6186b2f 100644
--- a/src/gui/text/qfontengine_mac.mm
+++ b/src/gui/text/qfontengine_mac.mm
@@ -257,10 +257,8 @@ static OSStatus atsuPostLayoutCallback(ATSULayoutOperationSelector selector, ATS
 #if !defined(QT_NO_DEBUG)
         int surrogates = 0;
         const QChar *str = item->string;
-        for (int i = item->from; i < item->from + item->length - 1; ++i) {
-            surrogates += (str[i].unicode() >= 0xd800 && str[i].unicode() < 0xdc00
-                           && str[i+1].unicode() >= 0xdc00 && str[i+1].unicode() < 0xe000);
-        }
+        for (int i = item->from; i < item->from + item->length - 1; ++i)
+            surrogates += (str[i].isHighSurrogate() && str[i+1].isLowSurrogate());
 #endif
         for (nextCharStop = item->from; nextCharStop < item->from + item->length; ++nextCharStop)
             if (item->charAttributes[nextCharStop].charStop)
@@ -328,10 +326,8 @@ static OSStatus atsuPostLayoutCallback(ATSULayoutOperationSelector selector, ATS
             if (charOffset < item->length - 1) {
                 QChar current = item->string[item->from + charOffset];
                 QChar next = item->string[item->from + charOffset + 1];
-                if (current.unicode() >= 0xd800 && current.unicode() < 0xdc00
-                    && next.unicode() >= 0xdc00 && next.unicode() < 0xe000) {
+                if (current.isHighSurrogate() && next.isLowSurrogate())
                     item->log_clusters[charOffset + 1] = currentClusterGlyph;
-                }
             }
         }
     }
@@ -738,15 +734,12 @@ QFontEngineMac::~QFontEngineMac()
 
 static inline unsigned int getChar(const QChar *str, int &i, const int len)
 {
-    unsigned int uc = str[i].unicode();
-    if (uc >= 0xd800 && uc < 0xdc00 && i < len-1) {
-        uint low = str[i+1].unicode();
-       if (low >= 0xdc00 && low < 0xe000) {
-            uc = (uc - 0xd800)*0x400 + (low - 0xdc00) + 0x10000;
-            ++i;
-        }
+    uint ucs4 = str[i].unicode();
+    if (str[i].isHighSurrogate() && i < len-1 && str[i+1].isLowSurrogate()) {
+        ++i;
+        ucs4 = QChar::surrogateToUcs4(ucs4, str[i].unicode());
     }
-    return uc;
+    return ucs4;
 }
 
 // Not used directly for shaping, only used to calculate m_averageCharWidth
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index a70aec1..8d81acb 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -155,6 +155,7 @@ public:
     struct FaceId {
         FaceId() : index(0), encoding(0) {}
         QByteArray filename;
+        QByteArray uuid;
         int index;
         int encoding;
     };
@@ -295,7 +296,7 @@ inline bool operator ==(const QFontEngine::FaceId &f1, const QFontEngine::FaceId
 
 inline uint qHash(const QFontEngine::FaceId &f)
 {
-    return qHash((f.index << 16) + f.encoding) + qHash(f.filename);
+    return qHash((f.index << 16) + f.encoding) + qHash(f.filename + f.uuid);
 }
 
 
diff --git a/src/gui/text/qfontengine_qpa.cpp b/src/gui/text/qfontengine_qpa.cpp
index cb1e7d6..c829c2f 100644
--- a/src/gui/text/qfontengine_qpa.cpp
+++ b/src/gui/text/qfontengine_qpa.cpp
@@ -226,15 +226,12 @@ QVariant QFontEngineQPA::extractHeaderField(const uchar *data, HeaderTag request
 
 static inline unsigned int getChar(const QChar *str, int &i, const int len)
 {
-    unsigned int uc = str[i].unicode();
-    if (uc >= 0xd800 && uc < 0xdc00 && i < len-1) {
-        uint low = str[i+1].unicode();
-       if (low >= 0xdc00 && low < 0xe000) {
-            uc = (uc - 0xd800)*0x400 + (low - 0xdc00) + 0x10000;
-            ++i;
-        }
+    uint ucs4 = str[i].unicode();
+    if (str[i].isHighSurrogate() && i < len-1 && str[i+1].isLowSurrogate()) {
+        ++i;
+        ucs4 = QChar::surrogateToUcs4(ucs4, str[i].unicode());
     }
-    return uc;
+    return ucs4;
 }
 
 QFontEngineQPA::QFontEngineQPA(const QFontDef &def, const QByteArray &data)
diff --git a/src/gui/text/qfontengine_qpf.cpp b/src/gui/text/qfontengine_qpf.cpp
index 30a1623..3db5ce1 100644
--- a/src/gui/text/qfontengine_qpf.cpp
+++ b/src/gui/text/qfontengine_qpf.cpp
@@ -278,15 +278,12 @@ QList<QByteArray> QFontEngineQPF::cleanUpAfterClientCrash(const QList<int> &cras
 
 static inline unsigned int getChar(const QChar *str, int &i, const int len)
 {
-    unsigned int uc = str[i].unicode();
-    if (uc >= 0xd800 && uc < 0xdc00 && i < len-1) {
-        uint low = str[i+1].unicode();
-       if (low >= 0xdc00 && low < 0xe000) {
-            uc = (uc - 0xd800)*0x400 + (low - 0xdc00) + 0x10000;
-            ++i;
-        }
+    uint ucs4 = str[i].unicode();
+    if (str[i].isHighSurrogate() && i < len-1 && str[i+1].isLowSurrogate()) {
+        ++i;
+        ucs4 = QChar::surrogateToUcs4(ucs4, str[i].unicode());
     }
-    return uc;
+    return ucs4;
 }
 #ifdef QT_FONTS_ARE_RESOURCES
 QFontEngineQPF::QFontEngineQPF(const QFontDef &def, const uchar *bytes, int size)
diff --git a/src/gui/text/qfontengine_qws.cpp b/src/gui/text/qfontengine_qws.cpp
index 237842b..ade283f 100644
--- a/src/gui/text/qfontengine_qws.cpp
+++ b/src/gui/text/qfontengine_qws.cpp
@@ -83,15 +83,12 @@ QT_BEGIN_NAMESPACE
 
 static inline unsigned int getChar(const QChar *str, int &i, const int len)
 {
-    unsigned int uc = str[i].unicode();
-    if (uc >= 0xd800 && uc < 0xdc00 && i < len-1) {
-        uint low = str[i+1].unicode();
-       if (low >= 0xdc00 && low < 0xe000) {
-            uc = (uc - 0xd800)*0x400 + (low - 0xdc00) + 0x10000;
-            ++i;
-        }
+    uint ucs4 = str[i].unicode();
+    if (str[i].isHighSurrogate() && i < len-1 && str[i+1].isLowSurrogate()) {
+        ++i;
+        ucs4 = QChar::surrogateToUcs4(ucs4, str[i].unicode());
     }
-    return uc;
+    return ucs4;
 }
 
 #define FM_SMOOTH 1
diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/text/qfontengine_s60.cpp
index b0824cb..203b6e1 100644
--- a/src/gui/text/qfontengine_s60.cpp
+++ b/src/gui/text/qfontengine_s60.cpp
@@ -233,15 +233,12 @@ bool QSymbianTypeFaceExtras::symbianFontTableApiAvailable()
 // duplicated from qfontengine_xyz.cpp
 static inline unsigned int getChar(const QChar *str, int &i, const int len)
 {
-    unsigned int uc = str[i].unicode();
-    if (uc >= 0xd800 && uc < 0xdc00 && i < len-1) {
-        uint low = str[i+1].unicode();
-       if (low >= 0xdc00 && low < 0xe000) {
-            uc = (uc - 0xd800)*0x400 + (low - 0xdc00) + 0x10000;
-            ++i;
-        }
+    uint ucs4 = str[i].unicode();
+    if (str[i].isHighSurrogate() && i < len-1 && str[i+1].isLowSurrogate()) {
+        ++i;
+        ucs4 = QChar::surrogateToUcs4(ucs4, str[i].unicode());
     }
-    return uc;
+    return ucs4;
 }
 
 extern QString qt_symbian_fontNameWithAppFontMarker(const QString &fontName); // qfontdatabase_s60.cpp
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp
index aef2145..fc11387 100644
--- a/src/gui/text/qfontengine_win.cpp
+++ b/src/gui/text/qfontengine_win.cpp
@@ -224,15 +224,12 @@ void QFontEngineWin::getCMap()
 
 inline unsigned int getChar(const QChar *str, int &i, const int len)
 {
-    unsigned int uc = str[i].unicode();
-    if (uc >= 0xd800 && uc < 0xdc00 && i < len-1) {
-        uint low = str[i+1].unicode();
-       if (low >= 0xdc00 && low < 0xe000) {
-            uc = (uc - 0xd800)*0x400 + (low - 0xdc00) + 0x10000;
-            ++i;
-        }
+    uint ucs4 = str[i].unicode();
+    if (str[i].isHighSurrogate() && i < len-1 && str[i+1].isLowSurrogate()) {
+        ++i;
+        ucs4 = QChar::surrogateToUcs4(ucs4, str[i].unicode());
     }
-    return uc;
+    return ucs4;
 }
 
 int QFontEngineWin::getGlyphIndexes(const QChar *str, int numChars, QGlyphLayout *glyphs, bool mirrored) const
diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/text/qfontengine_x11.cpp
index 490866c..6e87f4c 100644
--- a/src/gui/text/qfontengine_x11.cpp
+++ b/src/gui/text/qfontengine_x11.cpp
@@ -358,9 +358,7 @@ bool QFontEngineXLFD::stringToCMap(const QChar *s, int len, QGlyphLayout *glyphs
     QVarLengthArray<ushort> _s(len);
     QChar *str = (QChar *)_s.data();
     for (int i = 0; i < len; ++i) {
-        if (i < len - 1
-            && s[i].unicode() >= 0xd800 && s[i].unicode() < 0xdc00
-            && s[i+1].unicode() >= 0xdc00 && s[i].unicode() < 0xe000) {
+        if (s[i].isHighSurrogate() && i < len-1 && s[i+1].isLowSurrogate()) {
             *str = QChar();
             ++i;
         } else {
diff --git a/src/gui/text/qfontenginedirectwrite.cpp b/src/gui/text/qfontenginedirectwrite.cpp
index d693273..5bac117 100644
--- a/src/gui/text/qfontenginedirectwrite.cpp
+++ b/src/gui/text/qfontenginedirectwrite.cpp
@@ -269,15 +269,12 @@ QFixed QFontEngineDirectWrite::emSquareSize() const
 
 inline unsigned int getChar(const QChar *str, int &i, const int len)
 {
-    unsigned int uc = str[i].unicode();
-    if (uc >= 0xd800 && uc < 0xdc00 && i < len-1) {
-        uint low = str[i+1].unicode();
-       if (low >= 0xdc00 && low < 0xe000) {
-            uc = (uc - 0xd800)*0x400 + (low - 0xdc00) + 0x10000;
-            ++i;
-        }
+    uint ucs4 = str[i].unicode();
+    if (str[i].isHighSurrogate() && i < len-1 && str[i+1].isLowSurrogate()) {
+        ++i;
+        ucs4 = QChar::surrogateToUcs4( ucs4, str[i].unicode());
     }
-    return uc;
+    return ucs4;
 }
 
 bool QFontEngineDirectWrite::stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs,
diff --git a/src/gui/text/qfontmetrics.cpp b/src/gui/text/qfontmetrics.cpp
index f3d4107..1d93d54 100644
--- a/src/gui/text/qfontmetrics.cpp
+++ b/src/gui/text/qfontmetrics.cpp
@@ -442,9 +442,10 @@ bool QFontMetrics::inFont(QChar ch) const
 }
 
 /*!
+   \fn bool QFontMetrics::inFontUcs4(uint character) const
    \since 4.8
 
-   Returns true if the character encoded in UCS-4/UTF-32 is a valid
+   Returns true if the given \a character encoded in UCS-4/UTF-32 is a valid
    character in the font; otherwise returns false.
 */
 bool QFontMetrics::inFontUcs4(uint ucs4) const
diff --git a/src/gui/text/qglyphrun.cpp b/src/gui/text/qglyphrun.cpp
index 2865d91..7f43378 100644
--- a/src/gui/text/qglyphrun.cpp
+++ b/src/gui/text/qglyphrun.cpp
@@ -140,14 +140,18 @@ bool QGlyphRun::operator==(const QGlyphRun &other) const
         return false;
     }
 
-    for (int i=0; i<qMax(d->glyphIndexDataSize, d->glyphPositionDataSize); ++i) {
-        if (i < d->glyphIndexDataSize && d->glyphIndexData[i] != other.d->glyphIndexData[i])
-           return false;
-
-        if (i < d->glyphPositionDataSize && d->glyphPositionData[i] != other.d->glyphPositionData[i])
-           return false;
+    if (d->glyphIndexData != other.d->glyphIndexData) {
+        for (int i = 0; i < d->glyphIndexDataSize; ++i) {
+            if (d->glyphIndexData[i] != other.d->glyphIndexData[i])
+               return false;
+        }
+    }
+    if (d->glyphPositionData != other.d->glyphPositionData) {
+        for (int i = 0; i < d->glyphPositionDataSize; ++i) {
+            if (d->glyphPositionData[i] != other.d->glyphPositionData[i])
+               return false;
+        }
     }
-
 
     return (d->overline == other.d->overline
             && d->underline == other.d->underline
@@ -156,13 +160,11 @@ bool QGlyphRun::operator==(const QGlyphRun &other) const
 }
 
 /*!
+    \fn bool QGlyphRun::operator!=(const QGlyphRun &other) const
+
     Compares \a other to this QGlyphRun object. Returns true if any of the list of glyph
     indexes, the list of positions or the font are different, otherwise returns false.
 */
-bool QGlyphRun::operator!=(const QGlyphRun &other) const
-{
-    return !(*this == other);
-}
 
 /*!
     Returns the font selected for this QGlyphRun object.
@@ -175,7 +177,8 @@ QRawFont QGlyphRun::rawFont() const
 }
 
 /*!
-    Sets the font in which to look up the glyph indexes to \a font.
+    Sets the font specified by \a rawFont to be the font used to look up the
+    glyph indexes.
 
     \sa rawFont(), setGlyphIndexes()
 */
@@ -293,6 +296,9 @@ bool QGlyphRun::overline() const
 */
 void QGlyphRun::setOverline(bool overline)
 {
+    if (d->overline == overline)
+        return;
+
     detach();
     d->overline = overline;
 }
@@ -315,6 +321,9 @@ bool QGlyphRun::underline() const
 */
 void QGlyphRun::setUnderline(bool underline)
 {
+    if (d->underline == underline)
+        return;
+
     detach();
     d->underline = underline;
 }
@@ -337,6 +346,9 @@ bool QGlyphRun::strikeOut() const
 */
 void QGlyphRun::setStrikeOut(bool strikeOut)
 {
+    if (d->strikeOut == strikeOut)
+        return;
+
     detach();
     d->strikeOut = strikeOut;
 }
diff --git a/src/gui/text/qglyphrun.h b/src/gui/text/qglyphrun.h
index cf407a8..bc7f4ff 100644
--- a/src/gui/text/qglyphrun.h
+++ b/src/gui/text/qglyphrun.h
@@ -79,8 +79,10 @@ public:
     void clear();
 
     QGlyphRun &operator=(const QGlyphRun &other);
+
     bool operator==(const QGlyphRun &other) const;
-    bool operator!=(const QGlyphRun &other) const;
+    inline bool operator!=(const QGlyphRun &other) const
+    { return !operator==(other); }
 
     void setOverline(bool overline);
     bool overline() const;
diff --git a/src/gui/text/qplatformfontdatabase_qpa.cpp b/src/gui/text/qplatformfontdatabase_qpa.cpp
index d1d1f94..e3eeca5 100644
--- a/src/gui/text/qplatformfontdatabase_qpa.cpp
+++ b/src/gui/text/qplatformfontdatabase_qpa.cpp
@@ -160,6 +160,9 @@ QSupportedWritingSystems::QSupportedWritingSystems(const QSupportedWritingSystem
     d->ref.ref();
 }
 
+/*!
+    Assigns the \a other supported writing systems object to this object.
+*/
 QSupportedWritingSystems &QSupportedWritingSystems::operator=(const QSupportedWritingSystems &other)
 {
     if (d != other.d) {
@@ -171,6 +174,9 @@ QSupportedWritingSystems &QSupportedWritingSystems::operator=(const QSupportedWr
     return *this;
 }
 
+/*!
+    Destroys the object.
+*/
 QSupportedWritingSystems::~QSupportedWritingSystems()
 {
     if (!d->ref.deref())
@@ -187,12 +193,26 @@ void QSupportedWritingSystems::detach()
     }
 }
 
+/*!
+    Sets the supported state of the writing system given by \a writingSystem to
+    the value specified by \a support. A value of true indicates that the
+    writing system is supported; a value of false indicates that it is
+    unsupported.
+
+    \sa supported()
+*/
 void QSupportedWritingSystems::setSupported(QFontDatabase::WritingSystem writingSystem, bool support)
 {
     detach();
     d->vector[writingSystem] = support;
 }
 
+/*!
+    Returns true if the writing system given by \a writingSystem is supported;
+    otherwise returns false.
+
+    \sa setSupported()
+*/
 bool QSupportedWritingSystems::supported(QFontDatabase::WritingSystem writingSystem) const
 {
     return d->vector.at(writingSystem);
@@ -295,7 +315,7 @@ QStringList QPlatformFontDatabase::addApplicationFont(const QByteArray &fontData
 }
 
 /*!
-
+    Releases the font handle and deletes any associated data loaded from a file.
 */
 void QPlatformFontDatabase::releaseHandle(void *handle)
 {
@@ -304,7 +324,13 @@ void QPlatformFontDatabase::releaseHandle(void *handle)
 }
 
 /*!
+    Returns the path to the font directory.
+
+    The font directory is stored in the general Qt settings unless it has been
+    overridden by the \c QT_QPA_FONTDIR environment variable.
 
+    When using builds of Qt that do not support settings, the \c QT_QPA_FONTDIR
+    environment variable is the only way to specify the font directory.
 */
 QString QPlatformFontDatabase::fontDir() const
 {
diff --git a/src/gui/text/qrawfont.cpp b/src/gui/text/qrawfont.cpp
index e3e5c57..7c7d4eb 100644
--- a/src/gui/text/qrawfont.cpp
+++ b/src/gui/text/qrawfont.cpp
@@ -46,7 +46,6 @@
 #include "qrawfont.h"
 #include "qrawfont_p.h"
 
-#include <QtCore/qthread.h>
 #include <QtCore/qendian.h>
 
 QT_BEGIN_NAMESPACE
@@ -77,7 +76,7 @@ QT_BEGIN_NAMESPACE
 
    A QRawFont object represents a single, physical instance of a given font in a given pixel size.
    I.e. in the typical case it represents a set of TrueType or OpenType font tables and uses a
-   user specified pixel size to convert metrics into logical pixel units. In can be used in
+   user specified pixel size to convert metrics into logical pixel units. It can be used in
    combination with the QGlyphRun class to draw specific glyph indexes at specific positions, and
    also have accessors to some relevant data in the physical font.
 
@@ -190,8 +189,7 @@ QRawFont &QRawFont::operator=(const QRawFont &other)
 */
 bool QRawFont::isValid() const
 {
-    Q_ASSERT(d->thread == 0 || d->thread == QThread::currentThread());
-    return d->fontEngine != 0;
+    return d->isValid();
 }
 
 /*!
@@ -225,7 +223,7 @@ void QRawFont::loadFromData(const QByteArray &fontData,
                             qreal pixelSize,
                             QFont::HintingPreference hintingPreference)
 {
-    detach();
+    d.detach();
     d->cleanUp();
     d->hintingPreference = hintingPreference;
     d->thread = QThread::currentThread();
@@ -240,20 +238,21 @@ void QRawFont::loadFromData(const QByteArray &fontData,
    If \a antialiasingType is set to QRawFont::SubPixelAntialiasing, then the resulting image will be
    in QImage::Format_RGB32 and the RGB values of each pixel will represent the subpixel opacities of
    the pixel in the rasterization of the glyph. Otherwise, the image will be in the format of
-   QImage::Format_A8 and each pixel will contain the opacity of the pixel in the rasterization.
+   QImage::Format_Indexed8 and each pixel will contain the opacity of the pixel in the
+   rasterization.
 
    \sa pathForGlyph(), QPainter::drawGlyphRun()
 */
 QImage QRawFont::alphaMapForGlyph(quint32 glyphIndex, AntialiasingType antialiasingType,
                                   const QTransform &transform) const
 {
-    if (!isValid())
+    if (!d->isValid())
         return QImage();
 
     if (antialiasingType == SubPixelAntialiasing)
         return d->fontEngine->alphaRGBMapForGlyph(glyphIndex, QFixed(), 0, transform);
-    else
-        return d->fontEngine->alphaMapForGlyph(glyphIndex, QFixed(), transform);
+
+    return d->fontEngine->alphaMapForGlyph(glyphIndex, QFixed(), transform);
 }
 
 /*!
@@ -266,7 +265,7 @@ QImage QRawFont::alphaMapForGlyph(quint32 glyphIndex, AntialiasingType antialias
 */
 QPainterPath QRawFont::pathForGlyph(quint32 glyphIndex) const
 {
-    if (!isValid())
+    if (!d->isValid())
         return QPainterPath();
 
     QFixedPoint position;
@@ -284,16 +283,19 @@ bool QRawFont::operator==(const QRawFont &other) const
 }
 
 /*!
+    \fn bool QRawFont::operator!=(const QRawFont &other) const
+
+    Returns true if this QRawFont is not equal to \a other. Otherwise, returns false.
+*/
+
+/*!
    Returns the ascent of this QRawFont in pixel units.
 
    \sa QFontMetricsF::ascent()
 */
 qreal QRawFont::ascent() const
 {
-    if (!isValid())
-        return 0.0;
-
-    return d->fontEngine->ascent().toReal();
+    return d->isValid() ? d->fontEngine->ascent().toReal() : 0.0;
 }
 
 /*!
@@ -303,10 +305,7 @@ qreal QRawFont::ascent() const
 */
 qreal QRawFont::descent() const
 {
-    if (!isValid())
-        return 0.0;
-
-    return d->fontEngine->descent().toReal();
+    return d->isValid() ? d->fontEngine->descent().toReal() : 0.0;
 }
 
 /*!
@@ -316,10 +315,7 @@ qreal QRawFont::descent() const
 */
 qreal QRawFont::xHeight() const
 {
-    if (!isValid())
-        return 0.0;
-
-    return d->fontEngine->xHeight().toReal();
+    return d->isValid() ? d->fontEngine->xHeight().toReal() : 0.0;
 }
 
 /*!
@@ -329,10 +325,7 @@ qreal QRawFont::xHeight() const
 */
 qreal QRawFont::leading() const
 {
-    if (!isValid())
-        return 0.0;
-
-    return d->fontEngine->leading().toReal();
+    return d->isValid() ? d->fontEngine->leading().toReal() : 0.0;
 }
 
 /*!
@@ -342,10 +335,7 @@ qreal QRawFont::leading() const
 */
 qreal QRawFont::averageCharWidth() const
 {
-    if (!isValid())
-        return 0.0;
-
-    return d->fontEngine->averageCharWidth().toReal();
+    return d->isValid() ? d->fontEngine->averageCharWidth().toReal() : 0.0;
 }
 
 /*!
@@ -355,10 +345,7 @@ qreal QRawFont::averageCharWidth() const
 */
 qreal QRawFont::maxCharWidth() const
 {
-    if (!isValid())
-        return 0.0;
-
-    return d->fontEngine->maxCharWidth();
+    return d->isValid() ? d->fontEngine->maxCharWidth() : 0.0;
 }
 
 /*!
@@ -370,10 +357,7 @@ qreal QRawFont::maxCharWidth() const
 */
 qreal QRawFont::pixelSize() const
 {
-    if (!isValid())
-        return 0.0;
-
-    return d->fontEngine->fontDef.pixelSize;
+    return d->isValid() ? d->fontEngine->fontDef.pixelSize : 0.0;
 }
 
 /*!
@@ -386,10 +370,7 @@ qreal QRawFont::pixelSize() const
 */
 qreal QRawFont::unitsPerEm() const
 {
-    if (!isValid())
-        return 0.0;
-
-    return d->fontEngine->emSquareSize().toReal();
+    return d->isValid() ? d->fontEngine->emSquareSize().toReal() : 0.0;
 }
 
 /*!
@@ -397,10 +378,7 @@ qreal QRawFont::unitsPerEm() const
 */
 QString QRawFont::familyName() const
 {
-    if (!isValid())
-        return QString();
-
-    return d->fontEngine->fontDef.family;
+    return d->isValid() ? d->fontEngine->fontDef.family : QString();
 }
 
 /*!
@@ -410,10 +388,7 @@ QString QRawFont::familyName() const
 */
 QString QRawFont::styleName() const
 {
-    if (!isValid())
-        return QString();
-
-    return d->fontEngine->fontDef.styleName;
+    return d->isValid() ? d->fontEngine->fontDef.styleName : QString();
 }
 
 /*!
@@ -423,10 +398,7 @@ QString QRawFont::styleName() const
 */
 QFont::Style QRawFont::style() const
 {
-    if (!isValid())
-        return QFont::StyleNormal;
-
-    return QFont::Style(d->fontEngine->fontDef.style);
+    return d->isValid() ? QFont::Style(d->fontEngine->fontDef.style) : QFont::StyleNormal;
 }
 
 /*!
@@ -436,10 +408,7 @@ QFont::Style QRawFont::style() const
 */
 int QRawFont::weight() const
 {
-    if (!isValid())
-        return -1;
-
-    return int(d->fontEngine->fontDef.weight);
+    return d->isValid() ? int(d->fontEngine->fontDef.weight) : -1;
 }
 
 /*!
@@ -457,7 +426,7 @@ int QRawFont::weight() const
 */
 QVector<quint32> QRawFont::glyphIndexesForString(const QString &text) const
 {
-    if (!isValid())
+    if (!d->isValid())
         return QVector<quint32>();
 
     int nglyphs = text.size();
@@ -485,11 +454,12 @@ QVector<quint32> QRawFont::glyphIndexesForString(const QString &text) const
    must be at least \a numChars, if that's still not enough, this function will return
    false, then you can resize \a glyphIndexes from the size returned in \a numGlyphs.
 
-   \sa glyphIndexesForString(), advancesForGlyphIndexes(), QGlyphs, QTextLayout::glyphs(), QTextFragment::glyphs()
+   \sa glyphIndexesForString(), advancesForGlyphIndexes(), QGlyphRun,
+       QTextLayout::glyphRuns(), QTextFragment::glyphRuns()
 */
 bool QRawFont::glyphIndexesForChars(const QChar *chars, int numChars, quint32 *glyphIndexes, int *numGlyphs) const
 {
-    if (!isValid())
+    if (!d->isValid())
         return false;
 
     QGlyphLayout glyphs;
@@ -506,7 +476,7 @@ bool QRawFont::glyphIndexesForChars(const QChar *chars, int numChars, quint32 *g
 */
 QVector<QPointF> QRawFont::advancesForGlyphIndexes(const QVector<quint32> &glyphIndexes) const
 {
-    if (!isValid())
+    if (!d->isValid())
         return QVector<QPointF>();
 
     int numGlyphs = glyphIndexes.size();
@@ -533,7 +503,7 @@ QVector<QPointF> QRawFont::advancesForGlyphIndexes(const QVector<quint32> &glyph
 */
 bool QRawFont::advancesForGlyphIndexes(const quint32 *glyphIndexes, QPointF *advances, int numGlyphs) const
 {
-    if (!isValid())
+    if (!d->isValid())
         return false;
 
     QGlyphLayout glyphs;
@@ -559,10 +529,7 @@ bool QRawFont::advancesForGlyphIndexes(const quint32 *glyphIndexes, QPointF *adv
 */
 QFont::HintingPreference QRawFont::hintingPreference() const
 {
-    if (!isValid())
-        return QFont::PreferDefaultHinting;
-
-    return d->hintingPreference;
+    return d->isValid() ? d->hintingPreference : QFont::PreferDefaultHinting;
 }
 
 /*!
@@ -573,7 +540,7 @@ QFont::HintingPreference QRawFont::hintingPreference() const
 */
 QByteArray QRawFont::fontTable(const char *tagName) const
 {
-    if (!isValid())
+    if (!d->isValid())
         return QByteArray();
 
     const quint32 *tagId = reinterpret_cast<const quint32 *>(tagName);
@@ -596,9 +563,9 @@ extern QList<QFontDatabase::WritingSystem> qt_determine_writing_systems_from_tru
 */
 QList<QFontDatabase::WritingSystem> QRawFont::supportedWritingSystems() const
 {
-    if (isValid()) {
+    if (d->isValid()) {
         QByteArray os2Table = fontTable("OS/2");
-        if (!os2Table.isEmpty() && os2Table.size() > 86) {
+        if (os2Table.size() > 86) {
             char *data = os2Table.data();
             quint32 *bigEndianUnicodeRanges = reinterpret_cast<quint32 *>(data + 42);
             quint32 *bigEndianCodepageRanges = reinterpret_cast<quint32 *>(data + 78);
@@ -626,10 +593,7 @@ QList<QFontDatabase::WritingSystem> QRawFont::supportedWritingSystems() const
 */
 bool QRawFont::supportsCharacter(QChar character) const
 {
-    if (!isValid())
-        return false;
-
-    return d->fontEngine->canRender(&character, 1);
+    return d->isValid() && d->fontEngine->canRender(&character, 1);
 }
 
 /*!
@@ -640,9 +604,6 @@ bool QRawFont::supportsCharacter(QChar character) const
 */
 bool QRawFont::supportsCharacter(quint32 ucs4) const
 {
-    if (!isValid())
-        return false;
-
     QChar str[2];
     int len;
     if (!QChar::requiresSurrogates(ucs4)) {
@@ -654,7 +615,7 @@ bool QRawFont::supportsCharacter(quint32 ucs4) const
         len = 2;
     }
 
-    return d->fontEngine->canRender(str, len);
+    return d->isValid() && d->fontEngine->canRender(str, len);
 }
 
 // qfontdatabase.cpp
@@ -666,6 +627,7 @@ extern int qt_script_for_writing_system(QFontDatabase::WritingSystem writingSyst
 */
 QRawFont QRawFont::fromFont(const QFont &font, QFontDatabase::WritingSystem writingSystem)
 {
+    QRawFont rawFont;
 #if defined(Q_WS_MAC)
     QTextLayout layout(QFontDatabase::writingSystemSample(writingSystem), font);
     layout.beginLayout();
@@ -676,14 +638,12 @@ QRawFont QRawFont::fromFont(const QFont &font, QFontDatabase::WritingSystem writ
         // Pick the one matches the family name we originally requested,
         // if none of them match, just pick the first one
         for (int i = 0; i < list.size(); i++) {
-            QGlyphRun glyphs = list.at(i);
-            QRawFont rawfont = glyphs.rawFont();
-            if (rawfont.familyName() == font.family())
-                return rawfont;
+            rawFont = list.at(i).rawFont();
+            if (rawFont.familyName() == font.family())
+                return rawFont;
         }
         return list.at(0).rawFont();
     }
-    return QRawFont();
 #else
     QFontPrivate *font_d = QFontPrivate::get(font);
     int script = qt_script_for_writing_system(writingSystem);
@@ -699,15 +659,12 @@ QRawFont QRawFont::fromFont(const QFont &font, QFontDatabase::WritingSystem writ
     }
 
     if (fe != 0) {
-        QRawFont rawFont;
         rawFont.d.data()->fontEngine = fe;
         rawFont.d.data()->fontEngine->ref.ref();
         rawFont.d.data()->hintingPreference = font.hintingPreference();
-        return rawFont;
-    } else {
-        return QRawFont();
     }
 #endif
+    return rawFont;
 }
 
 /*!
@@ -718,7 +675,7 @@ void QRawFont::setPixelSize(qreal pixelSize)
     if (d->fontEngine == 0)
         return;
 
-    detach();
+    d.detach();
     QFontEngine *oldFontEngine = d->fontEngine;
 
     d->fontEngine = d->fontEngine->cloneWithSize(pixelSize);
@@ -733,15 +690,6 @@ void QRawFont::setPixelSize(qreal pixelSize)
 /*!
     \internal
 */
-void QRawFont::detach()
-{
-    if (d->ref != 1)
-        d.detach();
-}
-
-/*!
-    \internal
-*/
 void QRawFontPrivate::cleanUp()
 {
     platformCleanUp();
diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h
index d5b5680..cf77996 100644
--- a/src/gui/text/qrawfont.h
+++ b/src/gui/text/qrawfont.h
@@ -81,7 +81,10 @@ public:
     bool isValid() const;
 
     QRawFont &operator=(const QRawFont &other);
+
     bool operator==(const QRawFont &other) const;
+    inline bool operator!=(const QRawFont &other) const
+    { return !operator==(other); }
 
     QString familyName() const;
     QString styleName() const;
@@ -132,9 +135,6 @@ public:
 
 private:
     friend class QRawFontPrivate;
-
-    void detach();
-
     QExplicitlySharedDataPointer<QRawFontPrivate> d;
 };
 
diff --git a/src/gui/text/qrawfont_ft.cpp b/src/gui/text/qrawfont_ft.cpp
index 5bba221..1666df3 100644
--- a/src/gui/text/qrawfont_ft.cpp
+++ b/src/gui/text/qrawfont_ft.cpp
@@ -45,6 +45,7 @@
 
 #include "qrawfont_p.h"
 #include "qfontengine_ft_p.h"
+#include "quuid.h"
 
 #if defined(Q_WS_X11) && !defined(QT_NO_FONTCONFIG)
 #  include "qfontengine_x11_p.h"
@@ -87,6 +88,7 @@ public:
         FaceId faceId;
         faceId.filename = "";
         faceId.index = 0;
+        faceId.uuid = QUuid::createUuid().toByteArray();
 
         return init(faceId, true, Format_None, fontData);
     }
diff --git a/src/gui/text/qrawfont_p.h b/src/gui/text/qrawfont_p.h
index fdf7cad..3557751 100644
--- a/src/gui/text/qrawfont_p.h
+++ b/src/gui/text/qrawfont_p.h
@@ -54,7 +54,9 @@
 //
 
 #include "qrawfont.h"
+
 #include "qfontengine_p.h"
+#include <QtCore/qthread.h>
 #include <QtCore/qthreadstorage.h>
 
 #if !defined(QT_NO_RAWFONT)
@@ -71,21 +73,17 @@ public:
         , thread(0)
 #if defined(Q_WS_WIN)
         , fontHandle(NULL)
-        , ptrAddFontMemResourceEx(NULL)
-        , ptrRemoveFontMemResourceEx(NULL)
 #endif
     {}
 
     QRawFontPrivate(const QRawFontPrivate &other)
-        : hintingPreference(other.hintingPreference)
+        : fontEngine(other.fontEngine)
+        , hintingPreference(other.hintingPreference)
         , thread(other.thread)
 #if defined(Q_WS_WIN)
         , fontHandle(NULL)
-        , ptrAddFontMemResourceEx(other.ptrAddFontMemResourceEx)
-        , ptrRemoveFontMemResourceEx(other.ptrRemoveFontMemResourceEx)
 #endif
     {
-        fontEngine = other.fontEngine;
         if (fontEngine != 0)
             fontEngine->ref.ref();
     }
@@ -96,6 +94,12 @@ public:
         cleanUp();
     }
 
+    inline bool isValid() const
+    {
+        Q_ASSERT(thread == 0 || thread == QThread::currentThread());
+        return fontEngine != 0;
+    }
+
     void cleanUp();
     void platformCleanUp();
     void platformLoadFromData(const QByteArray &fontData,
@@ -111,14 +115,7 @@ public:
 
 #if defined(Q_WS_WIN)
     HANDLE fontHandle;
-
-    typedef HANDLE (WINAPI *PtrAddFontMemResourceEx)(PVOID, DWORD, PVOID, DWORD *);
-    typedef BOOL (WINAPI *PtrRemoveFontMemResourceEx)(HANDLE);
-
-    PtrAddFontMemResourceEx ptrAddFontMemResourceEx;
-    PtrRemoveFontMemResourceEx ptrRemoveFontMemResourceEx;
-
-#endif // Q_WS_WIN
+#endif
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/text/qrawfont_win.cpp b/src/gui/text/qrawfont_win.cpp
index 779652f..a729e31 100644
--- a/src/gui/text/qrawfont_win.cpp
+++ b/src/gui/text/qrawfont_win.cpp
@@ -40,6 +40,9 @@
 ****************************************************************************/
 
 #include "qrawfont_p.h"
+
+#if !defined(QT_NO_RAWFONT)
+
 #include <private/qsystemlibrary_p.h>
 
 #if !defined(QT_NO_DIRECTWRITE)
@@ -47,8 +50,6 @@
 #  include <dwrite.h>
 #endif
 
-#if !defined(QT_NO_RAWFONT)
-
 QT_BEGIN_NAMESPACE
 
 namespace {
@@ -61,18 +62,16 @@ namespace {
         operator T() const
         {
             T littleEndian = 0;
-            for (int i=0; i<sizeof(T); ++i) {
+            for (int i = 0; i < int(sizeof(T)); ++i)
                 littleEndian |= data[i] << ((sizeof(T) - i - 1) * 8);
-            }
 
             return littleEndian;
         }
 
         BigEndian<T> &operator=(const T &t)
         {
-            for (int i=0; i<sizeof(T); ++i) {
+            for (int i = 0; i < int(sizeof(T)); ++i)
                 data[i] = ((t >> (sizeof(T) - i - 1) * 8) & 0xff);
-            }
 
             return *this;
         }
@@ -157,7 +156,7 @@ namespace {
     class EmbeddedFont
     {
     public:
-        EmbeddedFont(const QByteArray &fontData);
+        EmbeddedFont(const QByteArray &fontData) : m_fontData(fontData) {}
 
         QString changeFamilyName(const QString &newFamilyName);
         QByteArray data() const { return m_fontData; }
@@ -168,10 +167,6 @@ namespace {
         QByteArray m_fontData;
     };
 
-    EmbeddedFont::EmbeddedFont(const QByteArray &fontData) : m_fontData(fontData)
-    {
-    }
-
     TableDirectory *EmbeddedFont::tableDirectoryEntry(const QByteArray &tagName)
     {
         Q_ASSERT(tagName.size() == 4);
@@ -214,9 +209,9 @@ namespace {
                                                         + nameRecord->offset;
 
                     const BigEndian<quint16> *s = reinterpret_cast<const BigEndian<quint16> *>(ptr);
-                    for (int j=0; j<nameRecord->length / sizeof(quint16); ++j)
-                        name += QChar(s[j]);
-
+                    const BigEndian<quint16> *e = s + nameRecord->length / sizeof(quint16);
+                    while (s != e)
+                        name += QChar(*s++);
                     break;
                 }
             }
@@ -525,41 +520,49 @@ extern QFontEngine *qt_load_font_engine_win(const QFontDef &request);
 // From qfontdatabase.cpp
 extern QFont::Weight weightFromInteger(int weight);
 
-void QRawFontPrivate::platformCleanUp()
+typedef HANDLE (WINAPI *PtrAddFontMemResourceEx)(PVOID, DWORD, PVOID, DWORD *);
+static PtrAddFontMemResourceEx ptrAddFontMemResourceEx = 0;
+typedef BOOL (WINAPI *PtrRemoveFontMemResourceEx)(HANDLE);
+static PtrRemoveFontMemResourceEx ptrRemoveFontMemResourceEx = 0;
+
+static void resolveGdi32()
 {
-    if (fontHandle != NULL) {
-        if (ptrRemoveFontMemResourceEx == NULL) {
-            void *func = QSystemLibrary::resolve(QLatin1String("gdi32"), "RemoveFontMemResourceEx");
-            ptrRemoveFontMemResourceEx =
-                    reinterpret_cast<QRawFontPrivate::PtrRemoveFontMemResourceEx>(func);
+    static bool triedResolve = false;
+    if (!triedResolve) {
+        QSystemLibrary gdi32(QLatin1String("gdi32"));
+        if (gdi32.load()) {
+            ptrAddFontMemResourceEx = (PtrAddFontMemResourceEx)gdi32.resolve("AddFontMemResourceEx");
+            ptrRemoveFontMemResourceEx = (PtrRemoveFontMemResourceEx)gdi32.resolve("RemoveFontMemResourceEx");
         }
 
-        if (ptrRemoveFontMemResourceEx == NULL) {
-            qWarning("QRawFont::platformCleanUp: Can't find RemoveFontMemResourceEx in gdi32");
-            fontHandle = NULL;
-        } else {
+        triedResolve = true;
+    }
+}
+
+void QRawFontPrivate::platformCleanUp()
+{
+    if (fontHandle != NULL) {
+        if (ptrRemoveFontMemResourceEx)
             ptrRemoveFontMemResourceEx(fontHandle);
-            fontHandle = NULL;
-        }
+        fontHandle = NULL;
     }
 }
 
-void QRawFontPrivate::platformLoadFromData(const QByteArray &_fontData,
+void QRawFontPrivate::platformLoadFromData(const QByteArray &fontData,
                                            qreal pixelSize,
                                            QFont::HintingPreference hintingPreference)
 {
-    QByteArray fontData(_fontData);
     EmbeddedFont font(fontData);
 
 #if !defined(QT_NO_DIRECTWRITE)
     if (hintingPreference == QFont::PreferDefaultHinting
-     || hintingPreference == QFont::PreferFullHinting)
+        || hintingPreference == QFont::PreferFullHinting)
 #endif
     {
         GUID guid;
         CoCreateGuid(&guid);
 
-        QString uniqueFamilyName = QString::fromLatin1("f")
+        QString uniqueFamilyName = QLatin1Char('f')
                 + QString::number(guid.Data1, 36) + QLatin1Char('-')
                 + QString::number(guid.Data2, 36) + QLatin1Char('-')
                 + QString::number(guid.Data3, 36) + QLatin1Char('-')
@@ -571,22 +574,13 @@ void QRawFontPrivate::platformLoadFromData(const QByteArray &_fontData,
             return;
         }
 
-        if (ptrAddFontMemResourceEx == NULL || ptrRemoveFontMemResourceEx == NULL) {
-            void *func = QSystemLibrary::resolve(QLatin1String("gdi32"), "RemoveFontMemResourceEx");
-            ptrRemoveFontMemResourceEx =
-                    reinterpret_cast<QRawFontPrivate::PtrRemoveFontMemResourceEx>(func);
-
-            func = QSystemLibrary::resolve(QLatin1String("gdi32"), "AddFontMemResourceEx");
-            ptrAddFontMemResourceEx =
-                    reinterpret_cast<QRawFontPrivate::PtrAddFontMemResourceEx>(func);
-        }
-
         Q_ASSERT(fontHandle == NULL);
-        if (ptrAddFontMemResourceEx != NULL && ptrRemoveFontMemResourceEx != NULL) {
+        resolveGdi32();
+        if (ptrAddFontMemResourceEx && ptrRemoveFontMemResourceEx) {
             DWORD count = 0;
-            fontData = font.data();
-            fontHandle = ptrAddFontMemResourceEx(fontData.data(), fontData.size(), 0, &count);
-
+            QByteArray newFontData = font.data();
+            fontHandle = ptrAddFontMemResourceEx((void *)newFontData.constData(), newFontData.size(),
+                                                 0, &count);
             if (count == 0 && fontHandle != NULL) {
                 ptrRemoveFontMemResourceEx(fontHandle);
                 fontHandle = NULL;
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index e32e112..aeeef85 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -680,20 +680,30 @@ void QTextControlPrivate::extendWordwiseSelection(int suggestedNewPosition, qrea
     if (!wordSelectionEnabled && (mouseXPosition < wordStartX || mouseXPosition > wordEndX))
         return;
 
-    // keep the already selected word even when moving to the left
-    // (#39164)
-    if (suggestedNewPosition < selectedWordOnDoubleClick.position())
-        cursor.setPosition(selectedWordOnDoubleClick.selectionEnd());
-    else
-        cursor.setPosition(selectedWordOnDoubleClick.selectionStart());
+    if (wordSelectionEnabled) {
+        if (suggestedNewPosition < selectedWordOnDoubleClick.position()) {
+            cursor.setPosition(selectedWordOnDoubleClick.selectionEnd());
+            setCursorPosition(wordStartPos, QTextCursor::KeepAnchor);
+        } else {
+            cursor.setPosition(selectedWordOnDoubleClick.selectionStart());
+            setCursorPosition(wordEndPos, QTextCursor::KeepAnchor);
+        }
+    } else {
+        // keep the already selected word even when moving to the left
+        // (#39164)
+        if (suggestedNewPosition < selectedWordOnDoubleClick.position())
+            cursor.setPosition(selectedWordOnDoubleClick.selectionEnd());
+        else
+            cursor.setPosition(selectedWordOnDoubleClick.selectionStart());
 
-    const qreal differenceToStart = mouseXPosition - wordStartX;
-    const qreal differenceToEnd = wordEndX - mouseXPosition;
+        const qreal differenceToStart = mouseXPosition - wordStartX;
+        const qreal differenceToEnd = wordEndX - mouseXPosition;
 
-    if (differenceToStart < differenceToEnd)
-        setCursorPosition(wordStartPos, QTextCursor::KeepAnchor);
-    else
-        setCursorPosition(wordEndPos, QTextCursor::KeepAnchor);
+        if (differenceToStart < differenceToEnd)
+            setCursorPosition(wordStartPos, QTextCursor::KeepAnchor);
+        else
+            setCursorPosition(wordEndPos, QTextCursor::KeepAnchor);
+    }
 
     if (interactionFlags & Qt::TextSelectableByMouse) {
 #ifndef QT_NO_CLIPBOARD
@@ -1628,16 +1638,13 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons
         return;
     }
 
-    if (!mousePressed)
-        return;
-
     const qreal mouseX = qreal(mousePos.x());
 
     int newCursorPos = q->hitTest(mousePos, Qt::FuzzyHit);
     if (newCursorPos == -1)
         return;
 
-    if (wordSelectionEnabled && !selectedWordOnDoubleClick.hasSelection()) {
+    if (mousePressed && wordSelectionEnabled && !selectedWordOnDoubleClick.hasSelection()) {
         selectedWordOnDoubleClick = cursor;
         selectedWordOnDoubleClick.select(QTextCursor::WordUnderCursor);
     }
@@ -1646,7 +1653,7 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons
         extendBlockwiseSelection(newCursorPos);
     else if (selectedWordOnDoubleClick.hasSelection())
         extendWordwiseSelection(newCursorPos, mouseX);
-    else
+    else if (mousePressed)
         setCursorPosition(newCursorPos, QTextCursor::KeepAnchor);
 
     if (interactionFlags & Qt::TextEditable) {
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index 7e7ca6c..acef9fa 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -1511,11 +1511,11 @@ void QTextCursor::deletePreviousChar()
     const QTextFragmentData * const frag = fragIt.value();
     int fpos = fragIt.position();
     QChar uc = d->priv->buffer().at(d->anchor - fpos + frag->stringPosition);
-    if (d->anchor > fpos && uc.unicode() >= 0xdc00 && uc.unicode() < 0xe000) {
+    if (d->anchor > fpos && uc.isLowSurrogate()) {
         // second half of a surrogate, check if we have the first half as well,
         // if yes delete both at once
         uc = d->priv->buffer().at(d->anchor - 1 - fpos + frag->stringPosition);
-        if (uc.unicode() >= 0xd800 && uc.unicode() < 0xdc00)
+        if (uc.isHighSurrogate())
             --d->anchor;
     }
 
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 9301f16..2fc1dbd 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -968,7 +968,7 @@ void QTextEngine::shapeText(int item) const
     }
 
     for (int i = 0; i < si.num_glyphs; ++i)
-        si.width += glyphs.advances_x[i];
+        si.width += glyphs.advances_x[i] * !glyphs.attributes[i].dontPrint;
 }
 
 static inline bool hasCaseChange(const QScriptItem &si)
@@ -993,8 +993,7 @@ static void heuristicSetGlyphAttributes(const QChar *uc, int length, QGlyphLayou
 
     int glyph_pos = 0;
     for (int i = 0; i < length; i++) {
-        if (uc[i].unicode() >= 0xd800 && uc[i].unicode() < 0xdc00 && i < length-1
-            && uc[i+1].unicode() >= 0xdc00 && uc[i+1].unicode() < 0xe000) {
+        if (uc[i].isHighSurrogate() && i < length-1 && uc[i+1].isLowSurrogate()) {
             logClusters[i] = glyph_pos;
             logClusters[++i] = glyph_pos;
         } else {
@@ -1387,6 +1386,7 @@ QTextEngine::~QTextEngine()
     if (!stackEngine)
         delete layoutData;
     delete specialData;
+    resetFontEngineCache();
 }
 
 const HB_CharAttributes *QTextEngine::attributes() const
@@ -1447,6 +1447,13 @@ static inline void releaseCachedFontEngine(QFontEngine *fontEngine)
     }
 }
 
+void QTextEngine::resetFontEngineCache()
+{
+    releaseCachedFontEngine(feCache.prevFontEngine);
+    releaseCachedFontEngine(feCache.prevScaledFontEngine);
+    feCache.reset();
+}
+
 void QTextEngine::invalidate()
 {
     freeMemory();
@@ -1455,9 +1462,7 @@ void QTextEngine::invalidate()
     if (specialData)
         specialData->resolvedFormatIndices.clear();
 
-    releaseCachedFontEngine(feCache.prevFontEngine);
-    releaseCachedFontEngine(feCache.prevScaledFontEngine);
-    feCache.reset();
+    resetFontEngineCache();
 }
 
 void QTextEngine::clearLineData()
@@ -1534,8 +1539,6 @@ void QTextEngine::itemize() const
     while (uc < e) {
         switch (*uc) {
         case QChar::ObjectReplacementCharacter:
-            if (analysis->bidiLevel % 2)
-                --analysis->bidiLevel;
             analysis->script = QUnicodeTables::Common;
             analysis->flags = QScriptAnalysis::Object;
             break;
@@ -2089,7 +2092,8 @@ void QTextEngine::justify(const QScriptLine &line)
         }
     }
 
-    QFixed need = line.width - line.textWidth;
+    QFixed leading = leadingSpaceWidth(line);
+    QFixed need = line.width - line.textWidth - leading;
     if (need < 0) {
         // line overflows already!
         const_cast<QScriptLine &>(line).justified = true;
@@ -2659,7 +2663,7 @@ void QTextEngine::splitItem(int item, int pos) const
         QFixed w = 0;
         const QGlyphLayout g = shapedGlyphs(&oldItem);
         for(int j = 0; j < breakGlyph; ++j)
-            w += g.advances_x[j];
+            w += g.advances_x[j] * !g.attributes[j].dontPrint;
 
         newItem.width = oldItem.width - w;
         oldItem.width = w;
@@ -2952,7 +2956,7 @@ int QTextEngine::lineNumberForTextPosition(int pos)
         return lines.size() - 1;
     for (int i = 0; i < lines.size(); ++i) {
         const QScriptLine& line = lines[i];
-        if (line.from + line.length > pos)
+        if (line.from + line.length + line.trailingSpaces > pos)
             return i;
     }
     return -1;
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index b1bd0c3..9362022 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -376,7 +376,7 @@ struct Q_AUTOTEST_EXPORT QScriptLine
 {
     // created and filled in QTextLine::layout_helper
     QScriptLine()
-        : from(0), length(0),
+        : from(0), trailingSpaces(0), length(0),
         justified(0), gridfitted(0),
         hasTrailingSpaces(0), leadingIncluded(0) {}
     QFixed descent;
@@ -388,6 +388,7 @@ struct Q_AUTOTEST_EXPORT QScriptLine
     QFixed textWidth;
     QFixed textAdvance;
     int from;
+    unsigned short trailingSpaces;
     signed int length : 28;
     mutable uint justified : 1;
     mutable uint gridfitted : 1;
@@ -628,6 +629,7 @@ public:
     int lineNumberForTextPosition(int pos);
     int positionAfterVisualMovement(int oldPos, QTextCursor::MoveOperation op);
     void insertionPointsForLine(int lineNum, QVector<int> &insertionPoints);
+    void resetFontEngineCache();
 
 private:
     void setBoundary(int strPos) const;
diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp
index 5b60dfa..d130c61 100644
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
@@ -820,15 +820,11 @@ QString QTextHtmlParser::parseEntity()
             if (uc >= 0x80 && uc < 0x80 + (sizeof(windowsLatin1ExtendedCharacters)/sizeof(windowsLatin1ExtendedCharacters[0])))
                 uc = windowsLatin1ExtendedCharacters[uc - 0x80];
             QString str;
-            if (uc > 0xffff) {
-                // surrogate pair
-                uc -= 0x10000;
-                ushort high = uc/0x400 + 0xd800;
-                ushort low = uc%0x400 + 0xdc00;
-                str.append(QChar(high));
-                str.append(QChar(low));
+            if (QChar::requiresSurrogates(uc)) {
+                str += QChar(QChar::highSurrogate(uc));
+                str += QChar(QChar::lowSurrogate(uc));
             } else {
-                str.append(QChar(uc));
+                str = QChar(uc);
             }
             return str;
         }
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp
index 515915a..d0c1a0e 100644
--- a/src/gui/text/qtextlayout.cpp
+++ b/src/gui/text/qtextlayout.cpp
@@ -375,7 +375,7 @@ QTextLayout::~QTextLayout()
 void QTextLayout::setFont(const QFont &font)
 {
     d->fnt = font;
-    d->feCache.reset();
+    d->resetFontEngineCache();
 }
 
 /*!
@@ -515,7 +515,7 @@ void QTextLayout::setAdditionalFormats(const QList<FormatRange> &formatList)
     }
     if (d->block.docHandle())
         d->block.docHandle()->documentChange(d->block.position(), d->block.length());
-    d->feCache.reset();
+    d->resetFontEngineCache();
 }
 
 /*!
@@ -814,7 +814,7 @@ QTextLine QTextLayout::createLine()
     if (l && d->lines.at(l-1).length < 0) {
         QTextLine(l-1, d).setNumColumns(INT_MAX);
     }
-    int from = l > 0 ? d->lines.at(l-1).from + d->lines.at(l-1).length : 0;
+    int from = l > 0 ? d->lines.at(l-1).from + d->lines.at(l-1).length + d->lines.at(l-1).trailingSpaces : 0;
     int strlen = d->layoutData->string.length();
     if (l && from >= strlen) {
         if (!d->lines.at(l-1).length || d->layoutData->string.at(strlen - 1) != QChar::LineSeparator)
@@ -1708,6 +1708,7 @@ void QTextLine::layout_helper(int maxGlyphs)
 {
     QScriptLine &line = eng->lines[i];
     line.length = 0;
+    line.trailingSpaces = 0;
     line.textWidth = 0;
     line.hasTrailingSpaces = false;
 
@@ -1928,14 +1929,10 @@ found:
 
     if (line.textWidth > 0 && item < eng->layoutData->items.size())
         eng->maxWidth += lbh.spaceData.textWidth;
-    // In the latter case, text are drawn with trailing spaces at the beginning
-    // of a line, so the naturalTextWidth should contain the space width
-    if ((eng->option.flags() & QTextOption::IncludeTrailingSpaces) ||
-        (line.width == QFIXED_MAX && eng->isRightToLeft())) {
+    if (eng->option.flags() & QTextOption::IncludeTrailingSpaces)
         line.textWidth += lbh.spaceData.textWidth;
-    }
     if (lbh.spaceData.length) {
-        line.length += lbh.spaceData.length;
+        line.trailingSpaces = lbh.spaceData.length;
         line.hasTrailingSpaces = true;
     }
 
@@ -1999,7 +1996,7 @@ int QTextLine::textLength() const
         && eng->block.isValid() && i == eng->lines.count()-1) {
         return eng->lines[i].length - 1;
     }
-    return eng->lines[i].length;
+    return eng->lines[i].length + eng->lines[i].trailingSpaces;
 }
 
 static void drawMenuText(QPainter *p, QFixed x, QFixed y, const QScriptItem &si, QTextItemInt &gf, QTextEngine *eng,
@@ -2510,6 +2507,9 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const
 
     int pos = *cursorPos;
     int itm;
+    const HB_CharAttributes *attributes = eng->attributes();
+    while (pos < line.from + line.length && !attributes[pos].charStop)
+        pos++;
     if (pos == line.from + (int)line.length) {
         // end of line ensure we have the last item on the line
         itm = eng->findItem(pos-1);
diff --git a/src/gui/text/text.pri b/src/gui/text/text.pri
index b6cdc52..1cfacf7 100644
--- a/src/gui/text/text.pri
+++ b/src/gui/text/text.pri
@@ -106,14 +106,17 @@ unix:x11 {
 !embedded:!qpa:!x11:mac {
         HEADERS += \
                 text/qfontengine_mac_p.h
-        OBJECTIVE_HEADERS += \
-                text/qfontengine_coretext_p.h
 	SOURCES += \
                 text/qfont_mac.cpp \
                 text/qrawfont_mac.cpp
         OBJECTIVE_SOURCES += \
-                text/qfontengine_coretext.mm \
                 text/qfontengine_mac.mm
+}
+!embedded:!x11:mac {
+        OBJECTIVE_HEADERS += \
+                text/qfontengine_coretext_p.h
+        OBJECTIVE_SOURCES += \
+                text/qfontengine_coretext.mm
         contains(QT_CONFIG, harfbuzz) {
             DEFINES += QT_ENABLE_HARFBUZZ_FOR_MAC
         }
diff --git a/src/gui/util/qdesktopservices.cpp b/src/gui/util/qdesktopservices.cpp
index e79819e..05a1292 100644
--- a/src/gui/util/qdesktopservices.cpp
+++ b/src/gui/util/qdesktopservices.cpp
@@ -177,6 +177,9 @@ void QOpenUrlHandlerRegistry::handlerDestroyed(QObject *handler)
     Unicode-aware, the user may have configured their client without these features.
     Also, certain e-mail clients (e.g., Lotus Notes) have problems with long URLs.
 
+    \note On Symbian OS, \c SwEvent capability is required to open the given \a url
+    if the Web browser is already running.
+
     \sa setUrlHandler()
 */
 bool QDesktopServices::openUrl(const QUrl &url)
diff --git a/src/gui/util/qdesktopservices_s60.cpp b/src/gui/util/qdesktopservices_s60.cpp
index 8c243ed..7a53224 100644
--- a/src/gui/util/qdesktopservices_s60.cpp
+++ b/src/gui/util/qdesktopservices_s60.cpp
@@ -313,12 +313,12 @@ static void handleUrlL(const TDesC& aUrl)
     CleanupStack::PopAndDestroy();
 }
 
-static bool handleUrl(const QUrl &url)
+static bool handleUrl(const QUrl &url, bool useEncodedUrl)
 {
     if (!url.isValid())
         return false;
 
-    QString urlString(url.toEncoded());
+    QString urlString(useEncodedUrl ? url.toEncoded() : url.toString());
     TPtrC urlPtr(qt_QString2TPtrC(urlString));
     TRAPD( err, handleUrlL(urlPtr));
     return err ? false : true;
@@ -326,12 +326,12 @@ static bool handleUrl(const QUrl &url)
 
 static bool launchWebBrowser(const QUrl &url)
 {
-    return handleUrl(url);
+    return handleUrl(url, true);
 }
 
 static bool openDocument(const QUrl &file)
 {
-    return handleUrl(file);
+    return handleUrl(file, false);
 }
 
 #endif //USE_SCHEMEHANDLER
diff --git a/src/gui/widgets/qabstractplatformmenubar_p.h b/src/gui/widgets/qabstractplatformmenubar_p.h
new file mode 100644
index 0000000..10e6fdc
--- /dev/null
+++ b/src/gui/widgets/qabstractplatformmenubar_p.h
@@ -0,0 +1,108 @@
+/****************************************************************************
+**
+** 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 QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QABSTRACTPLATFORMMENUBAR_P_H
+#define QABSTRACTPLATFORMMENUBAR_P_H
+
+#include <qfactoryinterface.h>
+#include <qglobal.h>
+#include <qplugin.h>
+
+#ifndef QT_NO_MENUBAR
+
+QT_BEGIN_NAMESPACE
+
+class QAction;
+class QActionEvent;
+class QEvent;
+class QMenuBar;
+class QObject;
+class QWidget;
+
+class QAbstractPlatformMenuBar;
+
+struct QPlatformMenuBarFactoryInterface : public QFactoryInterface
+{
+    virtual QAbstractPlatformMenuBar *create() = 0;
+};
+
+#define QPlatformMenuBarFactoryInterface_iid "com.nokia.qt.QPlatformMenuBarFactoryInterface"
+Q_DECLARE_INTERFACE(QPlatformMenuBarFactoryInterface, QPlatformMenuBarFactoryInterface_iid)
+
+/*!
+    The platform-specific implementation of a menubar
+*/
+class QAbstractPlatformMenuBar
+{
+public:
+    virtual ~QAbstractPlatformMenuBar() {}
+
+    virtual void init(QMenuBar *) = 0;
+
+    virtual void setVisible(bool visible) = 0;
+
+    virtual void actionEvent(QActionEvent *) = 0;
+
+    virtual void handleReparent(QWidget *oldParent, QWidget *newParent, QWidget *oldWindow, QWidget *newWindow) = 0;
+
+    virtual bool allowCornerWidgets() const = 0;
+
+    virtual void popupAction(QAction *) = 0;
+
+    virtual void setNativeMenuBar(bool) = 0;
+
+    virtual bool isNativeMenuBar() const = 0;
+
+    /*!
+        Return true if the native menubar is capable of listening to the
+        shortcut keys. If false is returned, QMenuBar will trigger actions on
+        shortcut itself.
+    */
+    virtual bool shortcutsHandledByNativeMenuBar() const = 0;
+
+    virtual bool menuBarEventFilter(QObject *, QEvent *event) = 0;
+};
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_MENUBAR
+
+#endif // QABSTRACTPLATFORMMENUBAR_P_H
diff --git a/src/gui/widgets/qcombobox.cpp b/src/gui/widgets/qcombobox.cpp
index 41394e3..fc251bf 100644
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
@@ -2497,7 +2497,7 @@ void QComboBox::showPopup()
         } else {
             TRect staConTopRect = TRect();
             AknLayoutUtils::LayoutMetricsRect(AknLayoutUtils::EStaconTop, staConTopRect);
-            listRect.setWidth(listRect.height());
+            listRect.setWidth(screen.height());
             //by default popup is centered on screen in landscape
             listRect.moveCenter(screen.center());
             if (staConTopRect.IsEmpty() && AknLayoutUtils::CbaLocation() != AknLayoutUtils::EAknCbaLocationBottom) {
diff --git a/src/gui/widgets/qlinecontrol.cpp b/src/gui/widgets/qlinecontrol.cpp
index b6e2f90..d58da37 100644
--- a/src/gui/widgets/qlinecontrol.cpp
+++ b/src/gui/widgets/qlinecontrol.cpp
@@ -60,7 +60,7 @@
 QT_BEGIN_NAMESPACE
 
 #ifdef QT_GUI_PASSWORD_ECHO_DELAY
-static int qt_passwordEchoDelay = QT_GUI_PASSWORD_ECHO_DELAY;
+static const int qt_passwordEchoDelay = QT_GUI_PASSWORD_ECHO_DELAY;
 #endif
 
 /*!
@@ -93,8 +93,8 @@ void QLineControl::updateDisplayText(bool forceUpdate)
     if (m_echoMode == QLineEdit::Password) {
         str.fill(m_passwordCharacter);
 #ifdef QT_GUI_PASSWORD_ECHO_DELAY
-        if (m_passwordEchoTimer != 0 && !str.isEmpty()) {
-            int cursor = m_text.length() - 1;
+        if (m_passwordEchoTimer != 0 && m_cursor > 0 && m_cursor <= m_text.length()) {
+            int cursor = m_cursor - 1;
             QChar uc = m_text.at(cursor);
             str[cursor] = uc;
             if (cursor > 0 && uc.unicode() >= 0xdc00 && uc.unicode() < 0xe000) {
@@ -198,12 +198,10 @@ void QLineControl::backspace()
             --m_cursor;
             if (m_maskData)
                 m_cursor = prevMaskBlank(m_cursor);
-            QChar uc = m_text.at(m_cursor);
-            if (m_cursor > 0 && uc.unicode() >= 0xdc00 && uc.unicode() < 0xe000) {
+            if (m_cursor > 0 && m_text.at(m_cursor).isLowSurrogate()) {
                 // second half of a surrogate, check if we have the first half as well,
                 // if yes delete both at once
-                uc = m_text.at(m_cursor - 1);
-                if (uc.unicode() >= 0xd800 && uc.unicode() < 0xdc00) {
+                if (m_text.at(m_cursor - 1).isHighSurrogate()) {
                     internalDelete(true);
                     --m_cursor;
                 }
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index 9db068c..56658b3 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -1639,7 +1639,7 @@ QMenuBarPrivate::QMacMenuBarPrivate::~QMacMenuBarPrivate()
 }
 
 void
-QMenuBarPrivate::QMacMenuBarPrivate::addAction(QAction *a, QMacMenuAction *before)
+QMenuBarPrivate::QMacMenuBarPrivate::addAction(QAction *a, QAction *before)
 {
     if (a->isSeparator() || !menu)
         return;
@@ -1649,7 +1649,7 @@ QMenuBarPrivate::QMacMenuBarPrivate::addAction(QAction *a, QMacMenuAction *befor
 #ifndef QT_MAC_USE_COCOA
     action->command = qt_mac_menu_static_cmd_id++;
 #endif
-    addAction(action, before);
+    addAction(action, findAction(before));
 }
 
 void
diff --git a/src/gui/widgets/qmenu_p.h b/src/gui/widgets/qmenu_p.h
index 0e63799..82bd932 100644
--- a/src/gui/widgets/qmenu_p.h
+++ b/src/gui/widgets/qmenu_p.h
@@ -154,6 +154,9 @@ public:
 #endif
                       scroll(0), eventLoop(0), tearoff(0), tornoff(0), tearoffHighlighted(0),
                       hasCheckableItems(0), sloppyAction(0), doChildEffects(false)
+#ifdef QT3_SUPPORT
+                      ,emitHighlighted(false)
+#endif
 #ifdef Q_WS_MAC
                       ,mac_menu(0)
 #endif
@@ -163,9 +166,6 @@ public:
 #ifdef Q_WS_S60
                       ,symbian_menu(0)
 #endif
-#ifdef QT3_SUPPORT
-                      ,emitHighlighted(false)
-#endif
     { }
     ~QMenuPrivate()
     {
diff --git a/src/gui/widgets/qmenu_symbian.cpp b/src/gui/widgets/qmenu_symbian.cpp
index c9dbff5..99a1d78 100644
--- a/src/gui/widgets/qmenu_symbian.cpp
+++ b/src/gui/widgets/qmenu_symbian.cpp
@@ -398,12 +398,12 @@ void QMenuPrivate::QSymbianMenuPrivate::rebuild(bool)
 {
 }
 
-void QMenuBarPrivate::QSymbianMenuBarPrivate::addAction(QAction *a, QSymbianMenuAction *before)
+void QMenuBarPrivate::QSymbianMenuBarPrivate::addAction(QAction *a, QAction *before)
 {
     QSymbianMenuAction *action = new QSymbianMenuAction;
     action->action = a;
     action->command = qt_symbian_menu_static_cmd_id++;
-    addAction(action, before);
+    addAction(action, findAction(before));
 }
 
 void QMenuBarPrivate::QSymbianMenuBarPrivate::addAction(QSymbianMenuAction *action, QSymbianMenuAction *before)
diff --git a/src/gui/widgets/qmenu_wince.cpp b/src/gui/widgets/qmenu_wince.cpp
index 1157fff..b0c6c1b 100644
--- a/src/gui/widgets/qmenu_wince.cpp
+++ b/src/gui/widgets/qmenu_wince.cpp
@@ -504,12 +504,12 @@ void QMenuPrivate::QWceMenuPrivate::removeAction(QWceMenuAction *action)
     rebuild();
 }
 
-void QMenuBarPrivate::QWceMenuBarPrivate::addAction(QAction *a, QWceMenuAction *before)
+void QMenuBarPrivate::QWceMenuBarPrivate::addAction(QAction *a, QAction *before)
 {
     QWceMenuAction *action = new QWceMenuAction;
     action->action = a;
     action->command = qt_wce_menu_static_cmd_id++;
-    addAction(action, before);
+    addAction(action, findAction(before));
 }
 
 void QMenuBarPrivate::QWceMenuBarPrivate::addAction(QWceMenuAction *action, QWceMenuAction *before)
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index 3ff98a4..3e5365c 100644
--- a/src/gui/widgets/qmenubar.cpp
+++ b/src/gui/widgets/qmenubar.cpp
@@ -55,6 +55,9 @@
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qwhatsthis.h>
+#ifdef Q_WS_X11
+#include <qpluginloader.h>
+#endif
 
 #ifndef QT_NO_MENUBAR
 
@@ -66,6 +69,9 @@
 #include "qmenu_p.h"
 #include "qmenubar_p.h"
 #include "qdebug.h"
+#ifdef Q_WS_X11
+#include "qmenubar_x11_p.h"
+#endif
 
 #ifdef Q_WS_WINCE
 extern bool qt_wince_is_mobile(); //defined in qguifunctions_wce.cpp
@@ -173,7 +179,11 @@ void QMenuBarPrivate::updateGeometries()
         return;
     int q_width = q->width()-(q->style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, q)*2);
     int q_start = -1;
-    if(leftWidget || rightWidget) {
+    if(
+#ifdef Q_WS_X11
+        platformMenuBar->allowCornerWidgets() &&
+#endif
+        (leftWidget || rightWidget)) {
         int vmargin = q->style()->pixelMetric(QStyle::PM_MenuBarVMargin, 0, q)
                       + q->style()->pixelMetric(QStyle::PM_MenuBarPanelWidth, 0, q);
         int hmargin = q->style()->pixelMetric(QStyle::PM_MenuBarHMargin, 0, q)
@@ -204,7 +214,11 @@ void QMenuBarPrivate::updateGeometries()
     calcActionRects(q_width, q_start);
     currentAction = 0;
 #ifndef QT_NO_SHORTCUT
-    if(itemsDirty) {
+    if(
+#ifdef Q_WS_X11
+        !platformMenuBar->shortcutsHandledByNativeMenuBar() &&
+#endif
+        itemsDirty) {
         for(int j = 0; j < shortcutIndexMap.size(); ++j)
             q->releaseShortcut(shortcutIndexMap.value(j));
         shortcutIndexMap.resize(0); // faster than clear
@@ -212,6 +226,12 @@ void QMenuBarPrivate::updateGeometries()
             shortcutIndexMap.append(q->grabShortcut(QKeySequence::mnemonic(actions.at(i)->text())));
     }
 #endif
+#ifdef Q_WS_X11
+    if(q->isNativeMenuBar()) {//nothing to see here folks, move along..
+        itemsDirty = false;
+        return;
+    }
+#endif
     itemsDirty = false;
 
     hiddenActions.clear();
@@ -743,6 +763,11 @@ void QMenuBarPrivate::init()
         QApplication::setAttribute(Qt::AA_DontUseNativeMenuBar, true);
     }
 #endif
+#ifdef Q_WS_X11
+    platformMenuBar = qt_guiPlatformMenuBarFactory()->create();
+    platformMenuBar->init(q);
+#endif
+
     q->setBackgroundRole(QPalette::Button);
     oldWindow = oldParent = 0;
 #ifdef QT3_SUPPORT
@@ -751,6 +776,10 @@ void QMenuBarPrivate::init()
 #ifdef QT_SOFTKEYS_ENABLED
     menuBarAction = 0;
 #endif
+#ifdef Q_WS_X11
+    cornerWidgetToolBar = 0;
+    cornerWidgetContainer = 0;
+#endif
     handleReparent();
     q->setMouseTracking(q->style()->styleHint(QStyle::SH_MenuBar_MouseTracking, 0, q));
 
@@ -821,6 +850,10 @@ QMenuBar::~QMenuBar()
     Q_D(QMenuBar);
     d->symbianDestroyMenuBar();
 #endif
+#ifdef Q_WS_X11
+    Q_D(QMenuBar);
+    delete d->cornerWidgetToolBar;
+#endif
 }
 
 /*!
@@ -1072,6 +1105,10 @@ void QMenuBar::paintEvent(QPaintEvent *e)
 */
 void QMenuBar::setVisible(bool visible)
 {
+#ifdef Q_WS_X11
+    Q_D(QMenuBar);
+    d->platformMenuBar->setVisible(visible);
+#else
 #if defined(Q_WS_MAC) || defined(Q_OS_WINCE) || defined(Q_WS_S60)
     if (isNativeMenuBar()) {
         if (!visible)
@@ -1080,6 +1117,7 @@ void QMenuBar::setVisible(bool visible)
     }
 #endif
     QWidget::setVisible(visible);
+#endif // Q_WS_X11
 }
 
 /*!
@@ -1275,6 +1313,9 @@ void QMenuBar::actionEvent(QActionEvent *e)
 {
     Q_D(QMenuBar);
     d->itemsDirty = true;
+#ifdef Q_WS_X11
+    d->platformMenuBar->actionEvent(e);
+#endif
 #if defined (Q_WS_MAC) || defined(Q_OS_WINCE) || defined(Q_WS_S60)
     if (isNativeMenuBar()) {
 #ifdef Q_WS_MAC
@@ -1287,7 +1328,7 @@ void QMenuBar::actionEvent(QActionEvent *e)
         if (!nativeMenuBar)
             return;
         if(e->type() == QEvent::ActionAdded)
-            nativeMenuBar->addAction(e->action(), nativeMenuBar->findAction(e->before()));
+            nativeMenuBar->addAction(e->action(), e->before());
         else if(e->type() == QEvent::ActionRemoved)
             nativeMenuBar->removeAction(e->action());
         else if(e->type() == QEvent::ActionChanged)
@@ -1369,6 +1410,10 @@ void QMenuBarPrivate::handleReparent()
             newWindow->installEventFilter(q);
     }
 
+#ifdef Q_WS_X11
+    platformMenuBar->handleReparent(oldParent, newParent, oldWindow, newWindow);
+#endif
+
     oldParent = newParent;
     oldWindow = newWindow;
 
@@ -1566,6 +1611,11 @@ bool QMenuBar::event(QEvent *e)
 bool QMenuBar::eventFilter(QObject *object, QEvent *event)
 {
     Q_D(QMenuBar);
+#ifdef Q_WS_X11
+    if (d->platformMenuBar->menuBarEventFilter(object, event)) {
+        return true;
+    }
+#endif
     if (object == parent() && object) {
 #ifdef QT3_SUPPORT
         if (d->doAutoResize && event->type() == QEvent::Resize) {
@@ -1659,7 +1709,7 @@ QRect QMenuBar::actionGeometry(QAction *act) const
 QSize QMenuBar::minimumSizeHint() const
 {
     Q_D(const QMenuBar);
-#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60)
+#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60) || defined(Q_WS_X11)
     const bool as_gui_menubar = !isNativeMenuBar();
 #else
     const bool as_gui_menubar = true;
@@ -1682,6 +1732,9 @@ QSize QMenuBar::minimumSizeHint() const
         ret += QSize(2*fw + hmargin, 2*fw + vmargin);
     }
     int margin = 2*vmargin + 2*fw + spaceBelowMenuBar;
+#ifdef Q_WS_X11
+    if (d->platformMenuBar->allowCornerWidgets()) {
+#endif
     if(d->leftWidget) {
         QSize sz = d->leftWidget->minimumSizeHint();
         ret.setWidth(ret.width() + sz.width());
@@ -1694,6 +1747,9 @@ QSize QMenuBar::minimumSizeHint() const
         if(sz.height() + margin > ret.height())
             ret.setHeight(sz.height() + margin);
     }
+#ifdef Q_WS_X11
+    }
+#endif
     if(as_gui_menubar) {
         QStyleOptionMenuItem opt;
         opt.rect = rect();
@@ -1715,7 +1771,7 @@ QSize QMenuBar::minimumSizeHint() const
 QSize QMenuBar::sizeHint() const
 {
     Q_D(const QMenuBar);
-#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60)
+#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60) || defined(Q_WS_X11)
     const bool as_gui_menubar = !isNativeMenuBar();
 #else
     const bool as_gui_menubar = true;
@@ -1741,6 +1797,9 @@ QSize QMenuBar::sizeHint() const
         ret += QSize(fw + hmargin, fw + vmargin);
     }
     int margin = 2*vmargin + 2*fw + spaceBelowMenuBar;
+#ifdef Q_WS_X11
+    if(d->platformMenuBar->allowCornerWidgets()) {
+#endif
     if(d->leftWidget) {
         QSize sz = d->leftWidget->sizeHint();
         ret.setWidth(ret.width() + sz.width());
@@ -1753,6 +1812,9 @@ QSize QMenuBar::sizeHint() const
         if(sz.height() + margin > ret.height())
             ret.setHeight(sz.height() + margin);
     }
+#ifdef Q_WS_X11
+    }
+#endif
     if(as_gui_menubar) {
         QStyleOptionMenuItem opt;
         opt.rect = rect();
@@ -1774,7 +1836,7 @@ QSize QMenuBar::sizeHint() const
 int QMenuBar::heightForWidth(int) const
 {
     Q_D(const QMenuBar);
-#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60)
+#if defined(Q_WS_MAC) || defined(Q_WS_WINCE) || defined(Q_WS_S60) || defined(Q_WS_X11)
     const bool as_gui_menubar = !isNativeMenuBar();
 #else
     const bool as_gui_menubar = true;
@@ -1794,10 +1856,16 @@ int QMenuBar::heightForWidth(int) const
         height += 2*vmargin;
     }
     int margin = 2*vmargin + 2*fw + spaceBelowMenuBar;
+#ifdef Q_WS_X11
+    if(d->platformMenuBar->allowCornerWidgets()) {
+#endif
     if(d->leftWidget)
         height = qMax(d->leftWidget->sizeHint().height() + margin, height);
     if(d->rightWidget)
         height = qMax(d->rightWidget->sizeHint().height() + margin, height);
+#ifdef Q_WS_X11
+    }
+#endif
     if(as_gui_menubar) {
         QStyleOptionMenuItem opt;
         opt.init(this);
@@ -1817,7 +1885,15 @@ void QMenuBarPrivate::_q_internalShortcutActivated(int id)
 {
     Q_Q(QMenuBar);
     QAction *act = actions.at(id);
-    setCurrentAction(act, true, true);
+#ifdef Q_WS_X11
+    if (q->isNativeMenuBar()) {
+        platformMenuBar->popupAction(act);
+    } else {
+#endif
+        setCurrentAction(act, true, true);
+#ifdef Q_WS_X11
+    }
+#endif
     if (act && !act->menu()) {
         activateAction(act, QAction::Trigger);
         //100 is the same as the default value in QPushButton::animateClick
@@ -1838,6 +1914,39 @@ void QMenuBarPrivate::_q_updateLayout()
     }
 }
 
+#ifdef Q_WS_X11
+void QMenuBarPrivate::updateCornerWidgetToolBar()
+{
+    Q_Q(QMenuBar);
+    if (!cornerWidgetToolBar) {
+        QMainWindow *window = qobject_cast<QMainWindow *>(q->window());
+        if (!window) {
+            qWarning() << "Menubar parent is not a QMainWindow, not showing corner widgets";
+            return;
+        }
+        cornerWidgetToolBar = window->addToolBar(QApplication::translate("QMenuBar", "Corner Toolbar"));
+        cornerWidgetToolBar->setObjectName(QLatin1String("CornerToolBar"));
+        cornerWidgetContainer = new QWidget;
+        cornerWidgetToolBar->addWidget(cornerWidgetContainer);
+        new QHBoxLayout(cornerWidgetContainer);
+    } else {
+        QLayout *layout = cornerWidgetContainer->layout();
+        while (layout->count() > 0) {
+            layout->takeAt(0);
+        }
+    }
+    if (leftWidget) {
+        leftWidget->setParent(cornerWidgetContainer);
+        cornerWidgetContainer->layout()->addWidget(leftWidget);
+    }
+    if (rightWidget) {
+        rightWidget->setParent(cornerWidgetContainer);
+        cornerWidgetContainer->layout()->addWidget(rightWidget);
+    }
+}
+#endif
+
+
 /*!
     \fn void QMenuBar::setCornerWidget(QWidget *widget, Qt::Corner corner)
 
@@ -1870,10 +1979,18 @@ void QMenuBar::setCornerWidget(QWidget *w, Qt::Corner corner)
         return;
     }
 
+#ifdef Q_WS_X11
+    if(!d->platformMenuBar->allowCornerWidgets()) {
+        d->updateCornerWidgetToolBar();
+    } else {
+#endif
     if (w) {
         w->setParent(this);
         w->installEventFilter(this);
     }
+#ifdef Q_WS_X11
+    }
+#endif
 
     d->_q_updateLayout();
 }
@@ -1923,6 +2040,9 @@ QWidget *QMenuBar::cornerWidget(Qt::Corner corner) const
 void QMenuBar::setNativeMenuBar(bool nativeMenuBar)
 {
     Q_D(QMenuBar);
+#ifdef Q_WS_X11
+    d->platformMenuBar->setNativeMenuBar(nativeMenuBar);
+#else
     if (d->nativeMenuBar == -1 || (nativeMenuBar != bool(d->nativeMenuBar))) {
         d->nativeMenuBar = nativeMenuBar;
 #ifdef Q_WS_MAC
@@ -1947,15 +2067,20 @@ void QMenuBar::setNativeMenuBar(bool nativeMenuBar)
 	    setVisible(true);
 #endif
     }
+#endif // Q_WS_X11
 }
 
 bool QMenuBar::isNativeMenuBar() const
 {
     Q_D(const QMenuBar);
+#ifdef Q_WS_X11
+    return d->platformMenuBar->isNativeMenuBar();
+#else
     if (d->nativeMenuBar == -1) {
         return !QApplication::instance()->testAttribute(Qt::AA_DontUseNativeMenuBar);
     }
     return d->nativeMenuBar;
+#endif
 }
 
 /*!
diff --git a/src/gui/widgets/qmenubar_p.h b/src/gui/widgets/qmenubar_p.h
index 1ac694e..9a1f758 100644
--- a/src/gui/widgets/qmenubar_p.h
+++ b/src/gui/widgets/qmenubar_p.h
@@ -47,7 +47,7 @@
 //  -------------
 //
 // This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
+// platformMenuBarementation detail.  This header file may change from version to
 // version without notice, or even be removed.
 //
 // We mean it.
@@ -61,6 +61,10 @@
 #include "qguifunctions_wince.h"
 #endif
 
+#ifdef Q_WS_X11
+#include "qabstractplatformmenubar_p.h"
+#endif
+
 #ifndef QT_NO_MENUBAR
 #ifdef Q_WS_S60
 class CCoeControl;
@@ -71,21 +75,27 @@ class CEikMenuBar;
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_MENUBAR
+class QToolBar;
 class QMenuBarExtension;
 class QMenuBarPrivate : public QWidgetPrivate
 {
     Q_DECLARE_PUBLIC(QMenuBar)
 public:
     QMenuBarPrivate() : itemsDirty(0), currentAction(0), mouseDown(0),
-                         closePopupMode(0), defaultPopDown(1), popupState(0), keyboardState(0), altPressed(0),
-                         nativeMenuBar(-1), doChildEffects(false)
+                         closePopupMode(0), defaultPopDown(1), popupState(0), keyboardState(0), altPressed(0)
+#ifndef Q_WS_X11
+                         , nativeMenuBar(-1)
+#endif
+                         , doChildEffects(false)
 #ifdef QT3_SUPPORT
                          , doAutoResize(false)
 #endif
 #ifdef Q_WS_MAC
                          , mac_menubar(0)
 #endif
-
+#ifdef Q_WS_X11
+                         , platformMenuBar(0)
+#endif
 #ifdef Q_WS_WINCE
                          , wce_menubar(0), wceClassicMenu(false)
 #endif
@@ -96,6 +106,9 @@ public:
         { }
     ~QMenuBarPrivate()
         {
+#ifdef Q_WS_X11
+            delete platformMenuBar;
+#endif
 #ifdef Q_WS_MAC
             delete mac_menubar;
 #endif
@@ -136,8 +149,9 @@ public:
     uint keyboardState : 1, altPressed : 1;
     QPointer<QWidget> keyboardFocusWidget;
 
-
+#ifndef Q_WS_X11
     int nativeMenuBar : 3;  // Only has values -1, 0, and 1
+#endif
     //firing of events
     void activateAction(QAction *, QAction::ActionEvent);
 
@@ -173,6 +187,9 @@ public:
 #ifdef QT3_SUPPORT
     bool doAutoResize;
 #endif
+#ifdef Q_WS_X11
+    QAbstractPlatformMenuBar *platformMenuBar;
+#endif
 #ifdef Q_WS_MAC
     //mac menubar binding
     struct QMacMenuBarPrivate {
@@ -181,7 +198,7 @@ public:
         QMacMenuBarPrivate();
         ~QMacMenuBarPrivate();
 
-        void addAction(QAction *, QMacMenuAction* =0);
+        void addAction(QAction *, QAction* =0);
         void addAction(QMacMenuAction *, QMacMenuAction* =0);
         void syncAction(QMacMenuAction *);
         inline void syncAction(QAction *a) { syncAction(findAction(a)); }
@@ -220,7 +237,7 @@ public:
 
         QWceMenuBarPrivate(QMenuBarPrivate *menubar);
         ~QWceMenuBarPrivate();
-        void addAction(QAction *, QWceMenuAction* =0);
+        void addAction(QAction *, QAction* =0);
         void addAction(QWceMenuAction *, QWceMenuAction* =0);
         void syncAction(QWceMenuAction *);
         inline void syncAction(QAction *a) { syncAction(findAction(a)); }
@@ -250,7 +267,7 @@ public:
         QMenuBarPrivate *d;
         QSymbianMenuBarPrivate(QMenuBarPrivate *menubar);
         ~QSymbianMenuBarPrivate();
-        void addAction(QAction *, QSymbianMenuAction* =0);
+        void addAction(QAction *, QAction* =0);
         void addAction(QSymbianMenuAction *, QSymbianMenuAction* =0);
         void syncAction(QSymbianMenuAction *);
         inline void syncAction(QAction *a) { syncAction(findAction(a)); }
@@ -273,6 +290,12 @@ public:
 #ifdef QT_SOFTKEYS_ENABLED
     QAction *menuBarAction;
 #endif
+
+#ifdef Q_WS_X11
+    void updateCornerWidgetToolBar();
+    QToolBar *cornerWidgetToolBar;
+    QWidget *cornerWidgetContainer;
+#endif
 };
 #endif
 
diff --git a/src/gui/widgets/qmenubar_x11.cpp b/src/gui/widgets/qmenubar_x11.cpp
new file mode 100644
index 0000000..25336d4
--- /dev/null
+++ b/src/gui/widgets/qmenubar_x11.cpp
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** 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 QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmenubar_x11_p.h"
+
+#ifndef QT_NO_MENUBAR
+
+#include "qapplication.h"
+#include "qdebug.h"
+#include "qevent.h"
+#include "qmenu.h"
+#include "qmenubar.h"
+
+#include <private/qfactoryloader_p.h>
+
+QT_BEGIN_NAMESPACE
+
+QX11MenuBar::~QX11MenuBar()
+{
+}
+
+void QX11MenuBar::init(QMenuBar *_menuBar)
+{
+    nativeMenuBar = -1;
+    menuBar = _menuBar;
+}
+
+void QX11MenuBar::setVisible(bool visible)
+{
+    menuBar->QWidget::setVisible(visible);
+}
+
+void QX11MenuBar::actionEvent(QActionEvent *e)
+{
+    Q_UNUSED(e);
+}
+
+void QX11MenuBar::handleReparent(QWidget *oldParent, QWidget *newParent, QWidget *oldWindow, QWidget *newWindow)
+{
+    Q_UNUSED(oldParent)
+    Q_UNUSED(newParent)
+    Q_UNUSED(oldWindow)
+    Q_UNUSED(newWindow)
+}
+
+bool QX11MenuBar::allowCornerWidgets() const
+{
+    return true;
+}
+
+void QX11MenuBar::popupAction(QAction *)
+{
+}
+
+void QX11MenuBar::setNativeMenuBar(bool value)
+{
+    if (nativeMenuBar == -1 || (value != bool(nativeMenuBar))) {
+        nativeMenuBar = value;
+    }
+}
+
+bool QX11MenuBar::isNativeMenuBar() const
+{
+    return false;
+}
+
+bool QX11MenuBar::shortcutsHandledByNativeMenuBar() const
+{
+    return false;
+}
+
+bool QX11MenuBar::menuBarEventFilter(QObject *, QEvent *)
+{
+    return false;
+}
+
+struct QX11MenuBarFactory : public QPlatformMenuBarFactoryInterface
+{
+    QAbstractPlatformMenuBar *create() { return new QX11MenuBar; }
+    virtual QStringList keys() const { return QStringList(); }
+};
+
+QPlatformMenuBarFactoryInterface *qt_guiPlatformMenuBarFactory()
+{
+    static QPlatformMenuBarFactoryInterface *factory = 0;
+    if (!factory) {
+#ifndef QT_NO_LIBRARY
+        QFactoryLoader loader(QPlatformMenuBarFactoryInterface_iid, QLatin1String("/menubar"));
+        factory = qobject_cast<QPlatformMenuBarFactoryInterface *>(loader.instance(QLatin1String("default")));
+#endif // QT_NO_LIBRARY
+        if(!factory) {
+            static QX11MenuBarFactory def;
+            factory = &def;
+        }
+    }
+    return factory;
+}
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_MENUBAR
diff --git a/src/gui/widgets/qmenubar_x11_p.h b/src/gui/widgets/qmenubar_x11_p.h
new file mode 100644
index 0000000..41debd0
--- /dev/null
+++ b/src/gui/widgets/qmenubar_x11_p.h
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** 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 QtGui module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QX11MENUBAR_P_H
+#define QX11MENUBAR_P_H
+
+#ifndef QT_NO_MENUBAR
+
+#include "qabstractplatformmenubar_p.h"
+
+QT_BEGIN_NAMESPACE
+
+class QMenuBar;
+
+class QX11MenuBar : public QAbstractPlatformMenuBar
+{
+public:
+    ~QX11MenuBar();
+
+    virtual void init(QMenuBar *);
+
+    virtual void setVisible(bool visible);
+
+    virtual void actionEvent(QActionEvent *e);
+
+    virtual void handleReparent(QWidget *oldParent, QWidget *newParent, QWidget *oldWindow, QWidget *newWindow);
+
+    virtual bool allowCornerWidgets() const;
+
+    virtual void popupAction(QAction*);
+
+    virtual void setNativeMenuBar(bool);
+    virtual bool isNativeMenuBar() const;
+
+    virtual bool shortcutsHandledByNativeMenuBar() const;
+    virtual bool menuBarEventFilter(QObject *, QEvent *event);
+
+private:
+    QMenuBar *menuBar;
+    int nativeMenuBar : 3;  // Only has values -1, 0, and 1
+};
+
+QPlatformMenuBarFactoryInterface *qt_guiPlatformMenuBarFactory();
+
+QT_END_NAMESPACE
+
+#endif // QT_NO_MENUBAR
+
+#endif /* QX11MENUBAR_P_H */
diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp
index 16e4aad..8faf156 100644
--- a/src/gui/widgets/qtabbar.cpp
+++ b/src/gui/widgets/qtabbar.cpp
@@ -171,7 +171,7 @@ void QTabBar::initStyleOption(QStyleOptionTab *option, int tabIndex) const
 
     if (tabIndex > 0 && tabIndex - 1 == d->currentIndex)
         option->selectedPosition = QStyleOptionTab::PreviousIsSelected;
-    else if (tabIndex < totalTabs - 1 && tabIndex + 1 == d->currentIndex)
+    else if (tabIndex + 1 < totalTabs && tabIndex + 1 == d->currentIndex)
         option->selectedPosition = QStyleOptionTab::NextIsSelected;
     else
         option->selectedPosition = QStyleOptionTab::NotAdjacent;
diff --git a/src/gui/widgets/widgets.pri b/src/gui/widgets/widgets.pri
index 669b838..6b3d6a9 100644
--- a/src/gui/widgets/widgets.pri
+++ b/src/gui/widgets/widgets.pri
@@ -144,6 +144,14 @@ SOURCES += \
         widgets/qplaintextedit.cpp \
         widgets/qprintpreviewwidget.cpp
 
+x11: {
+    HEADERS += \
+        widgets/qabstractplatformmenubar_p.h
+
+    SOURCES += \
+        widgets/qmenubar_x11.cpp
+}
+
 !embedded:!qpa:mac {
     HEADERS += widgets/qmacnativewidget_mac.h \
                widgets/qmaccocoaviewcontainer_mac.h
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index c1298e2..d0e24b0 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,5 +1,5 @@
 TEMPLATE = subdirs
 
 SUBDIRS += folderlistmodel particles gestures
-contains(QT_CONFIG, opengl): SUBDIRS += shaders
+contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1): SUBDIRS += shaders
 
diff --git a/src/imports/shaders/shadereffectitem.cpp b/src/imports/shaders/shadereffectitem.cpp
index 056581c..b954e5a 100644..100755
--- a/src/imports/shaders/shadereffectitem.cpp
+++ b/src/imports/shaders/shadereffectitem.cpp
@@ -199,8 +199,13 @@ Rectangle {
 
 */
 
+#ifdef Q_OS_SYMBIAN
+#define OBSERVE_GL_CONTEXT_LOSS 1
+#endif
+
 ShaderEffectItem::ShaderEffectItem(QDeclarativeItem *parent)
     : QDeclarativeItem(parent)
+    , m_program(0)
     , m_meshResolution(1, 1)
     , m_geometry(QSGGeometry::defaultAttributes_TexturedPoint2D(), 4)
     , m_blending(true)
@@ -214,15 +219,21 @@ ShaderEffectItem::ShaderEffectItem(QDeclarativeItem *parent)
     , m_hasShaderPrograms(false)
     , m_mirrored(false)
     , m_defaultVertexShader(true)
+    , m_contextObserver(0)
 {
     setFlag(QGraphicsItem::ItemHasNoContents, false);
     connect(this, SIGNAL(visibleChanged()), this, SLOT(handleVisibilityChange()));
     m_active = isVisible();
+
+#ifndef OBSERVE_GL_CONTEXT_LOSS
+    m_program = new QGLShaderProgram(this);
+#endif
 }
 
 ShaderEffectItem::~ShaderEffectItem()
 {
     reset();
+    delete m_contextObserver;
 }
 
 
@@ -243,11 +254,6 @@ ShaderEffectItem::~ShaderEffectItem()
 
 */
 
-/*!
-    \property ShaderEffectItem::fragmentShader
-    \brief the OpenGL fragment shader code.
-*/
-
 void ShaderEffectItem::setFragmentShader(const QString &code)
 {
     if (m_fragment_code.constData() == code.constData())
@@ -281,11 +287,6 @@ void ShaderEffectItem::setFragmentShader(const QString &code)
 
 */
 
-/*!
-    \property ShaderEffectItem::vertexShader
-    \brief the OpenGL vertex shader code.
-*/
-
 void ShaderEffectItem::setVertexShader(const QString &code)
 {
     if (m_vertex_code.constData() == code.constData())
@@ -320,11 +321,6 @@ void ShaderEffectItem::setVertexShader(const QString &code)
     The default value is true.
 */
 
-/*!
-    \property ShaderEffectItem::blending
-    \brief the drawing is done using blending.
-*/
-
 void ShaderEffectItem::setBlending(bool enable)
 {
     if (m_blending == enable)
@@ -347,11 +343,6 @@ void ShaderEffectItem::setBlending(bool enable)
     The default value is QSize(1,1).
 */
 
-/*!
-    \property ShaderEffectItem::meshResolution
-    \brief the amount of triangles in the mesh for both x and y-axis.
-*/
-
 void ShaderEffectItem::setMeshResolution(const QSize &size)
 {
     if (size == m_meshResolution)
@@ -422,10 +413,38 @@ void ShaderEffectItem::renderEffect(QPainter *painter, const QMatrix4x4 &matrix)
     if (!painter || !painter->device())
         return;
 
-    if (!m_program.isLinked() || m_program_dirty)
+#ifdef OBSERVE_GL_CONTEXT_LOSS
+    QGLContext *context = const_cast <QGLContext*> (QGLContext::currentContext());
+    if (!m_program || !m_contextObserver || !m_contextObserver->isValid()) {
+        // Context has changed, re-create QGLShaderProgram
+        if (context) {
+            delete m_program;
+            m_program = 0;
+
+            delete m_contextObserver;
+            m_contextObserver = 0;
+
+            m_program = new QGLShaderProgram(this);
+            m_contextObserver = new QGLFramebufferObject(QSize(2,2));
+
+            if (!m_contextObserver || !m_program) {
+                delete m_program;
+                m_program = 0;
+                delete m_contextObserver;
+                m_contextObserver = 0;
+                qWarning() << "ShaderEffectItem::renderEffect - Creating QGLShaderProgram or QGLFrameBufferObject failed!";
+            }
+        }
+    }
+#endif
+
+    if (!m_program)
+        return;
+
+    if (!m_program->isLinked() || m_program_dirty)
         updateShaderProgram();
 
-    m_program.bind();
+    m_program->bind();
 
     QMatrix4x4 combinedMatrix;
     combinedMatrix.scale(2.0 / painter->device()->width(), -2.0 / painter->device()->height(), 1.0);
@@ -434,7 +453,7 @@ void ShaderEffectItem::renderEffect(QPainter *painter, const QMatrix4x4 &matrix)
     updateEffectState(combinedMatrix);
 
     for (int i = 0; i < m_attributeNames.size(); ++i) {
-        m_program.enableAttributeArray(m_geometry.attributes()[i].position);
+        m_program->enableAttributeArray(m_geometry.attributes()[i].position);
     }
 
     bindGeometry();
@@ -472,11 +491,14 @@ void ShaderEffectItem::renderEffect(QPainter *painter, const QMatrix4x4 &matrix)
     glDisable(GL_DEPTH_TEST);
 
    for (int i = 0; i < m_attributeNames.size(); ++i)
-        m_program.disableAttributeArray(m_geometry.attributes()[i].position);
+        m_program->disableAttributeArray(m_geometry.attributes()[i].position);
 }
 
 void ShaderEffectItem::updateEffectState(const QMatrix4x4 &matrix)
 {
+    if (!m_program)
+        return;
+
     for (int i = m_sources.size() - 1; i >= 0; --i) {
         const ShaderEffectItem::SourceData &source = m_sources.at(i);
         if (!source.source)
@@ -487,10 +509,10 @@ void ShaderEffectItem::updateEffectState(const QMatrix4x4 &matrix)
     }
 
     if (m_respectsOpacity)
-        m_program.setUniformValue("qt_Opacity", static_cast<float> (effectiveOpacity()));
+        m_program->setUniformValue("qt_Opacity", static_cast<float> (effectiveOpacity()));
 
     if (m_respectsMatrix){
-        m_program.setUniformValue("qt_ModelViewProjectionMatrix", matrix);
+        m_program->setUniformValue("qt_ModelViewProjectionMatrix", matrix);
     }
 
     QSet<QByteArray>::const_iterator it;
@@ -500,37 +522,37 @@ void ShaderEffectItem::updateEffectState(const QMatrix4x4 &matrix)
 
         switch (v.type()) {
         case QVariant::Color:
-            m_program.setUniformValue(name.constData(), qvariant_cast<QColor>(v));
+            m_program->setUniformValue(name.constData(), qvariant_cast<QColor>(v));
             break;
         case QVariant::Double:
-            m_program.setUniformValue(name.constData(), (float) qvariant_cast<double>(v));
+            m_program->setUniformValue(name.constData(), (float) qvariant_cast<double>(v));
             break;
         case QVariant::Transform:
-            m_program.setUniformValue(name.constData(), qvariant_cast<QTransform>(v));
+            m_program->setUniformValue(name.constData(), qvariant_cast<QTransform>(v));
             break;
         case QVariant::Int:
-            m_program.setUniformValue(name.constData(), v.toInt());
+            m_program->setUniformValue(name.constData(), GLint(v.toInt()));
             break;
         case QVariant::Bool:
-            m_program.setUniformValue(name.constData(), GLint(v.toBool()));
+            m_program->setUniformValue(name.constData(), GLint(v.toBool()));
             break;
         case QVariant::Size:
         case QVariant::SizeF:
-            m_program.setUniformValue(name.constData(), v.toSizeF());
+            m_program->setUniformValue(name.constData(), v.toSizeF());
             break;
         case QVariant::Point:
         case QVariant::PointF:
-            m_program.setUniformValue(name.constData(), v.toPointF());
+            m_program->setUniformValue(name.constData(), v.toPointF());
             break;
         case QVariant::Rect:
         case QVariant::RectF:
         {
             QRectF r = v.toRectF();
-            m_program.setUniformValue(name.constData(), r.x(), r.y(), r.width(), r.height());
+            m_program->setUniformValue(name.constData(), r.x(), r.y(), r.width(), r.height());
         }
             break;
         case QVariant::Vector3D:
-            m_program.setUniformValue(name.constData(), qvariant_cast<QVector3D>(v));
+            m_program->setUniformValue(name.constData(), qvariant_cast<QVector3D>(v));
             break;
         default:
             break;
@@ -558,6 +580,9 @@ static inline int size_of_type(GLenum type)
 
 void ShaderEffectItem::bindGeometry()
 {
+    if (!m_program)
+        return;
+
     char const *const *attrNames = m_attributeNames.constData();
     int offset = 0;
         for (int j = 0; j < m_attributeNames.size(); ++j) {
@@ -574,7 +599,7 @@ void ShaderEffectItem::bindGeometry()
         if (normalize)
             qWarning() << "ShaderEffectItem::bindGeometry() - non supported attribute type!";
 
-        m_program.setAttributeArray(a.position, (GLfloat*) (((char*) m_geometry.vertexData()) + offset), a.tupleSize, m_geometry.stride());
+        m_program->setAttributeArray(a.position, (GLfloat*) (((char*) m_geometry.vertexData()) + offset), a.tupleSize, m_geometry.stride());
         //glVertexAttribPointer(a.position, a.tupleSize, a.type, normalize, m_geometry.stride(), (char *) m_geometry.vertexData() + offset);
         offset += a.tupleSize * size_of_type(a.type);
     }
@@ -657,6 +682,16 @@ void ShaderEffectItem::setActive(bool enable)
         }
     }
 
+    // QGLShaderProgram is deleted when not active (to minimize GPU memory usage).
+#ifdef OBSERVE_GL_CONTEXT_LOSS
+    if (!m_active && m_program) {
+        delete m_program;
+        m_program = 0;
+        delete m_contextObserver;
+        m_contextObserver = 0;
+    }
+#endif
+
     emit activeChanged();
     markDirty();
 }
@@ -776,7 +811,9 @@ void ShaderEffectItem::reset()
 {
     disconnectPropertySignals();
 
-    m_program.removeAllShaders();
+    if (m_program)
+        m_program->removeAllShaders();
+
     m_attributeNames.clear();
     m_uniformNames.clear();
     for (int i = 0; i < m_sources.size(); ++i) {
@@ -821,6 +858,9 @@ void ShaderEffectItem::updateProperties()
 
 void ShaderEffectItem::updateShaderProgram()
 {
+    if (!m_program)
+        return;
+
     QString vertexCode = m_vertex_code;
     QString fragmentCode = m_fragment_code;
 
@@ -830,16 +870,16 @@ void ShaderEffectItem::updateShaderProgram()
     if (fragmentCode.isEmpty())
         fragmentCode = QString::fromLatin1(qt_default_fragment_code);
 
-    m_program.addShaderFromSourceCode(QGLShader::Vertex, vertexCode);
-    m_program.addShaderFromSourceCode(QGLShader::Fragment, fragmentCode);
+    m_program->addShaderFromSourceCode(QGLShader::Vertex, vertexCode);
+    m_program->addShaderFromSourceCode(QGLShader::Fragment, fragmentCode);
 
     for (int i = 0; i < m_attributeNames.size(); ++i) {
-        m_program.bindAttributeLocation(m_attributeNames.at(i), m_geometry.attributes()[i].position);
+        m_program->bindAttributeLocation(m_attributeNames.at(i), m_geometry.attributes()[i].position);
     }
 
-    if (!m_program.link()) {
+    if (!m_program->link()) {
         qWarning("ShaderEffectItem: Shader compilation failed:");
-        qWarning() << m_program.log();
+        qWarning() << m_program->log();
     }
 
     if (!m_attributeNames.contains(qt_postion_attribute_name))
@@ -849,10 +889,10 @@ void ShaderEffectItem::updateShaderProgram()
     if (!m_respectsMatrix)
         qWarning("ShaderEffectItem: Missing reference to \'qt_ModelViewProjectionMatrix\'.");
 
-    if (m_program.isLinked()) {
-        m_program.bind();
+    if (m_program->isLinked()) {
+        m_program->bind();
         for (int i = 0; i < m_sources.size(); ++i)
-            m_program.setUniformValue(m_sources.at(i).name.constData(), i);
+            m_program->setUniformValue(m_sources.at(i).name.constData(), (GLint) i);
     }
 
     m_program_dirty = false;
diff --git a/src/imports/shaders/shadereffectitem.h b/src/imports/shaders/shadereffectitem.h
index aebe897..6c225a2 100644
--- a/src/imports/shaders/shadereffectitem.h
+++ b/src/imports/shaders/shadereffectitem.h
@@ -115,7 +115,7 @@ private:
 private:
     QString m_fragment_code;
     QString m_vertex_code;
-    QGLShaderProgram m_program;
+    QGLShaderProgram* m_program;
     QVector<const char *> m_attributeNames;
     QSet<QByteArray> m_uniformNames;
     QSize m_meshResolution;
@@ -143,6 +143,8 @@ private:
     bool m_hasShaderPrograms : 1;
     bool m_mirrored : 1;
     bool m_defaultVertexShader : 1;
+
+    QGLFramebufferObject* m_contextObserver;
 };
 
 QT_END_HEADER
diff --git a/src/imports/shaders/shadereffectsource.cpp b/src/imports/shaders/shadereffectsource.cpp
index 6210c41..f7a8a93 100644
--- a/src/imports/shaders/shadereffectsource.cpp
+++ b/src/imports/shaders/shadereffectsource.cpp
@@ -105,11 +105,6 @@ ShaderEffectSource::~ShaderEffectSource()
     sourceItem regardless of its clipping property.
 */
 
-/*!
-    \property ShaderEffectSource::sourceItem
-    \brief the Item which is the source for the effect.
-*/
-
 void ShaderEffectSource::setSourceItem(QDeclarativeItem *item)
 {
     if (item == m_sourceItem)
@@ -159,26 +154,17 @@ void ShaderEffectSource::setSourceItem(QDeclarativeItem *item)
     The default value is Qt.rect(0,0,0,0).
 */
 
-/*!
-    \property ShaderEffectSource::sourceRect
-    \brief the relative sourceRect for the source.
-*/
-
 void ShaderEffectSource::setSourceRect(const QRectF &rect)
 {
     if (rect == m_sourceRect)
         return;
     m_sourceRect = rect;
     updateSizeAndTexture();
-    updateBackbuffer();
     emit sourceRectChanged();
     emit repaintRequired();
 
-    if (m_sourceItem) {
-        ShaderEffect* effect = qobject_cast<ShaderEffect*> (m_sourceItem->graphicsEffect());
-        if (effect)
-            effect->m_changed = true;
-    }
+    m_dirtyTexture = true;
+    markSourceItemDirty();
 }
 
 /*!
@@ -192,11 +178,6 @@ void ShaderEffectSource::setSourceRect(const QRectF &rect)
     The default value is QSize(0,0).
 */
 
-/*!
-    \property ShaderEffectSource::textureSize
-    \brief the texture size for the source.
-*/
-
 void ShaderEffectSource::setTextureSize(const QSize &size)
 {
     if (size == m_textureSize)
@@ -207,11 +188,8 @@ void ShaderEffectSource::setTextureSize(const QSize &size)
     emit textureSizeChanged();
     emit repaintRequired();
 
-    if (m_sourceItem) {
-        ShaderEffect* effect = qobject_cast<ShaderEffect*> (m_sourceItem->graphicsEffect());
-        if (effect)
-            effect->m_changed = true;
-    }
+    m_dirtyTexture = true;
+    markSourceItemDirty();
 }
 
 /*!
@@ -227,11 +205,6 @@ void ShaderEffectSource::setTextureSize(const QSize &size)
     The default value is true.
 */
 
-/*!
-    \property ShaderEffectSource::live
-    \brief the flag tells whether source item content is changing between frames.
-*/
-
 void ShaderEffectSource::setLive(bool s)
 {
     if (s == m_live)
@@ -251,11 +224,6 @@ void ShaderEffectSource::setLive(bool s)
     The default value is false.
 */
 
-/*!
-    \property ShaderEffectSource::hideSource
-    \brief the flag tells whether original source item content should be hidden.
-*/
-
 void ShaderEffectSource::setHideSource(bool hide)
 {
     if (hide == m_hideSource)
@@ -283,19 +251,16 @@ void ShaderEffectSource::setHideSource(bool hide)
 
 */
 
-/*!
-    \property ShaderEffectSource::wrapMode
-    \brief the wrap parameter for the source after it has been mapped as a texture.
-*/
-
 void ShaderEffectSource::setWrapMode(WrapMode mode)
 {
     if (mode == m_wrapMode)
         return;
 
     m_wrapMode = mode;
-    updateBackbuffer();
     emit wrapModeChanged();
+
+    m_dirtyTexture = true;
+    markSourceItemDirty();
 }
 
 /*!
@@ -314,7 +279,7 @@ void ShaderEffectSource::grab()
     emit repaintRequired();
 }
 
-void ShaderEffectSource::bind() const
+void ShaderEffectSource::bind()
 {
     GLint filtering = smooth() ? GL_LINEAR : GL_NEAREST;
     GLuint hwrap = (m_wrapMode == Repeat || m_wrapMode == RepeatHorizontally) ? GL_REPEAT : GL_CLAMP_TO_EDGE;
@@ -323,9 +288,13 @@ void ShaderEffectSource::bind() const
 #if !defined(QT_OPENGL_ES_2)
     glEnable(GL_TEXTURE_2D);
 #endif
-    if (m_fbo) {
+
+    if (m_fbo && m_fbo->isValid()) {
         glBindTexture(GL_TEXTURE_2D, m_fbo->texture());
     } else {
+        m_dirtyTexture = true;
+        emit repaintRequired();
+        markSourceItemDirty();
         glBindTexture(GL_TEXTURE_2D, 0);
     }
 
@@ -354,7 +323,7 @@ void ShaderEffectSource::derefFromEffectItem()
 
 void ShaderEffectSource::updateBackbuffer()
 {
-    if (!m_sourceItem)
+    if (!m_sourceItem || !QGLContext::currentContext())
         return;
 
     // Multisampling is not (for now) supported.
@@ -370,7 +339,7 @@ void ShaderEffectSource::updateBackbuffer()
         if (!m_fbo) {
             m_fbo =  new ShaderEffectBuffer(size, format);
         } else {
-            if (m_fbo->size() != size || m_fbo->format().internalTextureFormat() != GLenum(m_format)) {
+            if (!m_fbo->isValid() || m_fbo->size() != size || m_fbo->format().internalTextureFormat() != GLenum(m_format)) {
                 delete m_fbo;
                 m_fbo = 0;
                 m_fbo =  new ShaderEffectBuffer(size, format);
@@ -397,6 +366,16 @@ void ShaderEffectSource::markSourceSizeDirty()
         emit repaintRequired();
 }
 
+void ShaderEffectSource::markSourceItemDirty()
+{
+    m_dirtyTexture = true;
+    if (m_sourceItem) {
+        ShaderEffect* effect = qobject_cast<ShaderEffect*> (m_sourceItem->graphicsEffect());
+        if (effect)
+            effect->m_changed = true;
+    }
+}
+
 void ShaderEffectSource::updateSizeAndTexture()
 {
     if (m_sourceItem) {
@@ -407,7 +386,7 @@ void ShaderEffectSource::updateSizeAndTexture()
             size.setWidth(1);
         if (size.height() < 1)
             size.setHeight(1);
-        if (m_fbo && m_fbo->size() != size) {
+        if (m_fbo && (m_fbo->size() != size || !m_fbo->isValid())) {
             delete m_fbo;
             m_fbo = 0;
             delete m_multisampledFbo;
diff --git a/src/imports/shaders/shadereffectsource.h b/src/imports/shaders/shadereffectsource.h
index 0f03a6a..af8a815 100644
--- a/src/imports/shaders/shadereffectsource.h
+++ b/src/imports/shaders/shadereffectsource.h
@@ -99,7 +99,7 @@ public:
     void setWrapMode(WrapMode mode);
 
     bool isActive() const { return m_refs; }
-    void bind() const;
+    void bind();
     void refFromEffectItem();
     void derefFromEffectItem();
     void updateBackbuffer();
@@ -124,6 +124,7 @@ Q_SIGNALS:
 public Q_SLOTS:
     void markSceneGraphDirty();
     void markSourceSizeDirty();
+    void markSourceItemDirty();
 
 private:
     void updateSizeAndTexture();
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 6101eea..4f2145e 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -48,6 +48,7 @@
 #include <private/qauthenticator_p.h>
 #include <qnetworkproxy.h>
 #include <qauthenticator.h>
+#include <qcoreapplication.h>
 
 #include <qbuffer.h>
 #include <qpair.h>
@@ -665,32 +666,31 @@ QString QHttpNetworkConnectionPrivate::errorDetail(QNetworkReply::NetworkError e
     QString errorString;
     switch (errorCode) {
     case QNetworkReply::HostNotFoundError:
-        errorString = QString::fromLatin1(QT_TRANSLATE_NOOP("QHttp", "Host %1 not found"))
-                              .arg(socket->peerName());
+        errorString = QCoreApplication::translate("QHttp", "Host %1 not found").arg(socket->peerName());
         break;
     case QNetworkReply::ConnectionRefusedError:
-        errorString = QLatin1String(QT_TRANSLATE_NOOP("QHttp", "Connection refused"));
+        errorString = QCoreApplication::translate("QHttp", "Connection refused");
         break;
     case QNetworkReply::RemoteHostClosedError:
-        errorString = QLatin1String(QT_TRANSLATE_NOOP("QHttp", "Connection closed"));
+        errorString = QCoreApplication::translate("QHttp", "Connection closed");
         break;
     case QNetworkReply::TimeoutError:
-        errorString = QLatin1String(QT_TRANSLATE_NOOP("QAbstractSocket", "Socket operation timed out"));
+        errorString = QCoreApplication::translate("QAbstractSocket", "Socket operation timed out");
         break;
     case QNetworkReply::ProxyAuthenticationRequiredError:
-        errorString = QLatin1String(QT_TRANSLATE_NOOP("QHttp", "Proxy requires authentication"));
+        errorString = QCoreApplication::translate("QHttp", "Proxy requires authentication");
         break;
     case QNetworkReply::AuthenticationRequiredError:
-        errorString = QLatin1String(QT_TRANSLATE_NOOP("QHttp", "Host requires authentication"));
+        errorString = QCoreApplication::translate("QHttp", "Host requires authentication");
         break;
     case QNetworkReply::ProtocolFailure:
-        errorString = QLatin1String(QT_TRANSLATE_NOOP("QHttp", "Data corrupted"));
+        errorString = QCoreApplication::translate("QHttp", "Data corrupted");
         break;
     case QNetworkReply::ProtocolUnknownError:
-        errorString = QLatin1String(QT_TRANSLATE_NOOP("QHttp", "Unknown protocol specified"));
+        errorString = QCoreApplication::translate("QHttp", "Unknown protocol specified");
         break;
     case QNetworkReply::SslHandshakeFailedError:
-        errorString = QLatin1String(QT_TRANSLATE_NOOP("QHttp", "SSL handshake failed"));
+        errorString = QCoreApplication::translate("QHttp", "SSL handshake failed");
         break;
     default:
         // all other errors are treated as QNetworkReply::UnknownNetworkError
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index 58eb0d8..0b568d4 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -275,6 +275,11 @@ void QNetworkReplyImplPrivate::_q_networkSessionConnected()
     if (session->state() != QNetworkSession::Connected)
         return;
 
+    #ifndef QT_NO_NETWORKPROXY
+        // Re-set proxies here as new session might have changed them
+        proxyList = manager->d_func()->queryProxy(QNetworkProxyQuery(request.url()));
+    #endif
+
     switch (state) {
     case QNetworkReplyImplPrivate::Buffering:
     case QNetworkReplyImplPrivate::Working:
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 6d4df44..71d61a4 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -1197,6 +1197,11 @@ void QNetworkProxyQuery::setUrl(const QUrl &url)
 }
 
 #ifndef QT_NO_BEARERMANAGEMENT
+/*!
+    Returns the network configuration of the proxy query.
+
+    \sa setNetworkConfiguration()
+*/
 QNetworkConfiguration QNetworkProxyQuery::networkConfiguration() const
 {
     return d ? d->config : QNetworkConfiguration();
@@ -1214,7 +1219,7 @@ QNetworkConfiguration QNetworkProxyQuery::networkConfiguration() const
     you should first start the QNetworkSession and obtain the active
     configuration from its properties.
 
-    \sa networkConfiguration
+    \sa networkConfiguration()
 */
 void QNetworkProxyQuery::setNetworkConfiguration(const QNetworkConfiguration &networkConfiguration)
 {
diff --git a/src/opengl/opengl.pro.user.2.1pre1 b/src/opengl/opengl.pro.user.2.1pre1
deleted file mode 100644
index 0c38724..0000000
--- a/src/opengl/opengl.pro.user.2.1pre1
+++ /dev/null
@@ -1,83 +0,0 @@
-<!DOCTYPE QtCreatorProject>
-<qtcreator>
- <data>
-  <variable>ProjectExplorer.Project.ActiveTarget</variable>
-  <value type="int">0</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.EditorSettings</variable>
-  <valuemap type="QVariantMap">
-   <value key="EditorConfiguration.Codec" type="QByteArray">UTF-8</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Target.0</variable>
-  <valuemap type="QVariantMap">
-   <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Desktop</value>
-   <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Target.DesktopTarget</value>
-   <value key="ProjectExplorer.Target.ActiveBuildConfiguration" type="int">0</value>
-   <value key="ProjectExplorer.Target.ActiveRunConfiguration" type="int">0</value>
-   <valuemap key="ProjectExplorer.Target.BuildConfiguration.0" type="QVariantMap">
-    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.0" type="QVariantMap">
-     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">qmake</value>
-     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">QtProjectManager.QMakeBuildStep</value>
-     <valuelist key="QtProjectManager.QMakeBuildStep.QMakeArguments" type="QVariantList">
-      <value type="QString">QMAKE_ABSOLUTE_SOURCE_PATH=/home/jlind/dev/qt/lighthouse-master/src/opengl</value>
-     </valuelist>
-    </valuemap>
-    <valuemap key="ProjectExplorer.BuildConfiguration.BuildStep.1" type="QVariantMap">
-     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
-     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
-     <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">false</value>
-     <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
-      <value type="QString">-j9</value>
-     </valuelist>
-     <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
-    </valuemap>
-    <value key="ProjectExplorer.BuildConfiguration.BuildStepsCount" type="int">2</value>
-    <valuemap key="ProjectExplorer.BuildConfiguration.CleanStep.0" type="QVariantMap">
-     <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Make</value>
-     <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.MakeStep</value>
-     <value key="Qt4ProjectManager.MakeStep.Clean" type="bool">true</value>
-     <valuelist key="Qt4ProjectManager.MakeStep.MakeArguments" type="QVariantList">
-      <value type="QString">clean</value>
-     </valuelist>
-     <value key="Qt4ProjectManager.MakeStep.MakeCommand" type="QString"></value>
-    </valuemap>
-    <value key="ProjectExplorer.BuildConfiguration.CleanStepsCount" type="int">1</value>
-    <value key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment" type="bool">false</value>
-    <valuelist key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges" type="QVariantList"/>
-    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">Debug</value>
-    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4BuildConfiguration</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration" type="int">2</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory" type="QString">/home/jlind/builds/master-lighthouse/src/opengl</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId" type="int">23</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.ToolChain" type="int">0</value>
-    <value key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild" type="bool">true</value>
-   </valuemap>
-   <value key="ProjectExplorer.Target.BuildConfigurationCount" type="int">1</value>
-   <valuemap key="ProjectExplorer.Target.RunConfiguration.0" type="QVariantMap">
-    <value key="ProjectExplorer.ProjectConfiguration.DisplayName" type="QString">headers</value>
-    <value key="ProjectExplorer.ProjectConfiguration.Id" type="QString">Qt4ProjectManager.Qt4RunConfiguration</value>
-    <value key="Qt4ProjectManager.Qt4RunConfiguration.BaseEnvironmentBase" type="int">2</value>
-    <valuelist key="Qt4ProjectManager.Qt4RunConfiguration.CommandLineArguments" type="QVariantList"/>
-    <value key="Qt4ProjectManager.Qt4RunConfiguration.ProFile" type="QString">../../../../../builds/master-lighthouse/include/QtOpenGL/headers.pri</value>
-    <value key="Qt4ProjectManager.Qt4RunConfiguration.UseDyldImageSuffix" type="bool">false</value>
-    <value key="Qt4ProjectManager.Qt4RunConfiguration.UseTerminal" type="bool">false</value>
-    <valuelist key="Qt4ProjectManager.Qt4RunConfiguration.UserEnvironmentChanges" type="QVariantList"/>
-    <value key="Qt4ProjectManager.Qt4RunConfiguration.UserSetName" type="bool">false</value>
-    <value key="Qt4ProjectManager.Qt4RunConfiguration.UserSetWorkingDirectory" type="bool">false</value>
-    <value key="Qt4ProjectManager.Qt4RunConfiguration.UserWorkingDirectory" type="QString"></value>
-   </valuemap>
-   <value key="ProjectExplorer.Target.RunConfigurationCount" type="int">1</value>
-  </valuemap>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.TargetCount</variable>
-  <value type="int">1</value>
- </data>
- <data>
-  <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
-  <value type="int">4</value>
- </data>
-</qtcreator>
diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp
index 71ed690..0f33cab 100644
--- a/src/opengl/qpaintengine_opengl.cpp
+++ b/src/opengl/qpaintengine_opengl.cpp
@@ -4536,11 +4536,14 @@ struct QGLGlyphCoord {
 };
 
 struct QGLFontTexture {
+    QGLFontTexture() : data(0) { }
+    ~QGLFontTexture() { free(data); }
     int x_offset; // glyph offset within the
     int y_offset;
     GLuint texture;
     int width;
     int height;
+    uchar *data;
 };
 
 typedef QHash<glyph_t, QGLGlyphCoord*>  QGLGlyphHash;
@@ -4563,7 +4566,7 @@ public:
     QGLGlyphCoord *lookup(QFontEngine *, glyph_t);
     void cacheGlyphs(QGLContext *, QFontEngine *, glyph_t *glyphs, int numGlyphs);
     void cleanCache();
-    void allocTexture(int width, int height, GLuint texture);
+    void allocTexture(QGLFontTexture *);
 
 public slots:
     void cleanupContext(const QGLContext *);
@@ -4681,19 +4684,18 @@ void QGLGlyphCache::cleanCache()
     qt_context_cache.clear();
 }
 
-void QGLGlyphCache::allocTexture(int width, int height, GLuint texture)
+void QGLGlyphCache::allocTexture(QGLFontTexture *font_tex)
 {
-    uchar *tex_data = (uchar *) malloc(width*height*2);
-    memset(tex_data, 0, width*height*2);
-    glBindTexture(GL_TEXTURE_2D, texture);
+    font_tex->data = (uchar *) malloc(font_tex->width*font_tex->height*2);
+    memset(font_tex->data, 0, font_tex->width*font_tex->height*2);
+    glBindTexture(GL_TEXTURE_2D, font_tex->texture);
 #ifndef QT_OPENGL_ES
     glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE8_ALPHA8,
-                 width, height, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, tex_data);
+                 font_tex->width, font_tex->height, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, font_tex->data);
 #else
     glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA,
-                 width, height, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, tex_data);
+                 font_tex->width, font_tex->height, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, font_tex->data);
 #endif
-    free(tex_data);
 }
 
 #if 0
@@ -4777,13 +4779,13 @@ void QGLGlyphCache::cacheGlyphs(QGLContext *context, QFontEngine *fontEngine,
         Q_ASSERT(max_tex_size > 0);
         if (tex_width > max_tex_size)
             tex_width = max_tex_size;
-        allocTexture(tex_width, tex_height, font_texture);
         font_tex = new QGLFontTexture;
         font_tex->texture = font_texture;
         font_tex->x_offset = x_margin;
         font_tex->y_offset = y_margin;
         font_tex->width = tex_width;
         font_tex->height = tex_height;
+        allocTexture(font_tex);
 //         qDebug() << "new font tex - width:" << tex_width << "height:"<< tex_height
 //                  << hex << "tex id:" << font_tex->texture << "key:" << font_key << "num cached:" << qt_font_textures.size();
         qt_font_textures.insert(font_key, font_tex);
@@ -4806,21 +4808,19 @@ void QGLGlyphCache::cacheGlyphs(QGLContext *context, QFontEngine *fontEngine,
                 font_tex->y_offset += strip_height;
                 if (font_tex->y_offset >= font_tex->height) {
                     // get hold of the old font texture
-                    uchar *old_tex_data = (uchar *) malloc(font_tex->width*font_tex->height*2);
+                    uchar *old_tex_data = font_tex->data;
                     int old_tex_height = font_tex->height;
-#ifndef QT_OPENGL_ES
-                    glGetTexImage(GL_TEXTURE_2D, 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, old_tex_data);
-#endif
 
                     // realloc a larger texture
                     glDeleteTextures(1, &font_tex->texture);
                     glGenTextures(1, &font_tex->texture);
                     font_tex->height = qt_next_power_of_two(font_tex->height + strip_height);
-                    allocTexture(font_tex->width, font_tex->height, font_tex->texture);
+                    allocTexture(font_tex);
 
                     // write back the old texture data
                     glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, font_tex->width, old_tex_height,
                                     GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, old_tex_data);
+                    memcpy(font_tex->data, old_tex_data, font_tex->width*old_tex_height*2);
                     free(old_tex_data);
 
                     // update the texture coords and the y offset for the existing glyphs in
@@ -4868,8 +4868,10 @@ void QGLGlyphCache::cacheGlyphs(QGLContext *context, QFontEngine *fontEngine,
                 }
 #endif
                 glyph_im = glyph_im.convertToFormat(QImage::Format_Indexed8);
+                int cacheLineStart = (font_tex->x_offset + font_tex->y_offset*font_tex->width)*2;
                 for (int y=0; y<glyph_im.height(); ++y) {
                     uchar *s = (uchar *) glyph_im.scanLine(y);
+                    int lineStart = idx;
                     for (int x=0; x<glyph_im.width(); ++x) {
                         uchar alpha = is8BitGray ? *s : qAlpha(glyph_im.color(*s));
                         tex_data[idx] = alpha;
@@ -4879,6 +4881,9 @@ void QGLGlyphCache::cacheGlyphs(QGLContext *context, QFontEngine *fontEngine,
                     }
                     if (glyph_im.width()%2 != 0)
                         idx += 2;
+                    // update cache
+                    memcpy(font_tex->data+cacheLineStart, tex_data+lineStart, glyph_width*2);
+                    cacheLineStart += font_tex->width*2;
                 }
                 glTexSubImage2D(GL_TEXTURE_2D, 0, font_tex->x_offset, font_tex->y_offset,
                                 glyph_width, glyph_im.height(),
@@ -4950,7 +4955,7 @@ void QOpenGLPaintEngine::drawStaticTextItem(QStaticTextItem *textItem)
     glEnableClientState(GL_VERTEX_ARRAY);
     glEnableClientState(GL_TEXTURE_COORD_ARRAY);
     bool antialias = !(textItem->fontEngine()->fontDef.styleStrategy & QFont::NoAntialias)
-				   && (d->matrix.type() > QTransform::TxTranslate);
+                                   && (d->matrix.type() > QTransform::TxTranslate);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, antialias ? GL_LINEAR : GL_NEAREST);
     glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, antialias ? GL_LINEAR : GL_NEAREST);
 
diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.cpp b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
index 1454c7c..4ae1d15 100644
--- a/src/plugins/accessible/widgets/qaccessiblemenu.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
@@ -433,6 +433,8 @@ QString QAccessibleMenuItem::actionText(int action, Text text, int child ) const
         switch (action) {
         case Press:
         case DefaultAction:
+            if (m_action->menu())
+                return QMenu::tr("Open");
             return QMenu::tr("Execute");
             break;
         default:
@@ -444,11 +446,41 @@ QString QAccessibleMenuItem::actionText(int action, Text text, int child ) const
 
 bool QAccessibleMenuItem::doAction(int action, int child, const QVariantList & /*params = QVariantList()*/ )
 {
-    if ((action == Press || action == DefaultAction) && child == 0) {
-        m_action->trigger();
-        return true;
+    if ((child) || ((action != DefaultAction) && (action != Press)))
+        return false;
+
+    // if the action has a menu, expand/hide it
+    if (m_action->menu()) {
+        if (m_action->menu()->isVisible()) {
+            m_action->menu()->hide();
+            return true;
+        } else {
+            if (QMenuBar *bar = qobject_cast<QMenuBar*>(owner())) {
+                bar->setActiveAction(m_action);
+                return true;
+            } else if (QMenu *menu = qobject_cast<QMenu*>(owner())){
+                menu->setActiveAction(m_action);
+                return true;
+            }
+        }
     }
-    return false;
+    // no menu
+    m_action->trigger();
+    return true;
+}
+
+// action interface
+int QAccessibleMenuItem::actionCount()
+{
+    return 1;
+}
+
+void QAccessibleMenuItem::doAction(int actionIndex)
+{
+    if (actionIndex)
+        return;
+
+    doAction(DefaultAction, 0);
 }
 
 int QAccessibleMenuItem::indexOfChild( const QAccessibleInterface * child ) const
@@ -618,7 +650,7 @@ QAccessible::State QAccessibleMenuItem::state(int child ) const
             delete iface;
         }
     }
-    return s;
+    return s | HasInvokeExtension;;
 }
 
 QString QAccessibleMenuItem::text ( Text t, int child ) const
@@ -654,17 +686,50 @@ QString QAccessibleMenuItem::text ( Text t, int child ) const
     return str;
 }
 
+// action interface
 int QAccessibleMenuItem::userActionCount ( int /*child*/ ) const
 {
     return 0;
 }
 
-
 QAction *QAccessibleMenuItem::action() const
 {
     return m_action;
 }
 
+QString QAccessibleMenuItem::description(int)
+{
+    return text(QAccessible::Description, 0);
+}
+
+QString QAccessibleMenuItem::name(int)
+{
+    return actionText(DefaultAction, QAccessible::Name, 0);
+}
+
+QString QAccessibleMenuItem::localizedName(int)
+{
+    return text(QAccessible::Name, 0);
+}
+
+QStringList QAccessibleMenuItem::keyBindings(int)
+{
+    QStringList keys;
+#ifndef QT_NO_SHORTCUT
+    QKeySequence key = m_action->shortcut();
+    if (!key.isEmpty()) {
+        keys.append(key.toString());
+    }
+#endif
+    return keys;
+}
+
+
+QVariant QAccessibleMenuItem::invokeMethodEx(Method, int, const QVariantList &)
+{
+    return QVariant();
+}
+
 QWidget *QAccessibleMenuItem::owner() const
 {
     return m_owner;
diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.h b/src/plugins/accessible/widgets/qaccessiblemenu.h
index 680594d..47f42cb 100644
--- a/src/plugins/accessible/widgets/qaccessiblemenu.h
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.h
@@ -43,6 +43,7 @@
 #define QACCESSIBLEMENU_H
 
 #include <QtGui/qaccessiblewidget.h>
+#include <QtGui/qaccessible2.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -101,8 +102,9 @@ protected:
 
 
 
-class QAccessibleMenuItem : public QAccessibleInterface
+class QAccessibleMenuItem : public QAccessibleActionInterface, public QAccessibleInterfaceEx
 {
+    Q_ACCESSIBLE_OBJECT
 public:
     explicit QAccessibleMenuItem(QWidget *owner, QAction *w);
 
@@ -123,9 +125,17 @@ public:
     virtual QString text ( Text t, int child ) const;
     virtual int userActionCount ( int child ) const;
 
-    QWidget *owner() const;
+    // action interface
+    virtual int actionCount();
+    virtual void doAction(int actionIndex);
+    virtual QString description(int);
+    virtual QString name(int);
+    virtual QString localizedName(int);
+    virtual QStringList keyBindings(int);
 
+    virtual QVariant invokeMethodEx(Method, int, const QVariantList &);
 
+    QWidget *owner() const;
 protected:
     QAction *action() const;
 private:
diff --git a/src/plugins/bearer/corewlan/corewlan.pro b/src/plugins/bearer/corewlan/corewlan.pro
index 90078e9..590a85b 100644
--- a/src/plugins/bearer/corewlan/corewlan.pro
+++ b/src/plugins/bearer/corewlan/corewlan.pro
@@ -5,9 +5,8 @@ QT = core network
 LIBS += -framework Foundation -framework SystemConfiguration
 
 contains(QT_CONFIG, corewlan) {
-    isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10.6.sdk") {
+    isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10\.[67]\.sdk") {
          LIBS += -framework CoreWLAN -framework Security
-         DEFINES += MAC_SDK_10_6
     }
 }
 
diff --git a/src/plugins/bearer/icd/dbusdispatcher.cpp b/src/plugins/bearer/icd/dbusdispatcher.cpp
index 60e4640..62dec62 100644
--- a/src/plugins/bearer/icd/dbusdispatcher.cpp
+++ b/src/plugins/bearer/icd/dbusdispatcher.cpp
@@ -195,7 +195,7 @@ static bool appendVariantToDBusMessage(const QVariant& argument,
             break;
 
         case QVariant::String: {
-            QByteArray data = argument.toString().toLatin1();
+            QByteArray data = argument.toString().toUtf8();
             str_data = data.data();
             dbus_message_iter_append_basic(dbus_iter, DBUS_TYPE_STRING,
                                            &str_data);
@@ -363,7 +363,7 @@ static QVariant getVariantFromDBusMessage(DBusMessageIter *iter) {
         case DBUS_TYPE_STRING:
         {
             dbus_message_iter_get_basic(iter, &str_data);
-            QString str(str_data);
+            QString str(QString::fromUtf8(str_data));
             QVariant variant(str);
             return variant;
         }
diff --git a/src/plugins/bearer/icd/iapconf.cpp b/src/plugins/bearer/icd/iapconf.cpp
index a29e326..e326edf 100644
--- a/src/plugins/bearer/icd/iapconf.cpp
+++ b/src/plugins/bearer/icd/iapconf.cpp
@@ -143,7 +143,7 @@ QVariant IAPConfPrivate::valueToVariant(ConnSettingsValue *value)
         return QVariant(value->value.bool_val ? true : false);
     
     case CONN_SETTINGS_VALUE_STRING:
-        return QVariant(QString(value->value.string_val));
+        return QVariant(QString::fromUtf8(value->value.string_val));
     
     case CONN_SETTINGS_VALUE_DOUBLE:
         return QVariant(value->value.double_val);
diff --git a/src/plugins/bearer/symbian/symbianengine.cpp b/src/plugins/bearer/symbian/symbianengine.cpp
index fc2791a..fdfe94a 100644
--- a/src/plugins/bearer/symbian/symbianengine.cpp
+++ b/src/plugins/bearer/symbian/symbianengine.cpp
@@ -505,8 +505,33 @@ SymbianNetworkConfigurationPrivate *SymbianEngine::configFromConnectionMethodL(
         cpPriv->bearerType = QNetworkConfiguration::Bearer2G;
         break;
     case KCommDbBearerWcdma:
-        cpPriv->bearerType = QNetworkConfiguration::BearerWCDMA;
-        break;
+        {
+            //This is ambiguous, check the network status to find out what the expected connection will be
+            TUint mode;
+            TRequestStatus status;
+            iConnectionMonitor.GetUintAttribute(0, 0, KMobilePhoneNetworkMode, mode, status);
+            User::WaitForRequest(status);
+            if (status != KErrNone)
+                cpPriv->bearerType = QNetworkConfiguration::BearerUnknown;
+            else switch (mode) {
+            case EConnMonNetworkModeCdma2000:
+                cpPriv->bearerType = QNetworkConfiguration::BearerCDMA2000;
+                break;
+            case EConnMonNetworkModeWcdma:
+            case EConnMonNetworkModeTdcdma:
+                cpPriv->bearerType = QNetworkConfiguration::BearerWCDMA; //includes HSDPA, as this API can't detect it
+                break;
+            case EConnMonNetworkModeGsm:
+            case EConnMonNetworkModeAmps:
+            case EConnMonNetworkModeCdma95:
+                cpPriv->bearerType = QNetworkConfiguration::Bearer2G; //includes GPRS and EDGE, Qt API treats them both as 2G
+                break;
+            default:
+                cpPriv->bearerType = QNetworkConfiguration::BearerUnknown;
+                break;
+            }
+            break;
+        }
     case KCommDbBearerLAN:
         cpPriv->bearerType = QNetworkConfiguration::BearerEthernet;
         break;
@@ -1122,6 +1147,13 @@ void SymbianEngine::EventL(const CConnMonEventBase& aEvent)
                     }
                 );
             }
+
+            //update bearer type for 2G/3G connections
+            TInt bearer;
+            iConnectionMonitor.GetIntAttribute(connectionId, 0, KBearerInfo, bearer, status);
+            User::WaitForRequest(status);
+            if (status == KErrNone)
+                updateMobileBearerToConfigs(TConnMonBearerInfo(bearer));
         } else if (connectionStatus == KConfigDaemonStartingDeregistration) {
             TUint connectionId = realEvent->ConnectionId();
             QNetworkConfigurationPrivatePointer ptr = dataByConnectionId(connectionId);
diff --git a/src/plugins/codecs/cn/qgb18030codec.cpp b/src/plugins/codecs/cn/qgb18030codec.cpp
index 0a45eeb..d12f5d9 100644
--- a/src/plugins/codecs/cn/qgb18030codec.cpp
+++ b/src/plugins/codecs/cn/qgb18030codec.cpp
@@ -108,10 +108,10 @@ QByteArray QGb18030Codec::convertFromUnicode(const QChar *uc, int len, Converter
         int len;
         uchar buf[4];
         if (high >= 0) {
-            if (ch >= 0xdc00 && ch < 0xe000) {
+            if (uc[i].isLowSurrogate()) {
                 // valid surrogate pair
                 ++i;
-                uint u = (high-0xd800)*0x400+(ch-0xdc00)+0x10000;
+                uint u = QChar::surrogateToUcs4(high, uc[i].unicode());
                 len = qt_UnicodeToGb18030(u, buf);
                 if (len >= 2) {
                     for (int j=0; j<len; j++)
@@ -129,10 +129,10 @@ QByteArray QGb18030Codec::convertFromUnicode(const QChar *uc, int len, Converter
             }
         }
 
-        if (ch < 0x80) {
+        if (IsLatin(ch)) {
             // ASCII
             *cursor++ = ch;
-        } else if ((ch >= 0xd800 && ch < 0xdc00)) {
+        } else if (uc[i].isHighSurrogate()) {
             // surrogates area. check for correct encoding
             // we need at least one more character, first the high surrogate, then the low one
             high = ch;
@@ -181,7 +181,7 @@ QString QGb18030Codec::convertToUnicode(const char* chars, int len, ConverterSta
         uchar ch = chars[i];
         switch (nbuf) {
         case 0:
-            if (ch < 0x80) {
+            if (IsLatin(ch)) {
                 // ASCII
                 resultData[unicodeLen] = ch;
                 ++unicodeLen;
@@ -339,7 +339,7 @@ QString QGbkCodec::convertToUnicode(const char* chars, int len, ConverterState *
         uchar ch = chars[i];
         switch (nbuf) {
         case 0:
-            if (ch < 0x80) {
+            if (IsLatin(ch)) {
                 // ASCII
                 resultData[unicodeLen] = ch;
                 ++unicodeLen;
@@ -487,7 +487,7 @@ QString QGb2312Codec::convertToUnicode(const char* chars, int len, ConverterStat
         uchar ch = chars[i];
         switch (nbuf) {
         case 0:
-            if (ch < 0x80) {
+            if (IsLatin(ch)) {
                 // ASCII
                 resultData[unicodeLen] = ch;
                 ++unicodeLen;
diff --git a/src/plugins/platforms/directfb/qdirectfbglcontext.cpp b/src/plugins/platforms/directfb/qdirectfbglcontext.cpp
index 8a40b24..aca28f1 100644
--- a/src/plugins/platforms/directfb/qdirectfbglcontext.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbglcontext.cpp
@@ -41,7 +41,7 @@
 
 #include "qdirectfbglcontext.h"
 
-#include <directfb/directfbgl.h>
+#include <directfbgl.h>
 
 #include <QDebug>
 
diff --git a/src/plugins/platforms/uikit/README b/src/plugins/platforms/uikit/README
index 81ef0bd..a8031e6 100644
--- a/src/plugins/platforms/uikit/README
+++ b/src/plugins/platforms/uikit/README
@@ -7,8 +7,8 @@ There have no tests been run whatsoever.
 
 * Open GL ES 1/2 based backend
 * Single touch
-* Text/font drawing using font shipped with application
-* Text input (Opening/closing software input panel.
+* Text/font drawing using system fonts (CoreText)
+* Text input (Opening/closing software input panel
   Application has to perform necessary layout changes itself.)
 * Initial showing/hiding of status bar (as defined in the Info.plist)
 * Interface orientations as defined in the Info.plist of the application
@@ -21,7 +21,16 @@ Building/Deploying the application has to be done in Xcode. You need to generate
 necessary moc_ files in advance and add these to the Xcode project. More details
 on the Xcode setup see below.
 
-1) Build Qt
+1) Known Issues
+
+* Console message
+  "QEventDispatcherUNIX: internal error, wakeUps.testAndSetRelease(1, 0) failed!"
+  seems to appear sometimes for some people for unknown reasons and
+  unknown effect
+* JavaScript XmlHttpRequest doesn't work reliably even though networking
+  in general seems to
+
+2) Build Qt
 
 The example Xcode project in the examples subdirectory requires that you do shadow
 builds of Qt in qt-lighthouse-ios-simulator and qt-lighthouse-ios-device directories
@@ -37,13 +46,13 @@ After configuring and building Qt you need to also build src/plugins/platforms/u
 
 Simulator:
 ----------
-configure -qpa -xplatform qpa/macx-iphonesimulator-g++ -arch i386 -developer-build -release -opengl es2 -no-accessibility -no-qt3support -no-multimedia -no-phonon-backend -no-svg -no-webkit -no-scripttools -no-openssl -no-sql-mysql -no-sql-odbc -no-cups -no-iconv -no-dbus -static -nomake tools -nomake demos -nomake docs -nomake examples -nomake translations
+configure -qpa -xplatform qpa/macx-iphonesimulator-g++ -arch i386 -developer-build -release -opengl es2 -no-accessibility -no-qt3support -no-multimedia -no-phonon-backend -no-webkit -no-scripttools -no-openssl -no-sql-mysql -no-sql-odbc -no-cups -no-iconv -no-dbus -static -nomake tools -nomake demos -nomake docs -nomake examples -nomake translations
 
 Device:
 -------
-configure -qpa -xplatform qpa/macx-iphonedevice-g++ -arch armv7 -no-neon -developer-build -release -opengl es2 -no-accessibility -no-qt3support -no-multimedia -no-phonon-backend -no-svg -no-webkit -no-scripttools -no-openssl -no-sql-mysql -no-sql-odbc -no-cups -no-iconv -no-dbus -static -nomake tools -nomake demos -nomake docs -nomake examples -nomake translations
+configure -qpa -xplatform qpa/macx-iphonedevice-g++ -arch armv7 -no-neon -developer-build -release -opengl es2 -no-accessibility -no-qt3support -no-multimedia -no-phonon-backend -no-webkit -no-scripttools -no-openssl -no-sql-mysql -no-sql-odbc -no-cups -no-iconv -no-dbus -static -nomake tools -nomake demos -nomake docs -nomake examples -nomake translations
 
-2) XCode setup:
+3) XCode setup:
 - there are examples in the examples subdirectory of the platform plugin
 - to create something fresh do something like:
   - Xcode: Create a "View-based Appplication"
@@ -64,5 +73,5 @@ configure -qpa -xplatform qpa/macx-iphonedevice-g++ -arch armv7 -no-neon -develo
     and call Phonon::Factory::setBackend(qt_plugin_instance_phonon_av());
     Link to libphonon and to plugins/phonon/phonon_av
 
-3) Done: Build and Run.
+4) Done: Build and Run.
 
diff --git a/src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo-Info.plist b/src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo-Info.plist
index 5bc1ac9..3c45823 100644
--- a/src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo-Info.plist
+++ b/src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo-Info.plist
@@ -6,6 +6,8 @@
 	<string>English</string>
 	<key>CFBundleDisplayName</key>
 	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleDocumentTypes</key>
+	<array/>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
@@ -20,6 +22,8 @@
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array/>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
@@ -37,5 +41,9 @@
 		<string>UIInterfaceOrientationPortrait</string>
 		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
+	<key>UTExportedTypeDeclarations</key>
+	<array/>
+	<key>UTImportedTypeDeclarations</key>
+	<array/>
 </dict>
 </plist>
diff --git a/src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo.xcodeproj/project.pbxproj b/src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo.xcodeproj/project.pbxproj
index b564ef9..dedc462 100755
--- a/src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo.xcodeproj/project.pbxproj
+++ b/src/plugins/platforms/uikit/examples/flickrdemo/flickrdemo.xcodeproj/project.pbxproj
@@ -17,13 +17,14 @@
 		D307DEB213EBCF5500399BD4 /* libQtOpenGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D307DEA913EBCF5500399BD4 /* libQtOpenGL.a */; };
 		D307DEB313EBCF5500399BD4 /* libQtScript.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D307DEAA13EBCF5500399BD4 /* libQtScript.a */; };
 		D307DEB413EBCF5500399BD4 /* libQtSql.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D307DEAB13EBCF5500399BD4 /* libQtSql.a */; };
-		D307DEB513EBCF5500399BD4 /* libQtXml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D307DEAC13EBCF5500399BD4 /* libQtXml.a */; };
 		D307DEB613EBCF5500399BD4 /* libQtXmlPatterns.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D307DEAD13EBCF5500399BD4 /* libQtXmlPatterns.a */; };
 		D307DEB813EBCF6400399BD4 /* libquikit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D307DEB713EBCF6400399BD4 /* libquikit.a */; };
 		D333CCF213B88A4D0070E08E /* moc_qmlapplicationviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D333CCEF13B88A4D0070E08E /* moc_qmlapplicationviewer.cpp */; };
 		D333CCF313B88A4D0070E08E /* moc_qmlapplicationviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D333CCEF13B88A4D0070E08E /* moc_qmlapplicationviewer.cpp */; };
 		D333CCF413B88A4D0070E08E /* qmlapplicationviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D333CCF013B88A4D0070E08E /* qmlapplicationviewer.cpp */; };
 		D333CCF513B88A4D0070E08E /* qmlapplicationviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D333CCF013B88A4D0070E08E /* qmlapplicationviewer.cpp */; };
+		D36D346513F3CD7E00EC5A41 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D36D346413F3CD7E00EC5A41 /* CoreText.framework */; };
+		D36D346613F3CD8800EC5A41 /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D36D346413F3CD7E00EC5A41 /* CoreText.framework */; };
 		D3A51610134B03DE00E30E2F /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3A5160F134B03DE00E30E2F /* OpenGLES.framework */; };
 		D3A51612134B03E900E30E2F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3A51611134B03E900E30E2F /* QuartzCore.framework */; };
 		D3A51615134B041500E30E2F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D3A51611134B03E900E30E2F /* QuartzCore.framework */; };
@@ -36,8 +37,6 @@
 		D3CAA7F213264F52008BB877 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
 		D3CAA7FA13264F8A008BB877 /* libz.1.2.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D3CAA7F913264F8A008BB877 /* libz.1.2.3.dylib */; };
 		D3CAA81113264FF0008BB877 /* libz.1.2.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D3CAA7F913264F8A008BB877 /* libz.1.2.3.dylib */; };
-		D3CAA88A132652E5008BB877 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = D3CAA836132652E5008BB877 /* fonts */; };
-		D3CAA88B132652E5008BB877 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = D3CAA836132652E5008BB877 /* fonts */; };
 		D3D815F31329339300CDE422 /* flickr in Resources */ = {isa = PBXBuildFile; fileRef = D3D815D31329339300CDE422 /* flickr */; };
 		D3D815F4132933AB00CDE422 /* flickr in Resources */ = {isa = PBXBuildFile; fileRef = D3D815D31329339300CDE422 /* flickr */; };
 		D3D81758132A184300CDE422 /* libQtCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D81752132A184300CDE422 /* libQtCore.a */; };
@@ -46,7 +45,6 @@
 		D3D8175B132A184300CDE422 /* libQtNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D81755132A184300CDE422 /* libQtNetwork.a */; };
 		D3D8175C132A184300CDE422 /* libQtScript.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D81756132A184300CDE422 /* libQtScript.a */; };
 		D3D8175D132A184300CDE422 /* libQtSql.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D81757132A184300CDE422 /* libQtSql.a */; };
-		D3D81760132A185A00CDE422 /* libQtXml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D8175E132A185A00CDE422 /* libQtXml.a */; };
 		D3D81761132A185A00CDE422 /* libQtXmlPatterns.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D8175F132A185A00CDE422 /* libQtXmlPatterns.a */; };
 		D3D81763132A186B00CDE422 /* libquikit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D81762132A186B00CDE422 /* libquikit.a */; };
 /* End PBXBuildFile section */
@@ -65,19 +63,18 @@
 		D307DEA913EBCF5500399BD4 /* libQtOpenGL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtOpenGL.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtOpenGL.a"; sourceTree = "<group>"; };
 		D307DEAA13EBCF5500399BD4 /* libQtScript.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtScript.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtScript.a"; sourceTree = "<group>"; };
 		D307DEAB13EBCF5500399BD4 /* libQtSql.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtSql.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtSql.a"; sourceTree = "<group>"; };
-		D307DEAC13EBCF5500399BD4 /* libQtXml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtXml.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtXml.a"; sourceTree = "<group>"; };
 		D307DEAD13EBCF5500399BD4 /* libQtXmlPatterns.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtXmlPatterns.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtXmlPatterns.a"; sourceTree = "<group>"; };
 		D307DEB713EBCF6400399BD4 /* libquikit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libquikit.a; path = "../../../../../../../qt-lighthouse-ios-simulator/plugins/platforms/libquikit.a"; sourceTree = "<group>"; };
 		D333CCEF13B88A4D0070E08E /* moc_qmlapplicationviewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_qmlapplicationviewer.cpp; path = ../share/qmlapplicationviewer/moc_qmlapplicationviewer.cpp; sourceTree = "<group>"; };
 		D333CCF013B88A4D0070E08E /* qmlapplicationviewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qmlapplicationviewer.cpp; path = ../share/qmlapplicationviewer/qmlapplicationviewer.cpp; sourceTree = "<group>"; };
 		D333CCF113B88A4D0070E08E /* qmlapplicationviewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qmlapplicationviewer.h; path = ../share/qmlapplicationviewer/qmlapplicationviewer.h; sourceTree = "<group>"; };
+		D36D346413F3CD7E00EC5A41 /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
 		D3A5160F134B03DE00E30E2F /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
 		D3A51611134B03E900E30E2F /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		D3A51617134B042A00E30E2F /* libQtOpenGL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtOpenGL.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtOpenGL.a"; sourceTree = "<group>"; };
 		D3CAA7C713264AAD008BB877 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
 		D3CAA7F613264F52008BB877 /* flickrdemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = flickrdemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D3CAA7F913264F8A008BB877 /* libz.1.2.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.1.2.3.dylib; path = usr/lib/libz.1.2.3.dylib; sourceTree = SDKROOT; };
-		D3CAA836132652E5008BB877 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = ../../../../../../lib/fonts; sourceTree = SOURCE_ROOT; };
 		D3D815D31329339300CDE422 /* flickr */ = {isa = PBXFileReference; lastKnownFileType = folder; name = flickr; path = ../../../../../../demos/declarative/flickr; sourceTree = SOURCE_ROOT; };
 		D3D81752132A184300CDE422 /* libQtCore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtCore.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtCore.a"; sourceTree = SOURCE_ROOT; };
 		D3D81753132A184300CDE422 /* libQtDeclarative.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtDeclarative.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtDeclarative.a"; sourceTree = SOURCE_ROOT; };
@@ -85,7 +82,6 @@
 		D3D81755132A184300CDE422 /* libQtNetwork.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtNetwork.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtNetwork.a"; sourceTree = SOURCE_ROOT; };
 		D3D81756132A184300CDE422 /* libQtScript.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtScript.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtScript.a"; sourceTree = SOURCE_ROOT; };
 		D3D81757132A184300CDE422 /* libQtSql.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtSql.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtSql.a"; sourceTree = SOURCE_ROOT; };
-		D3D8175E132A185A00CDE422 /* libQtXml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtXml.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtXml.a"; sourceTree = SOURCE_ROOT; };
 		D3D8175F132A185A00CDE422 /* libQtXmlPatterns.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtXmlPatterns.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtXmlPatterns.a"; sourceTree = SOURCE_ROOT; };
 		D3D81762132A186B00CDE422 /* libquikit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libquikit.a; path = "../../../../../../../qt-lighthouse-ios-device/plugins/platforms/libquikit.a"; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
@@ -95,6 +91,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D36D346613F3CD8800EC5A41 /* CoreText.framework in Frameworks */,
 				D3A51612134B03E900E30E2F /* QuartzCore.framework in Frameworks */,
 				D3A51610134B03DE00E30E2F /* OpenGLES.framework in Frameworks */,
 				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
@@ -108,7 +105,6 @@
 				D307DEB213EBCF5500399BD4 /* libQtOpenGL.a in Frameworks */,
 				D307DEB313EBCF5500399BD4 /* libQtScript.a in Frameworks */,
 				D307DEB413EBCF5500399BD4 /* libQtSql.a in Frameworks */,
-				D307DEB513EBCF5500399BD4 /* libQtXml.a in Frameworks */,
 				D307DEB613EBCF5500399BD4 /* libQtXmlPatterns.a in Frameworks */,
 				D307DEB813EBCF6400399BD4 /* libquikit.a in Frameworks */,
 			);
@@ -118,6 +114,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D36D346513F3CD7E00EC5A41 /* CoreText.framework in Frameworks */,
 				D3A51618134B042A00E30E2F /* libQtOpenGL.a in Frameworks */,
 				D3CAA7F013264F52008BB877 /* Foundation.framework in Frameworks */,
 				D3CAA7F113264F52008BB877 /* UIKit.framework in Frameworks */,
@@ -131,7 +128,6 @@
 				D3D8175B132A184300CDE422 /* libQtNetwork.a in Frameworks */,
 				D3D8175C132A184300CDE422 /* libQtScript.a in Frameworks */,
 				D3D8175D132A184300CDE422 /* libQtSql.a in Frameworks */,
-				D3D81760132A185A00CDE422 /* libQtXml.a in Frameworks */,
 				D3D81761132A185A00CDE422 /* libQtXmlPatterns.a in Frameworks */,
 				D3D81763132A186B00CDE422 /* libquikit.a in Frameworks */,
 			);
@@ -174,7 +170,6 @@
 			isa = PBXGroup;
 			children = (
 				D3D815D31329339300CDE422 /* flickr */,
-				D3CAA836132652E5008BB877 /* fonts */,
 				8D1107310486CEB800E47090 /* flickrdemo-Info.plist */,
 			);
 			name = Resources;
@@ -190,6 +185,7 @@
 				288765A40DF7441C002DB57D /* CoreGraphics.framework */,
 				D3A51611134B03E900E30E2F /* QuartzCore.framework */,
 				D3A5160F134B03DE00E30E2F /* OpenGLES.framework */,
+				D36D346413F3CD7E00EC5A41 /* CoreText.framework */,
 				D3CAA7F913264F8A008BB877 /* libz.1.2.3.dylib */,
 			);
 			name = Frameworks;
@@ -216,7 +212,6 @@
 				D3A51617134B042A00E30E2F /* libQtOpenGL.a */,
 				D3D81756132A184300CDE422 /* libQtScript.a */,
 				D3D81757132A184300CDE422 /* libQtSql.a */,
-				D3D8175E132A185A00CDE422 /* libQtXml.a */,
 				D3D8175F132A185A00CDE422 /* libQtXmlPatterns.a */,
 			);
 			name = Device;
@@ -233,7 +228,6 @@
 				D307DEA913EBCF5500399BD4 /* libQtOpenGL.a */,
 				D307DEAA13EBCF5500399BD4 /* libQtScript.a */,
 				D307DEAB13EBCF5500399BD4 /* libQtSql.a */,
-				D307DEAC13EBCF5500399BD4 /* libQtXml.a */,
 				D307DEAD13EBCF5500399BD4 /* libQtXmlPatterns.a */,
 			);
 			name = Simulator;
@@ -306,7 +300,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D3CAA88A132652E5008BB877 /* fonts in Resources */,
 				D3D815F31329339300CDE422 /* flickr in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -315,7 +308,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D3CAA88B132652E5008BB877 /* fonts in Resources */,
 				D3D815F4132933AB00CDE422 /* flickr in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/src/plugins/platforms/uikit/examples/qmltest/qmltest-Info.plist b/src/plugins/platforms/uikit/examples/qmltest/qmltest-Info.plist
index 1566585..531d93d 100644
--- a/src/plugins/platforms/uikit/examples/qmltest/qmltest-Info.plist
+++ b/src/plugins/platforms/uikit/examples/qmltest/qmltest-Info.plist
@@ -6,6 +6,8 @@
 	<string>English</string>
 	<key>CFBundleDisplayName</key>
 	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleDocumentTypes</key>
+	<array/>
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
@@ -20,9 +22,15 @@
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>CFBundleURLTypes</key>
+	<array/>
 	<key>CFBundleVersion</key>
 	<string>1.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UTExportedTypeDeclarations</key>
+	<array/>
+	<key>UTImportedTypeDeclarations</key>
+	<array/>
 </dict>
 </plist>
diff --git a/src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj b/src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj
index afebcba..021eed2 100755
--- a/src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj
+++ b/src/plugins/platforms/uikit/examples/qmltest/qmltest.xcodeproj/project.pbxproj
@@ -18,12 +18,13 @@
 		D307DED313EBD05900399BD4 /* libQtOpenGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D307DECA13EBD05900399BD4 /* libQtOpenGL.a */; };
 		D307DED413EBD05900399BD4 /* libQtScript.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D307DECB13EBD05900399BD4 /* libQtScript.a */; };
 		D307DED513EBD05900399BD4 /* libQtSql.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D307DECC13EBD05900399BD4 /* libQtSql.a */; };
-		D307DED613EBD05900399BD4 /* libQtXml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D307DECD13EBD05900399BD4 /* libQtXml.a */; };
 		D307DED713EBD05900399BD4 /* libQtXmlPatterns.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D307DECE13EBD05900399BD4 /* libQtXmlPatterns.a */; };
 		D333CCF913B88A690070E08E /* moc_qmlapplicationviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D333CCF613B88A690070E08E /* moc_qmlapplicationviewer.cpp */; };
 		D333CCFA13B88A690070E08E /* moc_qmlapplicationviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D333CCF613B88A690070E08E /* moc_qmlapplicationviewer.cpp */; };
 		D333CCFB13B88A690070E08E /* qmlapplicationviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D333CCF713B88A690070E08E /* qmlapplicationviewer.cpp */; };
 		D333CCFC13B88A690070E08E /* qmlapplicationviewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D333CCF713B88A690070E08E /* qmlapplicationviewer.cpp */; };
+		D34F290413F29AF400E4F9AC /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D34F290313F29AF400E4F9AC /* CoreText.framework */; };
+		D34F290713F29B0A00E4F9AC /* CoreText.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D34F290613F29B0300E4F9AC /* CoreText.framework */; };
 		D35784261345D9940046D202 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D35784251345D9940046D202 /* OpenGLES.framework */; };
 		D35784281345D9E00046D202 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D35784271345D9E00046D202 /* QuartzCore.framework */; };
 		D3578436134A09990046D202 /* libQtOpenGL.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3578435134A09990046D202 /* libQtOpenGL.a */; };
@@ -36,8 +37,6 @@
 		D3CAA7F213264F52008BB877 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; };
 		D3CAA7FA13264F8A008BB877 /* libz.1.2.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D3CAA7F913264F8A008BB877 /* libz.1.2.3.dylib */; };
 		D3CAA81113264FF0008BB877 /* libz.1.2.3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D3CAA7F913264F8A008BB877 /* libz.1.2.3.dylib */; };
-		D3CAA88A132652E5008BB877 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = D3CAA836132652E5008BB877 /* fonts */; };
-		D3CAA88B132652E5008BB877 /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = D3CAA836132652E5008BB877 /* fonts */; };
 		D3CAA89113265310008BB877 /* qml in Resources */ = {isa = PBXBuildFile; fileRef = D3CAA88E13265310008BB877 /* qml */; };
 		D3CAA89213265310008BB877 /* qml in Resources */ = {isa = PBXBuildFile; fileRef = D3CAA88E13265310008BB877 /* qml */; };
 		D3D817B2132A2CFD00CDE422 /* libQtCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817AA132A2CFD00CDE422 /* libQtCore.a */; };
@@ -46,7 +45,6 @@
 		D3D817B5132A2CFD00CDE422 /* libQtNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817AD132A2CFD00CDE422 /* libQtNetwork.a */; };
 		D3D817B6132A2CFD00CDE422 /* libQtScript.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817AE132A2CFD00CDE422 /* libQtScript.a */; };
 		D3D817B7132A2CFD00CDE422 /* libQtSql.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817AF132A2CFD00CDE422 /* libQtSql.a */; };
-		D3D817B8132A2CFD00CDE422 /* libQtXml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817B0132A2CFD00CDE422 /* libQtXml.a */; };
 		D3D817B9132A2CFD00CDE422 /* libQtXmlPatterns.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817B1132A2CFD00CDE422 /* libQtXmlPatterns.a */; };
 		D3D817BB132A2D0E00CDE422 /* libquikit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3D817BA132A2D0E00CDE422 /* libquikit.a */; };
 /* End PBXBuildFile section */
@@ -66,18 +64,18 @@
 		D307DECA13EBD05900399BD4 /* libQtOpenGL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtOpenGL.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtOpenGL.a"; sourceTree = "<group>"; };
 		D307DECB13EBD05900399BD4 /* libQtScript.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtScript.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtScript.a"; sourceTree = "<group>"; };
 		D307DECC13EBD05900399BD4 /* libQtSql.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtSql.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtSql.a"; sourceTree = "<group>"; };
-		D307DECD13EBD05900399BD4 /* libQtXml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtXml.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtXml.a"; sourceTree = "<group>"; };
 		D307DECE13EBD05900399BD4 /* libQtXmlPatterns.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtXmlPatterns.a; path = "../../../../../../../qt-lighthouse-ios-simulator/lib/libQtXmlPatterns.a"; sourceTree = "<group>"; };
 		D333CCF613B88A690070E08E /* moc_qmlapplicationviewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = moc_qmlapplicationviewer.cpp; path = ../share/qmlapplicationviewer/moc_qmlapplicationviewer.cpp; sourceTree = "<group>"; };
 		D333CCF713B88A690070E08E /* qmlapplicationviewer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = qmlapplicationviewer.cpp; path = ../share/qmlapplicationviewer/qmlapplicationviewer.cpp; sourceTree = "<group>"; };
 		D333CCF813B88A690070E08E /* qmlapplicationviewer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = qmlapplicationviewer.h; path = ../share/qmlapplicationviewer/qmlapplicationviewer.h; sourceTree = "<group>"; };
+		D34F290313F29AF400E4F9AC /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
+		D34F290613F29B0300E4F9AC /* CoreText.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreText.framework; path = System/Library/Frameworks/CoreText.framework; sourceTree = SDKROOT; };
 		D35784251345D9940046D202 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
 		D35784271345D9E00046D202 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
 		D3578435134A09990046D202 /* libQtOpenGL.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtOpenGL.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtOpenGL.a"; sourceTree = "<group>"; };
 		D3CAA7C713264AAD008BB877 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
 		D3CAA7F613264F52008BB877 /* qmltest.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = qmltest.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		D3CAA7F913264F8A008BB877 /* libz.1.2.3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.1.2.3.dylib; path = usr/lib/libz.1.2.3.dylib; sourceTree = SDKROOT; };
-		D3CAA836132652E5008BB877 /* fonts */ = {isa = PBXFileReference; lastKnownFileType = folder; name = fonts; path = ../../../../../../lib/fonts; sourceTree = SOURCE_ROOT; };
 		D3CAA88E13265310008BB877 /* qml */ = {isa = PBXFileReference; lastKnownFileType = folder; path = qml; sourceTree = SOURCE_ROOT; };
 		D3D817AA132A2CFD00CDE422 /* libQtCore.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtCore.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtCore.a"; sourceTree = SOURCE_ROOT; };
 		D3D817AB132A2CFD00CDE422 /* libQtDeclarative.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtDeclarative.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtDeclarative.a"; sourceTree = SOURCE_ROOT; };
@@ -85,7 +83,6 @@
 		D3D817AD132A2CFD00CDE422 /* libQtNetwork.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtNetwork.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtNetwork.a"; sourceTree = SOURCE_ROOT; };
 		D3D817AE132A2CFD00CDE422 /* libQtScript.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtScript.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtScript.a"; sourceTree = SOURCE_ROOT; };
 		D3D817AF132A2CFD00CDE422 /* libQtSql.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtSql.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtSql.a"; sourceTree = SOURCE_ROOT; };
-		D3D817B0132A2CFD00CDE422 /* libQtXml.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtXml.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtXml.a"; sourceTree = SOURCE_ROOT; };
 		D3D817B1132A2CFD00CDE422 /* libQtXmlPatterns.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libQtXmlPatterns.a; path = "../../../../../../../qt-lighthouse-ios-device/lib/libQtXmlPatterns.a"; sourceTree = SOURCE_ROOT; };
 		D3D817BA132A2D0E00CDE422 /* libquikit.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libquikit.a; path = "../../../../../../../qt-lighthouse-ios-device/plugins/platforms/libquikit.a"; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
@@ -95,6 +92,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D34F290413F29AF400E4F9AC /* CoreText.framework in Frameworks */,
 				D35784281345D9E00046D202 /* QuartzCore.framework in Frameworks */,
 				1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */,
 				1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */,
@@ -108,7 +106,6 @@
 				D307DED313EBD05900399BD4 /* libQtOpenGL.a in Frameworks */,
 				D307DED413EBD05900399BD4 /* libQtScript.a in Frameworks */,
 				D307DED513EBD05900399BD4 /* libQtSql.a in Frameworks */,
-				D307DED613EBD05900399BD4 /* libQtXml.a in Frameworks */,
 				D307DED713EBD05900399BD4 /* libQtXmlPatterns.a in Frameworks */,
 				D307DEC513EBD04100399BD4 /* libquikit.a in Frameworks */,
 			);
@@ -118,6 +115,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				D34F290713F29B0A00E4F9AC /* CoreText.framework in Frameworks */,
 				D357843A134A0AB10046D202 /* QuartzCore.framework in Frameworks */,
 				D3578439134A0AAE0046D202 /* OpenGLES.framework in Frameworks */,
 				D3CAA7F013264F52008BB877 /* Foundation.framework in Frameworks */,
@@ -130,7 +128,6 @@
 				D3D817B5132A2CFD00CDE422 /* libQtNetwork.a in Frameworks */,
 				D3D817B6132A2CFD00CDE422 /* libQtScript.a in Frameworks */,
 				D3D817B7132A2CFD00CDE422 /* libQtSql.a in Frameworks */,
-				D3D817B8132A2CFD00CDE422 /* libQtXml.a in Frameworks */,
 				D3D817B9132A2CFD00CDE422 /* libQtXmlPatterns.a in Frameworks */,
 				D3D817BB132A2D0E00CDE422 /* libquikit.a in Frameworks */,
 				D3578436134A09990046D202 /* libQtOpenGL.a in Frameworks */,
@@ -152,6 +149,7 @@
 		29B97314FDCFA39411CA2CEA /* CustomTemplate */ = {
 			isa = PBXGroup;
 			children = (
+				D34F290313F29AF400E4F9AC /* CoreText.framework */,
 				29B97315FDCFA39411CA2CEA /* Other Sources */,
 				29B97317FDCFA39411CA2CEA /* Resources */,
 				D3CAA7E213264E8C008BB877 /* QMLApplicationViewer */,
@@ -174,7 +172,6 @@
 			isa = PBXGroup;
 			children = (
 				D3CAA88E13265310008BB877 /* qml */,
-				D3CAA836132652E5008BB877 /* fonts */,
 				8D1107310486CEB800E47090 /* qmltest-Info.plist */,
 			);
 			name = Resources;
@@ -190,6 +187,7 @@
 				288765A40DF7441C002DB57D /* CoreGraphics.framework */,
 				D35784251345D9940046D202 /* OpenGLES.framework */,
 				D35784271345D9E00046D202 /* QuartzCore.framework */,
+				D34F290613F29B0300E4F9AC /* CoreText.framework */,
 				D3CAA7F913264F8A008BB877 /* libz.1.2.3.dylib */,
 			);
 			name = Frameworks;
@@ -216,7 +214,6 @@
 				D3578435134A09990046D202 /* libQtOpenGL.a */,
 				D3D817AE132A2CFD00CDE422 /* libQtScript.a */,
 				D3D817AF132A2CFD00CDE422 /* libQtSql.a */,
-				D3D817B0132A2CFD00CDE422 /* libQtXml.a */,
 				D3D817B1132A2CFD00CDE422 /* libQtXmlPatterns.a */,
 			);
 			name = Device;
@@ -233,7 +230,6 @@
 				D307DECA13EBD05900399BD4 /* libQtOpenGL.a */,
 				D307DECB13EBD05900399BD4 /* libQtScript.a */,
 				D307DECC13EBD05900399BD4 /* libQtSql.a */,
-				D307DECD13EBD05900399BD4 /* libQtXml.a */,
 				D307DECE13EBD05900399BD4 /* libQtXmlPatterns.a */,
 			);
 			name = Simulator;
@@ -306,7 +302,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D3CAA88A132652E5008BB877 /* fonts in Resources */,
 				D3CAA89113265310008BB877 /* qml in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -315,7 +310,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D3CAA88B132652E5008BB877 /* fonts in Resources */,
 				D3CAA89213265310008BB877 /* qml in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/src/plugins/platforms/uikit/phonon_av/avmediaobject.mm b/src/plugins/platforms/uikit/phonon_av/avmediaobject.mm
index 388866f..9cbddc0 100644
--- a/src/plugins/platforms/uikit/phonon_av/avmediaobject.mm
+++ b/src/plugins/platforms/uikit/phonon_av/avmediaobject.mm
@@ -60,7 +60,7 @@
 
 - (id)initWithMediaObject:(AVMediaObject *)obj
 {
-    if (self = [self init]) {
+    if ((self = [self init])) {
         mediaObject = obj;
     }
     return self;
diff --git a/src/plugins/platforms/uikit/platform.pro b/src/plugins/platforms/uikit/platform.pro
index 726da06..b5ff62f 100644
--- a/src/plugins/platforms/uikit/platform.pro
+++ b/src/plugins/platforms/uikit/platform.pro
@@ -17,11 +17,19 @@ OBJECTIVE_HEADERS = quikitintegration.h \
     quikiteventloop.h \
     quikitwindowsurface.h
 
-HEADERS = quikitsoftwareinputhandler.h
+HEADERS = quikitsoftwareinputhandler.h \
+    qcoretextfontdatabase.h
+
+SOURCES += \
+    qcoretextfontdatabase.cpp
+
+#needed for qcoretextfontengine even if it's not used
+INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/harfbuzz/src
 
 #add libz for freetype.
 LIBS += -lz
 
-include(../fontdatabases/genericunix/genericunix.pri)
 target.path += $$[QT_INSTALL_PLUGINS]/platforms
 INSTALLS += target
+
+
diff --git a/src/plugins/platforms/uikit/qcoretextfontdatabase.cpp b/src/plugins/platforms/uikit/qcoretextfontdatabase.cpp
new file mode 100644
index 0000000..76ad936
--- /dev/null
+++ b/src/plugins/platforms/uikit/qcoretextfontdatabase.cpp
@@ -0,0 +1,156 @@
+/****************************************************************************
+**
+** 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 plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qcoretextfontdatabase.h"
+
+#include <CoreText/CoreText.h>
+
+#include <private/qcore_mac_p.h>
+#include <private/qfontengine_coretext_p.h>
+
+#include <QtDebug>
+
+QT_BEGIN_NAMESPACE
+
+void QCoreTextFontDatabase::populateFontDatabase()
+{
+    QCFType<CTFontCollectionRef> collection = CTFontCollectionCreateFromAvailableFonts(0);
+    if(!collection)
+        return;
+    QCFType<CFArrayRef> fonts = CTFontCollectionCreateMatchingFontDescriptors(collection);
+    if(!fonts)
+        return;
+    QSupportedWritingSystems supportedWritingSystems;
+    for (int i = 0; i < QFontDatabase::WritingSystemsCount; ++i)
+        supportedWritingSystems.setSupported((QFontDatabase::WritingSystem)i, true);
+    QString foundry_name = "CoreText";
+    const int numFonts = CFArrayGetCount(fonts);
+    for(int i = 0; i < numFonts; ++i) {
+        CTFontDescriptorRef font = (CTFontDescriptorRef)CFArrayGetValueAtIndex(fonts, i);
+
+        QCFString family_name = (CFStringRef)CTFontDescriptorCopyAttribute(font, kCTFontFamilyNameAttribute);
+//        QCFString style_name = (CFStringRef)CTFontDescriptorCopyAttribute(font, kCTFontStyleNameAttribute);
+
+        QFont::Weight fontWeight = QFont::Normal;
+        QFont::Style fontStyle = QFont::StyleNormal;
+        if(QCFType<CFDictionaryRef> styles = (CFDictionaryRef)CTFontDescriptorCopyAttribute(font, kCTFontTraitsAttribute)) {
+            if(CFNumberRef weight = (CFNumberRef)CFDictionaryGetValue(styles, kCTFontWeightTrait)) {
+                Q_ASSERT(CFNumberIsFloatType(weight));
+                double d;
+                if(CFNumberGetValue(weight, kCFNumberDoubleType, &d)) {
+                    if (d > 0.0)
+                        fontWeight = QFont::Bold;
+                }
+            }
+            if(CFNumberRef italic = (CFNumberRef)CFDictionaryGetValue(styles, kCTFontSlantTrait)) {
+                Q_ASSERT(CFNumberIsFloatType(italic));
+                double d;
+                if(CFNumberGetValue(italic, kCFNumberDoubleType, &d)) {
+                    if (d > 0.0)
+                        fontStyle = QFont::StyleItalic;
+                }
+            }
+        }
+
+        int pixelSize = 0;
+        if(QCFType<CFNumberRef> size = (CFNumberRef)CTFontDescriptorCopyAttribute(font, kCTFontSizeAttribute)) {
+            if(CFNumberIsFloatType(size)) {
+                double d;
+                CFNumberGetValue(size, kCFNumberDoubleType, &d);
+                pixelSize = d;
+            } else {
+                CFNumberGetValue(size, kCFNumberIntType, &pixelSize);
+            }
+        }
+        registerFont(QString(family_name),
+                     foundry_name,
+                     fontWeight,
+                     fontStyle,
+                     QFont::Unstretched,
+                     true,
+                     true,
+                     pixelSize,
+                     supportedWritingSystems,
+                     0);
+    }
+}
+
+QFontEngine *QCoreTextFontDatabase::fontEngine(const QFontDef &fontDef, QUnicodeTables::Script script, void *handle)
+{
+    Q_UNUSED(script)
+    Q_UNUSED(handle)
+    CTFontSymbolicTraits symbolicTraits = 0;
+    if (fontDef.weight >= QFont::Bold)
+        symbolicTraits |= kCTFontBoldTrait;
+    switch (fontDef.style) {
+    case QFont::StyleNormal:
+        break;
+    case QFont::StyleItalic:
+    case QFont::StyleOblique:
+        symbolicTraits |= kCTFontItalicTrait;
+        break;
+    }
+
+    CGAffineTransform transform = CGAffineTransformIdentity;
+    if (fontDef.stretch != 100) {
+        transform = CGAffineTransformMakeScale(float(fontDef.stretch) / float(100), 1);
+    }
+
+    QCFType<CTFontRef> baseFont = CTFontCreateWithName(QCFString(fontDef.family), fontDef.pixelSize, &transform);
+    QCFType<CTFontRef> ctFont = NULL;
+    // There is a side effect in Core Text: if we apply 0 as symbolic traits to a font in normal weight,
+    // we will get the light version of that font (while the way supposed to work doesn't:
+    // setting kCTFontWeightTrait to some value between -1.0 to 0.0 has no effect on font selection)
+    if (fontDef.weight != QFont::Normal || symbolicTraits)
+        ctFont = CTFontCreateCopyWithSymbolicTraits(baseFont, fontDef.pixelSize, &transform, symbolicTraits, symbolicTraits);
+
+    // CTFontCreateCopyWithSymbolicTraits returns NULL if we ask for a trait that does
+    // not exist for the given font. (for example italic)
+    if (ctFont == 0) {
+        ctFont = baseFont;
+    }
+
+    if (ctFont)
+        return new QCoreTextFontEngine(ctFont, fontDef);
+    return 0;
+}
+
+QT_END_NAMESPACE
diff --git a/src/plugins/platforms/uikit/qcoretextfontdatabase.h b/src/plugins/platforms/uikit/qcoretextfontdatabase.h
new file mode 100644
index 0000000..f4fcb20
--- /dev/null
+++ b/src/plugins/platforms/uikit/qcoretextfontdatabase.h
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** 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 plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** 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.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QCORETEXTFONTDATABASE_H
+#define QCORETEXTFONTDATABASE_H
+
+#include <QtGui/QPlatformFontDatabase>
+
+QT_BEGIN_NAMESPACE
+
+class QCoreTextFontDatabase : public QPlatformFontDatabase
+{
+public:
+    void populateFontDatabase();
+    QFontEngine *fontEngine(const QFontDef &fontDef, QUnicodeTables::Script script, void *handle);
+};
+
+QT_END_NAMESPACE
+
+#endif // QCORETEXTFONTDATABASE_H
diff --git a/src/plugins/platforms/uikit/quikiteventloop.mm b/src/plugins/platforms/uikit/quikiteventloop.mm
index 7df7ec8..152a34a 100644
--- a/src/plugins/platforms/uikit/quikiteventloop.mm
+++ b/src/plugins/platforms/uikit/quikiteventloop.mm
@@ -67,7 +67,6 @@
 
 - (id)initWithEventLoopIntegration:(QUIKitEventLoop *)integration;
 
-- (void)processEvents;
 - (void)processEventsAndSchedule;
 
 @end
@@ -160,17 +159,11 @@
     return self;
 }
 
-- (void)processEvents
-{
-    QPlatformEventLoopIntegration::processEvents();
-}
-
 - (void)processEventsAndSchedule
 {
     QPlatformEventLoopIntegration::processEvents();
-    qint64 nextTime = qMin((qint64)33, mIntegration->nextTimerEvent()); // at least 30fps
     NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-    NSDate *nextDate = [[NSDate date] dateByAddingTimeInterval:((double)nextTime/1000)];
+    NSDate *nextDate = [[NSDate date] dateByAddingTimeInterval:((double)mIntegration->nextTimerEvent()/1000.)];
     [mIntegration->mTimer setFireDate:nextDate];
     [pool release];
 }
@@ -211,7 +204,7 @@ void QUIKitEventLoop::quitEventLoop()
 
 void QUIKitEventLoop::qtNeedsToProcessEvents()
 {
-    [mHelper performSelectorOnMainThread:@selector(processEvents) withObject:nil waitUntilDone:NO];
+    [mHelper performSelectorOnMainThread:@selector(processEventsAndSchedule) withObject:nil waitUntilDone:NO];
 }
 
 static UIReturnKeyType keyTypeForObject(QObject *obj)
diff --git a/src/plugins/platforms/uikit/quikitintegration.mm b/src/plugins/platforms/uikit/quikitintegration.mm
index ca020c9..02da97c 100644
--- a/src/plugins/platforms/uikit/quikitintegration.mm
+++ b/src/plugins/platforms/uikit/quikitintegration.mm
@@ -44,7 +44,7 @@
 #include "quikitwindowsurface.h"
 #include "quikitscreen.h"
 #include "quikiteventloop.h"
-#include "qgenericunixfontdatabase.h"
+#include "qcoretextfontdatabase.h"
 
 #include <QtGui/QApplication>
 
@@ -56,16 +56,6 @@
 
 QT_BEGIN_NAMESPACE
 
-class QUIKitFontDatabase : public QGenericUnixFontDatabase
-{
-public:
-    virtual QString fontDir() const
-    {
-        return QString( [[[[NSBundle mainBundle] bundlePath]
-            stringByAppendingPathComponent:@"fonts"] UTF8String] );
-    }
-};
-
 static QUIKitIntegration *m_instance = 0;
 
 QUIKitIntegration * QUIKitIntegration::instance()
@@ -74,7 +64,7 @@ QUIKitIntegration * QUIKitIntegration::instance()
 }
 
 QUIKitIntegration::QUIKitIntegration()
-    :mFontDb(new QUIKitFontDatabase() )
+    :mFontDb(new QCoreTextFontDatabase)
 {
     if (!m_instance)
         m_instance = this;
diff --git a/src/plugins/platforms/uikit/quikitscreen.mm b/src/plugins/platforms/uikit/quikitscreen.mm
index d7d8207..6d24193 100644
--- a/src/plugins/platforms/uikit/quikitscreen.mm
+++ b/src/plugins/platforms/uikit/quikitscreen.mm
@@ -56,14 +56,13 @@ QUIKitScreen::QUIKitScreen(int screenIndex)
     CGRect bounds = [uiScreen() bounds];
     m_geometry = QRect(bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height);
 
-    m_format = QImage::Format_ARGB32;
+    m_format = QImage::Format_ARGB32_Premultiplied;
 
     m_depth = 24;
 
     const qreal inch = 25.4;
     qreal dpi = 160.;
     int dragDistance = 12;
-    int defaultFontPixelSize = 14;
     if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) {
         dpi = 132.;
         dragDistance = 10;
@@ -71,8 +70,8 @@ QUIKitScreen::QUIKitScreen(int screenIndex)
     m_physicalSize = QSize(qRound(bounds.size.width * inch / dpi), qRound(bounds.size.height * inch / dpi));
     qApp->setStartDragDistance(dragDistance);
 
-    QFont font(QLatin1String("Bitstream Vera Sans"));
-    font.setPixelSize(defaultFontPixelSize);
+    QFont font; // system font is helvetica, so that is fine already
+    font.setPixelSize([UIFont systemFontSize]);
     qApp->setFont(font);
 
     [pool release];
diff --git a/src/plugins/platforms/uikit/quikitwindow.mm b/src/plugins/platforms/uikit/quikitwindow.mm
index 6e018fe..640b92e 100644
--- a/src/plugins/platforms/uikit/quikitwindow.mm
+++ b/src/plugins/platforms/uikit/quikitwindow.mm
@@ -53,6 +53,23 @@
 
 #include <QtDebug>
 
+static GLint stencilBits()
+{
+    static GLint bits;
+    static bool initialized = false;
+    if (!initialized) {
+        glGetIntegerv(GL_STENCIL_BITS, &bits);
+        initialized = true;
+    }
+    return bits;
+}
+
+static GLint depthBits()
+{
+    // we can choose between GL_DEPTH24_STENCIL8_OES and GL_DEPTH_COMPONENT16
+    return stencilBits() > 0 ? 24 : 16;
+}
+
 class EAGLPlatformContext : public QPlatformGLContext
 {
 public:
@@ -60,13 +77,13 @@ public:
         : mView(view)
     {
         mFormat.setWindowApi(QPlatformWindowFormat::OpenGL);
-        mFormat.setDepthBufferSize(24);
+        mFormat.setDepthBufferSize(depthBits());
         mFormat.setAccumBufferSize(0);
         mFormat.setRedBufferSize(8);
         mFormat.setGreenBufferSize(8);
         mFormat.setBlueBufferSize(8);
         mFormat.setAlphaBufferSize(8);
-        mFormat.setStencilBufferSize(8);
+        mFormat.setStencilBufferSize(stencilBits());
         mFormat.setSamples(0);
         mFormat.setSampleBuffers(false);
         mFormat.setDoubleBuffer(true);
@@ -74,7 +91,7 @@ public:
         mFormat.setRgba(true);
         mFormat.setAlpha(true);
         mFormat.setAccum(false);
-        mFormat.setStencil(true);
+        mFormat.setStencil(stencilBits() > 0);
         mFormat.setStereo(false);
         mFormat.setDirectRendering(false);
 
@@ -203,9 +220,13 @@ private:
 
         glGenRenderbuffers(1, &mDepthRenderbuffer);
         glBindRenderbuffer(GL_RENDERBUFFER, mDepthRenderbuffer);
-        glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8_OES, mFramebufferWidth, mFramebufferHeight);
+        if (stencilBits() > 0) {
+            glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH24_STENCIL8_OES, mFramebufferWidth, mFramebufferHeight);
+            glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, mDepthRenderbuffer);
+        } else {
+            glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, mFramebufferWidth, mFramebufferHeight);
+        }
         glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, mDepthRenderbuffer);
-        glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, GL_RENDERBUFFER, mDepthRenderbuffer);
 
         if (glCheckFramebufferStatus(GL_FRAMEBUFFER) != GL_FRAMEBUFFER_COMPLETE)
             NSLog(@"Failed to make complete framebuffer object %x", glCheckFramebufferStatus(GL_FRAMEBUFFER));
diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro
index 5b20a87..cbd67ea 100644
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@ -33,7 +33,7 @@ INCLUDEPATH += $$QMAKE_INCDIR_WAYLAND
 LIBS += $$QMAKE_LIBS_WAYLAND
 QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_WAYLAND
 
-!isEmpty(QMAKE_LFLAGS_RPATH) {
+!isEmpty(QMAKE_LFLAGS_RPATH):!contains(QT_CONFIG, no-pkg-config) {
     WAYLAND_NEEDS_RPATH = $$system(pkg-config --libs-only-L wayland-client)
     !isEmpty(WAYLAND_NEEDS_RPATH) {
         !isEmpty(QMAKE_LIBDIR_WAYLAND):QMAKE_LFLAGS += $${QMAKE_LFLAGS_RPATH}$${QMAKE_LIBDIR_WAYLAND}
diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
index 0d233e6..382217a 100644
--- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
+++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
@@ -4,6 +4,8 @@ TEMPLATE = subdirs
 # We just want to export the sqlite3 binaries for Symbian for platforms that do not have them.
 symbian-abld|symbian-sbsv2 {
     !symbian_no_export_sqlite:!exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso) {
-        BLD_INF_RULES.prj_exports +=  ":zip SQLite3_v9.2.zip"
+        # Symbian exports do not like drive letter, so remove it from the source dir
+        SQLITE_SRC_DIR = $$relativeProPath()
+        BLD_INF_RULES.prj_exports +=  ":zip $$SQLITE_SRC_DIR/SQLite3_v9.2.zip"
     }
 }
diff --git a/src/qbase.pri b/src/qbase.pri
index c4d081f..632d7f4 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -110,6 +110,9 @@ symbian {
     # workaround for the fact that some of our required includes in Symbian^3
     # now depend upon files in epoc32/include/platform
     INCLUDEPATH += $$OS_LAYER_SYSTEMINCLUDE
+
+    # All relevant files are marked as SMP safe for the Symbian port
+    MMP_RULES*=SMPSAFE
 }
 win32-borland:INCLUDEPATH += kernel
 
diff --git a/src/qt3support/itemviews/q3listbox.cpp b/src/qt3support/itemviews/q3listbox.cpp
index 796a3b8..f1574df 100644
--- a/src/qt3support/itemviews/q3listbox.cpp
+++ b/src/qt3support/itemviews/q3listbox.cpp
@@ -3531,9 +3531,9 @@ void Q3ListBox::refreshSlot()
     int col = columnAt(x);
     int row = rowAt(y);
     int top = row;
-    while(col < (int)d->columnPos.size()-1 && d->columnPos[col+1] < x)
+    while(col+1 < (int)d->columnPos.size() && d->columnPos[col+1] < x)
         col++;
-    while(top < (int)d->rowPos.size()-1 && d->rowPos[top+1] < y)
+    while(top+1 < (int)d->rowPos.size() && d->rowPos[top+1] < y)
         top++;
     Q3ListBoxItem * i = item(col * numRows() + row);
 
@@ -3684,7 +3684,7 @@ int Q3ListBox::columnAt(int x) const
         return numColumns() - 1;
 
     int col = 0;
-    while(col < (int)d->columnPos.size()-1 && d->columnPos[col+1] < x)
+    while(col+1 < (int)d->columnPos.size() && d->columnPos[col+1] < x)
         col++;
     return col;
 }
diff --git a/src/qt3support/network/q3socketdevice_win.cpp b/src/qt3support/network/q3socketdevice_win.cpp
index df115d7..bde63a0 100644
--- a/src/qt3support/network/q3socketdevice_win.cpp
+++ b/src/qt3support/network/q3socketdevice_win.cpp
@@ -83,8 +83,13 @@ typedef struct {
     struct  qt_in6_addr sin6_addr;  /* IPv6 address */
     u_long  sin6_scope_id;          /* set of interfaces for a scope */
 } qt_sockaddr_in6;
+
+QT_END_NAMESPACE
+
 #endif
 
+QT_BEGIN_NAMESPACE
+
 #ifndef AF_INET6
 #define AF_INET6        23              /* Internetwork Version 6 */
 #endif
diff --git a/src/qt3support/sql/q3datatable.cpp b/src/qt3support/sql/q3datatable.cpp
index 39ef1d9..35e9fda 100644
--- a/src/qt3support/sql/q3datatable.cpp
+++ b/src/qt3support/sql/q3datatable.cpp
@@ -710,7 +710,7 @@ bool Q3DataTable::eventFilter( QObject *o, QEvent *e )
 	    return true;
 	}
 	if ( d->dat.mode() != QSql::None ) {
-	    if ( (ke->key() == Qt::Key_Tab) && (c < numCols() - 1) && (!isColumnReadOnly( c+1 ) || d->dat.mode() == QSql::Insert) )
+	    if ( (ke->key() == Qt::Key_Tab) && (c+1 < numCols()) && (!isColumnReadOnly( c+1 ) || d->dat.mode() == QSql::Insert) )
 		d->continuousEdit = true;
 	    else if ( (ke->key() == Qt::Key_BackTab) && (c > 0) && (!isColumnReadOnly( c-1 ) || d->dat.mode() == QSql::Insert) )
 		d->continuousEdit = true;
diff --git a/src/qt3support/text/q3richtext.cpp b/src/qt3support/text/q3richtext.cpp
index dc1476c..c367c0c 100644
--- a/src/qt3support/text/q3richtext.cpp
+++ b/src/qt3support/text/q3richtext.cpp
@@ -121,7 +121,7 @@ static inline bool isBreakable(Q3TextString *string, int pos)
 {
     if (string->at(pos).nobreak)
         return false;
-    return (pos < string->length()-1 && string->at(pos+1).softBreak);
+    return (pos+1 < string->length() && string->at(pos+1).softBreak);
 }
 
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def
index ff29c0a..be09295 100644
--- a/src/s60installs/bwins/QtCoreu.def
+++ b/src/s60installs/bwins/QtCoreu.def
@@ -4489,397 +4489,394 @@ EXPORTS
 	?symbianCommandLine@QCoreApplicationPrivate@@SAPAVCApaCommandLine@@XZ @ 4488 NONAME ; class CApaCommandLine * QCoreApplicationPrivate::symbianCommandLine(void)
 	?revision@QMetaProperty@@QBEHXZ @ 4489 NONAME ; int QMetaProperty::revision(void) const
 	?revision@QMetaMethod@@QBEHXZ @ 4490 NONAME ; int QMetaMethod::revision(void) const
-	?indexOf@QStringRef@@QBEHABV1@HW4CaseSensitivity@Qt@@@Z @ 4491 NONAME ; int QStringRef::indexOf(class QStringRef const &, int, enum Qt::CaseSensitivity) const
-	?count@QString@@QBEHABVQStringRef@@W4CaseSensitivity@Qt@@@Z @ 4492 NONAME ; int QString::count(class QStringRef const &, enum Qt::CaseSensitivity) const
-	?swap@QString@@QAEXAAV1@@Z @ 4493 NONAME ; void QString::swap(class QString &)
-	?trUtf8@QAnimationDriver@@SA?AVQString@@PBD0H@Z @ 4494 NONAME ; class QString QAnimationDriver::trUtf8(char const *, char const *, int)
-	?startsWith@QStringRef@@QBE_NVQChar@@W4CaseSensitivity@Qt@@@Z @ 4495 NONAME ; bool QStringRef::startsWith(class QChar, enum Qt::CaseSensitivity) const
-	?setNativeKey@QSharedMemory@@QAEXABVQString@@@Z @ 4496 NONAME ; void QSharedMemory::setNativeKey(class QString const &)
-	??0QAnimationDriver@@IAE@AAVQAnimationDriverPrivate@@PAVQObject@@@Z @ 4497 NONAME ; QAnimationDriver::QAnimationDriver(class QAnimationDriverPrivate &, class QObject *)
-	?timerEvent@QUnifiedTimer@@MAEXPAVQTimerEvent@@@Z @ 4498 NONAME ; void QUnifiedTimer::timerEvent(class QTimerEvent *)
-	?registerAnimation@QUnifiedTimer@@SAXPAVQAbstractAnimation@@_N@Z @ 4499 NONAME ; void QUnifiedTimer::registerAnimation(class QAbstractAnimation *, bool)
-	?startsWith@QStringRef@@QBE_NABV1@W4CaseSensitivity@Qt@@@Z @ 4500 NONAME ; bool QStringRef::startsWith(class QStringRef const &, enum Qt::CaseSensitivity) const
-	?contains@QStringRef@@QBE?AVQBool@@ABV1@W4CaseSensitivity@Qt@@@Z @ 4501 NONAME ; class QBool QStringRef::contains(class QStringRef const &, enum Qt::CaseSensitivity) const
-	?startsWith@QStringRef@@QBE_NVQLatin1String@@W4CaseSensitivity@Qt@@@Z @ 4502 NONAME ; bool QStringRef::startsWith(class QLatin1String, enum Qt::CaseSensitivity) const
-	?cast@QMetaObject@@QBEPBVQObject@@PBV2@@Z @ 4503 NONAME ; class QObject const * QMetaObject::cast(class QObject const *) const
-	?ensureTimerUpdate@QUnifiedTimer@@SAXXZ @ 4504 NONAME ; void QUnifiedTimer::ensureTimerUpdate(void)
-	?contains@QStringRef@@QBE?AVQBool@@VQLatin1String@@W4CaseSensitivity@Qt@@@Z @ 4505 NONAME ; class QBool QStringRef::contains(class QLatin1String, enum Qt::CaseSensitivity) const
-	?d_func@QAnimationDriver@@ABEPBVQAnimationDriverPrivate@@XZ @ 4506 NONAME ; class QAnimationDriverPrivate const * QAnimationDriver::d_func(void) const
-	?swap@QVariant@@QAEXAAV1@@Z @ 4507 NONAME ; void QVariant::swap(class QVariant &)
-	?lastIndexOf@QStringRef@@QBEHABV1@HW4CaseSensitivity@Qt@@@Z @ 4508 NONAME ; int QStringRef::lastIndexOf(class QStringRef const &, int, enum Qt::CaseSensitivity) const
-	?indexOf@QStringRef@@QBEHVQLatin1String@@HW4CaseSensitivity@Qt@@@Z @ 4509 NONAME ; int QStringRef::indexOf(class QLatin1String, int, enum Qt::CaseSensitivity) const
-	?senderSignalIndex@QObject@@IBEHXZ @ 4510 NONAME ; int QObject::senderSignalIndex(void) const
-	?toUtf8@QStringRef@@QBE?AVQByteArray@@XZ @ 4511 NONAME ; class QByteArray QStringRef::toUtf8(void) const
-	?startsWith@QString@@QBE_NABVQStringRef@@W4CaseSensitivity@Qt@@@Z @ 4512 NONAME ; bool QString::startsWith(class QStringRef const &, enum Qt::CaseSensitivity) const
-	?unlockInternal@QMutex@@AAEXXZ @ 4513 NONAME ; void QMutex::unlockInternal(void)
-	?updateAnimationsTime@QUnifiedTimer@@QAEXXZ @ 4514 NONAME ; void QUnifiedTimer::updateAnimationsTime(void)
-	?swap@QBitArray@@QAEXAAV1@@Z @ 4515 NONAME ; void QBitArray::swap(class QBitArray &)
-	?nativeKey@QSharedMemory@@QBE?AVQString@@XZ @ 4516 NONAME ; class QString QSharedMemory::nativeKey(void) const
-	?connect@QObject@@SA_NPBV1@ABVQMetaMethod@@01W4ConnectionType@Qt@@@Z @ 4517 NONAME ; bool QObject::connect(class QObject const *, class QMetaMethod const &, class QObject const *, class QMetaMethod const &, enum Qt::ConnectionType)
-	?registerRunningAnimation@QUnifiedTimer@@AAEXPAVQAbstractAnimation@@@Z @ 4518 NONAME ; void QUnifiedTimer::registerRunningAnimation(class QAbstractAnimation *)
-	?disconnect@QObject@@SA_NPBV1@ABVQMetaMethod@@01@Z @ 4519 NONAME ; bool QObject::disconnect(class QObject const *, class QMetaMethod const &, class QObject const *, class QMetaMethod const &)
-	?installAnimationDriver@QUnifiedTimer@@QAEXPAVQAnimationDriver@@@Z @ 4520 NONAME ; void QUnifiedTimer::installAnimationDriver(class QAnimationDriver *)
-	?startsWith@QStringRef@@QBE_NABVQString@@W4CaseSensitivity@Qt@@@Z @ 4521 NONAME ; bool QStringRef::startsWith(class QString const &, enum Qt::CaseSensitivity) const
-	?contains@QStringRef@@QBE?AVQBool@@VQChar@@W4CaseSensitivity@Qt@@@Z @ 4522 NONAME ; class QBool QStringRef::contains(class QChar, enum Qt::CaseSensitivity) const
-	?unregisterAnimation@QUnifiedTimer@@SAXPAVQAbstractAnimation@@@Z @ 4523 NONAME ; void QUnifiedTimer::unregisterAnimation(class QAbstractAnimation *)
-	?qt_metacast@QAnimationDriver@@UAEPAXPBD@Z @ 4524 NONAME ; void * QAnimationDriver::qt_metacast(char const *)
-	?count@QStringRef@@QBEHABVQString@@W4CaseSensitivity@Qt@@@Z @ 4525 NONAME ; int QStringRef::count(class QString const &, enum Qt::CaseSensitivity) const
-	?endsWith@QStringRef@@QBE_NVQChar@@W4CaseSensitivity@Qt@@@Z @ 4526 NONAME ; bool QStringRef::endsWith(class QChar, enum Qt::CaseSensitivity) const
-	??0QUnifiedTimer@@AAE@XZ @ 4527 NONAME ; QUnifiedTimer::QUnifiedTimer(void)
-	??0QCoreApplicationPrivate@@QAE@AAHPAPADI@Z @ 4528 NONAME ; QCoreApplicationPrivate::QCoreApplicationPrivate(int &, char * *, unsigned int)
-	??0QCoreApplication@@QAE@AAHPAPADH@Z @ 4529 NONAME ; QCoreApplication::QCoreApplication(int &, char * *, int)
-	??0QAnimationDriver@@QAE@PAVQObject@@@Z @ 4530 NONAME ; QAnimationDriver::QAnimationDriver(class QObject *)
-	?lastIndexOf@QStringRef@@QBEHVQLatin1String@@HW4CaseSensitivity@Qt@@@Z @ 4531 NONAME ; int QStringRef::lastIndexOf(class QLatin1String, int, enum Qt::CaseSensitivity) const
-	??0QAnimationDriverPrivate@@QAE@XZ @ 4532 NONAME ; QAnimationDriverPrivate::QAnimationDriverPrivate(void)
-	?endsWith@QString@@QBE_NABVQStringRef@@W4CaseSensitivity@Qt@@@Z @ 4533 NONAME ; bool QString::endsWith(class QStringRef const &, enum Qt::CaseSensitivity) const
-	?trUtf8@QAnimationDriver@@SA?AVQString@@PBD0@Z @ 4534 NONAME ; class QString QAnimationDriver::trUtf8(char const *, char const *)
-	?install@QAnimationDriver@@QAEXXZ @ 4535 NONAME ; void QAnimationDriver::install(void)
-	?qt_metacall@QAnimationDriver@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 4536 NONAME ; int QAnimationDriver::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?endsWith@QStringRef@@QBE_NABVQString@@W4CaseSensitivity@Qt@@@Z @ 4537 NONAME ; bool QStringRef::endsWith(class QString const &, enum Qt::CaseSensitivity) const
-	?lockInline@QMutex@@QAEXXZ @ 4538 NONAME ; void QMutex::lockInline(void)
-	?endsWith@QStringRef@@QBE_NABV1@W4CaseSensitivity@Qt@@@Z @ 4539 NONAME ; bool QStringRef::endsWith(class QStringRef const &, enum Qt::CaseSensitivity) const
-	??_EQUnifiedTimer@@UAE@I@Z @ 4540 NONAME ; QUnifiedTimer::~QUnifiedTimer(unsigned int)
-	?setTimingInterval@QUnifiedTimer@@QAEXH@Z @ 4541 NONAME ; void QUnifiedTimer::setTimingInterval(int)
-	?closestPauseAnimationTimeToFinish@QUnifiedTimer@@AAEHXZ @ 4542 NONAME ; int QUnifiedTimer::closestPauseAnimationTimeToFinish(void)
-	??0QXmlStreamAttributes@@QAE@XZ @ 4543 NONAME ; QXmlStreamAttributes::QXmlStreamAttributes(void)
-	?lastIndexOf@QString@@QBEHABVQStringRef@@HW4CaseSensitivity@Qt@@@Z @ 4544 NONAME ; int QString::lastIndexOf(class QStringRef const &, int, enum Qt::CaseSensitivity) const
-	??1QAnimationDriverPrivate@@UAE@XZ @ 4545 NONAME ; QAnimationDriverPrivate::~QAnimationDriverPrivate(void)
-	?swap@QUrl@@QAEXAAV1@@Z @ 4546 NONAME ; void QUrl::swap(class QUrl &)
-	??_EQAnimationDriverPrivate@@UAE@I@Z @ 4547 NONAME ; QAnimationDriverPrivate::~QAnimationDriverPrivate(unsigned int)
-	??_EQAnimationDriver@@UAE@I@Z @ 4548 NONAME ; QAnimationDriver::~QAnimationDriver(unsigned int)
-	?instance@QUnifiedTimer@@SAPAV1@_N@Z @ 4549 NONAME ; class QUnifiedTimer * QUnifiedTimer::instance(bool)
-	?setSlowdownFactor@QUnifiedTimer@@QAEXM@Z @ 4550 NONAME ; void QUnifiedTimer::setSlowdownFactor(float)
-	?isRunning@QAnimationDriver@@QBE_NXZ @ 4551 NONAME ; bool QAnimationDriver::isRunning(void) const
-	?count@QStringRef@@QBEHABV1@W4CaseSensitivity@Qt@@@Z @ 4552 NONAME ; int QStringRef::count(class QStringRef const &, enum Qt::CaseSensitivity) const
-	?contains@QStringRef@@QBE?AVQBool@@ABVQString@@W4CaseSensitivity@Qt@@@Z @ 4553 NONAME ; class QBool QStringRef::contains(class QString const &, enum Qt::CaseSensitivity) const
-	?tryLockInline@QMutex@@QAE_NXZ @ 4554 NONAME ; bool QMutex::tryLockInline(void)
-	?lastIndexOf@QStringRef@@QBEHABVQString@@HW4CaseSensitivity@Qt@@@Z @ 4555 NONAME ; int QStringRef::lastIndexOf(class QString const &, int, enum Qt::CaseSensitivity) const
-	?lockInternal@QMutex@@AAEXXZ @ 4556 NONAME ; void QMutex::lockInternal(void)
-	?toLocal8Bit@QStringRef@@QBE?AVQByteArray@@XZ @ 4557 NONAME ; class QByteArray QStringRef::toLocal8Bit(void) const
-	?indexOf@QStringRef@@QBEHVQChar@@HW4CaseSensitivity@Qt@@@Z @ 4558 NONAME ; int QStringRef::indexOf(class QChar, int, enum Qt::CaseSensitivity) const
-	?toUcs4@QStringRef@@QBE?AV?$QVector@I@@XZ @ 4559 NONAME ; class QVector<unsigned int> QStringRef::toUcs4(void) const
-	?staticMetaObject@QAnimationDriver@@2UQMetaObject@@B @ 4560 NONAME ; struct QMetaObject const QAnimationDriver::staticMetaObject
-	?unregisterRunningAnimation@QUnifiedTimer@@AAEXPAVQAbstractAnimation@@@Z @ 4561 NONAME ; void QUnifiedTimer::unregisterRunningAnimation(class QAbstractAnimation *)
-	?isLocalFile@QUrl@@QBE_NXZ @ 4562 NONAME ; bool QUrl::isLocalFile(void) const
-	?swap@QByteArray@@QAEXAAV1@@Z @ 4563 NONAME ; void QByteArray::swap(class QByteArray &)
-	?tr@QAnimationDriver@@SA?AVQString@@PBD0H@Z @ 4564 NONAME ; class QString QAnimationDriver::tr(char const *, char const *, int)
-	?toLatin1@QStringRef@@QBE?AVQByteArray@@XZ @ 4565 NONAME ; class QByteArray QStringRef::toLatin1(void) const
-	??1QAnimationDriver@@UAE@XZ @ 4566 NONAME ; QAnimationDriver::~QAnimationDriver(void)
-	?tr@QAnimationDriver@@SA?AVQString@@PBD0@Z @ 4567 NONAME ; class QString QAnimationDriver::tr(char const *, char const *)
-	?waitForDone@QThreadPool@@QAE_NH@Z @ 4568 NONAME ; bool QThreadPool::waitForDone(int)
-	?endsWith@QStringRef@@QBE_NVQLatin1String@@W4CaseSensitivity@Qt@@@Z @ 4569 NONAME ; bool QStringRef::endsWith(class QLatin1String, enum Qt::CaseSensitivity) const
-	?stop@QAnimationDriver@@AAEXXZ @ 4570 NONAME ; void QAnimationDriver::stop(void)
-	?getStaticMetaObject@QAnimationDriver@@SAABUQMetaObject@@XZ @ 4571 NONAME ; struct QMetaObject const & QAnimationDriver::getStaticMetaObject(void)
-	?metaObject@QAnimationDriver@@UBEPBUQMetaObject@@XZ @ 4572 NONAME ; struct QMetaObject const * QAnimationDriver::metaObject(void) const
-	?d_func@QAnimationDriver@@AAEPAVQAnimationDriverPrivate@@XZ @ 4573 NONAME ; class QAnimationDriverPrivate * QAnimationDriver::d_func(void)
-	?app_compile_version@QCoreApplicationPrivate@@2HA @ 4574 NONAME ; int QCoreApplicationPrivate::app_compile_version
-	?restartAnimationTimer@QUnifiedTimer@@QAEXXZ @ 4575 NONAME ; void QUnifiedTimer::restartAnimationTimer(void)
-	?count@QStringRef@@QBEHVQChar@@W4CaseSensitivity@Qt@@@Z @ 4576 NONAME ; int QStringRef::count(class QChar, enum Qt::CaseSensitivity) const
-	?toAscii@QStringRef@@QBE?AVQByteArray@@XZ @ 4577 NONAME ; class QByteArray QStringRef::toAscii(void) const
-	?setConsistentTiming@QUnifiedTimer@@QAEX_N@Z @ 4578 NONAME ; void QUnifiedTimer::setConsistentTiming(bool)
-	??1QUnifiedTimer@@UAE@XZ @ 4579 NONAME ; QUnifiedTimer::~QUnifiedTimer(void)
-	?setSlowModeEnabled@QUnifiedTimer@@QAEX_N@Z @ 4580 NONAME ; void QUnifiedTimer::setSlowModeEnabled(bool)
-	?updateAnimationTimer@QUnifiedTimer@@SAXXZ @ 4581 NONAME ; void QUnifiedTimer::updateAnimationTimer(void)
-	?indexOf@QString@@QBEHABVQStringRef@@HW4CaseSensitivity@Qt@@@Z @ 4582 NONAME ; int QString::indexOf(class QStringRef const &, int, enum Qt::CaseSensitivity) const
-	?lastIndexOf@QStringRef@@QBEHVQChar@@HW4CaseSensitivity@Qt@@@Z @ 4583 NONAME ; int QStringRef::lastIndexOf(class QChar, int, enum Qt::CaseSensitivity) const
-	?advance@QAnimationDriver@@QAEXXZ @ 4584 NONAME ; void QAnimationDriver::advance(void)
-	?start@QAnimationDriver@@AAEXXZ @ 4585 NONAME ; void QAnimationDriver::start(void)
-	?unlockInline@QMutex@@QAEXXZ @ 4586 NONAME ; void QMutex::unlockInline(void)
-	??0QSystemError@@QAE@HW4ErrorScope@0@@Z @ 4587 NONAME ; QSystemError::QSystemError(int, enum QSystemError::ErrorScope)
-	??0QSystemError@@QAE@XZ @ 4588 NONAME ; QSystemError::QSystemError(void)
-	?error@QSystemError@@QAEHXZ @ 4589 NONAME ; int QSystemError::error(void)
-	?scope@QSystemError@@QAE?AW4ErrorScope@1@XZ @ 4590 NONAME ; enum QSystemError::ErrorScope QSystemError::scope(void)
-	?toString@QSystemError@@QAE?AVQString@@XZ @ 4591 NONAME ; class QString QSystemError::toString(void)
-	??0QFileInfo@@QAE@PAVQFileInfoPrivate@@@Z @ 4592 NONAME ; QFileInfo::QFileInfo(class QFileInfoPrivate *)
-	?currentUnicodeVersion@QChar@@SA?AW4UnicodeVersion@1@XZ @ 4593 NONAME ; enum QChar::UnicodeVersion QChar::currentUnicodeVersion(void)
-	?open@QFSFileEngine@@QAE_NV?$QFlags@W4OpenModeFlag@QIODevice@@@@ABVRFile@@V?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4594 NONAME ; bool QFSFileEngine::open(class QFlags<enum QIODevice::OpenModeFlag>, class RFile const &, class QFlags<enum QFile::FileHandleFlag>)
-	?open@QFSFileEngine@@QAE_NV?$QFlags@W4OpenModeFlag@QIODevice@@@@HV?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4595 NONAME ; bool QFSFileEngine::open(class QFlags<enum QIODevice::OpenModeFlag>, int, class QFlags<enum QFile::FileHandleFlag>)
-	?open@QFSFileEngine@@QAE_NV?$QFlags@W4OpenModeFlag@QIODevice@@@@PAU__sFILE@@V?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4596 NONAME ; bool QFSFileEngine::open(class QFlags<enum QIODevice::OpenModeFlag>, struct __sFILE *, class QFlags<enum QFile::FileHandleFlag>)
-	?open@QFile@@QAE_NABVRFile@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@V?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4597 NONAME ; bool QFile::open(class RFile const &, class QFlags<enum QIODevice::OpenModeFlag>, class QFlags<enum QFile::FileHandleFlag>)
-	?open@QFile@@QAE_NHV?$QFlags@W4OpenModeFlag@QIODevice@@@@V?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4598 NONAME ; bool QFile::open(int, class QFlags<enum QIODevice::OpenModeFlag>, class QFlags<enum QFile::FileHandleFlag>)
-	?open@QFile@@QAE_NPAU__sFILE@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@V?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4599 NONAME ; bool QFile::open(struct __sFILE *, class QFlags<enum QIODevice::OpenModeFlag>, class QFlags<enum QFile::FileHandleFlag>)
-	?contains@QString@@QBE?AVQBool@@ABVQStringRef@@W4CaseSensitivity@Qt@@@Z @ 4600 NONAME ; class QBool QString::contains(class QStringRef const &, enum Qt::CaseSensitivity) const
-	?nsecsElapsed@QElapsedTimer@@QBE_JXZ @ 4601 NONAME ; long long QElapsedTimer::nsecsElapsed(void) const
-	??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
-	?swap@QRegExp@@QAEXAAV1@@Z @ 4605 NONAME ; void QRegExp::swap(class QRegExp &)
-	?indexOf@QStringRef@@QBEHABVQString@@HW4CaseSensitivity@Qt@@@Z @ 4606 NONAME ; int QStringRef::indexOf(class QString const &, int, enum Qt::CaseSensitivity) const
-	gzungetc @ 4607 NONAME
-	?addSocket@QSymbianSocketManager@@QAEHABVRSocket@@@Z @ 4608 NONAME ; int QSymbianSocketManager::addSocket(class RSocket const &)
-	??0QActiveObject@@QAE@HPAVQEventDispatcherSymbian@@@Z @ 4609 NONAME ; QActiveObject::QActiveObject(int, class QEventDispatcherSymbian *)
-	?setDefaultConnection@QSymbianSocketManager@@QAEXPAVRConnection@@@Z @ 4610 NONAME ; void QSymbianSocketManager::setDefaultConnection(class RConnection *)
-	?reactivateAndComplete@QActiveObject@@QAEXXZ @ 4611 NONAME ; void QActiveObject::reactivateAndComplete(void)
-	?defaultConnection@QSymbianSocketManager@@QBEPAVRConnection@@XZ @ 4612 NONAME ; class RConnection * QSymbianSocketManager::defaultConnection(void) const
-	?qt_symbianGetSocketServer@@YAAAVRSocketServ@@XZ @ 4613 NONAME ; class RSocketServ & qt_symbianGetSocketServer(void)
-	?maybeQueueForLater@QActiveObject@@QAE_NXZ @ 4614 NONAME ABSENT ; bool QActiveObject::maybeQueueForLater(void)
-	??_EQActiveObject@@UAE@I@Z @ 4615 NONAME ; QActiveObject::~QActiveObject(unsigned int)
-	?lookupSocket@QSymbianSocketManager@@QBE_NHAAVRSocket@@@Z @ 4616 NONAME ; bool QSymbianSocketManager::lookupSocket(int, class RSocket &) const
-	?wait@QActiveObject@@SA_NPAVCActive@@H@Z @ 4617 NONAME ABSENT ; bool QActiveObject::wait(class CActive *, int)
-	?instance@QSymbianSocketManager@@SAAAV1@XZ @ 4618 NONAME ; class QSymbianSocketManager & QSymbianSocketManager::instance(void)
-	??0QSymbianSocketManager@@QAE@XZ @ 4619 NONAME ; QSymbianSocketManager::QSymbianSocketManager(void)
-	?create@QNonContiguousByteDeviceFactory@@SAPAVQNonContiguousByteDevice@@V?$QSharedPointer@VQRingBuffer@@@@@Z @ 4620 NONAME ; class QNonContiguousByteDevice * QNonContiguousByteDeviceFactory::create(class QSharedPointer<class QRingBuffer>)
-	??1QSymbianSocketManager@@QAE@XZ @ 4621 NONAME ; QSymbianSocketManager::~QSymbianSocketManager(void)
-	?isResetDisabled@QNonContiguousByteDevice@@QAE_NXZ @ 4622 NONAME ; bool QNonContiguousByteDevice::isResetDisabled(void)
-	??1QActiveObject@@UAE@XZ @ 4623 NONAME ; QActiveObject::~QActiveObject(void)
-	?wait@QActiveObject@@SA_NV?$QList@PAVCActive@@@@H@Z @ 4624 NONAME ABSENT ; bool QActiveObject::wait(class QList<class CActive *>, int)
-	?maybeDeferSocketEvent@QActiveObject@@QAE_NXZ @ 4625 NONAME ; bool QActiveObject::maybeDeferSocketEvent(void)
-	?lookupSocket@QSymbianSocketManager@@QBEHABVRSocket@@@Z @ 4626 NONAME ; int QSymbianSocketManager::lookupSocket(class RSocket const &) const
-	?areSocketEventsBlocked@QEventDispatcherSymbian@@QBE_NXZ @ 4627 NONAME ; bool QEventDispatcherSymbian::areSocketEventsBlocked(void) const
-	?addDeferredSocketActiveObject@QEventDispatcherSymbian@@QAEXPAVQActiveObject@@@Z @ 4628 NONAME ; void QEventDispatcherSymbian::addDeferredSocketActiveObject(class QActiveObject *)
-	?getSocketServer@QSymbianSocketManager@@QAEAAVRSocketServ@@XZ @ 4629 NONAME ; class RSocketServ & QSymbianSocketManager::getSocketServer(void)
-	?removeSocket@QSymbianSocketManager@@QAE_NABVRSocket@@@Z @ 4630 NONAME ; bool QSymbianSocketManager::removeSocket(class RSocket const &)
-	?started@QAnimationDriver@@MAEXXZ @ 4631 NONAME ; void QAnimationDriver::started(void)
-	?stopped@QAnimationDriver@@MAEXXZ @ 4632 NONAME ; void QAnimationDriver::stopped(void)
-	?toCurrencyString@QLocale@@QBE?AVQString@@NABV2@@Z @ 4633 NONAME ; class QString QLocale::toCurrencyString(double, class QString const &) const
-	?quoteString@QLocale@@QBE?AVQString@@ABVQStringRef@@W4QuotationStyle@1@@Z @ 4634 NONAME ; class QString QLocale::quoteString(class QStringRef const &, enum QLocale::QuotationStyle) const
-	?toCurrencyString@QLocale@@QBE?AVQString@@FABV2@@Z @ 4635 NONAME ; class QString QLocale::toCurrencyString(short, class QString const &) const
-	?countryCode@QLocalePrivate@@QBE?AVQString@@XZ @ 4636 NONAME ; class QString QLocalePrivate::countryCode(void) const
-	?toCurrencyString@QLocale@@QBE?AVQString@@IABV2@@Z @ 4637 NONAME ; class QString QLocale::toCurrencyString(unsigned int, class QString const &) const
-	?longLongToString@QLocalePrivate@@SA?AVQString@@VQChar@@000_JHHHI@Z @ 4638 NONAME ; class QString QLocalePrivate::longLongToString(class QChar, class QChar, class QChar, class QChar, long long, int, int, int, unsigned int)
-	?codeToScript@QLocalePrivate@@SA?AW4Script@QLocale@@ABVQString@@@Z @ 4639 NONAME ; enum QLocale::Script QLocalePrivate::codeToScript(class QString const &)
-	?bcp47Name@QLocale@@QBE?AVQString@@XZ @ 4640 NONAME ; class QString QLocale::bcp47Name(void) const
-	?quoteString@QLocale@@QBE?AVQString@@ABV2@W4QuotationStyle@1@@Z @ 4641 NONAME ; class QString QLocale::quoteString(class QString const &, enum QLocale::QuotationStyle) const
-	?unsLongLongToString@QLocalePrivate@@SA?AVQString@@VQChar@@00_KHHHI@Z @ 4642 NONAME ; class QString QLocalePrivate::unsLongLongToString(class QChar, class QChar, class QChar, unsigned long long, int, int, int, unsigned int)
-	?toCurrencyString@QLocale@@QBE?AVQString@@_KABV2@@Z @ 4643 NONAME ; class QString QLocale::toCurrencyString(unsigned long long, class QString const &) const
-	?firstDayOfWeek@QLocale@@QBE?AW4DayOfWeek@Qt@@XZ @ 4644 NONAME ; enum Qt::DayOfWeek QLocale::firstDayOfWeek(void) const
-	?createSeparatedList@QLocale@@QBE?AVQString@@ABVQStringList@@@Z @ 4645 NONAME ; class QString QLocale::createSeparatedList(class QStringList const &) const
-	?codeToCountry@QLocalePrivate@@SA?AW4Country@QLocale@@ABVQString@@@Z @ 4646 NONAME ; enum QLocale::Country QLocalePrivate::codeToCountry(class QString const &)
-	?scriptCode@QLocalePrivate@@QBE?AVQString@@XZ @ 4647 NONAME ; class QString QLocalePrivate::scriptCode(void) const
-	?scriptToString@QLocale@@SA?AVQString@@W4Script@1@@Z @ 4648 NONAME ; class QString QLocale::scriptToString(enum QLocale::Script)
-	?script@QLocale@@QBE?AW4Script@1@XZ @ 4649 NONAME ; enum QLocale::Script QLocale::script(void) const
-	?codeToLanguage@QLocalePrivate@@SA?AW4Language@QLocale@@ABVQString@@@Z @ 4650 NONAME ; enum QLocale::Language QLocalePrivate::codeToLanguage(class QString const &)
-	?weekdays@QLocale@@QBE?AV?$QList@W4DayOfWeek@Qt@@@@XZ @ 4651 NONAME ; class QList<enum Qt::DayOfWeek> QLocale::weekdays(void) const
-	?getLangAndCountry@QLocalePrivate@@SAXABVQString@@AAW4Language@QLocale@@AAW4Script@4@AAW4Country@4@@Z @ 4652 NONAME ; void QLocalePrivate::getLangAndCountry(class QString const &, enum QLocale::Language &, enum QLocale::Script &, enum QLocale::Country &)
-	?bcp47Name@QLocalePrivate@@QBE?AVQString@@XZ @ 4653 NONAME ; class QString QLocalePrivate::bcp47Name(void) const
-	?toCurrencyString@QLocale@@QBE?AVQString@@HABV2@@Z @ 4654 NONAME ; class QString QLocale::toCurrencyString(int, class QString const &) const
-	?matchingLocales@QLocale@@SA?AVQStringList@@W4Language@1@W4Script@1@W4Country@1@@Z @ 4655 NONAME ABSENT ; class QStringList QLocale::matchingLocales(enum QLocale::Language, enum QLocale::Script, enum QLocale::Country)
-	?languageCode@QLocalePrivate@@QBE?AVQString@@XZ @ 4656 NONAME ; class QString QLocalePrivate::languageCode(void) const
-	?toCurrencyString@QLocale@@QBE?AVQString@@GABV2@@Z @ 4657 NONAME ; class QString QLocale::toCurrencyString(unsigned short, class QString const &) const
-	?doubleToString@QLocalePrivate@@SA?AVQString@@VQChar@@00000NHW4DoubleForm@1@HI@Z @ 4658 NONAME ; class QString QLocalePrivate::doubleToString(class QChar, class QChar, class QChar, class QChar, class QChar, class QChar, double, int, enum QLocalePrivate::DoubleForm, int, unsigned int)
-	?currencySymbol@QLocale@@QBE?AVQString@@W4CurrencySymbolFormat@1@@Z @ 4659 NONAME ; class QString QLocale::currencySymbol(enum QLocale::CurrencySymbolFormat) const
-	?uiLanguages@QLocale@@QBE?AVQStringList@@XZ @ 4660 NONAME ; class QStringList QLocale::uiLanguages(void) const
-	?findLocale@QLocalePrivate@@SAPBU1@W4Language@QLocale@@W4Script@3@W4Country@3@@Z @ 4661 NONAME ; struct QLocalePrivate const * QLocalePrivate::findLocale(enum QLocale::Language, enum QLocale::Script, enum QLocale::Country)
-	?load@QTranslator@@QAE_NABVQLocale@@ABVQString@@111@Z @ 4662 NONAME ; bool QTranslator::load(class QLocale const &, class QString const &, class QString const &, class QString const &, class QString const &)
-	??0QLocale@@QAE@W4Language@0@W4Script@0@W4Country@0@@Z @ 4663 NONAME ; QLocale::QLocale(enum QLocale::Language, enum QLocale::Script, enum QLocale::Country)
-	?languageId@QLocalePrivate@@QBEGXZ @ 4664 NONAME ; unsigned short QLocalePrivate::languageId(void) const
-	?countryId@QLocalePrivate@@QBEGXZ @ 4665 NONAME ; unsigned short QLocalePrivate::countryId(void) const
-	?toCurrencyString@QLocale@@QBE?AVQString@@_JABV2@@Z @ 4666 NONAME ; class QString QLocale::toCurrencyString(long long, class QString const &) const
-	?toCurrencyString@QLocale@@QBE?AVQString@@MABV2@@Z @ 4667 NONAME ; class QString QLocale::toCurrencyString(float, class QString const &) const
-	adler32_combine @ 4668 NONAME
-	adler32_combine64 @ 4669 NONAME
-	compressBound @ 4670 NONAME
-	crc32_combine @ 4671 NONAME
-	crc32_combine64 @ 4672 NONAME
-	deflateBound @ 4673 NONAME
-	deflatePrime @ 4674 NONAME
-	deflateSetHeader @ 4675 NONAME
-	deflateTune @ 4676 NONAME
-	gzbuffer @ 4677 NONAME
-	gzclearerr @ 4678 NONAME
-	gzclose_r @ 4679 NONAME
-	gzclose_w @ 4680 NONAME
-	gzdirect @ 4681 NONAME
-	gzoffset @ 4682 NONAME
-	gzoffset64 @ 4683 NONAME
-	gzopen64 @ 4684 NONAME
-	gzseek64 @ 4685 NONAME
-	gztell64 @ 4686 NONAME
-	inflateBack @ 4687 NONAME
-	inflateBackEnd @ 4688 NONAME
-	inflateBackInit_ @ 4689 NONAME
-	inflateCopy @ 4690 NONAME
-	inflateGetHeader @ 4691 NONAME
-	inflateMark @ 4692 NONAME
-	inflatePrime @ 4693 NONAME
-	inflateReset2 @ 4694 NONAME
-	inflateUndermine @ 4695 NONAME
-	zlibCompileFlags @ 4696 NONAME
-	??_EQDateTime@@QAE@I@Z @ 4697 NONAME ABSENT ; QDateTime::~QDateTime(unsigned int)
-	??4QDate@@QAEAAV0@ABV0@@Z @ 4698 NONAME ABSENT ; class QDate & QDate::operator=(class QDate const &)
-	??4QSizeF@@QAEAAV0@ABV0@@Z @ 4699 NONAME ABSENT ; class QSizeF & QSizeF::operator=(class QSizeF const &)
-	??0QSize@@QAE@ABV0@@Z @ 4700 NONAME ABSENT ; QSize::QSize(class QSize const &)
-	??0QEvent@@QAE@ABV0@@Z @ 4701 NONAME ABSENT ; QEvent::QEvent(class QEvent const &)
-	??0QTextCodecFactoryInterface@@QAE@XZ @ 4702 NONAME ABSENT ; QTextCodecFactoryInterface::QTextCodecFactoryInterface(void)
-	??0QPointF@@QAE@ABV0@@Z @ 4703 NONAME ABSENT ; QPointF::QPointF(class QPointF const &)
-	??_EQUrl@@QAE@I@Z @ 4704 NONAME ABSENT ; QUrl::~QUrl(unsigned int)
-	??0QGenericArgument@@QAE@ABV0@@Z @ 4705 NONAME ABSENT ; QGenericArgument::QGenericArgument(class QGenericArgument const &)
-	??_EQVariant@@QAE@I@Z @ 4706 NONAME ABSENT ; QVariant::~QVariant(unsigned int)
-	??4QLineF@@QAEAAV0@ABV0@@Z @ 4707 NONAME ABSENT ; class QLineF & QLineF::operator=(class QLineF const &)
-	??0QXmlStreamAttributes@@QAE@ABV0@@Z @ 4708 NONAME ABSENT ; QXmlStreamAttributes::QXmlStreamAttributes(class QXmlStreamAttributes const &)
-	??0QMetaEnum@@QAE@ABV0@@Z @ 4709 NONAME ABSENT ; QMetaEnum::QMetaEnum(class QMetaEnum const &)
-	??4QUuid@@QAEAAU0@ABU0@@Z @ 4710 NONAME ABSENT ; struct QUuid & QUuid::operator=(struct QUuid const &)
-	??0CQtActiveScheduler@@QAE@XZ @ 4711 NONAME ABSENT ; CQtActiveScheduler::CQtActiveScheduler(void)
-	??0QSizeF@@QAE@ABV0@@Z @ 4712 NONAME ABSENT ; QSizeF::QSizeF(class QSizeF const &)
-	??4QMetaEnum@@QAEAAV0@ABV0@@Z @ 4713 NONAME ABSENT ; class QMetaEnum & QMetaEnum::operator=(class QMetaEnum const &)
-	??4QRect@@QAEAAV0@ABV0@@Z @ 4714 NONAME ABSENT ; class QRect & QRect::operator=(class QRect const &)
-	??_EQMutexPool@@QAE@I@Z @ 4715 NONAME ABSENT ; QMutexPool::~QMutexPool(unsigned int)
-	??0QMetaClassInfo@@QAE@ABV0@@Z @ 4716 NONAME ABSENT ; QMetaClassInfo::QMetaClassInfo(class QMetaClassInfo const &)
-	??0QDate@@QAE@ABV0@@Z @ 4717 NONAME ABSENT ; QDate::QDate(class QDate const &)
-	??_EQTextDecoder@@QAE@I@Z @ 4718 NONAME ABSENT ; QTextDecoder::~QTextDecoder(unsigned int)
-	??_EQMutex@@QAE@I@Z @ 4719 NONAME ABSENT ; QMutex::~QMutex(unsigned int)
-	??0QTimerEvent@@QAE@ABV0@@Z @ 4720 NONAME ABSENT ; QTimerEvent::QTimerEvent(class QTimerEvent const &)
-	??_EConverterState@QTextCodec@@QAE@I@Z @ 4721 NONAME ABSENT ; QTextCodec::ConverterState::~ConverterState(unsigned int)
-	??4QTime@@QAEAAV0@ABV0@@Z @ 4722 NONAME ABSENT ; class QTime & QTime::operator=(class QTime const &)
-	??0QMetaMethod@@QAE@ABV0@@Z @ 4723 NONAME ABSENT ; QMetaMethod::QMetaMethod(class QMetaMethod const &)
-	??_EQTextEncoder@@QAE@I@Z @ 4724 NONAME ABSENT ; QTextEncoder::~QTextEncoder(unsigned int)
-	??_EQFileInfo@@QAE@I@Z @ 4725 NONAME ABSENT ; QFileInfo::~QFileInfo(unsigned int)
-	??4QRectF@@QAEAAV0@ABV0@@Z @ 4726 NONAME ABSENT ; class QRectF & QRectF::operator=(class QRectF const &)
-	??4QXmlStreamStringRef@@QAEAAV0@ABV0@@Z @ 4727 NONAME ABSENT ; class QXmlStreamStringRef & QXmlStreamStringRef::operator=(class QXmlStreamStringRef const &)
-	??4QBasicAtomicInt@@QAEAAV0@ABV0@@Z @ 4728 NONAME ABSENT ; class QBasicAtomicInt & QBasicAtomicInt::operator=(class QBasicAtomicInt const &)
-	??_EQEasingCurve@@QAE@I@Z @ 4729 NONAME ABSENT ; QEasingCurve::~QEasingCurve(unsigned int)
-	??_EQReadWriteLock@@QAE@I@Z @ 4730 NONAME ABSENT ; QReadWriteLock::~QReadWriteLock(unsigned int)
-	??0QFactoryInterface@@QAE@XZ @ 4731 NONAME ABSENT ; QFactoryInterface::QFactoryInterface(void)
-	??4QLine@@QAEAAV0@ABV0@@Z @ 4732 NONAME ABSENT ; class QLine & QLine::operator=(class QLine const &)
-	??0QMetaProperty@@QAE@ABV0@@Z @ 4733 NONAME ABSENT ; QMetaProperty::QMetaProperty(class QMetaProperty const &)
-	??_EQBitArray@@QAE@I@Z @ 4734 NONAME ABSENT ; QBitArray::~QBitArray(unsigned int)
-	??0QTime@@QAE@ABV0@@Z @ 4735 NONAME ABSENT ; QTime::QTime(class QTime const &)
-	??4QPoint@@QAEAAV0@ABV0@@Z @ 4736 NONAME ABSENT ; class QPoint & QPoint::operator=(class QPoint const &)
-	??4QSize@@QAEAAV0@ABV0@@Z @ 4737 NONAME ABSENT ; class QSize & QSize::operator=(class QSize const &)
-	??0QPoint@@QAE@ABV0@@Z @ 4738 NONAME ABSENT ; QPoint::QPoint(class QPoint const &)
-	??4QPointF@@QAEAAV0@ABV0@@Z @ 4739 NONAME ABSENT ; class QPointF & QPointF::operator=(class QPointF const &)
-	??_EQRegExp@@QAE@I@Z @ 4740 NONAME ABSENT ; QRegExp::~QRegExp(unsigned int)
-	??4QLocalePrivate@@QAEAAU0@ABU0@@Z @ 4741 NONAME ABSENT ; struct QLocalePrivate & QLocalePrivate::operator=(struct QLocalePrivate const &)
-	??4QSystemError@@QAEAAV0@ABV0@@Z @ 4742 NONAME ABSENT ; class QSystemError & QSystemError::operator=(class QSystemError const &)
-	?staticMetaObjectExtraData@QPropertyAnimation@@0UQMetaObjectExtraData@@B @ 4743 NONAME ; struct QMetaObjectExtraData const QPropertyAnimation::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QAbstractTableModel@@0UQMetaObjectExtraData@@B @ 4744 NONAME ; struct QMetaObjectExtraData const QAbstractTableModel::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QSequentialAnimationGroup@@0UQMetaObjectExtraData@@B @ 4745 NONAME ; struct QMetaObjectExtraData const QSequentialAnimationGroup::staticMetaObjectExtraData
-	?createMutex@QMutexPool@@AAEPAVQMutex@@H@Z @ 4746 NONAME ; class QMutex * QMutexPool::createMutex(int)
-	?qt_static_metacall@QAbstractAnimation@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4747 NONAME ; void QAbstractAnimation::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?placeMetaCall@QMetaCallEvent@@UAEXPAVQObject@@@Z @ 4748 NONAME ; void QMetaCallEvent::placeMetaCall(class QObject *)
-	?staticMetaObjectExtraData@QAbstractEventDispatcher@@0UQMetaObjectExtraData@@B @ 4749 NONAME ; struct QMetaObjectExtraData const QAbstractEventDispatcher::staticMetaObjectExtraData
-	?qt_static_metacall@QAbstractListModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4750 NONAME ; void QAbstractListModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAbstractEventDispatcher@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4751 NONAME ; void QAbstractEventDispatcher::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAbstractState@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4752 NONAME ; void QAbstractState::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QThreadPool@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4753 NONAME ; void QThreadPool::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QFile@@0UQMetaObjectExtraData@@B @ 4754 NONAME ; struct QMetaObjectExtraData const QFile::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QBuffer@@0UQMetaObjectExtraData@@B @ 4755 NONAME ; struct QMetaObjectExtraData const QBuffer::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QSocketNotifier@@0UQMetaObjectExtraData@@B @ 4756 NONAME ; struct QMetaObjectExtraData const QSocketNotifier::staticMetaObjectExtraData
-	?qt_static_metacall@QIODevice@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4757 NONAME ; void QIODevice::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QEventLoop@@0UQMetaObjectExtraData@@B @ 4758 NONAME ; struct QMetaObjectExtraData const QEventLoop::staticMetaObjectExtraData
-	?qt_static_metacall@QTranslator@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4759 NONAME ; void QTranslator::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QSocketNotifier@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4760 NONAME ; void QSocketNotifier::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QState@@0UQMetaObjectExtraData@@B @ 4761 NONAME ; struct QMetaObjectExtraData const QState::staticMetaObjectExtraData
-	?qt_static_metacall@QNonContiguousByteDevice@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4762 NONAME ; void QNonContiguousByteDevice::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QHistoryState@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4763 NONAME ; void QHistoryState::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAnimationDriver@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4764 NONAME ; void QAnimationDriver::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QFileSystemWatcher@@0UQMetaObjectExtraData@@B @ 4765 NONAME ; struct QMetaObjectExtraData const QFileSystemWatcher::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QTimeLine@@0UQMetaObjectExtraData@@B @ 4766 NONAME ; struct QMetaObjectExtraData const QTimeLine::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QThreadPool@@0UQMetaObjectExtraData@@B @ 4767 NONAME ; struct QMetaObjectExtraData const QThreadPool::staticMetaObjectExtraData
-	?qt_static_metacall@QTimer@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4768 NONAME ; void QTimer::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QState@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4769 NONAME ; void QState::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QAbstractTransition@@0UQMetaObjectExtraData@@B @ 4770 NONAME ; struct QMetaObjectExtraData const QAbstractTransition::staticMetaObjectExtraData
-	?qt_static_metacall@QThread@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4771 NONAME ; void QThread::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QIODevice@@0UQMetaObjectExtraData@@B @ 4772 NONAME ; struct QMetaObjectExtraData const QIODevice::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QSettings@@0UQMetaObjectExtraData@@B @ 4773 NONAME ; struct QMetaObjectExtraData const QSettings::staticMetaObjectExtraData
-	?qt_static_metacall@QAnimationGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4774 NONAME ; void QAnimationGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QTemporaryFile@@0UQMetaObjectExtraData@@B @ 4775 NONAME ; struct QMetaObjectExtraData const QTemporaryFile::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QObjectCleanupHandler@@0UQMetaObjectExtraData@@B @ 4776 NONAME ; struct QMetaObjectExtraData const QObjectCleanupHandler::staticMetaObjectExtraData
-	?qt_static_metacall@QFactoryLoader@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4777 NONAME ; void QFactoryLoader::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QTextCodecPlugin@@0UQMetaObjectExtraData@@B @ 4778 NONAME ; struct QMetaObjectExtraData const QTextCodecPlugin::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QAbstractState@@0UQMetaObjectExtraData@@B @ 4779 NONAME ; struct QMetaObjectExtraData const QAbstractState::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QNonContiguousByteDevice@@0UQMetaObjectExtraData@@B @ 4780 NONAME ; struct QMetaObjectExtraData const QNonContiguousByteDevice::staticMetaObjectExtraData
-	?qt_static_metacall@QFileSystemWatcher@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4781 NONAME ; void QFileSystemWatcher::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?insert@QProcessEnvironment@@QAEXABV1@@Z @ 4782 NONAME ; void QProcessEnvironment::insert(class QProcessEnvironment const &)
-	?qt_static_metacall@QSignalTransition@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4783 NONAME ; void QSignalTransition::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QTimer@@0UQMetaObjectExtraData@@B @ 4784 NONAME ; struct QMetaObjectExtraData const QTimer::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QTranslator@@0UQMetaObjectExtraData@@B @ 4785 NONAME ; struct QMetaObjectExtraData const QTranslator::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QAbstractItemModel@@0UQMetaObjectExtraData@@B @ 4786 NONAME ; struct QMetaObjectExtraData const QAbstractItemModel::staticMetaObjectExtraData
-	?convertToAscii@QAbstractConcatenable@@KAXVQChar@@AAPAD@Z @ 4787 NONAME ; void QAbstractConcatenable::convertToAscii(class QChar, char * &)
-	?staticMetaObjectExtraData@QAbstractAnimation@@0UQMetaObjectExtraData@@B @ 4788 NONAME ; struct QMetaObjectExtraData const QAbstractAnimation::staticMetaObjectExtraData
-	?qt_static_metacall@QAbstractItemModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4789 NONAME ; void QAbstractItemModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QStateMachine@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4790 NONAME ; void QStateMachine::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?nativeCountryName@QLocale@@QBE?AVQString@@XZ @ 4791 NONAME ; class QString QLocale::nativeCountryName(void) const
-	?staticMetaObjectExtraData@QLibrary@@0UQMetaObjectExtraData@@B @ 4792 NONAME ; struct QMetaObjectExtraData const QLibrary::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QPluginLoader@@0UQMetaObjectExtraData@@B @ 4793 NONAME ; struct QMetaObjectExtraData const QPluginLoader::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QSharedMemory@@0UQMetaObjectExtraData@@B @ 4794 NONAME ; struct QMetaObjectExtraData const QSharedMemory::staticMetaObjectExtraData
-	??0QMetaCallEvent@@QAE@GGP6AXPAVQObject@@W4Call@QMetaObject@@HPAPAX@ZPBV1@HHPAH2PAVQSemaphore@@@Z @ 4795 NONAME ; QMetaCallEvent::QMetaCallEvent(unsigned short, unsigned short, void (*)(class QObject *, enum QMetaObject::Call, int, void * *), class QObject const *, int, int, int *, void * *, class QSemaphore *)
-	?qt_static_metacall@QFinalState@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4796 NONAME ; void QFinalState::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?matchingLocales@QLocale@@SA?AV?$QList@VQLocale@@@@W4Language@1@W4Script@1@W4Country@1@@Z @ 4797 NONAME ; class QList<class QLocale> QLocale::matchingLocales(enum QLocale::Language, enum QLocale::Script, enum QLocale::Country)
-	?staticMetaObjectExtraData@QAbstractListModel@@0UQMetaObjectExtraData@@B @ 4798 NONAME ; struct QMetaObjectExtraData const QAbstractListModel::staticMetaObjectExtraData
-	?qt_static_metacall@QMimeData@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4799 NONAME ; void QMimeData::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QTextCodecPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4800 NONAME ; void QTextCodecPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?convertToAscii@QAbstractConcatenable@@KAXPBVQChar@@HAAPAD@Z @ 4801 NONAME ; void QAbstractConcatenable::convertToAscii(class QChar const *, int, char * &)
-	?qt_static_metacall@QBuffer@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4802 NONAME ; void QBuffer::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QTemporaryFile@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4803 NONAME ; void QTemporaryFile::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QCoreApplication@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4804 NONAME ; void QCoreApplication::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QAnimationDriver@@0UQMetaObjectExtraData@@B @ 4805 NONAME ; struct QMetaObjectExtraData const QAnimationDriver::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QObject@@0UQMetaObjectExtraData@@B @ 4806 NONAME ; struct QMetaObjectExtraData const QObject::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QThread@@0UQMetaObjectExtraData@@B @ 4807 NONAME ; struct QMetaObjectExtraData const QThread::staticMetaObjectExtraData
-	?nativeLanguageName@QLocale@@QBE?AVQString@@XZ @ 4808 NONAME ; class QString QLocale::nativeLanguageName(void) const
-	?staticMetaObjectExtraData@QFinalState@@0UQMetaObjectExtraData@@B @ 4809 NONAME ; struct QMetaObjectExtraData const QFinalState::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QMimeData@@0UQMetaObjectExtraData@@B @ 4810 NONAME ; struct QMetaObjectExtraData const QMimeData::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QAnimationGroup@@0UQMetaObjectExtraData@@B @ 4811 NONAME ; struct QMetaObjectExtraData const QAnimationGroup::staticMetaObjectExtraData
-	?qt_static_metacall@QFile@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4812 NONAME ; void QFile::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QLibrary@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4813 NONAME ; void QLibrary::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QVariantAnimation@@0UQMetaObjectExtraData@@B @ 4814 NONAME ; struct QMetaObjectExtraData const QVariantAnimation::staticMetaObjectExtraData
-	?qt_static_metacall@QPluginLoader@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4815 NONAME ; void QPluginLoader::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QFactoryLoader@@0UQMetaObjectExtraData@@B @ 4816 NONAME ; struct QMetaObjectExtraData const QFactoryLoader::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QPauseAnimation@@0UQMetaObjectExtraData@@B @ 4817 NONAME ; struct QMetaObjectExtraData const QPauseAnimation::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QEventDispatcherSymbian@@0UQMetaObjectExtraData@@B @ 4818 NONAME ; struct QMetaObjectExtraData const QEventDispatcherSymbian::staticMetaObjectExtraData
-	?qt_static_metacall@QObjectCleanupHandler@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4819 NONAME ; void QObjectCleanupHandler::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QSignalMapper@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4820 NONAME ; void QSignalMapper::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QEventTransition@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4821 NONAME ; void QEventTransition::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?convertToLatin1@QAbstractConcatenable@@KAXVQChar@@AAPAD@Z @ 4822 NONAME ; void QAbstractConcatenable::convertToLatin1(class QChar, char * &)
-	?qt_static_metacall@QObject@@CAXPAV1@W4Call@QMetaObject@@HPAPAX@Z @ 4823 NONAME ; void QObject::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QVariantAnimation@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4824 NONAME ; void QVariantAnimation::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QPauseAnimation@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4825 NONAME ; void QPauseAnimation::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QSettings@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4826 NONAME ; void QSettings::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QHistoryState@@0UQMetaObjectExtraData@@B @ 4827 NONAME ; struct QMetaObjectExtraData const QHistoryState::staticMetaObjectExtraData
-	?qt_static_metacall@QSharedMemory@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4828 NONAME ; void QSharedMemory::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAbstractTransition@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4829 NONAME ; void QAbstractTransition::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QProcess@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4830 NONAME ; void QProcess::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QSequentialAnimationGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4831 NONAME ; void QSequentialAnimationGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QSignalMapper@@0UQMetaObjectExtraData@@B @ 4832 NONAME ; struct QMetaObjectExtraData const QSignalMapper::staticMetaObjectExtraData
-	?qt_static_metacall@QPropertyAnimation@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4833 NONAME ; void QPropertyAnimation::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QProcess@@0UQMetaObjectExtraData@@B @ 4834 NONAME ; struct QMetaObjectExtraData const QProcess::staticMetaObjectExtraData
-	?qt_static_metacall@QParallelAnimationGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4835 NONAME ; void QParallelAnimationGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QEventDispatcherSymbian@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4836 NONAME ; void QEventDispatcherSymbian::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QCoreApplication@@0UQMetaObjectExtraData@@B @ 4837 NONAME ; struct QMetaObjectExtraData const QCoreApplication::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QParallelAnimationGroup@@0UQMetaObjectExtraData@@B @ 4838 NONAME ; struct QMetaObjectExtraData const QParallelAnimationGroup::staticMetaObjectExtraData
-	?qt_static_metacall@QTimeLine@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4839 NONAME ; void QTimeLine::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QStateMachine@@0UQMetaObjectExtraData@@B @ 4840 NONAME ; struct QMetaObjectExtraData const QStateMachine::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QSignalTransition@@0UQMetaObjectExtraData@@B @ 4841 NONAME ; struct QMetaObjectExtraData const QSignalTransition::staticMetaObjectExtraData
-	?qt_static_metacall@QAbstractTableModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4842 NONAME ; void QAbstractTableModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QEventTransition@@0UQMetaObjectExtraData@@B @ 4843 NONAME ; struct QMetaObjectExtraData const QEventTransition::staticMetaObjectExtraData
-	?qt_static_metacall@QEventLoop@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4844 NONAME ; void QEventLoop::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?keys@QProcessEnvironment@@QBE?AVQStringList@@XZ @ 4845 NONAME ; class QStringList QProcessEnvironment::keys(void) const
-	?qt_static_metacall@QFutureWatcherBase@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4846 NONAME ; void QFutureWatcherBase::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?progressValueChanged@QFutureWatcherBase@@IAEXH@Z @ 4847 NONAME ; void QFutureWatcherBase::progressValueChanged(int)
-	?qt_metacast@QFutureWatcherBase@@UAEPAXPBD@Z @ 4848 NONAME ; void * QFutureWatcherBase::qt_metacast(char const *)
-	?qIsEffectiveTLD@@YA_NABVQString@@@Z @ 4849 NONAME ; bool qIsEffectiveTLD(class QString const &)
-	?tr@QFutureWatcherBase@@SA?AVQString@@PBD0@Z @ 4850 NONAME ; class QString QFutureWatcherBase::tr(char const *, char const *)
-	?trolltechConf@QCoreApplicationPrivate@@SAPAVQSettings@@XZ @ 4851 NONAME ; class QSettings * QCoreApplicationPrivate::trolltechConf(void)
-	?pause@QFutureWatcherBase@@QAEXXZ @ 4852 NONAME ; void QFutureWatcherBase::pause(void)
-	?topLevelDomain@QUrl@@QBE?AVQString@@XZ @ 4853 NONAME ; class QString QUrl::topLevelDomain(void) const
-	?togglePaused@QFutureWatcherBase@@QAEXXZ @ 4854 NONAME ; void QFutureWatcherBase::togglePaused(void)
-	?toRfc4122@QUuid@@QBE?AVQByteArray@@XZ @ 4855 NONAME ; class QByteArray QUuid::toRfc4122(void) const
-	?progressRangeChanged@QFutureWatcherBase@@IAEXHH@Z @ 4856 NONAME ; void QFutureWatcherBase::progressRangeChanged(int, int)
-	?cancel@QFutureWatcherBase@@QAEXXZ @ 4857 NONAME ; void QFutureWatcherBase::cancel(void)
-	?tr@QFutureWatcherBase@@SA?AVQString@@PBD0H@Z @ 4858 NONAME ; class QString QFutureWatcherBase::tr(char const *, char const *, int)
-	?toByteArray@QUuid@@QBE?AVQByteArray@@XZ @ 4859 NONAME ; class QByteArray QUuid::toByteArray(void) const
-	?runningAnimationCount@QUnifiedTimer@@QAEHXZ @ 4860 NONAME ; int QUnifiedTimer::runningAnimationCount(void)
-	?getStaticMetaObject@QFutureWatcherBase@@SAABUQMetaObject@@XZ @ 4861 NONAME ; struct QMetaObject const & QFutureWatcherBase::getStaticMetaObject(void)
-	?trUtf8@QFutureWatcherBase@@SA?AVQString@@PBD0H@Z @ 4862 NONAME ; class QString QFutureWatcherBase::trUtf8(char const *, char const *, int)
-	?staticMetaObjectExtraData@QFutureWatcherBase@@0UQMetaObjectExtraData@@B @ 4863 NONAME ; struct QMetaObjectExtraData const QFutureWatcherBase::staticMetaObjectExtraData
-	?qt_metacall@QFutureWatcherBase@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 4864 NONAME ; int QFutureWatcherBase::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?resumed@QFutureWatcherBase@@IAEXXZ @ 4865 NONAME ; void QFutureWatcherBase::resumed(void)
-	?setPaused@QFutureWatcherBase@@QAEX_N@Z @ 4866 NONAME ; void QFutureWatcherBase::setPaused(bool)
-	?canceled@QFutureWatcherBase@@IAEXXZ @ 4867 NONAME ; void QFutureWatcherBase::canceled(void)
-	?progressTextChanged@QFutureWatcherBase@@IAEXABVQString@@@Z @ 4868 NONAME ; void QFutureWatcherBase::progressTextChanged(class QString const &)
-	?fromRfc4122@QUuid@@SA?AU1@ABVQByteArray@@@Z @ 4869 NONAME ; struct QUuid QUuid::fromRfc4122(class QByteArray const &)
-	?staticMetaObject@QFutureWatcherBase@@2UQMetaObject@@B @ 4870 NONAME ; struct QMetaObject const QFutureWatcherBase::staticMetaObject
-	?trUtf8@QFutureWatcherBase@@SA?AVQString@@PBD0@Z @ 4871 NONAME ; class QString QFutureWatcherBase::trUtf8(char const *, char const *)
-	?d_func@QFutureWatcherBase@@ABEPBVQFutureWatcherBasePrivate@@XZ @ 4872 NONAME ; class QFutureWatcherBasePrivate const * QFutureWatcherBase::d_func(void) const
-	?metaObject@QFutureWatcherBase@@UBEPBUQMetaObject@@XZ @ 4873 NONAME ; struct QMetaObject const * QFutureWatcherBase::metaObject(void) const
-	?d_func@QFutureWatcherBase@@AAEPAVQFutureWatcherBasePrivate@@XZ @ 4874 NONAME ; class QFutureWatcherBasePrivate * QFutureWatcherBase::d_func(void)
-	?qTopLevelDomain@@YA?AVQString@@ABV1@@Z @ 4875 NONAME ; class QString qTopLevelDomain(class QString const &)
-	??0QUuid@@QAE@ABVQByteArray@@@Z @ 4876 NONAME ; QUuid::QUuid(class QByteArray const &)
-	?resultReadyAt@QFutureWatcherBase@@IAEXH@Z @ 4877 NONAME ; void QFutureWatcherBase::resultReadyAt(int)
-	?paused@QFutureWatcherBase@@IAEXXZ @ 4878 NONAME ; void QFutureWatcherBase::paused(void)
-	?finished@QFutureWatcherBase@@IAEXXZ @ 4879 NONAME ; void QFutureWatcherBase::finished(void)
-	?resume@QFutureWatcherBase@@QAEXXZ @ 4880 NONAME ; void QFutureWatcherBase::resume(void)
-	?resultsReadyAt@QFutureWatcherBase@@IAEXHH@Z @ 4881 NONAME ; void QFutureWatcherBase::resultsReadyAt(int, int)
-	?started@QFutureWatcherBase@@IAEXXZ @ 4882 NONAME ; void QFutureWatcherBase::started(void)
-	?resetInternalData@QAbstractItemModel@@IAEXXZ @ 4883 NONAME ; void QAbstractItemModel::resetInternalData(void)
+	??_EQDateTime@@QAE@I@Z @ 4491 NONAME ABSENT ; QDateTime::~QDateTime(unsigned int)
+	??4QDate@@QAEAAV0@ABV0@@Z @ 4492 NONAME ABSENT ; class QDate & QDate::operator=(class QDate const &)
+	??4QSizeF@@QAEAAV0@ABV0@@Z @ 4493 NONAME ABSENT ; class QSizeF & QSizeF::operator=(class QSizeF const &)
+	??0QSize@@QAE@ABV0@@Z @ 4494 NONAME ABSENT ; QSize::QSize(class QSize const &)
+	??0QEvent@@QAE@ABV0@@Z @ 4495 NONAME ABSENT ; QEvent::QEvent(class QEvent const &)
+	??0QTextCodecFactoryInterface@@QAE@XZ @ 4496 NONAME ABSENT ; QTextCodecFactoryInterface::QTextCodecFactoryInterface(void)
+	??0QPointF@@QAE@ABV0@@Z @ 4497 NONAME ABSENT ; QPointF::QPointF(class QPointF const &)
+	??_EQUrl@@QAE@I@Z @ 4498 NONAME ABSENT ; QUrl::~QUrl(unsigned int)
+	??0QGenericArgument@@QAE@ABV0@@Z @ 4499 NONAME ABSENT ; QGenericArgument::QGenericArgument(class QGenericArgument const &)
+	??_EQVariant@@QAE@I@Z @ 4500 NONAME ABSENT ; QVariant::~QVariant(unsigned int)
+	??4QLineF@@QAEAAV0@ABV0@@Z @ 4501 NONAME ABSENT ; class QLineF & QLineF::operator=(class QLineF const &)
+	??0QXmlStreamAttributes@@QAE@ABV0@@Z @ 4502 NONAME ABSENT ; QXmlStreamAttributes::QXmlStreamAttributes(class QXmlStreamAttributes const &)
+	??0QMetaEnum@@QAE@ABV0@@Z @ 4503 NONAME ABSENT ; QMetaEnum::QMetaEnum(class QMetaEnum const &)
+	??4QUuid@@QAEAAU0@ABU0@@Z @ 4504 NONAME ABSENT ; struct QUuid & QUuid::operator=(struct QUuid const &)
+	??0CQtActiveScheduler@@QAE@XZ @ 4505 NONAME ABSENT ; CQtActiveScheduler::CQtActiveScheduler(void)
+	??0QSizeF@@QAE@ABV0@@Z @ 4506 NONAME ABSENT ; QSizeF::QSizeF(class QSizeF const &)
+	??4QMetaEnum@@QAEAAV0@ABV0@@Z @ 4507 NONAME ABSENT ; class QMetaEnum & QMetaEnum::operator=(class QMetaEnum const &)
+	??4QRect@@QAEAAV0@ABV0@@Z @ 4508 NONAME ABSENT ; class QRect & QRect::operator=(class QRect const &)
+	??_EQMutexPool@@QAE@I@Z @ 4509 NONAME ABSENT ; QMutexPool::~QMutexPool(unsigned int)
+	??0QMetaClassInfo@@QAE@ABV0@@Z @ 4510 NONAME ABSENT ; QMetaClassInfo::QMetaClassInfo(class QMetaClassInfo const &)
+	??0QDate@@QAE@ABV0@@Z @ 4511 NONAME ABSENT ; QDate::QDate(class QDate const &)
+	??_EQTextDecoder@@QAE@I@Z @ 4512 NONAME ABSENT ; QTextDecoder::~QTextDecoder(unsigned int)
+	??_EQMutex@@QAE@I@Z @ 4513 NONAME ABSENT ; QMutex::~QMutex(unsigned int)
+	??0QTimerEvent@@QAE@ABV0@@Z @ 4514 NONAME ABSENT ; QTimerEvent::QTimerEvent(class QTimerEvent const &)
+	??0QXmlStreamAttributes@@QAE@XZ @ 4515 NONAME ; QXmlStreamAttributes::QXmlStreamAttributes(void)
+	??_EConverterState@QTextCodec@@QAE@I@Z @ 4516 NONAME ABSENT ; QTextCodec::ConverterState::~ConverterState(unsigned int)
+	??4QTime@@QAEAAV0@ABV0@@Z @ 4517 NONAME ABSENT ; class QTime & QTime::operator=(class QTime const &)
+	??0QMetaMethod@@QAE@ABV0@@Z @ 4518 NONAME ABSENT ; QMetaMethod::QMetaMethod(class QMetaMethod const &)
+	??_EQTextEncoder@@QAE@I@Z @ 4519 NONAME ABSENT ; QTextEncoder::~QTextEncoder(unsigned int)
+	??_EQFileInfo@@QAE@I@Z @ 4520 NONAME ABSENT ; QFileInfo::~QFileInfo(unsigned int)
+	??4QRectF@@QAEAAV0@ABV0@@Z @ 4521 NONAME ABSENT ; class QRectF & QRectF::operator=(class QRectF const &)
+	??4QXmlStreamStringRef@@QAEAAV0@ABV0@@Z @ 4522 NONAME ABSENT ; class QXmlStreamStringRef & QXmlStreamStringRef::operator=(class QXmlStreamStringRef const &)
+	??4QBasicAtomicInt@@QAEAAV0@ABV0@@Z @ 4523 NONAME ABSENT ; class QBasicAtomicInt & QBasicAtomicInt::operator=(class QBasicAtomicInt const &)
+	??_EQEasingCurve@@QAE@I@Z @ 4524 NONAME ABSENT ; QEasingCurve::~QEasingCurve(unsigned int)
+	??_EQReadWriteLock@@QAE@I@Z @ 4525 NONAME ABSENT ; QReadWriteLock::~QReadWriteLock(unsigned int)
+	??0QFactoryInterface@@QAE@XZ @ 4526 NONAME ABSENT ; QFactoryInterface::QFactoryInterface(void)
+	??4QLine@@QAEAAV0@ABV0@@Z @ 4527 NONAME ABSENT ; class QLine & QLine::operator=(class QLine const &)
+	??0QMetaProperty@@QAE@ABV0@@Z @ 4528 NONAME ABSENT ; QMetaProperty::QMetaProperty(class QMetaProperty const &)
+	??_EQBitArray@@QAE@I@Z @ 4529 NONAME ABSENT ; QBitArray::~QBitArray(unsigned int)
+	??0QTime@@QAE@ABV0@@Z @ 4530 NONAME ABSENT ; QTime::QTime(class QTime const &)
+	??4QPoint@@QAEAAV0@ABV0@@Z @ 4531 NONAME ABSENT ; class QPoint & QPoint::operator=(class QPoint const &)
+	??4QSize@@QAEAAV0@ABV0@@Z @ 4532 NONAME ABSENT ; class QSize & QSize::operator=(class QSize const &)
+	??0QPoint@@QAE@ABV0@@Z @ 4533 NONAME ABSENT ; QPoint::QPoint(class QPoint const &)
+	??4QPointF@@QAEAAV0@ABV0@@Z @ 4534 NONAME ABSENT ; class QPointF & QPointF::operator=(class QPointF const &)
+	??_EQRegExp@@QAE@I@Z @ 4535 NONAME ABSENT ; QRegExp::~QRegExp(unsigned int)
+	??4QLocalePrivate@@QAEAAU0@ABU0@@Z @ 4536 NONAME ABSENT ; struct QLocalePrivate & QLocalePrivate::operator=(struct QLocalePrivate const &)
+	adler32_combine @ 4537 NONAME
+	adler32_combine64 @ 4538 NONAME
+	compressBound @ 4539 NONAME
+	crc32_combine @ 4540 NONAME
+	crc32_combine64 @ 4541 NONAME
+	deflateBound @ 4542 NONAME
+	deflatePrime @ 4543 NONAME
+	deflateSetHeader @ 4544 NONAME
+	deflateTune @ 4545 NONAME
+	gzbuffer @ 4546 NONAME
+	gzclearerr @ 4547 NONAME
+	gzclose_r @ 4548 NONAME
+	gzclose_w @ 4549 NONAME
+	gzdirect @ 4550 NONAME
+	gzoffset @ 4551 NONAME
+	gzoffset64 @ 4552 NONAME
+	gzopen64 @ 4553 NONAME
+	gzseek64 @ 4554 NONAME
+	gztell64 @ 4555 NONAME
+	gzungetc @ 4556 NONAME
+	inflateBack @ 4557 NONAME
+	inflateBackEnd @ 4558 NONAME
+	inflateBackInit_ @ 4559 NONAME
+	inflateCopy @ 4560 NONAME
+	inflateGetHeader @ 4561 NONAME
+	inflateMark @ 4562 NONAME
+	inflatePrime @ 4563 NONAME
+	inflateReset2 @ 4564 NONAME
+	inflateUndermine @ 4565 NONAME
+	zlibCompileFlags @ 4566 NONAME
+	?toLower@QLocale@@QBE?AVQString@@ABV2@@Z @ 4567 NONAME ; class QString QLocale::toLower(class QString const &) const
+	?qt_static_metacall@QFutureWatcherBase@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4568 NONAME ; void QFutureWatcherBase::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QSettings@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4569 NONAME ; void QSettings::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QMetaCallEvent@@QAE@GGP6AXPAVQObject@@W4Call@QMetaObject@@HPAPAX@ZPBV1@HHPAH2PAVQSemaphore@@@Z @ 4570 NONAME ; QMetaCallEvent::QMetaCallEvent(unsigned short, unsigned short, void (*)(class QObject *, enum QMetaObject::Call, int, void * *), class QObject const *, int, int, int *, void * *, class QSemaphore *)
+	?qt_static_metacall@QFileSystemWatcher@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4571 NONAME ; void QFileSystemWatcher::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?contains@QString@@QBE?AVQBool@@ABVQStringRef@@W4CaseSensitivity@Qt@@@Z @ 4572 NONAME ; class QBool QString::contains(class QStringRef const &, enum Qt::CaseSensitivity) const
+	?qt_static_metacall@QBuffer@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4573 NONAME ; void QBuffer::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?progressValueChanged@QFutureWatcherBase@@IAEXH@Z @ 4574 NONAME ; void QFutureWatcherBase::progressValueChanged(int)
+	?staticMetaObjectExtraData@QParallelAnimationGroup@@0UQMetaObjectExtraData@@B @ 4575 NONAME ; struct QMetaObjectExtraData const QParallelAnimationGroup::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QFileSystemWatcher@@0UQMetaObjectExtraData@@B @ 4576 NONAME ; struct QMetaObjectExtraData const QFileSystemWatcher::staticMetaObjectExtraData
+	?swap@QRegExp@@QAEXAAV1@@Z @ 4577 NONAME ; void QRegExp::swap(class QRegExp &)
+	?qt_metacast@QFutureWatcherBase@@UAEPAXPBD@Z @ 4578 NONAME ; void * QFutureWatcherBase::qt_metacast(char const *)
+	?staticMetaObjectExtraData@QThreadPool@@0UQMetaObjectExtraData@@B @ 4579 NONAME ; struct QMetaObjectExtraData const QThreadPool::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QTimer@@0UQMetaObjectExtraData@@B @ 4580 NONAME ; struct QMetaObjectExtraData const QTimer::staticMetaObjectExtraData
+	?indexOf@QStringRef@@QBEHABVQString@@HW4CaseSensitivity@Qt@@@Z @ 4581 NONAME ; int QStringRef::indexOf(class QString const &, int, enum Qt::CaseSensitivity) const
+	?indexOf@QStringRef@@QBEHABV1@HW4CaseSensitivity@Qt@@@Z @ 4582 NONAME ; int QStringRef::indexOf(class QStringRef const &, int, enum Qt::CaseSensitivity) const
+	?count@QString@@QBEHABVQStringRef@@W4CaseSensitivity@Qt@@@Z @ 4583 NONAME ; int QString::count(class QStringRef const &, enum Qt::CaseSensitivity) const
+	?qIsEffectiveTLD@@YA_NABVQString@@@Z @ 4584 NONAME ; bool qIsEffectiveTLD(class QString const &)
+	?swap@QString@@QAEXAAV1@@Z @ 4585 NONAME ; void QString::swap(class QString &)
+	?staticMetaObjectExtraData@QHistoryState@@0UQMetaObjectExtraData@@B @ 4586 NONAME ; struct QMetaObjectExtraData const QHistoryState::staticMetaObjectExtraData
+	?trUtf8@QAnimationDriver@@SA?AVQString@@PBD0H@Z @ 4587 NONAME ; class QString QAnimationDriver::trUtf8(char const *, char const *, int)
+	?startsWith@QStringRef@@QBE_NVQChar@@W4CaseSensitivity@Qt@@@Z @ 4588 NONAME ; bool QStringRef::startsWith(class QChar, enum Qt::CaseSensitivity) const
+	?setNativeKey@QSharedMemory@@QAEXABVQString@@@Z @ 4589 NONAME ; void QSharedMemory::setNativeKey(class QString const &)
+	?lookupSocket@QSymbianSocketManager@@QBEHABVRSocket@@@Z @ 4590 NONAME ; int QSymbianSocketManager::lookupSocket(class RSocket const &) const
+	??0QAnimationDriver@@IAE@AAVQAnimationDriverPrivate@@PAVQObject@@@Z @ 4591 NONAME ; QAnimationDriver::QAnimationDriver(class QAnimationDriverPrivate &, class QObject *)
+	?staticMetaObjectExtraData@QBuffer@@0UQMetaObjectExtraData@@B @ 4592 NONAME ; struct QMetaObjectExtraData const QBuffer::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QPluginLoader@@0UQMetaObjectExtraData@@B @ 4593 NONAME ; struct QMetaObjectExtraData const QPluginLoader::staticMetaObjectExtraData
+	?convertToLatin1@QAbstractConcatenable@@KAXVQChar@@AAPAD@Z @ 4594 NONAME ; void QAbstractConcatenable::convertToLatin1(class QChar, char * &)
+	?languageCode@QLocalePrivate@@QBE?AVQString@@XZ @ 4595 NONAME ; class QString QLocalePrivate::languageCode(void) const
+	?timerEvent@QUnifiedTimer@@MAEXPAVQTimerEvent@@@Z @ 4596 NONAME ; void QUnifiedTimer::timerEvent(class QTimerEvent *)
+	?currentUnicodeVersion@QChar@@SA?AW4UnicodeVersion@1@XZ @ 4597 NONAME ; enum QChar::UnicodeVersion QChar::currentUnicodeVersion(void)
+	?registerAnimation@QUnifiedTimer@@SAXPAVQAbstractAnimation@@_N@Z @ 4598 NONAME ; void QUnifiedTimer::registerAnimation(class QAbstractAnimation *, bool)
+	?staticMetaObjectExtraData@QThread@@0UQMetaObjectExtraData@@B @ 4599 NONAME ; struct QMetaObjectExtraData const QThread::staticMetaObjectExtraData
+	?tr@QFutureWatcherBase@@SA?AVQString@@PBD0@Z @ 4600 NONAME ; class QString QFutureWatcherBase::tr(char const *, char const *)
+	?startsWith@QStringRef@@QBE_NABV1@W4CaseSensitivity@Qt@@@Z @ 4601 NONAME ; bool QStringRef::startsWith(class QStringRef const &, enum Qt::CaseSensitivity) const
+	?contains@QStringRef@@QBE?AVQBool@@ABV1@W4CaseSensitivity@Qt@@@Z @ 4602 NONAME ; class QBool QStringRef::contains(class QStringRef const &, enum Qt::CaseSensitivity) const
+	?defaultConnection@QSymbianSocketManager@@QBEPAVRConnection@@XZ @ 4603 NONAME ; class RConnection * QSymbianSocketManager::defaultConnection(void) const
+	?trolltechConf@QCoreApplicationPrivate@@SAPAVQSettings@@XZ @ 4604 NONAME ; class QSettings * QCoreApplicationPrivate::trolltechConf(void)
+	?open@QFSFileEngine@@QAE_NV?$QFlags@W4OpenModeFlag@QIODevice@@@@HV?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4605 NONAME ; bool QFSFileEngine::open(class QFlags<enum QIODevice::OpenModeFlag>, int, class QFlags<enum QFile::FileHandleFlag>)
+	?qt_static_metacall@QEventLoop@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4606 NONAME ; void QEventLoop::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?startsWith@QStringRef@@QBE_NVQLatin1String@@W4CaseSensitivity@Qt@@@Z @ 4607 NONAME ; bool QStringRef::startsWith(class QLatin1String, enum Qt::CaseSensitivity) const
+	?staticMetaObjectExtraData@QAbstractEventDispatcher@@0UQMetaObjectExtraData@@B @ 4608 NONAME ; struct QMetaObjectExtraData const QAbstractEventDispatcher::staticMetaObjectExtraData
+	?cast@QMetaObject@@QBEPBVQObject@@PBV2@@Z @ 4609 NONAME ; class QObject const * QMetaObject::cast(class QObject const *) const
+	?staticMetaObjectExtraData@QSharedMemory@@0UQMetaObjectExtraData@@B @ 4610 NONAME ; struct QMetaObjectExtraData const QSharedMemory::staticMetaObjectExtraData
+	?pause@QFutureWatcherBase@@QAEXXZ @ 4611 NONAME ; void QFutureWatcherBase::pause(void)
+	?ensureTimerUpdate@QUnifiedTimer@@SAXXZ @ 4612 NONAME ; void QUnifiedTimer::ensureTimerUpdate(void)
+	?contains@QStringRef@@QBE?AVQBool@@VQLatin1String@@W4CaseSensitivity@Qt@@@Z @ 4613 NONAME ; class QBool QStringRef::contains(class QLatin1String, enum Qt::CaseSensitivity) const
+	?insert@QProcessEnvironment@@QAEXABV1@@Z @ 4614 NONAME ; void QProcessEnvironment::insert(class QProcessEnvironment const &)
+	?d_func@QAnimationDriver@@ABEPBVQAnimationDriverPrivate@@XZ @ 4615 NONAME ; class QAnimationDriverPrivate const * QAnimationDriver::d_func(void) const
+	?staticMetaObjectExtraData@QVariantAnimation@@0UQMetaObjectExtraData@@B @ 4616 NONAME ; struct QMetaObjectExtraData const QVariantAnimation::staticMetaObjectExtraData
+	?swap@QVariant@@QAEXAAV1@@Z @ 4617 NONAME ; void QVariant::swap(class QVariant &)
+	?topLevelDomain@QUrl@@QBE?AVQString@@XZ @ 4618 NONAME ; class QString QUrl::topLevelDomain(void) const
+	?lastIndexOf@QStringRef@@QBEHABV1@HW4CaseSensitivity@Qt@@@Z @ 4619 NONAME ; int QStringRef::lastIndexOf(class QStringRef const &, int, enum Qt::CaseSensitivity) const
+	?togglePaused@QFutureWatcherBase@@QAEXXZ @ 4620 NONAME ; void QFutureWatcherBase::togglePaused(void)
+	?qt_static_metacall@QNonContiguousByteDevice@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4621 NONAME ; void QNonContiguousByteDevice::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?stopped@QAnimationDriver@@MAEXXZ @ 4622 NONAME ; void QAnimationDriver::stopped(void)
+	?indexOf@QStringRef@@QBEHVQLatin1String@@HW4CaseSensitivity@Qt@@@Z @ 4623 NONAME ; int QStringRef::indexOf(class QLatin1String, int, enum Qt::CaseSensitivity) const
+	?toRfc4122@QUuid@@QBE?AVQByteArray@@XZ @ 4624 NONAME ; class QByteArray QUuid::toRfc4122(void) const
+	?senderSignalIndex@QObject@@IBEHXZ @ 4625 NONAME ; int QObject::senderSignalIndex(void) const
+	?convertToAscii@QAbstractConcatenable@@KAXPBVQChar@@HAAPAD@Z @ 4626 NONAME ; void QAbstractConcatenable::convertToAscii(class QChar const *, int, char * &)
+	?nsecsElapsed@QElapsedTimer@@QBE_JXZ @ 4627 NONAME ; long long QElapsedTimer::nsecsElapsed(void) const
+	?staticMetaObjectExtraData@QFinalState@@0UQMetaObjectExtraData@@B @ 4628 NONAME ; struct QMetaObjectExtraData const QFinalState::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QNonContiguousByteDevice@@0UQMetaObjectExtraData@@B @ 4629 NONAME ; struct QMetaObjectExtraData const QNonContiguousByteDevice::staticMetaObjectExtraData
+	?isResetDisabled@QNonContiguousByteDevice@@QAE_NXZ @ 4630 NONAME ; bool QNonContiguousByteDevice::isResetDisabled(void)
+	?progressRangeChanged@QFutureWatcherBase@@IAEXHH@Z @ 4631 NONAME ; void QFutureWatcherBase::progressRangeChanged(int, int)
+	?staticMetaObjectExtraData@QTranslator@@0UQMetaObjectExtraData@@B @ 4632 NONAME ; struct QMetaObjectExtraData const QTranslator::staticMetaObjectExtraData
+	?qt_static_metacall@QAbstractTransition@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4633 NONAME ; void QAbstractTransition::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QMimeData@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4634 NONAME ; void QMimeData::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QSocketNotifier@@0UQMetaObjectExtraData@@B @ 4635 NONAME ; struct QMetaObjectExtraData const QSocketNotifier::staticMetaObjectExtraData
+	?qt_static_metacall@QFile@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4636 NONAME ; void QFile::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?bcp47Name@QLocale@@QBE?AVQString@@XZ @ 4637 NONAME ; class QString QLocale::bcp47Name(void) const
+	?toCurrencyString@QLocale@@QBE?AVQString@@_JABV2@@Z @ 4638 NONAME ; class QString QLocale::toCurrencyString(long long, class QString const &) const
+	??0QSymbianSocketManager@@QAE@XZ @ 4639 NONAME ; QSymbianSocketManager::QSymbianSocketManager(void)
+	?cancel@QFutureWatcherBase@@QAEXXZ @ 4640 NONAME ; void QFutureWatcherBase::cancel(void)
+	?toUtf8@QStringRef@@QBE?AVQByteArray@@XZ @ 4641 NONAME ; class QByteArray QStringRef::toUtf8(void) const
+	?qt_static_metacall@QPropertyAnimation@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4642 NONAME ; void QPropertyAnimation::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?startsWith@QString@@QBE_NABVQStringRef@@W4CaseSensitivity@Qt@@@Z @ 4643 NONAME ; bool QString::startsWith(class QStringRef const &, enum Qt::CaseSensitivity) const
+	?unlockInternal@QMutex@@AAEXXZ @ 4644 NONAME ; void QMutex::unlockInternal(void)
+	??XQPoint@@QAEAAV0@N@Z @ 4645 NONAME ; class QPoint & QPoint::operator*=(double)
+	?qt_static_metacall@QSignalTransition@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4646 NONAME ; void QSignalTransition::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?updateAnimationsTime@QUnifiedTimer@@QAEXXZ @ 4647 NONAME ; void QUnifiedTimer::updateAnimationsTime(void)
+	??0QSystemError@@QAE@HW4ErrorScope@0@@Z @ 4648 NONAME ; QSystemError::QSystemError(int, enum QSystemError::ErrorScope)
+	?findLocale@QLocalePrivate@@SAPBU1@W4Language@QLocale@@W4Script@3@W4Country@3@@Z @ 4649 NONAME ; struct QLocalePrivate const * QLocalePrivate::findLocale(enum QLocale::Language, enum QLocale::Script, enum QLocale::Country)
+	?swap@QBitArray@@QAEXAAV1@@Z @ 4650 NONAME ; void QBitArray::swap(class QBitArray &)
+	?qt_static_metacall@QAbstractItemModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4651 NONAME ; void QAbstractItemModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?nativeKey@QSharedMemory@@QBE?AVQString@@XZ @ 4652 NONAME ; class QString QSharedMemory::nativeKey(void) const
+	?areSocketEventsBlocked@QEventDispatcherSymbian@@QBE_NXZ @ 4653 NONAME ; bool QEventDispatcherSymbian::areSocketEventsBlocked(void) const
+	?qt_static_metacall@QStateMachine@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4654 NONAME ; void QStateMachine::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?connect@QObject@@SA_NPBV1@ABVQMetaMethod@@01W4ConnectionType@Qt@@@Z @ 4655 NONAME ; bool QObject::connect(class QObject const *, class QMetaMethod const &, class QObject const *, class QMetaMethod const &, enum Qt::ConnectionType)
+	?qt_static_metacall@QSocketNotifier@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4656 NONAME ; void QSocketNotifier::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QThreadPool@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4657 NONAME ; void QThreadPool::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?tr@QFutureWatcherBase@@SA?AVQString@@PBD0H@Z @ 4658 NONAME ; class QString QFutureWatcherBase::tr(char const *, char const *, int)
+	?codeToScript@QLocalePrivate@@SA?AW4Script@QLocale@@ABVQString@@@Z @ 4659 NONAME ; enum QLocale::Script QLocalePrivate::codeToScript(class QString const &)
+	?registerRunningAnimation@QUnifiedTimer@@AAEXPAVQAbstractAnimation@@@Z @ 4660 NONAME ; void QUnifiedTimer::registerRunningAnimation(class QAbstractAnimation *)
+	?qt_static_metacall@QEventDispatcherSymbian@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4661 NONAME ; void QEventDispatcherSymbian::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?disconnect@QObject@@SA_NPBV1@ABVQMetaMethod@@01@Z @ 4662 NONAME ; bool QObject::disconnect(class QObject const *, class QMetaMethod const &, class QObject const *, class QMetaMethod const &)
+	?toByteArray@QUuid@@QBE?AVQByteArray@@XZ @ 4663 NONAME ; class QByteArray QUuid::toByteArray(void) const
+	?installAnimationDriver@QUnifiedTimer@@QAEXPAVQAnimationDriver@@@Z @ 4664 NONAME ; void QUnifiedTimer::installAnimationDriver(class QAnimationDriver *)
+	?createSeparatedList@QLocale@@QBE?AVQString@@ABVQStringList@@@Z @ 4665 NONAME ; class QString QLocale::createSeparatedList(class QStringList const &) const
+	?startsWith@QStringRef@@QBE_NABVQString@@W4CaseSensitivity@Qt@@@Z @ 4666 NONAME ; bool QStringRef::startsWith(class QString const &, enum Qt::CaseSensitivity) const
+	?firstDayOfWeek@QLocale@@QBE?AW4DayOfWeek@Qt@@XZ @ 4667 NONAME ; enum Qt::DayOfWeek QLocale::firstDayOfWeek(void) const
+	?contains@QStringRef@@QBE?AVQBool@@VQChar@@W4CaseSensitivity@Qt@@@Z @ 4668 NONAME ; class QBool QStringRef::contains(class QChar, enum Qt::CaseSensitivity) const
+	?unsLongLongToString@QLocalePrivate@@SA?AVQString@@VQChar@@00_KHHHI@Z @ 4669 NONAME ; class QString QLocalePrivate::unsLongLongToString(class QChar, class QChar, class QChar, unsigned long long, int, int, int, unsigned int)
+	?qt_static_metacall@QTimer@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4670 NONAME ; void QTimer::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?unregisterAnimation@QUnifiedTimer@@SAXPAVQAbstractAnimation@@@Z @ 4671 NONAME ; void QUnifiedTimer::unregisterAnimation(class QAbstractAnimation *)
+	?runningAnimationCount@QUnifiedTimer@@QAEHXZ @ 4672 NONAME ; int QUnifiedTimer::runningAnimationCount(void)
+	?staticMetaObjectExtraData@QObjectCleanupHandler@@0UQMetaObjectExtraData@@B @ 4673 NONAME ; struct QMetaObjectExtraData const QObjectCleanupHandler::staticMetaObjectExtraData
+	?qt_symbianGetSocketServer@@YAAAVRSocketServ@@XZ @ 4674 NONAME ; class RSocketServ & qt_symbianGetSocketServer(void)
+	?open@QFile@@QAE_NHV?$QFlags@W4OpenModeFlag@QIODevice@@@@V?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4675 NONAME ; bool QFile::open(int, class QFlags<enum QIODevice::OpenModeFlag>, class QFlags<enum QFile::FileHandleFlag>)
+	?quoteString@QLocale@@QBE?AVQString@@ABVQStringRef@@W4QuotationStyle@1@@Z @ 4676 NONAME ; class QString QLocale::quoteString(class QStringRef const &, enum QLocale::QuotationStyle) const
+	?qt_metacast@QAnimationDriver@@UAEPAXPBD@Z @ 4677 NONAME ; void * QAnimationDriver::qt_metacast(char const *)
+	?qt_static_metacall@QSignalMapper@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4678 NONAME ; void QSignalMapper::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?getStaticMetaObject@QFutureWatcherBase@@SAABUQMetaObject@@XZ @ 4679 NONAME ; struct QMetaObject const & QFutureWatcherBase::getStaticMetaObject(void)
+	?toCurrencyString@QLocale@@QBE?AVQString@@_KABV2@@Z @ 4680 NONAME ; class QString QLocale::toCurrencyString(unsigned long long, class QString const &) const
+	?trUtf8@QFutureWatcherBase@@SA?AVQString@@PBD0H@Z @ 4681 NONAME ; class QString QFutureWatcherBase::trUtf8(char const *, char const *, int)
+	?count@QStringRef@@QBEHABVQString@@W4CaseSensitivity@Qt@@@Z @ 4682 NONAME ; int QStringRef::count(class QString const &, enum Qt::CaseSensitivity) const
+	?endsWith@QStringRef@@QBE_NVQChar@@W4CaseSensitivity@Qt@@@Z @ 4683 NONAME ; bool QStringRef::endsWith(class QChar, enum Qt::CaseSensitivity) const
+	?getSocketServer@QSymbianSocketManager@@QAEAAVRSocketServ@@XZ @ 4684 NONAME ; class RSocketServ & QSymbianSocketManager::getSocketServer(void)
+	?qt_static_metacall@QTimeLine@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4685 NONAME ; void QTimeLine::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QUnifiedTimer@@AAE@XZ @ 4686 NONAME ; QUnifiedTimer::QUnifiedTimer(void)
+	?staticMetaObjectExtraData@QFutureWatcherBase@@0UQMetaObjectExtraData@@B @ 4687 NONAME ; struct QMetaObjectExtraData const QFutureWatcherBase::staticMetaObjectExtraData
+	?open@QFSFileEngine@@QAE_NV?$QFlags@W4OpenModeFlag@QIODevice@@@@PAU__sFILE@@V?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4688 NONAME ; bool QFSFileEngine::open(class QFlags<enum QIODevice::OpenModeFlag>, struct __sFILE *, class QFlags<enum QFile::FileHandleFlag>)
+	?createMutex@QMutexPool@@AAEPAVQMutex@@H@Z @ 4689 NONAME ; class QMutex * QMutexPool::createMutex(int)
+	??0QCoreApplicationPrivate@@QAE@AAHPAPADI@Z @ 4690 NONAME ; QCoreApplicationPrivate::QCoreApplicationPrivate(int &, char * *, unsigned int)
+	??1QActiveObject@@UAE@XZ @ 4691 NONAME ; QActiveObject::~QActiveObject(void)
+	?maybeDeferSocketEvent@QActiveObject@@QAE_NXZ @ 4692 NONAME ; bool QActiveObject::maybeDeferSocketEvent(void)
+	?addDeferredSocketActiveObject@QEventDispatcherSymbian@@QAEXPAVQActiveObject@@@Z @ 4693 NONAME ; void QEventDispatcherSymbian::addDeferredSocketActiveObject(class QActiveObject *)
+	?qt_static_metacall@QSequentialAnimationGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4694 NONAME ; void QSequentialAnimationGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QCoreApplication@@QAE@AAHPAPADH@Z @ 4695 NONAME ; QCoreApplication::QCoreApplication(int &, char * *, int)
+	?staticMetaObjectExtraData@QTextCodecPlugin@@0UQMetaObjectExtraData@@B @ 4696 NONAME ; struct QMetaObjectExtraData const QTextCodecPlugin::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QStateMachine@@0UQMetaObjectExtraData@@B @ 4697 NONAME ; struct QMetaObjectExtraData const QStateMachine::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QAbstractTransition@@0UQMetaObjectExtraData@@B @ 4698 NONAME ; struct QMetaObjectExtraData const QAbstractTransition::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QProcess@@0UQMetaObjectExtraData@@B @ 4699 NONAME ; struct QMetaObjectExtraData const QProcess::staticMetaObjectExtraData
+	?qt_static_metacall@QProcess@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4700 NONAME ; void QProcess::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?toCurrencyString@QLocale@@QBE?AVQString@@MABV2@@Z @ 4701 NONAME ; class QString QLocale::toCurrencyString(float, class QString const &) const
+	?uiLanguages@QLocale@@QBE?AVQStringList@@XZ @ 4702 NONAME ; class QStringList QLocale::uiLanguages(void) const
+	?qt_metacall@QFutureWatcherBase@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 4703 NONAME ; int QFutureWatcherBase::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?weekdays@QLocale@@QBE?AV?$QList@W4DayOfWeek@Qt@@@@XZ @ 4704 NONAME ; class QList<enum Qt::DayOfWeek> QLocale::weekdays(void) const
+	??0QAnimationDriver@@QAE@PAVQObject@@@Z @ 4705 NONAME ; QAnimationDriver::QAnimationDriver(class QObject *)
+	?qt_static_metacall@QEventTransition@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4706 NONAME ; void QEventTransition::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?lastIndexOf@QStringRef@@QBEHVQLatin1String@@HW4CaseSensitivity@Qt@@@Z @ 4707 NONAME ; int QStringRef::lastIndexOf(class QLatin1String, int, enum Qt::CaseSensitivity) const
+	?qt_static_metacall@QAbstractAnimation@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4708 NONAME ; void QAbstractAnimation::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QAnimationDriverPrivate@@QAE@XZ @ 4709 NONAME ; QAnimationDriverPrivate::QAnimationDriverPrivate(void)
+	??XQPoint@@QAEAAV0@H@Z @ 4710 NONAME ; class QPoint & QPoint::operator*=(int)
+	?staticMetaObjectExtraData@QIODevice@@0UQMetaObjectExtraData@@B @ 4711 NONAME ; struct QMetaObjectExtraData const QIODevice::staticMetaObjectExtraData
+	??1QSymbianSocketManager@@QAE@XZ @ 4712 NONAME ; QSymbianSocketManager::~QSymbianSocketManager(void)
+	?resumed@QFutureWatcherBase@@IAEXXZ @ 4713 NONAME ; void QFutureWatcherBase::resumed(void)
+	?setPaused@QFutureWatcherBase@@QAEX_N@Z @ 4714 NONAME ; void QFutureWatcherBase::setPaused(bool)
+	?qt_static_metacall@QTranslator@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4715 NONAME ; void QTranslator::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?endsWith@QString@@QBE_NABVQStringRef@@W4CaseSensitivity@Qt@@@Z @ 4716 NONAME ; bool QString::endsWith(class QStringRef const &, enum Qt::CaseSensitivity) const
+	?canceled@QFutureWatcherBase@@IAEXXZ @ 4717 NONAME ; void QFutureWatcherBase::canceled(void)
+	?qt_static_metacall@QThread@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4718 NONAME ; void QThread::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?progressTextChanged@QFutureWatcherBase@@IAEXABVQString@@@Z @ 4719 NONAME ; void QFutureWatcherBase::progressTextChanged(class QString const &)
+	?staticMetaObjectExtraData@QFile@@0UQMetaObjectExtraData@@B @ 4720 NONAME ; struct QMetaObjectExtraData const QFile::staticMetaObjectExtraData
+	?trUtf8@QAnimationDriver@@SA?AVQString@@PBD0@Z @ 4721 NONAME ; class QString QAnimationDriver::trUtf8(char const *, char const *)
+	?matchingLocales@QLocale@@SA?AV?$QList@VQLocale@@@@W4Language@1@W4Script@1@W4Country@1@@Z @ 4722 NONAME ; class QList<class QLocale> QLocale::matchingLocales(enum QLocale::Language, enum QLocale::Script, enum QLocale::Country)
+	?install@QAnimationDriver@@QAEXXZ @ 4723 NONAME ; void QAnimationDriver::install(void)
+	?qt_static_metacall@QHistoryState@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4724 NONAME ; void QHistoryState::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?countryCode@QLocalePrivate@@QBE?AVQString@@XZ @ 4725 NONAME ; class QString QLocalePrivate::countryCode(void) const
+	?staticMetaObjectExtraData@QAnimationDriver@@0UQMetaObjectExtraData@@B @ 4726 NONAME ; struct QMetaObjectExtraData const QAnimationDriver::staticMetaObjectExtraData
+	?qt_metacall@QAnimationDriver@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 4727 NONAME ; int QAnimationDriver::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?toCurrencyString@QLocale@@QBE?AVQString@@NABV2@@Z @ 4728 NONAME ; class QString QLocale::toCurrencyString(double, class QString const &) const
+	?endsWith@QStringRef@@QBE_NABVQString@@W4CaseSensitivity@Qt@@@Z @ 4729 NONAME ; bool QStringRef::endsWith(class QString const &, enum Qt::CaseSensitivity) const
+	?load@QTranslator@@QAE_NABVQLocale@@ABVQString@@111@Z @ 4730 NONAME ; bool QTranslator::load(class QLocale const &, class QString const &, class QString const &, class QString const &, class QString const &)
+	?lockInline@QMutex@@QAEXXZ @ 4731 NONAME ; void QMutex::lockInline(void)
+	??_EQActiveObject@@UAE@I@Z @ 4732 NONAME ; QActiveObject::~QActiveObject(unsigned int)
+	?toUpper@QLocale@@QBE?AVQString@@ABV2@@Z @ 4733 NONAME ; class QString QLocale::toUpper(class QString const &) const
+	?staticMetaObjectExtraData@QSignalTransition@@0UQMetaObjectExtraData@@B @ 4734 NONAME ; struct QMetaObjectExtraData const QSignalTransition::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QMimeData@@0UQMetaObjectExtraData@@B @ 4735 NONAME ; struct QMetaObjectExtraData const QMimeData::staticMetaObjectExtraData
+	??0QLocale@@QAE@W4Language@0@W4Script@0@W4Country@0@@Z @ 4736 NONAME ; QLocale::QLocale(enum QLocale::Language, enum QLocale::Script, enum QLocale::Country)
+	?fromRfc4122@QUuid@@SA?AU1@ABVQByteArray@@@Z @ 4737 NONAME ; struct QUuid QUuid::fromRfc4122(class QByteArray const &)
+	?staticMetaObjectExtraData@QEventTransition@@0UQMetaObjectExtraData@@B @ 4738 NONAME ; struct QMetaObjectExtraData const QEventTransition::staticMetaObjectExtraData
+	?staticMetaObject@QFutureWatcherBase@@2UQMetaObject@@B @ 4739 NONAME ; struct QMetaObject const QFutureWatcherBase::staticMetaObject
+	?reactivateAndComplete@QActiveObject@@QAEXXZ @ 4740 NONAME ; void QActiveObject::reactivateAndComplete(void)
+	?keys@QProcessEnvironment@@QBE?AVQStringList@@XZ @ 4741 NONAME ; class QStringList QProcessEnvironment::keys(void) const
+	?staticMetaObjectExtraData@QPropertyAnimation@@0UQMetaObjectExtraData@@B @ 4742 NONAME ; struct QMetaObjectExtraData const QPropertyAnimation::staticMetaObjectExtraData
+	?hasError@QXmlStreamWriter@@QBE_NXZ @ 4743 NONAME ; bool QXmlStreamWriter::hasError(void) const
+	?endsWith@QStringRef@@QBE_NABV1@W4CaseSensitivity@Qt@@@Z @ 4744 NONAME ; bool QStringRef::endsWith(class QStringRef const &, enum Qt::CaseSensitivity) const
+	??_EQUnifiedTimer@@UAE@I@Z @ 4745 NONAME ; QUnifiedTimer::~QUnifiedTimer(unsigned int)
+	?setTimingInterval@QUnifiedTimer@@QAEXH@Z @ 4746 NONAME ; void QUnifiedTimer::setTimingInterval(int)
+	?qt_static_metacall@QPluginLoader@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4747 NONAME ; void QPluginLoader::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?closestPauseAnimationTimeToFinish@QUnifiedTimer@@AAEHXZ @ 4748 NONAME ; int QUnifiedTimer::closestPauseAnimationTimeToFinish(void)
+	?quoteString@QLocale@@QBE?AVQString@@ABV2@W4QuotationStyle@1@@Z @ 4749 NONAME ; class QString QLocale::quoteString(class QString const &, enum QLocale::QuotationStyle) const
+	?qt_static_metacall@QState@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4750 NONAME ; void QState::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?currencySymbol@QLocale@@QBE?AVQString@@W4CurrencySymbolFormat@1@@Z @ 4751 NONAME ; class QString QLocale::currencySymbol(enum QLocale::CurrencySymbolFormat) const
+	?lastIndexOf@QString@@QBEHABVQStringRef@@HW4CaseSensitivity@Qt@@@Z @ 4752 NONAME ; int QString::lastIndexOf(class QStringRef const &, int, enum Qt::CaseSensitivity) const
+	?qt_static_metacall@QAnimationDriver@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4753 NONAME ; void QAnimationDriver::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?trUtf8@QFutureWatcherBase@@SA?AVQString@@PBD0@Z @ 4754 NONAME ; class QString QFutureWatcherBase::trUtf8(char const *, char const *)
+	??1QAnimationDriverPrivate@@UAE@XZ @ 4755 NONAME ; QAnimationDriverPrivate::~QAnimationDriverPrivate(void)
+	?d_func@QFutureWatcherBase@@ABEPBVQFutureWatcherBasePrivate@@XZ @ 4756 NONAME ; class QFutureWatcherBasePrivate const * QFutureWatcherBase::d_func(void) const
+	?metaObject@QFutureWatcherBase@@UBEPBUQMetaObject@@XZ @ 4757 NONAME ; struct QMetaObject const * QFutureWatcherBase::metaObject(void) const
+	?swap@QUrl@@QAEXAAV1@@Z @ 4758 NONAME ; void QUrl::swap(class QUrl &)
+	??_EQAnimationDriverPrivate@@UAE@I@Z @ 4759 NONAME ; QAnimationDriverPrivate::~QAnimationDriverPrivate(unsigned int)
+	?toCurrencyString@QLocale@@QBE?AVQString@@FABV2@@Z @ 4760 NONAME ; class QString QLocale::toCurrencyString(short, class QString const &) const
+	??_EQAnimationDriver@@UAE@I@Z @ 4761 NONAME ; QAnimationDriver::~QAnimationDriver(unsigned int)
+	?staticMetaObjectExtraData@QPauseAnimation@@0UQMetaObjectExtraData@@B @ 4762 NONAME ; struct QMetaObjectExtraData const QPauseAnimation::staticMetaObjectExtraData
+	?qt_static_metacall@QAbstractEventDispatcher@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4763 NONAME ; void QAbstractEventDispatcher::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QSettings@@0UQMetaObjectExtraData@@B @ 4764 NONAME ; struct QMetaObjectExtraData const QSettings::staticMetaObjectExtraData
+	?instance@QUnifiedTimer@@SAPAV1@_N@Z @ 4765 NONAME ; class QUnifiedTimer * QUnifiedTimer::instance(bool)
+	?setSlowdownFactor@QUnifiedTimer@@QAEXM@Z @ 4766 NONAME ; void QUnifiedTimer::setSlowdownFactor(float)
+	?isRunning@QAnimationDriver@@QBE_NXZ @ 4767 NONAME ; bool QAnimationDriver::isRunning(void) const
+	?open@QFSFileEngine@@QAE_NV?$QFlags@W4OpenModeFlag@QIODevice@@@@ABVRFile@@V?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4768 NONAME ; bool QFSFileEngine::open(class QFlags<enum QIODevice::OpenModeFlag>, class RFile const &, class QFlags<enum QFile::FileHandleFlag>)
+	?script@QLocale@@QBE?AW4Script@1@XZ @ 4769 NONAME ; enum QLocale::Script QLocale::script(void) const
+	?nativeLanguageName@QLocale@@QBE?AVQString@@XZ @ 4770 NONAME ; class QString QLocale::nativeLanguageName(void) const
+	?open@QFile@@QAE_NABVRFile@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@V?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4771 NONAME ; bool QFile::open(class RFile const &, class QFlags<enum QIODevice::OpenModeFlag>, class QFlags<enum QFile::FileHandleFlag>)
+	?qt_static_metacall@QObject@@CAXPAV1@W4Call@QMetaObject@@HPAPAX@Z @ 4772 NONAME ; void QObject::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?count@QStringRef@@QBEHABV1@W4CaseSensitivity@Qt@@@Z @ 4773 NONAME ; int QStringRef::count(class QStringRef const &, enum Qt::CaseSensitivity) const
+	?staticMetaObjectExtraData@QSignalMapper@@0UQMetaObjectExtraData@@B @ 4774 NONAME ; struct QMetaObjectExtraData const QSignalMapper::staticMetaObjectExtraData
+	?contains@QStringRef@@QBE?AVQBool@@ABVQString@@W4CaseSensitivity@Qt@@@Z @ 4775 NONAME ; class QBool QStringRef::contains(class QString const &, enum Qt::CaseSensitivity) const
+	?tryLockInline@QMutex@@QAE_NXZ @ 4776 NONAME ; bool QMutex::tryLockInline(void)
+	?lastIndexOf@QStringRef@@QBEHABVQString@@HW4CaseSensitivity@Qt@@@Z @ 4777 NONAME ; int QStringRef::lastIndexOf(class QString const &, int, enum Qt::CaseSensitivity) const
+	?scriptCode@QLocalePrivate@@QBE?AVQString@@XZ @ 4778 NONAME ; class QString QLocalePrivate::scriptCode(void) const
+	?removeSocket@QSymbianSocketManager@@QAE_NABVRSocket@@@Z @ 4779 NONAME ; bool QSymbianSocketManager::removeSocket(class RSocket const &)
+	?staticMetaObjectExtraData@QState@@0UQMetaObjectExtraData@@B @ 4780 NONAME ; struct QMetaObjectExtraData const QState::staticMetaObjectExtraData
+	?lockInternal@QMutex@@AAEXXZ @ 4781 NONAME ; void QMutex::lockInternal(void)
+	?scope@QSystemError@@QAE?AW4ErrorScope@1@XZ @ 4782 NONAME ; enum QSystemError::ErrorScope QSystemError::scope(void)
+	?staticMetaObjectExtraData@QSequentialAnimationGroup@@0UQMetaObjectExtraData@@B @ 4783 NONAME ; struct QMetaObjectExtraData const QSequentialAnimationGroup::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QEventDispatcherSymbian@@0UQMetaObjectExtraData@@B @ 4784 NONAME ; struct QMetaObjectExtraData const QEventDispatcherSymbian::staticMetaObjectExtraData
+	??0QActiveObject@@QAE@HPAVQEventDispatcherSymbian@@@Z @ 4785 NONAME ; QActiveObject::QActiveObject(int, class QEventDispatcherSymbian *)
+	?staticMetaObjectExtraData@QCoreApplication@@0UQMetaObjectExtraData@@B @ 4786 NONAME ; struct QMetaObjectExtraData const QCoreApplication::staticMetaObjectExtraData
+	?d_func@QFutureWatcherBase@@AAEPAVQFutureWatcherBasePrivate@@XZ @ 4787 NONAME ; class QFutureWatcherBasePrivate * QFutureWatcherBase::d_func(void)
+	?toCurrencyString@QLocale@@QBE?AVQString@@GABV2@@Z @ 4788 NONAME ; class QString QLocale::toCurrencyString(unsigned short, class QString const &) const
+	?qt_static_metacall@QTextCodecPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4789 NONAME ; void QTextCodecPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?codeToLanguage@QLocalePrivate@@SA?AW4Language@QLocale@@ABVQString@@@Z @ 4790 NONAME ; enum QLocale::Language QLocalePrivate::codeToLanguage(class QString const &)
+	?toString@QSystemError@@QAE?AVQString@@XZ @ 4791 NONAME ; class QString QSystemError::toString(void)
+	?toLocal8Bit@QStringRef@@QBE?AVQByteArray@@XZ @ 4792 NONAME ; class QByteArray QStringRef::toLocal8Bit(void) const
+	?indexOf@QStringRef@@QBEHVQChar@@HW4CaseSensitivity@Qt@@@Z @ 4793 NONAME ; int QStringRef::indexOf(class QChar, int, enum Qt::CaseSensitivity) const
+	?toUcs4@QStringRef@@QBE?AV?$QVector@I@@XZ @ 4794 NONAME ; class QVector<unsigned int> QStringRef::toUcs4(void) const
+	?qTopLevelDomain@@YA?AVQString@@ABV1@@Z @ 4795 NONAME ; class QString qTopLevelDomain(class QString const &)
+	?staticMetaObject@QAnimationDriver@@2UQMetaObject@@B @ 4796 NONAME ; struct QMetaObject const QAnimationDriver::staticMetaObject
+	?unregisterRunningAnimation@QUnifiedTimer@@AAEXPAVQAbstractAnimation@@@Z @ 4797 NONAME ; void QUnifiedTimer::unregisterRunningAnimation(class QAbstractAnimation *)
+	?isLocalFile@QUrl@@QBE_NXZ @ 4798 NONAME ; bool QUrl::isLocalFile(void) const
+	?swap@QByteArray@@QAEXAAV1@@Z @ 4799 NONAME ; void QByteArray::swap(class QByteArray &)
+	?staticMetaObjectExtraData@QTimeLine@@0UQMetaObjectExtraData@@B @ 4800 NONAME ; struct QMetaObjectExtraData const QTimeLine::staticMetaObjectExtraData
+	?tr@QAnimationDriver@@SA?AVQString@@PBD0H@Z @ 4801 NONAME ; class QString QAnimationDriver::tr(char const *, char const *, int)
+	?doubleToString@QLocalePrivate@@SA?AVQString@@VQChar@@00000NHW4DoubleForm@1@HI@Z @ 4802 NONAME ; class QString QLocalePrivate::doubleToString(class QChar, class QChar, class QChar, class QChar, class QChar, class QChar, double, int, enum QLocalePrivate::DoubleForm, int, unsigned int)
+	?toLatin1@QStringRef@@QBE?AVQByteArray@@XZ @ 4803 NONAME ; class QByteArray QStringRef::toLatin1(void) const
+	?staticMetaObjectExtraData@QAbstractItemModel@@0UQMetaObjectExtraData@@B @ 4804 NONAME ; struct QMetaObjectExtraData const QAbstractItemModel::staticMetaObjectExtraData
+	??1QAnimationDriver@@UAE@XZ @ 4805 NONAME ; QAnimationDriver::~QAnimationDriver(void)
+	?codeToCountry@QLocalePrivate@@SA?AW4Country@QLocale@@ABVQString@@@Z @ 4806 NONAME ; enum QLocale::Country QLocalePrivate::codeToCountry(class QString const &)
+	?staticMetaObjectExtraData@QAbstractAnimation@@0UQMetaObjectExtraData@@B @ 4807 NONAME ; struct QMetaObjectExtraData const QAbstractAnimation::staticMetaObjectExtraData
+	??0QUuid@@QAE@ABVQByteArray@@@Z @ 4808 NONAME ; QUuid::QUuid(class QByteArray const &)
+	?qt_static_metacall@QVariantAnimation@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4809 NONAME ; void QVariantAnimation::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QFinalState@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4810 NONAME ; void QFinalState::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?tr@QAnimationDriver@@SA?AVQString@@PBD0@Z @ 4811 NONAME ; class QString QAnimationDriver::tr(char const *, char const *)
+	?waitForDone@QThreadPool@@QAE_NH@Z @ 4812 NONAME ; bool QThreadPool::waitForDone(int)
+	?qt_static_metacall@QSharedMemory@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4813 NONAME ; void QSharedMemory::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QObjectCleanupHandler@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4814 NONAME ; void QObjectCleanupHandler::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QSystemError@@QAE@XZ @ 4815 NONAME ; QSystemError::QSystemError(void)
+	?qt_static_metacall@QAnimationGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4816 NONAME ; void QAnimationGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?countryId@QLocalePrivate@@QBEGXZ @ 4817 NONAME ; unsigned short QLocalePrivate::countryId(void) const
+	?qt_static_metacall@QParallelAnimationGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4818 NONAME ; void QParallelAnimationGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?convertToAscii@QAbstractConcatenable@@KAXVQChar@@AAPAD@Z @ 4819 NONAME ; void QAbstractConcatenable::convertToAscii(class QChar, char * &)
+	?resultReadyAt@QFutureWatcherBase@@IAEXH@Z @ 4820 NONAME ; void QFutureWatcherBase::resultReadyAt(int)
+	?endsWith@QStringRef@@QBE_NVQLatin1String@@W4CaseSensitivity@Qt@@@Z @ 4821 NONAME ; bool QStringRef::endsWith(class QLatin1String, enum Qt::CaseSensitivity) const
+	?stop@QAnimationDriver@@AAEXXZ @ 4822 NONAME ; void QAnimationDriver::stop(void)
+	?toCurrencyString@QLocale@@QBE?AVQString@@HABV2@@Z @ 4823 NONAME ; class QString QLocale::toCurrencyString(int, class QString const &) const
+	?staticMetaObjectExtraData@QEventLoop@@0UQMetaObjectExtraData@@B @ 4824 NONAME ; struct QMetaObjectExtraData const QEventLoop::staticMetaObjectExtraData
+	?qt_static_metacall@QAbstractState@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4825 NONAME ; void QAbstractState::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QFactoryLoader@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4826 NONAME ; void QFactoryLoader::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QFactoryLoader@@0UQMetaObjectExtraData@@B @ 4827 NONAME ; struct QMetaObjectExtraData const QFactoryLoader::staticMetaObjectExtraData
+	?getStaticMetaObject@QAnimationDriver@@SAABUQMetaObject@@XZ @ 4828 NONAME ; struct QMetaObject const & QAnimationDriver::getStaticMetaObject(void)
+	?metaObject@QAnimationDriver@@UBEPBUQMetaObject@@XZ @ 4829 NONAME ; struct QMetaObject const * QAnimationDriver::metaObject(void) const
+	?placeMetaCall@QMetaCallEvent@@UAEXPAVQObject@@@Z @ 4830 NONAME ; void QMetaCallEvent::placeMetaCall(class QObject *)
+	?resetInternalData@QAbstractItemModel@@IAEXXZ @ 4831 NONAME ; void QAbstractItemModel::resetInternalData(void)
+	?d_func@QAnimationDriver@@AAEPAVQAnimationDriverPrivate@@XZ @ 4832 NONAME ; class QAnimationDriverPrivate * QAnimationDriver::d_func(void)
+	??0QFileInfo@@QAE@PAVQFileInfoPrivate@@@Z @ 4833 NONAME ; QFileInfo::QFileInfo(class QFileInfoPrivate *)
+	?longLongToString@QLocalePrivate@@SA?AVQString@@VQChar@@000_JHHHI@Z @ 4834 NONAME ; class QString QLocalePrivate::longLongToString(class QChar, class QChar, class QChar, class QChar, long long, int, int, int, unsigned int)
+	?app_compile_version@QCoreApplicationPrivate@@2HA @ 4835 NONAME ; int QCoreApplicationPrivate::app_compile_version
+	?create@QNonContiguousByteDeviceFactory@@SAPAVQNonContiguousByteDevice@@V?$QSharedPointer@VQRingBuffer@@@@@Z @ 4836 NONAME ; class QNonContiguousByteDevice * QNonContiguousByteDeviceFactory::create(class QSharedPointer<class QRingBuffer>)
+	?staticMetaObjectExtraData@QAbstractListModel@@0UQMetaObjectExtraData@@B @ 4837 NONAME ; struct QMetaObjectExtraData const QAbstractListModel::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QTemporaryFile@@0UQMetaObjectExtraData@@B @ 4838 NONAME ; struct QMetaObjectExtraData const QTemporaryFile::staticMetaObjectExtraData
+	?qt_static_metacall@QLibrary@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4839 NONAME ; void QLibrary::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?restartAnimationTimer@QUnifiedTimer@@QAEXXZ @ 4840 NONAME ; void QUnifiedTimer::restartAnimationTimer(void)
+	?paused@QFutureWatcherBase@@IAEXXZ @ 4841 NONAME ; void QFutureWatcherBase::paused(void)
+	?count@QStringRef@@QBEHVQChar@@W4CaseSensitivity@Qt@@@Z @ 4842 NONAME ; int QStringRef::count(class QChar, enum Qt::CaseSensitivity) const
+	?staticMetaObjectExtraData@QAbstractTableModel@@0UQMetaObjectExtraData@@B @ 4843 NONAME ; struct QMetaObjectExtraData const QAbstractTableModel::staticMetaObjectExtraData
+	?open@QFile@@QAE_NPAU__sFILE@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@V?$QFlags@W4FileHandleFlag@QFile@@@@@Z @ 4844 NONAME ; bool QFile::open(struct __sFILE *, class QFlags<enum QIODevice::OpenModeFlag>, class QFlags<enum QFile::FileHandleFlag>)
+	?toAscii@QStringRef@@QBE?AVQByteArray@@XZ @ 4845 NONAME ; class QByteArray QStringRef::toAscii(void) const
+	?qt_static_metacall@QPauseAnimation@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4846 NONAME ; void QPauseAnimation::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?bcp47Name@QLocalePrivate@@QBE?AVQString@@XZ @ 4847 NONAME ; class QString QLocalePrivate::bcp47Name(void) const
+	?qt_static_metacall@QAbstractListModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4848 NONAME ; void QAbstractListModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?setDefaultConnection@QSymbianSocketManager@@QAEXPAVRConnection@@@Z @ 4849 NONAME ; void QSymbianSocketManager::setDefaultConnection(class RConnection *)
+	?qt_static_metacall@QAbstractTableModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4850 NONAME ; void QAbstractTableModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?lookupSocket@QSymbianSocketManager@@QBE_NHAAVRSocket@@@Z @ 4851 NONAME ; bool QSymbianSocketManager::lookupSocket(int, class RSocket &) const
+	?staticMetaObjectExtraData@QLibrary@@0UQMetaObjectExtraData@@B @ 4852 NONAME ; struct QMetaObjectExtraData const QLibrary::staticMetaObjectExtraData
+	?setConsistentTiming@QUnifiedTimer@@QAEX_N@Z @ 4853 NONAME ; void QUnifiedTimer::setConsistentTiming(bool)
+	?staticMetaObjectExtraData@QObject@@0UQMetaObjectExtraData@@B @ 4854 NONAME ; struct QMetaObjectExtraData const QObject::staticMetaObjectExtraData
+	?started@QAnimationDriver@@MAEXXZ @ 4855 NONAME ; void QAnimationDriver::started(void)
+	??1QUnifiedTimer@@UAE@XZ @ 4856 NONAME ; QUnifiedTimer::~QUnifiedTimer(void)
+	?setSlowModeEnabled@QUnifiedTimer@@QAEX_N@Z @ 4857 NONAME ; void QUnifiedTimer::setSlowModeEnabled(bool)
+	?toCurrencyString@QLocale@@QBE?AVQString@@IABV2@@Z @ 4858 NONAME ; class QString QLocale::toCurrencyString(unsigned int, class QString const &) const
+	?updateAnimationTimer@QUnifiedTimer@@SAXXZ @ 4859 NONAME ; void QUnifiedTimer::updateAnimationTimer(void)
+	?qt_static_metacall@QIODevice@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4860 NONAME ; void QIODevice::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?finished@QFutureWatcherBase@@IAEXXZ @ 4861 NONAME ; void QFutureWatcherBase::finished(void)
+	?qt_static_metacall@QTemporaryFile@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4862 NONAME ; void QTemporaryFile::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?instance@QSymbianSocketManager@@SAAAV1@XZ @ 4863 NONAME ; class QSymbianSocketManager & QSymbianSocketManager::instance(void)
+	?getLangAndCountry@QLocalePrivate@@SAXABVQString@@AAW4Language@QLocale@@AAW4Script@4@AAW4Country@4@@Z @ 4864 NONAME ; void QLocalePrivate::getLangAndCountry(class QString const &, enum QLocale::Language &, enum QLocale::Script &, enum QLocale::Country &)
+	?qt_static_metacall@QCoreApplication@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 4865 NONAME ; void QCoreApplication::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?nativeCountryName@QLocale@@QBE?AVQString@@XZ @ 4866 NONAME ; class QString QLocale::nativeCountryName(void) const
+	?resume@QFutureWatcherBase@@QAEXXZ @ 4867 NONAME ; void QFutureWatcherBase::resume(void)
+	?error@QSystemError@@QAEHXZ @ 4868 NONAME ; int QSystemError::error(void)
+	?addSocket@QSymbianSocketManager@@QAEHABVRSocket@@@Z @ 4869 NONAME ; int QSymbianSocketManager::addSocket(class RSocket const &)
+	?indexOf@QString@@QBEHABVQStringRef@@HW4CaseSensitivity@Qt@@@Z @ 4870 NONAME ; int QString::indexOf(class QStringRef const &, int, enum Qt::CaseSensitivity) const
+	?lastIndexOf@QStringRef@@QBEHVQChar@@HW4CaseSensitivity@Qt@@@Z @ 4871 NONAME ; int QStringRef::lastIndexOf(class QChar, int, enum Qt::CaseSensitivity) const
+	?advance@QAnimationDriver@@QAEXXZ @ 4872 NONAME ; void QAnimationDriver::advance(void)
+	?start@QAnimationDriver@@AAEXXZ @ 4873 NONAME ; void QAnimationDriver::start(void)
+	?unlockInline@QMutex@@QAEXXZ @ 4874 NONAME ; void QMutex::unlockInline(void)
+	?staticMetaObjectExtraData@QAnimationGroup@@0UQMetaObjectExtraData@@B @ 4875 NONAME ; struct QMetaObjectExtraData const QAnimationGroup::staticMetaObjectExtraData
+	?resultsReadyAt@QFutureWatcherBase@@IAEXHH@Z @ 4876 NONAME ; void QFutureWatcherBase::resultsReadyAt(int, int)
+	?scriptToString@QLocale@@SA?AVQString@@W4Script@1@@Z @ 4877 NONAME ; class QString QLocale::scriptToString(enum QLocale::Script)
+	?languageId@QLocalePrivate@@QBEGXZ @ 4878 NONAME ; unsigned short QLocalePrivate::languageId(void) const
+	?started@QFutureWatcherBase@@IAEXXZ @ 4879 NONAME ; void QFutureWatcherBase::started(void)
+	?staticMetaObjectExtraData@QAbstractState@@0UQMetaObjectExtraData@@B @ 4880 NONAME ; struct QMetaObjectExtraData const QAbstractState::staticMetaObjectExtraData
 
diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def
index c39ff18..3bb039d 100644
--- a/src/s60installs/bwins/QtDeclarativeu.def
+++ b/src/s60installs/bwins/QtDeclarativeu.def
@@ -1893,66 +1893,75 @@ EXPORTS
 	?setLayoutMirror@QDeclarativeItemPrivate@@QAEX_N@Z @ 1892 NONAME ; void QDeclarativeItemPrivate::setLayoutMirror(bool)
 	?setImplicitLayoutMirror@QDeclarativeItemPrivate@@QAEX_N0@Z @ 1893 NONAME ; void QDeclarativeItemPrivate::setImplicitLayoutMirror(bool, bool)
 	?isMirrored@QDeclarativeItemPrivate@@QBE_NXZ @ 1894 NONAME ; bool QDeclarativeItemPrivate::isMirrored(void) const
-	?qt_static_metacall@QDeclarativeExtensionPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1895 NONAME ; void QDeclarativeExtensionPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QDeclarativeEngine@@0UQMetaObjectExtraData@@B @ 1896 NONAME ; struct QMetaObjectExtraData const QDeclarativeEngine::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDeclarativeComponent@@0UQMetaObjectExtraData@@B @ 1897 NONAME ; struct QMetaObjectExtraData const QDeclarativeComponent::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDeclarativeState@@0UQMetaObjectExtraData@@B @ 1898 NONAME ; struct QMetaObjectExtraData const QDeclarativeState::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QPacketProtocol@@0UQMetaObjectExtraData@@B @ 1899 NONAME ; struct QMetaObjectExtraData const QPacketProtocol::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDeclarativeExtensionPlugin@@0UQMetaObjectExtraData@@B @ 1900 NONAME ; struct QMetaObjectExtraData const QDeclarativeExtensionPlugin::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDeclarativeContext@@0UQMetaObjectExtraData@@B @ 1901 NONAME ; struct QMetaObjectExtraData const QDeclarativeContext::staticMetaObjectExtraData
-	?qt_static_metacall@QPacketProtocol@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1902 NONAME ; void QPacketProtocol::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QDeclarativeDebugServer@@0UQMetaObjectExtraData@@B @ 1903 NONAME ; struct QMetaObjectExtraData const QDeclarativeDebugServer::staticMetaObjectExtraData
-	?qt_static_metacall@QDeclarativeStateOperation@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1904 NONAME ; void QDeclarativeStateOperation::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??_EQDeclarativeListReference@@QAE@I@Z @ 1895 NONAME ABSENT ; QDeclarativeListReference::~QDeclarativeListReference(unsigned int)
+	??_EVariant@QDeclarativeParser@@QAE@I@Z @ 1896 NONAME ABSENT ; QDeclarativeParser::Variant::~Variant(unsigned int)
+	??_EQDeclarativeProperty@@QAE@I@Z @ 1897 NONAME ABSENT ; QDeclarativeProperty::~QDeclarativeProperty(unsigned int)
+	??_EQDeclarativeError@@QAE@I@Z @ 1898 NONAME ABSENT ; QDeclarativeError::~QDeclarativeError(unsigned int)
+	??_EQDeclarativeCustomParserProperty@@QAE@I@Z @ 1899 NONAME ABSENT ; QDeclarativeCustomParserProperty::~QDeclarativeCustomParserProperty(unsigned int)
+	??0QDeclarativeExtensionInterface@@QAE@XZ @ 1900 NONAME ABSENT ; QDeclarativeExtensionInterface::QDeclarativeExtensionInterface(void)
+	??_EQDeclarativeScriptString@@QAE@I@Z @ 1901 NONAME ABSENT ; QDeclarativeScriptString::~QDeclarativeScriptString(unsigned int)
+	??_EQDeclarativeCustomParserNode@@QAE@I@Z @ 1902 NONAME ABSENT ; QDeclarativeCustomParserNode::~QDeclarativeCustomParserNode(unsigned int)
+	??_EQDeclarativePixmap@@QAE@I@Z @ 1903 NONAME ABSENT ; QDeclarativePixmap::~QDeclarativePixmap(unsigned int)
+	?instance@QDeclarativeInspectorService@@SAPAV1@XZ @ 1904 NONAME ; class QDeclarativeInspectorService * QDeclarativeInspectorService::instance(void)
 	?qt_static_metacall@QDeclarativeComponent@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1905 NONAME ; void QDeclarativeComponent::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QDeclarativeTransition@@0UQMetaObjectExtraData@@B @ 1906 NONAME ; struct QMetaObjectExtraData const QDeclarativeTransition::staticMetaObjectExtraData
-	?qt_static_metacall@QDeclarativePropertyMap@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1907 NONAME ; void QDeclarativePropertyMap::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QDeclarativeDebugService@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1908 NONAME ; void QDeclarativeDebugService::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QDeclarativeContext@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1909 NONAME ; void QDeclarativeContext::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QDeclarativeItem@@0UQMetaObjectExtraData@@B @ 1910 NONAME ; struct QMetaObjectExtraData const QDeclarativeItem::staticMetaObjectExtraData
+	?qt_static_metacall@QDeclarativeStateGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1906 NONAME ; void QDeclarativeStateGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QDeclarativeDebugService@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1907 NONAME ; void QDeclarativeDebugService::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QDeclarativeItem@@0UQMetaObjectExtraData@@B @ 1908 NONAME ; struct QMetaObjectExtraData const QDeclarativeItem::staticMetaObjectExtraData
+	??_EQDeclarativeInspectorInterface@@UAE@I@Z @ 1909 NONAME ; QDeclarativeInspectorInterface::~QDeclarativeInspectorInterface(unsigned int)
+	?qt_static_metacall@QDeclarativeInspectorService@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1910 NONAME ; void QDeclarativeInspectorService::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
 	?qt_static_metacall@QDeclarativeState@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1911 NONAME ; void QDeclarativeState::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QDeclarativeDebugService@@0UQMetaObjectExtraData@@B @ 1912 NONAME ; struct QMetaObjectExtraData const QDeclarativeDebugService::staticMetaObjectExtraData
-	?qt_static_metacall@QDeclarativeItem@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1913 NONAME ; void QDeclarativeItem::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QDeclarativeStateOperation@@0UQMetaObjectExtraData@@B @ 1914 NONAME ; struct QMetaObjectExtraData const QDeclarativeStateOperation::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDeclarativePropertyMap@@0UQMetaObjectExtraData@@B @ 1915 NONAME ; struct QMetaObjectExtraData const QDeclarativePropertyMap::staticMetaObjectExtraData
-	?qt_static_metacall@QDeclarativeDebugServer@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1916 NONAME ; void QDeclarativeDebugServer::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QDeclarativeExpression@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1917 NONAME ; void QDeclarativeExpression::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QDeclarativeView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1918 NONAME ; void QDeclarativeView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QDeclarativeTransition@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1919 NONAME ; void QDeclarativeTransition::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QDeclarativeStateGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1920 NONAME ; void QDeclarativeStateGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QDeclarativeExpression@@0UQMetaObjectExtraData@@B @ 1921 NONAME ; struct QMetaObjectExtraData const QDeclarativeExpression::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDeclarativeStateGroup@@0UQMetaObjectExtraData@@B @ 1922 NONAME ; struct QMetaObjectExtraData const QDeclarativeStateGroup::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDeclarativeView@@0UQMetaObjectExtraData@@B @ 1923 NONAME ; struct QMetaObjectExtraData const QDeclarativeView::staticMetaObjectExtraData
-	?qt_static_metacall@QDeclarativeEngine@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1924 NONAME ; void QDeclarativeEngine::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?instance@QDeclarativeInspectorService@@SAPAV1@XZ @ 1925 NONAME ; class QDeclarativeInspectorService * QDeclarativeInspectorService::instance(void)
-	??_EQDeclarativeInspectorInterface@@UAE@I@Z @ 1926 NONAME ; QDeclarativeInspectorInterface::~QDeclarativeInspectorInterface(unsigned int)
-	?qt_static_metacall@QDeclarativeInspectorService@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1927 NONAME ; void QDeclarativeInspectorService::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?flushCache@QDeclarativePixmap@@SAXXZ @ 1928 NONAME ; void QDeclarativePixmap::flushCache(void)
-	??0QDeclarativeDebuggingEnabler@@QAE@XZ @ 1929 NONAME ; QDeclarativeDebuggingEnabler::QDeclarativeDebuggingEnabler(void)
-	?addView@QDeclarativeInspectorService@@QAEXPAVQDeclarativeView@@@Z @ 1930 NONAME ; void QDeclarativeInspectorService::addView(class QDeclarativeView *)
-	?tr@QDeclarativeInspectorService@@SA?AVQString@@PBD0@Z @ 1931 NONAME ; class QString QDeclarativeInspectorService::tr(char const *, char const *)
-	?statusChanged@QDeclarativeInspectorService@@MAEXW4Status@QDeclarativeDebugService@@@Z @ 1932 NONAME ; void QDeclarativeInspectorService::statusChanged(enum QDeclarativeDebugService::Status)
-	?waitForReadyRead@QPacketProtocol@@QAE_NH@Z @ 1933 NONAME ; bool QPacketProtocol::waitForReadyRead(int)
-	?waitForMessage@QDeclarativeDebugService@@QAE_NXZ @ 1934 NONAME ; bool QDeclarativeDebugService::waitForMessage(void)
-	?staticMetaObject@QDeclarativeInspectorService@@2UQMetaObject@@B @ 1935 NONAME ; struct QMetaObject const QDeclarativeInspectorService::staticMetaObject
-	?qt_metacast@QDeclarativeInspectorService@@UAEPAXPBD@Z @ 1936 NONAME ; void * QDeclarativeInspectorService::qt_metacast(char const *)
-	?waitForMessage@QDeclarativeDebugServer@@QAE_NPAVQDeclarativeDebugService@@@Z @ 1937 NONAME ; bool QDeclarativeDebugServer::waitForMessage(class QDeclarativeDebugService *)
-	?sendMessage@QDeclarativeInspectorService@@QAEXABVQByteArray@@@Z @ 1938 NONAME ; void QDeclarativeInspectorService::sendMessage(class QByteArray const &)
-	??_EQDeclarativeInspectorService@@UAE@I@Z @ 1939 NONAME ; QDeclarativeInspectorService::~QDeclarativeInspectorService(unsigned int)
-	??1QDeclarativeInspectorService@@UAE@XZ @ 1940 NONAME ; QDeclarativeInspectorService::~QDeclarativeInspectorService(void)
-	?gotMessage@QDeclarativeInspectorService@@IAEXABVQByteArray@@@Z @ 1941 NONAME ; void QDeclarativeInspectorService::gotMessage(class QByteArray const &)
-	?loadInspectorPlugin@QDeclarativeInspectorService@@CAPAVQDeclarativeInspectorInterface@@XZ @ 1942 NONAME ; class QDeclarativeInspectorInterface * QDeclarativeInspectorService::loadInspectorPlugin(void)
-	?removeView@QDeclarativeInspectorService@@QAEXPAVQDeclarativeView@@@Z @ 1943 NONAME ; void QDeclarativeInspectorService::removeView(class QDeclarativeView *)
-	?trUtf8@QDeclarativeInspectorService@@SA?AVQString@@PBD0@Z @ 1944 NONAME ; class QString QDeclarativeInspectorService::trUtf8(char const *, char const *)
-	?metaObject@QDeclarativeInspectorService@@UBEPBUQMetaObject@@XZ @ 1945 NONAME ; struct QMetaObject const * QDeclarativeInspectorService::metaObject(void) const
-	?tr@QDeclarativeInspectorService@@SA?AVQString@@PBD0H@Z @ 1946 NONAME ; class QString QDeclarativeInspectorService::tr(char const *, char const *, int)
+	?flushCache@QDeclarativePixmap@@SAXXZ @ 1912 NONAME ; void QDeclarativePixmap::flushCache(void)
+	?staticMetaObjectExtraData@QDeclarativePropertyMap@@0UQMetaObjectExtraData@@B @ 1913 NONAME ; struct QMetaObjectExtraData const QDeclarativePropertyMap::staticMetaObjectExtraData
+	?qt_static_metacall@QDeclarativeExtensionPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1914 NONAME ; void QDeclarativeExtensionPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QDeclarativeDebuggingEnabler@@QAE@XZ @ 1915 NONAME ; QDeclarativeDebuggingEnabler::QDeclarativeDebuggingEnabler(void)
+	?addView@QDeclarativeInspectorService@@QAEXPAVQDeclarativeView@@@Z @ 1916 NONAME ; void QDeclarativeInspectorService::addView(class QDeclarativeView *)
+	?qt_static_metacall@QDeclarativeView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1917 NONAME ; void QDeclarativeView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QDeclarativeItem@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1918 NONAME ; void QDeclarativeItem::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?tr@QDeclarativeInspectorService@@SA?AVQString@@PBD0@Z @ 1919 NONAME ; class QString QDeclarativeInspectorService::tr(char const *, char const *)
+	?staticMetaObjectExtraData@QDeclarativeEngine@@0UQMetaObjectExtraData@@B @ 1920 NONAME ; struct QMetaObjectExtraData const QDeclarativeEngine::staticMetaObjectExtraData
+	?qt_static_metacall@QDeclarativeExpression@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1921 NONAME ; void QDeclarativeExpression::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QDeclarativeEngine@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1922 NONAME ; void QDeclarativeEngine::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?statusChanged@QDeclarativeInspectorService@@MAEXW4Status@QDeclarativeDebugService@@@Z @ 1923 NONAME ; void QDeclarativeInspectorService::statusChanged(enum QDeclarativeDebugService::Status)
+	?waitForReadyRead@QPacketProtocol@@QAE_NH@Z @ 1924 NONAME ; bool QPacketProtocol::waitForReadyRead(int)
+	?staticMetaObjectExtraData@QDeclarativeExtensionPlugin@@0UQMetaObjectExtraData@@B @ 1925 NONAME ; struct QMetaObjectExtraData const QDeclarativeExtensionPlugin::staticMetaObjectExtraData
+	?waitForMessage@QDeclarativeDebugService@@QAE_NXZ @ 1926 NONAME ; bool QDeclarativeDebugService::waitForMessage(void)
+	?staticMetaObjectExtraData@QPacketProtocol@@0UQMetaObjectExtraData@@B @ 1927 NONAME ; struct QMetaObjectExtraData const QPacketProtocol::staticMetaObjectExtraData
+	?staticMetaObject@QDeclarativeInspectorService@@2UQMetaObject@@B @ 1928 NONAME ; struct QMetaObject const QDeclarativeInspectorService::staticMetaObject
+	?qt_metacast@QDeclarativeInspectorService@@UAEPAXPBD@Z @ 1929 NONAME ; void * QDeclarativeInspectorService::qt_metacast(char const *)
+	?waitForMessage@QDeclarativeDebugServer@@QAE_NPAVQDeclarativeDebugService@@@Z @ 1930 NONAME ; bool QDeclarativeDebugServer::waitForMessage(class QDeclarativeDebugService *)
+	?qt_static_metacall@QDeclarativeContext@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1931 NONAME ; void QDeclarativeContext::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QDeclarativeExpression@@0UQMetaObjectExtraData@@B @ 1932 NONAME ; struct QMetaObjectExtraData const QDeclarativeExpression::staticMetaObjectExtraData
+	?sendMessage@QDeclarativeInspectorService@@QAEXABVQByteArray@@@Z @ 1933 NONAME ; void QDeclarativeInspectorService::sendMessage(class QByteArray const &)
+	??_EQDeclarativeInspectorService@@UAE@I@Z @ 1934 NONAME ; QDeclarativeInspectorService::~QDeclarativeInspectorService(unsigned int)
+	?qt_static_metacall@QDeclarativePropertyMap@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1935 NONAME ; void QDeclarativePropertyMap::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??1QDeclarativeInspectorService@@UAE@XZ @ 1936 NONAME ; QDeclarativeInspectorService::~QDeclarativeInspectorService(void)
+	?staticMetaObjectExtraData@QDeclarativeDebugServer@@0UQMetaObjectExtraData@@B @ 1937 NONAME ; struct QMetaObjectExtraData const QDeclarativeDebugServer::staticMetaObjectExtraData
+	?gotMessage@QDeclarativeInspectorService@@IAEXABVQByteArray@@@Z @ 1938 NONAME ; void QDeclarativeInspectorService::gotMessage(class QByteArray const &)
+	?loadInspectorPlugin@QDeclarativeInspectorService@@CAPAVQDeclarativeInspectorInterface@@XZ @ 1939 NONAME ; class QDeclarativeInspectorInterface * QDeclarativeInspectorService::loadInspectorPlugin(void)
+	?removeView@QDeclarativeInspectorService@@QAEXPAVQDeclarativeView@@@Z @ 1940 NONAME ; void QDeclarativeInspectorService::removeView(class QDeclarativeView *)
+	?trUtf8@QDeclarativeInspectorService@@SA?AVQString@@PBD0@Z @ 1941 NONAME ; class QString QDeclarativeInspectorService::trUtf8(char const *, char const *)
+	?metaObject@QDeclarativeInspectorService@@UBEPBUQMetaObject@@XZ @ 1942 NONAME ; struct QMetaObject const * QDeclarativeInspectorService::metaObject(void) const
+	?tr@QDeclarativeInspectorService@@SA?AVQString@@PBD0H@Z @ 1943 NONAME ; class QString QDeclarativeInspectorService::tr(char const *, char const *, int)
+	?qt_static_metacall@QPacketProtocol@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1944 NONAME ; void QPacketProtocol::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QDeclarativeContext@@0UQMetaObjectExtraData@@B @ 1945 NONAME ; struct QMetaObjectExtraData const QDeclarativeContext::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QDeclarativeState@@0UQMetaObjectExtraData@@B @ 1946 NONAME ; struct QMetaObjectExtraData const QDeclarativeState::staticMetaObjectExtraData
 	?views@QDeclarativeInspectorService@@QBE?AV?$QList@PAVQDeclarativeView@@@@XZ @ 1947 NONAME ; class QList<class QDeclarativeView *> QDeclarativeInspectorService::views(void) const
 	??0QDeclarativeInspectorService@@QAE@XZ @ 1948 NONAME ; QDeclarativeInspectorService::QDeclarativeInspectorService(void)
-	?getStaticMetaObject@QDeclarativeInspectorService@@SAABUQMetaObject@@XZ @ 1949 NONAME ; struct QMetaObject const & QDeclarativeInspectorService::getStaticMetaObject(void)
-	?staticMetaObjectExtraData@QDeclarativeInspectorService@@0UQMetaObjectExtraData@@B @ 1950 NONAME ; struct QMetaObjectExtraData const QDeclarativeInspectorService::staticMetaObjectExtraData
-	??0QDeclarativeInspectorInterface@@QAE@XZ @ 1951 NONAME ; QDeclarativeInspectorInterface::QDeclarativeInspectorInterface(void)
-	?messageReceived@QDeclarativeInspectorService@@MAEXABVQByteArray@@@Z @ 1952 NONAME ; void QDeclarativeInspectorService::messageReceived(class QByteArray const &)
-	?trUtf8@QDeclarativeInspectorService@@SA?AVQString@@PBD0H@Z @ 1953 NONAME ; class QString QDeclarativeInspectorService::trUtf8(char const *, char const *, int)
-	??1QDeclarativeInspectorInterface@@UAE@XZ @ 1954 NONAME ; QDeclarativeInspectorInterface::~QDeclarativeInspectorInterface(void)
-	?qt_metacall@QDeclarativeInspectorService@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1955 NONAME ; int QDeclarativeInspectorService::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?updateStatus@QDeclarativeInspectorService@@AAEXXZ @ 1956 NONAME ; void QDeclarativeInspectorService::updateStatus(void)
+	?updateStatus@QDeclarativeInspectorService@@AAEXXZ @ 1949 NONAME ; void QDeclarativeInspectorService::updateStatus(void)
+	?getStaticMetaObject@QDeclarativeInspectorService@@SAABUQMetaObject@@XZ @ 1950 NONAME ; struct QMetaObject const & QDeclarativeInspectorService::getStaticMetaObject(void)
+	?staticMetaObjectExtraData@QDeclarativeInspectorService@@0UQMetaObjectExtraData@@B @ 1951 NONAME ; struct QMetaObjectExtraData const QDeclarativeInspectorService::staticMetaObjectExtraData
+	?qt_static_metacall@QDeclarativeTransition@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1952 NONAME ; void QDeclarativeTransition::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QDeclarativeInspectorInterface@@QAE@XZ @ 1953 NONAME ; QDeclarativeInspectorInterface::QDeclarativeInspectorInterface(void)
+	?messageReceived@QDeclarativeInspectorService@@MAEXABVQByteArray@@@Z @ 1954 NONAME ; void QDeclarativeInspectorService::messageReceived(class QByteArray const &)
+	?staticMetaObjectExtraData@QDeclarativeDebugService@@0UQMetaObjectExtraData@@B @ 1955 NONAME ; struct QMetaObjectExtraData const QDeclarativeDebugService::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QDeclarativeView@@0UQMetaObjectExtraData@@B @ 1956 NONAME ; struct QMetaObjectExtraData const QDeclarativeView::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QDeclarativeTransition@@0UQMetaObjectExtraData@@B @ 1957 NONAME ; struct QMetaObjectExtraData const QDeclarativeTransition::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QDeclarativeComponent@@0UQMetaObjectExtraData@@B @ 1958 NONAME ; struct QMetaObjectExtraData const QDeclarativeComponent::staticMetaObjectExtraData
+	?trUtf8@QDeclarativeInspectorService@@SA?AVQString@@PBD0H@Z @ 1959 NONAME ; class QString QDeclarativeInspectorService::trUtf8(char const *, char const *, int)
+	?qt_static_metacall@QDeclarativeDebugServer@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1960 NONAME ; void QDeclarativeDebugServer::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??1QDeclarativeInspectorInterface@@UAE@XZ @ 1961 NONAME ; QDeclarativeInspectorInterface::~QDeclarativeInspectorInterface(void)
+	?staticMetaObjectExtraData@QDeclarativeStateOperation@@0UQMetaObjectExtraData@@B @ 1962 NONAME ; struct QMetaObjectExtraData const QDeclarativeStateOperation::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QDeclarativeStateGroup@@0UQMetaObjectExtraData@@B @ 1963 NONAME ; struct QMetaObjectExtraData const QDeclarativeStateGroup::staticMetaObjectExtraData
+	?qt_static_metacall@QDeclarativeStateOperation@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1964 NONAME ; void QDeclarativeStateOperation::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeInspectorService@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1965 NONAME ; int QDeclarativeInspectorService::qt_metacall(enum QMetaObject::Call, int, void * *)
 
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index b763848..16de776 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -1901,7 +1901,7 @@ EXPORTS
 	?ResourceFileName@QS60MainApplication@@UBE?AV?$TBuf@$0BAA@@@XZ @ 1900 NONAME ; class TBuf<256> QS60MainApplication::ResourceFileName(void) const
 	?RestoreMenuL@QS60MainAppUi@@UAEXPAVCCoeControl@@HW4TMenuType@MEikMenuObserver@@@Z @ 1901 NONAME ; void QS60MainAppUi::RestoreMenuL(class CCoeControl *, int, enum MEikMenuObserver::TMenuType)
 	?_q_clipboardChanged@QLineControl@@AAEXXZ @ 1902 NONAME ; void QLineControl::_q_clipboardChanged(void)
-	?_q_delayedDestroy@QWidgetPrivate@@QAEXPAVCCoeControl@@@Z @ 1903 NONAME ; void QWidgetPrivate::_q_delayedDestroy(class CCoeControl *)
+	?_q_delayedDestroy@QWidgetPrivate@@QAEXPAVCCoeControl@@@Z @ 1903 NONAME ABSENT ; void QWidgetPrivate::_q_delayedDestroy(class CCoeControl *)
 	?_q_deleteSelected@QLineControl@@AAEXXZ @ 1904 NONAME ; void QLineControl::_q_deleteSelected(void)
 	?_q_showIfNotHidden@QWidgetPrivate@@QAEXXZ @ 1905 NONAME ; void QWidgetPrivate::_q_showIfNotHidden(void)
 	?about@QMessageBox@@SAXPAVQWidget@@ABVQString@@1@Z @ 1906 NONAME ; void QMessageBox::about(class QWidget *, class QString const &, class QString const &)
@@ -13114,935 +13114,873 @@ EXPORTS
 	?constImageRef@QVolatileImage@@QBEABVQImage@@XZ @ 13113 NONAME ; class QImage const & QVolatileImage::constImageRef(void) const
 	?toVolatileImage@QPixmapData@@UBE?AVQVolatileImage@@XZ @ 13114 NONAME ; class QVolatileImage QPixmapData::toVolatileImage(void) const
 	?qt_s60_setPartialScreenAutomaticTranslation@@YAX_N@Z @ 13115 NONAME ; void qt_s60_setPartialScreenAutomaticTranslation(bool)
-	png_set_chunk_malloc_max @ 13116 NONAME
-	png_set_compression_buffer_size @ 13117 NONAME
-	png_set_compression_level @ 13118 NONAME
-	png_set_compression_mem_level @ 13119 NONAME
-	png_set_compression_method @ 13120 NONAME
-	png_set_compression_strategy @ 13121 NONAME
-	png_set_compression_window_bits @ 13122 NONAME
-	png_set_crc_action @ 13123 NONAME
-	png_set_error_fn @ 13124 NONAME
-	png_set_expand @ 13125 NONAME
-	png_set_expand_gray_1_2_4_to_8 @ 13126 NONAME
-	png_set_filler @ 13127 NONAME
-	png_set_filter @ 13128 NONAME
-	png_set_filter_heuristics @ 13129 NONAME
-	png_set_filter_heuristics_fixed @ 13130 NONAME
-	png_set_flush @ 13131 NONAME
-	png_set_gAMA @ 13132 NONAME
-	png_set_gAMA_fixed @ 13133 NONAME
-	png_set_gamma @ 13134 NONAME
-	png_set_gamma_fixed @ 13135 NONAME
-	png_set_gray_to_rgb @ 13136 NONAME
-	png_set_hIST @ 13137 NONAME
-	png_set_iCCP @ 13138 NONAME
-	png_set_interlace_handling @ 13139 NONAME
-	png_set_invalid @ 13140 NONAME
-	png_set_invert_alpha @ 13141 NONAME
-	png_set_invert_mono @ 13142 NONAME
-	png_set_keep_unknown_chunks @ 13143 NONAME
-	png_set_longjmp_fn @ 13144 NONAME
-	png_set_mem_fn @ 13145 NONAME
-	png_set_oFFs @ 13146 NONAME
-	png_set_pCAL @ 13147 NONAME
-	png_set_pHYs @ 13148 NONAME
-	png_set_packing @ 13149 NONAME
-	png_set_packswap @ 13150 NONAME
-	png_set_palette_to_rgb @ 13151 NONAME
-	png_set_progressive_read_fn @ 13152 NONAME
-	png_set_quantize @ 13153 NONAME
-	png_set_read_fn @ 13154 NONAME
-	png_set_read_status_fn @ 13155 NONAME
-	png_set_read_user_chunk_fn @ 13156 NONAME
-	png_set_read_user_transform_fn @ 13157 NONAME
-	png_set_rgb_to_gray @ 13158 NONAME
-	png_set_rgb_to_gray_fixed @ 13159 NONAME
-	png_set_rows @ 13160 NONAME
-	png_set_sBIT @ 13161 NONAME
-	png_set_sCAL @ 13162 NONAME
-	png_set_sCAL_fixed @ 13163 NONAME
-	png_set_sCAL_s @ 13164 NONAME
-	png_set_sPLT @ 13165 NONAME
-	png_set_sRGB @ 13166 NONAME
-	png_set_sRGB_gAMA_and_cHRM @ 13167 NONAME
-	png_set_shift @ 13168 NONAME
-	png_set_sig_bytes @ 13169 NONAME
-	png_set_strip_16 @ 13170 NONAME
-	png_set_strip_alpha @ 13171 NONAME
-	png_set_swap @ 13172 NONAME
-	png_set_swap_alpha @ 13173 NONAME
-	png_set_tIME @ 13174 NONAME
-	png_set_tRNS @ 13175 NONAME
-	png_set_tRNS_to_alpha @ 13176 NONAME
-	png_set_text @ 13177 NONAME
-	png_set_unknown_chunk_location @ 13178 NONAME
-	png_set_unknown_chunks @ 13179 NONAME
-	png_set_user_limits @ 13180 NONAME
-	png_set_user_transform_info @ 13181 NONAME
-	png_set_write_fn @ 13182 NONAME
-	png_set_write_status_fn @ 13183 NONAME
-	png_set_write_user_transform_fn @ 13184 NONAME
-	png_sig_cmp @ 13185 NONAME
-	png_start_read_image @ 13186 NONAME
-	png_warning @ 13187 NONAME
-	png_write_chunk @ 13188 NONAME
-	png_write_chunk_data @ 13189 NONAME
-	png_write_chunk_end @ 13190 NONAME
-	png_write_chunk_start @ 13191 NONAME
-	png_write_end @ 13192 NONAME
-	png_write_flush @ 13193 NONAME
-	png_write_image @ 13194 NONAME
-	png_write_info @ 13195 NONAME
-	png_write_info_before_PLTE @ 13196 NONAME
-	png_write_png @ 13197 NONAME
-	png_write_row @ 13198 NONAME
-	png_write_rows @ 13199 NONAME
-	png_write_sig @ 13200 NONAME
-	?clipEnabledChanged@QBlitterPaintEngine@@UAEXXZ @ 13201 NONAME ; void QBlitterPaintEngine::clipEnabledChanged(void)
-	?supportsSubPixelPositions@QFontEngine@@UBE_NXZ @ 13202 NONAME ; bool QFontEngine::supportsSubPixelPositions(void) const
-	??_EQScrollerProperties@@UAE@I@Z @ 13203 NONAME ABSENT ; QScrollerProperties::~QScrollerProperties(unsigned int)
-	png_benign_error @ 13204 NONAME
-	png_build_grayscale_palette @ 13205 NONAME
-	png_calloc @ 13206 NONAME
-	?d_func@QScrollEvent@@AAEPAVQScrollEventPrivate@@XZ @ 13207 NONAME ABSENT ; class QScrollEventPrivate * QScrollEvent::d_func(void)
-	png_chunk_benign_error @ 13208 NONAME
-	png_chunk_error @ 13209 NONAME
-	?heightForWidth@QTabWidget@@UBEHH@Z @ 13210 NONAME ; int QTabWidget::heightForWidth(int) const
-	??1QFlickGesture@@UAE@XZ @ 13211 NONAME ABSENT ; QFlickGesture::~QFlickGesture(void)
-	??0QRasterWindowSurface@@QAE@PAVQWidget@@_N@Z @ 13212 NONAME ; QRasterWindowSurface::QRasterWindowSurface(class QWidget *, bool)
-	?brushChanged@QBlitterPaintEngine@@UAEXXZ @ 13213 NONAME ; void QBlitterPaintEngine::brushChanged(void)
-	?clip@QBlitterPaintEngine@@UAEXABVQRect@@W4ClipOperation@Qt@@@Z @ 13214 NONAME ; void QBlitterPaintEngine::clip(class QRect const &, enum Qt::ClipOperation)
-	?detach@QGlyphs@@AAEXXZ @ 13215 NONAME ABSENT ; void QGlyphs::detach(void)
-	?trUtf8@QInternalMimeData@@SA?AVQString@@PBD0@Z @ 13216 NONAME ; class QString QInternalMimeData::trUtf8(char const *, char const *)
-	png_chunk_warning @ 13217 NONAME
-	png_convert_from_struct_tm @ 13218 NONAME
-	?setHintingPreference@QFont@@QAEXW4HintingPreference@1@@Z @ 13219 NONAME ; void QFont::setHintingPreference(enum QFont::HintingPreference)
-	png_convert_from_time_t @ 13220 NONAME
-	png_convert_to_rfc1123 @ 13221 NONAME
-	?capabilities@QBlittable@@QBE?AV?$QFlags@W4Capability@QBlittable@@@@XZ @ 13222 NONAME ; class QFlags<enum QBlittable::Capability> QBlittable::capabilities(void) const
-	?setContentPosRange@QScrollPrepareEvent@@QAEXABVQRectF@@@Z @ 13223 NONAME ABSENT ; void QScrollPrepareEvent::setContentPosRange(class QRectF const &)
-	png_create_info_struct @ 13224 NONAME
-	?swap@QBrush@@QAEXAAV1@@Z @ 13225 NONAME ; void QBrush::swap(class QBrush &)
-	?trUtf8@QFlickGesture@@SA?AVQString@@PBD0H@Z @ 13226 NONAME ABSENT ; class QString QFlickGesture::trUtf8(char const *, char const *, int)
-	?fontHintingPreference@QTextCharFormat@@QBE?AW4HintingPreference@QFont@@XZ @ 13227 NONAME ; enum QFont::HintingPreference QTextCharFormat::fontHintingPreference(void) const
-	?swap@QPixmap@@QAEXAAV1@@Z @ 13228 NONAME ; void QPixmap::swap(class QPixmap &)
-	??0QBlitterPaintEngine@@QAE@PAVQBlittablePixmapData@@@Z @ 13229 NONAME ; QBlitterPaintEngine::QBlitterPaintEngine(class QBlittablePixmapData *)
-	?numberPrefix@QTextListFormat@@QBE?AVQString@@XZ @ 13230 NONAME ; class QString QTextListFormat::numberPrefix(void) const
-	?setSnapPositionsX@QScroller@@QAEXMM@Z @ 13231 NONAME ABSENT ; void QScroller::setSnapPositionsX(float, float)
-	?scroller@QScroller@@SAPBV1@PBVQObject@@@Z @ 13232 NONAME ABSENT ; class QScroller const * QScroller::scroller(class QObject const *)
-	?qt_metacall@QScroller@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 13233 NONAME ABSENT ; int QScroller::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?tr@QFlickGesture@@SA?AVQString@@PBD0@Z @ 13234 NONAME ABSENT ; class QString QFlickGesture::tr(char const *, char const *)
-	png_create_read_struct @ 13235 NONAME
-	?setScrollerProperties@QScroller@@QAEXABVQScrollerProperties@@@Z @ 13236 NONAME ABSENT ; void QScroller::setScrollerProperties(class QScrollerProperties const &)
-	png_create_read_struct_2 @ 13237 NONAME
-	png_create_write_struct @ 13238 NONAME
-	??MQItemSelectionRange@@QBE_NABV0@@Z @ 13239 NONAME ; bool QItemSelectionRange::operator<(class QItemSelectionRange const &) const
-	?setWidthForHeight@QSizePolicy@@QAEX_N@Z @ 13240 NONAME ; void QSizePolicy::setWidthForHeight(bool)
-	?qt_fontdata_from_index@@YA?AVQByteArray@@H@Z @ 13241 NONAME ; class QByteArray qt_fontdata_from_index(int)
-	png_create_write_struct_2 @ 13242 NONAME
-	?swap@QImage@@QAEXAAV1@@Z @ 13243 NONAME ; void QImage::swap(class QImage &)
-	png_data_freer @ 13244 NONAME
-	??0QScroller@@AAE@PAVQObject@@@Z @ 13245 NONAME ABSENT ; QScroller::QScroller(class QObject *)
-	?compositionModeChanged@QBlitterPaintEngine@@UAEXXZ @ 13246 NONAME ; void QBlitterPaintEngine::compositionModeChanged(void)
-	?contentPosRange@QScrollPrepareEvent@@QBE?AVQRectF@@XZ @ 13247 NONAME ABSENT ; class QRectF QScrollPrepareEvent::contentPosRange(void) const
-	?grabGesture@QScroller@@SA?AW4GestureType@Qt@@PAVQObject@@W4ScrollerGestureType@1@@Z @ 13248 NONAME ABSENT ; enum Qt::GestureType QScroller::grabGesture(class QObject *, enum QScroller::ScrollerGestureType)
-	??_EQFlickGesture@@UAE@I@Z @ 13249 NONAME ABSENT ; QFlickGesture::~QFlickGesture(unsigned int)
-	?drawRects@QBlitterPaintEngine@@UAEXPBVQRectF@@H@Z @ 13250 NONAME ; void QBlitterPaintEngine::drawRects(class QRectF const *, int)
-	png_destroy_info_struct @ 13251 NONAME
-	png_destroy_read_struct @ 13252 NONAME
-	??1QBlitterPaintEngine@@UAE@XZ @ 13253 NONAME ; QBlitterPaintEngine::~QBlitterPaintEngine(void)
-	?markRasterOverlay@QBlittablePixmapData@@QAEXPBVQRectF@@H@Z @ 13254 NONAME ; void QBlittablePixmapData::markRasterOverlay(class QRectF const *, int)
-	png_destroy_write_struct @ 13255 NONAME
-	png_error @ 13256 NONAME
-	?drawTextItem@QBlitterPaintEngine@@UAEXABVQPointF@@ABVQTextItem@@@Z @ 13257 NONAME ; void QBlitterPaintEngine::drawTextItem(class QPointF const &, class QTextItem const &)
-	png_free @ 13258 NONAME
-	?trUtf8@QFlickGesture@@SA?AVQString@@PBD0@Z @ 13259 NONAME ABSENT ; class QString QFlickGesture::trUtf8(char const *, char const *)
-	?stop@QScroller@@QAEXXZ @ 13260 NONAME ABSENT ; void QScroller::stop(void)
-	?retrieveData@QInternalMimeData@@MBE?AVQVariant@@ABVQString@@W4Type@2@@Z @ 13261 NONAME ; class QVariant QInternalMimeData::retrieveData(class QString const &, enum QVariant::Type) const
-	??8QGlyphs@@QBE_NABV0@@Z @ 13262 NONAME ABSENT ; bool QGlyphs::operator==(class QGlyphs const &) const
-	?drawImage@QBlitterPaintEngine@@UAEXABVQRectF@@ABVQImage@@0V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 13263 NONAME ; void QBlitterPaintEngine::drawImage(class QRectF const &, class QImage const &, class QRectF const &, class QFlags<enum Qt::ImageConversionFlag>)
-	?contentPos@QScrollEvent@@QBE?AVQPointF@@XZ @ 13264 NONAME ABSENT ; class QPointF QScrollEvent::contentPos(void) const
-	?mimeTypes@QAbstractProxyModel@@UBE?AVQStringList@@XZ @ 13265 NONAME ; class QStringList QAbstractProxyModel::mimeTypes(void) const
-	?createState@QBlitterPaintEngine@@UBEPAVQPainterState@@PAV2@@Z @ 13266 NONAME ; class QPainterState * QBlitterPaintEngine::createState(class QPainterState *) const
-	?removeItem@QGraphicsGridLayout@@QAEXPAVQGraphicsLayoutItem@@@Z @ 13267 NONAME ; void QGraphicsGridLayout::removeItem(class QGraphicsLayoutItem *)
-	?clipBoundingRect@QPainter@@QBE?AVQRectF@@XZ @ 13268 NONAME ; class QRectF QPainter::clipBoundingRect(void) const
-	?formats@QInternalMimeData@@UBE?AVQStringList@@XZ @ 13269 NONAME ; class QStringList QInternalMimeData::formats(void) const
-	?stateChanged@QScroller@@IAEXW4State@1@@Z @ 13270 NONAME ABSENT ; void QScroller::stateChanged(enum QScroller::State)
-	?raster@QBlitterPaintEngine@@ABEPAVQRasterPaintEngine@@XZ @ 13271 NONAME ; class QRasterPaintEngine * QBlitterPaintEngine::raster(void) const
-	?sort@QAbstractProxyModel@@UAEXHW4SortOrder@Qt@@@Z @ 13272 NONAME ; void QAbstractProxyModel::sort(int, enum Qt::SortOrder)
-	?d_func@QBlittable@@AAEPAVQBlittablePrivate@@XZ @ 13273 NONAME ; class QBlittablePrivate * QBlittable::d_func(void)
-	?setDefaultScrollerProperties@QScrollerProperties@@SAXABV1@@Z @ 13274 NONAME ABSENT ; void QScrollerProperties::setDefaultScrollerProperties(class QScrollerProperties const &)
-	png_free_data @ 13275 NONAME
-	?type@QBlitterPaintEngine@@UBE?AW4Type@QPaintEngine@@XZ @ 13276 NONAME ; enum QPaintEngine::Type QBlitterPaintEngine::type(void) const
-	?qt_metacast@QScroller@@UAEPAXPBD@Z @ 13277 NONAME ABSENT ; void * QScroller::qt_metacast(char const *)
-	png_free_default @ 13278 NONAME
-	?buddy@QAbstractProxyModel@@UBE?AVQModelIndex@@ABV2@@Z @ 13279 NONAME ; class QModelIndex QAbstractProxyModel::buddy(class QModelIndex const &) const
-	?tr@QScroller@@SA?AVQString@@PBD0H@Z @ 13280 NONAME ABSENT ; class QString QScroller::tr(char const *, char const *, int)
-	?fill@QImage@@QAEXABVQColor@@@Z @ 13281 NONAME ; void QImage::fill(class QColor const &)
-	?scrollMetric@QScrollerProperties@@QBE?AVQVariant@@W4ScrollMetric@1@@Z @ 13282 NONAME ABSENT ; class QVariant QScrollerProperties::scrollMetric(enum QScrollerProperties::ScrollMetric) const
-	?fill@QImage@@QAEXW4GlobalColor@Qt@@@Z @ 13283 NONAME ; void QImage::fill(enum Qt::GlobalColor)
-	png_get_IHDR @ 13284 NONAME
-	?canFetchMore@QAbstractProxyModel@@UBE_NABVQModelIndex@@@Z @ 13285 NONAME ; bool QAbstractProxyModel::canFetchMore(class QModelIndex const &) const
-	png_get_PLTE @ 13286 NONAME
-	??1QScroller@@EAE@XZ @ 13287 NONAME ABSENT ; QScroller::~QScroller(void)
-	?setFont@QGlyphs@@QAEXABVQFont@@@Z @ 13288 NONAME ABSENT ; void QGlyphs::setFont(class QFont const &)
-	?startPos@QScrollPrepareEvent@@QBE?AVQPointF@@XZ @ 13289 NONAME ABSENT ; class QPointF QScrollPrepareEvent::startPos(void) const
-	?resize@QBlittablePixmapData@@UAEXHH@Z @ 13290 NONAME ; void QBlittablePixmapData::resize(int, int)
-	?setTabsClosable@QMdiArea@@QAEX_N@Z @ 13291 NONAME ; void QMdiArea::setTabsClosable(bool)
-	?ensureVisible@QScroller@@QAEXABVQRectF@@MM@Z @ 13292 NONAME ABSENT ; void QScroller::ensureVisible(class QRectF const &, float, float)
-	?getText@QInputDialog@@SA?AVQString@@PAVQWidget@@ABV2@1W4EchoMode@QLineEdit@@1PA_NV?$QFlags@W4WindowType@Qt@@@@V?$QFlags@W4InputMethodHint@Qt@@@@@Z @ 13293 NONAME ; class QString QInputDialog::getText(class QWidget *, class QString const &, class QString const &, enum QLineEdit::EchoMode, class QString const &, bool *, class QFlags<enum Qt::WindowType>, class QFlags<enum Qt::InputMethodHint>)
-	?hasWidthForHeight@QSizePolicy@@QBE_NXZ @ 13294 NONAME ; bool QSizePolicy::hasWidthForHeight(void) const
-	?transformChanged@QBlitterPaintEngine@@UAEXXZ @ 13295 NONAME ; void QBlitterPaintEngine::transformChanged(void)
-	png_get_bKGD @ 13296 NONAME
-	??0QBlittablePixmapData@@QAE@XZ @ 13297 NONAME ; QBlittablePixmapData::QBlittablePixmapData(void)
-	png_get_bit_depth @ 13298 NONAME
-	png_get_cHRM @ 13299 NONAME
-	?size@QBlittable@@QBE?AVQSize@@XZ @ 13300 NONAME ; class QSize QBlittable::size(void) const
-	png_get_cHRM_fixed @ 13301 NONAME
-	?setBlittable@QBlittablePixmapData@@QAEXPAVQBlittable@@@Z @ 13302 NONAME ; void QBlittablePixmapData::setBlittable(class QBlittable *)
-	?opacityChanged@QBlitterPaintEngine@@UAEXXZ @ 13303 NONAME ; void QBlitterPaintEngine::opacityChanged(void)
-	?tr@QFlickGesture@@SA?AVQString@@PBD0H@Z @ 13304 NONAME ABSENT ; class QString QFlickGesture::tr(char const *, char const *, int)
-	png_get_channels @ 13305 NONAME
-	?createExplicitFontWithName@QFontEngine@@IBE?AVQFont@@ABVQString@@@Z @ 13306 NONAME ABSENT ; class QFont QFontEngine::createExplicitFontWithName(class QString const &) const
-	?setState@QBlitterPaintEngine@@UAEXPAVQPainterState@@@Z @ 13307 NONAME ; void QBlitterPaintEngine::setState(class QPainterState *)
-	?clip@QBlitterPaintEngine@@UAEXABVQRegion@@W4ClipOperation@Qt@@@Z @ 13308 NONAME ; void QBlitterPaintEngine::clip(class QRegion const &, enum Qt::ClipOperation)
-	?subPixelPositionForX@QTextureGlyphCache@@QBE?AUQFixed@@U2@@Z @ 13309 NONAME ; struct QFixed QTextureGlyphCache::subPixelPositionForX(struct QFixed) const
-	?hasAlphaChannel@QBlittablePixmapData@@UBE_NXZ @ 13310 NONAME ; bool QBlittablePixmapData::hasAlphaChannel(void) const
-	?setSnapPositionsX@QScroller@@QAEXABV?$QList@M@@@Z @ 13311 NONAME ABSENT ; void QScroller::setSnapPositionsX(class QList<float> const &)
-	?numberSuffix@QTextListFormat@@QBE?AVQString@@XZ @ 13312 NONAME ; class QString QTextListFormat::numberSuffix(void) const
-	??HQGlyphs@@ABE?AV0@ABV0@@Z @ 13313 NONAME ABSENT ; class QGlyphs QGlyphs::operator+(class QGlyphs const &) const
-	png_get_chunk_cache_max @ 13314 NONAME
-	?tabsMovable@QMdiArea@@QBE_NXZ @ 13315 NONAME ; bool QMdiArea::tabsMovable(void) const
-	png_get_chunk_malloc_max @ 13316 NONAME
-	?contentPos@QScrollPrepareEvent@@QBE?AVQPointF@@XZ @ 13317 NONAME ABSENT ; class QPointF QScrollPrepareEvent::contentPos(void) const
-	?getStaticMetaObject@QScroller@@SAABUQMetaObject@@XZ @ 13318 NONAME ABSENT ; struct QMetaObject const & QScroller::getStaticMetaObject(void)
-	?end@QBlitterPaintEngine@@UAE_NXZ @ 13319 NONAME ; bool QBlitterPaintEngine::end(void)
-	??1QScrollerProperties@@UAE@XZ @ 13320 NONAME ABSENT ; QScrollerProperties::~QScrollerProperties(void)
-	??0QFlickGesture@@QAE@PAVQObject@@W4MouseButton@Qt@@0@Z @ 13321 NONAME ABSENT ; QFlickGesture::QFlickGesture(class QObject *, enum Qt::MouseButton, class QObject *)
-	?fill@QBlitterPaintEngine@@UAEXABVQVectorPath@@ABVQBrush@@@Z @ 13322 NONAME ; void QBlitterPaintEngine::fill(class QVectorPath const &, class QBrush const &)
-	?drawPixmap@QBlitterPaintEngine@@UAEXABVQRectF@@ABVQPixmap@@0@Z @ 13323 NONAME ; void QBlitterPaintEngine::drawPixmap(class QRectF const &, class QPixmap const &, class QRectF const &)
-	png_get_color_type @ 13324 NONAME
-	?setSnapPositionsY@QScroller@@QAEXABV?$QList@M@@@Z @ 13325 NONAME ABSENT ; void QScroller::setSnapPositionsY(class QList<float> const &)
-	png_get_compression_buffer_size @ 13326 NONAME
-	png_get_compression_type @ 13327 NONAME
-	png_get_copyright @ 13328 NONAME
-	?tr@QInternalMimeData@@SA?AVQString@@PBD0H@Z @ 13329 NONAME ; class QString QInternalMimeData::tr(char const *, char const *, int)
-	?velocity@QScroller@@QBE?AVQPointF@@XZ @ 13330 NONAME ABSENT ; class QPointF QScroller::velocity(void) const
-	?glyphIndexes@QGlyphs@@QBE?AV?$QVector@I@@XZ @ 13331 NONAME ABSENT ; class QVector<unsigned int> QGlyphs::glyphIndexes(void) const
-	?get@QFontPrivate@@SAPAV1@ABVQFont@@@Z @ 13332 NONAME ; class QFontPrivate * QFontPrivate::get(class QFont const &)
-	?setScrollMetric@QScrollerProperties@@QAEXW4ScrollMetric@1@ABVQVariant@@@Z @ 13333 NONAME ABSENT ; void QScrollerProperties::setScrollMetric(enum QScrollerProperties::ScrollMetric, class QVariant const &)
-	png_get_current_pass_number @ 13334 NONAME
-	??0QScrollEvent@@QAE@ABVQPointF@@0W4ScrollState@0@@Z @ 13335 NONAME ABSENT ; QScrollEvent::QScrollEvent(class QPointF const &, class QPointF const &, enum QScrollEvent::ScrollState)
-	?d_func@QFlickGesture@@AAEPAVQFlickGesturePrivate@@XZ @ 13336 NONAME ABSENT ; class QFlickGesturePrivate * QFlickGesture::d_func(void)
-	?scrollState@QScrollEvent@@QBE?AW4ScrollState@1@XZ @ 13337 NONAME ABSENT ; enum QScrollEvent::ScrollState QScrollEvent::scrollState(void) const
-	png_get_current_row_number @ 13338 NONAME
-	png_get_error_ptr @ 13339 NONAME
-	?fetchMore@QAbstractProxyModel@@UAEXABVQModelIndex@@@Z @ 13340 NONAME ; void QAbstractProxyModel::fetchMore(class QModelIndex const &)
-	?glyphs@QTextLine@@ABE?AV?$QList@VQGlyphs@@@@HH@Z @ 13341 NONAME ABSENT ; class QList<class QGlyphs> QTextLine::glyphs(int, int) const
-	?getStaticMetaObject@QFlickGesture@@SAABUQMetaObject@@XZ @ 13342 NONAME ABSENT ; struct QMetaObject const & QFlickGesture::getStaticMetaObject(void)
-	?setViewportSize@QScrollPrepareEvent@@QAEXABVQSizeF@@@Z @ 13343 NONAME ABSENT ; void QScrollPrepareEvent::setViewportSize(class QSizeF const &)
-	png_get_filter_type @ 13344 NONAME
-	png_get_gAMA @ 13345 NONAME
-	?d_func@QScrollPrepareEvent@@AAEPAVQScrollPrepareEventPrivate@@XZ @ 13346 NONAME ABSENT ; class QScrollPrepareEventPrivate * QScrollPrepareEvent::d_func(void)
-	?overshootDistance@QScrollEvent@@QBE?AVQPointF@@XZ @ 13347 NONAME ABSENT ; class QPointF QScrollEvent::overshootDistance(void) const
-	?resolveFontFamilyAlias@QFontDatabase@@CA?AVQString@@ABV2@@Z @ 13348 NONAME ; class QString QFontDatabase::resolveFontFamilyAlias(class QString const &)
-	?alphaRGBMapForGlyph@QFontEngine@@UAE?AVQImage@@IUQFixed@@HABVQTransform@@@Z @ 13349 NONAME ; class QImage QFontEngine::alphaRGBMapForGlyph(unsigned int, struct QFixed, int, class QTransform const &)
-	png_get_gAMA_fixed @ 13350 NONAME
-	?swap@QBitmap@@QAEXAAV1@@Z @ 13351 NONAME ; void QBitmap::swap(class QBitmap &)
-	?hasFormat@QInternalMimeData@@UBE_NABVQString@@@Z @ 13352 NONAME ; bool QInternalMimeData::hasFormat(class QString const &) const
-	?renderDataHelper@QInternalMimeData@@SA?AVQByteArray@@ABVQString@@PBVQMimeData@@@Z @ 13353 NONAME ; class QByteArray QInternalMimeData::renderDataHelper(class QString const &, class QMimeData const *)
-	png_get_hIST @ 13354 NONAME
-	??0QWindowSurface@@QAE@PAVQWidget@@_N@Z @ 13355 NONAME ; QWindowSurface::QWindowSurface(class QWidget *, bool)
-	?fill@QBlittablePixmapData@@UAEXABVQColor@@@Z @ 13356 NONAME ; void QBlittablePixmapData::fill(class QColor const &)
-	?metric@QBlittablePixmapData@@UBEHW4PaintDeviceMetric@QPaintDevice@@@Z @ 13357 NONAME ; int QBlittablePixmapData::metric(enum QPaintDevice::PaintDeviceMetric) const
-	png_get_header_ver @ 13358 NONAME
-	?fillRect@QBlitterPaintEngine@@UAEXABVQRectF@@ABVQColor@@@Z @ 13359 NONAME ; void QBlitterPaintEngine::fillRect(class QRectF const &, class QColor const &)
-	png_get_header_version @ 13360 NONAME
-	??6@YA?AVQDebug@@V0@PBVQSymbianEvent@@@Z @ 13361 NONAME ; class QDebug operator<<(class QDebug, class QSymbianEvent const *)
-	png_get_iCCP @ 13362 NONAME
-	?ProcessCommandParametersL@QS60MainAppUi@@UAEHW4TApaCommand@@AAV?$TBuf@$0BAA@@@ABVTDesC8@@@Z @ 13363 NONAME ; int QS60MainAppUi::ProcessCommandParametersL(enum TApaCommand, class TBuf<256> &, class TDesC8 const &)
-	?scrollerProperties@QScroller@@QBE?AVQScrollerProperties@@XZ @ 13364 NONAME ABSENT ; class QScrollerProperties QScroller::scrollerProperties(void) const
-	??_EQBlittablePixmapData@@UAE@I@Z @ 13365 NONAME ; QBlittablePixmapData::~QBlittablePixmapData(unsigned int)
-	?mimeData@QAbstractProxyModel@@UBEPAVQMimeData@@ABV?$QList@VQModelIndex@@@@@Z @ 13366 NONAME ; class QMimeData * QAbstractProxyModel::mimeData(class QList<class QModelIndex> const &) const
-	png_get_image_height @ 13367 NONAME
-	??_EQScroller@@UAE@I@Z @ 13368 NONAME ABSENT ; QScroller::~QScroller(unsigned int)
-	??1QScrollPrepareEvent@@UAE@XZ @ 13369 NONAME ABSENT ; QScrollPrepareEvent::~QScrollPrepareEvent(void)
-	png_get_image_width @ 13370 NONAME
-	?setTabsMovable@QMdiArea@@QAEX_N@Z @ 13371 NONAME ; void QMdiArea::setTabsMovable(bool)
-	?minimumSizeHint@QRadioButton@@UBE?AVQSize@@XZ @ 13372 NONAME ; class QSize QRadioButton::minimumSizeHint(void) const
-	png_get_int_32 @ 13373 NONAME
-	?qt_metacast@QFlickGesture@@UAEPAXPBD@Z @ 13374 NONAME ABSENT ; void * QFlickGesture::qt_metacast(char const *)
-	png_get_interlace_type @ 13375 NONAME
-	?setPositions@QGlyphs@@QAEXABV?$QVector@VQPointF@@@@@Z @ 13376 NONAME ABSENT ; void QGlyphs::setPositions(class QVector<class QPointF> const &)
-	png_get_io_chunk_name @ 13377 NONAME
-	png_get_io_chunk_type @ 13378 NONAME
-	png_get_io_ptr @ 13379 NONAME
-	?drawRects@QBlitterPaintEngine@@UAEXPBVQRect@@H@Z @ 13380 NONAME ; void QBlitterPaintEngine::drawRects(class QRect const *, int)
-	?fillInPendingGlyphs@QTextureGlyphCache@@QAEXXZ @ 13381 NONAME ; void QTextureGlyphCache::fillInPendingGlyphs(void)
-	?metaObject@QFlickGesture@@UBEPBUQMetaObject@@XZ @ 13382 NONAME ABSENT ; struct QMetaObject const * QFlickGesture::metaObject(void) const
-	?renderHintsChanged@QBlitterPaintEngine@@UAEXXZ @ 13383 NONAME ; void QBlitterPaintEngine::renderHintsChanged(void)
-	?supportedDropActions@QAbstractProxyModel@@UBE?AV?$QFlags@W4DropAction@Qt@@@@XZ @ 13384 NONAME ; class QFlags<enum Qt::DropAction> QAbstractProxyModel::supportedDropActions(void) const
-	?fillRect@QBlitterPaintEngine@@UAEXABVQRectF@@ABVQBrush@@@Z @ 13385 NONAME ; void QBlitterPaintEngine::fillRect(class QRectF const &, class QBrush const &)
-	?setGlyphIndexes@QGlyphs@@QAEXABV?$QVector@I@@@Z @ 13386 NONAME ABSENT ; void QGlyphs::setGlyphIndexes(class QVector<unsigned int> const &)
-	?alphaMapBoundingBox@QFontEngine@@UAE?AUglyph_metrics_t@@IABVQTransform@@W4GlyphFormat@1@@Z @ 13387 NONAME ABSENT ; struct glyph_metrics_t QFontEngine::alphaMapBoundingBox(unsigned int, class QTransform const &, enum QFontEngine::GlyphFormat)
-	?resendPrepareEvent@QScroller@@QAEXXZ @ 13388 NONAME ABSENT ; void QScroller::resendPrepareEvent(void)
-	png_get_libpng_ver @ 13389 NONAME
-	png_get_mem_ptr @ 13390 NONAME
-	png_get_oFFs @ 13391 NONAME
-	?d_func@QBlittable@@ABEPBVQBlittablePrivate@@XZ @ 13392 NONAME ; class QBlittablePrivate const * QBlittable::d_func(void) const
-	?state@QBlitterPaintEngine@@QBEPBVQPainterState@@XZ @ 13393 NONAME ; class QPainterState const * QBlitterPaintEngine::state(void) const
-	??0QScrollPrepareEvent@@QAE@ABVQPointF@@@Z @ 13394 NONAME ABSENT ; QScrollPrepareEvent::QScrollPrepareEvent(class QPointF const &)
-	png_get_pCAL @ 13395 NONAME
-	png_get_pHYs @ 13396 NONAME
-	png_get_pHYs_dpi @ 13397 NONAME
-	?scrollTo@QScroller@@QAEXABVQPointF@@H@Z @ 13398 NONAME ABSENT ; void QScroller::scrollTo(class QPointF const &, int)
-	?ungrabGesture@QScroller@@SAXPAVQObject@@@Z @ 13399 NONAME ABSENT ; void QScroller::ungrabGesture(class QObject *)
-	png_get_pixel_aspect_ratio @ 13400 NONAME
-	?clear@QGlyphs@@QAEXXZ @ 13401 NONAME ABSENT ; void QGlyphs::clear(void)
-	png_get_pixel_aspect_ratio_fixed @ 13402 NONAME
-	??1QBlittablePixmapData@@UAE@XZ @ 13403 NONAME ; QBlittablePixmapData::~QBlittablePixmapData(void)
-	?formatsHelper@QInternalMimeData@@SA?AVQStringList@@PBVQMimeData@@@Z @ 13404 NONAME ; class QStringList QInternalMimeData::formatsHelper(class QMimeData const *)
-	?qt_metacast@QInternalMimeData@@UAEPAXPBD@Z @ 13405 NONAME ; void * QInternalMimeData::qt_metacast(char const *)
-	?font@QGlyphs@@QBE?AVQFont@@XZ @ 13406 NONAME ABSENT ; class QFont QGlyphs::font(void) const
-	?paintEngine@QBlittablePixmapData@@UBEPAVQPaintEngine@@XZ @ 13407 NONAME ; class QPaintEngine * QBlittablePixmapData::paintEngine(void) const
-	?unsetDefaultScrollerProperties@QScrollerProperties@@SAXXZ @ 13408 NONAME ABSENT ; void QScrollerProperties::unsetDefaultScrollerProperties(void)
-	?hasChildren@QAbstractProxyModel@@UBE_NABVQModelIndex@@@Z @ 13409 NONAME ; bool QAbstractProxyModel::hasChildren(class QModelIndex const &) const
-	?swap@QPen@@QAEXAAV1@@Z @ 13410 NONAME ; void QPen::swap(class QPen &)
-	?span@QAbstractProxyModel@@UBE?AVQSize@@ABVQModelIndex@@@Z @ 13411 NONAME ; class QSize QAbstractProxyModel::span(class QModelIndex const &) const
-	png_get_pixels_per_meter @ 13412 NONAME
-	png_get_progressive_ptr @ 13413 NONAME
-	png_get_rgb_to_gray_status @ 13414 NONAME
-	?setSnapPositionsY@QScroller@@QAEXMM@Z @ 13415 NONAME ABSENT ; void QScroller::setSnapPositionsY(float, float)
-	?d_func@QScrollPrepareEvent@@ABEPBVQScrollPrepareEventPrivate@@XZ @ 13416 NONAME ABSENT ; class QScrollPrepareEventPrivate const * QScrollPrepareEvent::d_func(void) const
-	?textureMapForGlyph@QTextureGlyphCache@@QBE?AVQImage@@IUQFixed@@@Z @ 13417 NONAME ; class QImage QTextureGlyphCache::textureMapForGlyph(unsigned int, struct QFixed) const
-	png_get_rowbytes @ 13418 NONAME
-	png_get_rows @ 13419 NONAME
-	png_get_sBIT @ 13420 NONAME
-	?qt_metacall@QInternalMimeData@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 13421 NONAME ; int QInternalMimeData::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?lineHeightType@QTextBlockFormat@@QBEHXZ @ 13422 NONAME ; int QTextBlockFormat::lineHeightType(void) const
-	?hintingPreference@QFont@@QBE?AW4HintingPreference@1@XZ @ 13423 NONAME ; enum QFont::HintingPreference QFont::hintingPreference(void) const
-	??0QGlyphs@@QAE@XZ @ 13424 NONAME ABSENT ; QGlyphs::QGlyphs(void)
-	?trUtf8@QInternalMimeData@@SA?AVQString@@PBD0H@Z @ 13425 NONAME ; class QString QInternalMimeData::trUtf8(char const *, char const *, int)
-	png_get_sCAL @ 13426 NONAME
-	png_get_sCAL_fixed @ 13427 NONAME
-	?begin@QBlitterPaintEngine@@UAE_NPAVQPaintDevice@@@Z @ 13428 NONAME ; bool QBlitterPaintEngine::begin(class QPaintDevice *)
-	?inFontUcs4@QFontMetricsF@@QBE_NI@Z @ 13429 NONAME ; bool QFontMetricsF::inFontUcs4(unsigned int) const
-	?viewportSize@QScrollPrepareEvent@@QBE?AVQSizeF@@XZ @ 13430 NONAME ABSENT ; class QSizeF QScrollPrepareEvent::viewportSize(void) const
-	?markRasterOverlay@QBlittablePixmapData@@QAEXABVQRectF@@@Z @ 13431 NONAME ; void QBlittablePixmapData::markRasterOverlay(class QRectF const &)
-	?d_func@QBlitterPaintEngine@@AAEPAVQBlitterPaintEnginePrivate@@XZ @ 13432 NONAME ; class QBlitterPaintEnginePrivate * QBlitterPaintEngine::d_func(void)
-	?setNumberPrefix@QTextListFormat@@QAEXABVQString@@@Z @ 13433 NONAME ; void QTextListFormat::setNumberPrefix(class QString const &)
-	?lineHeight@QTextBlockFormat@@QBEMMM@Z @ 13434 NONAME ; float QTextBlockFormat::lineHeight(float, float) const
-	png_get_sCAL_s @ 13435 NONAME
-	?getItem@QInputDialog@@SA?AVQString@@PAVQWidget@@ABV2@1ABVQStringList@@H_NPA_NV?$QFlags@W4WindowType@Qt@@@@V?$QFlags@W4InputMethodHint@Qt@@@@@Z @ 13436 NONAME ; class QString QInputDialog::getItem(class QWidget *, class QString const &, class QString const &, class QStringList const &, int, bool, bool *, class QFlags<enum Qt::WindowType>, class QFlags<enum Qt::InputMethodHint>)
-	png_get_sPLT @ 13437 NONAME
-	?hasFeature@QWindowSurface@@QBE_NW4WindowSurfaceFeature@1@@Z @ 13438 NONAME ; bool QWindowSurface::hasFeature(enum QWindowSurface::WindowSurfaceFeature) const
-	?qGamma_correct_back_to_linear_cs@@YAXPAVQImage@@@Z @ 13439 NONAME ; void qGamma_correct_back_to_linear_cs(class QImage *)
-	png_get_sRGB @ 13440 NONAME
-	?clip@QBlitterPaintEngine@@UAEXABVQVectorPath@@W4ClipOperation@Qt@@@Z @ 13441 NONAME ; void QBlitterPaintEngine::clip(class QVectorPath const &, enum Qt::ClipOperation)
-	??1QScrollEvent@@UAE@XZ @ 13442 NONAME ABSENT ; QScrollEvent::~QScrollEvent(void)
-	?state@QScroller@@QBE?AW4State@1@XZ @ 13443 NONAME ABSENT ; enum QScroller::State QScroller::state(void) const
-	?positions@QGlyphs@@QBE?AV?$QVector@VQPointF@@@@XZ @ 13444 NONAME ABSENT ; class QVector<class QPointF> QGlyphs::positions(void) const
-	?tr@QScroller@@SA?AVQString@@PBD0@Z @ 13445 NONAME ABSENT ; class QString QScroller::tr(char const *, char const *)
-	?canReadData@QInternalMimeData@@SA_NABVQString@@@Z @ 13446 NONAME ; bool QInternalMimeData::canReadData(class QString const &)
-	?glyphs@QTextLayout@@QBE?AV?$QList@VQGlyphs@@@@XZ @ 13447 NONAME ABSENT ; class QList<class QGlyphs> QTextLayout::glyphs(void) const
-	png_get_tIME @ 13448 NONAME
-	png_get_tRNS @ 13449 NONAME
-	png_get_text @ 13450 NONAME
-	?trUtf8@QScroller@@SA?AVQString@@PBD0H@Z @ 13451 NONAME ABSENT ; class QString QScroller::trUtf8(char const *, char const *, int)
-	?d_func@QFlickGesture@@ABEPBVQFlickGesturePrivate@@XZ @ 13452 NONAME ABSENT ; class QFlickGesturePrivate const * QFlickGesture::d_func(void) const
-	png_get_uint_16 @ 13453 NONAME
-	png_get_uint_31 @ 13454 NONAME
-	png_get_uint_32 @ 13455 NONAME
-	png_get_unknown_chunks @ 13456 NONAME
-	?hasScroller@QScroller@@SA_NPAVQObject@@@Z @ 13457 NONAME ABSENT ; bool QScroller::hasScroller(class QObject *)
-	?alphaMapForGlyph@QFontEngine@@UAE?AVQImage@@IUQFixed@@ABVQTransform@@@Z @ 13458 NONAME ; class QImage QFontEngine::alphaMapForGlyph(unsigned int, struct QFixed, class QTransform const &)
-	png_get_user_chunk_ptr @ 13459 NONAME
-	??_EQGlyphs@@QAE@I@Z @ 13460 NONAME ABSENT ; QGlyphs::~QGlyphs(unsigned int)
-	?fromImage@QBlittablePixmapData@@UAEXABVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 13461 NONAME ; void QBlittablePixmapData::fromImage(class QImage const &, class QFlags<enum Qt::ImageConversionFlag>)
-	??0QInternalMimeData@@QAE@XZ @ 13462 NONAME ; QInternalMimeData::QInternalMimeData(void)
-	??_EQScrollEvent@@UAE@I@Z @ 13463 NONAME ABSENT ; QScrollEvent::~QScrollEvent(unsigned int)
-	?features@QRasterWindowSurface@@UBE?AV?$QFlags@W4WindowSurfaceFeature@QWindowSurface@@@@XZ @ 13464 NONAME ; class QFlags<enum QWindowSurface::WindowSurfaceFeature> QRasterWindowSurface::features(void) const
-	??4QGlyphs@@QAEAAV0@ABV0@@Z @ 13465 NONAME ABSENT ; class QGlyphs & QGlyphs::operator=(class QGlyphs const &)
-	png_get_user_height_max @ 13466 NONAME
-	png_get_user_transform_ptr @ 13467 NONAME
-	??0QBlittable@@QAE@ABVQSize@@V?$QFlags@W4Capability@QBlittable@@@@@Z @ 13468 NONAME ; QBlittable::QBlittable(class QSize const &, class QFlags<enum QBlittable::Capability>)
-	png_get_user_width_max @ 13469 NONAME
-	?scroller@QScroller@@SAPAV1@PAVQObject@@@Z @ 13470 NONAME ABSENT ; class QScroller * QScroller::scroller(class QObject *)
-	??4QScrollerProperties@@QAEAAV0@ABV0@@Z @ 13471 NONAME ABSENT ; class QScrollerProperties & QScrollerProperties::operator=(class QScrollerProperties const &)
-	?d_func@QScroller@@AAEPAVQScrollerPrivate@@XZ @ 13472 NONAME ABSENT ; class QScrollerPrivate * QScroller::d_func(void)
-	?scrollerPropertiesChanged@QScroller@@IAEXABVQScrollerProperties@@@Z @ 13473 NONAME ABSENT ; void QScroller::scrollerPropertiesChanged(class QScrollerProperties const &)
-	?markRasterOverlay@QBlittablePixmapData@@QAEXPBVQRect@@H@Z @ 13474 NONAME ; void QBlittablePixmapData::markRasterOverlay(class QRect const *, int)
-	?tabsClosable@QMdiArea@@QBE_NXZ @ 13475 NONAME ; bool QMdiArea::tabsClosable(void) const
-	?canStartScrollingAt@QAbstractScrollAreaPrivate@@QAE_NABVQPoint@@@Z @ 13476 NONAME ABSENT ; bool QAbstractScrollAreaPrivate::canStartScrollingAt(class QPoint const &)
-	??0QScrollerProperties@@QAE@XZ @ 13477 NONAME ABSENT ; QScrollerProperties::QScrollerProperties(void)
-	?setLineHeight@QTextBlockFormat@@QAEXMH@Z @ 13478 NONAME ; void QTextBlockFormat::setLineHeight(float, int)
-	?calculateSubPixelPositionCount@QTextureGlyphCache@@IBEHI@Z @ 13479 NONAME ; int QTextureGlyphCache::calculateSubPixelPositionCount(unsigned int) const
-	png_get_valid @ 13480 NONAME
-	png_get_x_offset_inches @ 13481 NONAME
-	?glyphs@QTextFragment@@QBE?AV?$QList@VQGlyphs@@@@XZ @ 13482 NONAME ABSENT ; class QList<class QGlyphs> QTextFragment::glyphs(void) const
-	png_get_x_offset_inches_fixed @ 13483 NONAME
-	png_get_x_offset_microns @ 13484 NONAME
-	?resetInternalData@QAbstractProxyModel@@IAEXXZ @ 13485 NONAME ABSENT ; void QAbstractProxyModel::resetInternalData(void)
-	png_get_x_offset_pixels @ 13486 NONAME
-	?features@QWindowSurface@@UBE?AV?$QFlags@W4WindowSurfaceFeature@QWindowSurface@@@@XZ @ 13487 NONAME ; class QFlags<enum QWindowSurface::WindowSurfaceFeature> QWindowSurface::features(void) const
-	?markRasterOverlay@QBlittablePixmapData@@QAEXABVQVectorPath@@@Z @ 13488 NONAME ; void QBlittablePixmapData::markRasterOverlay(class QVectorPath const &)
-	png_get_x_pixels_per_inch @ 13489 NONAME
-	?scrollTo@QScroller@@QAEXABVQPointF@@@Z @ 13490 NONAME ABSENT ; void QScroller::scrollTo(class QPointF const &)
-	png_get_x_pixels_per_meter @ 13491 NONAME
-	png_get_y_offset_inches @ 13492 NONAME
-	png_get_y_offset_inches_fixed @ 13493 NONAME
-	?clip@QBlitterPaintEngine@@QAEPBVQClipData@@XZ @ 13494 NONAME ; class QClipData const * QBlitterPaintEngine::clip(void)
-	?d_func@QScroller@@ABEPBVQScrollerPrivate@@XZ @ 13495 NONAME ABSENT ; class QScrollerPrivate const * QScroller::d_func(void) const
-	?setNumberSuffix@QTextListFormat@@QAEXABVQString@@@Z @ 13496 NONAME ; void QTextListFormat::setNumberSuffix(class QString const &)
-	?swap@QPicture@@QAEXAAV1@@Z @ 13497 NONAME ; void QPicture::swap(class QPicture &)
-	?swap@QPainterPath@@QAEXAAV1@@Z @ 13498 NONAME ; void QPainterPath::swap(class QPainterPath &)
-	png_get_y_offset_microns @ 13499 NONAME
-	?minimumSizeHint@QCheckBox@@UBE?AVQSize@@XZ @ 13500 NONAME ; class QSize QCheckBox::minimumSizeHint(void) const
-	?createExplicitFont@QFontEngine@@UBE?AVQFont@@XZ @ 13501 NONAME ABSENT ; class QFont QFontEngine::createExplicitFont(void) const
-	?alphaMapForGlyph@QFontEngine@@UAE?AVQImage@@IUQFixed@@@Z @ 13502 NONAME ; class QImage QFontEngine::alphaMapForGlyph(unsigned int, struct QFixed)
-	?fillTexture@QImageTextureGlyphCache@@UAEXABUCoord@QTextureGlyphCache@@IUQFixed@@@Z @ 13503 NONAME ; void QImageTextureGlyphCache::fillTexture(struct QTextureGlyphCache::Coord const &, unsigned int, struct QFixed)
-	?swap@QIcon@@QAEXAAV1@@Z @ 13504 NONAME ; void QIcon::swap(class QIcon &)
-	?unmarkRasterOverlay@QBlittablePixmapData@@QAEXABVQRectF@@@Z @ 13505 NONAME ; void QBlittablePixmapData::unmarkRasterOverlay(class QRectF const &)
-	png_get_y_offset_pixels @ 13506 NONAME
-	png_get_y_pixels_per_inch @ 13507 NONAME
-	?brushOriginChanged@QBlitterPaintEngine@@UAEXXZ @ 13508 NONAME ; void QBlitterPaintEngine::brushOriginChanged(void)
-	?openFile@QFileOpenEvent@@QBE_NAAVQFile@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@@Z @ 13509 NONAME ; bool QFileOpenEvent::openFile(class QFile &, class QFlags<enum QIODevice::OpenModeFlag>) const
-	png_get_y_pixels_per_meter @ 13510 NONAME
-	??0QApplicationPrivate@@QAE@AAHPAPADW4Type@QApplication@@H@Z @ 13511 NONAME ; QApplicationPrivate::QApplicationPrivate(int &, char * *, enum QApplication::Type, int)
-	?handleInput@QScroller@@QAE_NW4Input@1@ABVQPointF@@_J@Z @ 13512 NONAME ABSENT ; bool QScroller::handleInput(enum QScroller::Input, class QPointF const &, long long)
-	??8QScrollerProperties@@QBE_NABV0@@Z @ 13513 NONAME ABSENT ; bool QScrollerProperties::operator==(class QScrollerProperties const &) const
-	?inFontUcs4@QFontMetrics@@QBE_NI@Z @ 13514 NONAME ; bool QFontMetrics::inFontUcs4(unsigned int) const
-	png_handle_as_unknown @ 13515 NONAME
-	png_info_init_3 @ 13516 NONAME
-	png_init_io @ 13517 NONAME
-	?unlock@QBlittable@@QAEXXZ @ 13518 NONAME ; void QBlittable::unlock(void)
-	?metaObject@QScroller@@UBEPBUQMetaObject@@XZ @ 13519 NONAME ABSENT ; struct QMetaObject const * QScroller::metaObject(void) const
-	?d_func@QScrollEvent@@ABEPBVQScrollEventPrivate@@XZ @ 13520 NONAME ABSENT ; class QScrollEventPrivate const * QScrollEvent::d_func(void) const
-	?swap@QRegion@@QAEXAAV1@@Z @ 13521 NONAME ; void QRegion::swap(class QRegion &)
-	png_longjmp @ 13522 NONAME
-	?ensureVisible@QScroller@@QAEXABVQRectF@@MMH@Z @ 13523 NONAME ABSENT ; void QScroller::ensureVisible(class QRectF const &, float, float, int)
-	?qt_metacall@QFlickGesture@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 13524 NONAME ABSENT ; int QFlickGesture::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?setItemData@QAbstractProxyModel@@UAE_NABVQModelIndex@@ABV?$QMap@HVQVariant@@@@@Z @ 13525 NONAME ; bool QAbstractProxyModel::setItemData(class QModelIndex const &, class QMap<int, class QVariant> const &)
-	?getStaticMetaObject@QInternalMimeData@@SAABUQMetaObject@@XZ @ 13526 NONAME ; struct QMetaObject const & QInternalMimeData::getStaticMetaObject(void)
-	?swap@QPolygonF@@QAEXAAV1@@Z @ 13527 NONAME ; void QPolygonF::swap(class QPolygonF &)
-	?swap@QPolygon@@QAEXAAV1@@Z @ 13528 NONAME ; void QPolygon::swap(class QPolygon &)
-	??_EQScrollPrepareEvent@@UAE@I@Z @ 13529 NONAME ABSENT ; QScrollPrepareEvent::~QScrollPrepareEvent(unsigned int)
-	?d_func@QBlitterPaintEngine@@ABEPBVQBlitterPaintEnginePrivate@@XZ @ 13530 NONAME ; class QBlitterPaintEnginePrivate const * QBlitterPaintEngine::d_func(void) const
-	?pixelPerMeter@QScroller@@QBE?AVQPointF@@XZ @ 13531 NONAME ABSENT ; class QPointF QScroller::pixelPerMeter(void) const
-	?target@QScroller@@QBEPAVQObject@@XZ @ 13532 NONAME ABSENT ; class QObject * QScroller::target(void) const
-	?swap@QKeySequence@@QAEXAAV1@@Z @ 13533 NONAME ; void QKeySequence::swap(class QKeySequence &)
-	??1QGlyphs@@QAE@XZ @ 13534 NONAME ABSENT ; QGlyphs::~QGlyphs(void)
-	?lineHeight@QTextBlockFormat@@QBEMXZ @ 13535 NONAME ; float QTextBlockFormat::lineHeight(void) const
-	?stroke@QBlitterPaintEngine@@UAEXABVQVectorPath@@ABVQPen@@@Z @ 13536 NONAME ; void QBlitterPaintEngine::stroke(class QVectorPath const &, class QPen const &)
-	?tr@QInternalMimeData@@SA?AVQString@@PBD0@Z @ 13537 NONAME ; class QString QInternalMimeData::tr(char const *, char const *)
-	??9QGlyphs@@QBE_NABV0@@Z @ 13538 NONAME ABSENT ; bool QGlyphs::operator!=(class QGlyphs const &) const
-	??1QBlittable@@UAE@XZ @ 13539 NONAME ; QBlittable::~QBlittable(void)
-	??_EQBlitterPaintEngine@@UAE@I@Z @ 13540 NONAME ; QBlitterPaintEngine::~QBlitterPaintEngine(unsigned int)
-	png_malloc_default @ 13541 NONAME
-	?grabbedGesture@QScroller@@SA?AW4GestureType@Qt@@PAVQObject@@@Z @ 13542 NONAME ABSENT ; enum Qt::GestureType QScroller::grabbedGesture(class QObject *)
-	?buffer@QBlittablePixmapData@@UAEPAVQImage@@XZ @ 13543 NONAME ; class QImage * QBlittablePixmapData::buffer(void)
-	png_malloc_warn @ 13544 NONAME
-	?staticMetaObject@QFlickGesture@@2UQMetaObject@@B @ 13545 NONAME ABSENT ; struct QMetaObject const QFlickGesture::staticMetaObject
-	?finalPosition@QScroller@@QBE?AVQPointF@@XZ @ 13546 NONAME ABSENT ; class QPointF QScroller::finalPosition(void) const
-	png_permit_mng_features @ 13547 NONAME
-	?drawStaticTextItem@QBlitterPaintEngine@@UAEXPAVQStaticTextItem@@@Z @ 13548 NONAME ; void QBlitterPaintEngine::drawStaticTextItem(class QStaticTextItem *)
-	??0QGlyphs@@QAE@ABV0@@Z @ 13549 NONAME ABSENT ; QGlyphs::QGlyphs(class QGlyphs const &)
-	?lock@QBlittable@@QAEPAVQImage@@XZ @ 13550 NONAME ; class QImage * QBlittable::lock(void)
-	?setFontHintingPreference@QTextCharFormat@@QAEXW4HintingPreference@QFont@@@Z @ 13551 NONAME ; void QTextCharFormat::setFontHintingPreference(enum QFont::HintingPreference)
-	png_process_data @ 13552 NONAME
-	??_EQInternalMimeData@@UAE@I@Z @ 13553 NONAME ; QInternalMimeData::~QInternalMimeData(unsigned int)
-	png_process_data_skip @ 13554 NONAME
-	png_progressive_combine_row @ 13555 NONAME
-	png_read_image @ 13556 NONAME
-	png_read_info @ 13557 NONAME
-	?markRasterOverlay@QBlittablePixmapData@@QAEXABVQPointF@@ABVQTextItem@@@Z @ 13558 NONAME ; void QBlittablePixmapData::markRasterOverlay(class QPointF const &, class QTextItem const &)
-	?trUtf8@QScroller@@SA?AVQString@@PBD0@Z @ 13559 NONAME ABSENT ; class QString QScroller::trUtf8(char const *, char const *)
-	png_read_png @ 13560 NONAME
-	??YQGlyphs@@AAEAAV0@ABV0@@Z @ 13561 NONAME ABSENT ; class QGlyphs & QGlyphs::operator+=(class QGlyphs const &)
-	??9QScrollerProperties@@QBE_NABV0@@Z @ 13562 NONAME ABSENT ; bool QScrollerProperties::operator!=(class QScrollerProperties const &) const
-	png_read_row @ 13563 NONAME
-	?drawEllipse@QBlitterPaintEngine@@UAEXABVQRectF@@@Z @ 13564 NONAME ; void QBlitterPaintEngine::drawEllipse(class QRectF const &)
-	png_read_rows @ 13565 NONAME
-	png_read_update_info @ 13566 NONAME
-	png_reset_zstream @ 13567 NONAME
-	?blittable@QBlittablePixmapData@@QBEPAVQBlittable@@XZ @ 13568 NONAME ; class QBlittable * QBlittablePixmapData::blittable(void) const
-	?resizeCache@QTextureGlyphCache@@QAEXHH@Z @ 13569 NONAME ; void QTextureGlyphCache::resizeCache(int, int)
-	??0QScrollerProperties@@QAE@ABV0@@Z @ 13570 NONAME ABSENT ; QScrollerProperties::QScrollerProperties(class QScrollerProperties const &)
-	png_save_int_32 @ 13571 NONAME
-	?metaObject@QInternalMimeData@@UBEPBUQMetaObject@@XZ @ 13572 NONAME ; struct QMetaObject const * QInternalMimeData::metaObject(void) const
-	?setContentPos@QScrollPrepareEvent@@QAEXABVQPointF@@@Z @ 13573 NONAME ABSENT ; void QScrollPrepareEvent::setContentPos(class QPointF const &)
-	png_save_uint_16 @ 13574 NONAME
-	png_save_uint_32 @ 13575 NONAME
-	png_set_IHDR @ 13576 NONAME
-	?staticMetaObject@QScroller@@2UQMetaObject@@B @ 13577 NONAME ABSENT ; struct QMetaObject const QScroller::staticMetaObject
-	?hasFormatHelper@QInternalMimeData@@SA_NABVQString@@PBVQMimeData@@@Z @ 13578 NONAME ; bool QInternalMimeData::hasFormatHelper(class QString const &, class QMimeData const *)
-	?state@QBlitterPaintEngine@@QAEPAVQPainterState@@XZ @ 13579 NONAME ; class QPainterState * QBlitterPaintEngine::state(void)
-	?penChanged@QBlitterPaintEngine@@UAEXXZ @ 13580 NONAME ; void QBlitterPaintEngine::penChanged(void)
-	??0QFileOpenEvent@@QAE@ABVRFile@@@Z @ 13581 NONAME ; QFileOpenEvent::QFileOpenEvent(class RFile const &)
-	?hasHeightForWidth@QWidgetPrivate@@UBE_NXZ @ 13582 NONAME ; bool QWidgetPrivate::hasHeightForWidth(void) const
-	png_set_PLTE @ 13583 NONAME
-	?toImage@QBlittablePixmapData@@UBE?AVQImage@@XZ @ 13584 NONAME ; class QImage QBlittablePixmapData::toImage(void) const
-	??_EQBlittable@@UAE@I@Z @ 13585 NONAME ; QBlittable::~QBlittable(unsigned int)
-	png_set_add_alpha @ 13586 NONAME
-	??1QInternalMimeData@@UAE@XZ @ 13587 NONAME ; QInternalMimeData::~QInternalMimeData(void)
-	png_set_bKGD @ 13588 NONAME
-	?qt_addBitmapToPath@@YAXMMPBEHHHPAVQPainterPath@@@Z @ 13589 NONAME ; void qt_addBitmapToPath(float, float, unsigned char const *, int, int, int, class QPainterPath *)
-	?staticMetaObject@QInternalMimeData@@2UQMetaObject@@B @ 13590 NONAME ; struct QMetaObject const QInternalMimeData::staticMetaObject
-	?activeScrollers@QScroller@@SA?AV?$QList@PAVQScroller@@@@XZ @ 13591 NONAME ABSENT ; class QList<class QScroller *> QScroller::activeScrollers(void)
-	?drawGlyphs@QPainter@@QAEXABVQPointF@@ABVQGlyphs@@@Z @ 13592 NONAME ABSENT ; void QPainter::drawGlyphs(class QPointF const &, class QGlyphs const &)
-	png_set_background @ 13593 NONAME
-	?staticMetaObjectExtraData@QStylePlugin@@0UQMetaObjectExtraData@@B @ 13594 NONAME ; struct QMetaObjectExtraData const QStylePlugin::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QToolBar@@0UQMetaObjectExtraData@@B @ 13595 NONAME ; struct QMetaObjectExtraData const QToolBar::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QTableView@@0UQMetaObjectExtraData@@B @ 13596 NONAME ; struct QMetaObjectExtraData const QTableView::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QValidator@@0UQMetaObjectExtraData@@B @ 13597 NONAME ; struct QMetaObjectExtraData const QValidator::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QPaintBufferSignalProxy@@0UQMetaObjectExtraData@@B @ 13598 NONAME ; struct QMetaObjectExtraData const QPaintBufferSignalProxy::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QSplashScreen@@0UQMetaObjectExtraData@@B @ 13599 NONAME ; struct QMetaObjectExtraData const QSplashScreen::staticMetaObjectExtraData
-	?qt_static_metacall@QDockWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13600 NONAME ; void QDockWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QVBoxLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13601 NONAME ; void QVBoxLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QCommonStyle@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13602 NONAME ; void QCommonStyle::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QMenuBar@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13603 NONAME ; void QMenuBar::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QGraphicsObject@@0UQMetaObjectExtraData@@B @ 13604 NONAME ; struct QMetaObjectExtraData const QGraphicsObject::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QSplitter@@0UQMetaObjectExtraData@@B @ 13605 NONAME ; struct QMetaObjectExtraData const QSplitter::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QUndoStack@@0UQMetaObjectExtraData@@B @ 13606 NONAME ; struct QMetaObjectExtraData const QUndoStack::staticMetaObjectExtraData
-	?qt_static_metacall@QPaintBufferResource@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13607 NONAME ; void QPaintBufferResource::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QSound@@0UQMetaObjectExtraData@@B @ 13608 NONAME ; struct QMetaObjectExtraData const QSound::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QSwipeGesture@@0UQMetaObjectExtraData@@B @ 13609 NONAME ; struct QMetaObjectExtraData const QSwipeGesture::staticMetaObjectExtraData
-	?qt_static_metacall@QSizeGrip@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13610 NONAME ; void QSizeGrip::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QSlider@@0UQMetaObjectExtraData@@B @ 13611 NONAME ; struct QMetaObjectExtraData const QSlider::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QAbstractItemView@@0UQMetaObjectExtraData@@B @ 13612 NONAME ; struct QMetaObjectExtraData const QAbstractItemView::staticMetaObjectExtraData
-	?setCompressionPolicy@QZipWriter@@QAEXW4CompressionPolicy@1@@Z @ 13613 NONAME ; void QZipWriter::setCompressionPolicy(enum QZipWriter::CompressionPolicy)
-	?staticMetaObjectExtraData@QPlainTextEdit@@0UQMetaObjectExtraData@@B @ 13614 NONAME ; struct QMetaObjectExtraData const QPlainTextEdit::staticMetaObjectExtraData
-	?addFile@QZipWriter@@QAEXABVQString@@PAVQIODevice@@@Z @ 13615 NONAME ; void QZipWriter::addFile(class QString const &, class QIODevice *)
-	?staticMetaObjectExtraData@QDateEdit@@0UQMetaObjectExtraData@@B @ 13616 NONAME ; struct QMetaObjectExtraData const QDateEdit::staticMetaObjectExtraData
-	?qt_static_metacall@QGuiPlatformPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13617 NONAME ; void QGuiPlatformPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QFlickGesture@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13618 NONAME ABSENT ; void QFlickGesture::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QStyledItemDelegate@@0UQMetaObjectExtraData@@B @ 13619 NONAME ; struct QMetaObjectExtraData const QStyledItemDelegate::staticMetaObjectExtraData
-	?qt_static_metacall@QWizard@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13620 NONAME ; void QWizard::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QTextControl@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13621 NONAME ; void QTextControl::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QGraphicsRotation@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13622 NONAME ; void QGraphicsRotation::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QAbstractProxyModel@@0UQMetaObjectExtraData@@B @ 13623 NONAME ; struct QMetaObjectExtraData const QAbstractProxyModel::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDialog@@0UQMetaObjectExtraData@@B @ 13624 NONAME ; struct QMetaObjectExtraData const QDialog::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QPixmapDropShadowFilter@@0UQMetaObjectExtraData@@B @ 13625 NONAME ; struct QMetaObjectExtraData const QPixmapDropShadowFilter::staticMetaObjectExtraData
-	?qt_static_metacall@QPanGesture@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13626 NONAME ; void QPanGesture::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QWidgetResizeHandler@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13627 NONAME ; void QWidgetResizeHandler::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QGraphicsSystemPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13628 NONAME ; void QGraphicsSystemPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QProxyModel@@0UQMetaObjectExtraData@@B @ 13629 NONAME ; struct QMetaObjectExtraData const QProxyModel::staticMetaObjectExtraData
-	?qt_static_metacall@QGraphicsWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13630 NONAME ; void QGraphicsWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QSizeGrip@@0UQMetaObjectExtraData@@B @ 13631 NONAME ; struct QMetaObjectExtraData const QSizeGrip::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QImageIOPlugin@@0UQMetaObjectExtraData@@B @ 13632 NONAME ; struct QMetaObjectExtraData const QImageIOPlugin::staticMetaObjectExtraData
-	?qt_static_metacall@QSortFilterProxyModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13633 NONAME ; void QSortFilterProxyModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QDrag@@0UQMetaObjectExtraData@@B @ 13634 NONAME ; struct QMetaObjectExtraData const QDrag::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QAction@@0UQMetaObjectExtraData@@B @ 13635 NONAME ; struct QMetaObjectExtraData const QAction::staticMetaObjectExtraData
-	?qt_static_metacall@QUndoView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13636 NONAME ; void QUndoView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?creationPermissions@QZipWriter@@QBE?AV?$QFlags@W4Permission@QFile@@@@XZ @ 13637 NONAME ; class QFlags<enum QFile::Permission> QZipWriter::creationPermissions(void) const
-	?staticMetaObjectExtraData@QTabBar@@0UQMetaObjectExtraData@@B @ 13638 NONAME ; struct QMetaObjectExtraData const QTabBar::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QColumnView@@0UQMetaObjectExtraData@@B @ 13639 NONAME ; struct QMetaObjectExtraData const QColumnView::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QProxyStyle@@0UQMetaObjectExtraData@@B @ 13640 NONAME ; struct QMetaObjectExtraData const QProxyStyle::staticMetaObjectExtraData
-	?qt_static_metacall@QActionGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13641 NONAME ; void QActionGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QLineEdit@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13642 NONAME ; void QLineEdit::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	??0QZipWriter@@QAE@ABVQString@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@@Z @ 13643 NONAME ; QZipWriter::QZipWriter(class QString const &, class QFlags<enum QIODevice::OpenModeFlag>)
-	?staticMetaObjectExtraData@QSortFilterProxyModel@@0UQMetaObjectExtraData@@B @ 13644 NONAME ; struct QMetaObjectExtraData const QSortFilterProxyModel::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QIconEnginePlugin@@0UQMetaObjectExtraData@@B @ 13645 NONAME ; struct QMetaObjectExtraData const QIconEnginePlugin::staticMetaObjectExtraData
-	?qt_static_metacall@QPixmapConvolutionFilter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13646 NONAME ; void QPixmapConvolutionFilter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QApplication@@0UQMetaObjectExtraData@@B @ 13647 NONAME ; struct QMetaObjectExtraData const QApplication::staticMetaObjectExtraData
-	?qt_static_metacall@QCalendarWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13648 NONAME ; void QCalendarWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QInputContextPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13649 NONAME ; void QInputContextPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QGuiPlatformPlugin@@0UQMetaObjectExtraData@@B @ 13650 NONAME ; struct QMetaObjectExtraData const QGuiPlatformPlugin::staticMetaObjectExtraData
-	?qt_static_metacall@QTextObject@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13651 NONAME ; void QTextObject::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QStandardItemModel@@0UQMetaObjectExtraData@@B @ 13652 NONAME ; struct QMetaObjectExtraData const QStandardItemModel::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QProgressDialog@@0UQMetaObjectExtraData@@B @ 13653 NONAME ; struct QMetaObjectExtraData const QProgressDialog::staticMetaObjectExtraData
-	?qt_static_metacall@QAbstractItemView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13654 NONAME ; void QAbstractItemView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QColumnView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13655 NONAME ; void QColumnView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QPixmapBlurFilter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13656 NONAME ; void QPixmapBlurFilter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QGraphicsTransform@@0UQMetaObjectExtraData@@B @ 13657 NONAME ; struct QMetaObjectExtraData const QGraphicsTransform::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QFontDialog@@0UQMetaObjectExtraData@@B @ 13658 NONAME ; struct QMetaObjectExtraData const QFontDialog::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGraphicsBlurEffect@@0UQMetaObjectExtraData@@B @ 13659 NONAME ; struct QMetaObjectExtraData const QGraphicsBlurEffect::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGraphicsProxyWidget@@0UQMetaObjectExtraData@@B @ 13660 NONAME ; struct QMetaObjectExtraData const QGraphicsProxyWidget::staticMetaObjectExtraData
-	?qt_static_metacall@QPictureFormatPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13661 NONAME ; void QPictureFormatPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QFileDialog@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13662 NONAME ; void QFileDialog::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QFlickGesture@@0UQMetaObjectExtraData@@B @ 13663 NONAME ABSENT ; struct QMetaObjectExtraData const QFlickGesture::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QWizard@@0UQMetaObjectExtraData@@B @ 13664 NONAME ; struct QMetaObjectExtraData const QWizard::staticMetaObjectExtraData
-	?qt_static_metacall@QS60Style@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13665 NONAME ; void QS60Style::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QTapGesture@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13666 NONAME ; void QTapGesture::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QItemDelegate@@0UQMetaObjectExtraData@@B @ 13667 NONAME ; struct QMetaObjectExtraData const QItemDelegate::staticMetaObjectExtraData
-	?qt_static_metacall@QProxyModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13668 NONAME ; void QProxyModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QScrollBar@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13669 NONAME ; void QScrollBar::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QComboBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13670 NONAME ; void QComboBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QToolButton@@0UQMetaObjectExtraData@@B @ 13671 NONAME ; struct QMetaObjectExtraData const QToolButton::staticMetaObjectExtraData
-	?qt_static_metacall@QItemSelectionModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13672 NONAME ; void QItemSelectionModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	??0QZipWriter@@QAE@PAVQIODevice@@@Z @ 13673 NONAME ; QZipWriter::QZipWriter(class QIODevice *)
-	?staticMetaObjectExtraData@QButtonGroup@@0UQMetaObjectExtraData@@B @ 13674 NONAME ; struct QMetaObjectExtraData const QButtonGroup::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QErrorMessage@@0UQMetaObjectExtraData@@B @ 13675 NONAME ; struct QMetaObjectExtraData const QErrorMessage::staticMetaObjectExtraData
-	?qt_static_metacall@QTableView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13676 NONAME ; void QTableView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QTextEdit@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13677 NONAME ; void QTextEdit::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QDialog@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13678 NONAME ; void QDialog::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QMessageBox@@0UQMetaObjectExtraData@@B @ 13679 NONAME ; struct QMetaObjectExtraData const QMessageBox::staticMetaObjectExtraData
-	?qt_static_metacall@QWorkspace@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13680 NONAME ; void QWorkspace::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QTextEdit@@0UQMetaObjectExtraData@@B @ 13681 NONAME ; struct QMetaObjectExtraData const QTextEdit::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDoubleValidator@@0UQMetaObjectExtraData@@B @ 13682 NONAME ; struct QMetaObjectExtraData const QDoubleValidator::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGraphicsWidget@@0UQMetaObjectExtraData@@B @ 13683 NONAME ; struct QMetaObjectExtraData const QGraphicsWidget::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QSplitterHandle@@0UQMetaObjectExtraData@@B @ 13684 NONAME ; struct QMetaObjectExtraData const QSplitterHandle::staticMetaObjectExtraData
-	?qt_static_metacall@QPinchGesture@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13685 NONAME ; void QPinchGesture::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?alphaMapBoundingBox@QFontEngine@@UAE?AUglyph_metrics_t@@IUQFixed@@ABVQTransform@@W4GlyphFormat@1@@Z @ 13686 NONAME ; struct glyph_metrics_t QFontEngine::alphaMapBoundingBox(unsigned int, struct QFixed, class QTransform const &, enum QFontEngine::GlyphFormat)
-	?qt_static_metacall@QGridLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13687 NONAME ; void QGridLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QSplitter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13688 NONAME ; void QSplitter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QStackedLayout@@0UQMetaObjectExtraData@@B @ 13689 NONAME ; struct QMetaObjectExtraData const QStackedLayout::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QTapAndHoldGesture@@0UQMetaObjectExtraData@@B @ 13690 NONAME ; struct QMetaObjectExtraData const QTapAndHoldGesture::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QLCDNumber@@0UQMetaObjectExtraData@@B @ 13691 NONAME ; struct QMetaObjectExtraData const QLCDNumber::staticMetaObjectExtraData
-	?qt_static_metacall@QDoubleSpinBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13692 NONAME ; void QDoubleSpinBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QValidator@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13693 NONAME ; void QValidator::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?addDirectory@QZipWriter@@QAEXABVQString@@@Z @ 13694 NONAME ; void QZipWriter::addDirectory(class QString const &)
-	?staticMetaObjectExtraData@QEventDispatcherS60@@0UQMetaObjectExtraData@@B @ 13695 NONAME ; struct QMetaObjectExtraData const QEventDispatcherS60::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QLineControl@@0UQMetaObjectExtraData@@B @ 13696 NONAME ; struct QMetaObjectExtraData const QLineControl::staticMetaObjectExtraData
-	?qt_static_metacall@QStylePlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13697 NONAME ; void QStylePlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QScrollArea@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13698 NONAME ; void QScrollArea::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QProgressDialog@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13699 NONAME ; void QProgressDialog::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QWidget@@0UQMetaObjectExtraData@@B @ 13700 NONAME ; struct QMetaObjectExtraData const QWidget::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QRubberBand@@0UQMetaObjectExtraData@@B @ 13701 NONAME ; struct QMetaObjectExtraData const QRubberBand::staticMetaObjectExtraData
-	?qt_static_metacall@QLineControl@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13702 NONAME ; void QLineControl::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QDockWidgetLayout@@0UQMetaObjectExtraData@@B @ 13703 NONAME ; struct QMetaObjectExtraData const QDockWidgetLayout::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QTextControl@@0UQMetaObjectExtraData@@B @ 13704 NONAME ; struct QMetaObjectExtraData const QTextControl::staticMetaObjectExtraData
-	?qt_static_metacall@QTreeView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13705 NONAME ; void QTreeView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QGraphicsScene@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13706 NONAME ; void QGraphicsScene::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QApplication@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13707 NONAME ; void QApplication::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QCommandLinkButton@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13708 NONAME ; void QCommandLinkButton::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QTextBlockGroup@@0UQMetaObjectExtraData@@B @ 13709 NONAME ; struct QMetaObjectExtraData const QTextBlockGroup::staticMetaObjectExtraData
-	?qt_static_metacall@QIntValidator@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13710 NONAME ; void QIntValidator::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QInputContextPlugin@@0UQMetaObjectExtraData@@B @ 13711 NONAME ; struct QMetaObjectExtraData const QInputContextPlugin::staticMetaObjectExtraData
-	?qt_static_metacall@QFontComboBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13712 NONAME ; void QFontComboBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QTextDocument@@0UQMetaObjectExtraData@@B @ 13713 NONAME ; struct QMetaObjectExtraData const QTextDocument::staticMetaObjectExtraData
-	?qt_static_metacall@QTextList@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13714 NONAME ; void QTextList::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QStyle@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13715 NONAME ; void QStyle::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QGraphicsObject@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13716 NONAME ; void QGraphicsObject::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QSpinBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13717 NONAME ; void QSpinBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QGraphicsScale@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13718 NONAME ; void QGraphicsScale::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QPlainTextDocumentLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13719 NONAME ; void QPlainTextDocumentLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QShortcut@@0UQMetaObjectExtraData@@B @ 13720 NONAME ; struct QMetaObjectExtraData const QShortcut::staticMetaObjectExtraData
-	?qt_static_metacall@QDial@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13721 NONAME ; void QDial::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QGraphicsItemAnimation@@0UQMetaObjectExtraData@@B @ 13722 NONAME ; struct QMetaObjectExtraData const QGraphicsItemAnimation::staticMetaObjectExtraData
-	?qt_static_metacall@QGraphicsProxyWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13723 NONAME ; void QGraphicsProxyWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QMenuBar@@0UQMetaObjectExtraData@@B @ 13724 NONAME ; struct QMetaObjectExtraData const QMenuBar::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGraphicsColorizeEffect@@0UQMetaObjectExtraData@@B @ 13725 NONAME ; struct QMetaObjectExtraData const QGraphicsColorizeEffect::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QScrollArea@@0UQMetaObjectExtraData@@B @ 13726 NONAME ; struct QMetaObjectExtraData const QScrollArea::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QPaintBufferResource@@0UQMetaObjectExtraData@@B @ 13727 NONAME ; struct QMetaObjectExtraData const QPaintBufferResource::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QTextFrame@@0UQMetaObjectExtraData@@B @ 13728 NONAME ; struct QMetaObjectExtraData const QTextFrame::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QItemSelectionModel@@0UQMetaObjectExtraData@@B @ 13729 NONAME ; struct QMetaObjectExtraData const QItemSelectionModel::staticMetaObjectExtraData
-	?qt_static_metacall@QIconEnginePluginV2@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13730 NONAME ; void QIconEnginePluginV2::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QGraphicsBlurEffect@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13731 NONAME ; void QGraphicsBlurEffect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	png_access_version_number @ 13116 NONAME
+	png_benign_error @ 13117 NONAME
+	png_build_grayscale_palette @ 13118 NONAME
+	png_calloc @ 13119 NONAME
+	png_chunk_benign_error @ 13120 NONAME
+	png_chunk_error @ 13121 NONAME
+	png_chunk_warning @ 13122 NONAME
+	png_convert_from_struct_tm @ 13123 NONAME
+	png_convert_from_time_t @ 13124 NONAME
+	png_convert_to_rfc1123 @ 13125 NONAME
+	png_create_info_struct @ 13126 NONAME
+	png_create_read_struct @ 13127 NONAME
+	png_create_read_struct_2 @ 13128 NONAME
+	png_create_write_struct @ 13129 NONAME
+	png_create_write_struct_2 @ 13130 NONAME
+	png_data_freer @ 13131 NONAME
+	png_destroy_info_struct @ 13132 NONAME
+	png_destroy_read_struct @ 13133 NONAME
+	png_destroy_write_struct @ 13134 NONAME
+	png_error @ 13135 NONAME
+	png_free @ 13136 NONAME
+	png_free_data @ 13137 NONAME
+	png_free_default @ 13138 NONAME
+	png_get_IHDR @ 13139 NONAME
+	png_get_PLTE @ 13140 NONAME
+	png_get_bKGD @ 13141 NONAME
+	png_get_bit_depth @ 13142 NONAME
+	png_get_cHRM @ 13143 NONAME
+	png_get_cHRM_fixed @ 13144 NONAME
+	png_get_channels @ 13145 NONAME
+	png_get_chunk_cache_max @ 13146 NONAME
+	png_get_chunk_malloc_max @ 13147 NONAME
+	png_get_color_type @ 13148 NONAME
+	png_get_compression_buffer_size @ 13149 NONAME
+	png_get_compression_type @ 13150 NONAME
+	png_get_copyright @ 13151 NONAME
+	png_get_current_pass_number @ 13152 NONAME
+	png_get_current_row_number @ 13153 NONAME
+	png_get_error_ptr @ 13154 NONAME
+	png_get_filter_type @ 13155 NONAME
+	png_get_gAMA @ 13156 NONAME
+	png_get_gAMA_fixed @ 13157 NONAME
+	png_get_hIST @ 13158 NONAME
+	png_get_header_ver @ 13159 NONAME
+	png_get_header_version @ 13160 NONAME
+	png_get_iCCP @ 13161 NONAME
+	png_get_image_height @ 13162 NONAME
+	png_get_image_width @ 13163 NONAME
+	png_get_int_32 @ 13164 NONAME
+	png_get_interlace_type @ 13165 NONAME
+	png_get_io_chunk_name @ 13166 NONAME
+	png_get_io_chunk_type @ 13167 NONAME
+	png_get_io_ptr @ 13168 NONAME
+	png_get_io_state @ 13169 NONAME
+	png_get_libpng_ver @ 13170 NONAME
+	png_get_mem_ptr @ 13171 NONAME
+	png_get_oFFs @ 13172 NONAME
+	png_get_pCAL @ 13173 NONAME
+	png_get_pHYs @ 13174 NONAME
+	png_get_pHYs_dpi @ 13175 NONAME
+	png_get_pixel_aspect_ratio @ 13176 NONAME
+	png_get_pixel_aspect_ratio_fixed @ 13177 NONAME
+	png_get_pixels_per_inch @ 13178 NONAME
+	png_get_pixels_per_meter @ 13179 NONAME
+	png_get_progressive_ptr @ 13180 NONAME
+	png_get_rgb_to_gray_status @ 13181 NONAME
+	png_get_rowbytes @ 13182 NONAME
+	png_get_rows @ 13183 NONAME
+	png_get_sBIT @ 13184 NONAME
+	png_get_sCAL @ 13185 NONAME
+	png_get_sCAL_fixed @ 13186 NONAME
+	png_get_sCAL_s @ 13187 NONAME
+	png_get_sPLT @ 13188 NONAME
+	png_get_sRGB @ 13189 NONAME
+	png_get_signature @ 13190 NONAME
+	png_get_tIME @ 13191 NONAME
+	png_get_tRNS @ 13192 NONAME
+	png_get_text @ 13193 NONAME
+	png_get_uint_16 @ 13194 NONAME
+	png_get_uint_31 @ 13195 NONAME
+	png_get_uint_32 @ 13196 NONAME
+	png_get_unknown_chunks @ 13197 NONAME
+	png_get_user_chunk_ptr @ 13198 NONAME
+	png_get_user_height_max @ 13199 NONAME
+	png_get_user_transform_ptr @ 13200 NONAME
+	png_get_user_width_max @ 13201 NONAME
+	png_get_valid @ 13202 NONAME
+	png_get_x_offset_inches @ 13203 NONAME
+	png_get_x_offset_inches_fixed @ 13204 NONAME
+	png_get_x_offset_microns @ 13205 NONAME
+	png_get_x_offset_pixels @ 13206 NONAME
+	png_get_x_pixels_per_inch @ 13207 NONAME
+	png_get_x_pixels_per_meter @ 13208 NONAME
+	png_get_y_offset_inches @ 13209 NONAME
+	png_get_y_offset_inches_fixed @ 13210 NONAME
+	png_get_y_offset_microns @ 13211 NONAME
+	png_get_y_offset_pixels @ 13212 NONAME
+	png_get_y_pixels_per_inch @ 13213 NONAME
+	png_get_y_pixels_per_meter @ 13214 NONAME
+	png_handle_as_unknown @ 13215 NONAME
+	png_info_init_3 @ 13216 NONAME
+	png_init_io @ 13217 NONAME
+	png_longjmp @ 13218 NONAME
+	png_malloc @ 13219 NONAME
+	png_malloc_default @ 13220 NONAME
+	png_malloc_warn @ 13221 NONAME
+	png_permit_mng_features @ 13222 NONAME
+	png_process_data @ 13223 NONAME
+	png_process_data_pause @ 13224 NONAME
+	png_process_data_skip @ 13225 NONAME
+	png_progressive_combine_row @ 13226 NONAME
+	png_read_end @ 13227 NONAME
+	png_read_image @ 13228 NONAME
+	png_read_info @ 13229 NONAME
+	png_read_png @ 13230 NONAME
+	png_read_row @ 13231 NONAME
+	png_read_rows @ 13232 NONAME
+	png_read_update_info @ 13233 NONAME
+	png_reset_zstream @ 13234 NONAME
+	png_save_int_32 @ 13235 NONAME
+	png_save_uint_16 @ 13236 NONAME
+	png_save_uint_32 @ 13237 NONAME
+	png_set_IHDR @ 13238 NONAME
+	png_set_PLTE @ 13239 NONAME
+	png_set_add_alpha @ 13240 NONAME
+	png_set_alpha_mode @ 13241 NONAME
+	png_set_alpha_mode_fixed @ 13242 NONAME
+	png_set_bKGD @ 13243 NONAME
+	png_set_background @ 13244 NONAME
+	png_set_background_fixed @ 13245 NONAME
+	png_set_benign_errors @ 13246 NONAME
+	png_set_bgr @ 13247 NONAME
+	png_set_cHRM @ 13248 NONAME
+	png_set_cHRM_fixed @ 13249 NONAME
+	png_set_chunk_cache_max @ 13250 NONAME
+	png_set_chunk_malloc_max @ 13251 NONAME
+	png_set_compression_buffer_size @ 13252 NONAME
+	png_set_compression_level @ 13253 NONAME
+	png_set_compression_mem_level @ 13254 NONAME
+	png_set_compression_method @ 13255 NONAME
+	png_set_compression_strategy @ 13256 NONAME
+	png_set_compression_window_bits @ 13257 NONAME
+	png_set_crc_action @ 13258 NONAME
+	png_set_error_fn @ 13259 NONAME
+	png_set_expand @ 13260 NONAME
+	png_set_expand_16 @ 13261 NONAME
+	png_set_expand_gray_1_2_4_to_8 @ 13262 NONAME
+	png_set_filler @ 13263 NONAME
+	png_set_filter @ 13264 NONAME
+	png_set_filter_heuristics @ 13265 NONAME
+	png_set_filter_heuristics_fixed @ 13266 NONAME
+	png_set_flush @ 13267 NONAME
+	png_set_gAMA @ 13268 NONAME
+	png_set_gAMA_fixed @ 13269 NONAME
+	png_set_gamma @ 13270 NONAME
+	png_set_gamma_fixed @ 13271 NONAME
+	png_set_gray_to_rgb @ 13272 NONAME
+	png_set_hIST @ 13273 NONAME
+	png_set_iCCP @ 13274 NONAME
+	png_set_interlace_handling @ 13275 NONAME
+	png_set_invalid @ 13276 NONAME
+	png_set_invert_alpha @ 13277 NONAME
+	png_set_invert_mono @ 13278 NONAME
+	png_set_keep_unknown_chunks @ 13279 NONAME
+	png_set_longjmp_fn @ 13280 NONAME
+	png_set_mem_fn @ 13281 NONAME
+	png_set_oFFs @ 13282 NONAME
+	png_set_pCAL @ 13283 NONAME
+	png_set_pHYs @ 13284 NONAME
+	png_set_packing @ 13285 NONAME
+	png_set_packswap @ 13286 NONAME
+	png_set_palette_to_rgb @ 13287 NONAME
+	png_set_progressive_read_fn @ 13288 NONAME
+	png_set_quantize @ 13289 NONAME
+	png_set_read_fn @ 13290 NONAME
+	png_set_read_status_fn @ 13291 NONAME
+	png_set_read_user_chunk_fn @ 13292 NONAME
+	png_set_read_user_transform_fn @ 13293 NONAME
+	png_set_rgb_to_gray @ 13294 NONAME
+	png_set_rgb_to_gray_fixed @ 13295 NONAME
+	png_set_rows @ 13296 NONAME
+	png_set_sBIT @ 13297 NONAME
+	png_set_sCAL @ 13298 NONAME
+	png_set_sCAL_fixed @ 13299 NONAME
+	png_set_sCAL_s @ 13300 NONAME
+	png_set_sPLT @ 13301 NONAME
+	png_set_sRGB @ 13302 NONAME
+	png_set_sRGB_gAMA_and_cHRM @ 13303 NONAME
+	png_set_scale_16 @ 13304 NONAME
+	png_set_shift @ 13305 NONAME
+	png_set_sig_bytes @ 13306 NONAME
+	png_set_strip_16 @ 13307 NONAME
+	png_set_strip_alpha @ 13308 NONAME
+	png_set_swap @ 13309 NONAME
+	png_set_swap_alpha @ 13310 NONAME
+	png_set_tIME @ 13311 NONAME
+	png_set_tRNS @ 13312 NONAME
+	png_set_tRNS_to_alpha @ 13313 NONAME
+	png_set_text @ 13314 NONAME
+	png_set_text_compression_level @ 13315 NONAME
+	png_set_text_compression_mem_level @ 13316 NONAME
+	png_set_text_compression_method @ 13317 NONAME
+	png_set_text_compression_strategy @ 13318 NONAME
+	png_set_text_compression_window_bits @ 13319 NONAME
+	png_set_unknown_chunk_location @ 13320 NONAME
+	png_set_unknown_chunks @ 13321 NONAME
+	png_set_user_limits @ 13322 NONAME
+	png_set_user_transform_info @ 13323 NONAME
+	png_set_write_fn @ 13324 NONAME
+	png_set_write_status_fn @ 13325 NONAME
+	png_set_write_user_transform_fn @ 13326 NONAME
+	png_sig_cmp @ 13327 NONAME
+	png_start_read_image @ 13328 NONAME
+	png_warning @ 13329 NONAME
+	png_write_chunk @ 13330 NONAME
+	png_write_chunk_data @ 13331 NONAME
+	png_write_chunk_end @ 13332 NONAME
+	png_write_chunk_start @ 13333 NONAME
+	png_write_end @ 13334 NONAME
+	png_write_flush @ 13335 NONAME
+	png_write_image @ 13336 NONAME
+	png_write_info @ 13337 NONAME
+	png_write_info_before_PLTE @ 13338 NONAME
+	png_write_png @ 13339 NONAME
+	png_write_row @ 13340 NONAME
+	png_write_rows @ 13341 NONAME
+	png_write_sig @ 13342 NONAME
+	?clipEnabledChanged@QBlitterPaintEngine@@UAEXXZ @ 13343 NONAME ; void QBlitterPaintEngine::clipEnabledChanged(void)
+	?qt_static_metacall@QEventDispatcherS60@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13344 NONAME ; void QEventDispatcherS60::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?supportsSubPixelPositions@QFontEngine@@UBE_NXZ @ 13345 NONAME ; bool QFontEngine::supportsSubPixelPositions(void) const
+	?qt_static_metacall@QStyledItemDelegate@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13346 NONAME ; void QStyledItemDelegate::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QPixmapDropShadowFilter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13347 NONAME ; void QPixmapDropShadowFilter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QS60Style@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13348 NONAME ; void QS60Style::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QTableWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13349 NONAME ; void QTableWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QTextBrowser@@0UQMetaObjectExtraData@@B @ 13350 NONAME ; struct QMetaObjectExtraData const QTextBrowser::staticMetaObjectExtraData
+	?qt_static_metacall@QMenuBar@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13351 NONAME ; void QMenuBar::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?exists@QZipWriter@@QBE_NXZ @ 13352 NONAME ; bool QZipWriter::exists(void) const
+	?heightForWidth@QTabWidget@@UBEHH@Z @ 13353 NONAME ; int QTabWidget::heightForWidth(int) const
+	?staticMetaObjectExtraData@QSplashScreen@@0UQMetaObjectExtraData@@B @ 13354 NONAME ; struct QMetaObjectExtraData const QSplashScreen::staticMetaObjectExtraData
+	?qt_static_metacall@QGraphicsItemAnimation@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13355 NONAME ; void QGraphicsItemAnimation::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QRasterWindowSurface@@QAE@PAVQWidget@@_N@Z @ 13356 NONAME ; QRasterWindowSurface::QRasterWindowSurface(class QWidget *, bool)
+	?brushChanged@QBlitterPaintEngine@@UAEXXZ @ 13357 NONAME ; void QBlitterPaintEngine::brushChanged(void)
+	?clip@QBlitterPaintEngine@@UAEXABVQRect@@W4ClipOperation@Qt@@@Z @ 13358 NONAME ; void QBlitterPaintEngine::clip(class QRect const &, enum Qt::ClipOperation)
+	?staticMetaObjectExtraData@QGraphicsWidget@@0UQMetaObjectExtraData@@B @ 13359 NONAME ; struct QMetaObjectExtraData const QGraphicsWidget::staticMetaObjectExtraData
+	?qt_static_metacall@QSessionManager@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13360 NONAME ; void QSessionManager::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QTabWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13361 NONAME ; void QTabWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QTapAndHoldGesture@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13362 NONAME ; void QTapAndHoldGesture::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QMainWindow@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13363 NONAME ; void QMainWindow::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QMovie@@0UQMetaObjectExtraData@@B @ 13364 NONAME ; struct QMetaObjectExtraData const QMovie::staticMetaObjectExtraData
+	?trUtf8@QInternalMimeData@@SA?AVQString@@PBD0@Z @ 13365 NONAME ; class QString QInternalMimeData::trUtf8(char const *, char const *)
+	?staticMetaObjectExtraData@QPixmapConvolutionFilter@@0UQMetaObjectExtraData@@B @ 13366 NONAME ; struct QMetaObjectExtraData const QPixmapConvolutionFilter::staticMetaObjectExtraData
+	?setHintingPreference@QFont@@QAEXW4HintingPreference@1@@Z @ 13367 NONAME ; void QFont::setHintingPreference(enum QFont::HintingPreference)
+	?initialize@QTreeViewPrivate@@QAEXXZ @ 13368 NONAME ; void QTreeViewPrivate::initialize(void)
+	?qt_static_metacall@QTextControl@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13369 NONAME ; void QTextControl::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QToolBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13370 NONAME ; void QToolBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QSplitter@@0UQMetaObjectExtraData@@B @ 13371 NONAME ; struct QMetaObjectExtraData const QSplitter::staticMetaObjectExtraData
+	?qt_static_metacall@QGraphicsTextItem@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13372 NONAME ; void QGraphicsTextItem::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QGraphicsView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13373 NONAME ; void QGraphicsView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QGraphicsOpacityEffect@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13374 NONAME ; void QGraphicsOpacityEffect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QGraphicsBlurEffect@@0UQMetaObjectExtraData@@B @ 13375 NONAME ; struct QMetaObjectExtraData const QGraphicsBlurEffect::staticMetaObjectExtraData
+	?capabilities@QBlittable@@QBE?AV?$QFlags@W4Capability@QBlittable@@@@XZ @ 13376 NONAME ; class QFlags<enum QBlittable::Capability> QBlittable::capabilities(void) const
+	?qt_static_metacall@QDoubleSpinBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13377 NONAME ; void QDoubleSpinBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?setCursorMoveStyle@QTextLayout@@QAEXW4CursorMoveStyle@Qt@@@Z @ 13378 NONAME ; void QTextLayout::setCursorMoveStyle(enum Qt::CursorMoveStyle)
+	?qt_static_metacall@QGraphicsObject@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13379 NONAME ; void QGraphicsObject::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QAbstractButton@@0UQMetaObjectExtraData@@B @ 13380 NONAME ; struct QMetaObjectExtraData const QAbstractButton::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QGraphicsEffectSource@@0UQMetaObjectExtraData@@B @ 13381 NONAME ; struct QMetaObjectExtraData const QGraphicsEffectSource::staticMetaObjectExtraData
+	?qt_static_metacall@QAbstractItemView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13382 NONAME ; void QAbstractItemView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QPaintBufferResource@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13383 NONAME ; void QPaintBufferResource::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?swap@QBrush@@QAEXAAV1@@Z @ 13384 NONAME ; void QBrush::swap(class QBrush &)
+	?expand@QTreeViewPrivate@@QAEXH_N@Z @ 13385 NONAME ; void QTreeViewPrivate::expand(int, bool)
+	?qt_static_metacall@QTextDocument@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13386 NONAME ; void QTextDocument::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?fontHintingPreference@QTextCharFormat@@QBE?AW4HintingPreference@QFont@@XZ @ 13387 NONAME ; enum QFont::HintingPreference QTextCharFormat::fontHintingPreference(void) const
+	?swap@QPixmap@@QAEXAAV1@@Z @ 13388 NONAME ; void QPixmap::swap(class QPixmap &)
+	??0QBlitterPaintEngine@@QAE@PAVQBlittablePixmapData@@@Z @ 13389 NONAME ; QBlitterPaintEngine::QBlitterPaintEngine(class QBlittablePixmapData *)
+	?removeViewItems@QTreeViewPrivate@@QAEXHH@Z @ 13390 NONAME ; void QTreeViewPrivate::removeViewItems(int, int)
+	?staticMetaObjectExtraData@QTableView@@0UQMetaObjectExtraData@@B @ 13391 NONAME ; struct QMetaObjectExtraData const QTableView::staticMetaObjectExtraData
+	?qt_static_metacall@QAction@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13392 NONAME ; void QAction::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QPinchGesture@@0UQMetaObjectExtraData@@B @ 13393 NONAME ; struct QMetaObjectExtraData const QPinchGesture::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QIdentityProxyModel@@0UQMetaObjectExtraData@@B @ 13394 NONAME ; struct QMetaObjectExtraData const QIdentityProxyModel::staticMetaObjectExtraData
+	?numberPrefix@QTextListFormat@@QBE?AVQString@@XZ @ 13395 NONAME ; class QString QTextListFormat::numberPrefix(void) const
+	?qt_static_metacall@QPlainTextEdit@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13396 NONAME ; void QPlainTextEdit::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QListView@@0UQMetaObjectExtraData@@B @ 13397 NONAME ; struct QMetaObjectExtraData const QListView::staticMetaObjectExtraData
+	?qt_static_metacall@QLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13398 NONAME ; void QLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QWindowsStyle@@0UQMetaObjectExtraData@@B @ 13399 NONAME ; struct QMetaObjectExtraData const QWindowsStyle::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QMdiSubWindow@@0UQMetaObjectExtraData@@B @ 13400 NONAME ; struct QMetaObjectExtraData const QMdiSubWindow::staticMetaObjectExtraData
+	?drawAnimatedOperation@QTreeViewPrivate@@QBEXPAVQPainter@@@Z @ 13401 NONAME ; void QTreeViewPrivate::drawAnimatedOperation(class QPainter *) const
+	?firstVisibleItem@QTreeViewPrivate@@QBEHPAH@Z @ 13402 NONAME ; int QTreeViewPrivate::firstVisibleItem(int *) const
+	?qt_static_metacall@QClipboard@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13403 NONAME ; void QClipboard::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??MQItemSelectionRange@@QBE_NABV0@@Z @ 13404 NONAME ; bool QItemSelectionRange::operator<(class QItemSelectionRange const &) const
+	?setWidthForHeight@QSizePolicy@@QAEX_N@Z @ 13405 NONAME ; void QSizePolicy::setWidthForHeight(bool)
+	?qt_static_metacall@QGraphicsScene@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13406 NONAME ; void QGraphicsScene::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QTextList@@0UQMetaObjectExtraData@@B @ 13407 NONAME ; struct QMetaObjectExtraData const QTextList::staticMetaObjectExtraData
+	?qt_fontdata_from_index@@YA?AVQByteArray@@H@Z @ 13408 NONAME ; class QByteArray qt_fontdata_from_index(int)
+	?offsetInLigature@QTextEngine@@QAE?AUQFixed@@PBUQScriptItem@@HHH@Z @ 13409 NONAME ; struct QFixed QTextEngine::offsetInLigature(struct QScriptItem const *, int, int, int)
+	?defaultCursorMoveStyle@QTextDocument@@QBE?AW4CursorMoveStyle@Qt@@XZ @ 13410 NONAME ; enum Qt::CursorMoveStyle QTextDocument::defaultCursorMoveStyle(void) const
+	?hasFamily@QFontDatabase@@QBE_NABVQString@@@Z @ 13411 NONAME ; bool QFontDatabase::hasFamily(class QString const &) const
+	?qt_static_metacall@QGraphicsAnchor@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13412 NONAME ; void QGraphicsAnchor::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?swap@QImage@@QAEXAAV1@@Z @ 13413 NONAME ; void QImage::swap(class QImage &)
+	?staticMetaObjectExtraData@QDockWidget@@0UQMetaObjectExtraData@@B @ 13414 NONAME ; struct QMetaObjectExtraData const QDockWidget::staticMetaObjectExtraData
+	?insertViewItems@QTreeViewPrivate@@QAEXHHABUQTreeViewItem@@@Z @ 13415 NONAME ; void QTreeViewPrivate::insertViewItems(int, int, struct QTreeViewItem const &)
+	?compositionModeChanged@QBlitterPaintEngine@@UAEXXZ @ 13416 NONAME ; void QBlitterPaintEngine::compositionModeChanged(void)
+	?staticMetaObjectExtraData@QPictureFormatPlugin@@0UQMetaObjectExtraData@@B @ 13417 NONAME ; struct QMetaObjectExtraData const QPictureFormatPlugin::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QAbstractItemView@@0UQMetaObjectExtraData@@B @ 13418 NONAME ; struct QMetaObjectExtraData const QAbstractItemView::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QValidator@@0UQMetaObjectExtraData@@B @ 13419 NONAME ; struct QMetaObjectExtraData const QValidator::staticMetaObjectExtraData
+	?qt_static_metacall@QGraphicsBlurEffect@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13420 NONAME ; void QGraphicsBlurEffect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QDialog@@0UQMetaObjectExtraData@@B @ 13421 NONAME ; struct QMetaObjectExtraData const QDialog::staticMetaObjectExtraData
+	?qt_static_metacall@QSplitter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13422 NONAME ; void QSplitter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QLineControl@@0UQMetaObjectExtraData@@B @ 13423 NONAME ; struct QMetaObjectExtraData const QLineControl::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QProgressDialog@@0UQMetaObjectExtraData@@B @ 13424 NONAME ; struct QMetaObjectExtraData const QProgressDialog::staticMetaObjectExtraData
+	?drawRects@QBlitterPaintEngine@@UAEXPBVQRectF@@H@Z @ 13425 NONAME ; void QBlitterPaintEngine::drawRects(class QRectF const *, int)
+	??0QTreeViewPrivate@@QAE@XZ @ 13426 NONAME ; QTreeViewPrivate::QTreeViewPrivate(void)
+	?qt_static_metacall@QGridLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13427 NONAME ; void QGridLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QMenuBar@@0UQMetaObjectExtraData@@B @ 13428 NONAME ; struct QMetaObjectExtraData const QMenuBar::staticMetaObjectExtraData
+	?qt_static_metacall@QStackedLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13429 NONAME ; void QStackedLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??_EQTreeViewPrivate@@UAE@I@Z @ 13430 NONAME ; QTreeViewPrivate::~QTreeViewPrivate(unsigned int)
+	?staticMetaObjectExtraData@QLineEdit@@0UQMetaObjectExtraData@@B @ 13431 NONAME ; struct QMetaObjectExtraData const QLineEdit::staticMetaObjectExtraData
+	?qt_metacall@QIdentityProxyModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 13432 NONAME ; int QIdentityProxyModel::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QListWidget@@0UQMetaObjectExtraData@@B @ 13433 NONAME ; struct QMetaObjectExtraData const QListWidget::staticMetaObjectExtraData
+	??1QBlitterPaintEngine@@UAE@XZ @ 13434 NONAME ; QBlitterPaintEngine::~QBlitterPaintEngine(void)
+	?markRasterOverlay@QBlittablePixmapData@@QAEXPBVQRectF@@H@Z @ 13435 NONAME ; void QBlittablePixmapData::markRasterOverlay(class QRectF const *, int)
+	?qt_static_metacall@QTableView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13436 NONAME ; void QTableView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?mapSelectionFromSource@QIdentityProxyModel@@UBE?AVQItemSelection@@ABV2@@Z @ 13437 NONAME ; class QItemSelection QIdentityProxyModel::mapSelectionFromSource(class QItemSelection const &) const
+	?qt_static_metacall@QIdentityProxyModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13438 NONAME ; void QIdentityProxyModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?cursorMoveStyle@QTextLayout@@QBE?AW4CursorMoveStyle@Qt@@XZ @ 13439 NONAME ; enum Qt::CursorMoveStyle QTextLayout::cursorMoveStyle(void) const
+	?staticMetaObjectExtraData@QEventDispatcherS60@@0UQMetaObjectExtraData@@B @ 13440 NONAME ; struct QMetaObjectExtraData const QEventDispatcherS60::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QStylePlugin@@0UQMetaObjectExtraData@@B @ 13441 NONAME ; struct QMetaObjectExtraData const QStylePlugin::staticMetaObjectExtraData
+	?drawTextItem@QBlitterPaintEngine@@UAEXABVQPointF@@ABVQTextItem@@@Z @ 13442 NONAME ; void QBlitterPaintEngine::drawTextItem(class QPointF const &, class QTextItem const &)
+	?qt_static_metacall@QLabel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13443 NONAME ; void QLabel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QLayout@@0UQMetaObjectExtraData@@B @ 13444 NONAME ; struct QMetaObjectExtraData const QLayout::staticMetaObjectExtraData
+	?retrieveData@QInternalMimeData@@MBE?AVQVariant@@ABVQString@@W4Type@2@@Z @ 13445 NONAME ; class QVariant QInternalMimeData::retrieveData(class QString const &, enum QVariant::Type) const
+	?qt_static_metacall@QCheckBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13446 NONAME ; void QCheckBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QDirModel@@0UQMetaObjectExtraData@@B @ 13447 NONAME ; struct QMetaObjectExtraData const QDirModel::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QFocusFrame@@0UQMetaObjectExtraData@@B @ 13448 NONAME ; struct QMetaObjectExtraData const QFocusFrame::staticMetaObjectExtraData
+	?q_func@QTreeViewPrivate@@ABEPBVQTreeView@@XZ @ 13449 NONAME ; class QTreeView const * QTreeViewPrivate::q_func(void) const
+	?viewIndex@QTreeViewPrivate@@QBEHABVQModelIndex@@@Z @ 13450 NONAME ; int QTreeViewPrivate::viewIndex(class QModelIndex const &) const
+	?qt_static_metacall@QGraphicsScale@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13451 NONAME ; void QGraphicsScale::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QFrame@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13452 NONAME ; void QFrame::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?drawImage@QBlitterPaintEngine@@UAEXABVQRectF@@ABVQImage@@0V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 13453 NONAME ; void QBlitterPaintEngine::drawImage(class QRectF const &, class QImage const &, class QRectF const &, class QFlags<enum Qt::ImageConversionFlag>)
+	?staticMetaObjectExtraData@QDateTimeEdit@@0UQMetaObjectExtraData@@B @ 13454 NONAME ; struct QMetaObjectExtraData const QDateTimeEdit::staticMetaObjectExtraData
+	?mimeTypes@QAbstractProxyModel@@UBE?AVQStringList@@XZ @ 13455 NONAME ; class QStringList QAbstractProxyModel::mimeTypes(void) const
+	?mapSelectionToSource@QIdentityProxyModel@@UBE?AVQItemSelection@@ABV2@@Z @ 13456 NONAME ; class QItemSelection QIdentityProxyModel::mapSelectionToSource(class QItemSelection const &) const
+	?createState@QBlitterPaintEngine@@UBEPAVQPainterState@@PAV2@@Z @ 13457 NONAME ; class QPainterState * QBlitterPaintEngine::createState(class QPainterState *) const
+	??1QIdentityProxyModel@@UAE@XZ @ 13458 NONAME ; QIdentityProxyModel::~QIdentityProxyModel(void)
+	?qt_static_metacall@QDoubleValidator@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13459 NONAME ; void QDoubleValidator::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?removeItem@QGraphicsGridLayout@@QAEXPAVQGraphicsLayoutItem@@@Z @ 13460 NONAME ; void QGraphicsGridLayout::removeItem(class QGraphicsLayoutItem *)
+	?qt_static_metacall@QHBoxLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13461 NONAME ; void QHBoxLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?clipBoundingRect@QPainter@@QBE?AVQRectF@@XZ @ 13462 NONAME ; class QRectF QPainter::clipBoundingRect(void) const
+	?staticMetaObjectExtraData@QAbstractSlider@@0UQMetaObjectExtraData@@B @ 13463 NONAME ; struct QMetaObjectExtraData const QAbstractSlider::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QSlider@@0UQMetaObjectExtraData@@B @ 13464 NONAME ; struct QMetaObjectExtraData const QSlider::staticMetaObjectExtraData
+	?formats@QInternalMimeData@@UBE?AVQStringList@@XZ @ 13465 NONAME ; class QStringList QInternalMimeData::formats(void) const
+	?staticMetaObjectExtraData@QMainWindow@@0UQMetaObjectExtraData@@B @ 13466 NONAME ; struct QMetaObjectExtraData const QMainWindow::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QButtonGroup@@0UQMetaObjectExtraData@@B @ 13467 NONAME ; struct QMetaObjectExtraData const QButtonGroup::staticMetaObjectExtraData
+	?qt_static_metacall@QAbstractSlider@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13468 NONAME ; void QAbstractSlider::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??_EQIdentityProxyModel@@UAE@I@Z @ 13469 NONAME ; QIdentityProxyModel::~QIdentityProxyModel(unsigned int)
+	?qt_static_metacall@QPictureFormatPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13470 NONAME ; void QPictureFormatPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QGuiPlatformPlugin@@0UQMetaObjectExtraData@@B @ 13471 NONAME ; struct QMetaObjectExtraData const QGuiPlatformPlugin::staticMetaObjectExtraData
+	?removeRows@QIdentityProxyModel@@UAE_NHHABVQModelIndex@@@Z @ 13472 NONAME ; bool QIdentityProxyModel::removeRows(int, int, class QModelIndex const &)
+	?staticMetaObjectExtraData@QPixmapDropShadowFilter@@0UQMetaObjectExtraData@@B @ 13473 NONAME ; struct QMetaObjectExtraData const QPixmapDropShadowFilter::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QGridLayout@@0UQMetaObjectExtraData@@B @ 13474 NONAME ; struct QMetaObjectExtraData const QGridLayout::staticMetaObjectExtraData
+	?raster@QBlitterPaintEngine@@ABEPAVQRasterPaintEngine@@XZ @ 13475 NONAME ; class QRasterPaintEngine * QBlitterPaintEngine::raster(void) const
+	?sort@QAbstractProxyModel@@UAEXHW4SortOrder@Qt@@@Z @ 13476 NONAME ; void QAbstractProxyModel::sort(int, enum Qt::SortOrder)
+	?getClusterLength@QTextEngine@@AAEHPAGPBUHB_CharAttributes@@HHHPAH@Z @ 13477 NONAME ; int QTextEngine::getClusterLength(unsigned short *, struct HB_CharAttributes const *, int, int, int, int *)
+	?staticMetaObjectExtraData@QPlainTextEdit@@0UQMetaObjectExtraData@@B @ 13478 NONAME ; struct QMetaObjectExtraData const QPlainTextEdit::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QTableWidget@@0UQMetaObjectExtraData@@B @ 13479 NONAME ; struct QMetaObjectExtraData const QTableWidget::staticMetaObjectExtraData
+	?qt_static_metacall@QSyntaxHighlighter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13480 NONAME ; void QSyntaxHighlighter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?setCreationPermissions@QZipWriter@@QAEXV?$QFlags@W4Permission@QFile@@@@@Z @ 13481 NONAME ; void QZipWriter::setCreationPermissions(class QFlags<enum QFile::Permission>)
+	?q_func@QTreeViewPrivate@@AAEPAVQTreeView@@XZ @ 13482 NONAME ; class QTreeView * QTreeViewPrivate::q_func(void)
+	?d_func@QBlittable@@AAEPAVQBlittablePrivate@@XZ @ 13483 NONAME ; class QBlittablePrivate * QBlittable::d_func(void)
+	?previousLogicalPosition@QTextEngine@@QBEHH@Z @ 13484 NONAME ; int QTextEngine::previousLogicalPosition(int) const
+	?type@QBlitterPaintEngine@@UBE?AW4Type@QPaintEngine@@XZ @ 13485 NONAME ; enum QPaintEngine::Type QBlitterPaintEngine::type(void) const
+	?updateScrollBars@QTreeViewPrivate@@QAEXXZ @ 13486 NONAME ; void QTreeViewPrivate::updateScrollBars(void)
+	?qt_static_metacall@QCommandLinkButton@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13487 NONAME ; void QCommandLinkButton::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?buddy@QAbstractProxyModel@@UBE?AVQModelIndex@@ABV2@@Z @ 13488 NONAME ; class QModelIndex QAbstractProxyModel::buddy(class QModelIndex const &) const
+	?staticMetaObjectExtraData@QProxyModel@@0UQMetaObjectExtraData@@B @ 13489 NONAME ; struct QMetaObjectExtraData const QProxyModel::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QInputContextPlugin@@0UQMetaObjectExtraData@@B @ 13490 NONAME ; struct QMetaObjectExtraData const QInputContextPlugin::staticMetaObjectExtraData
+	?metaObject@QIdentityProxyModel@@UBEPBUQMetaObject@@XZ @ 13491 NONAME ; struct QMetaObject const * QIdentityProxyModel::metaObject(void) const
+	?removeColumns@QIdentityProxyModel@@UAE_NHHABVQModelIndex@@@Z @ 13492 NONAME ; bool QIdentityProxyModel::removeColumns(int, int, class QModelIndex const &)
+	?indentationForItem@QTreeViewPrivate@@QBEHH@Z @ 13493 NONAME ; int QTreeViewPrivate::indentationForItem(int) const
+	?qt_static_metacall@QDirModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13494 NONAME ; void QDirModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QMdiSubWindow@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13495 NONAME ; void QMdiSubWindow::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?fill@QImage@@QAEXABVQColor@@@Z @ 13496 NONAME ; void QImage::fill(class QColor const &)
+	??0QZipWriter@@QAE@PAVQIODevice@@@Z @ 13497 NONAME ; QZipWriter::QZipWriter(class QIODevice *)
+	?fill@QImage@@QAEXW4GlobalColor@Qt@@@Z @ 13498 NONAME ; void QImage::fill(enum Qt::GlobalColor)
+	?staticMetaObjectExtraData@QUndoView@@0UQMetaObjectExtraData@@B @ 13499 NONAME ; struct QMetaObjectExtraData const QUndoView::staticMetaObjectExtraData
+	?canFetchMore@QAbstractProxyModel@@UBE_NABVQModelIndex@@@Z @ 13500 NONAME ; bool QAbstractProxyModel::canFetchMore(class QModelIndex const &) const
+	?staticMetaObjectExtraData@QTextObject@@0UQMetaObjectExtraData@@B @ 13501 NONAME ; struct QMetaObjectExtraData const QTextObject::staticMetaObjectExtraData
+	?qt_static_metacall@QPixmapConvolutionFilter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13502 NONAME ; void QPixmapConvolutionFilter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?alignLine@QTextEngine@@QAE?AUQFixed@@ABUQScriptLine@@@Z @ 13503 NONAME ; struct QFixed QTextEngine::alignLine(struct QScriptLine const &)
+	?above@QTreeViewPrivate@@QBEHH@Z @ 13504 NONAME ; int QTreeViewPrivate::above(int) const
+	?qt_static_metacall@QSortFilterProxyModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13505 NONAME ; void QSortFilterProxyModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?_q_columnsRemoved@QTreeViewPrivate@@UAEXABVQModelIndex@@HH@Z @ 13506 NONAME ; void QTreeViewPrivate::_q_columnsRemoved(class QModelIndex const &, int, int)
+	?qt_static_metacall@QTreeView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13507 NONAME ; void QTreeView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QGraphicsSystemPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13508 NONAME ; void QGraphicsSystemPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?resize@QBlittablePixmapData@@UAEXHH@Z @ 13509 NONAME ; void QBlittablePixmapData::resize(int, int)
+	?setTabsClosable@QMdiArea@@QAEX_N@Z @ 13510 NONAME ; void QMdiArea::setTabsClosable(bool)
+	?staticMetaObjectExtraData@QTreeWidget@@0UQMetaObjectExtraData@@B @ 13511 NONAME ; struct QMetaObjectExtraData const QTreeWidget::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QBoxLayout@@0UQMetaObjectExtraData@@B @ 13512 NONAME ; struct QMetaObjectExtraData const QBoxLayout::staticMetaObjectExtraData
+	?qt_static_metacall@QTabBar@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13513 NONAME ; void QTabBar::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?parent@QIdentityProxyModel@@UBE?AVQModelIndex@@ABV2@@Z @ 13514 NONAME ; class QModelIndex QIdentityProxyModel::parent(class QModelIndex const &) const
+	?insertColumns@QIdentityProxyModel@@UAE_NHHABVQModelIndex@@@Z @ 13515 NONAME ; bool QIdentityProxyModel::insertColumns(int, int, class QModelIndex const &)
+	?staticMetaObjectExtraData@QDesktopWidget@@0UQMetaObjectExtraData@@B @ 13516 NONAME ; struct QMetaObjectExtraData const QDesktopWidget::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QScrollArea@@0UQMetaObjectExtraData@@B @ 13517 NONAME ; struct QMetaObjectExtraData const QScrollArea::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QImageIOPlugin@@0UQMetaObjectExtraData@@B @ 13518 NONAME ; struct QMetaObjectExtraData const QImageIOPlugin::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QVBoxLayout@@0UQMetaObjectExtraData@@B @ 13519 NONAME ; struct QMetaObjectExtraData const QVBoxLayout::staticMetaObjectExtraData
+	?compressionPolicy@QZipWriter@@QBE?AW4CompressionPolicy@1@XZ @ 13520 NONAME ; enum QZipWriter::CompressionPolicy QZipWriter::compressionPolicy(void) const
+	?getText@QInputDialog@@SA?AVQString@@PAVQWidget@@ABV2@1W4EchoMode@QLineEdit@@1PA_NV?$QFlags@W4WindowType@Qt@@@@V?$QFlags@W4InputMethodHint@Qt@@@@@Z @ 13521 NONAME ; class QString QInputDialog::getText(class QWidget *, class QString const &, class QString const &, enum QLineEdit::EchoMode, class QString const &, bool *, class QFlags<enum Qt::WindowType>, class QFlags<enum Qt::InputMethodHint>)
+	?columnRanges@QTreeViewPrivate@@QBE?AV?$QList@U?$QPair@HH@@@@ABVQModelIndex@@0@Z @ 13522 NONAME ; class QList<struct QPair<int, int> > QTreeViewPrivate::columnRanges(class QModelIndex const &, class QModelIndex const &) const
+	?hasWidthForHeight@QSizePolicy@@QBE_NXZ @ 13523 NONAME ; bool QSizePolicy::hasWidthForHeight(void) const
+	?staticMetaObjectExtraData@QSizeGrip@@0UQMetaObjectExtraData@@B @ 13524 NONAME ; struct QMetaObjectExtraData const QSizeGrip::staticMetaObjectExtraData
+	?qt_static_metacall@QDesktopWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13525 NONAME ; void QDesktopWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QGraphicsDropShadowEffect@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13526 NONAME ; void QGraphicsDropShadowEffect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QAbstractProxyModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13527 NONAME ; void QAbstractProxyModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?setDefaultCursorMoveStyle@QTextDocument@@QAEXW4CursorMoveStyle@Qt@@@Z @ 13528 NONAME ; void QTextDocument::setDefaultCursorMoveStyle(enum Qt::CursorMoveStyle)
+	?transformChanged@QBlitterPaintEngine@@UAEXXZ @ 13529 NONAME ; void QBlitterPaintEngine::transformChanged(void)
+	??0QBlittablePixmapData@@QAE@XZ @ 13530 NONAME ; QBlittablePixmapData::QBlittablePixmapData(void)
+	?staticMetaObjectExtraData@QHBoxLayout@@0UQMetaObjectExtraData@@B @ 13531 NONAME ; struct QMetaObjectExtraData const QHBoxLayout::staticMetaObjectExtraData
+	?close@QZipWriter@@QAEXXZ @ 13532 NONAME ; void QZipWriter::close(void)
+	?staticMetaObjectExtraData@QUndoGroup@@0UQMetaObjectExtraData@@B @ 13533 NONAME ; struct QMetaObjectExtraData const QUndoGroup::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QDoubleSpinBox@@0UQMetaObjectExtraData@@B @ 13534 NONAME ; struct QMetaObjectExtraData const QDoubleSpinBox::staticMetaObjectExtraData
+	?qt_static_metacall@QGraphicsTransform@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13535 NONAME ; void QGraphicsTransform::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?dropMimeData@QIdentityProxyModel@@UAE_NPBVQMimeData@@W4DropAction@Qt@@HHABVQModelIndex@@@Z @ 13536 NONAME ; bool QIdentityProxyModel::dropMimeData(class QMimeData const *, enum Qt::DropAction, int, int, class QModelIndex const &)
+	?staticMetaObjectExtraData@QErrorMessage@@0UQMetaObjectExtraData@@B @ 13537 NONAME ; struct QMetaObjectExtraData const QErrorMessage::staticMetaObjectExtraData
+	?size@QBlittable@@QBE?AVQSize@@XZ @ 13538 NONAME ; class QSize QBlittable::size(void) const
+	?staticMetaObjectExtraData@QGraphicsScene@@0UQMetaObjectExtraData@@B @ 13539 NONAME ; struct QMetaObjectExtraData const QGraphicsScene::staticMetaObjectExtraData
+	?qt_static_metacall@QPixmapFilter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13540 NONAME ; void QPixmapFilter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QStyle@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13541 NONAME ; void QStyle::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?setBlittable@QBlittablePixmapData@@QAEXPAVQBlittable@@@Z @ 13542 NONAME ; void QBlittablePixmapData::setBlittable(class QBlittable *)
+	?qt_static_metacall@QMdiArea@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13543 NONAME ; void QMdiArea::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?visualCursorMovement@QTextEngine@@QBE_NXZ @ 13544 NONAME ; bool QTextEngine::visualCursorMovement(void) const
+	?qt_static_metacall@QComboBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13545 NONAME ; void QComboBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?positionInLigature@QTextEngine@@QAEHPBUQScriptItem@@HUQFixed@@1H_N@Z @ 13546 NONAME ; int QTextEngine::positionInLigature(struct QScriptItem const *, int, struct QFixed, struct QFixed, int, bool)
+	??0QRadialGradient@@QAE@MMMMMM@Z @ 13547 NONAME ; QRadialGradient::QRadialGradient(float, float, float, float, float, float)
+	?staticMetaObjectExtraData@QRadioButton@@0UQMetaObjectExtraData@@B @ 13548 NONAME ; struct QMetaObjectExtraData const QRadioButton::staticMetaObjectExtraData
+	?opacityChanged@QBlitterPaintEngine@@UAEXXZ @ 13549 NONAME ; void QBlitterPaintEngine::opacityChanged(void)
+	?qt_static_metacall@QAbstractScrollArea@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13550 NONAME ; void QAbstractScrollArea::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QDateTimeEdit@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13551 NONAME ; void QDateTimeEdit::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?_q_modelDestroyed@QTreeViewPrivate@@UAEXXZ @ 13552 NONAME ; void QTreeViewPrivate::_q_modelDestroyed(void)
+	?qt_static_metacall@QFontComboBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13553 NONAME ; void QFontComboBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QGraphicsRotation@@0UQMetaObjectExtraData@@B @ 13554 NONAME ; struct QMetaObjectExtraData const QGraphicsRotation::staticMetaObjectExtraData
+	?setState@QBlitterPaintEngine@@UAEXPAVQPainterState@@@Z @ 13555 NONAME ; void QBlitterPaintEngine::setState(class QPainterState *)
+	?addFile@QZipWriter@@QAEXABVQString@@ABVQByteArray@@@Z @ 13556 NONAME ; void QZipWriter::addFile(class QString const &, class QByteArray const &)
+	?qt_static_metacall@QAbstractButton@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13557 NONAME ; void QAbstractButton::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QTextDocument@@0UQMetaObjectExtraData@@B @ 13558 NONAME ; struct QMetaObjectExtraData const QTextDocument::staticMetaObjectExtraData
+	?setSourceModel@QIdentityProxyModel@@UAEXPAVQAbstractItemModel@@@Z @ 13559 NONAME ; void QIdentityProxyModel::setSourceModel(class QAbstractItemModel *)
+	?clip@QBlitterPaintEngine@@UAEXABVQRegion@@W4ClipOperation@Qt@@@Z @ 13560 NONAME ; void QBlitterPaintEngine::clip(class QRegion const &, enum Qt::ClipOperation)
+	?subPixelPositionForX@QTextureGlyphCache@@QBE?AUQFixed@@U2@@Z @ 13561 NONAME ; struct QFixed QTextureGlyphCache::subPixelPositionForX(struct QFixed) const
+	?addFile@QZipWriter@@QAEXABVQString@@PAVQIODevice@@@Z @ 13562 NONAME ; void QZipWriter::addFile(class QString const &, class QIODevice *)
+	?hasAlphaChannel@QBlittablePixmapData@@UBE_NXZ @ 13563 NONAME ; bool QBlittablePixmapData::hasAlphaChannel(void) const
+	?numberSuffix@QTextListFormat@@QBE?AVQString@@XZ @ 13564 NONAME ; class QString QTextListFormat::numberSuffix(void) const
+	?tabsMovable@QMdiArea@@QBE_NXZ @ 13565 NONAME ; bool QMdiArea::tabsMovable(void) const
+	?coordinateForItem@QTreeViewPrivate@@QBEHH@Z @ 13566 NONAME ; int QTreeViewPrivate::coordinateForItem(int) const
+	?staticMetaObjectExtraData@QRubberBand@@0UQMetaObjectExtraData@@B @ 13567 NONAME ; struct QMetaObjectExtraData const QRubberBand::staticMetaObjectExtraData
+	?qt_static_metacall@QRubberBand@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13568 NONAME ; void QRubberBand::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QMenu@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13569 NONAME ; void QMenu::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?end@QBlitterPaintEngine@@UAE_NXZ @ 13570 NONAME ; bool QBlitterPaintEngine::end(void)
+	?staticMetaObjectExtraData@QAbstractItemDelegate@@0UQMetaObjectExtraData@@B @ 13571 NONAME ; struct QMetaObjectExtraData const QAbstractItemDelegate::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QGraphicsTextItem@@0UQMetaObjectExtraData@@B @ 13572 NONAME ; struct QMetaObjectExtraData const QGraphicsTextItem::staticMetaObjectExtraData
+	?getStaticMetaObject@QIdentityProxyModel@@SAABUQMetaObject@@XZ @ 13573 NONAME ; struct QMetaObject const & QIdentityProxyModel::getStaticMetaObject(void)
+	?accessibleTable2Index@QTreeViewPrivate@@QBEHABVQModelIndex@@@Z @ 13574 NONAME ; int QTreeViewPrivate::accessibleTable2Index(class QModelIndex const &) const
+	?qt_static_metacall@QFormLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13575 NONAME ; void QFormLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QTextTable@@0UQMetaObjectExtraData@@B @ 13576 NONAME ; struct QMetaObjectExtraData const QTextTable::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QWizard@@0UQMetaObjectExtraData@@B @ 13577 NONAME ; struct QMetaObjectExtraData const QWizard::staticMetaObjectExtraData
+	?fill@QBlitterPaintEngine@@UAEXABVQVectorPath@@ABVQBrush@@@Z @ 13578 NONAME ; void QBlitterPaintEngine::fill(class QVectorPath const &, class QBrush const &)
+	?drawPixmap@QBlitterPaintEngine@@UAEXABVQRectF@@ABVQPixmap@@0@Z @ 13579 NONAME ; void QBlitterPaintEngine::drawPixmap(class QRectF const &, class QPixmap const &, class QRectF const &)
+	?staticMetaObjectExtraData@QTextBlockGroup@@0UQMetaObjectExtraData@@B @ 13580 NONAME ; struct QMetaObjectExtraData const QTextBlockGroup::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QActionGroup@@0UQMetaObjectExtraData@@B @ 13581 NONAME ; struct QMetaObjectExtraData const QActionGroup::staticMetaObjectExtraData
+	?supportsTransformations@QPaintEngineEx@@UBE_NMABVQTransform@@@Z @ 13582 NONAME ; bool QPaintEngineEx::supportsTransformations(float, class QTransform const &) const
+	?index@QIdentityProxyModel@@UBE?AVQModelIndex@@HHABV2@@Z @ 13583 NONAME ; class QModelIndex QIdentityProxyModel::index(int, int, class QModelIndex const &) const
+	?status@QZipWriter@@QBE?AW4Status@1@XZ @ 13584 NONAME ; enum QZipWriter::Status QZipWriter::status(void) const
+	?qt_static_metacall@QTextFrame@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13585 NONAME ; void QTextFrame::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QSlider@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13586 NONAME ; void QSlider::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?tr@QInternalMimeData@@SA?AVQString@@PBD0H@Z @ 13587 NONAME ; class QString QInternalMimeData::tr(char const *, char const *, int)
+	?qt_static_metacall@QTimeEdit@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13588 NONAME ; void QTimeEdit::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QPaintBufferSignalProxy@@0UQMetaObjectExtraData@@B @ 13589 NONAME ; struct QMetaObjectExtraData const QPaintBufferSignalProxy::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QIconEnginePluginV2@@0UQMetaObjectExtraData@@B @ 13590 NONAME ; struct QMetaObjectExtraData const QIconEnginePluginV2::staticMetaObjectExtraData
+	?get@QFontPrivate@@SAPAV1@ABVQFont@@@Z @ 13591 NONAME ; class QFontPrivate * QFontPrivate::get(class QFont const &)
+	?setCursorMoveStyle@QLineControl@@QAEXW4CursorMoveStyle@Qt@@@Z @ 13592 NONAME ; void QLineControl::setCursorMoveStyle(enum Qt::CursorMoveStyle)
+	?staticMetaObjectExtraData@QStyledItemDelegate@@0UQMetaObjectExtraData@@B @ 13593 NONAME ; struct QMetaObjectExtraData const QStyledItemDelegate::staticMetaObjectExtraData
+	?qt_static_metacall@QMouseEventTransition@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13594 NONAME ; void QMouseEventTransition::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QItemDelegate@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13595 NONAME ; void QItemDelegate::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QMdiArea@@0UQMetaObjectExtraData@@B @ 13596 NONAME ; struct QMetaObjectExtraData const QMdiArea::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QGraphicsView@@0UQMetaObjectExtraData@@B @ 13597 NONAME ; struct QMetaObjectExtraData const QGraphicsView::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QStyle@@0UQMetaObjectExtraData@@B @ 13598 NONAME ; struct QMetaObjectExtraData const QStyle::staticMetaObjectExtraData
+	?fetchMore@QAbstractProxyModel@@UAEXABVQModelIndex@@@Z @ 13599 NONAME ; void QAbstractProxyModel::fetchMore(class QModelIndex const &)
+	?insertRows@QIdentityProxyModel@@UAE_NHHABVQModelIndex@@@Z @ 13600 NONAME ; bool QIdentityProxyModel::insertRows(int, int, class QModelIndex const &)
+	?positionAfterVisualMovement@QTextEngine@@QAEHHW4MoveOperation@QTextCursor@@@Z @ 13601 NONAME ; int QTextEngine::positionAfterVisualMovement(int, enum QTextCursor::MoveOperation)
+	?resolveFontFamilyAlias@QFontDatabase@@CA?AVQString@@ABV2@@Z @ 13602 NONAME ; class QString QFontDatabase::resolveFontFamilyAlias(class QString const &)
+	?alphaRGBMapForGlyph@QFontEngine@@UAE?AVQImage@@IUQFixed@@HABVQTransform@@@Z @ 13603 NONAME ; class QImage QFontEngine::alphaRGBMapForGlyph(unsigned int, struct QFixed, int, class QTransform const &)
+	?setCenterRadius@QRadialGradient@@QAEXM@Z @ 13604 NONAME ; void QRadialGradient::setCenterRadius(float)
+	?staticMetaObjectExtraData@QPixmapBlurFilter@@0UQMetaObjectExtraData@@B @ 13605 NONAME ; struct QMetaObjectExtraData const QPixmapBlurFilter::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QMenu@@0UQMetaObjectExtraData@@B @ 13606 NONAME ; struct QMetaObjectExtraData const QMenu::staticMetaObjectExtraData
+	?swap@QBitmap@@QAEXAAV1@@Z @ 13607 NONAME ; void QBitmap::swap(class QBitmap &)
+	?hasFormat@QInternalMimeData@@UBE_NABVQString@@@Z @ 13608 NONAME ; bool QInternalMimeData::hasFormat(class QString const &) const
+	?leftCursorPosition@QTextLayout@@QBEHH@Z @ 13609 NONAME ; int QTextLayout::leftCursorPosition(int) const
+	?staticMetaObjectExtraData@QGroupBox@@0UQMetaObjectExtraData@@B @ 13610 NONAME ; struct QMetaObjectExtraData const QGroupBox::staticMetaObjectExtraData
+	?renderDataHelper@QInternalMimeData@@SA?AVQByteArray@@ABVQString@@PBVQMimeData@@@Z @ 13611 NONAME ; class QByteArray QInternalMimeData::renderDataHelper(class QString const &, class QMimeData const *)
+	?staticMetaObjectExtraData@QKeyEventTransition@@0UQMetaObjectExtraData@@B @ 13612 NONAME ; struct QMetaObjectExtraData const QKeyEventTransition::staticMetaObjectExtraData
+	?qt_static_metacall@QKeyEventTransition@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13613 NONAME ; void QKeyEventTransition::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QWindowSurface@@QAE@PAVQWidget@@_N@Z @ 13614 NONAME ; QWindowSurface::QWindowSurface(class QWidget *, bool)
+	?fill@QBlittablePixmapData@@UAEXABVQColor@@@Z @ 13615 NONAME ; void QBlittablePixmapData::fill(class QColor const &)
+	?staticMetaObjectExtraData@QTabWidget@@0UQMetaObjectExtraData@@B @ 13616 NONAME ; struct QMetaObjectExtraData const QTabWidget::staticMetaObjectExtraData
+	?metric@QBlittablePixmapData@@UBEHW4PaintDeviceMetric@QPaintDevice@@@Z @ 13617 NONAME ; int QBlittablePixmapData::metric(enum QPaintDevice::PaintDeviceMetric) const
+	?select@QTreeViewPrivate@@QAEXABVQModelIndex@@0V?$QFlags@W4SelectionFlag@QItemSelectionModel@@@@@Z @ 13618 NONAME ; void QTreeViewPrivate::select(class QModelIndex const &, class QModelIndex const &, class QFlags<enum QItemSelectionModel::SelectionFlag>)
+	?setStyleName@QFont@@QAEXABVQString@@@Z @ 13619 NONAME ; void QFont::setStyleName(class QString const &)
+	?fillRect@QBlitterPaintEngine@@UAEXABVQRectF@@ABVQColor@@@Z @ 13620 NONAME ; void QBlitterPaintEngine::fillRect(class QRectF const &, class QColor const &)
+	??6@YA?AVQDebug@@V0@PBVQSymbianEvent@@@Z @ 13621 NONAME ; class QDebug operator<<(class QDebug, class QSymbianEvent const *)
+	?qt_static_metacall@QSplitterHandle@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13622 NONAME ; void QSplitterHandle::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QTextEdit@@0UQMetaObjectExtraData@@B @ 13623 NONAME ; struct QMetaObjectExtraData const QTextEdit::staticMetaObjectExtraData
+	?qt_static_metacall@QCompleter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13624 NONAME ; void QCompleter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QSwipeGesture@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13625 NONAME ; void QSwipeGesture::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QWindowsStyle@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13626 NONAME ; void QWindowsStyle::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?ProcessCommandParametersL@QS60MainAppUi@@UAEHW4TApaCommand@@AAV?$TBuf@$0BAA@@@ABVTDesC8@@@Z @ 13627 NONAME ; int QS60MainAppUi::ProcessCommandParametersL(enum TApaCommand, class TBuf<256> &, class TDesC8 const &)
+	?qt_static_metacall@QVBoxLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13628 NONAME ; void QVBoxLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QSpinBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13629 NONAME ; void QSpinBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??_EQBlittablePixmapData@@UAE@I@Z @ 13630 NONAME ; QBlittablePixmapData::~QBlittablePixmapData(unsigned int)
+	?qt_static_metacall@QStringListModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13631 NONAME ; void QStringListModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QPanGesture@@0UQMetaObjectExtraData@@B @ 13632 NONAME ; struct QMetaObjectExtraData const QPanGesture::staticMetaObjectExtraData
+	?device@QZipWriter@@QBEPAVQIODevice@@XZ @ 13633 NONAME ; class QIODevice * QZipWriter::device(void) const
+	?mimeData@QAbstractProxyModel@@UBEPAVQMimeData@@ABV?$QList@VQModelIndex@@@@@Z @ 13634 NONAME ; class QMimeData * QAbstractProxyModel::mimeData(class QList<class QModelIndex> const &) const
+	?qt_static_metacall@QWidgetResizeHandler@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13635 NONAME ; void QWidgetResizeHandler::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QZipWriter@@QAE@ABVQString@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@@Z @ 13636 NONAME ; QZipWriter::QZipWriter(class QString const &, class QFlags<enum QIODevice::OpenModeFlag>)
+	?qt_static_metacall@QPinchGesture@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13637 NONAME ; void QPinchGesture::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QTextBrowser@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13638 NONAME ; void QTextBrowser::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?drawPixmapFragments@QPaintEngineEx@@UAEXPBVQRectF@@0HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 13639 NONAME ; void QPaintEngineEx::drawPixmapFragments(class QRectF const *, class QRectF const *, int, class QPixmap const &, class QFlags<enum QPainter::PixmapFragmentHint>)
+	?staticMetaObjectExtraData@QTabBar@@0UQMetaObjectExtraData@@B @ 13640 NONAME ; struct QMetaObjectExtraData const QTabBar::staticMetaObjectExtraData
+	?setTabsMovable@QMdiArea@@QAEX_N@Z @ 13641 NONAME ; void QMdiArea::setTabsMovable(bool)
+	?minimumSizeHint@QRadioButton@@UBE?AVQSize@@XZ @ 13642 NONAME ; class QSize QRadioButton::minimumSizeHint(void) const
+	?staticMetaObjectExtraData@QGraphicsObject@@0UQMetaObjectExtraData@@B @ 13643 NONAME ; struct QMetaObjectExtraData const QGraphicsObject::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QPaintBufferResource@@0UQMetaObjectExtraData@@B @ 13644 NONAME ; struct QMetaObjectExtraData const QPaintBufferResource::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QToolBar@@0UQMetaObjectExtraData@@B @ 13645 NONAME ; struct QMetaObjectExtraData const QToolBar::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QFontDialog@@0UQMetaObjectExtraData@@B @ 13646 NONAME ; struct QMetaObjectExtraData const QFontDialog::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QCheckBox@@0UQMetaObjectExtraData@@B @ 13647 NONAME ; struct QMetaObjectExtraData const QCheckBox::staticMetaObjectExtraData
+	?qt_static_metacall@QGraphicsRotation@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13648 NONAME ; void QGraphicsRotation::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?drawRects@QBlitterPaintEngine@@UAEXPBVQRect@@H@Z @ 13649 NONAME ; void QBlitterPaintEngine::drawRects(class QRect const *, int)
+	?fillInPendingGlyphs@QTextureGlyphCache@@QAEXXZ @ 13650 NONAME ; void QTextureGlyphCache::fillInPendingGlyphs(void)
+	?qt_static_metacall@QColorDialog@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13651 NONAME ; void QColorDialog::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QPixmapBlurFilter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13652 NONAME ; void QPixmapBlurFilter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?draggablePaintPairs@QTreeViewPrivate@@UBE?AV?$QList@U?$QPair@VQRect@@VQModelIndex@@@@@@ABV?$QList@VQModelIndex@@@@PAVQRect@@@Z @ 13653 NONAME ; class QList<struct QPair<class QRect, class QModelIndex> > QTreeViewPrivate::draggablePaintPairs(class QList<class QModelIndex> const &, class QRect *) const
+	?qt_static_metacall@QFontDialog@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13654 NONAME ; void QFontDialog::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?focalRadius@QRadialGradient@@QBEMXZ @ 13655 NONAME ; float QRadialGradient::focalRadius(void) const
+	?renderHintsChanged@QBlitterPaintEngine@@UAEXXZ @ 13656 NONAME ; void QBlitterPaintEngine::renderHintsChanged(void)
+	?staticMetaObjectExtraData@QColorDialog@@0UQMetaObjectExtraData@@B @ 13657 NONAME ; struct QMetaObjectExtraData const QColorDialog::staticMetaObjectExtraData
+	?supportedDropActions@QAbstractProxyModel@@UBE?AV?$QFlags@W4DropAction@Qt@@@@XZ @ 13658 NONAME ; class QFlags<enum Qt::DropAction> QAbstractProxyModel::supportedDropActions(void) const
+	?beginAnimatedOperation@QTreeViewPrivate@@QAEXXZ @ 13659 NONAME ; void QTreeViewPrivate::beginAnimatedOperation(void)
+	?columnAt@QTreeViewPrivate@@QBEHH@Z @ 13660 NONAME ; int QTreeViewPrivate::columnAt(int) const
+	?qt_metacast@QIdentityProxyModel@@UAEPAXPBD@Z @ 13661 NONAME ; void * QIdentityProxyModel::qt_metacast(char const *)
+	?qt_static_metacall@QLineControl@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13662 NONAME ; void QLineControl::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?fillRect@QBlitterPaintEngine@@UAEXABVQRectF@@ABVQBrush@@@Z @ 13663 NONAME ; void QBlitterPaintEngine::fillRect(class QRectF const &, class QBrush const &)
+	?staticMetaObjectExtraData@QClipboard@@0UQMetaObjectExtraData@@B @ 13664 NONAME ; struct QMetaObjectExtraData const QClipboard::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QPixmapColorizeFilter@@0UQMetaObjectExtraData@@B @ 13665 NONAME ; struct QMetaObjectExtraData const QPixmapColorizeFilter::staticMetaObjectExtraData
+	?qt_static_metacall@QUndoStack@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13666 NONAME ; void QUndoStack::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QStandardItemModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13667 NONAME ; void QStandardItemModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QSessionManager@@0UQMetaObjectExtraData@@B @ 13668 NONAME ; struct QMetaObjectExtraData const QSessionManager::staticMetaObjectExtraData
+	?d_func@QBlittable@@ABEPBVQBlittablePrivate@@XZ @ 13669 NONAME ; class QBlittablePrivate const * QBlittable::d_func(void) const
+	?staticMetaObjectExtraData@QStringListModel@@0UQMetaObjectExtraData@@B @ 13670 NONAME ; struct QMetaObjectExtraData const QStringListModel::staticMetaObjectExtraData
+	?qt_static_metacall@QPaintBufferSignalProxy@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13671 NONAME ; void QPaintBufferSignalProxy::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QDrag@@0UQMetaObjectExtraData@@B @ 13672 NONAME ; struct QMetaObjectExtraData const QDrag::staticMetaObjectExtraData
+	?qt_static_metacall@QProxyModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13673 NONAME ; void QProxyModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QWidgetResizeHandler@@0UQMetaObjectExtraData@@B @ 13674 NONAME ; struct QMetaObjectExtraData const QWidgetResizeHandler::staticMetaObjectExtraData
+	?state@QBlitterPaintEngine@@QBEPBVQPainterState@@XZ @ 13675 NONAME ; class QPainterState const * QBlitterPaintEngine::state(void) const
+	?qt_static_metacall@QGroupBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13676 NONAME ; void QGroupBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QTextObject@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13677 NONAME ; void QTextObject::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QScrollBar@@0UQMetaObjectExtraData@@B @ 13678 NONAME ; struct QMetaObjectExtraData const QScrollBar::staticMetaObjectExtraData
+	?pageUp@QTreeViewPrivate@@QBEHH@Z @ 13679 NONAME ; int QTreeViewPrivate::pageUp(int) const
+	?staticMetaObjectExtraData@QWizardPage@@0UQMetaObjectExtraData@@B @ 13680 NONAME ; struct QMetaObjectExtraData const QWizardPage::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QShortcut@@0UQMetaObjectExtraData@@B @ 13681 NONAME ; struct QMetaObjectExtraData const QShortcut::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QGraphicsScale@@0UQMetaObjectExtraData@@B @ 13682 NONAME ; struct QMetaObjectExtraData const QGraphicsScale::staticMetaObjectExtraData
+	?isItemHiddenOrDisabled@QTreeViewPrivate@@QBE_NH@Z @ 13683 NONAME ; bool QTreeViewPrivate::isItemHiddenOrDisabled(int) const
+	??0QRadialGradient@@QAE@ABVQPointF@@M0M@Z @ 13684 NONAME ; QRadialGradient::QRadialGradient(class QPointF const &, float, class QPointF const &, float)
+	?qt_static_metacall@QTextEdit@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13685 NONAME ; void QTextEdit::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QTapAndHoldGesture@@0UQMetaObjectExtraData@@B @ 13686 NONAME ; struct QMetaObjectExtraData const QTapAndHoldGesture::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QApplication@@0UQMetaObjectExtraData@@B @ 13687 NONAME ; struct QMetaObjectExtraData const QApplication::staticMetaObjectExtraData
+	?qt_static_metacall@QGraphicsEffectSource@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13688 NONAME ; void QGraphicsEffectSource::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QPushButton@@0UQMetaObjectExtraData@@B @ 13689 NONAME ; struct QMetaObjectExtraData const QPushButton::staticMetaObjectExtraData
+	?centerRadius@QRadialGradient@@QBEMXZ @ 13690 NONAME ; float QRadialGradient::centerRadius(void) const
+	?qt_static_metacall@QAbstractItemDelegate@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13691 NONAME ; void QAbstractItemDelegate::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?expandOrCollapseItemAtPos@QTreeViewPrivate@@QAE_NABVQPoint@@@Z @ 13692 NONAME ; bool QTreeViewPrivate::expandOrCollapseItemAtPos(class QPoint const &)
+	?paintAlternatingRowColors@QTreeViewPrivate@@QBEXPAVQPainter@@PAVQStyleOptionViewItemV4@@HH@Z @ 13693 NONAME ; void QTreeViewPrivate::paintAlternatingRowColors(class QPainter *, class QStyleOptionViewItemV4 *, int, int) const
+	??1QBlittablePixmapData@@UAE@XZ @ 13694 NONAME ; QBlittablePixmapData::~QBlittablePixmapData(void)
+	?formatsHelper@QInternalMimeData@@SA?AVQStringList@@PBVQMimeData@@@Z @ 13695 NONAME ; class QStringList QInternalMimeData::formatsHelper(class QMimeData const *)
+	?qt_metacast@QInternalMimeData@@UAEPAXPBD@Z @ 13696 NONAME ; void * QInternalMimeData::qt_metacast(char const *)
+	?drawPixmapFragments@QPainter@@QAEXPBVQRectF@@0HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 13697 NONAME ; void QPainter::drawPixmapFragments(class QRectF const *, class QRectF const *, int, class QPixmap const &, class QFlags<enum QPainter::PixmapFragmentHint>)
+	?qt_isExtendedRadialGradient@@YA_NABVQBrush@@@Z @ 13698 NONAME ; bool qt_isExtendedRadialGradient(class QBrush const &)
+	?staticMetaObjectExtraData@QStatusBar@@0UQMetaObjectExtraData@@B @ 13699 NONAME ; struct QMetaObjectExtraData const QStatusBar::staticMetaObjectExtraData
+	?qt_static_metacall@QScrollArea@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13700 NONAME ; void QScrollArea::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13701 NONAME ; void QWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QDial@@0UQMetaObjectExtraData@@B @ 13702 NONAME ; struct QMetaObjectExtraData const QDial::staticMetaObjectExtraData
+	?itemDecorationRect@QTreeViewPrivate@@QBE?AVQRect@@ABVQModelIndex@@@Z @ 13703 NONAME ; class QRect QTreeViewPrivate::itemDecorationRect(class QModelIndex const &) const
+	?staticMetaObjectExtraData@QItemSelectionModel@@0UQMetaObjectExtraData@@B @ 13704 NONAME ; struct QMetaObjectExtraData const QItemSelectionModel::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QFileSystemModel@@0UQMetaObjectExtraData@@B @ 13705 NONAME ; struct QMetaObjectExtraData const QFileSystemModel::staticMetaObjectExtraData
+	?setCompressionPolicy@QZipWriter@@QAEXW4CompressionPolicy@1@@Z @ 13706 NONAME ; void QZipWriter::setCompressionPolicy(enum QZipWriter::CompressionPolicy)
+	??1QTreeViewPrivate@@UAE@XZ @ 13707 NONAME ; QTreeViewPrivate::~QTreeViewPrivate(void)
+	?mapToSource@QIdentityProxyModel@@UBE?AVQModelIndex@@ABV2@@Z @ 13708 NONAME ; class QModelIndex QIdentityProxyModel::mapToSource(class QModelIndex const &) const
+	?staticMetaObjectExtraData@QColumnView@@0UQMetaObjectExtraData@@B @ 13709 NONAME ; struct QMetaObjectExtraData const QColumnView::staticMetaObjectExtraData
+	?paintEngine@QBlittablePixmapData@@UBEPAVQPaintEngine@@XZ @ 13710 NONAME ; class QPaintEngine * QBlittablePixmapData::paintEngine(void) const
+	?qt_static_metacall@QInputContextPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13711 NONAME ; void QInputContextPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?d_func@QIdentityProxyModel@@AAEPAVQIdentityProxyModelPrivate@@XZ @ 13712 NONAME ; class QIdentityProxyModelPrivate * QIdentityProxyModel::d_func(void)
+	?qt_static_metacall@QGraphicsColorizeEffect@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13713 NONAME ; void QGraphicsColorizeEffect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?hasChildren@QAbstractProxyModel@@UBE_NABVQModelIndex@@@Z @ 13714 NONAME ; bool QAbstractProxyModel::hasChildren(class QModelIndex const &) const
+	?qt_static_metacall@QPushButton@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13715 NONAME ; void QPushButton::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?swap@QPen@@QAEXAAV1@@Z @ 13716 NONAME ; void QPen::swap(class QPen &)
+	?span@QAbstractProxyModel@@UBE?AVQSize@@ABVQModelIndex@@@Z @ 13717 NONAME ; class QSize QAbstractProxyModel::span(class QModelIndex const &) const
+	?staticMetaObjectExtraData@QSound@@0UQMetaObjectExtraData@@B @ 13718 NONAME ; struct QMetaObjectExtraData const QSound::staticMetaObjectExtraData
+	?qt_static_metacall@QDialog@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13719 NONAME ; void QDialog::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QGraphicsItemAnimation@@0UQMetaObjectExtraData@@B @ 13720 NONAME ; struct QMetaObjectExtraData const QGraphicsItemAnimation::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QGraphicsAnchor@@0UQMetaObjectExtraData@@B @ 13721 NONAME ; struct QMetaObjectExtraData const QGraphicsAnchor::staticMetaObjectExtraData
+	?qt_static_metacall@QImageIOPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13722 NONAME ; void QImageIOPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?textureMapForGlyph@QTextureGlyphCache@@QBE?AVQImage@@IUQFixed@@@Z @ 13723 NONAME ; class QImage QTextureGlyphCache::textureMapForGlyph(unsigned int, struct QFixed) const
+	?qt_static_metacall@QUndoView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13724 NONAME ; void QUndoView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QIntValidator@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13725 NONAME ; void QIntValidator::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QRegExpValidator@@0UQMetaObjectExtraData@@B @ 13726 NONAME ; struct QMetaObjectExtraData const QRegExpValidator::staticMetaObjectExtraData
+	?insertionPointsForLine@QTextEngine@@QAEXHAAV?$QVector@H@@@Z @ 13727 NONAME ; void QTextEngine::insertionPointsForLine(int, class QVector<int> &)
+	?staticMetaObjectExtraData@QAbstractSpinBox@@0UQMetaObjectExtraData@@B @ 13728 NONAME ; struct QMetaObjectExtraData const QAbstractSpinBox::staticMetaObjectExtraData
+	?qt_metacall@QInternalMimeData@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 13729 NONAME ; int QInternalMimeData::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QLCDNumber@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13730 NONAME ; void QLCDNumber::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??1QZipWriter@@QAE@XZ @ 13731 NONAME ; QZipWriter::~QZipWriter(void)
 	?staticMetaObjectExtraData@QSpinBox@@0UQMetaObjectExtraData@@B @ 13732 NONAME ; struct QMetaObjectExtraData const QSpinBox::staticMetaObjectExtraData
-	?qt_static_metacall@QMenu@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13733 NONAME ; void QMenu::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QListWidget@@0UQMetaObjectExtraData@@B @ 13734 NONAME ; struct QMetaObjectExtraData const QListWidget::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QTimeEdit@@0UQMetaObjectExtraData@@B @ 13735 NONAME ; struct QMetaObjectExtraData const QTimeEdit::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QMenu@@0UQMetaObjectExtraData@@B @ 13736 NONAME ; struct QMetaObjectExtraData const QMenu::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QFrame@@0UQMetaObjectExtraData@@B @ 13737 NONAME ; struct QMetaObjectExtraData const QFrame::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDirModel@@0UQMetaObjectExtraData@@B @ 13738 NONAME ; struct QMetaObjectExtraData const QDirModel::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QAbstractSpinBox@@0UQMetaObjectExtraData@@B @ 13739 NONAME ; struct QMetaObjectExtraData const QAbstractSpinBox::staticMetaObjectExtraData
-	?qt_static_metacall@QProxyStyle@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13740 NONAME ; void QProxyStyle::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QDateTimeEdit@@0UQMetaObjectExtraData@@B @ 13741 NONAME ; struct QMetaObjectExtraData const QDateTimeEdit::staticMetaObjectExtraData
-	?qt_static_metacall@QStyledItemDelegate@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13742 NONAME ; void QStyledItemDelegate::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QListView@@0UQMetaObjectExtraData@@B @ 13743 NONAME ; struct QMetaObjectExtraData const QListView::staticMetaObjectExtraData
-	?qt_static_metacall@QFrame@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13744 NONAME ; void QFrame::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QHeaderView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13745 NONAME ; void QHeaderView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?exists@QZipWriter@@QBE_NXZ @ 13746 NONAME ; bool QZipWriter::exists(void) const
-	?qt_static_metacall@QSyntaxHighlighter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13747 NONAME ; void QSyntaxHighlighter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QScroller@@0UQMetaObjectExtraData@@B @ 13748 NONAME ABSENT ; struct QMetaObjectExtraData const QScroller::staticMetaObjectExtraData
-	?qt_static_metacall@QTextFrame@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13749 NONAME ; void QTextFrame::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QDirModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13750 NONAME ; void QDirModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QScrollBar@@0UQMetaObjectExtraData@@B @ 13751 NONAME ; struct QMetaObjectExtraData const QScrollBar::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QMovie@@0UQMetaObjectExtraData@@B @ 13752 NONAME ; struct QMetaObjectExtraData const QMovie::staticMetaObjectExtraData
-	?qt_static_metacall@QGraphicsDropShadowEffect@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13753 NONAME ; void QGraphicsDropShadowEffect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QSound@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13754 NONAME ; void QSound::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QTextBrowser@@0UQMetaObjectExtraData@@B @ 13755 NONAME ; struct QMetaObjectExtraData const QTextBrowser::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QHeaderView@@0UQMetaObjectExtraData@@B @ 13756 NONAME ; struct QMetaObjectExtraData const QHeaderView::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QPixmapBlurFilter@@0UQMetaObjectExtraData@@B @ 13757 NONAME ; struct QMetaObjectExtraData const QPixmapBlurFilter::staticMetaObjectExtraData
-	?qt_static_metacall@QUndoStack@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13758 NONAME ; void QUndoStack::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QGraphicsAnchor@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13759 NONAME ; void QGraphicsAnchor::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QPanGesture@@0UQMetaObjectExtraData@@B @ 13760 NONAME ; struct QMetaObjectExtraData const QPanGesture::staticMetaObjectExtraData
-	?qt_static_metacall@QDataWidgetMapper@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13761 NONAME ; void QDataWidgetMapper::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QTextBlockGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13762 NONAME ; void QTextBlockGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QStringListModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13763 NONAME ; void QStringListModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QGraphicsTextItem@@0UQMetaObjectExtraData@@B @ 13764 NONAME ; struct QMetaObjectExtraData const QGraphicsTextItem::staticMetaObjectExtraData
-	?qt_static_metacall@QTimeEdit@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13765 NONAME ; void QTimeEdit::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QToolBar@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13766 NONAME ; void QToolBar::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QCheckBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13767 NONAME ; void QCheckBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QFontComboBox@@0UQMetaObjectExtraData@@B @ 13768 NONAME ; struct QMetaObjectExtraData const QFontComboBox::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDesktopWidget@@0UQMetaObjectExtraData@@B @ 13769 NONAME ; struct QMetaObjectExtraData const QDesktopWidget::staticMetaObjectExtraData
-	?qt_static_metacall@QSwipeGesture@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13770 NONAME ; void QSwipeGesture::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QFormLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13771 NONAME ; void QFormLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAbstractButton@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13772 NONAME ; void QAbstractButton::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QClipboard@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13773 NONAME ; void QClipboard::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QWidgetResizeHandler@@0UQMetaObjectExtraData@@B @ 13774 NONAME ; struct QMetaObjectExtraData const QWidgetResizeHandler::staticMetaObjectExtraData
-	?qt_static_metacall@QIconEnginePlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13775 NONAME ; void QIconEnginePlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QTreeWidget@@0UQMetaObjectExtraData@@B @ 13776 NONAME ; struct QMetaObjectExtraData const QTreeWidget::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QFileSystemModel@@0UQMetaObjectExtraData@@B @ 13777 NONAME ; struct QMetaObjectExtraData const QFileSystemModel::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGraphicsDropShadowEffect@@0UQMetaObjectExtraData@@B @ 13778 NONAME ; struct QMetaObjectExtraData const QGraphicsDropShadowEffect::staticMetaObjectExtraData
-	?qt_static_metacall@QPushButton@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13779 NONAME ; void QPushButton::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QClipboard@@0UQMetaObjectExtraData@@B @ 13780 NONAME ; struct QMetaObjectExtraData const QClipboard::staticMetaObjectExtraData
-	?qt_static_metacall@QHBoxLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13781 NONAME ; void QHBoxLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QKeyEventTransition@@0UQMetaObjectExtraData@@B @ 13782 NONAME ; struct QMetaObjectExtraData const QKeyEventTransition::staticMetaObjectExtraData
-	?qt_static_metacall@QWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13783 NONAME ; void QWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QListView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13784 NONAME ; void QListView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?status@QZipWriter@@QBE?AW4Status@1@XZ @ 13785 NONAME ; enum QZipWriter::Status QZipWriter::status(void) const
-	?qt_static_metacall@QProgressBar@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13786 NONAME ; void QProgressBar::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QMouseEventTransition@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13787 NONAME ; void QMouseEventTransition::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QTextBrowser@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13788 NONAME ; void QTextBrowser::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QMessageBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13789 NONAME ; void QMessageBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QPaintBufferSignalProxy@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13790 NONAME ; void QPaintBufferSignalProxy::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QWizardPage@@0UQMetaObjectExtraData@@B @ 13791 NONAME ; struct QMetaObjectExtraData const QWizardPage::staticMetaObjectExtraData
-	?qt_static_metacall@QMdiSubWindow@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13792 NONAME ; void QMdiSubWindow::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QFocusFrame@@0UQMetaObjectExtraData@@B @ 13793 NONAME ; struct QMetaObjectExtraData const QFocusFrame::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDockWidget@@0UQMetaObjectExtraData@@B @ 13794 NONAME ; struct QMetaObjectExtraData const QDockWidget::staticMetaObjectExtraData
-	?qt_static_metacall@QShortcut@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13795 NONAME ; void QShortcut::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QTextDocument@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13796 NONAME ; void QTextDocument::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QFileSystemModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13797 NONAME ; void QFileSystemModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QCompleter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13798 NONAME ; void QCompleter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QIntValidator@@0UQMetaObjectExtraData@@B @ 13799 NONAME ; struct QMetaObjectExtraData const QIntValidator::staticMetaObjectExtraData
-	?qt_static_metacall@QDrag@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13800 NONAME ; void QDrag::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QRegExpValidator@@0UQMetaObjectExtraData@@B @ 13801 NONAME ; struct QMetaObjectExtraData const QRegExpValidator::staticMetaObjectExtraData
-	?qt_static_metacall@QTabWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13802 NONAME ; void QTabWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QButtonGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13803 NONAME ; void QButtonGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAction@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13804 NONAME ; void QAction::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QPixmapConvolutionFilter@@0UQMetaObjectExtraData@@B @ 13805 NONAME ; struct QMetaObjectExtraData const QPixmapConvolutionFilter::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QIconEnginePluginV2@@0UQMetaObjectExtraData@@B @ 13806 NONAME ; struct QMetaObjectExtraData const QIconEnginePluginV2::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QLabel@@0UQMetaObjectExtraData@@B @ 13807 NONAME ; struct QMetaObjectExtraData const QLabel::staticMetaObjectExtraData
-	?qt_static_metacall@QInputDialog@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13808 NONAME ; void QInputDialog::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QMdiArea@@0UQMetaObjectExtraData@@B @ 13809 NONAME ; struct QMetaObjectExtraData const QMdiArea::staticMetaObjectExtraData
-	?qt_static_metacall@QRadioButton@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13810 NONAME ; void QRadioButton::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QS60Style@@0UQMetaObjectExtraData@@B @ 13811 NONAME ; struct QMetaObjectExtraData const QS60Style::staticMetaObjectExtraData
-	?qt_static_metacall@QToolBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13812 NONAME ; void QToolBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QDateEdit@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13813 NONAME ; void QDateEdit::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QAbstractScrollArea@@0UQMetaObjectExtraData@@B @ 13814 NONAME ; struct QMetaObjectExtraData const QAbstractScrollArea::staticMetaObjectExtraData
-	?qt_static_metacall@QGroupBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13815 NONAME ; void QGroupBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?isWritable@QZipWriter@@QBE_NXZ @ 13816 NONAME ; bool QZipWriter::isWritable(void) const
-	?qt_static_metacall@QToolButton@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13817 NONAME ; void QToolButton::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QGraphicsRotation@@0UQMetaObjectExtraData@@B @ 13818 NONAME ; struct QMetaObjectExtraData const QGraphicsRotation::staticMetaObjectExtraData
-	?qt_static_metacall@QDateTimeEdit@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13819 NONAME ; void QDateTimeEdit::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QPlainTextDocumentLayout@@0UQMetaObjectExtraData@@B @ 13820 NONAME ; struct QMetaObjectExtraData const QPlainTextDocumentLayout::staticMetaObjectExtraData
-	?addFile@QZipWriter@@QAEXABVQString@@ABVQByteArray@@@Z @ 13821 NONAME ; void QZipWriter::addFile(class QString const &, class QByteArray const &)
-	?staticMetaObjectExtraData@QComboBox@@0UQMetaObjectExtraData@@B @ 13822 NONAME ; struct QMetaObjectExtraData const QComboBox::staticMetaObjectExtraData
-	?qt_static_metacall@QGraphicsColorizeEffect@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13823 NONAME ; void QGraphicsColorizeEffect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QPixmapDropShadowFilter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13824 NONAME ; void QPixmapDropShadowFilter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QAbstractTextDocumentLayout@@0UQMetaObjectExtraData@@B @ 13825 NONAME ; struct QMetaObjectExtraData const QAbstractTextDocumentLayout::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QCheckBox@@0UQMetaObjectExtraData@@B @ 13826 NONAME ; struct QMetaObjectExtraData const QCheckBox::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QCalendarWidget@@0UQMetaObjectExtraData@@B @ 13827 NONAME ; struct QMetaObjectExtraData const QCalendarWidget::staticMetaObjectExtraData
-	?qt_static_metacall@QWidgetAction@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13828 NONAME ; void QWidgetAction::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?device@QZipWriter@@QBEPAVQIODevice@@XZ @ 13829 NONAME ; class QIODevice * QZipWriter::device(void) const
-	?staticMetaObjectExtraData@QBoxLayout@@0UQMetaObjectExtraData@@B @ 13830 NONAME ; struct QMetaObjectExtraData const QBoxLayout::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QRadioButton@@0UQMetaObjectExtraData@@B @ 13831 NONAME ; struct QMetaObjectExtraData const QRadioButton::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGridLayout@@0UQMetaObjectExtraData@@B @ 13832 NONAME ; struct QMetaObjectExtraData const QGridLayout::staticMetaObjectExtraData
-	?qt_static_metacall@QDoubleValidator@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13833 NONAME ; void QDoubleValidator::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QKeyEventTransition@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13834 NONAME ; void QKeyEventTransition::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QMainWindow@@0UQMetaObjectExtraData@@B @ 13835 NONAME ; struct QMetaObjectExtraData const QMainWindow::staticMetaObjectExtraData
-	?qt_static_metacall@QTextTable@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13836 NONAME ; void QTextTable::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QGraphicsView@@0UQMetaObjectExtraData@@B @ 13837 NONAME ; struct QMetaObjectExtraData const QGraphicsView::staticMetaObjectExtraData
-	?qt_static_metacall@QErrorMessage@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13838 NONAME ; void QErrorMessage::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QToolBox@@0UQMetaObjectExtraData@@B @ 13839 NONAME ; struct QMetaObjectExtraData const QToolBox::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QTreeView@@0UQMetaObjectExtraData@@B @ 13840 NONAME ; struct QMetaObjectExtraData const QTreeView::staticMetaObjectExtraData
-	?qt_static_metacall@QSlider@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13841 NONAME ; void QSlider::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QStringListModel@@0UQMetaObjectExtraData@@B @ 13842 NONAME ; struct QMetaObjectExtraData const QStringListModel::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QProgressBar@@0UQMetaObjectExtraData@@B @ 13843 NONAME ; struct QMetaObjectExtraData const QProgressBar::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QTextList@@0UQMetaObjectExtraData@@B @ 13844 NONAME ; struct QMetaObjectExtraData const QTextList::staticMetaObjectExtraData
-	?qt_static_metacall@QGraphicsTransform@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13845 NONAME ; void QGraphicsTransform::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QFormLayout@@0UQMetaObjectExtraData@@B @ 13846 NONAME ; struct QMetaObjectExtraData const QFormLayout::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGesture@@0UQMetaObjectExtraData@@B @ 13847 NONAME ; struct QMetaObjectExtraData const QGesture::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGraphicsAnchor@@0UQMetaObjectExtraData@@B @ 13848 NONAME ; struct QMetaObjectExtraData const QGraphicsAnchor::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QTextObject@@0UQMetaObjectExtraData@@B @ 13849 NONAME ; struct QMetaObjectExtraData const QTextObject::staticMetaObjectExtraData
-	?qt_static_metacall@QGraphicsView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13850 NONAME ; void QGraphicsView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QGraphicsOpacityEffect@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13851 NONAME ; void QGraphicsOpacityEffect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAbstractSlider@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13852 NONAME ; void QAbstractSlider::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QTreeWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13853 NONAME ; void QTreeWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QAbstractItemDelegate@@0UQMetaObjectExtraData@@B @ 13854 NONAME ; struct QMetaObjectExtraData const QAbstractItemDelegate::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QStatusBar@@0UQMetaObjectExtraData@@B @ 13855 NONAME ; struct QMetaObjectExtraData const QStatusBar::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QActionGroup@@0UQMetaObjectExtraData@@B @ 13856 NONAME ; struct QMetaObjectExtraData const QActionGroup::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDataWidgetMapper@@0UQMetaObjectExtraData@@B @ 13857 NONAME ; struct QMetaObjectExtraData const QDataWidgetMapper::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDial@@0UQMetaObjectExtraData@@B @ 13858 NONAME ; struct QMetaObjectExtraData const QDial::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QMdiSubWindow@@0UQMetaObjectExtraData@@B @ 13859 NONAME ; struct QMetaObjectExtraData const QMdiSubWindow::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGraphicsEffect@@0UQMetaObjectExtraData@@B @ 13860 NONAME ; struct QMetaObjectExtraData const QGraphicsEffect::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QPictureFormatPlugin@@0UQMetaObjectExtraData@@B @ 13861 NONAME ; struct QMetaObjectExtraData const QPictureFormatPlugin::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGraphicsScale@@0UQMetaObjectExtraData@@B @ 13862 NONAME ; struct QMetaObjectExtraData const QGraphicsScale::staticMetaObjectExtraData
-	?qt_static_metacall@QStandardItemModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13863 NONAME ; void QStandardItemModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QDockWidgetLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13864 NONAME ; void QDockWidgetLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QPinchGesture@@0UQMetaObjectExtraData@@B @ 13865 NONAME ; struct QMetaObjectExtraData const QPinchGesture::staticMetaObjectExtraData
-	?qt_static_metacall@QLabel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13866 NONAME ; void QLabel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QTableWidget@@0UQMetaObjectExtraData@@B @ 13867 NONAME ; struct QMetaObjectExtraData const QTableWidget::staticMetaObjectExtraData
-	?close@QZipWriter@@QAEXXZ @ 13868 NONAME ; void QZipWriter::close(void)
-	?qt_static_metacall@QStatusBar@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13869 NONAME ; void QStatusBar::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QCommandLinkButton@@0UQMetaObjectExtraData@@B @ 13870 NONAME ; struct QMetaObjectExtraData const QCommandLinkButton::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QPushButton@@0UQMetaObjectExtraData@@B @ 13871 NONAME ; struct QMetaObjectExtraData const QPushButton::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QWidgetAction@@0UQMetaObjectExtraData@@B @ 13872 NONAME ; struct QMetaObjectExtraData const QWidgetAction::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QDoubleSpinBox@@0UQMetaObjectExtraData@@B @ 13873 NONAME ; struct QMetaObjectExtraData const QDoubleSpinBox::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QTextTable@@0UQMetaObjectExtraData@@B @ 13874 NONAME ; struct QMetaObjectExtraData const QTextTable::staticMetaObjectExtraData
-	?qt_static_metacall@QSplashScreen@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13875 NONAME ; void QSplashScreen::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QStackedLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13876 NONAME ; void QStackedLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QCompleter@@0UQMetaObjectExtraData@@B @ 13877 NONAME ; struct QMetaObjectExtraData const QCompleter::staticMetaObjectExtraData
-	?qt_static_metacall@QAbstractScrollArea@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13878 NONAME ; void QAbstractScrollArea::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QDesktopWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13879 NONAME ; void QDesktopWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAbstractSpinBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13880 NONAME ; void QAbstractSpinBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QGraphicsEffectSource@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13881 NONAME ; void QGraphicsEffectSource::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?addSymLink@QZipWriter@@QAEXABVQString@@0@Z @ 13882 NONAME ; void QZipWriter::addSymLink(class QString const &, class QString const &)
-	?staticMetaObjectExtraData@QGraphicsEffectSource@@0UQMetaObjectExtraData@@B @ 13883 NONAME ; struct QMetaObjectExtraData const QGraphicsEffectSource::staticMetaObjectExtraData
-	?qt_static_metacall@QScroller@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13884 NONAME ABSENT ; void QScroller::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QStyle@@0UQMetaObjectExtraData@@B @ 13885 NONAME ; struct QMetaObjectExtraData const QStyle::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QTabWidget@@0UQMetaObjectExtraData@@B @ 13886 NONAME ; struct QMetaObjectExtraData const QTabWidget::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QPixmapFilter@@0UQMetaObjectExtraData@@B @ 13887 NONAME ; struct QMetaObjectExtraData const QPixmapFilter::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGraphicsOpacityEffect@@0UQMetaObjectExtraData@@B @ 13888 NONAME ; struct QMetaObjectExtraData const QGraphicsOpacityEffect::staticMetaObjectExtraData
-	?qt_static_metacall@QBoxLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13889 NONAME ; void QBoxLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAbstractTextDocumentLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13890 NONAME ; void QAbstractTextDocumentLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QGraphicsSystemPlugin@@0UQMetaObjectExtraData@@B @ 13891 NONAME ; struct QMetaObjectExtraData const QGraphicsSystemPlugin::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QMouseEventTransition@@0UQMetaObjectExtraData@@B @ 13892 NONAME ; struct QMetaObjectExtraData const QMouseEventTransition::staticMetaObjectExtraData
-	?qt_static_metacall@QTabBar@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13893 NONAME ; void QTabBar::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?compressionPolicy@QZipWriter@@QBE?AW4CompressionPolicy@1@XZ @ 13894 NONAME ; enum QZipWriter::CompressionPolicy QZipWriter::compressionPolicy(void) const
-	?qt_static_metacall@QWindowsStyle@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13895 NONAME ; void QWindowsStyle::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QUndoGroup@@0UQMetaObjectExtraData@@B @ 13896 NONAME ; struct QMetaObjectExtraData const QUndoGroup::staticMetaObjectExtraData
-	?qt_static_metacall@QStackedWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13897 NONAME ; void QStackedWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QColorDialog@@0UQMetaObjectExtraData@@B @ 13898 NONAME ; struct QMetaObjectExtraData const QColorDialog::staticMetaObjectExtraData
-	?qt_static_metacall@QMdiArea@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13899 NONAME ; void QMdiArea::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QGraphicsScene@@0UQMetaObjectExtraData@@B @ 13900 NONAME ; struct QMetaObjectExtraData const QGraphicsScene::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGroupBox@@0UQMetaObjectExtraData@@B @ 13901 NONAME ; struct QMetaObjectExtraData const QGroupBox::staticMetaObjectExtraData
-	?qt_static_metacall@QInternalMimeData@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13902 NONAME ; void QInternalMimeData::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QAbstractSlider@@0UQMetaObjectExtraData@@B @ 13903 NONAME ; struct QMetaObjectExtraData const QAbstractSlider::staticMetaObjectExtraData
-	?qt_static_metacall@QTapAndHoldGesture@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13904 NONAME ; void QTapAndHoldGesture::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QFocusFrame@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13905 NONAME ; void QFocusFrame::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QHBoxLayout@@0UQMetaObjectExtraData@@B @ 13906 NONAME ; struct QMetaObjectExtraData const QHBoxLayout::staticMetaObjectExtraData
-	?qt_static_metacall@QSessionManager@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13907 NONAME ; void QSessionManager::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QSyntaxHighlighter@@0UQMetaObjectExtraData@@B @ 13908 NONAME ; struct QMetaObjectExtraData const QSyntaxHighlighter::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QLineEdit@@0UQMetaObjectExtraData@@B @ 13909 NONAME ; struct QMetaObjectExtraData const QLineEdit::staticMetaObjectExtraData
-	?qt_static_metacall@QWizardPage@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13910 NONAME ; void QWizardPage::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QColorDialog@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13911 NONAME ; void QColorDialog::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QInputDialog@@0UQMetaObjectExtraData@@B @ 13912 NONAME ; struct QMetaObjectExtraData const QInputDialog::staticMetaObjectExtraData
-	?qt_static_metacall@QPixmapColorizeFilter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13913 NONAME ; void QPixmapColorizeFilter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QListWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13914 NONAME ; void QListWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAbstractProxyModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13915 NONAME ; void QAbstractProxyModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QVBoxLayout@@0UQMetaObjectExtraData@@B @ 13916 NONAME ; struct QMetaObjectExtraData const QVBoxLayout::staticMetaObjectExtraData
-	?qt_static_metacall@QAbstractItemDelegate@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13917 NONAME ; void QAbstractItemDelegate::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QCommonStyle@@0UQMetaObjectExtraData@@B @ 13918 NONAME ; struct QMetaObjectExtraData const QCommonStyle::staticMetaObjectExtraData
-	?qt_static_metacall@QPixmapFilter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13919 NONAME ; void QPixmapFilter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QLayout@@0UQMetaObjectExtraData@@B @ 13920 NONAME ; struct QMetaObjectExtraData const QLayout::staticMetaObjectExtraData
-	?qt_static_metacall@QLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13921 NONAME ; void QLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QWindowsStyle@@0UQMetaObjectExtraData@@B @ 13922 NONAME ; struct QMetaObjectExtraData const QWindowsStyle::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QStackedWidget@@0UQMetaObjectExtraData@@B @ 13923 NONAME ; struct QMetaObjectExtraData const QStackedWidget::staticMetaObjectExtraData
-	?qt_static_metacall@QGesture@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13924 NONAME ; void QGesture::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QMovie@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13925 NONAME ; void QMovie::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QPixmapColorizeFilter@@0UQMetaObjectExtraData@@B @ 13926 NONAME ; struct QMetaObjectExtraData const QPixmapColorizeFilter::staticMetaObjectExtraData
-	?qt_static_metacall@QTableWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13927 NONAME ; void QTableWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QRubberBand@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13928 NONAME ; void QRubberBand::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QPlainTextEdit@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13929 NONAME ; void QPlainTextEdit::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QAbstractButton@@0UQMetaObjectExtraData@@B @ 13930 NONAME ; struct QMetaObjectExtraData const QAbstractButton::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QInternalMimeData@@0UQMetaObjectExtraData@@B @ 13931 NONAME ; struct QMetaObjectExtraData const QInternalMimeData::staticMetaObjectExtraData
-	??1QZipWriter@@QAE@XZ @ 13932 NONAME ; QZipWriter::~QZipWriter(void)
-	?staticMetaObjectExtraData@QDialogButtonBox@@0UQMetaObjectExtraData@@B @ 13933 NONAME ; struct QMetaObjectExtraData const QDialogButtonBox::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QUndoView@@0UQMetaObjectExtraData@@B @ 13934 NONAME ; struct QMetaObjectExtraData const QUndoView::staticMetaObjectExtraData
-	?qt_static_metacall@QGraphicsTextItem@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13935 NONAME ; void QGraphicsTextItem::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?setCreationPermissions@QZipWriter@@QAEXV?$QFlags@W4Permission@QFile@@@@@Z @ 13936 NONAME ; void QZipWriter::setCreationPermissions(class QFlags<enum QFile::Permission>)
-	?staticMetaObjectExtraData@QInputContext@@0UQMetaObjectExtraData@@B @ 13937 NONAME ; struct QMetaObjectExtraData const QInputContext::staticMetaObjectExtraData
-	?qt_static_metacall@QInputContext@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13938 NONAME ; void QInputContext::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QEventDispatcherS60@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13939 NONAME ; void QEventDispatcherS60::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QFileDialog@@0UQMetaObjectExtraData@@B @ 13940 NONAME ; struct QMetaObjectExtraData const QFileDialog::staticMetaObjectExtraData
-	?qt_static_metacall@QUndoGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13941 NONAME ; void QUndoGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QDialogButtonBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13942 NONAME ; void QDialogButtonBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QImageIOPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13943 NONAME ; void QImageIOPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QLCDNumber@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13944 NONAME ; void QLCDNumber::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QFontDialog@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13945 NONAME ; void QFontDialog::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QMainWindow@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13946 NONAME ; void QMainWindow::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QRegExpValidator@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13947 NONAME ; void QRegExpValidator::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QSplitterHandle@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13948 NONAME ; void QSplitterHandle::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QGraphicsEffect@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13949 NONAME ; void QGraphicsEffect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QTapGesture@@0UQMetaObjectExtraData@@B @ 13950 NONAME ; struct QMetaObjectExtraData const QTapGesture::staticMetaObjectExtraData
-	?qt_static_metacall@QItemDelegate@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13951 NONAME ; void QItemDelegate::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QWorkspace@@0UQMetaObjectExtraData@@B @ 13952 NONAME ; struct QMetaObjectExtraData const QWorkspace::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QSessionManager@@0UQMetaObjectExtraData@@B @ 13953 NONAME ; struct QMetaObjectExtraData const QSessionManager::staticMetaObjectExtraData
-	?qt_static_metacall@QGraphicsItemAnimation@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13954 NONAME ; void QGraphicsItemAnimation::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?setCursorMoveStyle@QLineControl@@QAEXW4MoveStyle@QTextCursor@@@Z @ 13955 NONAME ABSENT ; void QLineControl::setCursorMoveStyle(enum QTextCursor::MoveStyle)
-	?staticMetaObjectExtraData@QIdentityProxyModel@@0UQMetaObjectExtraData@@B @ 13956 NONAME ; struct QMetaObjectExtraData const QIdentityProxyModel::staticMetaObjectExtraData
-	?defaultCursorMoveStyle@QTextDocument@@QBE?AW4MoveStyle@QTextCursor@@XZ @ 13957 NONAME ABSENT ; enum QTextCursor::MoveStyle QTextDocument::defaultCursorMoveStyle(void) const
-	?offsetInLigature@QTextEngine@@QAE?AUQFixed@@PBUQScriptItem@@HHH@Z @ 13958 NONAME ; struct QFixed QTextEngine::offsetInLigature(struct QScriptItem const *, int, int, int)
-	?qt_metacall@QIdentityProxyModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 13959 NONAME ; int QIdentityProxyModel::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?mapSelectionFromSource@QIdentityProxyModel@@UBE?AVQItemSelection@@ABV2@@Z @ 13960 NONAME ; class QItemSelection QIdentityProxyModel::mapSelectionFromSource(class QItemSelection const &) const
-	?qt_static_metacall@QIdentityProxyModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13961 NONAME ; void QIdentityProxyModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?mapSelectionToSource@QIdentityProxyModel@@UBE?AVQItemSelection@@ABV2@@Z @ 13962 NONAME ; class QItemSelection QIdentityProxyModel::mapSelectionToSource(class QItemSelection const &) const
-	??1QIdentityProxyModel@@UAE@XZ @ 13963 NONAME ; QIdentityProxyModel::~QIdentityProxyModel(void)
-	??_EQIdentityProxyModel@@UAE@I@Z @ 13964 NONAME ; QIdentityProxyModel::~QIdentityProxyModel(unsigned int)
-	?removeRows@QIdentityProxyModel@@UAE_NHHABVQModelIndex@@@Z @ 13965 NONAME ; bool QIdentityProxyModel::removeRows(int, int, class QModelIndex const &)
-	?previousLogicalPosition@QTextEngine@@QBEHH@Z @ 13966 NONAME ; int QTextEngine::previousLogicalPosition(int) const
-	?metaObject@QIdentityProxyModel@@UBEPBUQMetaObject@@XZ @ 13967 NONAME ; struct QMetaObject const * QIdentityProxyModel::metaObject(void) const
-	?cursorMoveStyle@QLineControl@@QBE?AW4MoveStyle@QTextCursor@@XZ @ 13968 NONAME ABSENT ; enum QTextCursor::MoveStyle QLineControl::cursorMoveStyle(void) const
-	?removeColumns@QIdentityProxyModel@@UAE_NHHABVQModelIndex@@@Z @ 13969 NONAME ; bool QIdentityProxyModel::removeColumns(int, int, class QModelIndex const &)
-	?alignLine@QTextEngine@@QAE?AUQFixed@@ABUQScriptLine@@@Z @ 13970 NONAME ; struct QFixed QTextEngine::alignLine(struct QScriptLine const &)
-	png_set_chunk_cache_max @ 13971 NONAME
-	?parent@QIdentityProxyModel@@UBE?AVQModelIndex@@ABV2@@Z @ 13972 NONAME ; class QModelIndex QIdentityProxyModel::parent(class QModelIndex const &) const
-	?insertColumns@QIdentityProxyModel@@UAE_NHHABVQModelIndex@@@Z @ 13973 NONAME ; bool QIdentityProxyModel::insertColumns(int, int, class QModelIndex const &)
-	?dropMimeData@QIdentityProxyModel@@UAE_NPBVQMimeData@@W4DropAction@Qt@@HHABVQModelIndex@@@Z @ 13974 NONAME ; bool QIdentityProxyModel::dropMimeData(class QMimeData const *, enum Qt::DropAction, int, int, class QModelIndex const &)
-	?visualCursorMovement@QTextEngine@@QBE_NXZ @ 13975 NONAME ; bool QTextEngine::visualCursorMovement(void) const
-	??0QRadialGradient@@QAE@MMMMMM@Z @ 13976 NONAME ; QRadialGradient::QRadialGradient(float, float, float, float, float, float)
-	?setSourceModel@QIdentityProxyModel@@UAEXPAVQAbstractItemModel@@@Z @ 13977 NONAME ; void QIdentityProxyModel::setSourceModel(class QAbstractItemModel *)
-	?getStaticMetaObject@QIdentityProxyModel@@SAABUQMetaObject@@XZ @ 13978 NONAME ; struct QMetaObject const & QIdentityProxyModel::getStaticMetaObject(void)
-	?index@QIdentityProxyModel@@UBE?AVQModelIndex@@HHABV2@@Z @ 13979 NONAME ; class QModelIndex QIdentityProxyModel::index(int, int, class QModelIndex const &) const
-	png_set_background_fixed @ 13980 NONAME
-	png_access_version_number @ 13981 NONAME
-	?insertRows@QIdentityProxyModel@@UAE_NHHABVQModelIndex@@@Z @ 13982 NONAME ; bool QIdentityProxyModel::insertRows(int, int, class QModelIndex const &)
-	?positionAfterVisualMovement@QTextEngine@@QAEHHW4MoveOperation@QTextCursor@@@Z @ 13983 NONAME ; int QTextEngine::positionAfterVisualMovement(int, enum QTextCursor::MoveOperation)
-	?setCenterRadius@QRadialGradient@@QAEXM@Z @ 13984 NONAME ; void QRadialGradient::setCenterRadius(float)
-	?leftCursorPosition@QTextLayout@@QBEHH@Z @ 13985 NONAME ; int QTextLayout::leftCursorPosition(int) const
-	?focalRadius@QRadialGradient@@QBEMXZ @ 13986 NONAME ; float QRadialGradient::focalRadius(void) const
-	?qt_metacast@QIdentityProxyModel@@UAEPAXPBD@Z @ 13987 NONAME ; void * QIdentityProxyModel::qt_metacast(char const *)
-	png_get_io_state @ 13988 NONAME
-	??0QRadialGradient@@QAE@ABVQPointF@@M0M@Z @ 13989 NONAME ; QRadialGradient::QRadialGradient(class QPointF const &, float, class QPointF const &, float)
-	?centerRadius@QRadialGradient@@QBEMXZ @ 13990 NONAME ; float QRadialGradient::centerRadius(void) const
-	?qt_isExtendedRadialGradient@@YA_NABVQBrush@@@Z @ 13991 NONAME ; bool qt_isExtendedRadialGradient(class QBrush const &)
-	?mapToSource@QIdentityProxyModel@@UBE?AVQModelIndex@@ABV2@@Z @ 13992 NONAME ; class QModelIndex QIdentityProxyModel::mapToSource(class QModelIndex const &) const
-	?d_func@QIdentityProxyModel@@AAEPAVQIdentityProxyModelPrivate@@XZ @ 13993 NONAME ; class QIdentityProxyModelPrivate * QIdentityProxyModel::d_func(void)
-	?insertionPointsForLine@QTextEngine@@QAEXHAAV?$QVector@H@@@Z @ 13994 NONAME ; void QTextEngine::insertionPointsForLine(int, class QVector<int> &)
-	?cloneWithSize@QFontEngine@@UBEPAV1@M@Z @ 13995 NONAME ; class QFontEngine * QFontEngine::cloneWithSize(float) const
-	?setCursorMoveStyle@QLineEdit@@QAEXW4MoveStyle@QTextCursor@@@Z @ 13996 NONAME ABSENT ; void QLineEdit::setCursorMoveStyle(enum QTextCursor::MoveStyle)
-	??0QIdentityProxyModel@@IAE@AAVQIdentityProxyModelPrivate@@PAVQObject@@@Z @ 13997 NONAME ; QIdentityProxyModel::QIdentityProxyModel(class QIdentityProxyModelPrivate &, class QObject *)
-	?lineNumberForTextPosition@QTextEngine@@QAEHH@Z @ 13998 NONAME ; int QTextEngine::lineNumberForTextPosition(int)
-	png_set_benign_errors @ 13999 NONAME
-	?beginningOfLine@QTextEngine@@AAEHH@Z @ 14000 NONAME ; int QTextEngine::beginningOfLine(int)
-	??0QIdentityProxyModel@@QAE@PAVQObject@@@Z @ 14001 NONAME ; QIdentityProxyModel::QIdentityProxyModel(class QObject *)
-	?rightCursorPosition@QTextLayout@@QBEHH@Z @ 14002 NONAME ; int QTextLayout::rightCursorPosition(int) const
-	?d_func@QIdentityProxyModel@@ABEPBVQIdentityProxyModelPrivate@@XZ @ 14003 NONAME ; class QIdentityProxyModelPrivate const * QIdentityProxyModel::d_func(void) const
-	?columnCount@QIdentityProxyModel@@UBEHABVQModelIndex@@@Z @ 14004 NONAME ; int QIdentityProxyModel::columnCount(class QModelIndex const &) const
-	?cursorMoveStyle@QLineEdit@@QBE?AW4MoveStyle@QTextCursor@@XZ @ 14005 NONAME ABSENT ; enum QTextCursor::MoveStyle QLineEdit::cursorMoveStyle(void) const
-	?trUtf8@QIdentityProxyModel@@SA?AVQString@@PBD0H@Z @ 14006 NONAME ; class QString QIdentityProxyModel::trUtf8(char const *, char const *, int)
-	?setDefaultCursorMoveStyle@QTextDocument@@QAEXW4MoveStyle@QTextCursor@@@Z @ 14007 NONAME ABSENT ; void QTextDocument::setDefaultCursorMoveStyle(enum QTextCursor::MoveStyle)
-	?actionText@QUndoCommand@@QBE?AVQString@@XZ @ 14008 NONAME ; class QString QUndoCommand::actionText(void) const
-	?tr@QIdentityProxyModel@@SA?AVQString@@PBD0H@Z @ 14009 NONAME ; class QString QIdentityProxyModel::tr(char const *, char const *, int)
-	?mapFromSource@QIdentityProxyModel@@UBE?AVQModelIndex@@ABV2@@Z @ 14010 NONAME ; class QModelIndex QIdentityProxyModel::mapFromSource(class QModelIndex const &) const
-	?nextLogicalPosition@QTextEngine@@QBEHH@Z @ 14011 NONAME ; int QTextEngine::nextLogicalPosition(int) const
-	?setCursorMoveStyle@QTextLayout@@QAEXW4MoveStyle@QTextCursor@@@Z @ 14012 NONAME ABSENT ; void QTextLayout::setCursorMoveStyle(enum QTextCursor::MoveStyle)
-	?doItemsLayout@QTableView@@UAEXXZ @ 14013 NONAME ; void QTableView::doItemsLayout(void)
-	?setFocalRadius@QRadialGradient@@QAEXM@Z @ 14014 NONAME ; void QRadialGradient::setFocalRadius(float)
-	?qt_painterPathFromVectorPath@@YA?AVQPainterPath@@ABVQVectorPath@@@Z @ 14015 NONAME ; class QPainterPath qt_painterPathFromVectorPath(class QVectorPath const &)
-	?tr@QIdentityProxyModel@@SA?AVQString@@PBD0@Z @ 14016 NONAME ; class QString QIdentityProxyModel::tr(char const *, char const *)
-	?match@QIdentityProxyModel@@UBE?AV?$QList@VQModelIndex@@@@ABVQModelIndex@@HABVQVariant@@HV?$QFlags@W4MatchFlag@Qt@@@@@Z @ 14017 NONAME ; class QList<class QModelIndex> QIdentityProxyModel::match(class QModelIndex const &, int, class QVariant const &, int, class QFlags<enum Qt::MatchFlag>) const
-	?staticMetaObject@QIdentityProxyModel@@2UQMetaObject@@B @ 14018 NONAME ; struct QMetaObject const QIdentityProxyModel::staticMetaObject
-	?rowCount@QIdentityProxyModel@@UBEHABVQModelIndex@@@Z @ 14019 NONAME ; int QIdentityProxyModel::rowCount(class QModelIndex const &) const
-	?trUtf8@QIdentityProxyModel@@SA?AVQString@@PBD0@Z @ 14020 NONAME ; class QString QIdentityProxyModel::trUtf8(char const *, char const *)
-	?cursorMoveStyle@QTextLayout@@QBE?AW4MoveStyle@QTextCursor@@XZ @ 14021 NONAME ABSENT ; enum QTextCursor::MoveStyle QTextLayout::cursorMoveStyle(void) const
-	?endOfLine@QTextEngine@@AAEHH@Z @ 14022 NONAME ; int QTextEngine::endOfLine(int)
-	?setCursorMoveStyle@QTextLayout@@QAEXW4CursorMoveStyle@Qt@@@Z @ 14023 NONAME ; void QTextLayout::setCursorMoveStyle(enum Qt::CursorMoveStyle)
-	?defaultCursorMoveStyle@QTextDocument@@QBE?AW4CursorMoveStyle@Qt@@XZ @ 14024 NONAME ; enum Qt::CursorMoveStyle QTextDocument::defaultCursorMoveStyle(void) const
-	?cursorMoveStyle@QTextLayout@@QBE?AW4CursorMoveStyle@Qt@@XZ @ 14025 NONAME ; enum Qt::CursorMoveStyle QTextLayout::cursorMoveStyle(void) const
-	?setDefaultCursorMoveStyle@QTextDocument@@QAEXW4CursorMoveStyle@Qt@@@Z @ 14026 NONAME ; void QTextDocument::setDefaultCursorMoveStyle(enum Qt::CursorMoveStyle)
-	?setCursorMoveStyle@QLineControl@@QAEXW4CursorMoveStyle@Qt@@@Z @ 14027 NONAME ; void QLineControl::setCursorMoveStyle(enum Qt::CursorMoveStyle)
-	?cursorMoveStyle@QLineEdit@@QBE?AW4CursorMoveStyle@Qt@@XZ @ 14028 NONAME ; enum Qt::CursorMoveStyle QLineEdit::cursorMoveStyle(void) const
-	png_get_signature @ 14029 NONAME
-	png_malloc @ 14030 NONAME
-	?setCursorMoveStyle@QLineEdit@@QAEXW4CursorMoveStyle@Qt@@@Z @ 14031 NONAME ; void QLineEdit::setCursorMoveStyle(enum Qt::CursorMoveStyle)
-	png_process_data_pause @ 14032 NONAME
-	png_read_end @ 14033 NONAME
-	?cursorMoveStyle@QLineControl@@QBE?AW4CursorMoveStyle@Qt@@XZ @ 14034 NONAME ; enum Qt::CursorMoveStyle QLineControl::cursorMoveStyle(void) const
-	?hasBCM2727@QSymbianGraphicsSystemEx@@UAE_NXZ @ 14035 NONAME ABSENT ; bool QSymbianGraphicsSystemEx::hasBCM2727(void)
-	png_get_pixels_per_inch @ 14036 NONAME
-	png_set_bgr @ 14037 NONAME
-	?getClusterLength@QTextEngine@@AAEHPAGPBUHB_CharAttributes@@HHHPAH@Z @ 14038 NONAME ; int QTextEngine::getClusterLength(unsigned short *, struct HB_CharAttributes const *, int, int, int, int *)
-	?positionInLigature@QTextEngine@@QAEHPBUQScriptItem@@HUQFixed@@1H_N@Z @ 14039 NONAME ; int QTextEngine::positionInLigature(struct QScriptItem const *, int, struct QFixed, struct QFixed, int, bool)
-	?supportsTransformations@QPaintEngineEx@@UBE_NMABVQTransform@@@Z @ 14040 NONAME ; bool QPaintEngineEx::supportsTransformations(float, class QTransform const &) const
-	?drawStaticTextItem@QPaintEngineEx@@UAEXPAVQStaticTextItem@@@Z @ 14041 NONAME ; void QPaintEngineEx::drawStaticTextItem(class QStaticTextItem *)
-	png_set_cHRM @ 14042 NONAME
-	png_set_cHRM_fixed @ 14043 NONAME
-	?setStyleName@QFont@@QAEXABVQString@@@Z @ 14044 NONAME ; void QFont::setStyleName(class QString const &)
-	?styleName@QFont@@QBE?AVQString@@XZ @ 14045 NONAME ; class QString QFont::styleName(void) const
-	?styleName@QFontInfo@@QBE?AVQString@@XZ @ 14046 NONAME ; class QString QFontInfo::styleName(void) const
+	?lineHeightType@QTextBlockFormat@@QBEHXZ @ 13733 NONAME ; int QTextBlockFormat::lineHeightType(void) const
+	?hintingPreference@QFont@@QBE?AW4HintingPreference@1@XZ @ 13734 NONAME ; enum QFont::HintingPreference QFont::hintingPreference(void) const
+	?qt_static_metacall@QDockWidgetLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13735 NONAME ; void QDockWidgetLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?trUtf8@QInternalMimeData@@SA?AVQString@@PBD0H@Z @ 13736 NONAME ; class QString QInternalMimeData::trUtf8(char const *, char const *, int)
+	?cloneWithSize@QFontEngine@@UBEPAV1@M@Z @ 13737 NONAME ; class QFontEngine * QFontEngine::cloneWithSize(float) const
+	?begin@QBlitterPaintEngine@@UAE_NPAVQPaintDevice@@@Z @ 13738 NONAME ; bool QBlitterPaintEngine::begin(class QPaintDevice *)
+	?storeExpanded@QTreeViewPrivate@@QAE_NABVQPersistentModelIndex@@@Z @ 13739 NONAME ; bool QTreeViewPrivate::storeExpanded(class QPersistentModelIndex const &)
+	?staticMetaObjectExtraData@QPixmapFilter@@0UQMetaObjectExtraData@@B @ 13740 NONAME ; struct QMetaObjectExtraData const QPixmapFilter::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QTapGesture@@0UQMetaObjectExtraData@@B @ 13741 NONAME ; struct QMetaObjectExtraData const QTapGesture::staticMetaObjectExtraData
+	?inFontUcs4@QFontMetricsF@@QBE_NI@Z @ 13742 NONAME ; bool QFontMetricsF::inFontUcs4(unsigned int) const
+	?styleName@QFont@@QBE?AVQString@@XZ @ 13743 NONAME ; class QString QFont::styleName(void) const
+	?staticMetaObjectExtraData@QTextControl@@0UQMetaObjectExtraData@@B @ 13744 NONAME ; struct QMetaObjectExtraData const QTextControl::staticMetaObjectExtraData
+	?qt_static_metacall@QScrollBar@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13745 NONAME ; void QScrollBar::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QStackedWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13746 NONAME ; void QStackedWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?markRasterOverlay@QBlittablePixmapData@@QAEXABVQRectF@@@Z @ 13747 NONAME ; void QBlittablePixmapData::markRasterOverlay(class QRectF const &)
+	?d_func@QBlitterPaintEngine@@AAEPAVQBlitterPaintEnginePrivate@@XZ @ 13748 NONAME ; class QBlitterPaintEnginePrivate * QBlitterPaintEngine::d_func(void)
+	?setNumberPrefix@QTextListFormat@@QAEXABVQString@@@Z @ 13749 NONAME ; void QTextListFormat::setNumberPrefix(class QString const &)
+	?qt_static_metacall@QAbstractSpinBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13750 NONAME ; void QAbstractSpinBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?lineHeight@QTextBlockFormat@@QBEMMM@Z @ 13751 NONAME ; float QTextBlockFormat::lineHeight(float, float) const
+	??0QIdentityProxyModel@@IAE@AAVQIdentityProxyModelPrivate@@PAVQObject@@@Z @ 13752 NONAME ; QIdentityProxyModel::QIdentityProxyModel(class QIdentityProxyModelPrivate &, class QObject *)
+	?staticMetaObjectExtraData@QGraphicsEffect@@0UQMetaObjectExtraData@@B @ 13753 NONAME ; struct QMetaObjectExtraData const QGraphicsEffect::staticMetaObjectExtraData
+	?qt_static_metacall@QMovie@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13754 NONAME ; void QMovie::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QToolBar@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13755 NONAME ; void QToolBar::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?getItem@QInputDialog@@SA?AVQString@@PAVQWidget@@ABV2@1ABVQStringList@@H_NPA_NV?$QFlags@W4WindowType@Qt@@@@V?$QFlags@W4InputMethodHint@Qt@@@@@Z @ 13756 NONAME ; class QString QInputDialog::getItem(class QWidget *, class QString const &, class QString const &, class QStringList const &, int, bool, bool *, class QFlags<enum Qt::WindowType>, class QFlags<enum Qt::InputMethodHint>)
+	?staticMetaObjectExtraData@QItemDelegate@@0UQMetaObjectExtraData@@B @ 13757 NONAME ; struct QMetaObjectExtraData const QItemDelegate::staticMetaObjectExtraData
+	?qt_static_metacall@QFileSystemModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13758 NONAME ; void QFileSystemModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?hasFeature@QWindowSurface@@QBE_NW4WindowSurfaceFeature@1@@Z @ 13759 NONAME ; bool QWindowSurface::hasFeature(enum QWindowSurface::WindowSurfaceFeature) const
+	?qGamma_correct_back_to_linear_cs@@YAXPAVQImage@@@Z @ 13760 NONAME ; void qGamma_correct_back_to_linear_cs(class QImage *)
+	?qt_static_metacall@QBoxLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13761 NONAME ; void QBoxLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QInputContext@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13762 NONAME ; void QInputContext::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QColumnView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13763 NONAME ; void QColumnView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?cursorMoveStyle@QLineEdit@@QBE?AW4CursorMoveStyle@Qt@@XZ @ 13764 NONAME ; enum Qt::CursorMoveStyle QLineEdit::cursorMoveStyle(void) const
+	?clip@QBlitterPaintEngine@@UAEXABVQVectorPath@@W4ClipOperation@Qt@@@Z @ 13765 NONAME ; void QBlitterPaintEngine::clip(class QVectorPath const &, enum Qt::ClipOperation)
+	?qt_static_metacall@QSizeGrip@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13766 NONAME ; void QSizeGrip::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QFileDialog@@0UQMetaObjectExtraData@@B @ 13767 NONAME ; struct QMetaObjectExtraData const QFileDialog::staticMetaObjectExtraData
+	?qt_static_metacall@QCalendarWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13768 NONAME ; void QCalendarWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?hasVisibleChildren@QTreeViewPrivate@@QBE_NABVQModelIndex@@@Z @ 13769 NONAME ; bool QTreeViewPrivate::hasVisibleChildren(class QModelIndex const &) const
+	?canReadData@QInternalMimeData@@SA_NABVQString@@@Z @ 13770 NONAME ; bool QInternalMimeData::canReadData(class QString const &)
+	?staticMetaObjectExtraData@QSwipeGesture@@0UQMetaObjectExtraData@@B @ 13771 NONAME ; struct QMetaObjectExtraData const QSwipeGesture::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QProxyStyle@@0UQMetaObjectExtraData@@B @ 13772 NONAME ; struct QMetaObjectExtraData const QProxyStyle::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QMessageBox@@0UQMetaObjectExtraData@@B @ 13773 NONAME ; struct QMetaObjectExtraData const QMessageBox::staticMetaObjectExtraData
+	?qt_static_metacall@QStatusBar@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13774 NONAME ; void QStatusBar::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QDataWidgetMapper@@0UQMetaObjectExtraData@@B @ 13775 NONAME ; struct QMetaObjectExtraData const QDataWidgetMapper::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QPlainTextDocumentLayout@@0UQMetaObjectExtraData@@B @ 13776 NONAME ; struct QMetaObjectExtraData const QPlainTextDocumentLayout::staticMetaObjectExtraData
+	?qt_static_metacall@QProxyStyle@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13777 NONAME ; void QProxyStyle::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QAbstractTextDocumentLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13778 NONAME ; void QAbstractTextDocumentLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QDockWidgetLayout@@0UQMetaObjectExtraData@@B @ 13779 NONAME ; struct QMetaObjectExtraData const QDockWidgetLayout::staticMetaObjectExtraData
+	?qt_static_metacall@QIconEnginePluginV2@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13780 NONAME ; void QIconEnginePluginV2::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QRegExpValidator@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13781 NONAME ; void QRegExpValidator::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?lineNumberForTextPosition@QTextEngine@@QAEHH@Z @ 13782 NONAME ; int QTextEngine::lineNumberForTextPosition(int)
+	?staticMetaObjectExtraData@QDoubleValidator@@0UQMetaObjectExtraData@@B @ 13783 NONAME ; struct QMetaObjectExtraData const QDoubleValidator::staticMetaObjectExtraData
+	?qt_static_metacall@QCommonStyle@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13784 NONAME ; void QCommonStyle::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QTextList@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13785 NONAME ; void QTextList::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?beginningOfLine@QTextEngine@@AAEHH@Z @ 13786 NONAME ; int QTextEngine::beginningOfLine(int)
+	?qt_static_metacall@QDockWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13787 NONAME ; void QDockWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QAbstractProxyModel@@0UQMetaObjectExtraData@@B @ 13788 NONAME ; struct QMetaObjectExtraData const QAbstractProxyModel::staticMetaObjectExtraData
+	?alphaMapForGlyph@QFontEngine@@UAE?AVQImage@@IUQFixed@@ABVQTransform@@@Z @ 13789 NONAME ; class QImage QFontEngine::alphaMapForGlyph(unsigned int, struct QFixed, class QTransform const &)
+	?staticMetaObjectExtraData@QUndoStack@@0UQMetaObjectExtraData@@B @ 13790 NONAME ; struct QMetaObjectExtraData const QUndoStack::staticMetaObjectExtraData
+	?itemAtCoordinate@QTreeViewPrivate@@QBEHH@Z @ 13791 NONAME ; int QTreeViewPrivate::itemAtCoordinate(int) const
+	?renderTreeToPixmapForAnimation@QTreeViewPrivate@@QBE?AVQPixmap@@ABVQRect@@@Z @ 13792 NONAME ; class QPixmap QTreeViewPrivate::renderTreeToPixmapForAnimation(class QRect const &) const
+	?qt_static_metacall@QErrorMessage@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13793 NONAME ; void QErrorMessage::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?fromImage@QBlittablePixmapData@@UAEXABVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 13794 NONAME ; void QBlittablePixmapData::fromImage(class QImage const &, class QFlags<enum Qt::ImageConversionFlag>)
+	??0QInternalMimeData@@QAE@XZ @ 13795 NONAME ; QInternalMimeData::QInternalMimeData(void)
+	?prepareAnimatedOperation@QTreeViewPrivate@@QAEXHW4Direction@QAbstractAnimation@@@Z @ 13796 NONAME ; void QTreeViewPrivate::prepareAnimatedOperation(int, enum QAbstractAnimation::Direction)
+	?features@QRasterWindowSurface@@UBE?AV?$QFlags@W4WindowSurfaceFeature@QWindowSurface@@@@XZ @ 13797 NONAME ; class QFlags<enum QWindowSurface::WindowSurfaceFeature> QRasterWindowSurface::features(void) const
+	?qt_static_metacall@QActionGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13798 NONAME ; void QActionGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?_q_endAnimatedOperation@QTreeViewPrivate@@QAEXXZ @ 13799 NONAME ; void QTreeViewPrivate::_q_endAnimatedOperation(void)
+	??0QBlittable@@QAE@ABVQSize@@V?$QFlags@W4Capability@QBlittable@@@@@Z @ 13800 NONAME ; QBlittable::QBlittable(class QSize const &, class QFlags<enum QBlittable::Capability>)
+	?qt_static_metacall@QDataWidgetMapper@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13801 NONAME ; void QDataWidgetMapper::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QGraphicsSystemPlugin@@0UQMetaObjectExtraData@@B @ 13802 NONAME ; struct QMetaObjectExtraData const QGraphicsSystemPlugin::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QCommonStyle@@0UQMetaObjectExtraData@@B @ 13803 NONAME ; struct QMetaObjectExtraData const QCommonStyle::staticMetaObjectExtraData
+	?qt_static_metacall@QWizard@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13804 NONAME ; void QWizard::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QIdentityProxyModel@@QAE@PAVQObject@@@Z @ 13805 NONAME ; QIdentityProxyModel::QIdentityProxyModel(class QObject *)
+	?staticMetaObjectExtraData@QTreeView@@0UQMetaObjectExtraData@@B @ 13806 NONAME ; struct QMetaObjectExtraData const QTreeView::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QDateEdit@@0UQMetaObjectExtraData@@B @ 13807 NONAME ; struct QMetaObjectExtraData const QDateEdit::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QGesture@@0UQMetaObjectExtraData@@B @ 13808 NONAME ; struct QMetaObjectExtraData const QGesture::staticMetaObjectExtraData
+	?qt_static_metacall@QGraphicsProxyWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13809 NONAME ; void QGraphicsProxyWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?markRasterOverlay@QBlittablePixmapData@@QAEXPBVQRect@@H@Z @ 13810 NONAME ; void QBlittablePixmapData::markRasterOverlay(class QRect const *, int)
+	?rightCursorPosition@QTextLayout@@QBEHH@Z @ 13811 NONAME ; int QTextLayout::rightCursorPosition(int) const
+	?tabsClosable@QMdiArea@@QBE_NXZ @ 13812 NONAME ; bool QMdiArea::tabsClosable(void) const
+	?startAndEndColumns@QTreeViewPrivate@@QBE?AU?$QPair@HH@@ABVQRect@@@Z @ 13813 NONAME ; struct QPair<int, int> QTreeViewPrivate::startAndEndColumns(class QRect const &) const
+	?staticMetaObjectExtraData@QTextFrame@@0UQMetaObjectExtraData@@B @ 13814 NONAME ; struct QMetaObjectExtraData const QTextFrame::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QAbstractScrollArea@@0UQMetaObjectExtraData@@B @ 13815 NONAME ; struct QMetaObjectExtraData const QAbstractScrollArea::staticMetaObjectExtraData
+	?setLineHeight@QTextBlockFormat@@QAEXMH@Z @ 13816 NONAME ; void QTextBlockFormat::setLineHeight(float, int)
+	?staticMetaObjectExtraData@QFormLayout@@0UQMetaObjectExtraData@@B @ 13817 NONAME ; struct QMetaObjectExtraData const QFormLayout::staticMetaObjectExtraData
+	?calculateSubPixelPositionCount@QTextureGlyphCache@@IBEHI@Z @ 13818 NONAME ; int QTextureGlyphCache::calculateSubPixelPositionCount(unsigned int) const
+	?staticMetaObjectExtraData@QStackedWidget@@0UQMetaObjectExtraData@@B @ 13819 NONAME ; struct QMetaObjectExtraData const QStackedWidget::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QDialogButtonBox@@0UQMetaObjectExtraData@@B @ 13820 NONAME ; struct QMetaObjectExtraData const QDialogButtonBox::staticMetaObjectExtraData
+	?setCursorMoveStyle@QLineEdit@@QAEXW4CursorMoveStyle@Qt@@@Z @ 13821 NONAME ; void QLineEdit::setCursorMoveStyle(enum Qt::CursorMoveStyle)
+	?qt_static_metacall@QToolButton@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13822 NONAME ; void QToolButton::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?invalidateHeightCache@QTreeViewPrivate@@QBEXH@Z @ 13823 NONAME ; void QTreeViewPrivate::invalidateHeightCache(int) const
+	?qt_static_metacall@QPanGesture@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13824 NONAME ; void QPanGesture::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?isIndexExpanded@QTreeViewPrivate@@QBE_NABVQModelIndex@@@Z @ 13825 NONAME ; bool QTreeViewPrivate::isIndexExpanded(class QModelIndex const &) const
+	?features@QWindowSurface@@UBE?AV?$QFlags@W4WindowSurfaceFeature@QWindowSurface@@@@XZ @ 13826 NONAME ; class QFlags<enum QWindowSurface::WindowSurfaceFeature> QWindowSurface::features(void) const
+	?layout@QTreeViewPrivate@@QAEXH_N0@Z @ 13827 NONAME ; void QTreeViewPrivate::layout(int, bool, bool)
+	?markRasterOverlay@QBlittablePixmapData@@QAEXABVQVectorPath@@@Z @ 13828 NONAME ; void QBlittablePixmapData::markRasterOverlay(class QVectorPath const &)
+	?alphaMapBoundingBox@QFontEngine@@UAE?AUglyph_metrics_t@@IUQFixed@@ABVQTransform@@W4GlyphFormat@1@@Z @ 13829 NONAME ; struct glyph_metrics_t QFontEngine::alphaMapBoundingBox(unsigned int, struct QFixed, class QTransform const &, enum QFontEngine::GlyphFormat)
+	?qt_static_metacall@QTapGesture@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13830 NONAME ; void QTapGesture::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QIntValidator@@0UQMetaObjectExtraData@@B @ 13831 NONAME ; struct QMetaObjectExtraData const QIntValidator::staticMetaObjectExtraData
+	?qt_static_metacall@QInputDialog@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13832 NONAME ; void QInputDialog::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?clip@QBlitterPaintEngine@@QAEPBVQClipData@@XZ @ 13833 NONAME ; class QClipData const * QBlitterPaintEngine::clip(void)
+	?cancelPasswordEchoTimer@QLineControl@@AAEXXZ @ 13834 NONAME ; void QLineControl::cancelPasswordEchoTimer(void)
+	?qt_static_metacall@QStylePlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13835 NONAME ; void QStylePlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?setNumberSuffix@QTextListFormat@@QAEXABVQString@@@Z @ 13836 NONAME ; void QTextListFormat::setNumberSuffix(class QString const &)
+	?qt_static_metacall@QApplication@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13837 NONAME ; void QApplication::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?swap@QPicture@@QAEXAAV1@@Z @ 13838 NONAME ; void QPicture::swap(class QPicture &)
+	?d_func@QIdentityProxyModel@@ABEPBVQIdentityProxyModelPrivate@@XZ @ 13839 NONAME ; class QIdentityProxyModelPrivate const * QIdentityProxyModel::d_func(void) const
+	?qt_static_metacall@QSplashScreen@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13840 NONAME ; void QSplashScreen::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?swap@QPainterPath@@QAEXAAV1@@Z @ 13841 NONAME ; void QPainterPath::swap(class QPainterPath &)
+	?qt_static_metacall@QFocusFrame@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13842 NONAME ; void QFocusFrame::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?minimumSizeHint@QCheckBox@@UBE?AVQSize@@XZ @ 13843 NONAME ; class QSize QCheckBox::minimumSizeHint(void) const
+	?alphaMapForGlyph@QFontEngine@@UAE?AVQImage@@IUQFixed@@@Z @ 13844 NONAME ; class QImage QFontEngine::alphaMapForGlyph(unsigned int, struct QFixed)
+	?fillTexture@QImageTextureGlyphCache@@UAEXABUCoord@QTextureGlyphCache@@IUQFixed@@@Z @ 13845 NONAME ; void QImageTextureGlyphCache::fillTexture(struct QTextureGlyphCache::Coord const &, unsigned int, struct QFixed)
+	?swap@QIcon@@QAEXAAV1@@Z @ 13846 NONAME ; void QIcon::swap(class QIcon &)
+	?columnCount@QIdentityProxyModel@@UBEHABVQModelIndex@@@Z @ 13847 NONAME ; int QIdentityProxyModel::columnCount(class QModelIndex const &) const
+	?unmarkRasterOverlay@QBlittablePixmapData@@QAEXABVQRectF@@@Z @ 13848 NONAME ; void QBlittablePixmapData::unmarkRasterOverlay(class QRectF const &)
+	?collapse@QTreeViewPrivate@@QAEXH_N@Z @ 13849 NONAME ; void QTreeViewPrivate::collapse(int, bool)
+	?trUtf8@QIdentityProxyModel@@SA?AVQString@@PBD0H@Z @ 13850 NONAME ; class QString QIdentityProxyModel::trUtf8(char const *, char const *, int)
+	?brushOriginChanged@QBlitterPaintEngine@@UAEXXZ @ 13851 NONAME ; void QBlitterPaintEngine::brushOriginChanged(void)
+	?openFile@QFileOpenEvent@@QBE_NAAVQFile@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@@Z @ 13852 NONAME ; bool QFileOpenEvent::openFile(class QFile &, class QFlags<enum QIODevice::OpenModeFlag>) const
+	??0QApplicationPrivate@@QAE@AAHPAPADW4Type@QApplication@@H@Z @ 13853 NONAME ; QApplicationPrivate::QApplicationPrivate(int &, char * *, enum QApplication::Type, int)
+	?qt_static_metacall@QSound@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13854 NONAME ; void QSound::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QToolBox@@0UQMetaObjectExtraData@@B @ 13855 NONAME ; struct QMetaObjectExtraData const QToolBox::staticMetaObjectExtraData
+	?addDirectory@QZipWriter@@QAEXABVQString@@@Z @ 13856 NONAME ; void QZipWriter::addDirectory(class QString const &)
+	?modelIndex@QTreeViewPrivate@@QBE?AVQModelIndex@@HH@Z @ 13857 NONAME ; class QModelIndex QTreeViewPrivate::modelIndex(int, int) const
+	?staticMetaObjectExtraData@QGraphicsOpacityEffect@@0UQMetaObjectExtraData@@B @ 13858 NONAME ; struct QMetaObjectExtraData const QGraphicsOpacityEffect::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QGraphicsColorizeEffect@@0UQMetaObjectExtraData@@B @ 13859 NONAME ; struct QMetaObjectExtraData const QGraphicsColorizeEffect::staticMetaObjectExtraData
+	?inFontUcs4@QFontMetrics@@QBE_NI@Z @ 13860 NONAME ; bool QFontMetrics::inFontUcs4(unsigned int) const
+	?staticMetaObjectExtraData@QIconEnginePlugin@@0UQMetaObjectExtraData@@B @ 13861 NONAME ; struct QMetaObjectExtraData const QIconEnginePlugin::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QFrame@@0UQMetaObjectExtraData@@B @ 13862 NONAME ; struct QMetaObjectExtraData const QFrame::staticMetaObjectExtraData
+	?isWritable@QZipWriter@@QBE_NXZ @ 13863 NONAME ; bool QZipWriter::isWritable(void) const
+	?qt_static_metacall@QValidator@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13864 NONAME ; void QValidator::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QStandardItemModel@@0UQMetaObjectExtraData@@B @ 13865 NONAME ; struct QMetaObjectExtraData const QStandardItemModel::staticMetaObjectExtraData
+	?itemHeight@QTreeViewPrivate@@QBEHH@Z @ 13866 NONAME ; int QTreeViewPrivate::itemHeight(int) const
+	?qt_static_metacall@QDrag@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13867 NONAME ; void QDrag::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QFontComboBox@@0UQMetaObjectExtraData@@B @ 13868 NONAME ; struct QMetaObjectExtraData const QFontComboBox::staticMetaObjectExtraData
+	?isRowHidden@QTreeViewPrivate@@QBE_NABVQModelIndex@@@Z @ 13869 NONAME ; bool QTreeViewPrivate::isRowHidden(class QModelIndex const &) const
+	?staticMetaObjectExtraData@QInputDialog@@0UQMetaObjectExtraData@@B @ 13870 NONAME ; struct QMetaObjectExtraData const QInputDialog::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QInputContext@@0UQMetaObjectExtraData@@B @ 13871 NONAME ; struct QMetaObjectExtraData const QInputContext::staticMetaObjectExtraData
+	?unlock@QBlittable@@QAEXXZ @ 13872 NONAME ; void QBlittable::unlock(void)
+	?swap@QRegion@@QAEXAAV1@@Z @ 13873 NONAME ; void QRegion::swap(class QRegion &)
+	?staticMetaObjectExtraData@QLCDNumber@@0UQMetaObjectExtraData@@B @ 13874 NONAME ; struct QMetaObjectExtraData const QLCDNumber::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QS60Style@@0UQMetaObjectExtraData@@B @ 13875 NONAME ; struct QMetaObjectExtraData const QS60Style::staticMetaObjectExtraData
+	?qt_static_metacall@QWidgetAction@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13876 NONAME ; void QWidgetAction::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QListView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13877 NONAME ; void QListView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?setItemData@QAbstractProxyModel@@UAE_NABVQModelIndex@@ABV?$QMap@HVQVariant@@@@@Z @ 13878 NONAME ; bool QAbstractProxyModel::setItemData(class QModelIndex const &, class QMap<int, class QVariant> const &)
+	?getStaticMetaObject@QInternalMimeData@@SAABUQMetaObject@@XZ @ 13879 NONAME ; struct QMetaObject const & QInternalMimeData::getStaticMetaObject(void)
+	?swap@QPolygonF@@QAEXAAV1@@Z @ 13880 NONAME ; void QPolygonF::swap(class QPolygonF &)
+	?creationPermissions@QZipWriter@@QBE?AV?$QFlags@W4Permission@QFile@@@@XZ @ 13881 NONAME ; class QFlags<enum QFile::Permission> QZipWriter::creationPermissions(void) const
+	?qt_static_metacall@QDial@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13882 NONAME ; void QDial::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?swap@QPolygon@@QAEXAAV1@@Z @ 13883 NONAME ; void QPolygon::swap(class QPolygon &)
+	?qt_static_metacall@QWorkspace@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13884 NONAME ; void QWorkspace::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QProgressDialog@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13885 NONAME ; void QProgressDialog::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?d_func@QBlitterPaintEngine@@ABEPBVQBlitterPaintEnginePrivate@@XZ @ 13886 NONAME ; class QBlitterPaintEnginePrivate const * QBlitterPaintEngine::d_func(void) const
+	?actionText@QUndoCommand@@QBE?AVQString@@XZ @ 13887 NONAME ; class QString QUndoCommand::actionText(void) const
+	?staticMetaObjectExtraData@QWidgetAction@@0UQMetaObjectExtraData@@B @ 13888 NONAME ; struct QMetaObjectExtraData const QWidgetAction::staticMetaObjectExtraData
+	?qt_static_metacall@QListWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13889 NONAME ; void QListWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?tr@QIdentityProxyModel@@SA?AVQString@@PBD0H@Z @ 13890 NONAME ; class QString QIdentityProxyModel::tr(char const *, char const *, int)
+	?swap@QKeySequence@@QAEXAAV1@@Z @ 13891 NONAME ; void QKeySequence::swap(class QKeySequence &)
+	?staticMetaObjectExtraData@QGraphicsDropShadowEffect@@0UQMetaObjectExtraData@@B @ 13892 NONAME ; struct QMetaObjectExtraData const QGraphicsDropShadowEffect::staticMetaObjectExtraData
+	?qt_static_metacall@QProgressBar@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13893 NONAME ; void QProgressBar::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QTextBlockGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13894 NONAME ; void QTextBlockGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?lineHeight@QTextBlockFormat@@QBEMXZ @ 13895 NONAME ; float QTextBlockFormat::lineHeight(void) const
+	?stroke@QBlitterPaintEngine@@UAEXABVQVectorPath@@ABVQPen@@@Z @ 13896 NONAME ; void QBlitterPaintEngine::stroke(class QVectorPath const &, class QPen const &)
+	?qt_static_metacall@QWizardPage@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13897 NONAME ; void QWizardPage::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?_q_sortIndicatorChanged@QTreeViewPrivate@@QAEXHW4SortOrder@Qt@@@Z @ 13898 NONAME ; void QTreeViewPrivate::_q_sortIndicatorChanged(int, enum Qt::SortOrder)
+	?staticMetaObjectExtraData@QToolButton@@0UQMetaObjectExtraData@@B @ 13899 NONAME ; struct QMetaObjectExtraData const QToolButton::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QSyntaxHighlighter@@0UQMetaObjectExtraData@@B @ 13900 NONAME ; struct QMetaObjectExtraData const QSyntaxHighlighter::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QHeaderView@@0UQMetaObjectExtraData@@B @ 13901 NONAME ; struct QMetaObjectExtraData const QHeaderView::staticMetaObjectExtraData
+	?tr@QInternalMimeData@@SA?AVQString@@PBD0@Z @ 13902 NONAME ; class QString QInternalMimeData::tr(char const *, char const *)
+	?mapFromSource@QIdentityProxyModel@@UBE?AVQModelIndex@@ABV2@@Z @ 13903 NONAME ; class QModelIndex QIdentityProxyModel::mapFromSource(class QModelIndex const &) const
+	??1QBlittable@@UAE@XZ @ 13904 NONAME ; QBlittable::~QBlittable(void)
+	??_EQBlitterPaintEngine@@UAE@I@Z @ 13905 NONAME ; QBlitterPaintEngine::~QBlitterPaintEngine(unsigned int)
+	?staticMetaObjectExtraData@QInternalMimeData@@0UQMetaObjectExtraData@@B @ 13906 NONAME ; struct QMetaObjectExtraData const QInternalMimeData::staticMetaObjectExtraData
+	?buffer@QBlittablePixmapData@@UAEPAVQImage@@XZ @ 13907 NONAME ; class QImage * QBlittablePixmapData::buffer(void)
+	?staticMetaObjectExtraData@QComboBox@@0UQMetaObjectExtraData@@B @ 13908 NONAME ; struct QMetaObjectExtraData const QComboBox::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QWorkspace@@0UQMetaObjectExtraData@@B @ 13909 NONAME ; struct QMetaObjectExtraData const QWorkspace::staticMetaObjectExtraData
+	?nextLogicalPosition@QTextEngine@@QBEHH@Z @ 13910 NONAME ; int QTextEngine::nextLogicalPosition(int) const
+	?qt_static_metacall@QGraphicsEffect@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13911 NONAME ; void QGraphicsEffect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QUndoGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13912 NONAME ; void QUndoGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QProgressBar@@0UQMetaObjectExtraData@@B @ 13913 NONAME ; struct QMetaObjectExtraData const QProgressBar::staticMetaObjectExtraData
+	?qt_static_metacall@QLineEdit@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13914 NONAME ; void QLineEdit::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?drawStaticTextItem@QBlitterPaintEngine@@UAEXPAVQStaticTextItem@@@Z @ 13915 NONAME ; void QBlitterPaintEngine::drawStaticTextItem(class QStaticTextItem *)
+	?pageDown@QTreeViewPrivate@@QBEHH@Z @ 13916 NONAME ; int QTreeViewPrivate::pageDown(int) const
+	?lock@QBlittable@@QAEPAVQImage@@XZ @ 13917 NONAME ; class QImage * QBlittable::lock(void)
+	?setFontHintingPreference@QTextCharFormat@@QAEXW4HintingPreference@QFont@@@Z @ 13918 NONAME ; void QTextCharFormat::setFontHintingPreference(enum QFont::HintingPreference)
+	?qt_static_metacall@QPixmapColorizeFilter@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13919 NONAME ; void QPixmapColorizeFilter::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QGuiPlatformPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13920 NONAME ; void QGuiPlatformPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QSplitterHandle@@0UQMetaObjectExtraData@@B @ 13921 NONAME ; struct QMetaObjectExtraData const QSplitterHandle::staticMetaObjectExtraData
+	?qt_static_metacall@QButtonGroup@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13922 NONAME ; void QButtonGroup::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QCalendarWidget@@0UQMetaObjectExtraData@@B @ 13923 NONAME ; struct QMetaObjectExtraData const QCalendarWidget::staticMetaObjectExtraData
+	?qt_static_metacall@QTreeWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13924 NONAME ; void QTreeWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?doItemsLayout@QTableView@@UAEXXZ @ 13925 NONAME ; void QTableView::doItemsLayout(void)
+	??_EQInternalMimeData@@UAE@I@Z @ 13926 NONAME ; QInternalMimeData::~QInternalMimeData(unsigned int)
+	?staticMetaObjectExtraData@QMouseEventTransition@@0UQMetaObjectExtraData@@B @ 13927 NONAME ; struct QMetaObjectExtraData const QMouseEventTransition::staticMetaObjectExtraData
+	?qt_static_metacall@QIconEnginePlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13928 NONAME ; void QIconEnginePlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?_q_modelAboutToBeReset@QTreeViewPrivate@@QAEXXZ @ 13929 NONAME ; void QTreeViewPrivate::_q_modelAboutToBeReset(void)
+	?qt_static_metacall@QDialogButtonBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13930 NONAME ; void QDialogButtonBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?markRasterOverlay@QBlittablePixmapData@@QAEXABVQPointF@@ABVQTextItem@@@Z @ 13931 NONAME ; void QBlittablePixmapData::markRasterOverlay(class QPointF const &, class QTextItem const &)
+	?qt_static_metacall@QPlainTextDocumentLayout@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13932 NONAME ; void QPlainTextDocumentLayout::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QLabel@@0UQMetaObjectExtraData@@B @ 13933 NONAME ; struct QMetaObjectExtraData const QLabel::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QCompleter@@0UQMetaObjectExtraData@@B @ 13934 NONAME ; struct QMetaObjectExtraData const QCompleter::staticMetaObjectExtraData
+	?qt_static_metacall@QDateEdit@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13935 NONAME ; void QDateEdit::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?drawEllipse@QBlitterPaintEngine@@UAEXABVQRectF@@@Z @ 13936 NONAME ; void QBlitterPaintEngine::drawEllipse(class QRectF const &)
+	?styleName@QFontInfo@@QBE?AVQString@@XZ @ 13937 NONAME ; class QString QFontInfo::styleName(void) const
+	?staticMetaObjectExtraData@QTimeEdit@@0UQMetaObjectExtraData@@B @ 13938 NONAME ; struct QMetaObjectExtraData const QTimeEdit::staticMetaObjectExtraData
+	?itemDecorationAt@QTreeViewPrivate@@QBEHABVQPoint@@@Z @ 13939 NONAME ; int QTreeViewPrivate::itemDecorationAt(class QPoint const &) const
+	?blittable@QBlittablePixmapData@@QBEPAVQBlittable@@XZ @ 13940 NONAME ; class QBlittable * QBlittablePixmapData::blittable(void) const
+	?setFocalRadius@QRadialGradient@@QAEXM@Z @ 13941 NONAME ; void QRadialGradient::setFocalRadius(float)
+	?qt_painterPathFromVectorPath@@YA?AVQPainterPath@@ABVQVectorPath@@@Z @ 13942 NONAME ; class QPainterPath qt_painterPathFromVectorPath(class QVectorPath const &)
+	?staticMetaObjectExtraData@QAction@@0UQMetaObjectExtraData@@B @ 13943 NONAME ; struct QMetaObjectExtraData const QAction::staticMetaObjectExtraData
+	?resizeCache@QTextureGlyphCache@@QAEXHH@Z @ 13944 NONAME ; void QTextureGlyphCache::resizeCache(int, int)
+	?qt_static_metacall@QHeaderView@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13945 NONAME ; void QHeaderView::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QGraphicsProxyWidget@@0UQMetaObjectExtraData@@B @ 13946 NONAME ; struct QMetaObjectExtraData const QGraphicsProxyWidget::staticMetaObjectExtraData
+	?metaObject@QInternalMimeData@@UBEPBUQMetaObject@@XZ @ 13947 NONAME ; struct QMetaObject const * QInternalMimeData::metaObject(void) const
+	?addSymLink@QZipWriter@@QAEXABVQString@@0@Z @ 13948 NONAME ; void QZipWriter::addSymLink(class QString const &, class QString const &)
+	?drawStaticTextItem@QPaintEngineEx@@UAEXPAVQStaticTextItem@@@Z @ 13949 NONAME ; void QPaintEngineEx::drawStaticTextItem(class QStaticTextItem *)
+	?tr@QIdentityProxyModel@@SA?AVQString@@PBD0@Z @ 13950 NONAME ; class QString QIdentityProxyModel::tr(char const *, char const *)
+	?qt_static_metacall@QFileDialog@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13951 NONAME ; void QFileDialog::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QInternalMimeData@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13952 NONAME ; void QInternalMimeData::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QGesture@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13953 NONAME ; void QGesture::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?hasFormatHelper@QInternalMimeData@@SA_NABVQString@@PBVQMimeData@@@Z @ 13954 NONAME ; bool QInternalMimeData::hasFormatHelper(class QString const &, class QMimeData const *)
+	?state@QBlitterPaintEngine@@QAEPAVQPainterState@@XZ @ 13955 NONAME ; class QPainterState * QBlitterPaintEngine::state(void)
+	?penChanged@QBlitterPaintEngine@@UAEXXZ @ 13956 NONAME ; void QBlitterPaintEngine::penChanged(void)
+	??0QFileOpenEvent@@QAE@ABVRFile@@@Z @ 13957 NONAME ; QFileOpenEvent::QFileOpenEvent(class RFile const &)
+	?staticMetaObjectExtraData@QStackedLayout@@0UQMetaObjectExtraData@@B @ 13958 NONAME ; struct QMetaObjectExtraData const QStackedLayout::staticMetaObjectExtraData
+	?match@QIdentityProxyModel@@UBE?AV?$QList@VQModelIndex@@@@ABVQModelIndex@@HABVQVariant@@HV?$QFlags@W4MatchFlag@Qt@@@@@Z @ 13959 NONAME ; class QList<class QModelIndex> QIdentityProxyModel::match(class QModelIndex const &, int, class QVariant const &, int, class QFlags<enum Qt::MatchFlag>) const
+	?cursorMoveStyle@QLineControl@@QBE?AW4CursorMoveStyle@Qt@@XZ @ 13960 NONAME ; enum Qt::CursorMoveStyle QLineControl::cursorMoveStyle(void) const
+	?hasHeightForWidth@QWidgetPrivate@@UBE_NXZ @ 13961 NONAME ; bool QWidgetPrivate::hasHeightForWidth(void) const
+	?qt_static_metacall@QMessageBox@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13962 NONAME ; void QMessageBox::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QSortFilterProxyModel@@0UQMetaObjectExtraData@@B @ 13963 NONAME ; struct QMetaObjectExtraData const QSortFilterProxyModel::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QCommandLinkButton@@0UQMetaObjectExtraData@@B @ 13964 NONAME ; struct QMetaObjectExtraData const QCommandLinkButton::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QWidget@@0UQMetaObjectExtraData@@B @ 13965 NONAME ; struct QMetaObjectExtraData const QWidget::staticMetaObjectExtraData
+	?toImage@QBlittablePixmapData@@UBE?AVQImage@@XZ @ 13966 NONAME ; class QImage QBlittablePixmapData::toImage(void) const
+	??_EQBlittable@@UAE@I@Z @ 13967 NONAME ; QBlittable::~QBlittable(unsigned int)
+	?below@QTreeViewPrivate@@QBEHH@Z @ 13968 NONAME ; int QTreeViewPrivate::below(int) const
+	?staticMetaObject@QIdentityProxyModel@@2UQMetaObject@@B @ 13969 NONAME ; struct QMetaObject const QIdentityProxyModel::staticMetaObject
+	?rowCount@QIdentityProxyModel@@UBEHABVQModelIndex@@@Z @ 13970 NONAME ; int QIdentityProxyModel::rowCount(class QModelIndex const &) const
+	?trUtf8@QIdentityProxyModel@@SA?AVQString@@PBD0@Z @ 13971 NONAME ; class QString QIdentityProxyModel::trUtf8(char const *, char const *)
+	?qt_static_metacall@QRadioButton@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13972 NONAME ; void QRadioButton::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??1QInternalMimeData@@UAE@XZ @ 13973 NONAME ; QInternalMimeData::~QInternalMimeData(void)
+	?_q_columnsAboutToBeRemoved@QTreeViewPrivate@@UAEXABVQModelIndex@@HH@Z @ 13974 NONAME ; void QTreeViewPrivate::_q_columnsAboutToBeRemoved(class QModelIndex const &, int, int)
+	?qt_addBitmapToPath@@YAXMMPBEHHHPAVQPainterPath@@@Z @ 13975 NONAME ; void qt_addBitmapToPath(float, float, unsigned char const *, int, int, int, class QPainterPath *)
+	?qt_static_metacall@QTextTable@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13976 NONAME ; void QTextTable::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QItemSelectionModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13977 NONAME ; void QItemSelectionModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObject@QInternalMimeData@@2UQMetaObject@@B @ 13978 NONAME ; struct QMetaObject const QInternalMimeData::staticMetaObject
+	?staticMetaObjectExtraData@QGraphicsTransform@@0UQMetaObjectExtraData@@B @ 13979 NONAME ; struct QMetaObjectExtraData const QGraphicsTransform::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QAbstractTextDocumentLayout@@0UQMetaObjectExtraData@@B @ 13980 NONAME ; struct QMetaObjectExtraData const QAbstractTextDocumentLayout::staticMetaObjectExtraData
+	?qt_static_metacall@QGraphicsWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13981 NONAME ; void QGraphicsWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QShortcut@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 13982 NONAME ; void QShortcut::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?endOfLine@QTextEngine@@AAEHH@Z @ 13983 NONAME ; int QTextEngine::endOfLine(int)
+	?queryKeyboardModifiers@QApplication@@SA?AV?$QFlags@W4KeyboardModifier@Qt@@@@XZ @ 13984 NONAME ; class QFlags<enum Qt::KeyboardModifier> QApplication::queryKeyboardModifiers(void)
 
diff --git a/src/s60installs/bwins/QtMultimediau.def b/src/s60installs/bwins/QtMultimediau.def
index b4ca8b5..f46f363 100644
--- a/src/s60installs/bwins/QtMultimediau.def
+++ b/src/s60installs/bwins/QtMultimediau.def
@@ -274,18 +274,23 @@ EXPORTS
 	?sampleRate@QAudioFormat@@QBEHXZ @ 273 NONAME ; int QAudioFormat::sampleRate(void) const
 	?supportedSampleRates@QAudioDeviceInfo@@QBE?AV?$QList@H@@XZ @ 274 NONAME ; class QList<int> QAudioDeviceInfo::supportedSampleRates(void) const
 	?setChannelCount@QAudioFormat@@QAEXH@Z @ 275 NONAME ; void QAudioFormat::setChannelCount(int)
-	?staticMetaObjectExtraData@QAudioOutput@@0UQMetaObjectExtraData@@B @ 276 NONAME ; struct QMetaObjectExtraData const QAudioOutput::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QAbstractAudioInput@@0UQMetaObjectExtraData@@B @ 277 NONAME ; struct QMetaObjectExtraData const QAbstractAudioInput::staticMetaObjectExtraData
-	?qt_static_metacall@QAbstractAudioOutput@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 278 NONAME ; void QAbstractAudioOutput::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAudioInput@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 279 NONAME ; void QAudioInput::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAudioOutput@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 280 NONAME ; void QAudioOutput::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QAbstractAudioInput@@QAE@XZ @ 276 NONAME ABSENT ; QAbstractAudioInput::QAbstractAudioInput(void)
+	??0QAudioEngineFactoryInterface@@QAE@XZ @ 277 NONAME ABSENT ; QAudioEngineFactoryInterface::QAudioEngineFactoryInterface(void)
+	??0QAbstractAudioDeviceInfo@@QAE@XZ @ 278 NONAME ABSENT ; QAbstractAudioDeviceInfo::QAbstractAudioDeviceInfo(void)
+	??0QAbstractAudioOutput@@QAE@XZ @ 279 NONAME ABSENT ; QAbstractAudioOutput::QAbstractAudioOutput(void)
+	??_EQAudioDeviceInfo@@QAE@I@Z @ 280 NONAME ABSENT ; QAudioDeviceInfo::~QAudioDeviceInfo(unsigned int)
 	?staticMetaObjectExtraData@QAbstractAudioDeviceInfo@@0UQMetaObjectExtraData@@B @ 281 NONAME ; struct QMetaObjectExtraData const QAbstractAudioDeviceInfo::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QAudioInput@@0UQMetaObjectExtraData@@B @ 282 NONAME ; struct QMetaObjectExtraData const QAudioInput::staticMetaObjectExtraData
-	?qt_static_metacall@QAbstractVideoSurface@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 283 NONAME ; void QAbstractVideoSurface::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAudioEnginePlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 284 NONAME ; void QAudioEnginePlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QAbstractVideoSurface@@0UQMetaObjectExtraData@@B @ 285 NONAME ; struct QMetaObjectExtraData const QAbstractVideoSurface::staticMetaObjectExtraData
-	?qt_static_metacall@QAbstractAudioDeviceInfo@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 286 NONAME ; void QAbstractAudioDeviceInfo::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QAbstractAudioOutput@@0UQMetaObjectExtraData@@B @ 287 NONAME ; struct QMetaObjectExtraData const QAbstractAudioOutput::staticMetaObjectExtraData
-	?qt_static_metacall@QAbstractAudioInput@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 288 NONAME ; void QAbstractAudioInput::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QAudioEnginePlugin@@0UQMetaObjectExtraData@@B @ 289 NONAME ; struct QMetaObjectExtraData const QAudioEnginePlugin::staticMetaObjectExtraData
+	?qt_static_metacall@QAbstractAudioOutput@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 282 NONAME ; void QAbstractAudioOutput::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QAbstractVideoSurface@@0UQMetaObjectExtraData@@B @ 283 NONAME ; struct QMetaObjectExtraData const QAbstractVideoSurface::staticMetaObjectExtraData
+	?qt_static_metacall@QAudioOutput@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 284 NONAME ; void QAudioOutput::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QAudioInput@@0UQMetaObjectExtraData@@B @ 285 NONAME ; struct QMetaObjectExtraData const QAudioInput::staticMetaObjectExtraData
+	?qt_static_metacall@QAudioInput@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 286 NONAME ; void QAudioInput::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QAbstractAudioInput@@0UQMetaObjectExtraData@@B @ 287 NONAME ; struct QMetaObjectExtraData const QAbstractAudioInput::staticMetaObjectExtraData
+	?qt_static_metacall@QAudioEnginePlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 288 NONAME ; void QAudioEnginePlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QAbstractVideoSurface@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 289 NONAME ; void QAbstractVideoSurface::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QAudioOutput@@0UQMetaObjectExtraData@@B @ 290 NONAME ; struct QMetaObjectExtraData const QAudioOutput::staticMetaObjectExtraData
+	?qt_static_metacall@QAbstractAudioInput@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 291 NONAME ; void QAbstractAudioInput::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QAbstractAudioOutput@@0UQMetaObjectExtraData@@B @ 292 NONAME ; struct QMetaObjectExtraData const QAbstractAudioOutput::staticMetaObjectExtraData
+	?qt_static_metacall@QAbstractAudioDeviceInfo@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 293 NONAME ; void QAbstractAudioDeviceInfo::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QAudioEnginePlugin@@0UQMetaObjectExtraData@@B @ 294 NONAME ; struct QMetaObjectExtraData const QAudioEnginePlugin::staticMetaObjectExtraData
 
diff --git a/src/s60installs/bwins/QtNetworku.def b/src/s60installs/bwins/QtNetworku.def
index 5d0df03..2f8a7de 100644
--- a/src/s60installs/bwins/QtNetworku.def
+++ b/src/s60installs/bwins/QtNetworku.def
@@ -1145,103 +1145,117 @@ EXPORTS
 	?setNetworkAccessible@QNetworkAccessManager@@QAEXW4NetworkAccessibility@1@@Z @ 1144 NONAME ; void QNetworkAccessManager::setNetworkAccessible(enum QNetworkAccessManager::NetworkAccessibility)
 	??_EQBearerEngineFactoryInterface@@UAE@I@Z @ 1145 NONAME ; QBearerEngineFactoryInterface::~QBearerEngineFactoryInterface(unsigned int)
 	?enablePolling@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1146 NONAME ; void QNetworkConfigurationManagerPrivate::enablePolling(void)
-	?joinMulticastGroup@QUdpSocket@@QAE_NABVQHostAddress@@ABVQNetworkInterface@@@Z @ 1147 NONAME ; bool QUdpSocket::joinMulticastGroup(class QHostAddress const &, class QNetworkInterface const &)
-	?setMulticastInterface@QUdpSocket@@QAEXABVQNetworkInterface@@@Z @ 1148 NONAME ; void QUdpSocket::setMulticastInterface(class QNetworkInterface const &)
-	?setFinished@QNetworkReply@@IAEX_N@Z @ 1149 NONAME ; void QNetworkReply::setFinished(bool)
-	?multicastInterface@QUdpSocket@@QBE?AVQNetworkInterface@@XZ @ 1150 NONAME ; class QNetworkInterface QUdpSocket::multicastInterface(void) const
-	?joinMulticastGroup@QUdpSocket@@QAE_NABVQHostAddress@@@Z @ 1151 NONAME ; bool QUdpSocket::joinMulticastGroup(class QHostAddress const &)
-	?leaveMulticastGroup@QUdpSocket@@QAE_NABVQHostAddress@@ABVQNetworkInterface@@@Z @ 1152 NONAME ; bool QUdpSocket::leaveMulticastGroup(class QHostAddress const &, class QNetworkInterface const &)
-	?leaveMulticastGroup@QUdpSocket@@QAE_NABVQHostAddress@@@Z @ 1153 NONAME ; bool QUdpSocket::leaveMulticastGroup(class QHostAddress const &)
-	?allConfigurations@QNetworkConfigurationManagerPrivate@@QBE?AV?$QList@VQNetworkConfiguration@@@@V?$QFlags@W4StateFlag@QNetworkConfiguration@@@@@Z @ 1154 NONAME ; class QList<class QNetworkConfiguration> QNetworkConfigurationManagerPrivate::allConfigurations(class QFlags<enum QNetworkConfiguration::StateFlag>) const
-	?capabilities@QNetworkConfigurationManagerPrivate@@QBE?AV?$QFlags@W4Capability@QNetworkConfigurationManager@@@@XZ @ 1155 NONAME ; class QFlags<enum QNetworkConfigurationManager::Capability> QNetworkConfigurationManagerPrivate::capabilities(void) const
-	?configurationFromIdentifier@QNetworkConfigurationManagerPrivate@@QBE?AVQNetworkConfiguration@@ABVQString@@@Z @ 1156 NONAME ; class QNetworkConfiguration QNetworkConfigurationManagerPrivate::configurationFromIdentifier(class QString const &) const
-	?defaultConfiguration@QNetworkConfigurationManagerPrivate@@QBE?AVQNetworkConfiguration@@XZ @ 1157 NONAME ; class QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration(void) const
-	?engines@QNetworkConfigurationManagerPrivate@@QBE?AV?$QList@PAVQBearerEngine@@@@XZ @ 1158 NONAME ; class QList<class QBearerEngine *> QNetworkConfigurationManagerPrivate::engines(void) const
-	?isOnline@QNetworkConfigurationManagerPrivate@@QBE_NXZ @ 1159 NONAME ; bool QNetworkConfigurationManagerPrivate::isOnline(void) const
-	?startPolling@QNetworkConfigurationManagerPrivate@@AAEXXZ @ 1160 NONAME ; void QNetworkConfigurationManagerPrivate::startPolling(void)
-	?peerVerifyName@QSslSocket@@QBE?AVQString@@XZ @ 1161 NONAME ; class QString QSslSocket::peerVerifyName(void) const
-	?setPeerVerifyName@QSslSocket@@QAEXABVQString@@@Z @ 1162 NONAME ; void QSslSocket::setPeerVerifyName(class QString const &)
-	?nativeSession@QNetworkSessionPrivate@@SAPAVRConnection@@AAVQNetworkSession@@@Z @ 1163 NONAME ; class RConnection * QNetworkSessionPrivate::nativeSession(class QNetworkSession &)
-	?nativeOpenSocket@QNetworkSessionPrivate@@SAHAAVQNetworkSession@@AAVRSocket@@III@Z @ 1164 NONAME ; int QNetworkSessionPrivate::nativeOpenSocket(class QNetworkSession &, class RSocket &, unsigned int, unsigned int, unsigned int)
-	?nativeOpenHostResolver@QNetworkSessionPrivate@@SAHAAVQNetworkSession@@AAVRHostResolver@@II@Z @ 1165 NONAME ; int QNetworkSessionPrivate::nativeOpenHostResolver(class QNetworkSession &, class RHostResolver &, unsigned int, unsigned int)
-	??_EQHttpMultiPart@@UAE@I@Z @ 1166 NONAME ; QHttpMultiPart::~QHttpMultiPart(unsigned int)
-	??1QHttpPart@@QAE@XZ @ 1167 NONAME ; QHttpPart::~QHttpPart(void)
-	?trUtf8@QHttpMultiPart@@SA?AVQString@@PBD0@Z @ 1168 NONAME ; class QString QHttpMultiPart::trUtf8(char const *, char const *)
-	??0QHttpPart@@QAE@ABV0@@Z @ 1169 NONAME ; QHttpPart::QHttpPart(class QHttpPart const &)
-	?setBody@QHttpPart@@QAEXABVQByteArray@@@Z @ 1170 NONAME ; void QHttpPart::setBody(class QByteArray const &)
-	?trUtf8@QHttpMultiPart@@SA?AVQString@@PBD0H@Z @ 1171 NONAME ; class QString QHttpMultiPart::trUtf8(char const *, char const *, int)
-	?staticMetaObject@QHttpMultiPart@@2UQMetaObject@@B @ 1172 NONAME ; struct QMetaObject const QHttpMultiPart::staticMetaObject
-	??4QHttpPart@@QAEAAV0@ABV0@@Z @ 1173 NONAME ; class QHttpPart & QHttpPart::operator=(class QHttpPart const &)
-	?append@QHttpMultiPart@@QAEXABVQHttpPart@@@Z @ 1174 NONAME ; void QHttpMultiPart::append(class QHttpPart const &)
-	?setContentType@QHttpMultiPart@@QAEXW4ContentType@1@@Z @ 1175 NONAME ; void QHttpMultiPart::setContentType(enum QHttpMultiPart::ContentType)
-	?d_func@QHttpMultiPart@@AAEPAVQHttpMultiPartPrivate@@XZ @ 1176 NONAME ; class QHttpMultiPartPrivate * QHttpMultiPart::d_func(void)
-	??9QHttpPart@@QBE_NABV0@@Z @ 1177 NONAME ; bool QHttpPart::operator!=(class QHttpPart const &) const
-	??0QHttpMultiPart@@QAE@W4ContentType@0@PAVQObject@@@Z @ 1178 NONAME ; QHttpMultiPart::QHttpMultiPart(enum QHttpMultiPart::ContentType, class QObject *)
-	??0QHttpPart@@QAE@XZ @ 1179 NONAME ; QHttpPart::QHttpPart(void)
-	?post@QNetworkAccessManager@@QAEPAVQNetworkReply@@ABVQNetworkRequest@@PAVQHttpMultiPart@@@Z @ 1180 NONAME ; class QNetworkReply * QNetworkAccessManager::post(class QNetworkRequest const &, class QHttpMultiPart *)
-	??0QHttpMultiPart@@QAE@PAVQObject@@@Z @ 1181 NONAME ; QHttpMultiPart::QHttpMultiPart(class QObject *)
-	??8QHttpPart@@QBE_NABV0@@Z @ 1182 NONAME ; bool QHttpPart::operator==(class QHttpPart const &) const
-	?setBodyDevice@QHttpPart@@QAEXPAVQIODevice@@@Z @ 1183 NONAME ; void QHttpPart::setBodyDevice(class QIODevice *)
-	?getStaticMetaObject@QHttpMultiPart@@SAABUQMetaObject@@XZ @ 1184 NONAME ; struct QMetaObject const & QHttpMultiPart::getStaticMetaObject(void)
-	?qt_metacast@QHttpMultiPart@@UAEPAXPBD@Z @ 1185 NONAME ; void * QHttpMultiPart::qt_metacast(char const *)
-	?put@QNetworkAccessManager@@QAEPAVQNetworkReply@@ABVQNetworkRequest@@PAVQHttpMultiPart@@@Z @ 1186 NONAME ; class QNetworkReply * QNetworkAccessManager::put(class QNetworkRequest const &, class QHttpMultiPart *)
-	?tr@QHttpMultiPart@@SA?AVQString@@PBD0@Z @ 1187 NONAME ; class QString QHttpMultiPart::tr(char const *, char const *)
-	?qt_metacall@QHttpMultiPart@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1188 NONAME ; int QHttpMultiPart::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?boundary@QHttpMultiPart@@QBE?AVQByteArray@@XZ @ 1189 NONAME ; class QByteArray QHttpMultiPart::boundary(void) const
-	?setRawHeader@QHttpPart@@QAEXABVQByteArray@@0@Z @ 1190 NONAME ; void QHttpPart::setRawHeader(class QByteArray const &, class QByteArray const &)
-	?metaObject@QHttpMultiPart@@UBEPBUQMetaObject@@XZ @ 1191 NONAME ; struct QMetaObject const * QHttpMultiPart::metaObject(void) const
-	?setHeader@QHttpPart@@QAEXW4KnownHeaders@QNetworkRequest@@ABVQVariant@@@Z @ 1192 NONAME ; void QHttpPart::setHeader(enum QNetworkRequest::KnownHeaders, class QVariant const &)
-	??1QHttpMultiPart@@UAE@XZ @ 1193 NONAME ; QHttpMultiPart::~QHttpMultiPart(void)
-	?d_func@QHttpMultiPart@@ABEPBVQHttpMultiPartPrivate@@XZ @ 1194 NONAME ; class QHttpMultiPartPrivate const * QHttpMultiPart::d_func(void) const
-	?tr@QHttpMultiPart@@SA?AVQString@@PBD0H@Z @ 1195 NONAME ; class QString QHttpMultiPart::tr(char const *, char const *, int)
-	?setBoundary@QHttpMultiPart@@QAEXABVQByteArray@@@Z @ 1196 NONAME ; void QHttpMultiPart::setBoundary(class QByteArray const &)
-	?qt_static_metacall@QNetworkSessionPrivate@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1197 NONAME ; void QNetworkSessionPrivate::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QUdpSocket@@0UQMetaObjectExtraData@@B @ 1198 NONAME ; struct QMetaObjectExtraData const QUdpSocket::staticMetaObjectExtraData
-	?qt_static_metacall@QLocalSocket@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1199 NONAME ; void QLocalSocket::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QFtp@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1200 NONAME ; void QFtp::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QTcpServer@@0UQMetaObjectExtraData@@B @ 1201 NONAME ; struct QMetaObjectExtraData const QTcpServer::staticMetaObjectExtraData
-	?qt_static_metacall@QSslSocket@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1202 NONAME ; void QSslSocket::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QNetworkSession@@0UQMetaObjectExtraData@@B @ 1203 NONAME ; struct QMetaObjectExtraData const QNetworkSession::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QNetworkAccessManager@@0UQMetaObjectExtraData@@B @ 1204 NONAME ; struct QMetaObjectExtraData const QNetworkAccessManager::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QAbstractSocket@@0UQMetaObjectExtraData@@B @ 1205 NONAME ; struct QMetaObjectExtraData const QAbstractSocket::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QTcpSocket@@0UQMetaObjectExtraData@@B @ 1206 NONAME ; struct QMetaObjectExtraData const QTcpSocket::staticMetaObjectExtraData
-	?qt_static_metacall@QTcpServer@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1207 NONAME ; void QTcpServer::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QNetworkSessionPrivate@@0UQMetaObjectExtraData@@B @ 1208 NONAME ; struct QMetaObjectExtraData const QNetworkSessionPrivate::staticMetaObjectExtraData
-	?qt_static_metacall@QNetworkConfigurationManagerPrivate@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1209 NONAME ; void QNetworkConfigurationManagerPrivate::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QHttp@@0UQMetaObjectExtraData@@B @ 1210 NONAME ; struct QMetaObjectExtraData const QHttp::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QSslSocket@@0UQMetaObjectExtraData@@B @ 1211 NONAME ; struct QMetaObjectExtraData const QSslSocket::staticMetaObjectExtraData
-	?qt_static_metacall@QNetworkReply@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1212 NONAME ; void QNetworkReply::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QLocalServer@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1213 NONAME ; void QLocalServer::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QNetworkConfigurationManager@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1214 NONAME ; void QNetworkConfigurationManager::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAbstractNetworkCache@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1215 NONAME ; void QAbstractNetworkCache::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QNetworkCookieJar@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1216 NONAME ; void QNetworkCookieJar::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QAbstractNetworkCache@@0UQMetaObjectExtraData@@B @ 1217 NONAME ; struct QMetaObjectExtraData const QAbstractNetworkCache::staticMetaObjectExtraData
-	?qt_static_metacall@QHttpMultiPart@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1218 NONAME ; void QHttpMultiPart::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QBearerEngine@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1219 NONAME ; void QBearerEngine::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QLocalSocket@@0UQMetaObjectExtraData@@B @ 1220 NONAME ; struct QMetaObjectExtraData const QLocalSocket::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QHttpMultiPart@@0UQMetaObjectExtraData@@B @ 1221 NONAME ; struct QMetaObjectExtraData const QHttpMultiPart::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QNetworkConfigurationManagerPrivate@@0UQMetaObjectExtraData@@B @ 1222 NONAME ; struct QMetaObjectExtraData const QNetworkConfigurationManagerPrivate::staticMetaObjectExtraData
-	?qt_static_metacall@QHttp@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1223 NONAME ; void QHttp::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QLocalServer@@0UQMetaObjectExtraData@@B @ 1224 NONAME ; struct QMetaObjectExtraData const QLocalServer::staticMetaObjectExtraData
-	?qt_static_metacall@QUdpSocket@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1225 NONAME ; void QUdpSocket::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QBearerEngine@@0UQMetaObjectExtraData@@B @ 1226 NONAME ; struct QMetaObjectExtraData const QBearerEngine::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QBearerEnginePlugin@@0UQMetaObjectExtraData@@B @ 1227 NONAME ; struct QMetaObjectExtraData const QBearerEnginePlugin::staticMetaObjectExtraData
-	?qt_static_metacall@QNetworkAccessManager@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1228 NONAME ; void QNetworkAccessManager::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QNetworkCookieJar@@0UQMetaObjectExtraData@@B @ 1229 NONAME ; struct QMetaObjectExtraData const QNetworkCookieJar::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QNetworkReply@@0UQMetaObjectExtraData@@B @ 1230 NONAME ; struct QMetaObjectExtraData const QNetworkReply::staticMetaObjectExtraData
-	?qt_static_metacall@QNetworkSession@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1231 NONAME ; void QNetworkSession::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QAbstractSocket@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1232 NONAME ; void QAbstractSocket::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QNetworkDiskCache@@0UQMetaObjectExtraData@@B @ 1233 NONAME ; struct QMetaObjectExtraData const QNetworkDiskCache::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QFtp@@0UQMetaObjectExtraData@@B @ 1234 NONAME ; struct QMetaObjectExtraData const QFtp::staticMetaObjectExtraData
-	?qt_static_metacall@QNetworkDiskCache@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1235 NONAME ; void QNetworkDiskCache::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QBearerEnginePlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1236 NONAME ; void QBearerEnginePlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QNetworkConfigurationManager@@0UQMetaObjectExtraData@@B @ 1237 NONAME ; struct QMetaObjectExtraData const QNetworkConfigurationManager::staticMetaObjectExtraData
-	?qt_static_metacall@QTcpSocket@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1238 NONAME ; void QTcpSocket::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	??0QNetworkProxyQuery@@QAE@ABVQNetworkConfiguration@@ABVQUrl@@W4QueryType@0@@Z @ 1239 NONAME ; QNetworkProxyQuery::QNetworkProxyQuery(class QNetworkConfiguration const &, class QUrl const &, enum QNetworkProxyQuery::QueryType)
-	??0QNetworkProxyQuery@@QAE@ABVQNetworkConfiguration@@ABVQString@@H1W4QueryType@0@@Z @ 1240 NONAME ; QNetworkProxyQuery::QNetworkProxyQuery(class QNetworkConfiguration const &, class QString const &, int, class QString const &, enum QNetworkProxyQuery::QueryType)
-	?networkConfiguration@QNetworkProxyQuery@@QBE?AVQNetworkConfiguration@@XZ @ 1241 NONAME ; class QNetworkConfiguration QNetworkProxyQuery::networkConfiguration(void) const
-	?setNetworkConfiguration@QNetworkProxyQuery@@QAEXABVQNetworkConfiguration@@@Z @ 1242 NONAME ; void QNetworkProxyQuery::setNetworkConfiguration(class QNetworkConfiguration const &)
-	??0QNetworkProxyQuery@@QAE@ABVQNetworkConfiguration@@GABVQString@@W4QueryType@0@@Z @ 1243 NONAME ; QNetworkProxyQuery::QNetworkProxyQuery(class QNetworkConfiguration const &, unsigned short, class QString const &, enum QNetworkProxyQuery::QueryType)
-	?cleanup@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1244 NONAME ; void QNetworkConfigurationManagerPrivate::cleanup(void)
-	?initialize@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1245 NONAME ; void QNetworkConfigurationManagerPrivate::initialize(void)
+	??_EQSslError@@QAE@I@Z @ 1147 NONAME ABSENT ; QSslError::~QSslError(unsigned int)
+	??0QBearerEngineFactoryInterface@@QAE@XZ @ 1148 NONAME ABSENT ; QBearerEngineFactoryInterface::QBearerEngineFactoryInterface(void)
+	??_EQSslCipher@@QAE@I@Z @ 1149 NONAME ABSENT ; QSslCipher::~QSslCipher(unsigned int)
+	??_EQSslConfiguration@@QAE@I@Z @ 1150 NONAME ABSENT ; QSslConfiguration::~QSslConfiguration(unsigned int)
+	??_EQSslCertificate@@QAE@I@Z @ 1151 NONAME ABSENT ; QSslCertificate::~QSslCertificate(unsigned int)
+	??_EQNetworkInterface@@QAE@I@Z @ 1152 NONAME ABSENT ; QNetworkInterface::~QNetworkInterface(unsigned int)
+	??_EQNetworkProxy@@QAE@I@Z @ 1153 NONAME ABSENT ; QNetworkProxy::~QNetworkProxy(unsigned int)
+	??_EQHostAddress@@QAE@I@Z @ 1154 NONAME ABSENT ; QHostAddress::~QHostAddress(unsigned int)
+	??_EQNetworkConfiguration@@QAE@I@Z @ 1155 NONAME ABSENT ; QNetworkConfiguration::~QNetworkConfiguration(unsigned int)
+	??_EQHostInfo@@QAE@I@Z @ 1156 NONAME ABSENT ; QHostInfo::~QHostInfo(unsigned int)
+	??_EQNetworkRequest@@QAE@I@Z @ 1157 NONAME ABSENT ; QNetworkRequest::~QNetworkRequest(unsigned int)
+	??4QIPv6Address@@QAEAAV0@ABV0@@Z @ 1158 NONAME ABSENT ; class QIPv6Address & QIPv6Address::operator=(class QIPv6Address const &)
+	??_EQNetworkAddressEntry@@QAE@I@Z @ 1159 NONAME ABSENT ; QNetworkAddressEntry::~QNetworkAddressEntry(unsigned int)
+	??_EQNetworkCookie@@QAE@I@Z @ 1160 NONAME ABSENT ; QNetworkCookie::~QNetworkCookie(unsigned int)
+	?tr@QHttpMultiPart@@SA?AVQString@@PBD0H@Z @ 1161 NONAME ; class QString QHttpMultiPart::tr(char const *, char const *, int)
+	?staticMetaObject@QHttpMultiPart@@2UQMetaObject@@B @ 1162 NONAME ; struct QMetaObject const QHttpMultiPart::staticMetaObject
+	?staticMetaObjectExtraData@QFtp@@0UQMetaObjectExtraData@@B @ 1163 NONAME ; struct QMetaObjectExtraData const QFtp::staticMetaObjectExtraData
+	?joinMulticastGroup@QUdpSocket@@QAE_NABVQHostAddress@@ABVQNetworkInterface@@@Z @ 1164 NONAME ; bool QUdpSocket::joinMulticastGroup(class QHostAddress const &, class QNetworkInterface const &)
+	?trUtf8@QHttpMultiPart@@SA?AVQString@@PBD0@Z @ 1165 NONAME ; class QString QHttpMultiPart::trUtf8(char const *, char const *)
+	??0QHttpPart@@QAE@ABV0@@Z @ 1166 NONAME ; QHttpPart::QHttpPart(class QHttpPart const &)
+	?setMulticastInterface@QUdpSocket@@QAEXABVQNetworkInterface@@@Z @ 1167 NONAME ; void QUdpSocket::setMulticastInterface(class QNetworkInterface const &)
+	?qt_static_metacall@QNetworkReply@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1168 NONAME ; void QNetworkReply::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QNetworkConfigurationManager@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1169 NONAME ; void QNetworkConfigurationManager::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?setFinished@QNetworkReply@@IAEX_N@Z @ 1170 NONAME ; void QNetworkReply::setFinished(bool)
+	??9QHttpPart@@QBE_NABV0@@Z @ 1171 NONAME ; bool QHttpPart::operator!=(class QHttpPart const &) const
+	??0QHttpMultiPart@@QAE@PAVQObject@@@Z @ 1172 NONAME ; QHttpMultiPart::QHttpMultiPart(class QObject *)
+	?setPeerVerifyName@QSslSocket@@QAEXABVQString@@@Z @ 1173 NONAME ; void QSslSocket::setPeerVerifyName(class QString const &)
+	?qt_static_metacall@QUdpSocket@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1174 NONAME ; void QUdpSocket::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QLocalSocket@@0UQMetaObjectExtraData@@B @ 1175 NONAME ; struct QMetaObjectExtraData const QLocalSocket::staticMetaObjectExtraData
+	??0QNetworkProxyQuery@@QAE@ABVQNetworkConfiguration@@ABVQUrl@@W4QueryType@0@@Z @ 1176 NONAME ; QNetworkProxyQuery::QNetworkProxyQuery(class QNetworkConfiguration const &, class QUrl const &, enum QNetworkProxyQuery::QueryType)
+	?staticMetaObjectExtraData@QNetworkCookieJar@@0UQMetaObjectExtraData@@B @ 1177 NONAME ; struct QMetaObjectExtraData const QNetworkCookieJar::staticMetaObjectExtraData
+	??1QHttpPart@@QAE@XZ @ 1178 NONAME ; QHttpPart::~QHttpPart(void)
+	?tr@QHttpMultiPart@@SA?AVQString@@PBD0@Z @ 1179 NONAME ; class QString QHttpMultiPart::tr(char const *, char const *)
+	?staticMetaObjectExtraData@QBearerEngine@@0UQMetaObjectExtraData@@B @ 1180 NONAME ; struct QMetaObjectExtraData const QBearerEngine::staticMetaObjectExtraData
+	?qt_static_metacall@QTcpSocket@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1181 NONAME ; void QTcpSocket::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QTcpSocket@@0UQMetaObjectExtraData@@B @ 1182 NONAME ; struct QMetaObjectExtraData const QTcpSocket::staticMetaObjectExtraData
+	?qt_static_metacall@QHttp@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1183 NONAME ; void QHttp::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QNetworkSession@@0UQMetaObjectExtraData@@B @ 1184 NONAME ; struct QMetaObjectExtraData const QNetworkSession::staticMetaObjectExtraData
+	?engines@QNetworkConfigurationManagerPrivate@@QBE?AV?$QList@PAVQBearerEngine@@@@XZ @ 1185 NONAME ; class QList<class QBearerEngine *> QNetworkConfigurationManagerPrivate::engines(void) const
+	?qt_static_metacall@QNetworkSessionPrivate@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1186 NONAME ; void QNetworkSessionPrivate::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QSslSocket@@0UQMetaObjectExtraData@@B @ 1187 NONAME ; struct QMetaObjectExtraData const QSslSocket::staticMetaObjectExtraData
+	?qt_static_metacall@QTcpServer@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1188 NONAME ; void QTcpServer::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QLocalServer@@0UQMetaObjectExtraData@@B @ 1189 NONAME ; struct QMetaObjectExtraData const QLocalServer::staticMetaObjectExtraData
+	?append@QHttpMultiPart@@QAEXABVQHttpPart@@@Z @ 1190 NONAME ; void QHttpMultiPart::append(class QHttpPart const &)
+	?d_func@QHttpMultiPart@@ABEPBVQHttpMultiPartPrivate@@XZ @ 1191 NONAME ; class QHttpMultiPartPrivate const * QHttpMultiPart::d_func(void) const
+	?staticMetaObjectExtraData@QHttp@@0UQMetaObjectExtraData@@B @ 1192 NONAME ; struct QMetaObjectExtraData const QHttp::staticMetaObjectExtraData
+	?setBodyDevice@QHttpPart@@QAEXPAVQIODevice@@@Z @ 1193 NONAME ; void QHttpPart::setBodyDevice(class QIODevice *)
+	?staticMetaObjectExtraData@QNetworkReply@@0UQMetaObjectExtraData@@B @ 1194 NONAME ; struct QMetaObjectExtraData const QNetworkReply::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QTcpServer@@0UQMetaObjectExtraData@@B @ 1195 NONAME ; struct QMetaObjectExtraData const QTcpServer::staticMetaObjectExtraData
+	??0QNetworkProxyQuery@@QAE@ABVQNetworkConfiguration@@ABVQString@@H1W4QueryType@0@@Z @ 1196 NONAME ; QNetworkProxyQuery::QNetworkProxyQuery(class QNetworkConfiguration const &, class QString const &, int, class QString const &, enum QNetworkProxyQuery::QueryType)
+	??4QHttpPart@@QAEAAV0@ABV0@@Z @ 1197 NONAME ; class QHttpPart & QHttpPart::operator=(class QHttpPart const &)
+	?nativeOpenSocket@QNetworkSessionPrivate@@SAHAAVQNetworkSession@@AAVRSocket@@III@Z @ 1198 NONAME ; int QNetworkSessionPrivate::nativeOpenSocket(class QNetworkSession &, class RSocket &, unsigned int, unsigned int, unsigned int)
+	?networkConfiguration@QNetworkProxyQuery@@QBE?AVQNetworkConfiguration@@XZ @ 1199 NONAME ; class QNetworkConfiguration QNetworkProxyQuery::networkConfiguration(void) const
+	?nativeOpenHostResolver@QNetworkSessionPrivate@@SAHAAVQNetworkSession@@AAVRHostResolver@@II@Z @ 1200 NONAME ; int QNetworkSessionPrivate::nativeOpenHostResolver(class QNetworkSession &, class RHostResolver &, unsigned int, unsigned int)
+	??_EQHttpMultiPart@@UAE@I@Z @ 1201 NONAME ; QHttpMultiPart::~QHttpMultiPart(unsigned int)
+	?qt_static_metacall@QNetworkConfigurationManagerPrivate@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1202 NONAME ; void QNetworkConfigurationManagerPrivate::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?configurationFromIdentifier@QNetworkConfigurationManagerPrivate@@QBE?AVQNetworkConfiguration@@ABVQString@@@Z @ 1203 NONAME ; class QNetworkConfiguration QNetworkConfigurationManagerPrivate::configurationFromIdentifier(class QString const &) const
+	?setBody@QHttpPart@@QAEXABVQByteArray@@@Z @ 1204 NONAME ; void QHttpPart::setBody(class QByteArray const &)
+	?nativeSession@QNetworkSessionPrivate@@SAPAVRConnection@@AAVQNetworkSession@@@Z @ 1205 NONAME ; class RConnection * QNetworkSessionPrivate::nativeSession(class QNetworkSession &)
+	?staticMetaObjectExtraData@QNetworkConfigurationManagerPrivate@@0UQMetaObjectExtraData@@B @ 1206 NONAME ; struct QMetaObjectExtraData const QNetworkConfigurationManagerPrivate::staticMetaObjectExtraData
+	?isOnline@QNetworkConfigurationManagerPrivate@@QBE_NXZ @ 1207 NONAME ; bool QNetworkConfigurationManagerPrivate::isOnline(void) const
+	?qt_static_metacall@QAbstractNetworkCache@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1208 NONAME ; void QAbstractNetworkCache::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QHttpMultiPart@@QAE@W4ContentType@0@PAVQObject@@@Z @ 1209 NONAME ; QHttpMultiPart::QHttpMultiPart(enum QHttpMultiPart::ContentType, class QObject *)
+	?multicastInterface@QUdpSocket@@QBE?AVQNetworkInterface@@XZ @ 1210 NONAME ; class QNetworkInterface QUdpSocket::multicastInterface(void) const
+	?d_func@QHttpMultiPart@@AAEPAVQHttpMultiPartPrivate@@XZ @ 1211 NONAME ; class QHttpMultiPartPrivate * QHttpMultiPart::d_func(void)
+	?qt_static_metacall@QLocalSocket@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1212 NONAME ; void QLocalSocket::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?cleanup@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1213 NONAME ; void QNetworkConfigurationManagerPrivate::cleanup(void)
+	?qt_static_metacall@QNetworkDiskCache@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1214 NONAME ; void QNetworkDiskCache::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?defaultConfiguration@QNetworkConfigurationManagerPrivate@@QBE?AVQNetworkConfiguration@@XZ @ 1215 NONAME ; class QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration(void) const
+	?qt_static_metacall@QLocalServer@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1216 NONAME ; void QLocalServer::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?peerVerifyName@QSslSocket@@QBE?AVQString@@XZ @ 1217 NONAME ; class QString QSslSocket::peerVerifyName(void) const
+	?boundary@QHttpMultiPart@@QBE?AVQByteArray@@XZ @ 1218 NONAME ; class QByteArray QHttpMultiPart::boundary(void) const
+	?joinMulticastGroup@QUdpSocket@@QAE_NABVQHostAddress@@@Z @ 1219 NONAME ; bool QUdpSocket::joinMulticastGroup(class QHostAddress const &)
+	?setHeader@QHttpPart@@QAEXW4KnownHeaders@QNetworkRequest@@ABVQVariant@@@Z @ 1220 NONAME ; void QHttpPart::setHeader(enum QNetworkRequest::KnownHeaders, class QVariant const &)
+	??1QHttpMultiPart@@UAE@XZ @ 1221 NONAME ; QHttpMultiPart::~QHttpMultiPart(void)
+	?allConfigurations@QNetworkConfigurationManagerPrivate@@QBE?AV?$QList@VQNetworkConfiguration@@@@V?$QFlags@W4StateFlag@QNetworkConfiguration@@@@@Z @ 1222 NONAME ; class QList<class QNetworkConfiguration> QNetworkConfigurationManagerPrivate::allConfigurations(class QFlags<enum QNetworkConfiguration::StateFlag>) const
+	?staticMetaObjectExtraData@QBearerEnginePlugin@@0UQMetaObjectExtraData@@B @ 1223 NONAME ; struct QMetaObjectExtraData const QBearerEnginePlugin::staticMetaObjectExtraData
+	?initialize@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1224 NONAME ; void QNetworkConfigurationManagerPrivate::initialize(void)
+	?post@QNetworkAccessManager@@QAEPAVQNetworkReply@@ABVQNetworkRequest@@PAVQHttpMultiPart@@@Z @ 1225 NONAME ; class QNetworkReply * QNetworkAccessManager::post(class QNetworkRequest const &, class QHttpMultiPart *)
+	?qt_metacast@QHttpMultiPart@@UAEPAXPBD@Z @ 1226 NONAME ; void * QHttpMultiPart::qt_metacast(char const *)
+	?qt_static_metacall@QNetworkAccessManager@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1227 NONAME ; void QNetworkAccessManager::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QSslSocket@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1228 NONAME ; void QSslSocket::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QHttpMultiPart@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1229 NONAME ; int QHttpMultiPart::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QAbstractSocket@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1230 NONAME ; void QAbstractSocket::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QHttpPart@@QAE@XZ @ 1231 NONAME ; QHttpPart::QHttpPart(void)
+	?setBoundary@QHttpMultiPart@@QAEXABVQByteArray@@@Z @ 1232 NONAME ; void QHttpMultiPart::setBoundary(class QByteArray const &)
+	??8QHttpPart@@QBE_NABV0@@Z @ 1233 NONAME ; bool QHttpPart::operator==(class QHttpPart const &) const
+	?setNetworkConfiguration@QNetworkProxyQuery@@QAEXABVQNetworkConfiguration@@@Z @ 1234 NONAME ; void QNetworkProxyQuery::setNetworkConfiguration(class QNetworkConfiguration const &)
+	?staticMetaObjectExtraData@QHttpMultiPart@@0UQMetaObjectExtraData@@B @ 1235 NONAME ; struct QMetaObjectExtraData const QHttpMultiPart::staticMetaObjectExtraData
+	?trUtf8@QHttpMultiPart@@SA?AVQString@@PBD0H@Z @ 1236 NONAME ; class QString QHttpMultiPart::trUtf8(char const *, char const *, int)
+	?staticMetaObjectExtraData@QAbstractSocket@@0UQMetaObjectExtraData@@B @ 1237 NONAME ; struct QMetaObjectExtraData const QAbstractSocket::staticMetaObjectExtraData
+	?qt_static_metacall@QHttpMultiPart@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1238 NONAME ; void QHttpMultiPart::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?leaveMulticastGroup@QUdpSocket@@QAE_NABVQHostAddress@@ABVQNetworkInterface@@@Z @ 1239 NONAME ; bool QUdpSocket::leaveMulticastGroup(class QHostAddress const &, class QNetworkInterface const &)
+	?qt_static_metacall@QNetworkCookieJar@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1240 NONAME ; void QNetworkCookieJar::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QFtp@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1241 NONAME ; void QFtp::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?getStaticMetaObject@QHttpMultiPart@@SAABUQMetaObject@@XZ @ 1242 NONAME ; struct QMetaObject const & QHttpMultiPart::getStaticMetaObject(void)
+	?staticMetaObjectExtraData@QNetworkSessionPrivate@@0UQMetaObjectExtraData@@B @ 1243 NONAME ; struct QMetaObjectExtraData const QNetworkSessionPrivate::staticMetaObjectExtraData
+	?put@QNetworkAccessManager@@QAEPAVQNetworkReply@@ABVQNetworkRequest@@PAVQHttpMultiPart@@@Z @ 1244 NONAME ; class QNetworkReply * QNetworkAccessManager::put(class QNetworkRequest const &, class QHttpMultiPart *)
+	?staticMetaObjectExtraData@QUdpSocket@@0UQMetaObjectExtraData@@B @ 1245 NONAME ; struct QMetaObjectExtraData const QUdpSocket::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QNetworkDiskCache@@0UQMetaObjectExtraData@@B @ 1246 NONAME ; struct QMetaObjectExtraData const QNetworkDiskCache::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QAbstractNetworkCache@@0UQMetaObjectExtraData@@B @ 1247 NONAME ; struct QMetaObjectExtraData const QAbstractNetworkCache::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QNetworkConfigurationManager@@0UQMetaObjectExtraData@@B @ 1248 NONAME ; struct QMetaObjectExtraData const QNetworkConfigurationManager::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QNetworkAccessManager@@0UQMetaObjectExtraData@@B @ 1249 NONAME ; struct QMetaObjectExtraData const QNetworkAccessManager::staticMetaObjectExtraData
+	?capabilities@QNetworkConfigurationManagerPrivate@@QBE?AV?$QFlags@W4Capability@QNetworkConfigurationManager@@@@XZ @ 1250 NONAME ; class QFlags<enum QNetworkConfigurationManager::Capability> QNetworkConfigurationManagerPrivate::capabilities(void) const
+	?leaveMulticastGroup@QUdpSocket@@QAE_NABVQHostAddress@@@Z @ 1251 NONAME ; bool QUdpSocket::leaveMulticastGroup(class QHostAddress const &)
+	?setContentType@QHttpMultiPart@@QAEXW4ContentType@1@@Z @ 1252 NONAME ; void QHttpMultiPart::setContentType(enum QHttpMultiPart::ContentType)
+	?qt_static_metacall@QBearerEngine@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1253 NONAME ; void QBearerEngine::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?setRawHeader@QHttpPart@@QAEXABVQByteArray@@0@Z @ 1254 NONAME ; void QHttpPart::setRawHeader(class QByteArray const &, class QByteArray const &)
+	?qt_static_metacall@QBearerEnginePlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1255 NONAME ; void QBearerEnginePlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QNetworkProxyQuery@@QAE@ABVQNetworkConfiguration@@GABVQString@@W4QueryType@0@@Z @ 1256 NONAME ; QNetworkProxyQuery::QNetworkProxyQuery(class QNetworkConfiguration const &, unsigned short, class QString const &, enum QNetworkProxyQuery::QueryType)
+	?metaObject@QHttpMultiPart@@UBEPBUQMetaObject@@XZ @ 1257 NONAME ; struct QMetaObject const * QHttpMultiPart::metaObject(void) const
+	?qt_static_metacall@QNetworkSession@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 1258 NONAME ; void QNetworkSession::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?startPolling@QNetworkConfigurationManagerPrivate@@AAEXXZ @ 1259 NONAME ; void QNetworkConfigurationManagerPrivate::startPolling(void)
 
diff --git a/src/s60installs/bwins/QtOpenGLu.def b/src/s60installs/bwins/QtOpenGLu.def
index 1a9525d..664e981 100644
--- a/src/s60installs/bwins/QtOpenGLu.def
+++ b/src/s60installs/bwins/QtOpenGLu.def
@@ -725,155 +725,157 @@ EXPORTS
 	?platformExtension@QGLGraphicsSystem@@UAEPAVQGraphicsSystemEx@@XZ @ 724 NONAME ; class QGraphicsSystemEx * QGLGraphicsSystem::platformExtension(void)
 	?releaseCachedGpuResources@QGLGraphicsSystem@@UAEXXZ @ 725 NONAME ; void QGLGraphicsSystem::releaseCachedGpuResources(void)
 	?toVolatileImage@QGLPixmapData@@UBE?AVQVolatileImage@@XZ @ 726 NONAME ; class QVolatileImage QGLPixmapData::toVolatileImage(void) const
-	?glGetActiveAttrib@QGLFunctions@@QAEXIIHPAH0PAIPAD@Z @ 727 NONAME ; void QGLFunctions::glGetActiveAttrib(unsigned int, unsigned int, int, int *, int *, unsigned int *, char *)
-	?glBindFramebuffer@QGLFunctions@@QAEXII@Z @ 728 NONAME ; void QGLFunctions::glBindFramebuffer(unsigned int, unsigned int)
-	?glBufferData@QGLFunctions@@QAEXIHPBXI@Z @ 729 NONAME ; void QGLFunctions::glBufferData(unsigned int, int, void const *, unsigned int)
-	?glValidateProgram@QGLFunctions@@QAEXI@Z @ 730 NONAME ; void QGLFunctions::glValidateProgram(unsigned int)
-	?glUniform1f@QGLFunctions@@QAEXHM@Z @ 731 NONAME ; void QGLFunctions::glUniform1f(int, float)
-	?glDetachShader@QGLFunctions@@QAEXII@Z @ 732 NONAME ; void QGLFunctions::glDetachShader(unsigned int, unsigned int)
-	?glDeleteProgram@QGLFunctions@@QAEXI@Z @ 733 NONAME ; void QGLFunctions::glDeleteProgram(unsigned int)
-	??_EQGLContextResourceBase@@UAE@I@Z @ 734 NONAME ; QGLContextResourceBase::~QGLContextResourceBase(unsigned int)
-	?glUniform2f@QGLFunctions@@QAEXHMM@Z @ 735 NONAME ; void QGLFunctions::glUniform2f(int, float, float)
-	?glIsProgram@QGLFunctions@@QAEEI@Z @ 736 NONAME ; unsigned char QGLFunctions::glIsProgram(unsigned int)
-	?openGLFeatures@QGLFunctions@@QBE?AV?$QFlags@W4OpenGLFeature@QGLFunctions@@@@XZ @ 737 NONAME ; class QFlags<enum QGLFunctions::OpenGLFeature> QGLFunctions::openGLFeatures(void) const
-	?glReleaseShaderCompiler@QGLFunctions@@QAEXXZ @ 738 NONAME ; void QGLFunctions::glReleaseShaderCompiler(void)
-	??0QGLTextureGlyphCache@@QAE@PBVQGLContext@@W4Type@QFontEngineGlyphCache@@ABVQTransform@@@Z @ 739 NONAME ; QGLTextureGlyphCache::QGLTextureGlyphCache(class QGLContext const *, enum QFontEngineGlyphCache::Type, class QTransform const &)
-	?context@QGLTextureGlyphCache@@QBEPBVQGLContext@@XZ @ 740 NONAME ; class QGLContext const * QGLTextureGlyphCache::context(void) const
-	?glGenRenderbuffers@QGLFunctions@@QAEXHPAI@Z @ 741 NONAME ; void QGLFunctions::glGenRenderbuffers(int, unsigned int *)
-	?glBindBuffer@QGLFunctions@@QAEXII@Z @ 742 NONAME ; void QGLFunctions::glBindBuffer(unsigned int, unsigned int)
-	?glUniformMatrix3fv@QGLFunctions@@QAEXHHEPBM@Z @ 743 NONAME ; void QGLFunctions::glUniformMatrix3fv(int, int, unsigned char, float const *)
-	?glGenerateMipmap@QGLFunctions@@QAEXI@Z @ 744 NONAME ; void QGLFunctions::glGenerateMipmap(unsigned int)
-	?hasOpenGLFeature@QGLFunctions@@QBE_NW4OpenGLFeature@1@@Z @ 745 NONAME ; bool QGLFunctions::hasOpenGLFeature(enum QGLFunctions::OpenGLFeature) const
-	?glGetAttachedShaders@QGLFunctions@@QAEXIHPAHPAI@Z @ 746 NONAME ; void QGLFunctions::glGetAttachedShaders(unsigned int, int, int *, unsigned int *)
-	?glDeleteShader@QGLFunctions@@QAEXI@Z @ 747 NONAME ; void QGLFunctions::glDeleteShader(unsigned int)
-	?simpleProgram@QGLEngineSharedShaders@@QAEPAVQGLShaderProgram@@XZ @ 748 NONAME ; class QGLShaderProgram * QGLEngineSharedShaders::simpleProgram(void)
-	?blitProgram@QGLEngineSharedShaders@@QAEPAVQGLShaderProgram@@XZ @ 749 NONAME ; class QGLShaderProgram * QGLEngineSharedShaders::blitProgram(void)
-	?glLinkProgram@QGLFunctions@@QAEXI@Z @ 750 NONAME ; void QGLFunctions::glLinkProgram(unsigned int)
-	?glUseProgram@QGLFunctions@@QAEXI@Z @ 751 NONAME ; void QGLFunctions::glUseProgram(unsigned int)
-	??0QGLFunctions@@QAE@PBVQGLContext@@@Z @ 752 NONAME ; QGLFunctions::QGLFunctions(class QGLContext const *)
-	?glGetBufferParameteriv@QGLFunctions@@QAEXIIPAH@Z @ 753 NONAME ; void QGLFunctions::glGetBufferParameteriv(unsigned int, unsigned int, int *)
-	?glGenBuffers@QGLFunctions@@QAEXHPAI@Z @ 754 NONAME ; void QGLFunctions::glGenBuffers(int, unsigned int *)
-	?glGetShaderiv@QGLFunctions@@QAEXIIPAH@Z @ 755 NONAME ; void QGLFunctions::glGetShaderiv(unsigned int, unsigned int, int *)
-	?fillTexture@QGLTextureGlyphCache@@UAEXABUCoord@QTextureGlyphCache@@IUQFixed@@@Z @ 756 NONAME ; void QGLTextureGlyphCache::fillTexture(struct QTextureGlyphCache::Coord const &, unsigned int, struct QFixed)
-	?glUniform2fv@QGLFunctions@@QAEXHHPBM@Z @ 757 NONAME ; void QGLFunctions::glUniform2fv(int, int, float const *)
-	??0QGLContextGroupResourceBase@@QAE@XZ @ 758 NONAME ; QGLContextGroupResourceBase::QGLContextGroupResourceBase(void)
-	?glGetFramebufferAttachmentParameteriv@QGLFunctions@@QAEXIIIPAH@Z @ 759 NONAME ; void QGLFunctions::glGetFramebufferAttachmentParameteriv(unsigned int, unsigned int, unsigned int, int *)
-	??0QGLEngineSharedShaders@@QAE@PBVQGLContext@@@Z @ 760 NONAME ; QGLEngineSharedShaders::QGLEngineSharedShaders(class QGLContext const *)
-	?cleanup@QGLContextGroupResourceBase@@QAEXPBVQGLContext@@PAX@Z @ 761 NONAME ; void QGLContextGroupResourceBase::cleanup(class QGLContext const *, void *)
-	?glUniform2iv@QGLFunctions@@QAEXHHPBH@Z @ 762 NONAME ; void QGLFunctions::glUniform2iv(int, int, int const *)
-	?glCompileShader@QGLFunctions@@QAEXI@Z @ 763 NONAME ; void QGLFunctions::glCompileShader(unsigned int)
-	?qShaderSnippets@QGLEngineSharedShaders@@0PAPBDA @ 764 NONAME ; char const * * QGLEngineSharedShaders::qShaderSnippets
-	?isFlipped@QGLPaintDevice@@UBE_NXZ @ 765 NONAME ; bool QGLPaintDevice::isFlipped(void) const
-	?shadersForContext@QGLEngineSharedShaders@@SAPAV1@PBVQGLContext@@@Z @ 766 NONAME ; class QGLEngineSharedShaders * QGLEngineSharedShaders::shadersForContext(class QGLContext const *)
-	?cleanupCustomStage@QGLEngineSharedShaders@@QAEXPAVQGLCustomShaderStage@@@Z @ 767 NONAME ; void QGLEngineSharedShaders::cleanupCustomStage(class QGLCustomShaderStage *)
-	?glGetProgramiv@QGLFunctions@@QAEXIIPAH@Z @ 768 NONAME ; void QGLFunctions::glGetProgramiv(unsigned int, unsigned int, int *)
-	?glClearDepthf@QGLFunctions@@QAEXM@Z @ 769 NONAME ; void QGLFunctions::glClearDepthf(float)
-	?glIsFramebuffer@QGLFunctions@@QAEEI@Z @ 770 NONAME ; unsigned char QGLFunctions::glIsFramebuffer(unsigned int)
-	?getStaticMetaObject@QGLEngineSharedShaders@@SAABUQMetaObject@@XZ @ 771 NONAME ; struct QMetaObject const & QGLEngineSharedShaders::getStaticMetaObject(void)
-	?glUniform4f@QGLFunctions@@QAEXHMMMM@Z @ 772 NONAME ; void QGLFunctions::glUniform4f(int, float, float, float, float)
-	?glUniform3f@QGLFunctions@@QAEXHMMM@Z @ 773 NONAME ; void QGLFunctions::glUniform3f(int, float, float, float)
-	??1QGLEngineSharedShaders@@QAE@XZ @ 774 NONAME ; QGLEngineSharedShaders::~QGLEngineSharedShaders(void)
-	?glDeleteRenderbuffers@QGLFunctions@@QAEXHPBI@Z @ 775 NONAME ; void QGLFunctions::glDeleteRenderbuffers(int, unsigned int const *)
-	?glVertexAttrib1f@QGLFunctions@@QAEXIM@Z @ 776 NONAME ; void QGLFunctions::glVertexAttrib1f(unsigned int, float)
-	?glVertexAttrib4f@QGLFunctions@@QAEXIMMMM@Z @ 777 NONAME ; void QGLFunctions::glVertexAttrib4f(unsigned int, float, float, float, float)
-	?glSampleCoverage@QGLFunctions@@QAEXME@Z @ 778 NONAME ; void QGLFunctions::glSampleCoverage(float, unsigned char)
-	?glGetActiveUniform@QGLFunctions@@QAEXIIHPAH0PAIPAD@Z @ 779 NONAME ; void QGLFunctions::glGetActiveUniform(unsigned int, unsigned int, int, int *, int *, unsigned int *, char *)
-	??_EQGLContextGroupResourceBase@@UAE@I@Z @ 780 NONAME ; QGLContextGroupResourceBase::~QGLContextGroupResourceBase(unsigned int)
-	?findProgramInCache@QGLEngineSharedShaders@@QAEPAVQGLEngineShaderProg@@ABV2@@Z @ 781 NONAME ; class QGLEngineShaderProg * QGLEngineSharedShaders::findProgramInCache(class QGLEngineShaderProg const &)
-	?glStencilOpSeparate@QGLFunctions@@QAEXIIII@Z @ 782 NONAME ; void QGLFunctions::glStencilOpSeparate(unsigned int, unsigned int, unsigned int, unsigned int)
-	?glCheckFramebufferStatus@QGLFunctions@@QAEII@Z @ 783 NONAME ; unsigned int QGLFunctions::glCheckFramebufferStatus(unsigned int)
-	?glDepthRangef@QGLFunctions@@QAEXMM@Z @ 784 NONAME ; void QGLFunctions::glDepthRangef(float, float)
-	??1QGLFunctions@@QAE@XZ @ 785 NONAME ; QGLFunctions::~QGLFunctions(void)
-	?glStencilMaskSeparate@QGLFunctions@@QAEXII@Z @ 786 NONAME ; void QGLFunctions::glStencilMaskSeparate(unsigned int, unsigned int)
-	?glBlendColor@QGLFunctions@@QAEXMMMM@Z @ 787 NONAME ; void QGLFunctions::glBlendColor(float, float, float, float)
-	?glUniform1fv@QGLFunctions@@QAEXHHPBM@Z @ 788 NONAME ; void QGLFunctions::glUniform1fv(int, int, float const *)
-	??1QGLContextResourceBase@@UAE@XZ @ 789 NONAME ; QGLContextResourceBase::~QGLContextResourceBase(void)
-	?glCreateProgram@QGLFunctions@@QAEIXZ @ 790 NONAME ; unsigned int QGLFunctions::glCreateProgram(void)
-	?glVertexAttrib2f@QGLFunctions@@QAEXIMM@Z @ 791 NONAME ; void QGLFunctions::glVertexAttrib2f(unsigned int, float, float)
-	?glUniformMatrix2fv@QGLFunctions@@QAEXHHEPBM@Z @ 792 NONAME ; void QGLFunctions::glUniformMatrix2fv(int, int, unsigned char, float const *)
-	?glBufferSubData@QGLFunctions@@QAEXIHHPBX@Z @ 793 NONAME ; void QGLFunctions::glBufferSubData(unsigned int, int, int, void const *)
-	?glUniform1iv@QGLFunctions@@QAEXHHPBH@Z @ 794 NONAME ; void QGLFunctions::glUniform1iv(int, int, int const *)
-	?qt_resolve_buffer_extensions@@YA_NPAVQGLContext@@@Z @ 795 NONAME ; bool qt_resolve_buffer_extensions(class QGLContext *)
-	?glUniform1i@QGLFunctions@@QAEXHH@Z @ 796 NONAME ; void QGLFunctions::glUniform1i(int, int)
-	?glVertexAttrib4fv@QGLFunctions@@QAEXIPBM@Z @ 797 NONAME ; void QGLFunctions::glVertexAttrib4fv(unsigned int, float const *)
-	?glDeleteFramebuffers@QGLFunctions@@QAEXHPBI@Z @ 798 NONAME ; void QGLFunctions::glDeleteFramebuffers(int, unsigned int const *)
-	?glGetVertexAttribfv@QGLFunctions@@QAEXIIPAM@Z @ 799 NONAME ; void QGLFunctions::glGetVertexAttribfv(unsigned int, unsigned int, float *)
-	?glGetProgramInfoLog@QGLFunctions@@QAEXIHPAHPAD@Z @ 800 NONAME ; void QGLFunctions::glGetProgramInfoLog(unsigned int, int, int *, char *)
-	?glGetShaderInfoLog@QGLFunctions@@QAEXIHPAHPAD@Z @ 801 NONAME ; void QGLFunctions::glGetShaderInfoLog(unsigned int, int, int *, char *)
-	?glEnableVertexAttribArray@QGLFunctions@@QAEXI@Z @ 802 NONAME ; void QGLFunctions::glEnableVertexAttribArray(unsigned int)
-	?glGetVertexAttribiv@QGLFunctions@@QAEXIIPAH@Z @ 803 NONAME ; void QGLFunctions::glGetVertexAttribiv(unsigned int, unsigned int, int *)
-	?glCompressedTexImage2D@QGLFunctions@@QAEXIHIHHHHPBX@Z @ 804 NONAME ; void QGLFunctions::glCompressedTexImage2D(unsigned int, int, unsigned int, int, int, int, int, void const *)
-	?glGetAttribLocation@QGLFunctions@@QAEHIPBD@Z @ 805 NONAME ; int QGLFunctions::glGetAttribLocation(unsigned int, char const *)
-	?glActiveTexture@QGLFunctions@@QAEXI@Z @ 806 NONAME ; void QGLFunctions::glActiveTexture(unsigned int)
-	?glUniform4fv@QGLFunctions@@QAEXHHPBM@Z @ 807 NONAME ; void QGLFunctions::glUniform4fv(int, int, float const *)
-	?glCreateShader@QGLFunctions@@QAEII@Z @ 808 NONAME ; unsigned int QGLFunctions::glCreateShader(unsigned int)
-	?glAttachShader@QGLFunctions@@QAEXII@Z @ 809 NONAME ; void QGLFunctions::glAttachShader(unsigned int, unsigned int)
-	?glRenderbufferStorage@QGLFunctions@@QAEXIIHH@Z @ 810 NONAME ; void QGLFunctions::glRenderbufferStorage(unsigned int, unsigned int, int, int)
-	?glVertexAttribPointer@QGLFunctions@@QAEXIHIEHPBX@Z @ 811 NONAME ; void QGLFunctions::glVertexAttribPointer(unsigned int, int, unsigned int, unsigned char, int, void const *)
-	?glUniform4iv@QGLFunctions@@QAEXHHPBH@Z @ 812 NONAME ; void QGLFunctions::glUniform4iv(int, int, int const *)
-	?glDisableVertexAttribArray@QGLFunctions@@QAEXI@Z @ 813 NONAME ; void QGLFunctions::glDisableVertexAttribArray(unsigned int)
-	?features@QGLWindowSurface@@UBE?AV?$QFlags@W4WindowSurfaceFeature@QWindowSurface@@@@XZ @ 814 NONAME ; class QFlags<enum QWindowSurface::WindowSurfaceFeature> QGLWindowSurface::features(void) const
-	?glIsShader@QGLFunctions@@QAEEI@Z @ 815 NONAME ; unsigned char QGLFunctions::glIsShader(unsigned int)
-	?glShaderBinary@QGLFunctions@@QAEXHPBIIPBXH@Z @ 816 NONAME ; void QGLFunctions::glShaderBinary(int, unsigned int const *, unsigned int, void const *, int)
-	?glGenFramebuffers@QGLFunctions@@QAEXHPAI@Z @ 817 NONAME ; void QGLFunctions::glGenFramebuffers(int, unsigned int *)
-	?glVertexAttrib3fv@QGLFunctions@@QAEXIPBM@Z @ 818 NONAME ; void QGLFunctions::glVertexAttrib3fv(unsigned int, float const *)
-	?glGetVertexAttribPointerv@QGLFunctions@@QAEXIIPAPAX@Z @ 819 NONAME ; void QGLFunctions::glGetVertexAttribPointerv(unsigned int, unsigned int, void * *)
-	?snippetNameStr@QGLEngineSharedShaders@@SA?AVQByteArray@@W4SnippetName@1@@Z @ 820 NONAME ; class QByteArray QGLEngineSharedShaders::snippetNameStr(enum QGLEngineSharedShaders::SnippetName)
-	?glUniformMatrix4fv@QGLFunctions@@QAEXHHEPBM@Z @ 821 NONAME ; void QGLFunctions::glUniformMatrix4fv(int, int, unsigned char, float const *)
-	?setContext@QGLTextureGlyphCache@@QAEXPBVQGLContext@@@Z @ 822 NONAME ; void QGLTextureGlyphCache::setContext(class QGLContext const *)
-	?glDeleteBuffers@QGLFunctions@@QAEXHPBI@Z @ 823 NONAME ; void QGLFunctions::glDeleteBuffers(int, unsigned int const *)
-	?glBindRenderbuffer@QGLFunctions@@QAEXII@Z @ 824 NONAME ; void QGLFunctions::glBindRenderbuffer(unsigned int, unsigned int)
-	?glStencilFuncSeparate@QGLFunctions@@QAEXIIHI@Z @ 825 NONAME ; void QGLFunctions::glStencilFuncSeparate(unsigned int, unsigned int, int, unsigned int)
-	?glGetUniformLocation@QGLFunctions@@QAEHIPBD@Z @ 826 NONAME ; int QGLFunctions::glGetUniformLocation(unsigned int, char const *)
-	?glGetRenderbufferParameteriv@QGLFunctions@@QAEXIIPAH@Z @ 827 NONAME ; void QGLFunctions::glGetRenderbufferParameteriv(unsigned int, unsigned int, int *)
-	?glBindAttribLocation@QGLFunctions@@QAEXIIPBD@Z @ 828 NONAME ; void QGLFunctions::glBindAttribLocation(unsigned int, unsigned int, char const *)
-	?glGetShaderSource@QGLFunctions@@QAEXIHPAHPAD@Z @ 829 NONAME ; void QGLFunctions::glGetShaderSource(unsigned int, int, int *, char *)
-	?setMipmap@QGLFramebufferObjectFormat@@QAEX_N@Z @ 830 NONAME ; void QGLFramebufferObjectFormat::setMipmap(bool)
-	??1QGLContextGroupResourceBase@@UAE@XZ @ 831 NONAME ; QGLContextGroupResourceBase::~QGLContextGroupResourceBase(void)
-	?glFramebufferTexture2D@QGLFunctions@@QAEXIIIIH@Z @ 832 NONAME ; void QGLFunctions::glFramebufferTexture2D(unsigned int, unsigned int, unsigned int, unsigned int, int)
-	?glBlendEquationSeparate@QGLFunctions@@QAEXII@Z @ 833 NONAME ; void QGLFunctions::glBlendEquationSeparate(unsigned int, unsigned int)
-	?insert@QGLContextResourceBase@@QAEXPBVQGLContext@@PAX@Z @ 834 NONAME ; void QGLContextResourceBase::insert(class QGLContext const *, void *)
-	??_EQGLEngineSharedShaders@@QAE@I@Z @ 835 NONAME ; QGLEngineSharedShaders::~QGLEngineSharedShaders(unsigned int)
-	?glUniform2i@QGLFunctions@@QAEXHHH@Z @ 836 NONAME ; void QGLFunctions::glUniform2i(int, int, int)
-	?glGetUniformfv@QGLFunctions@@QAEXIHPAM@Z @ 837 NONAME ; void QGLFunctions::glGetUniformfv(unsigned int, int, float *)
-	?glUniform3i@QGLFunctions@@QAEXHHHH@Z @ 838 NONAME ; void QGLFunctions::glUniform3i(int, int, int, int)
-	?staticMetaObject@QGLEngineSharedShaders@@2UQMetaObject@@B @ 839 NONAME ; struct QMetaObject const QGLEngineSharedShaders::staticMetaObject
-	?cleanup@QGLContextGroupResourceBase@@QAEXPBVQGLContext@@@Z @ 840 NONAME ; void QGLContextGroupResourceBase::cleanup(class QGLContext const *)
-	?glIsRenderbuffer@QGLFunctions@@QAEEI@Z @ 841 NONAME ; unsigned char QGLFunctions::glIsRenderbuffer(unsigned int)
-	?initializeGLFunctions@QGLFunctions@@QAEXPBVQGLContext@@@Z @ 842 NONAME ; void QGLFunctions::initializeGLFunctions(class QGLContext const *)
-	??0QGLFunctions@@QAE@XZ @ 843 NONAME ; QGLFunctions::QGLFunctions(void)
-	?glVertexAttrib2fv@QGLFunctions@@QAEXIPBM@Z @ 844 NONAME ; void QGLFunctions::glVertexAttrib2fv(unsigned int, float const *)
-	?isInitialized@QGLFunctions@@CA_NPBUQGLFunctionsPrivate@@@Z @ 845 NONAME ; bool QGLFunctions::isInitialized(struct QGLFunctionsPrivate const *)
-	?glGetUniformiv@QGLFunctions@@QAEXIHPAH@Z @ 846 NONAME ; void QGLFunctions::glGetUniformiv(unsigned int, int, int *)
-	?glBlendEquation@QGLFunctions@@QAEXI@Z @ 847 NONAME ; void QGLFunctions::glBlendEquation(unsigned int)
-	?glFramebufferRenderbuffer@QGLFunctions@@QAEXIIII@Z @ 848 NONAME ; void QGLFunctions::glFramebufferRenderbuffer(unsigned int, unsigned int, unsigned int, unsigned int)
-	?glUniform4i@QGLFunctions@@QAEXHHHHH@Z @ 849 NONAME ; void QGLFunctions::glUniform4i(int, int, int, int, int)
-	?glUniform3fv@QGLFunctions@@QAEXHHPBM@Z @ 850 NONAME ; void QGLFunctions::glUniform3fv(int, int, float const *)
-	?value@QGLContextResourceBase@@QAEPAXPBVQGLContext@@@Z @ 851 NONAME ; void * QGLContextResourceBase::value(class QGLContext const *)
-	?glBlendFuncSeparate@QGLFunctions@@QAEXIIII@Z @ 852 NONAME ; void QGLFunctions::glBlendFuncSeparate(unsigned int, unsigned int, unsigned int, unsigned int)
-	?glCompressedTexSubImage2D@QGLFunctions@@QAEXIHHHHHIHPBX@Z @ 853 NONAME ; void QGLFunctions::glCompressedTexSubImage2D(unsigned int, int, int, int, int, int, unsigned int, int, void const *)
-	?freeResource@QGLTextureGlyphCache@@UAEXPAX@Z @ 854 NONAME ; void QGLTextureGlyphCache::freeResource(void *)
-	?value@QGLContextGroupResourceBase@@QAEPAXPBVQGLContext@@@Z @ 855 NONAME ; void * QGLContextGroupResourceBase::value(class QGLContext const *)
-	?glUniform3iv@QGLFunctions@@QAEXHHPBH@Z @ 856 NONAME ; void QGLFunctions::glUniform3iv(int, int, int const *)
-	?mipmap@QGLFramebufferObjectFormat@@QBE_NXZ @ 857 NONAME ; bool QGLFramebufferObjectFormat::mipmap(void) const
-	?qt_extensionFuncs@QGLContextPrivate@@2UQGLExtensionFuncs@@A @ 858 NONAME ; struct QGLExtensionFuncs QGLContextPrivate::qt_extensionFuncs
-	?glShaderSource@QGLFunctions@@QAEXIHPAPBDPBH@Z @ 859 NONAME ; void QGLFunctions::glShaderSource(unsigned int, int, char const * *, int const *)
-	?glGetShaderPrecisionFormat@QGLFunctions@@QAEXIIPAH0@Z @ 860 NONAME ; void QGLFunctions::glGetShaderPrecisionFormat(unsigned int, unsigned int, int *, int *)
-	?insert@QGLContextGroupResourceBase@@QAEXPBVQGLContext@@PAX@Z @ 861 NONAME ; void QGLContextGroupResourceBase::insert(class QGLContext const *, void *)
-	?staticMetaObjectExtraData@QGLWindowSurface@@0UQMetaObjectExtraData@@B @ 862 NONAME ; struct QMetaObjectExtraData const QGLWindowSurface::staticMetaObjectExtraData
-	?qt_static_metacall@QGLSignalProxy@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 863 NONAME ; void QGLSignalProxy::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QGLSignalProxy@@0UQMetaObjectExtraData@@B @ 864 NONAME ; struct QMetaObjectExtraData const QGLSignalProxy::staticMetaObjectExtraData
-	?qt_static_metacall@QGLWindowSurface@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 865 NONAME ; void QGLWindowSurface::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QGLWidget@@0UQMetaObjectExtraData@@B @ 866 NONAME ; struct QMetaObjectExtraData const QGLWidget::staticMetaObjectExtraData
-	?qt_static_metacall@QGraphicsShaderEffect@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 867 NONAME ; void QGraphicsShaderEffect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QGLEngineShaderManager@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 868 NONAME ; void QGLEngineShaderManager::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QGLShader@@0UQMetaObjectExtraData@@B @ 869 NONAME ; struct QMetaObjectExtraData const QGLShader::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGLShaderProgram@@0UQMetaObjectExtraData@@B @ 870 NONAME ; struct QMetaObjectExtraData const QGLShaderProgram::staticMetaObjectExtraData
-	?qt_static_metacall@QGLWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 871 NONAME ; void QGLWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QGLShader@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 872 NONAME ; void QGLShader::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QGraphicsShaderEffect@@0UQMetaObjectExtraData@@B @ 873 NONAME ; struct QMetaObjectExtraData const QGraphicsShaderEffect::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGLEngineShaderManager@@0UQMetaObjectExtraData@@B @ 874 NONAME ; struct QMetaObjectExtraData const QGLEngineShaderManager::staticMetaObjectExtraData
-	?qt_static_metacall@QGLShaderProgram@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 875 NONAME ; void QGLShaderProgram::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?glVertexAttrib3f@QGLFunctions@@QAEXIMMM@Z @ 876 NONAME ; void QGLFunctions::glVertexAttrib3f(unsigned int, float, float, float)
-	?glVertexAttrib1fv@QGLFunctions@@QAEXIPBM@Z @ 877 NONAME ; void QGLFunctions::glVertexAttrib1fv(unsigned int, float const *)
-	?glIsBuffer@QGLFunctions@@QAEEI@Z @ 878 NONAME ; unsigned char QGLFunctions::glIsBuffer(unsigned int)
+	?glVertexAttrib3f@QGLFunctions@@QAEXIMMM@Z @ 727 NONAME ; void QGLFunctions::glVertexAttrib3f(unsigned int, float, float, float)
+	?glVertexAttrib1fv@QGLFunctions@@QAEXIPBM@Z @ 728 NONAME ; void QGLFunctions::glVertexAttrib1fv(unsigned int, float const *)
+	?glIsBuffer@QGLFunctions@@QAEEI@Z @ 729 NONAME ; unsigned char QGLFunctions::glIsBuffer(unsigned int)
+	?glGetActiveAttrib@QGLFunctions@@QAEXIIHPAH0PAIPAD@Z @ 730 NONAME ; void QGLFunctions::glGetActiveAttrib(unsigned int, unsigned int, int, int *, int *, unsigned int *, char *)
+	?glBindFramebuffer@QGLFunctions@@QAEXII@Z @ 731 NONAME ; void QGLFunctions::glBindFramebuffer(unsigned int, unsigned int)
+	?glBufferData@QGLFunctions@@QAEXIHPBXI@Z @ 732 NONAME ; void QGLFunctions::glBufferData(unsigned int, int, void const *, unsigned int)
+	?glValidateProgram@QGLFunctions@@QAEXI@Z @ 733 NONAME ; void QGLFunctions::glValidateProgram(unsigned int)
+	?glUniform1f@QGLFunctions@@QAEXHM@Z @ 734 NONAME ; void QGLFunctions::glUniform1f(int, float)
+	?glDetachShader@QGLFunctions@@QAEXII@Z @ 735 NONAME ; void QGLFunctions::glDetachShader(unsigned int, unsigned int)
+	?glDeleteProgram@QGLFunctions@@QAEXI@Z @ 736 NONAME ; void QGLFunctions::glDeleteProgram(unsigned int)
+	??_EQGLContextResourceBase@@UAE@I@Z @ 737 NONAME ; QGLContextResourceBase::~QGLContextResourceBase(unsigned int)
+	?glUniform2f@QGLFunctions@@QAEXHMM@Z @ 738 NONAME ; void QGLFunctions::glUniform2f(int, float, float)
+	?glIsProgram@QGLFunctions@@QAEEI@Z @ 739 NONAME ; unsigned char QGLFunctions::glIsProgram(unsigned int)
+	?openGLFeatures@QGLFunctions@@QBE?AV?$QFlags@W4OpenGLFeature@QGLFunctions@@@@XZ @ 740 NONAME ; class QFlags<enum QGLFunctions::OpenGLFeature> QGLFunctions::openGLFeatures(void) const
+	?glReleaseShaderCompiler@QGLFunctions@@QAEXXZ @ 741 NONAME ; void QGLFunctions::glReleaseShaderCompiler(void)
+	??0QGLTextureGlyphCache@@QAE@PBVQGLContext@@W4Type@QFontEngineGlyphCache@@ABVQTransform@@@Z @ 742 NONAME ; QGLTextureGlyphCache::QGLTextureGlyphCache(class QGLContext const *, enum QFontEngineGlyphCache::Type, class QTransform const &)
+	?context@QGLTextureGlyphCache@@QBEPBVQGLContext@@XZ @ 743 NONAME ; class QGLContext const * QGLTextureGlyphCache::context(void) const
+	?glGenRenderbuffers@QGLFunctions@@QAEXHPAI@Z @ 744 NONAME ; void QGLFunctions::glGenRenderbuffers(int, unsigned int *)
+	?glBindBuffer@QGLFunctions@@QAEXII@Z @ 745 NONAME ; void QGLFunctions::glBindBuffer(unsigned int, unsigned int)
+	?glUniformMatrix3fv@QGLFunctions@@QAEXHHEPBM@Z @ 746 NONAME ; void QGLFunctions::glUniformMatrix3fv(int, int, unsigned char, float const *)
+	?glGenerateMipmap@QGLFunctions@@QAEXI@Z @ 747 NONAME ; void QGLFunctions::glGenerateMipmap(unsigned int)
+	?hasOpenGLFeature@QGLFunctions@@QBE_NW4OpenGLFeature@1@@Z @ 748 NONAME ; bool QGLFunctions::hasOpenGLFeature(enum QGLFunctions::OpenGLFeature) const
+	?glGetAttachedShaders@QGLFunctions@@QAEXIHPAHPAI@Z @ 749 NONAME ; void QGLFunctions::glGetAttachedShaders(unsigned int, int, int *, unsigned int *)
+	?glDeleteShader@QGLFunctions@@QAEXI@Z @ 750 NONAME ; void QGLFunctions::glDeleteShader(unsigned int)
+	?simpleProgram@QGLEngineSharedShaders@@QAEPAVQGLShaderProgram@@XZ @ 751 NONAME ; class QGLShaderProgram * QGLEngineSharedShaders::simpleProgram(void)
+	?blitProgram@QGLEngineSharedShaders@@QAEPAVQGLShaderProgram@@XZ @ 752 NONAME ; class QGLShaderProgram * QGLEngineSharedShaders::blitProgram(void)
+	?staticMetaObjectExtraData@QGLWindowSurface@@0UQMetaObjectExtraData@@B @ 753 NONAME ; struct QMetaObjectExtraData const QGLWindowSurface::staticMetaObjectExtraData
+	?qt_static_metacall@QGLSignalProxy@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 754 NONAME ; void QGLSignalProxy::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?glLinkProgram@QGLFunctions@@QAEXI@Z @ 755 NONAME ; void QGLFunctions::glLinkProgram(unsigned int)
+	?glUseProgram@QGLFunctions@@QAEXI@Z @ 756 NONAME ; void QGLFunctions::glUseProgram(unsigned int)
+	??0QGLFunctions@@QAE@PBVQGLContext@@@Z @ 757 NONAME ; QGLFunctions::QGLFunctions(class QGLContext const *)
+	?staticMetaObjectExtraData@QGLSignalProxy@@0UQMetaObjectExtraData@@B @ 758 NONAME ; struct QMetaObjectExtraData const QGLSignalProxy::staticMetaObjectExtraData
+	?glGetBufferParameteriv@QGLFunctions@@QAEXIIPAH@Z @ 759 NONAME ; void QGLFunctions::glGetBufferParameteriv(unsigned int, unsigned int, int *)
+	?glGenBuffers@QGLFunctions@@QAEXHPAI@Z @ 760 NONAME ; void QGLFunctions::glGenBuffers(int, unsigned int *)
+	?glGetShaderiv@QGLFunctions@@QAEXIIPAH@Z @ 761 NONAME ; void QGLFunctions::glGetShaderiv(unsigned int, unsigned int, int *)
+	?fillTexture@QGLTextureGlyphCache@@UAEXABUCoord@QTextureGlyphCache@@IUQFixed@@@Z @ 762 NONAME ; void QGLTextureGlyphCache::fillTexture(struct QTextureGlyphCache::Coord const &, unsigned int, struct QFixed)
+	?glUniform2fv@QGLFunctions@@QAEXHHPBM@Z @ 763 NONAME ; void QGLFunctions::glUniform2fv(int, int, float const *)
+	??0QGLContextGroupResourceBase@@QAE@XZ @ 764 NONAME ; QGLContextGroupResourceBase::QGLContextGroupResourceBase(void)
+	?glGetFramebufferAttachmentParameteriv@QGLFunctions@@QAEXIIIPAH@Z @ 765 NONAME ; void QGLFunctions::glGetFramebufferAttachmentParameteriv(unsigned int, unsigned int, unsigned int, int *)
+	?qt_static_metacall@QGLWindowSurface@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 766 NONAME ; void QGLWindowSurface::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QGLEngineSharedShaders@@QAE@PBVQGLContext@@@Z @ 767 NONAME ; QGLEngineSharedShaders::QGLEngineSharedShaders(class QGLContext const *)
+	?staticMetaObjectExtraData@QGLWidget@@0UQMetaObjectExtraData@@B @ 768 NONAME ; struct QMetaObjectExtraData const QGLWidget::staticMetaObjectExtraData
+	?cleanup@QGLContextGroupResourceBase@@QAEXPBVQGLContext@@PAX@Z @ 769 NONAME ; void QGLContextGroupResourceBase::cleanup(class QGLContext const *, void *)
+	?glUniform2iv@QGLFunctions@@QAEXHHPBH@Z @ 770 NONAME ; void QGLFunctions::glUniform2iv(int, int, int const *)
+	?glCompileShader@QGLFunctions@@QAEXI@Z @ 771 NONAME ; void QGLFunctions::glCompileShader(unsigned int)
+	?qt_static_metacall@QGraphicsShaderEffect@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 772 NONAME ; void QGraphicsShaderEffect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qShaderSnippets@QGLEngineSharedShaders@@0PAPBDA @ 773 NONAME ; char const * * QGLEngineSharedShaders::qShaderSnippets
+	?isFlipped@QGLPaintDevice@@UBE_NXZ @ 774 NONAME ; bool QGLPaintDevice::isFlipped(void) const
+	?shadersForContext@QGLEngineSharedShaders@@SAPAV1@PBVQGLContext@@@Z @ 775 NONAME ; class QGLEngineSharedShaders * QGLEngineSharedShaders::shadersForContext(class QGLContext const *)
+	?cleanupCustomStage@QGLEngineSharedShaders@@QAEXPAVQGLCustomShaderStage@@@Z @ 776 NONAME ; void QGLEngineSharedShaders::cleanupCustomStage(class QGLCustomShaderStage *)
+	?glGetProgramiv@QGLFunctions@@QAEXIIPAH@Z @ 777 NONAME ; void QGLFunctions::glGetProgramiv(unsigned int, unsigned int, int *)
+	?glClearDepthf@QGLFunctions@@QAEXM@Z @ 778 NONAME ; void QGLFunctions::glClearDepthf(float)
+	?qt_static_metacall@QGLEngineShaderManager@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 779 NONAME ; void QGLEngineShaderManager::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?glIsFramebuffer@QGLFunctions@@QAEEI@Z @ 780 NONAME ; unsigned char QGLFunctions::glIsFramebuffer(unsigned int)
+	?getStaticMetaObject@QGLEngineSharedShaders@@SAABUQMetaObject@@XZ @ 781 NONAME ; struct QMetaObject const & QGLEngineSharedShaders::getStaticMetaObject(void)
+	?glUniform4f@QGLFunctions@@QAEXHMMMM@Z @ 782 NONAME ; void QGLFunctions::glUniform4f(int, float, float, float, float)
+	?glUniform3f@QGLFunctions@@QAEXHMMM@Z @ 783 NONAME ; void QGLFunctions::glUniform3f(int, float, float, float)
+	?staticMetaObjectExtraData@QGLShader@@0UQMetaObjectExtraData@@B @ 784 NONAME ; struct QMetaObjectExtraData const QGLShader::staticMetaObjectExtraData
+	??1QGLEngineSharedShaders@@QAE@XZ @ 785 NONAME ; QGLEngineSharedShaders::~QGLEngineSharedShaders(void)
+	?glDeleteRenderbuffers@QGLFunctions@@QAEXHPBI@Z @ 786 NONAME ; void QGLFunctions::glDeleteRenderbuffers(int, unsigned int const *)
+	?glVertexAttrib1f@QGLFunctions@@QAEXIM@Z @ 787 NONAME ; void QGLFunctions::glVertexAttrib1f(unsigned int, float)
+	?glVertexAttrib4f@QGLFunctions@@QAEXIMMMM@Z @ 788 NONAME ; void QGLFunctions::glVertexAttrib4f(unsigned int, float, float, float, float)
+	?glSampleCoverage@QGLFunctions@@QAEXME@Z @ 789 NONAME ; void QGLFunctions::glSampleCoverage(float, unsigned char)
+	?glGetActiveUniform@QGLFunctions@@QAEXIIHPAH0PAIPAD@Z @ 790 NONAME ; void QGLFunctions::glGetActiveUniform(unsigned int, unsigned int, int, int *, int *, unsigned int *, char *)
+	??_EQGLContextGroupResourceBase@@UAE@I@Z @ 791 NONAME ; QGLContextGroupResourceBase::~QGLContextGroupResourceBase(unsigned int)
+	?findProgramInCache@QGLEngineSharedShaders@@QAEPAVQGLEngineShaderProg@@ABV2@@Z @ 792 NONAME ; class QGLEngineShaderProg * QGLEngineSharedShaders::findProgramInCache(class QGLEngineShaderProg const &)
+	?glStencilOpSeparate@QGLFunctions@@QAEXIIII@Z @ 793 NONAME ; void QGLFunctions::glStencilOpSeparate(unsigned int, unsigned int, unsigned int, unsigned int)
+	?staticMetaObjectExtraData@QGLShaderProgram@@0UQMetaObjectExtraData@@B @ 794 NONAME ; struct QMetaObjectExtraData const QGLShaderProgram::staticMetaObjectExtraData
+	?glCheckFramebufferStatus@QGLFunctions@@QAEII@Z @ 795 NONAME ; unsigned int QGLFunctions::glCheckFramebufferStatus(unsigned int)
+	?glDepthRangef@QGLFunctions@@QAEXMM@Z @ 796 NONAME ; void QGLFunctions::glDepthRangef(float, float)
+	??1QGLFunctions@@QAE@XZ @ 797 NONAME ; QGLFunctions::~QGLFunctions(void)
+	?glStencilMaskSeparate@QGLFunctions@@QAEXII@Z @ 798 NONAME ; void QGLFunctions::glStencilMaskSeparate(unsigned int, unsigned int)
+	?drawPixmapFragments@QGL2PaintEngineEx@@UAEXPBVQRectF@@0HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 799 NONAME ; void QGL2PaintEngineEx::drawPixmapFragments(class QRectF const *, class QRectF const *, int, class QPixmap const &, class QFlags<enum QPainter::PixmapFragmentHint>)
+	?glBlendColor@QGLFunctions@@QAEXMMMM@Z @ 800 NONAME ; void QGLFunctions::glBlendColor(float, float, float, float)
+	?glUniform1fv@QGLFunctions@@QAEXHHPBM@Z @ 801 NONAME ; void QGLFunctions::glUniform1fv(int, int, float const *)
+	??1QGLContextResourceBase@@UAE@XZ @ 802 NONAME ; QGLContextResourceBase::~QGLContextResourceBase(void)
+	?glCreateProgram@QGLFunctions@@QAEIXZ @ 803 NONAME ; unsigned int QGLFunctions::glCreateProgram(void)
+	?glVertexAttrib2f@QGLFunctions@@QAEXIMM@Z @ 804 NONAME ; void QGLFunctions::glVertexAttrib2f(unsigned int, float, float)
+	?glUniformMatrix2fv@QGLFunctions@@QAEXHHEPBM@Z @ 805 NONAME ; void QGLFunctions::glUniformMatrix2fv(int, int, unsigned char, float const *)
+	?glBufferSubData@QGLFunctions@@QAEXIHHPBX@Z @ 806 NONAME ; void QGLFunctions::glBufferSubData(unsigned int, int, int, void const *)
+	?glUniform1iv@QGLFunctions@@QAEXHHPBH@Z @ 807 NONAME ; void QGLFunctions::glUniform1iv(int, int, int const *)
+	?qt_resolve_buffer_extensions@@YA_NPAVQGLContext@@@Z @ 808 NONAME ; bool qt_resolve_buffer_extensions(class QGLContext *)
+	?glUniform1i@QGLFunctions@@QAEXHH@Z @ 809 NONAME ; void QGLFunctions::glUniform1i(int, int)
+	?glVertexAttrib4fv@QGLFunctions@@QAEXIPBM@Z @ 810 NONAME ; void QGLFunctions::glVertexAttrib4fv(unsigned int, float const *)
+	?glDeleteFramebuffers@QGLFunctions@@QAEXHPBI@Z @ 811 NONAME ; void QGLFunctions::glDeleteFramebuffers(int, unsigned int const *)
+	?glGetVertexAttribfv@QGLFunctions@@QAEXIIPAM@Z @ 812 NONAME ; void QGLFunctions::glGetVertexAttribfv(unsigned int, unsigned int, float *)
+	?glGetProgramInfoLog@QGLFunctions@@QAEXIHPAHPAD@Z @ 813 NONAME ; void QGLFunctions::glGetProgramInfoLog(unsigned int, int, int *, char *)
+	?glGetShaderInfoLog@QGLFunctions@@QAEXIHPAHPAD@Z @ 814 NONAME ; void QGLFunctions::glGetShaderInfoLog(unsigned int, int, int *, char *)
+	?glEnableVertexAttribArray@QGLFunctions@@QAEXI@Z @ 815 NONAME ; void QGLFunctions::glEnableVertexAttribArray(unsigned int)
+	?glGetVertexAttribiv@QGLFunctions@@QAEXIIPAH@Z @ 816 NONAME ; void QGLFunctions::glGetVertexAttribiv(unsigned int, unsigned int, int *)
+	?qt_static_metacall@QGLWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 817 NONAME ; void QGLWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?glCompressedTexImage2D@QGLFunctions@@QAEXIHIHHHHPBX@Z @ 818 NONAME ; void QGLFunctions::glCompressedTexImage2D(unsigned int, int, unsigned int, int, int, int, int, void const *)
+	?glGetAttribLocation@QGLFunctions@@QAEHIPBD@Z @ 819 NONAME ; int QGLFunctions::glGetAttribLocation(unsigned int, char const *)
+	?glActiveTexture@QGLFunctions@@QAEXI@Z @ 820 NONAME ; void QGLFunctions::glActiveTexture(unsigned int)
+	?glUniform4fv@QGLFunctions@@QAEXHHPBM@Z @ 821 NONAME ; void QGLFunctions::glUniform4fv(int, int, float const *)
+	?qt_static_metacall@QGLShader@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 822 NONAME ; void QGLShader::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?glCreateShader@QGLFunctions@@QAEII@Z @ 823 NONAME ; unsigned int QGLFunctions::glCreateShader(unsigned int)
+	?glAttachShader@QGLFunctions@@QAEXII@Z @ 824 NONAME ; void QGLFunctions::glAttachShader(unsigned int, unsigned int)
+	?glRenderbufferStorage@QGLFunctions@@QAEXIIHH@Z @ 825 NONAME ; void QGLFunctions::glRenderbufferStorage(unsigned int, unsigned int, int, int)
+	?glVertexAttribPointer@QGLFunctions@@QAEXIHIEHPBX@Z @ 826 NONAME ; void QGLFunctions::glVertexAttribPointer(unsigned int, int, unsigned int, unsigned char, int, void const *)
+	?glUniform4iv@QGLFunctions@@QAEXHHPBH@Z @ 827 NONAME ; void QGLFunctions::glUniform4iv(int, int, int const *)
+	?glDisableVertexAttribArray@QGLFunctions@@QAEXI@Z @ 828 NONAME ; void QGLFunctions::glDisableVertexAttribArray(unsigned int)
+	?features@QGLWindowSurface@@UBE?AV?$QFlags@W4WindowSurfaceFeature@QWindowSurface@@@@XZ @ 829 NONAME ; class QFlags<enum QWindowSurface::WindowSurfaceFeature> QGLWindowSurface::features(void) const
+	?glIsShader@QGLFunctions@@QAEEI@Z @ 830 NONAME ; unsigned char QGLFunctions::glIsShader(unsigned int)
+	?glShaderBinary@QGLFunctions@@QAEXHPBIIPBXH@Z @ 831 NONAME ; void QGLFunctions::glShaderBinary(int, unsigned int const *, unsigned int, void const *, int)
+	?glGenFramebuffers@QGLFunctions@@QAEXHPAI@Z @ 832 NONAME ; void QGLFunctions::glGenFramebuffers(int, unsigned int *)
+	?glVertexAttrib3fv@QGLFunctions@@QAEXIPBM@Z @ 833 NONAME ; void QGLFunctions::glVertexAttrib3fv(unsigned int, float const *)
+	?glGetVertexAttribPointerv@QGLFunctions@@QAEXIIPAPAX@Z @ 834 NONAME ; void QGLFunctions::glGetVertexAttribPointerv(unsigned int, unsigned int, void * *)
+	?staticMetaObjectExtraData@QGraphicsShaderEffect@@0UQMetaObjectExtraData@@B @ 835 NONAME ; struct QMetaObjectExtraData const QGraphicsShaderEffect::staticMetaObjectExtraData
+	?glUniformMatrix4fv@QGLFunctions@@QAEXHHEPBM@Z @ 836 NONAME ; void QGLFunctions::glUniformMatrix4fv(int, int, unsigned char, float const *)
+	?setContext@QGLTextureGlyphCache@@QAEXPBVQGLContext@@@Z @ 837 NONAME ; void QGLTextureGlyphCache::setContext(class QGLContext const *)
+	?glDeleteBuffers@QGLFunctions@@QAEXHPBI@Z @ 838 NONAME ; void QGLFunctions::glDeleteBuffers(int, unsigned int const *)
+	?glBindRenderbuffer@QGLFunctions@@QAEXII@Z @ 839 NONAME ; void QGLFunctions::glBindRenderbuffer(unsigned int, unsigned int)
+	?glStencilFuncSeparate@QGLFunctions@@QAEXIIHI@Z @ 840 NONAME ; void QGLFunctions::glStencilFuncSeparate(unsigned int, unsigned int, int, unsigned int)
+	?staticMetaObjectExtraData@QGLEngineShaderManager@@0UQMetaObjectExtraData@@B @ 841 NONAME ; struct QMetaObjectExtraData const QGLEngineShaderManager::staticMetaObjectExtraData
+	?glGetUniformLocation@QGLFunctions@@QAEHIPBD@Z @ 842 NONAME ; int QGLFunctions::glGetUniformLocation(unsigned int, char const *)
+	?glGetRenderbufferParameteriv@QGLFunctions@@QAEXIIPAH@Z @ 843 NONAME ; void QGLFunctions::glGetRenderbufferParameteriv(unsigned int, unsigned int, int *)
+	?glBindAttribLocation@QGLFunctions@@QAEXIIPBD@Z @ 844 NONAME ; void QGLFunctions::glBindAttribLocation(unsigned int, unsigned int, char const *)
+	?glGetShaderSource@QGLFunctions@@QAEXIHPAHPAD@Z @ 845 NONAME ; void QGLFunctions::glGetShaderSource(unsigned int, int, int *, char *)
+	?setMipmap@QGLFramebufferObjectFormat@@QAEX_N@Z @ 846 NONAME ; void QGLFramebufferObjectFormat::setMipmap(bool)
+	??1QGLContextGroupResourceBase@@UAE@XZ @ 847 NONAME ; QGLContextGroupResourceBase::~QGLContextGroupResourceBase(void)
+	?glFramebufferTexture2D@QGLFunctions@@QAEXIIIIH@Z @ 848 NONAME ; void QGLFunctions::glFramebufferTexture2D(unsigned int, unsigned int, unsigned int, unsigned int, int)
+	?glBlendEquationSeparate@QGLFunctions@@QAEXII@Z @ 849 NONAME ; void QGLFunctions::glBlendEquationSeparate(unsigned int, unsigned int)
+	?insert@QGLContextResourceBase@@QAEXPBVQGLContext@@PAX@Z @ 850 NONAME ; void QGLContextResourceBase::insert(class QGLContext const *, void *)
+	??_EQGLEngineSharedShaders@@QAE@I@Z @ 851 NONAME ; QGLEngineSharedShaders::~QGLEngineSharedShaders(unsigned int)
+	?glUniform2i@QGLFunctions@@QAEXHHH@Z @ 852 NONAME ; void QGLFunctions::glUniform2i(int, int, int)
+	?glGetUniformfv@QGLFunctions@@QAEXIHPAM@Z @ 853 NONAME ; void QGLFunctions::glGetUniformfv(unsigned int, int, float *)
+	?glUniform3i@QGLFunctions@@QAEXHHHH@Z @ 854 NONAME ; void QGLFunctions::glUniform3i(int, int, int, int)
+	?staticMetaObject@QGLEngineSharedShaders@@2UQMetaObject@@B @ 855 NONAME ; struct QMetaObject const QGLEngineSharedShaders::staticMetaObject
+	?cleanup@QGLContextGroupResourceBase@@QAEXPBVQGLContext@@@Z @ 856 NONAME ; void QGLContextGroupResourceBase::cleanup(class QGLContext const *)
+	?glIsRenderbuffer@QGLFunctions@@QAEEI@Z @ 857 NONAME ; unsigned char QGLFunctions::glIsRenderbuffer(unsigned int)
+	?initializeGLFunctions@QGLFunctions@@QAEXPBVQGLContext@@@Z @ 858 NONAME ; void QGLFunctions::initializeGLFunctions(class QGLContext const *)
+	??0QGLFunctions@@QAE@XZ @ 859 NONAME ; QGLFunctions::QGLFunctions(void)
+	?glVertexAttrib2fv@QGLFunctions@@QAEXIPBM@Z @ 860 NONAME ; void QGLFunctions::glVertexAttrib2fv(unsigned int, float const *)
+	?isInitialized@QGLFunctions@@CA_NPBUQGLFunctionsPrivate@@@Z @ 861 NONAME ; bool QGLFunctions::isInitialized(struct QGLFunctionsPrivate const *)
+	?glGetUniformiv@QGLFunctions@@QAEXIHPAH@Z @ 862 NONAME ; void QGLFunctions::glGetUniformiv(unsigned int, int, int *)
+	?glBlendEquation@QGLFunctions@@QAEXI@Z @ 863 NONAME ; void QGLFunctions::glBlendEquation(unsigned int)
+	?glFramebufferRenderbuffer@QGLFunctions@@QAEXIIII@Z @ 864 NONAME ; void QGLFunctions::glFramebufferRenderbuffer(unsigned int, unsigned int, unsigned int, unsigned int)
+	?glUniform4i@QGLFunctions@@QAEXHHHHH@Z @ 865 NONAME ; void QGLFunctions::glUniform4i(int, int, int, int, int)
+	?glUniform3fv@QGLFunctions@@QAEXHHPBM@Z @ 866 NONAME ; void QGLFunctions::glUniform3fv(int, int, float const *)
+	?value@QGLContextResourceBase@@QAEPAXPBVQGLContext@@@Z @ 867 NONAME ; void * QGLContextResourceBase::value(class QGLContext const *)
+	?glBlendFuncSeparate@QGLFunctions@@QAEXIIII@Z @ 868 NONAME ; void QGLFunctions::glBlendFuncSeparate(unsigned int, unsigned int, unsigned int, unsigned int)
+	?glCompressedTexSubImage2D@QGLFunctions@@QAEXIHHHHHIHPBX@Z @ 869 NONAME ; void QGLFunctions::glCompressedTexSubImage2D(unsigned int, int, int, int, int, int, unsigned int, int, void const *)
+	?freeResource@QGLTextureGlyphCache@@UAEXPAX@Z @ 870 NONAME ; void QGLTextureGlyphCache::freeResource(void *)
+	?supportsTransformations@QGL2PaintEngineEx@@UBE_NMABVQTransform@@@Z @ 871 NONAME ; bool QGL2PaintEngineEx::supportsTransformations(float, class QTransform const &) const
+	?value@QGLContextGroupResourceBase@@QAEPAXPBVQGLContext@@@Z @ 872 NONAME ; void * QGLContextGroupResourceBase::value(class QGLContext const *)
+	?glUniform3iv@QGLFunctions@@QAEXHHPBH@Z @ 873 NONAME ; void QGLFunctions::glUniform3iv(int, int, int const *)
+	?mipmap@QGLFramebufferObjectFormat@@QBE_NXZ @ 874 NONAME ; bool QGLFramebufferObjectFormat::mipmap(void) const
+	?qt_extensionFuncs@QGLContextPrivate@@2UQGLExtensionFuncs@@A @ 875 NONAME ; struct QGLExtensionFuncs QGLContextPrivate::qt_extensionFuncs
+	?glShaderSource@QGLFunctions@@QAEXIHPAPBDPBH@Z @ 876 NONAME ; void QGLFunctions::glShaderSource(unsigned int, int, char const * *, int const *)
+	?glGetShaderPrecisionFormat@QGLFunctions@@QAEXIIPAH0@Z @ 877 NONAME ; void QGLFunctions::glGetShaderPrecisionFormat(unsigned int, unsigned int, int *, int *)
+	?qt_static_metacall@QGLShaderProgram@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 878 NONAME ; void QGLShaderProgram::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?insert@QGLContextGroupResourceBase@@QAEXPBVQGLContext@@PAX@Z @ 879 NONAME ; void QGLContextGroupResourceBase::insert(class QGLContext const *, void *)
+
diff --git a/src/s60installs/bwins/QtOpenVGu.def b/src/s60installs/bwins/QtOpenVGu.def
index afd7143..547931e 100644
--- a/src/s60installs/bwins/QtOpenVGu.def
+++ b/src/s60installs/bwins/QtOpenVGu.def
@@ -187,3 +187,4 @@ EXPORTS
 	?toVolatileImage@QVGPixmapData@@UBE?AVQVolatileImage@@XZ @ 186 NONAME ; class QVolatileImage QVGPixmapData::toVolatileImage(void) const
 	?supportsTransformations@QVGPaintEngine@@UBE_NMABVQTransform@@@Z @ 187 NONAME ; bool QVGPaintEngine::supportsTransformations(float, class QTransform const &) const
 	?features@QVGWindowSurface@@UBE?AV?$QFlags@W4WindowSurfaceFeature@QWindowSurface@@@@XZ @ 188 NONAME ; class QFlags<enum QWindowSurface::WindowSurfaceFeature> QVGWindowSurface::features(void) const
+
diff --git a/src/s60installs/bwins/QtScriptu.def b/src/s60installs/bwins/QtScriptu.def
index 709db1b..af80b54 100644
--- a/src/s60installs/bwins/QtScriptu.def
+++ b/src/s60installs/bwins/QtScriptu.def
@@ -405,8 +405,10 @@ EXPORTS
 	?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 &)
-	?qt_static_metacall@QScriptEngine@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 407 NONAME ; void QScriptEngine::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QScriptEngine@@0UQMetaObjectExtraData@@B @ 408 NONAME ; struct QMetaObjectExtraData const QScriptEngine::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QScriptExtensionPlugin@@0UQMetaObjectExtraData@@B @ 409 NONAME ; struct QMetaObjectExtraData const QScriptExtensionPlugin::staticMetaObjectExtraData
-	?qt_static_metacall@QScriptExtensionPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 410 NONAME ; void QScriptExtensionPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??0QScriptExtensionInterface@@QAE@XZ @ 407 NONAME ABSENT ; QScriptExtensionInterface::QScriptExtensionInterface(void)
+	??_EQScriptValue@@QAE@I@Z @ 408 NONAME ABSENT ; QScriptValue::~QScriptValue(unsigned int)
+	?staticMetaObjectExtraData@QScriptEngine@@0UQMetaObjectExtraData@@B @ 409 NONAME ; struct QMetaObjectExtraData const QScriptEngine::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QScriptExtensionPlugin@@0UQMetaObjectExtraData@@B @ 410 NONAME ; struct QMetaObjectExtraData const QScriptExtensionPlugin::staticMetaObjectExtraData
+	?qt_static_metacall@QScriptExtensionPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 411 NONAME ; void QScriptExtensionPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QScriptEngine@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 412 NONAME ; void QScriptEngine::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
 
diff --git a/src/s60installs/bwins/QtSqlu.def b/src/s60installs/bwins/QtSqlu.def
index 586850a..eba02f5 100644
--- a/src/s60installs/bwins/QtSqlu.def
+++ b/src/s60installs/bwins/QtSqlu.def
@@ -458,16 +458,20 @@ EXPORTS
 	?staticMetaObject@QSqlDriver@@2UQMetaObject@@B @ 457 NONAME ; struct QMetaObject const QSqlDriver::staticMetaObject
 	?staticMetaObject@QSqlQueryModel@@2UQMetaObject@@B @ 458 NONAME ; struct QMetaObject const QSqlQueryModel::staticMetaObject
 	?staticMetaObject@QSQLiteDriver@@2UQMetaObject@@B @ 459 NONAME ; struct QMetaObject const QSQLiteDriver::staticMetaObject
-	?qt_static_metacall@QSqlQueryModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 460 NONAME ; void QSqlQueryModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QSQLiteDriver@@0UQMetaObjectExtraData@@B @ 461 NONAME ; struct QMetaObjectExtraData const QSQLiteDriver::staticMetaObjectExtraData
-	?qt_static_metacall@QSqlTableModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 462 NONAME ; void QSqlTableModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QSqlTableModel@@0UQMetaObjectExtraData@@B @ 463 NONAME ; struct QMetaObjectExtraData const QSqlTableModel::staticMetaObjectExtraData
-	?qt_static_metacall@QSqlDriver@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 464 NONAME ; void QSqlDriver::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QSqlDriverPlugin@@0UQMetaObjectExtraData@@B @ 465 NONAME ; struct QMetaObjectExtraData const QSqlDriverPlugin::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QSqlDriver@@0UQMetaObjectExtraData@@B @ 466 NONAME ; struct QMetaObjectExtraData const QSqlDriver::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QSqlQueryModel@@0UQMetaObjectExtraData@@B @ 467 NONAME ; struct QMetaObjectExtraData const QSqlQueryModel::staticMetaObjectExtraData
-	?qt_static_metacall@QSQLiteDriver@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 468 NONAME ; void QSQLiteDriver::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QSqlRelationalTableModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 469 NONAME ; void QSqlRelationalTableModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QSqlRelationalTableModel@@0UQMetaObjectExtraData@@B @ 470 NONAME ; struct QMetaObjectExtraData const QSqlRelationalTableModel::staticMetaObjectExtraData
+	??4QSqlRelation@@QAEAAV0@ABV0@@Z @ 460 NONAME ABSENT ; class QSqlRelation & QSqlRelation::operator=(class QSqlRelation const &)
+	??0QSqlDriverFactoryInterface@@QAE@XZ @ 461 NONAME ABSENT ; QSqlDriverFactoryInterface::QSqlDriverFactoryInterface(void)
+	??0QSqlRelation@@QAE@ABV0@@Z @ 462 NONAME ABSENT ; QSqlRelation::QSqlRelation(class QSqlRelation const &)
+	?qt_static_metacall@QSqlRelationalTableModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 463 NONAME ; void QSqlRelationalTableModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QSQLiteDriver@@0UQMetaObjectExtraData@@B @ 464 NONAME ; struct QMetaObjectExtraData const QSQLiteDriver::staticMetaObjectExtraData
+	?qt_static_metacall@QSqlDriver@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 465 NONAME ; void QSqlDriver::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QSqlTableModel@@0UQMetaObjectExtraData@@B @ 466 NONAME ; struct QMetaObjectExtraData const QSqlTableModel::staticMetaObjectExtraData
+	?qt_static_metacall@QSqlTableModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 467 NONAME ; void QSqlTableModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QSqlRelationalTableModel@@0UQMetaObjectExtraData@@B @ 468 NONAME ; struct QMetaObjectExtraData const QSqlRelationalTableModel::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QSqlDriverPlugin@@0UQMetaObjectExtraData@@B @ 469 NONAME ; struct QMetaObjectExtraData const QSqlDriverPlugin::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QSqlDriver@@0UQMetaObjectExtraData@@B @ 470 NONAME ; struct QMetaObjectExtraData const QSqlDriver::staticMetaObjectExtraData
 	?qt_static_metacall@QSqlDriverPlugin@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 471 NONAME ; void QSqlDriverPlugin::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QSqlQueryModel@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 472 NONAME ; void QSqlQueryModel::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QSQLiteDriver@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 473 NONAME ; void QSQLiteDriver::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?setJoinMode@QSqlRelationalTableModel@@QAEXW4JoinMode@1@@Z @ 474 NONAME ; void QSqlRelationalTableModel::setJoinMode(enum QSqlRelationalTableModel::JoinMode)
+	?staticMetaObjectExtraData@QSqlQueryModel@@0UQMetaObjectExtraData@@B @ 475 NONAME ; struct QMetaObjectExtraData const QSqlQueryModel::staticMetaObjectExtraData
 
diff --git a/src/s60installs/bwins/QtSvgu.def b/src/s60installs/bwins/QtSvgu.def
index b0503f6..60835ca 100644
--- a/src/s60installs/bwins/QtSvgu.def
+++ b/src/s60installs/bwins/QtSvgu.def
@@ -146,10 +146,10 @@ EXPORTS
 	?staticMetaObject@QSvgWidget@@2UQMetaObject@@B @ 145 NONAME ; struct QMetaObject const QSvgWidget::staticMetaObject
 	?staticMetaObject@QGraphicsSvgItem@@2UQMetaObject@@B @ 146 NONAME ; struct QMetaObject const QGraphicsSvgItem::staticMetaObject
 	?staticMetaObject@QSvgRenderer@@2UQMetaObject@@B @ 147 NONAME ; struct QMetaObject const QSvgRenderer::staticMetaObject
-	?qt_static_metacall@QSvgWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 148 NONAME ; void QSvgWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@QSvgRenderer@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 149 NONAME ; void QSvgRenderer::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QSvgWidget@@0UQMetaObjectExtraData@@B @ 150 NONAME ; struct QMetaObjectExtraData const QSvgWidget::staticMetaObjectExtraData
-	?qt_static_metacall@QGraphicsSvgItem@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 151 NONAME ; void QGraphicsSvgItem::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QSvgRenderer@@0UQMetaObjectExtraData@@B @ 152 NONAME ; struct QMetaObjectExtraData const QSvgRenderer::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QGraphicsSvgItem@@0UQMetaObjectExtraData@@B @ 153 NONAME ; struct QMetaObjectExtraData const QGraphicsSvgItem::staticMetaObjectExtraData
+	?qt_static_metacall@QSvgRenderer@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 148 NONAME ; void QSvgRenderer::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QSvgWidget@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 149 NONAME ; void QSvgWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QSvgRenderer@@0UQMetaObjectExtraData@@B @ 150 NONAME ; struct QMetaObjectExtraData const QSvgRenderer::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@QGraphicsSvgItem@@0UQMetaObjectExtraData@@B @ 151 NONAME ; struct QMetaObjectExtraData const QGraphicsSvgItem::staticMetaObjectExtraData
+	?qt_static_metacall@QGraphicsSvgItem@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 152 NONAME ; void QGraphicsSvgItem::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QSvgWidget@@0UQMetaObjectExtraData@@B @ 153 NONAME ; struct QMetaObjectExtraData const QSvgWidget::staticMetaObjectExtraData
 
diff --git a/src/s60installs/bwins/QtTestu.def b/src/s60installs/bwins/QtTestu.def
index 486984a..087f210 100644
--- a/src/s60installs/bwins/QtTestu.def
+++ b/src/s60installs/bwins/QtTestu.def
@@ -169,5 +169,6 @@ EXPORTS
 	?current@QBenchmarkTestMethodData@@2PAV1@A @ 168 NONAME ; class QBenchmarkTestMethodData * QBenchmarkTestMethodData::current
 	?qt_static_metacall@QTestEventLoop@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 169 NONAME ; void QTestEventLoop::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
 	?startLogging@QTestLog@@SAXI@Z @ 170 NONAME ; void QTestLog::startLogging(unsigned int)
-	?staticMetaObjectExtraData@QTestEventLoop@@0UQMetaObjectExtraData@@B @ 171 NONAME ; struct QMetaObjectExtraData const QTestEventLoop::staticMetaObjectExtraData
+	?printAvailableTags@QTest@@3_NA @ 171 NONAME ; bool QTest::printAvailableTags
+	?staticMetaObjectExtraData@QTestEventLoop@@0UQMetaObjectExtraData@@B @ 172 NONAME ; struct QMetaObjectExtraData const QTestEventLoop::staticMetaObjectExtraData
 
diff --git a/src/s60installs/bwins/QtXmlPatternsu.def b/src/s60installs/bwins/QtXmlPatternsu.def
index 268201d..e3dacb9 100644
--- a/src/s60installs/bwins/QtXmlPatternsu.def
+++ b/src/s60installs/bwins/QtXmlPatternsu.def
@@ -277,8 +277,11 @@ EXPORTS
 	?writeEscapedAttribute@QXmlSerializer@@AAEXABVQString@@@Z @ 276 NONAME ; void QXmlSerializer::writeEscapedAttribute(class QString const &)
 	?staticMetaObject@QAbstractMessageHandler@@2UQMetaObject@@B @ 277 NONAME ; struct QMetaObject const QAbstractMessageHandler::staticMetaObject
 	?staticMetaObject@QAbstractUriResolver@@2UQMetaObject@@B @ 278 NONAME ; struct QMetaObject const QAbstractUriResolver::staticMetaObject
-	?qt_static_metacall@QAbstractUriResolver@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 279 NONAME ; void QAbstractUriResolver::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@QAbstractUriResolver@@0UQMetaObjectExtraData@@B @ 280 NONAME ; struct QMetaObjectExtraData const QAbstractUriResolver::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@QAbstractMessageHandler@@0UQMetaObjectExtraData@@B @ 281 NONAME ; struct QMetaObjectExtraData const QAbstractMessageHandler::staticMetaObjectExtraData
-	?qt_static_metacall@QAbstractMessageHandler@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 282 NONAME ; void QAbstractMessageHandler::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	??_EQXmlQuery@@QAE@I@Z @ 279 NONAME ABSENT ; QXmlQuery::~QXmlQuery(unsigned int)
+	??4QXmlNodeModelIndex@@QAEAAV0@ABV0@@Z @ 280 NONAME ABSENT ; class QXmlNodeModelIndex & QXmlNodeModelIndex::operator=(class QXmlNodeModelIndex const &)
+	??_EQXmlItem@@QAE@I@Z @ 281 NONAME ABSENT ; QXmlItem::~QXmlItem(unsigned int)
+	?staticMetaObjectExtraData@QAbstractUriResolver@@0UQMetaObjectExtraData@@B @ 282 NONAME ; struct QMetaObjectExtraData const QAbstractUriResolver::staticMetaObjectExtraData
+	?qt_static_metacall@QAbstractMessageHandler@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 283 NONAME ; void QAbstractMessageHandler::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@QAbstractUriResolver@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 284 NONAME ; void QAbstractUriResolver::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@QAbstractMessageHandler@@0UQMetaObjectExtraData@@B @ 285 NONAME ; struct QMetaObjectExtraData const QAbstractMessageHandler::staticMetaObjectExtraData
 
diff --git a/src/s60installs/bwins/QtXmlu.def b/src/s60installs/bwins/QtXmlu.def
index 744a744..c77f5ed 100644
--- a/src/s60installs/bwins/QtXmlu.def
+++ b/src/s60installs/bwins/QtXmlu.def
@@ -400,4 +400,11 @@ EXPORTS
 	?warning@QXmlDefaultHandler@@UAE_NABVQXmlParseException@@@Z @ 399 NONAME ; bool QXmlDefaultHandler::warning(class QXmlParseException const &)
 	?EndOfDocument@QXmlInputSource@@2GB @ 400 NONAME ; unsigned short const QXmlInputSource::EndOfDocument
 	?EndOfData@QXmlInputSource@@2GB @ 401 NONAME ; unsigned short const QXmlInputSource::EndOfData
+	??0QXmlContentHandler@@QAE@XZ @ 402 NONAME ABSENT ; QXmlContentHandler::QXmlContentHandler(void)
+	??0QXmlDTDHandler@@QAE@XZ @ 403 NONAME ABSENT ; QXmlDTDHandler::QXmlDTDHandler(void)
+	??0QXmlReader@@QAE@XZ @ 404 NONAME ABSENT ; QXmlReader::QXmlReader(void)
+	??0QXmlLexicalHandler@@QAE@XZ @ 405 NONAME ABSENT ; QXmlLexicalHandler::QXmlLexicalHandler(void)
+	??0QXmlDeclHandler@@QAE@XZ @ 406 NONAME ABSENT ; QXmlDeclHandler::QXmlDeclHandler(void)
+	??0QXmlEntityResolver@@QAE@XZ @ 407 NONAME ABSENT ; QXmlEntityResolver::QXmlEntityResolver(void)
+	??0QXmlErrorHandler@@QAE@XZ @ 408 NONAME ABSENT ; QXmlErrorHandler::QXmlErrorHandler(void)
 
diff --git a/src/s60installs/bwins/phononu.def b/src/s60installs/bwins/phononu.def
index 826f52d..67f91e5 100644
--- a/src/s60installs/bwins/phononu.def
+++ b/src/s60installs/bwins/phononu.def
@@ -570,32 +570,36 @@ EXPORTS
 	?setOutputDevice@PulseSupport@Phonon@@QAE_NVQString@@H@Z @ 569 NONAME ; bool Phonon::PulseSupport::setOutputDevice(class QString, int)
 	?qt_metacast@AudioDataOutput@Phonon@@UAEPAXPBD@Z @ 570 NONAME ; void * Phonon::AudioDataOutput::qt_metacast(char const *)
 	?clearStreamCache@PulseSupport@Phonon@@QAEXVQString@@@Z @ 571 NONAME ; void Phonon::PulseSupport::clearStreamCache(class QString)
-	?qt_static_metacall@MediaObject@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 572 NONAME ; void Phonon::MediaObject::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@AbstractMediaStream@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 573 NONAME ; void Phonon::AbstractMediaStream::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@MediaController@Phonon@@0UQMetaObjectExtraData@@B @ 574 NONAME ; struct QMetaObjectExtraData const Phonon::MediaController::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@AudioDataOutput@Phonon@@0UQMetaObjectExtraData@@B @ 575 NONAME ; struct QMetaObjectExtraData const Phonon::AudioDataOutput::staticMetaObjectExtraData
-	?qt_static_metacall@VolumeFaderEffect@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 576 NONAME ; void Phonon::VolumeFaderEffect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@AbstractMediaStream@Phonon@@0UQMetaObjectExtraData@@B @ 577 NONAME ; struct QMetaObjectExtraData const Phonon::AbstractMediaStream::staticMetaObjectExtraData
-	?qt_static_metacall@AbstractAudioOutput@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 578 NONAME ; void Phonon::AbstractAudioOutput::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@AudioDataOutput@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 579 NONAME ; void Phonon::AudioDataOutput::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@PulseSupport@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 580 NONAME ; void Phonon::PulseSupport::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@SeekSlider@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 581 NONAME ; void Phonon::SeekSlider::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@AudioOutput@Phonon@@0UQMetaObjectExtraData@@B @ 582 NONAME ; struct QMetaObjectExtraData const Phonon::AudioOutput::staticMetaObjectExtraData
-	?qt_static_metacall@MediaController@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 583 NONAME ; void Phonon::MediaController::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@VolumeSlider@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 584 NONAME ; void Phonon::VolumeSlider::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@VideoPlayer@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 585 NONAME ; void Phonon::VideoPlayer::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@Effect@Phonon@@0UQMetaObjectExtraData@@B @ 586 NONAME ; struct QMetaObjectExtraData const Phonon::Effect::staticMetaObjectExtraData
-	?qt_static_metacall@VideoWidget@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 587 NONAME ; void Phonon::VideoWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@VideoPlayer@Phonon@@0UQMetaObjectExtraData@@B @ 588 NONAME ; struct QMetaObjectExtraData const Phonon::VideoPlayer::staticMetaObjectExtraData
-	?qt_static_metacall@EffectWidget@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 589 NONAME ; void Phonon::EffectWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@VolumeSlider@Phonon@@0UQMetaObjectExtraData@@B @ 590 NONAME ; struct QMetaObjectExtraData const Phonon::VolumeSlider::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@AbstractAudioOutput@Phonon@@0UQMetaObjectExtraData@@B @ 591 NONAME ; struct QMetaObjectExtraData const Phonon::AbstractAudioOutput::staticMetaObjectExtraData
+	??_EEffectParameter@Phonon@@QAE@I@Z @ 572 NONAME ABSENT ; Phonon::EffectParameter::~EffectParameter(unsigned int)
+	??_EPath@Phonon@@QAE@I@Z @ 573 NONAME ABSENT ; Phonon::Path::~Path(unsigned int)
+	??_EMediaSource@Phonon@@QAE@I@Z @ 574 NONAME ABSENT ; Phonon::MediaSource::~MediaSource(unsigned int)
+	??_EObjectDescriptionData@Phonon@@QAE@I@Z @ 575 NONAME ABSENT ; Phonon::ObjectDescriptionData::~ObjectDescriptionData(unsigned int)
+	?qt_static_metacall@AbstractMediaStream@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 576 NONAME ; void Phonon::AbstractMediaStream::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@MediaObject@Phonon@@0UQMetaObjectExtraData@@B @ 577 NONAME ; struct QMetaObjectExtraData const Phonon::MediaObject::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@VolumeSlider@Phonon@@0UQMetaObjectExtraData@@B @ 578 NONAME ; struct QMetaObjectExtraData const Phonon::VolumeSlider::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@VolumeFaderEffect@Phonon@@0UQMetaObjectExtraData@@B @ 579 NONAME ; struct QMetaObjectExtraData const Phonon::VolumeFaderEffect::staticMetaObjectExtraData
+	?qt_static_metacall@VideoWidget@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 580 NONAME ; void Phonon::VideoWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@MediaObject@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 581 NONAME ; void Phonon::MediaObject::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@EffectWidget@Phonon@@0UQMetaObjectExtraData@@B @ 582 NONAME ; struct QMetaObjectExtraData const Phonon::EffectWidget::staticMetaObjectExtraData
+	?qt_static_metacall@VolumeFaderEffect@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 583 NONAME ; void Phonon::VolumeFaderEffect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@SeekSlider@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 584 NONAME ; void Phonon::SeekSlider::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@AudioOutput@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 585 NONAME ; void Phonon::AudioOutput::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@VideoPlayer@Phonon@@0UQMetaObjectExtraData@@B @ 586 NONAME ; struct QMetaObjectExtraData const Phonon::VideoPlayer::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@AbstractAudioOutput@Phonon@@0UQMetaObjectExtraData@@B @ 587 NONAME ; struct QMetaObjectExtraData const Phonon::AbstractAudioOutput::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@AudioOutput@Phonon@@0UQMetaObjectExtraData@@B @ 588 NONAME ; struct QMetaObjectExtraData const Phonon::AudioOutput::staticMetaObjectExtraData
+	?qt_static_metacall@PulseSupport@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 589 NONAME ; void Phonon::PulseSupport::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@AbstractMediaStream@Phonon@@0UQMetaObjectExtraData@@B @ 590 NONAME ; struct QMetaObjectExtraData const Phonon::AbstractMediaStream::staticMetaObjectExtraData
+	?qt_static_metacall@VideoPlayer@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 591 NONAME ; void Phonon::VideoPlayer::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
 	?staticMetaObjectExtraData@PulseSupport@Phonon@@0UQMetaObjectExtraData@@B @ 592 NONAME ; struct QMetaObjectExtraData const Phonon::PulseSupport::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@VideoWidget@Phonon@@0UQMetaObjectExtraData@@B @ 593 NONAME ; struct QMetaObjectExtraData const Phonon::VideoWidget::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@VolumeFaderEffect@Phonon@@0UQMetaObjectExtraData@@B @ 594 NONAME ; struct QMetaObjectExtraData const Phonon::VolumeFaderEffect::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@EffectWidget@Phonon@@0UQMetaObjectExtraData@@B @ 595 NONAME ; struct QMetaObjectExtraData const Phonon::EffectWidget::staticMetaObjectExtraData
-	?staticMetaObjectExtraData@SeekSlider@Phonon@@0UQMetaObjectExtraData@@B @ 596 NONAME ; struct QMetaObjectExtraData const Phonon::SeekSlider::staticMetaObjectExtraData
-	?qt_static_metacall@Effect@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 597 NONAME ; void Phonon::Effect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?qt_static_metacall@AudioOutput@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 598 NONAME ; void Phonon::AudioOutput::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
-	?staticMetaObjectExtraData@MediaObject@Phonon@@0UQMetaObjectExtraData@@B @ 599 NONAME ; struct QMetaObjectExtraData const Phonon::MediaObject::staticMetaObjectExtraData
+	?qt_static_metacall@AbstractAudioOutput@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 593 NONAME ; void Phonon::AbstractAudioOutput::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@MediaController@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 594 NONAME ; void Phonon::MediaController::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@Effect@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 595 NONAME ; void Phonon::Effect::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@Effect@Phonon@@0UQMetaObjectExtraData@@B @ 596 NONAME ; struct QMetaObjectExtraData const Phonon::Effect::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@AudioDataOutput@Phonon@@0UQMetaObjectExtraData@@B @ 597 NONAME ; struct QMetaObjectExtraData const Phonon::AudioDataOutput::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@SeekSlider@Phonon@@0UQMetaObjectExtraData@@B @ 598 NONAME ; struct QMetaObjectExtraData const Phonon::SeekSlider::staticMetaObjectExtraData
+	?qt_static_metacall@VolumeSlider@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 599 NONAME ; void Phonon::VolumeSlider::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?staticMetaObjectExtraData@VideoWidget@Phonon@@0UQMetaObjectExtraData@@B @ 600 NONAME ; struct QMetaObjectExtraData const Phonon::VideoWidget::staticMetaObjectExtraData
+	?staticMetaObjectExtraData@MediaController@Phonon@@0UQMetaObjectExtraData@@B @ 601 NONAME ; struct QMetaObjectExtraData const Phonon::MediaController::staticMetaObjectExtraData
+	?qt_static_metacall@EffectWidget@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 602 NONAME ; void Phonon::EffectWidget::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
+	?qt_static_metacall@AudioDataOutput@Phonon@@CAXPAVQObject@@W4Call@QMetaObject@@HPAPAX@Z @ 603 NONAME ; void Phonon::AudioDataOutput::qt_static_metacall(class QObject *, enum QMetaObject::Call, int, void * *)
 
diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index f0bf9fc..cf42b67 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -3717,450 +3717,449 @@ EXPORTS
 	_ZN23QCoreApplicationPrivate18symbianCommandLineEv @ 3716 NONAME
 	_ZNK11QMetaMethod8revisionEv @ 3717 NONAME
 	_ZNK13QMetaProperty8revisionEv @ 3718 NONAME
-	_ZN11QThreadPool11waitForDoneEi @ 3719 NONAME
-	_ZN12QSystemError8toStringEv @ 3720 NONAME
-	_ZN13QFSFileEngine4openE6QFlagsIN9QIODevice12OpenModeFlagEEP7__sFILES0_IN5QFile14FileHandleFlagEE @ 3721 NONAME
-	_ZN13QFSFileEngine4openE6QFlagsIN9QIODevice12OpenModeFlagEERK5RFileS0_IN5QFile14FileHandleFlagEE @ 3722 NONAME
-	_ZN13QFSFileEngine4openE6QFlagsIN9QIODevice12OpenModeFlagEEiS0_IN5QFile14FileHandleFlagEE @ 3723 NONAME
-	_ZN13QSharedMemory12setNativeKeyERK7QString @ 3724 NONAME
-	_ZN13QUnifiedTimer10timerEventEP11QTimerEvent @ 3725 NONAME
-	_ZN13QUnifiedTimer17ensureTimerUpdateEv @ 3726 NONAME
-	_ZN13QUnifiedTimer17registerAnimationEP18QAbstractAnimationb @ 3727 NONAME
-	_ZN13QUnifiedTimer17setTimingIntervalEi @ 3728 NONAME
-	_ZN13QUnifiedTimer19unregisterAnimationEP18QAbstractAnimation @ 3729 NONAME
-	_ZN13QUnifiedTimer20updateAnimationTimerEv @ 3730 NONAME
-	_ZN13QUnifiedTimer20updateAnimationsTimeEv @ 3731 NONAME
-	_ZN13QUnifiedTimer21restartAnimationTimerEv @ 3732 NONAME
-	_ZN13QUnifiedTimer22installAnimationDriverEP16QAnimationDriver @ 3733 NONAME
-	_ZN13QUnifiedTimer24registerRunningAnimationEP18QAbstractAnimation @ 3734 NONAME
-	_ZN13QUnifiedTimer26unregisterRunningAnimationEP18QAbstractAnimation @ 3735 NONAME
-	_ZN13QUnifiedTimer33closestPauseAnimationTimeToFinishEv @ 3736 NONAME
-	_ZN13QUnifiedTimer8instanceEb @ 3737 NONAME
-	_ZN13QUnifiedTimerC1Ev @ 3738 NONAME
-	_ZN13QUnifiedTimerC2Ev @ 3739 NONAME
-	_ZN16QAnimationDriver11qt_metacallEN11QMetaObject4CallEiPPv @ 3740 NONAME
-	_ZN16QAnimationDriver11qt_metacastEPKc @ 3741 NONAME
-	_ZN16QAnimationDriver16staticMetaObjectE @ 3742 NONAME DATA 16
-	_ZN16QAnimationDriver19getStaticMetaObjectEv @ 3743 NONAME
-	_ZN16QAnimationDriver4stopEv @ 3744 NONAME
-	_ZN16QAnimationDriver5startEv @ 3745 NONAME
-	_ZN16QAnimationDriver7advanceEv @ 3746 NONAME
-	_ZN16QAnimationDriver7installEv @ 3747 NONAME
-	_ZN16QAnimationDriverC1EP7QObject @ 3748 NONAME
-	_ZN16QAnimationDriverC1ER23QAnimationDriverPrivateP7QObject @ 3749 NONAME
-	_ZN16QAnimationDriverC2EP7QObject @ 3750 NONAME
-	_ZN16QAnimationDriverC2ER23QAnimationDriverPrivateP7QObject @ 3751 NONAME
-	_ZN16QCoreApplicationC1ERiPPci @ 3752 NONAME
-	_ZN16QCoreApplicationC2ERiPPci @ 3753 NONAME
-	_ZN23QCoreApplicationPrivate19app_compile_versionE @ 3754 NONAME DATA 4
-	_ZN23QCoreApplicationPrivateC1ERiPPcj @ 3755 NONAME
-	_ZN23QCoreApplicationPrivateC2ERiPPcj @ 3756 NONAME
-	_ZN31QNonContiguousByteDeviceFactory6createE14QSharedPointerI11QRingBufferE @ 3757 NONAME
-	_ZN5QChar21currentUnicodeVersionEv @ 3758 NONAME
-	_ZN5QFile4openEP7__sFILE6QFlagsIN9QIODevice12OpenModeFlagEES2_INS_14FileHandleFlagEE @ 3759 NONAME
-	_ZN5QFile4openERK5RFile6QFlagsIN9QIODevice12OpenModeFlagEES3_INS_14FileHandleFlagEE @ 3760 NONAME
-	_ZN5QFile4openEi6QFlagsIN9QIODevice12OpenModeFlagEES0_INS_14FileHandleFlagEE @ 3761 NONAME
-	_ZN6QMutex12lockInternalEv @ 3762 NONAME
-	_ZN6QMutex14unlockInternalEv @ 3763 NONAME
-	_ZN7QObject10disconnectEPKS_RK11QMetaMethodS1_S4_ @ 3764 NONAME
-	_ZN7QObject7connectEPKS_RK11QMetaMethodS1_S4_N2Qt14ConnectionTypeE @ 3765 NONAME
-	_ZN9QFileInfoC1EP16QFileInfoPrivate @ 3766 NONAME
-	_ZN9QFileInfoC2EP16QFileInfoPrivate @ 3767 NONAME
-	_ZNK10QStringRef10startsWithE13QLatin1StringN2Qt15CaseSensitivityE @ 3768 NONAME
-	_ZNK10QStringRef10startsWithE5QCharN2Qt15CaseSensitivityE @ 3769 NONAME
-	_ZNK10QStringRef10startsWithERK7QStringN2Qt15CaseSensitivityE @ 3770 NONAME
-	_ZNK10QStringRef10startsWithERKS_N2Qt15CaseSensitivityE @ 3771 NONAME
-	_ZNK10QStringRef11lastIndexOfE13QLatin1StringiN2Qt15CaseSensitivityE @ 3772 NONAME
-	_ZNK10QStringRef11lastIndexOfE5QChariN2Qt15CaseSensitivityE @ 3773 NONAME
-	_ZNK10QStringRef11lastIndexOfERK7QStringiN2Qt15CaseSensitivityE @ 3774 NONAME
-	_ZNK10QStringRef11lastIndexOfERKS_iN2Qt15CaseSensitivityE @ 3775 NONAME
-	_ZNK10QStringRef11toLocal8BitEv @ 3776 NONAME
-	_ZNK10QStringRef5countE5QCharN2Qt15CaseSensitivityE @ 3777 NONAME
-	_ZNK10QStringRef5countERK7QStringN2Qt15CaseSensitivityE @ 3778 NONAME
-	_ZNK10QStringRef5countERKS_N2Qt15CaseSensitivityE @ 3779 NONAME
-	_ZNK10QStringRef6toUcs4Ev @ 3780 NONAME
-	_ZNK10QStringRef6toUtf8Ev @ 3781 NONAME
-	_ZNK10QStringRef7indexOfE13QLatin1StringiN2Qt15CaseSensitivityE @ 3782 NONAME
-	_ZNK10QStringRef7indexOfE5QChariN2Qt15CaseSensitivityE @ 3783 NONAME
-	_ZNK10QStringRef7indexOfERK7QStringiN2Qt15CaseSensitivityE @ 3784 NONAME
-	_ZNK10QStringRef7indexOfERKS_iN2Qt15CaseSensitivityE @ 3785 NONAME
-	_ZNK10QStringRef7toAsciiEv @ 3786 NONAME
-	_ZNK10QStringRef8endsWithE13QLatin1StringN2Qt15CaseSensitivityE @ 3787 NONAME
-	_ZNK10QStringRef8endsWithE5QCharN2Qt15CaseSensitivityE @ 3788 NONAME
-	_ZNK10QStringRef8endsWithERK7QStringN2Qt15CaseSensitivityE @ 3789 NONAME
-	_ZNK10QStringRef8endsWithERKS_N2Qt15CaseSensitivityE @ 3790 NONAME
-	_ZNK10QStringRef8toLatin1Ev @ 3791 NONAME
-	_ZNK11QMetaObject4castEPK7QObject @ 3792 NONAME
-	_ZNK13QElapsedTimer12nsecsElapsedEv @ 3793 NONAME
-	_ZNK13QSharedMemory9nativeKeyEv @ 3794 NONAME
-	_ZNK16QAnimationDriver10metaObjectEv @ 3795 NONAME
-	_ZNK16QAnimationDriver9isRunningEv @ 3796 NONAME
-	_ZNK16QXmlStreamWriter8hasErrorEv @ 3797 NONAME
-	_ZNK4QUrl11isLocalFileEv @ 3798 NONAME
-	_ZNK7QObject17senderSignalIndexEv @ 3799 NONAME
-	_ZNK7QString10startsWithERK10QStringRefN2Qt15CaseSensitivityE @ 3800 NONAME
-	_ZNK7QString11lastIndexOfERK10QStringRefiN2Qt15CaseSensitivityE @ 3801 NONAME
-	_ZNK7QString5countERK10QStringRefN2Qt15CaseSensitivityE @ 3802 NONAME
-	_ZNK7QString7indexOfERK10QStringRefiN2Qt15CaseSensitivityE @ 3803 NONAME
-	_ZNK7QString8endsWithERK10QStringRefN2Qt15CaseSensitivityE @ 3804 NONAME
-	_ZTI13QUnifiedTimer @ 3805 NONAME
-	_ZTI16QAnimationDriver @ 3806 NONAME
-	_ZTI23QAnimationDriverPrivate @ 3807 NONAME
-	_ZTV13QUnifiedTimer @ 3808 NONAME
-	_ZTV16QAnimationDriver @ 3809 NONAME
-	_ZTV23QAnimationDriverPrivate @ 3810 NONAME
-	adler32_combine @ 3811 NONAME
-	adler32_combine64 @ 3812 NONAME
-	compressBound @ 3813 NONAME
-	crc32_combine @ 3814 NONAME
-	crc32_combine64 @ 3815 NONAME
-	deflateBound @ 3816 NONAME
-	deflatePrime @ 3817 NONAME
-	deflateSetHeader @ 3818 NONAME
-	deflateTune @ 3819 NONAME
-	gzbuffer @ 3820 NONAME
-	gzclearerr @ 3821 NONAME
-	gzclose_r @ 3822 NONAME
-	gzclose_w @ 3823 NONAME
-	gzdirect @ 3824 NONAME
-	gzoffset @ 3825 NONAME
-	gzoffset64 @ 3826 NONAME
-	gzopen64 @ 3827 NONAME
-	gzseek64 @ 3828 NONAME
-	gztell64 @ 3829 NONAME
-	gzungetc @ 3830 NONAME
-	inflateBack @ 3831 NONAME
-	inflateBackEnd @ 3832 NONAME
-	inflateBackInit_ @ 3833 NONAME
-	inflateCopy @ 3834 NONAME
-	inflateGetHeader @ 3835 NONAME
-	inflateMark @ 3836 NONAME
-	inflatePrime @ 3837 NONAME
-	inflateReset2 @ 3838 NONAME
-	inflateUndermine @ 3839 NONAME
-	zlibCompileFlags @ 3840 NONAME
-	_Z25qt_symbianGetSocketServerv @ 3841 NONAME
-	_ZN10QEventLoop18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3842 NONAME
-	_ZN10QEventLoop25staticMetaObjectExtraDataE @ 3843 NONAME DATA 8
-	_ZN10QMutexPool11createMutexEi @ 3844 NONAME
-	_ZN11QFinalState18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3845 NONAME
-	_ZN11QFinalState25staticMetaObjectExtraDataE @ 3846 NONAME DATA 8
-	_ZN11QThreadPool18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3847 NONAME
-	_ZN11QThreadPool25staticMetaObjectExtraDataE @ 3848 NONAME DATA 8
-	_ZN11QTranslator18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3849 NONAME
-	_ZN11QTranslator25staticMetaObjectExtraDataE @ 3850 NONAME DATA 8
-	_ZN11QTranslator4loadERK7QLocaleRK7QStringS5_S5_S5_ @ 3851 NONAME
-	_ZN13QActiveObject18maybeQueueForLaterEv @ 3852 NONAME ABSENT
-	_ZN13QActiveObject21maybeDeferSocketEventEv @ 3853 NONAME
-	_ZN13QActiveObject21reactivateAndCompleteEv @ 3854 NONAME
-	_ZN13QActiveObject4waitE5QListIP7CActiveEi @ 3855 NONAME ABSENT
-	_ZN13QActiveObject4waitEP7CActivei @ 3856 NONAME ABSENT
-	_ZN13QActiveObjectC2EiP23QEventDispatcherSymbian @ 3857 NONAME
-	_ZN13QActiveObjectD0Ev @ 3858 NONAME
-	_ZN13QActiveObjectD1Ev @ 3859 NONAME
-	_ZN13QActiveObjectD2Ev @ 3860 NONAME
-	_ZN13QHistoryState18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3861 NONAME
-	_ZN13QHistoryState25staticMetaObjectExtraDataE @ 3862 NONAME DATA 8
-	_ZN13QPluginLoader18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3863 NONAME
-	_ZN13QPluginLoader25staticMetaObjectExtraDataE @ 3864 NONAME DATA 8
-	_ZN13QSharedMemory18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3865 NONAME
-	_ZN13QSharedMemory25staticMetaObjectExtraDataE @ 3866 NONAME DATA 8
-	_ZN13QSignalMapper18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3867 NONAME
-	_ZN13QSignalMapper25staticMetaObjectExtraDataE @ 3868 NONAME DATA 8
-	_ZN13QStateMachine18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3869 NONAME
-	_ZN13QStateMachine25staticMetaObjectExtraDataE @ 3870 NONAME DATA 8
-	_ZN14QAbstractState18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3871 NONAME
-	_ZN14QAbstractState25staticMetaObjectExtraDataE @ 3872 NONAME DATA 8
-	_ZN14QFactoryLoader18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3873 NONAME
-	_ZN14QFactoryLoader25staticMetaObjectExtraDataE @ 3874 NONAME DATA 8
-	_ZN14QLocalePrivate10findLocaleEN7QLocale8LanguageENS0_6ScriptENS0_7CountryE @ 3875 NONAME
-	_ZN14QLocalePrivate12codeToScriptERK7QString @ 3876 NONAME
-	_ZN14QLocalePrivate13codeToCountryERK7QString @ 3877 NONAME
-	_ZN14QLocalePrivate14codeToLanguageERK7QString @ 3878 NONAME
-	_ZN14QLocalePrivate14doubleToStringE5QCharS0_S0_S0_S0_S0_diNS_10DoubleFormEij @ 3879 NONAME
-	_ZN14QLocalePrivate16longLongToStringE5QCharS0_S0_S0_xiiij @ 3880 NONAME
-	_ZN14QLocalePrivate17getLangAndCountryERK7QStringRN7QLocale8LanguageERNS3_6ScriptERNS3_7CountryE @ 3881 NONAME
-	_ZN14QLocalePrivate19unsLongLongToStringE5QCharS0_S0_yiiij @ 3882 NONAME
-	_ZN14QMetaCallEventC1EttPFvP7QObjectN11QMetaObject4CallEiPPvEPKS0_iiPiS5_P10QSemaphore @ 3883 NONAME
-	_ZN14QMetaCallEventC2EttPFvP7QObjectN11QMetaObject4CallEiPPvEPKS0_iiPiS5_P10QSemaphore @ 3884 NONAME
-	_ZN14QTemporaryFile18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3885 NONAME
-	_ZN14QTemporaryFile25staticMetaObjectExtraDataE @ 3886 NONAME DATA 8
-	_ZN15QAnimationGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3887 NONAME
-	_ZN15QAnimationGroup25staticMetaObjectExtraDataE @ 3888 NONAME DATA 8
-	_ZN15QPauseAnimation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3889 NONAME
-	_ZN15QPauseAnimation25staticMetaObjectExtraDataE @ 3890 NONAME DATA 8
-	_ZN15QSocketNotifier18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3891 NONAME
-	_ZN15QSocketNotifier25staticMetaObjectExtraDataE @ 3892 NONAME DATA 8
-	_ZN16QAnimationDriver18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3893 NONAME
-	_ZN16QAnimationDriver25staticMetaObjectExtraDataE @ 3894 NONAME DATA 8
-	_ZN16QCoreApplication18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3895 NONAME
-	_ZN16QCoreApplication25staticMetaObjectExtraDataE @ 3896 NONAME DATA 8
-	_ZN16QEventTransition18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3897 NONAME
-	_ZN16QEventTransition25staticMetaObjectExtraDataE @ 3898 NONAME DATA 8
-	_ZN16QTextCodecPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3899 NONAME
-	_ZN16QTextCodecPlugin25staticMetaObjectExtraDataE @ 3900 NONAME DATA 8
-	_ZN17QSignalTransition18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3901 NONAME
-	_ZN17QSignalTransition25staticMetaObjectExtraDataE @ 3902 NONAME DATA 8
-	_ZN17QVariantAnimation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3903 NONAME
-	_ZN17QVariantAnimation25staticMetaObjectExtraDataE @ 3904 NONAME DATA 8
-	_ZN18QAbstractAnimation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3905 NONAME
-	_ZN18QAbstractAnimation25staticMetaObjectExtraDataE @ 3906 NONAME DATA 8
-	_ZN18QAbstractItemModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3907 NONAME
-	_ZN18QAbstractItemModel25staticMetaObjectExtraDataE @ 3908 NONAME DATA 8
-	_ZN18QAbstractListModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3909 NONAME
-	_ZN18QAbstractListModel25staticMetaObjectExtraDataE @ 3910 NONAME DATA 8
-	_ZN18QFileSystemWatcher18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3911 NONAME
-	_ZN18QFileSystemWatcher25staticMetaObjectExtraDataE @ 3912 NONAME DATA 8
-	_ZN18QPropertyAnimation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3913 NONAME
-	_ZN18QPropertyAnimation25staticMetaObjectExtraDataE @ 3914 NONAME DATA 8
-	_ZN19QAbstractTableModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3915 NONAME
-	_ZN19QAbstractTableModel25staticMetaObjectExtraDataE @ 3916 NONAME DATA 8
-	_ZN19QAbstractTransition18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3917 NONAME
-	_ZN19QAbstractTransition25staticMetaObjectExtraDataE @ 3918 NONAME DATA 8
-	_ZN19QProcessEnvironment6insertERKS_ @ 3919 NONAME
-	_ZN21QAbstractConcatenable14convertToAsciiEPK5QChariRPc @ 3920 NONAME
-	_ZN21QObjectCleanupHandler18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3921 NONAME
-	_ZN21QObjectCleanupHandler25staticMetaObjectExtraDataE @ 3922 NONAME DATA 8
-	_ZN21QSymbianSocketManager12removeSocketERK7RSocket @ 3923 NONAME
-	_ZN21QSymbianSocketManager15getSocketServerEv @ 3924 NONAME
-	_ZN21QSymbianSocketManager20setDefaultConnectionEP11RConnection @ 3925 NONAME
-	_ZN21QSymbianSocketManager8instanceEv @ 3926 NONAME
-	_ZN21QSymbianSocketManager9addSocketERK7RSocket @ 3927 NONAME
-	_ZN21QSymbianSocketManagerC1Ev @ 3928 NONAME
-	_ZN21QSymbianSocketManagerC2Ev @ 3929 NONAME
-	_ZN21QSymbianSocketManagerD1Ev @ 3930 NONAME
-	_ZN21QSymbianSocketManagerD2Ev @ 3931 NONAME
-	_ZN23QEventDispatcherSymbian18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3932 NONAME
-	_ZN23QEventDispatcherSymbian25staticMetaObjectExtraDataE @ 3933 NONAME DATA 8
-	_ZN23QParallelAnimationGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3934 NONAME
-	_ZN23QParallelAnimationGroup25staticMetaObjectExtraDataE @ 3935 NONAME DATA 8
-	_ZN24QAbstractEventDispatcher18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3936 NONAME
-	_ZN24QAbstractEventDispatcher25staticMetaObjectExtraDataE @ 3937 NONAME DATA 8
-	_ZN24QNonContiguousByteDevice18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3938 NONAME
-	_ZN24QNonContiguousByteDevice25staticMetaObjectExtraDataE @ 3939 NONAME DATA 8
-	_ZN25QSequentialAnimationGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3940 NONAME
-	_ZN25QSequentialAnimationGroup25staticMetaObjectExtraDataE @ 3941 NONAME DATA 8
-	_ZN5QFile18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3942 NONAME
-	_ZN5QFile25staticMetaObjectExtraDataE @ 3943 NONAME DATA 8
-	_ZN6QState18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3944 NONAME
-	_ZN6QState25staticMetaObjectExtraDataE @ 3945 NONAME DATA 8
-	_ZN6QTimer18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3946 NONAME
-	_ZN6QTimer25staticMetaObjectExtraDataE @ 3947 NONAME DATA 8
-	_ZN7QBuffer18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3948 NONAME
-	_ZN7QBuffer25staticMetaObjectExtraDataE @ 3949 NONAME DATA 8
-	_ZN7QLocale14scriptToStringENS_6ScriptE @ 3950 NONAME
-	_ZN7QLocale15matchingLocalesENS_8LanguageENS_6ScriptENS_7CountryE @ 3951 NONAME
-	_ZN7QLocaleC1ENS_8LanguageENS_6ScriptENS_7CountryE @ 3952 NONAME
-	_ZN7QLocaleC2ENS_8LanguageENS_6ScriptENS_7CountryE @ 3953 NONAME
-	_ZN7QObject18qt_static_metacallEPS_N11QMetaObject4CallEiPPv @ 3954 NONAME
-	_ZN7QObject25staticMetaObjectExtraDataE @ 3955 NONAME DATA 8
-	_ZN7QThread18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3956 NONAME
-	_ZN7QThread25staticMetaObjectExtraDataE @ 3957 NONAME DATA 8
-	_ZN8QLibrary18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3958 NONAME
-	_ZN8QLibrary25staticMetaObjectExtraDataE @ 3959 NONAME DATA 8
-	_ZN8QProcess18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3960 NONAME
-	_ZN8QProcess25staticMetaObjectExtraDataE @ 3961 NONAME DATA 8
-	_ZN9QIODevice18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3962 NONAME
-	_ZN9QIODevice25staticMetaObjectExtraDataE @ 3963 NONAME DATA 8
-	_ZN9QMimeData18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3964 NONAME
-	_ZN9QMimeData25staticMetaObjectExtraDataE @ 3965 NONAME DATA 8
-	_ZN9QSettings18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3966 NONAME
-	_ZN9QSettings25staticMetaObjectExtraDataE @ 3967 NONAME DATA 8
-	_ZN9QTimeLine18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3968 NONAME
-	_ZN9QTimeLine25staticMetaObjectExtraDataE @ 3969 NONAME DATA 8
-	_ZNK14QLocalePrivate10scriptCodeEv @ 3970 NONAME
-	_ZNK14QLocalePrivate11countryCodeEv @ 3971 NONAME
-	_ZNK14QLocalePrivate12languageCodeEv @ 3972 NONAME
-	_ZNK14QLocalePrivate9bcp47NameEv @ 3973 NONAME
-	_ZNK19QProcessEnvironment4keysEv @ 3974 NONAME
-	_ZNK21QSymbianSocketManager12lookupSocketERK7RSocket @ 3975 NONAME
-	_ZNK21QSymbianSocketManager12lookupSocketEiR7RSocket @ 3976 NONAME
-	_ZNK21QSymbianSocketManager17defaultConnectionEv @ 3977 NONAME
-	_ZNK7QLocale11quoteStringERK10QStringRefNS_14QuotationStyleE @ 3978 NONAME
-	_ZNK7QLocale11quoteStringERK7QStringNS_14QuotationStyleE @ 3979 NONAME
-	_ZNK7QLocale11uiLanguagesEv @ 3980 NONAME
-	_ZNK7QLocale14currencySymbolENS_20CurrencySymbolFormatE @ 3981 NONAME
-	_ZNK7QLocale14firstDayOfWeekEv @ 3982 NONAME
-	_ZNK7QLocale16toCurrencyStringEdRK7QString @ 3983 NONAME
-	_ZNK7QLocale16toCurrencyStringExRK7QString @ 3984 NONAME
-	_ZNK7QLocale16toCurrencyStringEyRK7QString @ 3985 NONAME
-	_ZNK7QLocale17nativeCountryNameEv @ 3986 NONAME
-	_ZNK7QLocale18nativeLanguageNameEv @ 3987 NONAME
-	_ZNK7QLocale19createSeparatedListERK11QStringList @ 3988 NONAME
-	_ZNK7QLocale6scriptEv @ 3989 NONAME
-	_ZNK7QLocale8weekdaysEv @ 3990 NONAME
-	_ZNK7QLocale9bcp47NameEv @ 3991 NONAME
-	_ZTI13QActiveObject @ 3992 NONAME
-	_ZTV13QActiveObject @ 3993 NONAME
-	_ZN23QCoreApplicationPrivate13trolltechConfEv @ 3994 NONAME
-	_ZN12QtConcurrent15ResultStoreBase10addResultsEiPKvii @ 3995 NONAME
-	_ZN12QtConcurrent15ResultStoreBase13setFilterModeEb @ 3996 NONAME
-	_ZN12QtConcurrent15ResultStoreBase15syncResultCountEv @ 3997 NONAME
-	_ZN12QtConcurrent15ResultStoreBase16insertResultItemEiRNS_10ResultItemE @ 3998 NONAME
-	_ZN12QtConcurrent15ResultStoreBase17updateInsertIndexEii @ 3999 NONAME
-	_ZN12QtConcurrent15ResultStoreBase18syncPendingResultsEv @ 4000 NONAME
-	_ZN12QtConcurrent15ResultStoreBase23insertResultItemIfValidEiRNS_10ResultItemE @ 4001 NONAME
-	_ZN12QtConcurrent15ResultStoreBase9addResultEiPKv @ 4002 NONAME
-	_ZN12QtConcurrent15ResultStoreBaseC1Ev @ 4003 NONAME
-	_ZN12QtConcurrent15ResultStoreBaseC2Ev @ 4004 NONAME
-	_ZN12QtConcurrent16BlockSizeManager13timeAfterUserEv @ 4005 NONAME
-	_ZN12QtConcurrent16BlockSizeManager14timeBeforeUserEv @ 4006 NONAME
-	_ZN12QtConcurrent16BlockSizeManager9blockSizeEv @ 4007 NONAME
-	_ZN12QtConcurrent16BlockSizeManagerC1Ei @ 4008 NONAME
-	_ZN12QtConcurrent16BlockSizeManagerC2Ei @ 4009 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase10isCanceledEv @ 4010 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase10threadExitEv @ 4011 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase11startThreadEv @ 4012 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase12startThreadsEv @ 4013 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase13startBlockingEv @ 4014 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase13waitForResumeEv @ 4015 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase15handleExceptionERKNS_9ExceptionE @ 4016 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase16setProgressRangeEii @ 4017 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase16setProgressValueEi @ 4018 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase18threadThrottleExitEv @ 4019 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase19startSingleThreadedEv @ 4020 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase19startThreadInternalEv @ 4021 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase23acquireBarrierSemaphoreEv @ 4022 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase26isProgressReportingEnabledEv @ 4023 NONAME
-	_ZN12QtConcurrent16ThreadEngineBase3runEv @ 4024 NONAME
-	_ZN12QtConcurrent16ThreadEngineBaseC2Ev @ 4025 NONAME
-	_ZN12QtConcurrent16ThreadEngineBaseD0Ev @ 4026 NONAME
-	_ZN12QtConcurrent16ThreadEngineBaseD1Ev @ 4027 NONAME
-	_ZN12QtConcurrent16ThreadEngineBaseD2Ev @ 4028 NONAME
-	_ZN12QtConcurrent18ResultIteratorBase14batchedAdvanceEv @ 4029 NONAME
-	_ZN12QtConcurrent18ResultIteratorBaseC1EN4QMapIiNS_10ResultItemEE14const_iteratorEi @ 4030 NONAME
-	_ZN12QtConcurrent18ResultIteratorBaseC1Ev @ 4031 NONAME
-	_ZN12QtConcurrent18ResultIteratorBaseC2EN4QMapIiNS_10ResultItemEE14const_iteratorEi @ 4032 NONAME
-	_ZN12QtConcurrent18ResultIteratorBaseC2Ev @ 4033 NONAME
-	_ZN12QtConcurrent18ResultIteratorBaseppEv @ 4034 NONAME
-	_ZN12QtConcurrent8internal14ExceptionStore12setExceptionERKNS_9ExceptionE @ 4035 NONAME
-	_ZN12QtConcurrent8internal14ExceptionStore22throwPossibleExceptionEv @ 4036 NONAME
-	_ZN12QtConcurrent8internal14ExceptionStore9exceptionEv @ 4037 NONAME
-	_ZN18QFutureWatcherBase11qt_metacallEN11QMetaObject4CallEiPPv @ 4038 NONAME
-	_ZN18QFutureWatcherBase11qt_metacastEPKc @ 4039 NONAME
-	_ZN18QFutureWatcherBase12togglePausedEv @ 4040 NONAME
-	_ZN18QFutureWatcherBase13connectNotifyEPKc @ 4041 NONAME
-	_ZN18QFutureWatcherBase13resultReadyAtEi @ 4042 NONAME
-	_ZN18QFutureWatcherBase14resultsReadyAtEii @ 4043 NONAME
-	_ZN18QFutureWatcherBase15waitForFinishedEv @ 4044 NONAME
-	_ZN18QFutureWatcherBase16disconnectNotifyEPKc @ 4045 NONAME
-	_ZN18QFutureWatcherBase16staticMetaObjectE @ 4046 NONAME DATA 16
-	_ZN18QFutureWatcherBase18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 4047 NONAME
-	_ZN18QFutureWatcherBase19getStaticMetaObjectEv @ 4048 NONAME
-	_ZN18QFutureWatcherBase19progressTextChangedERK7QString @ 4049 NONAME
-	_ZN18QFutureWatcherBase20progressRangeChangedEii @ 4050 NONAME
-	_ZN18QFutureWatcherBase20progressValueChangedEi @ 4051 NONAME
-	_ZN18QFutureWatcherBase22connectOutputInterfaceEv @ 4052 NONAME
-	_ZN18QFutureWatcherBase22setPendingResultsLimitEi @ 4053 NONAME
-	_ZN18QFutureWatcherBase25disconnectOutputInterfaceEb @ 4054 NONAME
-	_ZN18QFutureWatcherBase25staticMetaObjectExtraDataE @ 4055 NONAME DATA 8
-	_ZN18QFutureWatcherBase5eventEP6QEvent @ 4056 NONAME
-	_ZN18QFutureWatcherBase5pauseEv @ 4057 NONAME
-	_ZN18QFutureWatcherBase6cancelEv @ 4058 NONAME
-	_ZN18QFutureWatcherBase6pausedEv @ 4059 NONAME
-	_ZN18QFutureWatcherBase6resumeEv @ 4060 NONAME
-	_ZN18QFutureWatcherBase7resumedEv @ 4061 NONAME
-	_ZN18QFutureWatcherBase7startedEv @ 4062 NONAME
-	_ZN18QFutureWatcherBase8canceledEv @ 4063 NONAME
-	_ZN18QFutureWatcherBase8finishedEv @ 4064 NONAME
-	_ZN18QFutureWatcherBase9setPausedEb @ 4065 NONAME
-	_ZN18QFutureWatcherBaseC2EP7QObject @ 4066 NONAME
-	_ZN20QFutureInterfaceBase11setRunnableEP9QRunnable @ 4067 NONAME
-	_ZN20QFutureInterfaceBase12setThrottledEb @ 4068 NONAME
-	_ZN20QFutureInterfaceBase12togglePausedEv @ 4069 NONAME
-	_ZN20QFutureInterfaceBase13reportStartedEv @ 4070 NONAME
-	_ZN20QFutureInterfaceBase13setFilterModeEb @ 4071 NONAME
-	_ZN20QFutureInterfaceBase13waitForResultEi @ 4072 NONAME
-	_ZN20QFutureInterfaceBase13waitForResumeEv @ 4073 NONAME
-	_ZN20QFutureInterfaceBase14exceptionStoreEv @ 4074 NONAME
-	_ZN20QFutureInterfaceBase14reportCanceledEv @ 4075 NONAME
-	_ZN20QFutureInterfaceBase14reportFinishedEv @ 4076 NONAME
-	_ZN20QFutureInterfaceBase15reportExceptionERKN12QtConcurrent9ExceptionE @ 4077 NONAME
-	_ZN20QFutureInterfaceBase15resultStoreBaseEv @ 4078 NONAME
-	_ZN20QFutureInterfaceBase15waitForFinishedEv @ 4079 NONAME
-	_ZN20QFutureInterfaceBase16setProgressRangeEii @ 4080 NONAME
-	_ZN20QFutureInterfaceBase16setProgressValueEi @ 4081 NONAME
-	_ZN20QFutureInterfaceBase17waitForNextResultEv @ 4082 NONAME
-	_ZN20QFutureInterfaceBase18reportResultsReadyEii @ 4083 NONAME
-	_ZN20QFutureInterfaceBase19expectedResultCountEv @ 4084 NONAME
-	_ZN20QFutureInterfaceBase22setExpectedResultCountEi @ 4085 NONAME
-	_ZN20QFutureInterfaceBase23setProgressValueAndTextEiRK7QString @ 4086 NONAME
-	_ZN20QFutureInterfaceBase6cancelEv @ 4087 NONAME
-	_ZN20QFutureInterfaceBase9setPausedEb @ 4088 NONAME
-	_ZN20QFutureInterfaceBaseC1ENS_5StateE @ 4089 NONAME
-	_ZN20QFutureInterfaceBaseC1ERKS_ @ 4090 NONAME
-	_ZN20QFutureInterfaceBaseC2ENS_5StateE @ 4091 NONAME
-	_ZN20QFutureInterfaceBaseC2ERKS_ @ 4092 NONAME
-	_ZN20QFutureInterfaceBaseD0Ev @ 4093 NONAME
-	_ZN20QFutureInterfaceBaseD1Ev @ 4094 NONAME
-	_ZN20QFutureInterfaceBaseD2Ev @ 4095 NONAME
-	_ZN20QFutureInterfaceBaseaSERKS_ @ 4096 NONAME
-	_ZNK12QtConcurrent15ResultStoreBase10filterModeEv @ 4097 NONAME
-	_ZNK12QtConcurrent15ResultStoreBase13hasNextResultEv @ 4098 NONAME
-	_ZNK12QtConcurrent15ResultStoreBase3endEv @ 4099 NONAME
-	_ZNK12QtConcurrent15ResultStoreBase5beginEv @ 4100 NONAME
-	_ZNK12QtConcurrent15ResultStoreBase5countEv @ 4101 NONAME
-	_ZNK12QtConcurrent15ResultStoreBase8containsEi @ 4102 NONAME
-	_ZNK12QtConcurrent15ResultStoreBase8resultAtEi @ 4103 NONAME
-	_ZNK12QtConcurrent18ResultIteratorBase11resultIndexEv @ 4104 NONAME
-	_ZNK12QtConcurrent18ResultIteratorBase11vectorIndexEv @ 4105 NONAME
-	_ZNK12QtConcurrent18ResultIteratorBase23canIncrementVectorIndexEv @ 4106 NONAME
-	_ZNK12QtConcurrent18ResultIteratorBase8isVectorEv @ 4107 NONAME
-	_ZNK12QtConcurrent18ResultIteratorBase9batchSizeEv @ 4108 NONAME
-	_ZNK12QtConcurrent18ResultIteratorBaseeqERKS0_ @ 4109 NONAME
-	_ZNK12QtConcurrent18ResultIteratorBaseneERKS0_ @ 4110 NONAME
-	_ZNK12QtConcurrent18UnhandledException5cloneEv @ 4111 NONAME
-	_ZNK12QtConcurrent18UnhandledException5raiseEv @ 4112 NONAME
-	_ZNK12QtConcurrent8internal14ExceptionStore12hasExceptionEv @ 4113 NONAME
-	_ZNK12QtConcurrent8internal14ExceptionStore9hasThrownEv @ 4114 NONAME
-	_ZNK12QtConcurrent9Exception5cloneEv @ 4115 NONAME
-	_ZNK12QtConcurrent9Exception5raiseEv @ 4116 NONAME
-	_ZNK18QFutureWatcherBase10isCanceledEv @ 4117 NONAME
-	_ZNK18QFutureWatcherBase10isFinishedEv @ 4118 NONAME
-	_ZNK18QFutureWatcherBase10metaObjectEv @ 4119 NONAME
-	_ZNK18QFutureWatcherBase12progressTextEv @ 4120 NONAME
-	_ZNK18QFutureWatcherBase13progressValueEv @ 4121 NONAME
-	_ZNK18QFutureWatcherBase15progressMaximumEv @ 4122 NONAME
-	_ZNK18QFutureWatcherBase15progressMinimumEv @ 4123 NONAME
-	_ZNK18QFutureWatcherBase8isPausedEv @ 4124 NONAME
-	_ZNK18QFutureWatcherBase9isRunningEv @ 4125 NONAME
-	_ZNK18QFutureWatcherBase9isStartedEv @ 4126 NONAME
-	_ZNK20QFutureInterfaceBase10isCanceledEv @ 4127 NONAME
-	_ZNK20QFutureInterfaceBase10isFinishedEv @ 4128 NONAME
-	_ZNK20QFutureInterfaceBase10queryStateENS_5StateE @ 4129 NONAME
-	_ZNK20QFutureInterfaceBase11isThrottledEv @ 4130 NONAME
-	_ZNK20QFutureInterfaceBase11resultCountEv @ 4131 NONAME
-	_ZNK20QFutureInterfaceBase12progressTextEv @ 4132 NONAME
-	_ZNK20QFutureInterfaceBase13progressValueEv @ 4133 NONAME
-	_ZNK20QFutureInterfaceBase15isResultReadyAtEi @ 4134 NONAME
-	_ZNK20QFutureInterfaceBase15progressMaximumEv @ 4135 NONAME
-	_ZNK20QFutureInterfaceBase15progressMinimumEv @ 4136 NONAME
-	_ZNK20QFutureInterfaceBase15resultStoreBaseEv @ 4137 NONAME
-	_ZNK20QFutureInterfaceBase19referenceCountIsOneEv @ 4138 NONAME
-	_ZNK20QFutureInterfaceBase22isProgressUpdateNeededEv @ 4139 NONAME
-	_ZNK20QFutureInterfaceBase5mutexEv @ 4140 NONAME
-	_ZNK20QFutureInterfaceBase8isPausedEv @ 4141 NONAME
-	_ZNK20QFutureInterfaceBase9isRunningEv @ 4142 NONAME
-	_ZNK20QFutureInterfaceBase9isStartedEv @ 4143 NONAME
-	_ZTI18QFutureWatcherBase @ 4144 NONAME
-	_ZTI20QFutureInterfaceBase @ 4145 NONAME
-	_ZTIN12QtConcurrent15ResultStoreBaseE @ 4146 NONAME
-	_ZTIN12QtConcurrent16ThreadEngineBaseE @ 4147 NONAME
-	_ZTIN12QtConcurrent18UnhandledExceptionE @ 4148 NONAME
-	_ZTIN12QtConcurrent9ExceptionE @ 4149 NONAME
-	_ZTV18QFutureWatcherBase @ 4150 NONAME
-	_ZTV20QFutureInterfaceBase @ 4151 NONAME
-	_ZTVN12QtConcurrent15ResultStoreBaseE @ 4152 NONAME
-	_ZTVN12QtConcurrent16ThreadEngineBaseE @ 4153 NONAME
-	_ZTVN12QtConcurrent18UnhandledExceptionE @ 4154 NONAME
-	_ZTVN12QtConcurrent9ExceptionE @ 4155 NONAME
-	_Z15qIsEffectiveTLDRK7QString @ 4156 NONAME
-	_Z15qTopLevelDomainRK7QString @ 4157 NONAME
-	_ZN5QUuid11fromRfc4122ERK10QByteArray @ 4158 NONAME
-	_ZN5QUuidC1ERK10QByteArray @ 4159 NONAME
-	_ZN5QUuidC2ERK10QByteArray @ 4160 NONAME
-	_ZNK4QUrl14topLevelDomainEv @ 4161 NONAME
-	_ZNK5QUuid11toByteArrayEv @ 4162 NONAME
-	_ZNK5QUuid9toRfc4122Ev @ 4163 NONAME
-	_ZN18QAbstractItemModel17resetInternalDataEv @ 4164 NONAME
+	_Z15qIsEffectiveTLDRK7QString @ 3719 NONAME
+	_Z15qTopLevelDomainRK7QString @ 3720 NONAME
+	_Z25qt_symbianGetSocketServerv @ 3721 NONAME
+	_ZN10QEventLoop18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3722 NONAME
+	_ZN10QEventLoop25staticMetaObjectExtraDataE @ 3723 NONAME DATA 8
+	_ZN10QMutexPool11createMutexEi @ 3724 NONAME
+	_ZN11QFinalState18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3725 NONAME
+	_ZN11QFinalState25staticMetaObjectExtraDataE @ 3726 NONAME DATA 8
+	_ZN11QThreadPool11waitForDoneEi @ 3727 NONAME
+	_ZN11QThreadPool18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3728 NONAME
+	_ZN11QThreadPool25staticMetaObjectExtraDataE @ 3729 NONAME DATA 8
+	_ZN11QTranslator18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3730 NONAME
+	_ZN11QTranslator25staticMetaObjectExtraDataE @ 3731 NONAME DATA 8
+	_ZN11QTranslator4loadERK7QLocaleRK7QStringS5_S5_S5_ @ 3732 NONAME
+	_ZN12QSystemError8toStringEv @ 3733 NONAME
+	_ZN12QtConcurrent15ResultStoreBase10addResultsEiPKvii @ 3734 NONAME
+	_ZN12QtConcurrent15ResultStoreBase13setFilterModeEb @ 3735 NONAME
+	_ZN12QtConcurrent15ResultStoreBase15syncResultCountEv @ 3736 NONAME
+	_ZN12QtConcurrent15ResultStoreBase16insertResultItemEiRNS_10ResultItemE @ 3737 NONAME
+	_ZN12QtConcurrent15ResultStoreBase17updateInsertIndexEii @ 3738 NONAME
+	_ZN12QtConcurrent15ResultStoreBase18syncPendingResultsEv @ 3739 NONAME
+	_ZN12QtConcurrent15ResultStoreBase23insertResultItemIfValidEiRNS_10ResultItemE @ 3740 NONAME
+	_ZN12QtConcurrent15ResultStoreBase9addResultEiPKv @ 3741 NONAME
+	_ZN12QtConcurrent15ResultStoreBaseC1Ev @ 3742 NONAME
+	_ZN12QtConcurrent15ResultStoreBaseC2Ev @ 3743 NONAME
+	_ZN12QtConcurrent16BlockSizeManager13timeAfterUserEv @ 3744 NONAME
+	_ZN12QtConcurrent16BlockSizeManager14timeBeforeUserEv @ 3745 NONAME
+	_ZN12QtConcurrent16BlockSizeManager9blockSizeEv @ 3746 NONAME
+	_ZN12QtConcurrent16BlockSizeManagerC1Ei @ 3747 NONAME
+	_ZN12QtConcurrent16BlockSizeManagerC2Ei @ 3748 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase10isCanceledEv @ 3749 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase10threadExitEv @ 3750 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase11startThreadEv @ 3751 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase12startThreadsEv @ 3752 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase13startBlockingEv @ 3753 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase13waitForResumeEv @ 3754 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase15handleExceptionERKNS_9ExceptionE @ 3755 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase16setProgressRangeEii @ 3756 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase16setProgressValueEi @ 3757 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase18threadThrottleExitEv @ 3758 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase19startSingleThreadedEv @ 3759 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase19startThreadInternalEv @ 3760 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase23acquireBarrierSemaphoreEv @ 3761 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase26isProgressReportingEnabledEv @ 3762 NONAME
+	_ZN12QtConcurrent16ThreadEngineBase3runEv @ 3763 NONAME
+	_ZN12QtConcurrent16ThreadEngineBaseC2Ev @ 3764 NONAME
+	_ZN12QtConcurrent16ThreadEngineBaseD0Ev @ 3765 NONAME
+	_ZN12QtConcurrent16ThreadEngineBaseD1Ev @ 3766 NONAME
+	_ZN12QtConcurrent16ThreadEngineBaseD2Ev @ 3767 NONAME
+	_ZN12QtConcurrent18ResultIteratorBase14batchedAdvanceEv @ 3768 NONAME
+	_ZN12QtConcurrent18ResultIteratorBaseC1EN4QMapIiNS_10ResultItemEE14const_iteratorEi @ 3769 NONAME
+	_ZN12QtConcurrent18ResultIteratorBaseC1Ev @ 3770 NONAME
+	_ZN12QtConcurrent18ResultIteratorBaseC2EN4QMapIiNS_10ResultItemEE14const_iteratorEi @ 3771 NONAME
+	_ZN12QtConcurrent18ResultIteratorBaseC2Ev @ 3772 NONAME
+	_ZN12QtConcurrent18ResultIteratorBaseppEv @ 3773 NONAME
+	_ZN12QtConcurrent8internal14ExceptionStore12setExceptionERKNS_9ExceptionE @ 3774 NONAME
+	_ZN12QtConcurrent8internal14ExceptionStore22throwPossibleExceptionEv @ 3775 NONAME
+	_ZN12QtConcurrent8internal14ExceptionStore9exceptionEv @ 3776 NONAME
+	_ZN13QActiveObject21maybeDeferSocketEventEv @ 3777 NONAME
+	_ZN13QActiveObject21reactivateAndCompleteEv @ 3778 NONAME
+	_ZN13QActiveObjectC2EiP23QEventDispatcherSymbian @ 3779 NONAME
+	_ZN13QActiveObjectD0Ev @ 3780 NONAME
+	_ZN13QActiveObjectD1Ev @ 3781 NONAME
+	_ZN13QActiveObjectD2Ev @ 3782 NONAME
+	_ZN13QFSFileEngine4openE6QFlagsIN9QIODevice12OpenModeFlagEEP7__sFILES0_IN5QFile14FileHandleFlagEE @ 3783 NONAME
+	_ZN13QFSFileEngine4openE6QFlagsIN9QIODevice12OpenModeFlagEERK5RFileS0_IN5QFile14FileHandleFlagEE @ 3784 NONAME
+	_ZN13QFSFileEngine4openE6QFlagsIN9QIODevice12OpenModeFlagEEiS0_IN5QFile14FileHandleFlagEE @ 3785 NONAME
+	_ZN13QHistoryState18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3786 NONAME
+	_ZN13QHistoryState25staticMetaObjectExtraDataE @ 3787 NONAME DATA 8
+	_ZN13QPluginLoader18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3788 NONAME
+	_ZN13QPluginLoader25staticMetaObjectExtraDataE @ 3789 NONAME DATA 8
+	_ZN13QSharedMemory12setNativeKeyERK7QString @ 3790 NONAME
+	_ZN13QSharedMemory18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3791 NONAME
+	_ZN13QSharedMemory25staticMetaObjectExtraDataE @ 3792 NONAME DATA 8
+	_ZN13QSignalMapper18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3793 NONAME
+	_ZN13QSignalMapper25staticMetaObjectExtraDataE @ 3794 NONAME DATA 8
+	_ZN13QStateMachine18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3795 NONAME
+	_ZN13QStateMachine25staticMetaObjectExtraDataE @ 3796 NONAME DATA 8
+	_ZN13QUnifiedTimer10timerEventEP11QTimerEvent @ 3797 NONAME
+	_ZN13QUnifiedTimer17ensureTimerUpdateEv @ 3798 NONAME
+	_ZN13QUnifiedTimer17registerAnimationEP18QAbstractAnimationb @ 3799 NONAME
+	_ZN13QUnifiedTimer17setTimingIntervalEi @ 3800 NONAME
+	_ZN13QUnifiedTimer19unregisterAnimationEP18QAbstractAnimation @ 3801 NONAME
+	_ZN13QUnifiedTimer20updateAnimationTimerEv @ 3802 NONAME
+	_ZN13QUnifiedTimer20updateAnimationsTimeEv @ 3803 NONAME
+	_ZN13QUnifiedTimer21restartAnimationTimerEv @ 3804 NONAME
+	_ZN13QUnifiedTimer22installAnimationDriverEP16QAnimationDriver @ 3805 NONAME
+	_ZN13QUnifiedTimer24registerRunningAnimationEP18QAbstractAnimation @ 3806 NONAME
+	_ZN13QUnifiedTimer26unregisterRunningAnimationEP18QAbstractAnimation @ 3807 NONAME
+	_ZN13QUnifiedTimer33closestPauseAnimationTimeToFinishEv @ 3808 NONAME
+	_ZN13QUnifiedTimer8instanceEb @ 3809 NONAME
+	_ZN13QUnifiedTimerC1Ev @ 3810 NONAME
+	_ZN13QUnifiedTimerC2Ev @ 3811 NONAME
+	_ZN14QAbstractState18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3812 NONAME
+	_ZN14QAbstractState25staticMetaObjectExtraDataE @ 3813 NONAME DATA 8
+	_ZN14QFactoryLoader18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3814 NONAME
+	_ZN14QFactoryLoader25staticMetaObjectExtraDataE @ 3815 NONAME DATA 8
+	_ZN14QLocalePrivate10findLocaleEN7QLocale8LanguageENS0_6ScriptENS0_7CountryE @ 3816 NONAME
+	_ZN14QLocalePrivate12codeToScriptERK7QString @ 3817 NONAME
+	_ZN14QLocalePrivate13codeToCountryERK7QString @ 3818 NONAME
+	_ZN14QLocalePrivate14codeToLanguageERK7QString @ 3819 NONAME
+	_ZN14QLocalePrivate14doubleToStringE5QCharS0_S0_S0_S0_S0_diNS_10DoubleFormEij @ 3820 NONAME
+	_ZN14QLocalePrivate16longLongToStringE5QCharS0_S0_S0_xiiij @ 3821 NONAME
+	_ZN14QLocalePrivate17getLangAndCountryERK7QStringRN7QLocale8LanguageERNS3_6ScriptERNS3_7CountryE @ 3822 NONAME
+	_ZN14QLocalePrivate19unsLongLongToStringE5QCharS0_S0_yiiij @ 3823 NONAME
+	_ZN14QMetaCallEventC1EttPFvP7QObjectN11QMetaObject4CallEiPPvEPKS0_iiPiS5_P10QSemaphore @ 3824 NONAME
+	_ZN14QMetaCallEventC2EttPFvP7QObjectN11QMetaObject4CallEiPPvEPKS0_iiPiS5_P10QSemaphore @ 3825 NONAME
+	_ZN14QTemporaryFile18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3826 NONAME
+	_ZN14QTemporaryFile25staticMetaObjectExtraDataE @ 3827 NONAME DATA 8
+	_ZN15QAnimationGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3828 NONAME
+	_ZN15QAnimationGroup25staticMetaObjectExtraDataE @ 3829 NONAME DATA 8
+	_ZN15QPauseAnimation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3830 NONAME
+	_ZN15QPauseAnimation25staticMetaObjectExtraDataE @ 3831 NONAME DATA 8
+	_ZN15QSocketNotifier18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3832 NONAME
+	_ZN15QSocketNotifier25staticMetaObjectExtraDataE @ 3833 NONAME DATA 8
+	_ZN16QAnimationDriver11qt_metacallEN11QMetaObject4CallEiPPv @ 3834 NONAME
+	_ZN16QAnimationDriver11qt_metacastEPKc @ 3835 NONAME
+	_ZN16QAnimationDriver16staticMetaObjectE @ 3836 NONAME DATA 16
+	_ZN16QAnimationDriver18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3837 NONAME
+	_ZN16QAnimationDriver19getStaticMetaObjectEv @ 3838 NONAME
+	_ZN16QAnimationDriver25staticMetaObjectExtraDataE @ 3839 NONAME DATA 8
+	_ZN16QAnimationDriver4stopEv @ 3840 NONAME
+	_ZN16QAnimationDriver5startEv @ 3841 NONAME
+	_ZN16QAnimationDriver7advanceEv @ 3842 NONAME
+	_ZN16QAnimationDriver7installEv @ 3843 NONAME
+	_ZN16QAnimationDriverC1EP7QObject @ 3844 NONAME
+	_ZN16QAnimationDriverC1ER23QAnimationDriverPrivateP7QObject @ 3845 NONAME
+	_ZN16QAnimationDriverC2EP7QObject @ 3846 NONAME
+	_ZN16QAnimationDriverC2ER23QAnimationDriverPrivateP7QObject @ 3847 NONAME
+	_ZN16QCoreApplication18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3848 NONAME
+	_ZN16QCoreApplication25staticMetaObjectExtraDataE @ 3849 NONAME DATA 8
+	_ZN16QCoreApplicationC1ERiPPci @ 3850 NONAME
+	_ZN16QCoreApplicationC2ERiPPci @ 3851 NONAME
+	_ZN16QEventTransition18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3852 NONAME
+	_ZN16QEventTransition25staticMetaObjectExtraDataE @ 3853 NONAME DATA 8
+	_ZN16QTextCodecPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3854 NONAME
+	_ZN16QTextCodecPlugin25staticMetaObjectExtraDataE @ 3855 NONAME DATA 8
+	_ZN17QSignalTransition18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3856 NONAME
+	_ZN17QSignalTransition25staticMetaObjectExtraDataE @ 3857 NONAME DATA 8
+	_ZN17QVariantAnimation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3858 NONAME
+	_ZN17QVariantAnimation25staticMetaObjectExtraDataE @ 3859 NONAME DATA 8
+	_ZN18QAbstractAnimation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3860 NONAME
+	_ZN18QAbstractAnimation25staticMetaObjectExtraDataE @ 3861 NONAME DATA 8
+	_ZN18QAbstractItemModel17resetInternalDataEv @ 3862 NONAME
+	_ZN18QAbstractItemModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3863 NONAME
+	_ZN18QAbstractItemModel25staticMetaObjectExtraDataE @ 3864 NONAME DATA 8
+	_ZN18QAbstractListModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3865 NONAME
+	_ZN18QAbstractListModel25staticMetaObjectExtraDataE @ 3866 NONAME DATA 8
+	_ZN18QFileSystemWatcher18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3867 NONAME
+	_ZN18QFileSystemWatcher25staticMetaObjectExtraDataE @ 3868 NONAME DATA 8
+	_ZN18QFutureWatcherBase11qt_metacallEN11QMetaObject4CallEiPPv @ 3869 NONAME
+	_ZN18QFutureWatcherBase11qt_metacastEPKc @ 3870 NONAME
+	_ZN18QFutureWatcherBase12togglePausedEv @ 3871 NONAME
+	_ZN18QFutureWatcherBase13connectNotifyEPKc @ 3872 NONAME
+	_ZN18QFutureWatcherBase13resultReadyAtEi @ 3873 NONAME
+	_ZN18QFutureWatcherBase14resultsReadyAtEii @ 3874 NONAME
+	_ZN18QFutureWatcherBase15waitForFinishedEv @ 3875 NONAME
+	_ZN18QFutureWatcherBase16disconnectNotifyEPKc @ 3876 NONAME
+	_ZN18QFutureWatcherBase16staticMetaObjectE @ 3877 NONAME DATA 16
+	_ZN18QFutureWatcherBase18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3878 NONAME
+	_ZN18QFutureWatcherBase19getStaticMetaObjectEv @ 3879 NONAME
+	_ZN18QFutureWatcherBase19progressTextChangedERK7QString @ 3880 NONAME
+	_ZN18QFutureWatcherBase20progressRangeChangedEii @ 3881 NONAME
+	_ZN18QFutureWatcherBase20progressValueChangedEi @ 3882 NONAME
+	_ZN18QFutureWatcherBase22connectOutputInterfaceEv @ 3883 NONAME
+	_ZN18QFutureWatcherBase22setPendingResultsLimitEi @ 3884 NONAME
+	_ZN18QFutureWatcherBase25disconnectOutputInterfaceEb @ 3885 NONAME
+	_ZN18QFutureWatcherBase25staticMetaObjectExtraDataE @ 3886 NONAME DATA 8
+	_ZN18QFutureWatcherBase5eventEP6QEvent @ 3887 NONAME
+	_ZN18QFutureWatcherBase5pauseEv @ 3888 NONAME
+	_ZN18QFutureWatcherBase6cancelEv @ 3889 NONAME
+	_ZN18QFutureWatcherBase6pausedEv @ 3890 NONAME
+	_ZN18QFutureWatcherBase6resumeEv @ 3891 NONAME
+	_ZN18QFutureWatcherBase7resumedEv @ 3892 NONAME
+	_ZN18QFutureWatcherBase7startedEv @ 3893 NONAME
+	_ZN18QFutureWatcherBase8canceledEv @ 3894 NONAME
+	_ZN18QFutureWatcherBase8finishedEv @ 3895 NONAME
+	_ZN18QFutureWatcherBase9setPausedEb @ 3896 NONAME
+	_ZN18QFutureWatcherBaseC2EP7QObject @ 3897 NONAME
+	_ZN18QPropertyAnimation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3898 NONAME
+	_ZN18QPropertyAnimation25staticMetaObjectExtraDataE @ 3899 NONAME DATA 8
+	_ZN19QAbstractTableModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3900 NONAME
+	_ZN19QAbstractTableModel25staticMetaObjectExtraDataE @ 3901 NONAME DATA 8
+	_ZN19QAbstractTransition18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3902 NONAME
+	_ZN19QAbstractTransition25staticMetaObjectExtraDataE @ 3903 NONAME DATA 8
+	_ZN19QProcessEnvironment6insertERKS_ @ 3904 NONAME
+	_ZN20QFutureInterfaceBase11setRunnableEP9QRunnable @ 3905 NONAME
+	_ZN20QFutureInterfaceBase12setThrottledEb @ 3906 NONAME
+	_ZN20QFutureInterfaceBase12togglePausedEv @ 3907 NONAME
+	_ZN20QFutureInterfaceBase13reportStartedEv @ 3908 NONAME
+	_ZN20QFutureInterfaceBase13setFilterModeEb @ 3909 NONAME
+	_ZN20QFutureInterfaceBase13waitForResultEi @ 3910 NONAME
+	_ZN20QFutureInterfaceBase13waitForResumeEv @ 3911 NONAME
+	_ZN20QFutureInterfaceBase14exceptionStoreEv @ 3912 NONAME
+	_ZN20QFutureInterfaceBase14reportCanceledEv @ 3913 NONAME
+	_ZN20QFutureInterfaceBase14reportFinishedEv @ 3914 NONAME
+	_ZN20QFutureInterfaceBase15reportExceptionERKN12QtConcurrent9ExceptionE @ 3915 NONAME
+	_ZN20QFutureInterfaceBase15resultStoreBaseEv @ 3916 NONAME
+	_ZN20QFutureInterfaceBase15waitForFinishedEv @ 3917 NONAME
+	_ZN20QFutureInterfaceBase16setProgressRangeEii @ 3918 NONAME
+	_ZN20QFutureInterfaceBase16setProgressValueEi @ 3919 NONAME
+	_ZN20QFutureInterfaceBase17waitForNextResultEv @ 3920 NONAME
+	_ZN20QFutureInterfaceBase18reportResultsReadyEii @ 3921 NONAME
+	_ZN20QFutureInterfaceBase19expectedResultCountEv @ 3922 NONAME
+	_ZN20QFutureInterfaceBase22setExpectedResultCountEi @ 3923 NONAME
+	_ZN20QFutureInterfaceBase23setProgressValueAndTextEiRK7QString @ 3924 NONAME
+	_ZN20QFutureInterfaceBase6cancelEv @ 3925 NONAME
+	_ZN20QFutureInterfaceBase9setPausedEb @ 3926 NONAME
+	_ZN20QFutureInterfaceBaseC1ENS_5StateE @ 3927 NONAME
+	_ZN20QFutureInterfaceBaseC1ERKS_ @ 3928 NONAME
+	_ZN20QFutureInterfaceBaseC2ENS_5StateE @ 3929 NONAME
+	_ZN20QFutureInterfaceBaseC2ERKS_ @ 3930 NONAME
+	_ZN20QFutureInterfaceBaseD0Ev @ 3931 NONAME
+	_ZN20QFutureInterfaceBaseD1Ev @ 3932 NONAME
+	_ZN20QFutureInterfaceBaseD2Ev @ 3933 NONAME
+	_ZN20QFutureInterfaceBaseaSERKS_ @ 3934 NONAME
+	_ZN21QAbstractConcatenable14convertToAsciiEPK5QChariRPc @ 3935 NONAME
+	_ZN21QObjectCleanupHandler18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3936 NONAME
+	_ZN21QObjectCleanupHandler25staticMetaObjectExtraDataE @ 3937 NONAME DATA 8
+	_ZN21QSymbianSocketManager12removeSocketERK7RSocket @ 3938 NONAME
+	_ZN21QSymbianSocketManager15getSocketServerEv @ 3939 NONAME
+	_ZN21QSymbianSocketManager20setDefaultConnectionEP11RConnection @ 3940 NONAME
+	_ZN21QSymbianSocketManager8instanceEv @ 3941 NONAME
+	_ZN21QSymbianSocketManager9addSocketERK7RSocket @ 3942 NONAME
+	_ZN21QSymbianSocketManagerC1Ev @ 3943 NONAME
+	_ZN21QSymbianSocketManagerC2Ev @ 3944 NONAME
+	_ZN21QSymbianSocketManagerD1Ev @ 3945 NONAME
+	_ZN21QSymbianSocketManagerD2Ev @ 3946 NONAME
+	_ZN23QCoreApplicationPrivate13trolltechConfEv @ 3947 NONAME
+	_ZN23QCoreApplicationPrivate19app_compile_versionE @ 3948 NONAME DATA 4
+	_ZN23QCoreApplicationPrivateC1ERiPPcj @ 3949 NONAME
+	_ZN23QCoreApplicationPrivateC2ERiPPcj @ 3950 NONAME
+	_ZN23QEventDispatcherSymbian18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3951 NONAME
+	_ZN23QEventDispatcherSymbian25staticMetaObjectExtraDataE @ 3952 NONAME DATA 8
+	_ZN23QParallelAnimationGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3953 NONAME
+	_ZN23QParallelAnimationGroup25staticMetaObjectExtraDataE @ 3954 NONAME DATA 8
+	_ZN24QAbstractEventDispatcher18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3955 NONAME
+	_ZN24QAbstractEventDispatcher25staticMetaObjectExtraDataE @ 3956 NONAME DATA 8
+	_ZN24QNonContiguousByteDevice18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3957 NONAME
+	_ZN24QNonContiguousByteDevice25staticMetaObjectExtraDataE @ 3958 NONAME DATA 8
+	_ZN25QSequentialAnimationGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3959 NONAME
+	_ZN25QSequentialAnimationGroup25staticMetaObjectExtraDataE @ 3960 NONAME DATA 8
+	_ZN31QNonContiguousByteDeviceFactory6createE14QSharedPointerI11QRingBufferE @ 3961 NONAME
+	_ZN5QChar21currentUnicodeVersionEv @ 3962 NONAME
+	_ZN5QFile18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3963 NONAME
+	_ZN5QFile25staticMetaObjectExtraDataE @ 3964 NONAME DATA 8
+	_ZN5QFile4openEP7__sFILE6QFlagsIN9QIODevice12OpenModeFlagEES2_INS_14FileHandleFlagEE @ 3965 NONAME
+	_ZN5QFile4openERK5RFile6QFlagsIN9QIODevice12OpenModeFlagEES3_INS_14FileHandleFlagEE @ 3966 NONAME
+	_ZN5QFile4openEi6QFlagsIN9QIODevice12OpenModeFlagEES0_INS_14FileHandleFlagEE @ 3967 NONAME
+	_ZN5QUuid11fromRfc4122ERK10QByteArray @ 3968 NONAME
+	_ZN5QUuidC1ERK10QByteArray @ 3969 NONAME
+	_ZN5QUuidC2ERK10QByteArray @ 3970 NONAME
+	_ZN6QMutex12lockInternalEv @ 3971 NONAME
+	_ZN6QMutex14unlockInternalEv @ 3972 NONAME
+	_ZN6QState18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3973 NONAME
+	_ZN6QState25staticMetaObjectExtraDataE @ 3974 NONAME DATA 8
+	_ZN6QTimer18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3975 NONAME
+	_ZN6QTimer25staticMetaObjectExtraDataE @ 3976 NONAME DATA 8
+	_ZN7QBuffer18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3977 NONAME
+	_ZN7QBuffer25staticMetaObjectExtraDataE @ 3978 NONAME DATA 8
+	_ZN7QLocale14scriptToStringENS_6ScriptE @ 3979 NONAME
+	_ZN7QLocale15matchingLocalesENS_8LanguageENS_6ScriptENS_7CountryE @ 3980 NONAME
+	_ZN7QLocaleC1ENS_8LanguageENS_6ScriptENS_7CountryE @ 3981 NONAME
+	_ZN7QLocaleC2ENS_8LanguageENS_6ScriptENS_7CountryE @ 3982 NONAME
+	_ZN7QObject10disconnectEPKS_RK11QMetaMethodS1_S4_ @ 3983 NONAME
+	_ZN7QObject18qt_static_metacallEPS_N11QMetaObject4CallEiPPv @ 3984 NONAME
+	_ZN7QObject25staticMetaObjectExtraDataE @ 3985 NONAME DATA 8
+	_ZN7QObject7connectEPKS_RK11QMetaMethodS1_S4_N2Qt14ConnectionTypeE @ 3986 NONAME
+	_ZN7QThread18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3987 NONAME
+	_ZN7QThread25staticMetaObjectExtraDataE @ 3988 NONAME DATA 8
+	_ZN8QLibrary18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3989 NONAME
+	_ZN8QLibrary25staticMetaObjectExtraDataE @ 3990 NONAME DATA 8
+	_ZN8QProcess18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3991 NONAME
+	_ZN8QProcess25staticMetaObjectExtraDataE @ 3992 NONAME DATA 8
+	_ZN9QFileInfoC1EP16QFileInfoPrivate @ 3993 NONAME
+	_ZN9QFileInfoC2EP16QFileInfoPrivate @ 3994 NONAME
+	_ZN9QIODevice18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3995 NONAME
+	_ZN9QIODevice25staticMetaObjectExtraDataE @ 3996 NONAME DATA 8
+	_ZN9QMimeData18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3997 NONAME
+	_ZN9QMimeData25staticMetaObjectExtraDataE @ 3998 NONAME DATA 8
+	_ZN9QSettings18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 3999 NONAME
+	_ZN9QSettings25staticMetaObjectExtraDataE @ 4000 NONAME DATA 8
+	_ZN9QTimeLine18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 4001 NONAME
+	_ZN9QTimeLine25staticMetaObjectExtraDataE @ 4002 NONAME DATA 8
+	_ZNK10QStringRef10startsWithE13QLatin1StringN2Qt15CaseSensitivityE @ 4003 NONAME
+	_ZNK10QStringRef10startsWithE5QCharN2Qt15CaseSensitivityE @ 4004 NONAME
+	_ZNK10QStringRef10startsWithERK7QStringN2Qt15CaseSensitivityE @ 4005 NONAME
+	_ZNK10QStringRef10startsWithERKS_N2Qt15CaseSensitivityE @ 4006 NONAME
+	_ZNK10QStringRef11lastIndexOfE13QLatin1StringiN2Qt15CaseSensitivityE @ 4007 NONAME
+	_ZNK10QStringRef11lastIndexOfE5QChariN2Qt15CaseSensitivityE @ 4008 NONAME
+	_ZNK10QStringRef11lastIndexOfERK7QStringiN2Qt15CaseSensitivityE @ 4009 NONAME
+	_ZNK10QStringRef11lastIndexOfERKS_iN2Qt15CaseSensitivityE @ 4010 NONAME
+	_ZNK10QStringRef11toLocal8BitEv @ 4011 NONAME
+	_ZNK10QStringRef5countE5QCharN2Qt15CaseSensitivityE @ 4012 NONAME
+	_ZNK10QStringRef5countERK7QStringN2Qt15CaseSensitivityE @ 4013 NONAME
+	_ZNK10QStringRef5countERKS_N2Qt15CaseSensitivityE @ 4014 NONAME
+	_ZNK10QStringRef6toUcs4Ev @ 4015 NONAME
+	_ZNK10QStringRef6toUtf8Ev @ 4016 NONAME
+	_ZNK10QStringRef7indexOfE13QLatin1StringiN2Qt15CaseSensitivityE @ 4017 NONAME
+	_ZNK10QStringRef7indexOfE5QChariN2Qt15CaseSensitivityE @ 4018 NONAME
+	_ZNK10QStringRef7indexOfERK7QStringiN2Qt15CaseSensitivityE @ 4019 NONAME
+	_ZNK10QStringRef7indexOfERKS_iN2Qt15CaseSensitivityE @ 4020 NONAME
+	_ZNK10QStringRef7toAsciiEv @ 4021 NONAME
+	_ZNK10QStringRef8endsWithE13QLatin1StringN2Qt15CaseSensitivityE @ 4022 NONAME
+	_ZNK10QStringRef8endsWithE5QCharN2Qt15CaseSensitivityE @ 4023 NONAME
+	_ZNK10QStringRef8endsWithERK7QStringN2Qt15CaseSensitivityE @ 4024 NONAME
+	_ZNK10QStringRef8endsWithERKS_N2Qt15CaseSensitivityE @ 4025 NONAME
+	_ZNK10QStringRef8toLatin1Ev @ 4026 NONAME
+	_ZNK11QMetaObject4castEPK7QObject @ 4027 NONAME
+	_ZNK12QtConcurrent15ResultStoreBase10filterModeEv @ 4028 NONAME
+	_ZNK12QtConcurrent15ResultStoreBase13hasNextResultEv @ 4029 NONAME
+	_ZNK12QtConcurrent15ResultStoreBase3endEv @ 4030 NONAME
+	_ZNK12QtConcurrent15ResultStoreBase5beginEv @ 4031 NONAME
+	_ZNK12QtConcurrent15ResultStoreBase5countEv @ 4032 NONAME
+	_ZNK12QtConcurrent15ResultStoreBase8containsEi @ 4033 NONAME
+	_ZNK12QtConcurrent15ResultStoreBase8resultAtEi @ 4034 NONAME
+	_ZNK12QtConcurrent18ResultIteratorBase11resultIndexEv @ 4035 NONAME
+	_ZNK12QtConcurrent18ResultIteratorBase11vectorIndexEv @ 4036 NONAME
+	_ZNK12QtConcurrent18ResultIteratorBase23canIncrementVectorIndexEv @ 4037 NONAME
+	_ZNK12QtConcurrent18ResultIteratorBase8isVectorEv @ 4038 NONAME
+	_ZNK12QtConcurrent18ResultIteratorBase9batchSizeEv @ 4039 NONAME
+	_ZNK12QtConcurrent18ResultIteratorBaseeqERKS0_ @ 4040 NONAME
+	_ZNK12QtConcurrent18ResultIteratorBaseneERKS0_ @ 4041 NONAME
+	_ZNK12QtConcurrent18UnhandledException5cloneEv @ 4042 NONAME
+	_ZNK12QtConcurrent18UnhandledException5raiseEv @ 4043 NONAME
+	_ZNK12QtConcurrent8internal14ExceptionStore12hasExceptionEv @ 4044 NONAME
+	_ZNK12QtConcurrent8internal14ExceptionStore9hasThrownEv @ 4045 NONAME
+	_ZNK12QtConcurrent9Exception5cloneEv @ 4046 NONAME
+	_ZNK12QtConcurrent9Exception5raiseEv @ 4047 NONAME
+	_ZNK13QElapsedTimer12nsecsElapsedEv @ 4048 NONAME
+	_ZNK13QSharedMemory9nativeKeyEv @ 4049 NONAME
+	_ZNK14QLocalePrivate10scriptCodeEv @ 4050 NONAME
+	_ZNK14QLocalePrivate11countryCodeEv @ 4051 NONAME
+	_ZNK14QLocalePrivate12languageCodeEv @ 4052 NONAME
+	_ZNK14QLocalePrivate9bcp47NameEv @ 4053 NONAME
+	_ZNK16QAnimationDriver10metaObjectEv @ 4054 NONAME
+	_ZNK16QAnimationDriver9isRunningEv @ 4055 NONAME
+	_ZNK16QXmlStreamWriter8hasErrorEv @ 4056 NONAME
+	_ZNK18QFutureWatcherBase10isCanceledEv @ 4057 NONAME
+	_ZNK18QFutureWatcherBase10isFinishedEv @ 4058 NONAME
+	_ZNK18QFutureWatcherBase10metaObjectEv @ 4059 NONAME
+	_ZNK18QFutureWatcherBase12progressTextEv @ 4060 NONAME
+	_ZNK18QFutureWatcherBase13progressValueEv @ 4061 NONAME
+	_ZNK18QFutureWatcherBase15progressMaximumEv @ 4062 NONAME
+	_ZNK18QFutureWatcherBase15progressMinimumEv @ 4063 NONAME
+	_ZNK18QFutureWatcherBase8isPausedEv @ 4064 NONAME
+	_ZNK18QFutureWatcherBase9isRunningEv @ 4065 NONAME
+	_ZNK18QFutureWatcherBase9isStartedEv @ 4066 NONAME
+	_ZNK19QProcessEnvironment4keysEv @ 4067 NONAME
+	_ZNK20QFutureInterfaceBase10isCanceledEv @ 4068 NONAME
+	_ZNK20QFutureInterfaceBase10isFinishedEv @ 4069 NONAME
+	_ZNK20QFutureInterfaceBase10queryStateENS_5StateE @ 4070 NONAME
+	_ZNK20QFutureInterfaceBase11isThrottledEv @ 4071 NONAME
+	_ZNK20QFutureInterfaceBase11resultCountEv @ 4072 NONAME
+	_ZNK20QFutureInterfaceBase12progressTextEv @ 4073 NONAME
+	_ZNK20QFutureInterfaceBase13progressValueEv @ 4074 NONAME
+	_ZNK20QFutureInterfaceBase15isResultReadyAtEi @ 4075 NONAME
+	_ZNK20QFutureInterfaceBase15progressMaximumEv @ 4076 NONAME
+	_ZNK20QFutureInterfaceBase15progressMinimumEv @ 4077 NONAME
+	_ZNK20QFutureInterfaceBase15resultStoreBaseEv @ 4078 NONAME
+	_ZNK20QFutureInterfaceBase19referenceCountIsOneEv @ 4079 NONAME
+	_ZNK20QFutureInterfaceBase22isProgressUpdateNeededEv @ 4080 NONAME
+	_ZNK20QFutureInterfaceBase5mutexEv @ 4081 NONAME
+	_ZNK20QFutureInterfaceBase8isPausedEv @ 4082 NONAME
+	_ZNK20QFutureInterfaceBase9isRunningEv @ 4083 NONAME
+	_ZNK20QFutureInterfaceBase9isStartedEv @ 4084 NONAME
+	_ZNK21QSymbianSocketManager12lookupSocketERK7RSocket @ 4085 NONAME
+	_ZNK21QSymbianSocketManager12lookupSocketEiR7RSocket @ 4086 NONAME
+	_ZNK21QSymbianSocketManager17defaultConnectionEv @ 4087 NONAME
+	_ZNK4QUrl11isLocalFileEv @ 4088 NONAME
+	_ZNK4QUrl14topLevelDomainEv @ 4089 NONAME
+	_ZNK5QUuid11toByteArrayEv @ 4090 NONAME
+	_ZNK5QUuid9toRfc4122Ev @ 4091 NONAME
+	_ZNK7QLocale11quoteStringERK10QStringRefNS_14QuotationStyleE @ 4092 NONAME
+	_ZNK7QLocale11quoteStringERK7QStringNS_14QuotationStyleE @ 4093 NONAME
+	_ZNK7QLocale11uiLanguagesEv @ 4094 NONAME
+	_ZNK7QLocale14currencySymbolENS_20CurrencySymbolFormatE @ 4095 NONAME
+	_ZNK7QLocale14firstDayOfWeekEv @ 4096 NONAME
+	_ZNK7QLocale16toCurrencyStringEdRK7QString @ 4097 NONAME
+	_ZNK7QLocale16toCurrencyStringExRK7QString @ 4098 NONAME
+	_ZNK7QLocale16toCurrencyStringEyRK7QString @ 4099 NONAME
+	_ZNK7QLocale17nativeCountryNameEv @ 4100 NONAME
+	_ZNK7QLocale18nativeLanguageNameEv @ 4101 NONAME
+	_ZNK7QLocale19createSeparatedListERK11QStringList @ 4102 NONAME
+	_ZNK7QLocale6scriptEv @ 4103 NONAME
+	_ZNK7QLocale7toLowerERK7QString @ 4104 NONAME
+	_ZNK7QLocale7toUpperERK7QString @ 4105 NONAME
+	_ZNK7QLocale8weekdaysEv @ 4106 NONAME
+	_ZNK7QLocale9bcp47NameEv @ 4107 NONAME
+	_ZNK7QObject17senderSignalIndexEv @ 4108 NONAME
+	_ZNK7QString10startsWithERK10QStringRefN2Qt15CaseSensitivityE @ 4109 NONAME
+	_ZNK7QString11lastIndexOfERK10QStringRefiN2Qt15CaseSensitivityE @ 4110 NONAME
+	_ZNK7QString5countERK10QStringRefN2Qt15CaseSensitivityE @ 4111 NONAME
+	_ZNK7QString7indexOfERK10QStringRefiN2Qt15CaseSensitivityE @ 4112 NONAME
+	_ZNK7QString8endsWithERK10QStringRefN2Qt15CaseSensitivityE @ 4113 NONAME
+	_ZTI13QActiveObject @ 4114 NONAME
+	_ZTI13QUnifiedTimer @ 4115 NONAME
+	_ZTI16QAnimationDriver @ 4116 NONAME
+	_ZTI18QFutureWatcherBase @ 4117 NONAME
+	_ZTI20QFutureInterfaceBase @ 4118 NONAME
+	_ZTI23QAnimationDriverPrivate @ 4119 NONAME
+	_ZTIN12QtConcurrent15ResultStoreBaseE @ 4120 NONAME
+	_ZTIN12QtConcurrent16ThreadEngineBaseE @ 4121 NONAME
+	_ZTIN12QtConcurrent18UnhandledExceptionE @ 4122 NONAME
+	_ZTIN12QtConcurrent9ExceptionE @ 4123 NONAME
+	_ZTV13QActiveObject @ 4124 NONAME
+	_ZTV13QUnifiedTimer @ 4125 NONAME
+	_ZTV16QAnimationDriver @ 4126 NONAME
+	_ZTV18QFutureWatcherBase @ 4127 NONAME
+	_ZTV20QFutureInterfaceBase @ 4128 NONAME
+	_ZTV23QAnimationDriverPrivate @ 4129 NONAME
+	_ZTVN12QtConcurrent15ResultStoreBaseE @ 4130 NONAME
+	_ZTVN12QtConcurrent16ThreadEngineBaseE @ 4131 NONAME
+	_ZTVN12QtConcurrent18UnhandledExceptionE @ 4132 NONAME
+	_ZTVN12QtConcurrent9ExceptionE @ 4133 NONAME
+	adler32_combine @ 4134 NONAME
+	adler32_combine64 @ 4135 NONAME
+	compressBound @ 4136 NONAME
+	crc32_combine @ 4137 NONAME
+	crc32_combine64 @ 4138 NONAME
+	deflateBound @ 4139 NONAME
+	deflatePrime @ 4140 NONAME
+	deflateSetHeader @ 4141 NONAME
+	deflateTune @ 4142 NONAME
+	gzbuffer @ 4143 NONAME
+	gzclearerr @ 4144 NONAME
+	gzclose_r @ 4145 NONAME
+	gzclose_w @ 4146 NONAME
+	gzdirect @ 4147 NONAME
+	gzoffset @ 4148 NONAME
+	gzoffset64 @ 4149 NONAME
+	gzopen64 @ 4150 NONAME
+	gzseek64 @ 4151 NONAME
+	gztell64 @ 4152 NONAME
+	gzungetc @ 4153 NONAME
+	inflateBack @ 4154 NONAME
+	inflateBackEnd @ 4155 NONAME
+	inflateBackInit_ @ 4156 NONAME
+	inflateCopy @ 4157 NONAME
+	inflateGetHeader @ 4158 NONAME
+	inflateMark @ 4159 NONAME
+	inflatePrime @ 4160 NONAME
+	inflateReset2 @ 4161 NONAME
+	inflateUndermine @ 4162 NONAME
+	zlibCompileFlags @ 4163 NONAME
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index 85030cd..ef97c67 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -1933,79 +1933,60 @@ EXPORTS
 	_ZN23QDeclarativeItemPrivate15setLayoutMirrorEb @ 1932 NONAME
 	_ZN23QDeclarativeItemPrivate19resolveLayoutMirrorEv @ 1933 NONAME
 	_ZN23QDeclarativeItemPrivate23setImplicitLayoutMirrorEbb @ 1934 NONAME
-	_ZN15QPacketProtocol18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1935 NONAME
-	_ZN15QPacketProtocol25staticMetaObjectExtraDataE @ 1936 NONAME DATA 8
-	_ZN16QDeclarativeItem18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1937 NONAME
-	_ZN16QDeclarativeItem25staticMetaObjectExtraDataE @ 1938 NONAME DATA 8
-	_ZN16QDeclarativeView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1939 NONAME
-	_ZN16QDeclarativeView25staticMetaObjectExtraDataE @ 1940 NONAME DATA 8
-	_ZN17QDeclarativeState18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1941 NONAME
-	_ZN17QDeclarativeState25staticMetaObjectExtraDataE @ 1942 NONAME DATA 8
-	_ZN18QDeclarativeEngine18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1943 NONAME
-	_ZN18QDeclarativeEngine25staticMetaObjectExtraDataE @ 1944 NONAME DATA 8
-	_ZN19QDeclarativeContext18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1945 NONAME
-	_ZN19QDeclarativeContext25staticMetaObjectExtraDataE @ 1946 NONAME DATA 8
-	_ZN21QDeclarativeComponent18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1947 NONAME
-	_ZN21QDeclarativeComponent25staticMetaObjectExtraDataE @ 1948 NONAME DATA 8
-	_ZN22QDeclarativeExpression18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1949 NONAME
-	_ZN22QDeclarativeExpression25staticMetaObjectExtraDataE @ 1950 NONAME DATA 8
-	_ZN22QDeclarativeStateGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1951 NONAME
-	_ZN22QDeclarativeStateGroup25staticMetaObjectExtraDataE @ 1952 NONAME DATA 8
-	_ZN22QDeclarativeTransition18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1953 NONAME
-	_ZN22QDeclarativeTransition25staticMetaObjectExtraDataE @ 1954 NONAME DATA 8
-	_ZN23QDeclarativeDebugServer18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1955 NONAME
-	_ZN23QDeclarativeDebugServer25staticMetaObjectExtraDataE @ 1956 NONAME DATA 8
-	_ZN23QDeclarativePropertyMap18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1957 NONAME
-	_ZN23QDeclarativePropertyMap25staticMetaObjectExtraDataE @ 1958 NONAME DATA 8
-	_ZN24QDeclarativeDebugService18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1959 NONAME
-	_ZN24QDeclarativeDebugService25staticMetaObjectExtraDataE @ 1960 NONAME DATA 8
-	_ZN26QDeclarativeStateOperation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1961 NONAME
-	_ZN26QDeclarativeStateOperation25staticMetaObjectExtraDataE @ 1962 NONAME DATA 8
-	_ZN27QDeclarativeExtensionPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1963 NONAME
-	_ZN27QDeclarativeExtensionPlugin25staticMetaObjectExtraDataE @ 1964 NONAME DATA 8
-	_ZN15QPacketProtocol16waitForReadyReadEi @ 1965 NONAME
-	_ZN23QDeclarativeDebugServer14waitForMessageEP24QDeclarativeDebugService @ 1966 NONAME
-	_ZN24QDeclarativeDebugService14waitForMessageEv @ 1967 NONAME
-	_ZN27QDeclarativeObserverService10gotMessageERK10QByteArray @ 1968 NONAME ABSENT
-	_ZN27QDeclarativeObserverService10removeViewEP16QDeclarativeView @ 1969 NONAME ABSENT
-	_ZN27QDeclarativeObserverService11qt_metacallEN11QMetaObject4CallEiPPv @ 1970 NONAME ABSENT
-	_ZN27QDeclarativeObserverService11qt_metacastEPKc @ 1971 NONAME ABSENT
-	_ZN27QDeclarativeObserverService11sendMessageERK10QByteArray @ 1972 NONAME ABSENT
-	_ZN27QDeclarativeObserverService13statusChangedEN24QDeclarativeDebugService6StatusE @ 1973 NONAME ABSENT
-	_ZN27QDeclarativeObserverService15messageReceivedERK10QByteArray @ 1974 NONAME ABSENT
-	_ZN27QDeclarativeObserverService16staticMetaObjectE @ 1975 NONAME DATA 16 ABSENT
-	_ZN27QDeclarativeObserverService18loadObserverPluginEv @ 1976 NONAME ABSENT
-	_ZN27QDeclarativeObserverService18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1977 NONAME ABSENT
-	_ZN27QDeclarativeObserverService19getStaticMetaObjectEv @ 1978 NONAME ABSENT
-	_ZN27QDeclarativeObserverService25staticMetaObjectExtraDataE @ 1979 NONAME DATA 8 ABSENT
-	_ZN27QDeclarativeObserverService7addViewEP16QDeclarativeView @ 1980 NONAME ABSENT
-	_ZN27QDeclarativeObserverService8instanceEv @ 1981 NONAME ABSENT
-	_ZN27QDeclarativeObserverServiceC1Ev @ 1982 NONAME ABSENT
-	_ZN27QDeclarativeObserverServiceC2Ev @ 1983 NONAME ABSENT
-	_ZN28QDeclarativeDebuggingEnablerC1Ev @ 1984 NONAME
-	_ZN28QDeclarativeDebuggingEnablerC2Ev @ 1985 NONAME
-	_ZNK27QDeclarativeObserverService10metaObjectEv @ 1986 NONAME ABSENT
-	_ZTI27QDeclarativeObserverService @ 1987 NONAME ABSENT
-	_ZTV27QDeclarativeObserverService @ 1988 NONAME ABSENT
-	_ZN18QDeclarativePixmap10flushCacheEv @ 1989 NONAME
-	_ZN28QDeclarativeInspectorService10gotMessageERK10QByteArray @ 1990 NONAME
-	_ZN28QDeclarativeInspectorService10removeViewEP16QDeclarativeView @ 1991 NONAME
-	_ZN28QDeclarativeInspectorService11qt_metacallEN11QMetaObject4CallEiPPv @ 1992 NONAME
-	_ZN28QDeclarativeInspectorService11qt_metacastEPKc @ 1993 NONAME
-	_ZN28QDeclarativeInspectorService11sendMessageERK10QByteArray @ 1994 NONAME
-	_ZN28QDeclarativeInspectorService13statusChangedEN24QDeclarativeDebugService6StatusE @ 1995 NONAME
-	_ZN28QDeclarativeInspectorService15messageReceivedERK10QByteArray @ 1996 NONAME
-	_ZN28QDeclarativeInspectorService16staticMetaObjectE @ 1997 NONAME DATA 16
-	_ZN28QDeclarativeInspectorService18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1998 NONAME
-	_ZN28QDeclarativeInspectorService19getStaticMetaObjectEv @ 1999 NONAME
-	_ZN28QDeclarativeInspectorService19loadInspectorPluginEv @ 2000 NONAME
-	_ZN28QDeclarativeInspectorService25staticMetaObjectExtraDataE @ 2001 NONAME DATA 8
-	_ZN28QDeclarativeInspectorService7addViewEP16QDeclarativeView @ 2002 NONAME
-	_ZN28QDeclarativeInspectorService8instanceEv @ 2003 NONAME
-	_ZN28QDeclarativeInspectorServiceC1Ev @ 2004 NONAME
-	_ZN28QDeclarativeInspectorServiceC2Ev @ 2005 NONAME
-	_ZNK28QDeclarativeInspectorService10metaObjectEv @ 2006 NONAME
-	_ZTI28QDeclarativeInspectorService @ 2007 NONAME
-	_ZTV28QDeclarativeInspectorService @ 2008 NONAME
-	_ZN28QDeclarativeInspectorService12updateStatusEv @ 2009 NONAME
+	_ZN15QPacketProtocol16waitForReadyReadEi @ 1935 NONAME
+	_ZN15QPacketProtocol18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1936 NONAME
+	_ZN15QPacketProtocol25staticMetaObjectExtraDataE @ 1937 NONAME DATA 8
+	_ZN16QDeclarativeItem18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1938 NONAME
+	_ZN16QDeclarativeItem25staticMetaObjectExtraDataE @ 1939 NONAME DATA 8
+	_ZN16QDeclarativeView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1940 NONAME
+	_ZN16QDeclarativeView25staticMetaObjectExtraDataE @ 1941 NONAME DATA 8
+	_ZN17QDeclarativeState18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1942 NONAME
+	_ZN17QDeclarativeState25staticMetaObjectExtraDataE @ 1943 NONAME DATA 8
+	_ZN18QDeclarativeEngine18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1944 NONAME
+	_ZN18QDeclarativeEngine25staticMetaObjectExtraDataE @ 1945 NONAME DATA 8
+	_ZN18QDeclarativePixmap10flushCacheEv @ 1946 NONAME
+	_ZN19QDeclarativeContext18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1947 NONAME
+	_ZN19QDeclarativeContext25staticMetaObjectExtraDataE @ 1948 NONAME DATA 8
+	_ZN21QDeclarativeComponent18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1949 NONAME
+	_ZN21QDeclarativeComponent25staticMetaObjectExtraDataE @ 1950 NONAME DATA 8
+	_ZN22QDeclarativeExpression18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1951 NONAME
+	_ZN22QDeclarativeExpression25staticMetaObjectExtraDataE @ 1952 NONAME DATA 8
+	_ZN22QDeclarativeStateGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1953 NONAME
+	_ZN22QDeclarativeStateGroup25staticMetaObjectExtraDataE @ 1954 NONAME DATA 8
+	_ZN22QDeclarativeTransition18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1955 NONAME
+	_ZN22QDeclarativeTransition25staticMetaObjectExtraDataE @ 1956 NONAME DATA 8
+	_ZN23QDeclarativeDebugServer14waitForMessageEP24QDeclarativeDebugService @ 1957 NONAME
+	_ZN23QDeclarativeDebugServer18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1958 NONAME
+	_ZN23QDeclarativeDebugServer25staticMetaObjectExtraDataE @ 1959 NONAME DATA 8
+	_ZN23QDeclarativePropertyMap18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1960 NONAME
+	_ZN23QDeclarativePropertyMap25staticMetaObjectExtraDataE @ 1961 NONAME DATA 8
+	_ZN24QDeclarativeDebugService14waitForMessageEv @ 1962 NONAME
+	_ZN24QDeclarativeDebugService18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1963 NONAME
+	_ZN24QDeclarativeDebugService25staticMetaObjectExtraDataE @ 1964 NONAME DATA 8
+	_ZN26QDeclarativeStateOperation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1965 NONAME
+	_ZN26QDeclarativeStateOperation25staticMetaObjectExtraDataE @ 1966 NONAME DATA 8
+	_ZN27QDeclarativeExtensionPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1967 NONAME
+	_ZN27QDeclarativeExtensionPlugin25staticMetaObjectExtraDataE @ 1968 NONAME DATA 8
+	_ZN28QDeclarativeDebuggingEnablerC1Ev @ 1969 NONAME
+	_ZN28QDeclarativeDebuggingEnablerC2Ev @ 1970 NONAME
+	_ZN28QDeclarativeInspectorService10gotMessageERK10QByteArray @ 1971 NONAME
+	_ZN28QDeclarativeInspectorService10removeViewEP16QDeclarativeView @ 1972 NONAME
+	_ZN28QDeclarativeInspectorService11qt_metacallEN11QMetaObject4CallEiPPv @ 1973 NONAME
+	_ZN28QDeclarativeInspectorService11qt_metacastEPKc @ 1974 NONAME
+	_ZN28QDeclarativeInspectorService11sendMessageERK10QByteArray @ 1975 NONAME
+	_ZN28QDeclarativeInspectorService12updateStatusEv @ 1976 NONAME
+	_ZN28QDeclarativeInspectorService13statusChangedEN24QDeclarativeDebugService6StatusE @ 1977 NONAME
+	_ZN28QDeclarativeInspectorService15messageReceivedERK10QByteArray @ 1978 NONAME
+	_ZN28QDeclarativeInspectorService16staticMetaObjectE @ 1979 NONAME DATA 16
+	_ZN28QDeclarativeInspectorService18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1980 NONAME
+	_ZN28QDeclarativeInspectorService19getStaticMetaObjectEv @ 1981 NONAME
+	_ZN28QDeclarativeInspectorService19loadInspectorPluginEv @ 1982 NONAME
+	_ZN28QDeclarativeInspectorService25staticMetaObjectExtraDataE @ 1983 NONAME DATA 8
+	_ZN28QDeclarativeInspectorService7addViewEP16QDeclarativeView @ 1984 NONAME
+	_ZN28QDeclarativeInspectorService8instanceEv @ 1985 NONAME
+	_ZN28QDeclarativeInspectorServiceC1Ev @ 1986 NONAME
+	_ZN28QDeclarativeInspectorServiceC2Ev @ 1987 NONAME
+	_ZNK28QDeclarativeInspectorService10metaObjectEv @ 1988 NONAME
+	_ZTI28QDeclarativeInspectorService @ 1989 NONAME
+	_ZTV28QDeclarativeInspectorService @ 1990 NONAME
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 01b3772..4133773 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -11593,7 +11593,7 @@ EXPORTS
 	_ZN13QSymbianEventD2Ev @ 11592 NONAME
 	_ZN14QFileOpenEventC1ERK4QUrl @ 11593 NONAME
 	_ZN14QFileOpenEventC2ERK4QUrl @ 11594 NONAME
-	_ZN14QWidgetPrivate17_q_delayedDestroyEP11CCoeControl @ 11595 NONAME
+	_ZN14QWidgetPrivate17_q_delayedDestroyEP11CCoeControl @ 11595 NONAME ABSENT
 	_ZN14QWidgetPrivate21activateSymbianWindowEP11CCoeControl @ 11596 NONAME
 	_ZN14QWidgetPrivate26nearestGraphicsProxyWidgetEPK7QWidget @ 11597 NONAME
 	_ZN14QWidgetPrivate36invalidateGraphicsEffectsRecursivelyEv @ 11598 NONAME
@@ -12199,563 +12199,601 @@ EXPORTS
 	_ZNK14QVolatileImage13constImageRefEv @ 12198 NONAME
 	_Z43qt_s60_setPartialScreenAutomaticTranslationb @ 12199 NONAME
 	_Z18qt_addBitmapToPathffPKhiiiP12QPainterPath @ 12200 NONAME
-	_Z28qt_painterPathFromVectorPathRK11QVectorPath @ 12201 NONAME
-	_ZN10QBoxLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12202 NONAME
-	_ZN10QBoxLayout25staticMetaObjectExtraDataE @ 12203 NONAME DATA 8
-	_ZN10QClipboard18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12204 NONAME
-	_ZN10QClipboard25staticMetaObjectExtraDataE @ 12205 NONAME DATA 8
-	_ZN10QCompleter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12206 NONAME
-	_ZN10QCompleter25staticMetaObjectExtraDataE @ 12207 NONAME DATA 8
-	_ZN10QLCDNumber18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12208 NONAME
-	_ZN10QLCDNumber25staticMetaObjectExtraDataE @ 12209 NONAME DATA 8
-	_ZN10QScrollBar18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12210 NONAME
-	_ZN10QScrollBar25staticMetaObjectExtraDataE @ 12211 NONAME DATA 8
-	_ZN10QStatusBar18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12212 NONAME
-	_ZN10QStatusBar25staticMetaObjectExtraDataE @ 12213 NONAME DATA 8
-	_ZN10QTabWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12214 NONAME
-	_ZN10QTabWidget25staticMetaObjectExtraDataE @ 12215 NONAME DATA 8
-	_ZN10QTableView13doItemsLayoutEv @ 12216 NONAME
-	_ZN10QTableView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12217 NONAME
-	_ZN10QTableView25staticMetaObjectExtraDataE @ 12218 NONAME DATA 8
-	_ZN10QTextFrame18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12219 NONAME
-	_ZN10QTextFrame25staticMetaObjectExtraDataE @ 12220 NONAME DATA 8
-	_ZN10QTextTable18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12221 NONAME
-	_ZN10QTextTable25staticMetaObjectExtraDataE @ 12222 NONAME DATA 8
-	_ZN10QUndoGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12223 NONAME
-	_ZN10QUndoGroup25staticMetaObjectExtraDataE @ 12224 NONAME DATA 8
-	_ZN10QUndoStack18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12225 NONAME
-	_ZN10QUndoStack25staticMetaObjectExtraDataE @ 12226 NONAME DATA 8
-	_ZN10QValidator18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12227 NONAME
-	_ZN10QValidator25staticMetaObjectExtraDataE @ 12228 NONAME DATA 8
-	_ZN10QWorkspace18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12229 NONAME
-	_ZN10QWorkspace25staticMetaObjectExtraDataE @ 12230 NONAME DATA 8
-	_ZN10QZipWriter10addSymLinkERK7QStringS2_ @ 12231 NONAME
-	_ZN10QZipWriter12addDirectoryERK7QString @ 12232 NONAME
-	_ZN10QZipWriter20setCompressionPolicyENS_17CompressionPolicyE @ 12233 NONAME
-	_ZN10QZipWriter22setCreationPermissionsE6QFlagsIN5QFile10PermissionEE @ 12234 NONAME
-	_ZN10QZipWriter5closeEv @ 12235 NONAME
-	_ZN10QZipWriter7addFileERK7QStringP9QIODevice @ 12236 NONAME
-	_ZN10QZipWriter7addFileERK7QStringRK10QByteArray @ 12237 NONAME
-	_ZN10QZipWriterC1EP9QIODevice @ 12238 NONAME
-	_ZN10QZipWriterC1ERK7QString6QFlagsIN9QIODevice12OpenModeFlagEE @ 12239 NONAME
-	_ZN10QZipWriterC2EP9QIODevice @ 12240 NONAME
-	_ZN10QZipWriterC2ERK7QString6QFlagsIN9QIODevice12OpenModeFlagEE @ 12241 NONAME
-	_ZN10QZipWriterD1Ev @ 12242 NONAME
-	_ZN10QZipWriterD2Ev @ 12243 NONAME
-	_ZN11QColumnView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12244 NONAME
-	_ZN11QColumnView25staticMetaObjectExtraDataE @ 12245 NONAME DATA 8
-	_ZN11QDockWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12246 NONAME
-	_ZN11QDockWidget25staticMetaObjectExtraDataE @ 12247 NONAME DATA 8
-	_ZN11QFileDialog18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12248 NONAME
-	_ZN11QFileDialog25staticMetaObjectExtraDataE @ 12249 NONAME DATA 8
-	_ZN11QFocusFrame18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12250 NONAME
-	_ZN11QFocusFrame25staticMetaObjectExtraDataE @ 12251 NONAME DATA 8
-	_ZN11QFontDialog18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12252 NONAME
-	_ZN11QFontDialog25staticMetaObjectExtraDataE @ 12253 NONAME DATA 8
-	_ZN11QFormLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12254 NONAME
-	_ZN11QFormLayout25staticMetaObjectExtraDataE @ 12255 NONAME DATA 8
-	_ZN11QGridLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12256 NONAME
-	_ZN11QGridLayout25staticMetaObjectExtraDataE @ 12257 NONAME DATA 8
-	_ZN11QHBoxLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12258 NONAME
-	_ZN11QHBoxLayout25staticMetaObjectExtraDataE @ 12259 NONAME DATA 8
-	_ZN11QHeaderView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12260 NONAME
-	_ZN11QHeaderView25staticMetaObjectExtraDataE @ 12261 NONAME DATA 8
-	_ZN11QListWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12262 NONAME
-	_ZN11QListWidget25staticMetaObjectExtraDataE @ 12263 NONAME DATA 8
-	_ZN11QMainWindow18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12264 NONAME
-	_ZN11QMainWindow25staticMetaObjectExtraDataE @ 12265 NONAME DATA 8
-	_ZN11QMessageBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12266 NONAME
-	_ZN11QMessageBox25staticMetaObjectExtraDataE @ 12267 NONAME DATA 8
-	_ZN11QPanGesture18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12268 NONAME
-	_ZN11QPanGesture25staticMetaObjectExtraDataE @ 12269 NONAME DATA 8
-	_ZN11QProxyModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12270 NONAME
-	_ZN11QProxyModel25staticMetaObjectExtraDataE @ 12271 NONAME DATA 8
-	_ZN11QProxyStyle18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12272 NONAME
-	_ZN11QProxyStyle25staticMetaObjectExtraDataE @ 12273 NONAME DATA 8
-	_ZN11QPushButton18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12274 NONAME
-	_ZN11QPushButton25staticMetaObjectExtraDataE @ 12275 NONAME DATA 8
-	_ZN11QRubberBand18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12276 NONAME
-	_ZN11QRubberBand25staticMetaObjectExtraDataE @ 12277 NONAME DATA 8
-	_ZN11QScrollArea18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12278 NONAME
-	_ZN11QScrollArea25staticMetaObjectExtraDataE @ 12279 NONAME DATA 8
-	_ZN11QTapGesture18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12280 NONAME
-	_ZN11QTapGesture25staticMetaObjectExtraDataE @ 12281 NONAME DATA 8
-	_ZN11QTextEngine15beginningOfLineEi @ 12282 NONAME
-	_ZN11QTextEngine16offsetInLigatureEPK11QScriptItemiii @ 12283 NONAME
-	_Z32qGamma_correct_back_to_linear_csP6QImage @ 12284 NONAME
-	_ZN11QTextEngine22insertionPointsForLineEiR7QVectorIiE @ 12285 NONAME
-	_ZN11QTextEngine25lineNumberForTextPositionEi @ 12286 NONAME
-	_ZN11QTextEngine27positionAfterVisualMovementEiN11QTextCursor13MoveOperationE @ 12287 NONAME
-	_ZN11QTextEngine9alignLineERK11QScriptLine @ 12288 NONAME
-	_ZN11QTextEngine9endOfLineEi @ 12289 NONAME
-	_ZN11QTextLayout18setCursorMoveStyleEN11QTextCursor9MoveStyleE @ 12290 NONAME ABSENT
-	_ZN11QTextObject18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12291 NONAME
-	_ZN11QTextObject25staticMetaObjectExtraDataE @ 12292 NONAME DATA 8
-	_ZN11QToolButton18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12293 NONAME
-	_ZN11QToolButton25staticMetaObjectExtraDataE @ 12294 NONAME DATA 8
-	_ZN11QTreeWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12295 NONAME
-	_ZN11QTreeWidget25staticMetaObjectExtraDataE @ 12296 NONAME DATA 8
-	_ZN11QVBoxLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12297 NONAME
-	_ZN11QVBoxLayout25staticMetaObjectExtraDataE @ 12298 NONAME DATA 8
-	_ZN11QWizardPage18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12299 NONAME
-	_ZN11QWizardPage25staticMetaObjectExtraDataE @ 12300 NONAME DATA 8
-	_ZN12QActionGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12301 NONAME
-	_ZN12QActionGroup25staticMetaObjectExtraDataE @ 12302 NONAME DATA 8
-	_ZN12QApplication18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12303 NONAME
-	_ZN12QApplication25staticMetaObjectExtraDataE @ 12304 NONAME DATA 8
-	_ZN12QButtonGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12305 NONAME
-	_ZN12QButtonGroup25staticMetaObjectExtraDataE @ 12306 NONAME DATA 8
-	_ZN12QColorDialog18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12307 NONAME
-	_ZN12QColorDialog25staticMetaObjectExtraDataE @ 12308 NONAME DATA 8
-	_ZN12QCommonStyle18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12309 NONAME
-	_ZN12QCommonStyle25staticMetaObjectExtraDataE @ 12310 NONAME DATA 8
-	_ZN12QInputDialog18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12311 NONAME
-	_ZN12QInputDialog25staticMetaObjectExtraDataE @ 12312 NONAME DATA 8
-	_ZN12QLineControl18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12313 NONAME
-	_ZN12QLineControl25staticMetaObjectExtraDataE @ 12314 NONAME DATA 8
-	_ZN12QProgressBar18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12315 NONAME
-	_ZN12QProgressBar25staticMetaObjectExtraDataE @ 12316 NONAME DATA 8
-	_ZN12QRadioButton18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12317 NONAME
-	_ZN12QRadioButton25staticMetaObjectExtraDataE @ 12318 NONAME DATA 8
-	_ZN12QStylePlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12319 NONAME
-	_ZN12QStylePlugin25staticMetaObjectExtraDataE @ 12320 NONAME DATA 8
-	_ZN12QTableWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12321 NONAME
-	_ZN12QTableWidget25staticMetaObjectExtraDataE @ 12322 NONAME DATA 8
-	_ZN12QTextBrowser18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12323 NONAME
-	_ZN12QTextBrowser25staticMetaObjectExtraDataE @ 12324 NONAME DATA 8
-	_ZN12QTextControl18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12325 NONAME
-	_ZN12QTextControl25staticMetaObjectExtraDataE @ 12326 NONAME DATA 8
-	_ZN13QDateTimeEdit18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12327 NONAME
-	_ZN13QDateTimeEdit25staticMetaObjectExtraDataE @ 12328 NONAME DATA 8
-	_ZN13QErrorMessage18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12329 NONAME
-	_ZN13QErrorMessage25staticMetaObjectExtraDataE @ 12330 NONAME DATA 8
-	_ZN13QFontComboBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12331 NONAME
-	_ZN13QFontComboBox25staticMetaObjectExtraDataE @ 12332 NONAME DATA 8
-	_ZN13QFontDatabase22resolveFontFamilyAliasERK7QString @ 12333 NONAME
-	_ZN13QGraphicsView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12334 NONAME
-	_ZN13QGraphicsView25staticMetaObjectExtraDataE @ 12335 NONAME DATA 8
-	_ZN13QInputContext18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12336 NONAME
-	_ZN13QInputContext25staticMetaObjectExtraDataE @ 12337 NONAME DATA 8
-	_ZN13QIntValidator18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12338 NONAME
-	_ZN13QIntValidator25staticMetaObjectExtraDataE @ 12339 NONAME DATA 8
-	_ZN13QItemDelegate18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12340 NONAME
-	_ZN13QItemDelegate25staticMetaObjectExtraDataE @ 12341 NONAME DATA 8
-	_ZN13QMdiSubWindow18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12342 NONAME
-	_ZN13QMdiSubWindow25staticMetaObjectExtraDataE @ 12343 NONAME DATA 8
-	_ZN13QPinchGesture18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12344 NONAME
-	_ZN13QPinchGesture25staticMetaObjectExtraDataE @ 12345 NONAME DATA 8
-	_ZN13QPixmapFilter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12346 NONAME
-	_ZN13QPixmapFilter25staticMetaObjectExtraDataE @ 12347 NONAME DATA 8
-	_ZN13QS60MainAppUi25ProcessCommandParametersLE11TApaCommandR4TBufILi256EERK6TDesC8 @ 12348 NONAME
-	_ZN13QSplashScreen18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12349 NONAME
-	_ZN13QSplashScreen25staticMetaObjectExtraDataE @ 12350 NONAME DATA 8
-	_ZN13QSwipeGesture18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12351 NONAME
-	_ZN13QSwipeGesture25staticMetaObjectExtraDataE @ 12352 NONAME DATA 8
-	_ZN13QTextDocument18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12353 NONAME
-	_ZN13QTextDocument25setDefaultCursorMoveStyleEN11QTextCursor9MoveStyleE @ 12354 NONAME ABSENT
-	_ZN13QTextDocument25staticMetaObjectExtraDataE @ 12355 NONAME DATA 8
-	_ZN13QWidgetAction18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12356 NONAME
-	_ZN13QWidgetAction25staticMetaObjectExtraDataE @ 12357 NONAME DATA 8
-	_ZN13QWindowsStyle18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12358 NONAME
-	_ZN13QWindowsStyle25staticMetaObjectExtraDataE @ 12359 NONAME DATA 8
-	_ZN14QDesktopWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12360 NONAME
-	_ZN14QDesktopWidget25staticMetaObjectExtraDataE @ 12361 NONAME DATA 8
-	_ZN14QDoubleSpinBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12362 NONAME
-	_ZN14QDoubleSpinBox25staticMetaObjectExtraDataE @ 12363 NONAME DATA 8
-	_ZN14QFileOpenEventC1ERK5RFile @ 12364 NONAME
-	_ZN14QFileOpenEventC2ERK5RFile @ 12365 NONAME
-	_ZN14QGraphicsScale18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12366 NONAME
-	_ZN14QGraphicsScale25staticMetaObjectExtraDataE @ 12367 NONAME DATA 8
-	_ZN14QGraphicsScene18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12368 NONAME
-	_ZN14QGraphicsScene25staticMetaObjectExtraDataE @ 12369 NONAME DATA 8
-	_ZN14QImageIOPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12370 NONAME
-	_ZN14QImageIOPlugin25staticMetaObjectExtraDataE @ 12371 NONAME DATA 8
-	_ZN14QPlainTextEdit18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12372 NONAME
-	_ZN14QPlainTextEdit25staticMetaObjectExtraDataE @ 12373 NONAME DATA 8
-	_ZN14QStackedLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12374 NONAME
-	_ZN14QStackedLayout25staticMetaObjectExtraDataE @ 12375 NONAME DATA 8
-	_ZN14QStackedWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12376 NONAME
-	_ZN14QStackedWidget25staticMetaObjectExtraDataE @ 12377 NONAME DATA 8
-	_ZN14QWindowSurfaceC2EP7QWidgetb @ 12378 NONAME
-	_ZN15QAbstractButton18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12379 NONAME
-	_ZN15QAbstractButton25staticMetaObjectExtraDataE @ 12380 NONAME DATA 8
-	_ZN15QAbstractSlider18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12381 NONAME
-	_ZN15QAbstractSlider25staticMetaObjectExtraDataE @ 12382 NONAME DATA 8
-	_ZN15QCalendarWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12383 NONAME
-	_ZN15QCalendarWidget25staticMetaObjectExtraDataE @ 12384 NONAME DATA 8
-	_ZN15QGraphicsAnchor18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12385 NONAME
-	_ZN15QGraphicsAnchor25staticMetaObjectExtraDataE @ 12386 NONAME DATA 8
-	_ZN15QGraphicsEffect18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12387 NONAME
-	_ZN15QGraphicsEffect25staticMetaObjectExtraDataE @ 12388 NONAME DATA 8
-	_ZN10QBlittable4lockEv @ 12389 NONAME
-	_ZN10QBlittable6unlockEv @ 12390 NONAME
-	_ZN15QGraphicsObject18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12391 NONAME
-	_ZN15QGraphicsObject25staticMetaObjectExtraDataE @ 12392 NONAME DATA 8
-	_ZN15QGraphicsWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12393 NONAME
-	_ZN15QGraphicsWidget25staticMetaObjectExtraDataE @ 12394 NONAME DATA 8
-	_ZN15QProgressDialog18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12395 NONAME
-	_ZN15QProgressDialog25staticMetaObjectExtraDataE @ 12396 NONAME DATA 8
-	_ZN15QRadialGradient14setFocalRadiusEf @ 12397 NONAME
-	_ZN15QRadialGradient15setCenterRadiusEf @ 12398 NONAME
-	_ZN15QRadialGradientC1ERK7QPointFfS2_f @ 12399 NONAME
-	_ZN15QRadialGradientC1Effffff @ 12400 NONAME
-	_ZN15QRadialGradientC2ERK7QPointFfS2_f @ 12401 NONAME
-	_ZN15QRadialGradientC2Effffff @ 12402 NONAME
-	_ZN15QSessionManager18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12403 NONAME
-	_ZN15QSessionManager25staticMetaObjectExtraDataE @ 12404 NONAME DATA 8
-	_ZN15QSplitterHandle18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12405 NONAME
-	_ZN15QSplitterHandle25staticMetaObjectExtraDataE @ 12406 NONAME DATA 8
-	_ZN15QTextBlockGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12407 NONAME
-	_ZN15QTextBlockGroup25staticMetaObjectExtraDataE @ 12408 NONAME DATA 8
-	_ZN16QAbstractSpinBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12409 NONAME
-	_ZN16QAbstractSpinBox25staticMetaObjectExtraDataE @ 12410 NONAME DATA 8
-	_ZN16QDialogButtonBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12411 NONAME
-	_ZN16QDialogButtonBox25staticMetaObjectExtraDataE @ 12412 NONAME DATA 8
-	_ZN16QDoubleValidator18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12413 NONAME
-	_ZN16QDoubleValidator25staticMetaObjectExtraDataE @ 12414 NONAME DATA 8
-	_ZN16QFileSystemModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12415 NONAME
-	_ZN16QFileSystemModel25staticMetaObjectExtraDataE @ 12416 NONAME DATA 8
-	_ZN16QRegExpValidator18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12417 NONAME
-	_ZN16QRegExpValidator25staticMetaObjectExtraDataE @ 12418 NONAME DATA 8
-	_ZN16QStringListModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12419 NONAME
-	_ZN16QStringListModel25staticMetaObjectExtraDataE @ 12420 NONAME DATA 8
-	_ZN17QAbstractItemView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12421 NONAME
-	_ZN17QAbstractItemView25staticMetaObjectExtraDataE @ 12422 NONAME DATA 8
-	_ZN17QDataWidgetMapper18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12423 NONAME
-	_ZN17QDataWidgetMapper25staticMetaObjectExtraDataE @ 12424 NONAME DATA 8
-	_ZN17QDockWidgetLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12425 NONAME
-	_ZN17QDockWidgetLayout25staticMetaObjectExtraDataE @ 12426 NONAME DATA 8
-	_ZN17QGraphicsRotation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12427 NONAME
-	_ZN17QGraphicsRotation25staticMetaObjectExtraDataE @ 12428 NONAME DATA 8
-	_ZN17QGraphicsTextItem18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12429 NONAME
-	_ZN17QGraphicsTextItem25staticMetaObjectExtraDataE @ 12430 NONAME DATA 8
-	_ZN17QIconEnginePlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12431 NONAME
-	_ZN17QIconEnginePlugin25staticMetaObjectExtraDataE @ 12432 NONAME DATA 8
-	_ZN17QInternalMimeData11canReadDataERK7QString @ 12433 NONAME
-	_ZN17QInternalMimeData11qt_metacallEN11QMetaObject4CallEiPPv @ 12434 NONAME
-	_ZN17QInternalMimeData11qt_metacastEPKc @ 12435 NONAME
-	_ZN17QInternalMimeData13formatsHelperEPK9QMimeData @ 12436 NONAME
-	_ZN17QInternalMimeData15hasFormatHelperERK7QStringPK9QMimeData @ 12437 NONAME
-	_ZN17QInternalMimeData16renderDataHelperERK7QStringPK9QMimeData @ 12438 NONAME
-	_ZN17QInternalMimeData16staticMetaObjectE @ 12439 NONAME DATA 16
-	_ZN17QInternalMimeData18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12440 NONAME
-	_ZN17QInternalMimeData19getStaticMetaObjectEv @ 12441 NONAME
-	_ZN17QInternalMimeData25staticMetaObjectExtraDataE @ 12442 NONAME DATA 8
-	_ZN17QInternalMimeDataC2Ev @ 12443 NONAME
-	_ZN17QInternalMimeDataD0Ev @ 12444 NONAME
-	_ZN17QInternalMimeDataD1Ev @ 12445 NONAME
-	_ZN17QInternalMimeDataD2Ev @ 12446 NONAME
-	_ZN17QPixmapBlurFilter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12447 NONAME
-	_ZN17QPixmapBlurFilter25staticMetaObjectExtraDataE @ 12448 NONAME DATA 8
-	_ZN18QCommandLinkButton18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12449 NONAME
-	_ZN18QCommandLinkButton25staticMetaObjectExtraDataE @ 12450 NONAME DATA 8
-	_ZN18QGraphicsTransform18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12451 NONAME
-	_ZN18QGraphicsTransform25staticMetaObjectExtraDataE @ 12452 NONAME DATA 8
-	_ZN18QGuiPlatformPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12453 NONAME
-	_ZN18QGuiPlatformPlugin25staticMetaObjectExtraDataE @ 12454 NONAME DATA 8
-	_ZN18QStandardItemModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12455 NONAME
-	_ZN18QStandardItemModel25staticMetaObjectExtraDataE @ 12456 NONAME DATA 8
-	_ZN18QSyntaxHighlighter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12457 NONAME
-	_ZN18QSyntaxHighlighter25staticMetaObjectExtraDataE @ 12458 NONAME DATA 8
-	_ZN18QTapAndHoldGesture18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12459 NONAME
-	_ZN18QTapAndHoldGesture25staticMetaObjectExtraDataE @ 12460 NONAME DATA 8
-	_ZN18QTextureGlyphCache19fillInPendingGlyphsEv @ 12461 NONAME
-	_ZN19QAbstractProxyModel11setItemDataERK11QModelIndexRK4QMapIi8QVariantE @ 12462 NONAME
-	_ZN19QAbstractProxyModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12463 NONAME
-	_ZN19QAbstractProxyModel25staticMetaObjectExtraDataE @ 12464 NONAME DATA 8
-	_ZN19QAbstractProxyModel4sortEiN2Qt9SortOrderE @ 12465 NONAME
-	_ZN19QAbstractProxyModel9fetchMoreERK11QModelIndex @ 12466 NONAME
-	_ZN19QAbstractScrollArea18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12467 NONAME
-	_ZN19QAbstractScrollArea25staticMetaObjectExtraDataE @ 12468 NONAME DATA 8
-	_ZN19QApplicationPrivateC1ERiPPcN12QApplication4TypeEi @ 12469 NONAME
-	_ZN19QApplicationPrivateC2ERiPPcN12QApplication4TypeEi @ 12470 NONAME
-	_ZN19QBlitterPaintEngine10drawPixmapERK6QRectFRK7QPixmapS2_ @ 12471 NONAME
-	_ZN19QBlitterPaintEngine10penChangedEv @ 12472 NONAME
-	_ZN19QBlitterPaintEngine11drawEllipseERK6QRectF @ 12473 NONAME
-	_ZN19QBlitterPaintEngine12brushChangedEv @ 12474 NONAME
-	_ZN19QBlitterPaintEngine12drawTextItemERK7QPointFRK9QTextItem @ 12475 NONAME
-	_ZN19QBlitterPaintEngine14opacityChangedEv @ 12476 NONAME
-	_ZN19QBlitterPaintEngine16transformChangedEv @ 12477 NONAME
-	_ZN19QBlitterPaintEngine18brushOriginChangedEv @ 12478 NONAME
-	_ZN19QBlitterPaintEngine18clipEnabledChangedEv @ 12479 NONAME
-	_ZN19QBlitterPaintEngine18drawStaticTextItemEP15QStaticTextItem @ 12480 NONAME
-	_ZN19QBlitterPaintEngine18renderHintsChangedEv @ 12481 NONAME
-	_ZN19QBlitterPaintEngine22compositionModeChangedEv @ 12482 NONAME
-	_ZN19QBlitterPaintEngine3endEv @ 12483 NONAME
-	_ZN19QBlitterPaintEngine4clipERK11QVectorPathN2Qt13ClipOperationE @ 12484 NONAME
-	_ZN19QBlitterPaintEngine4clipERK5QRectN2Qt13ClipOperationE @ 12485 NONAME
-	_ZN19QBlitterPaintEngine4clipERK7QRegionN2Qt13ClipOperationE @ 12486 NONAME
-	_ZN19QBlitterPaintEngine4fillERK11QVectorPathRK6QBrush @ 12487 NONAME
-	_ZN19QBlitterPaintEngine5beginEP12QPaintDevice @ 12488 NONAME
-	_ZN19QBlitterPaintEngine6strokeERK11QVectorPathRK4QPen @ 12489 NONAME
-	_ZN19QBlitterPaintEngine8fillRectERK6QRectFRK6QBrush @ 12490 NONAME
-	_ZN19QBlitterPaintEngine8fillRectERK6QRectFRK6QColor @ 12491 NONAME
-	_ZN19QBlitterPaintEngine8setStateEP13QPainterState @ 12492 NONAME
-	_ZN19QBlitterPaintEngine9drawImageERK6QRectFRK6QImageS2_6QFlagsIN2Qt19ImageConversionFlagEE @ 12493 NONAME
-	_ZN19QBlitterPaintEngine9drawRectsEPK5QRecti @ 12494 NONAME
-	_ZN19QBlitterPaintEngine9drawRectsEPK6QRectFi @ 12495 NONAME
-	_ZN19QBlitterPaintEngineC1EP20QBlittablePixmapData @ 12496 NONAME
-	_ZN19QBlitterPaintEngineC2EP20QBlittablePixmapData @ 12497 NONAME
-	_ZN19QBlitterPaintEngineD0Ev @ 12498 NONAME
-	_ZN19QBlitterPaintEngineD1Ev @ 12499 NONAME
-	_ZN19QBlitterPaintEngineD2Ev @ 12500 NONAME
-	_ZN19QEventDispatcherS6018qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12501 NONAME
-	_ZN19QEventDispatcherS6025staticMetaObjectExtraDataE @ 12502 NONAME DATA 8
-	_ZN19QGraphicsBlurEffect18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12503 NONAME
-	_ZN19QGraphicsBlurEffect25staticMetaObjectExtraDataE @ 12504 NONAME DATA 8
-	_ZN19QGraphicsGridLayout10removeItemEP19QGraphicsLayoutItem @ 12505 NONAME
-	_ZN19QIconEnginePluginV218qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12506 NONAME
-	_ZN19QIconEnginePluginV225staticMetaObjectExtraDataE @ 12507 NONAME DATA 8
-	_ZN19QIdentityProxyModel10insertRowsEiiRK11QModelIndex @ 12508 NONAME
-	_ZN19QIdentityProxyModel10removeRowsEiiRK11QModelIndex @ 12509 NONAME
-	_ZN19QIdentityProxyModel11qt_metacallEN11QMetaObject4CallEiPPv @ 12510 NONAME
-	_ZN19QIdentityProxyModel11qt_metacastEPKc @ 12511 NONAME
-	_ZN19QIdentityProxyModel12dropMimeDataEPK9QMimeDataN2Qt10DropActionEiiRK11QModelIndex @ 12512 NONAME
-	_ZN19QIdentityProxyModel13insertColumnsEiiRK11QModelIndex @ 12513 NONAME
-	_ZN19QIdentityProxyModel13removeColumnsEiiRK11QModelIndex @ 12514 NONAME
-	_ZN19QIdentityProxyModel14setSourceModelEP18QAbstractItemModel @ 12515 NONAME
-	_ZN19QIdentityProxyModel16staticMetaObjectE @ 12516 NONAME DATA 16
-	_ZN19QIdentityProxyModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12517 NONAME
-	_ZN19QIdentityProxyModel19getStaticMetaObjectEv @ 12518 NONAME
-	_ZN19QIdentityProxyModel25staticMetaObjectExtraDataE @ 12519 NONAME DATA 8
-	_ZN19QIdentityProxyModelC1EP7QObject @ 12520 NONAME
-	_ZN19QIdentityProxyModelC1ER26QIdentityProxyModelPrivateP7QObject @ 12521 NONAME
-	_ZN19QIdentityProxyModelC2EP7QObject @ 12522 NONAME
-	_ZN19QIdentityProxyModelC2ER26QIdentityProxyModelPrivateP7QObject @ 12523 NONAME
-	_ZN19QIdentityProxyModelD0Ev @ 12524 NONAME
-	_ZN19QIdentityProxyModelD1Ev @ 12525 NONAME
-	_ZN19QIdentityProxyModelD2Ev @ 12526 NONAME
-	_ZN19QInputContextPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12527 NONAME
-	_ZN19QInputContextPlugin25staticMetaObjectExtraDataE @ 12528 NONAME DATA 8
-	_ZN19QItemSelectionModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12529 NONAME
-	_ZN19QItemSelectionModel25staticMetaObjectExtraDataE @ 12530 NONAME DATA 8
-	_ZN19QKeyEventTransition18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12531 NONAME
-	_ZN19QKeyEventTransition25staticMetaObjectExtraDataE @ 12532 NONAME DATA 8
-	_ZN19QStyledItemDelegate18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12533 NONAME
-	_ZN19QStyledItemDelegate25staticMetaObjectExtraDataE @ 12534 NONAME DATA 8
-	_ZN20QBlittablePixmapData12setBlittableEP10QBlittable @ 12535 NONAME
-	_ZN20QBlittablePixmapData4fillERK6QColor @ 12536 NONAME
-	_ZN20QBlittablePixmapData6bufferEv @ 12537 NONAME
-	_ZN20QBlittablePixmapData6resizeEii @ 12538 NONAME
-	_ZN20QBlittablePixmapData9fromImageERK6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 12539 NONAME
-	_ZN20QBlittablePixmapDataC2Ev @ 12540 NONAME
-	_ZN20QBlittablePixmapDataD0Ev @ 12541 NONAME
-	_ZN20QBlittablePixmapDataD1Ev @ 12542 NONAME
-	_ZN20QBlittablePixmapDataD2Ev @ 12543 NONAME
-	_ZN20QGraphicsProxyWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12544 NONAME
-	_ZN20QGraphicsProxyWidget25staticMetaObjectExtraDataE @ 12545 NONAME DATA 8
-	_ZN20QPaintBufferResource18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12546 NONAME
-	_ZN20QPaintBufferResource25staticMetaObjectExtraDataE @ 12547 NONAME DATA 8
-	_ZN20QPictureFormatPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12548 NONAME
-	_ZN20QPictureFormatPlugin25staticMetaObjectExtraDataE @ 12549 NONAME DATA 8
-	_ZN20QRasterWindowSurfaceC1EP7QWidgetb @ 12550 NONAME
-	_ZN20QRasterWindowSurfaceC2EP7QWidgetb @ 12551 NONAME
-	_ZN20QWidgetResizeHandler18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12552 NONAME
-	_ZN20QWidgetResizeHandler25staticMetaObjectExtraDataE @ 12553 NONAME DATA 8
-	_ZN21QAbstractItemDelegate18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12554 NONAME
-	_ZN21QAbstractItemDelegate25staticMetaObjectExtraDataE @ 12555 NONAME DATA 8
-	_ZN21QGraphicsEffectSource18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12556 NONAME
-	_ZN21QGraphicsEffectSource25staticMetaObjectExtraDataE @ 12557 NONAME DATA 8
-	_ZN21QGraphicsSystemPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12558 NONAME
-	_ZN21QGraphicsSystemPlugin25staticMetaObjectExtraDataE @ 12559 NONAME DATA 8
-	_ZN21QMouseEventTransition18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12560 NONAME
-	_ZN21QMouseEventTransition25staticMetaObjectExtraDataE @ 12561 NONAME DATA 8
-	_ZN21QPixmapColorizeFilter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12562 NONAME
-	_ZN21QPixmapColorizeFilter25staticMetaObjectExtraDataE @ 12563 NONAME DATA 8
-	_ZN21QSortFilterProxyModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12564 NONAME
-	_ZN21QSortFilterProxyModel25staticMetaObjectExtraDataE @ 12565 NONAME DATA 8
-	_ZN22QGraphicsItemAnimation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12566 NONAME
-	_ZN22QGraphicsItemAnimation25staticMetaObjectExtraDataE @ 12567 NONAME DATA 8
-	_ZN22QGraphicsOpacityEffect18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12568 NONAME
-	_ZN22QGraphicsOpacityEffect25staticMetaObjectExtraDataE @ 12569 NONAME DATA 8
-	_ZN23QGraphicsColorizeEffect18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12570 NONAME
-	_ZN23QGraphicsColorizeEffect25staticMetaObjectExtraDataE @ 12571 NONAME DATA 8
-	_ZN23QImageTextureGlyphCache11fillTextureERKN18QTextureGlyphCache5CoordEj6QFixed @ 12572 NONAME
-	_ZN23QPaintBufferSignalProxy18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12573 NONAME
-	_ZN23QPaintBufferSignalProxy25staticMetaObjectExtraDataE @ 12574 NONAME DATA 8
-	_ZN23QPixmapDropShadowFilter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12575 NONAME
-	_ZN23QPixmapDropShadowFilter25staticMetaObjectExtraDataE @ 12576 NONAME DATA 8
-	_ZN24QPixmapConvolutionFilter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12577 NONAME
-	_ZN24QPixmapConvolutionFilter25staticMetaObjectExtraDataE @ 12578 NONAME DATA 8
-	_ZN24QPlainTextDocumentLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12579 NONAME
-	_ZN24QPlainTextDocumentLayout25staticMetaObjectExtraDataE @ 12580 NONAME DATA 8
-	_ZN25QGraphicsDropShadowEffect18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12581 NONAME
-	_ZN25QGraphicsDropShadowEffect25staticMetaObjectExtraDataE @ 12582 NONAME DATA 8
-	_ZN27QAbstractTextDocumentLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12583 NONAME
-	_ZN27QAbstractTextDocumentLayout25staticMetaObjectExtraDataE @ 12584 NONAME DATA 8
-	_ZN5QDial18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12585 NONAME
-	_ZN5QDial25staticMetaObjectExtraDataE @ 12586 NONAME DATA 8
-	_ZN5QDrag18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12587 NONAME
-	_ZN5QDrag25staticMetaObjectExtraDataE @ 12588 NONAME DATA 8
-	_ZN5QFont20setHintingPreferenceENS_17HintingPreferenceE @ 12589 NONAME
-	_ZN5QMenu18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12590 NONAME
-	_ZN5QMenu25staticMetaObjectExtraDataE @ 12591 NONAME DATA 8
-	_ZN6QFrame18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12592 NONAME
-	_ZN6QFrame25staticMetaObjectExtraDataE @ 12593 NONAME DATA 8
-	_ZN6QImage4fillEN2Qt11GlobalColorE @ 12594 NONAME
-	_ZN6QImage4fillERK6QColor @ 12595 NONAME
-	_ZN6QLabel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12596 NONAME
-	_ZN6QLabel25staticMetaObjectExtraDataE @ 12597 NONAME DATA 8
-	_ZN6QMovie18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12598 NONAME
-	_ZN6QMovie25staticMetaObjectExtraDataE @ 12599 NONAME DATA 8
-	_ZN6QSound18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12600 NONAME
-	_ZN6QSound25staticMetaObjectExtraDataE @ 12601 NONAME DATA 8
-	_ZN6QStyle18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12602 NONAME
-	_ZN6QStyle25staticMetaObjectExtraDataE @ 12603 NONAME DATA 8
-	_ZN7QAction18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12604 NONAME
-	_ZN7QAction25staticMetaObjectExtraDataE @ 12605 NONAME DATA 8
-	_ZN7QDialog18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12606 NONAME
-	_ZN7QDialog25staticMetaObjectExtraDataE @ 12607 NONAME DATA 8
-	_ZN7QLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12608 NONAME
-	_ZN7QLayout25staticMetaObjectExtraDataE @ 12609 NONAME DATA 8
-	_ZN7QSlider18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12610 NONAME
-	_ZN7QSlider25staticMetaObjectExtraDataE @ 12611 NONAME DATA 8
-	_ZN7QTabBar18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12612 NONAME
-	_ZN7QTabBar25staticMetaObjectExtraDataE @ 12613 NONAME DATA 8
-	_ZN7QWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12614 NONAME
-	_ZN7QWidget25staticMetaObjectExtraDataE @ 12615 NONAME DATA 8
-	_ZN7QWizard18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12616 NONAME
-	_ZN7QWizard25staticMetaObjectExtraDataE @ 12617 NONAME DATA 8
-	_ZN8QGesture18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12618 NONAME
-	_ZN8QGesture25staticMetaObjectExtraDataE @ 12619 NONAME DATA 8
-	_ZN8QMdiArea14setTabsMovableEb @ 12620 NONAME
-	_ZN8QMdiArea15setTabsClosableEb @ 12621 NONAME
-	_ZN8QMdiArea18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12622 NONAME
-	_ZN8QMdiArea25staticMetaObjectExtraDataE @ 12623 NONAME DATA 8
-	_ZN8QMenuBar18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12624 NONAME
-	_ZN8QMenuBar25staticMetaObjectExtraDataE @ 12625 NONAME DATA 8
-	_ZN8QSpinBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12626 NONAME
-	_ZN8QSpinBox25staticMetaObjectExtraDataE @ 12627 NONAME DATA 8
-	_ZN8QToolBar18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12628 NONAME
-	_ZN8QToolBar25staticMetaObjectExtraDataE @ 12629 NONAME DATA 8
-	_ZN8QToolBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12630 NONAME
-	_ZN8QToolBox25staticMetaObjectExtraDataE @ 12631 NONAME DATA 8
-	_ZN9QCheckBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12632 NONAME
-	_ZN9QCheckBox25staticMetaObjectExtraDataE @ 12633 NONAME DATA 8
-	_ZN9QComboBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12634 NONAME
-	_ZN9QComboBox25staticMetaObjectExtraDataE @ 12635 NONAME DATA 8
-	_ZN9QDateEdit18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12636 NONAME
-	_ZN9QDateEdit25staticMetaObjectExtraDataE @ 12637 NONAME DATA 8
-	_ZN9QDirModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12638 NONAME
-	_ZN9QDirModel25staticMetaObjectExtraDataE @ 12639 NONAME DATA 8
-	_ZN9QGroupBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12640 NONAME
-	_ZN9QGroupBox25staticMetaObjectExtraDataE @ 12641 NONAME DATA 8
-	_ZN9QLineEdit18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12642 NONAME
-	_ZN9QLineEdit18setCursorMoveStyleEN11QTextCursor9MoveStyleE @ 12643 NONAME ABSENT
-	_ZN9QLineEdit25staticMetaObjectExtraDataE @ 12644 NONAME DATA 8
-	_ZN9QListView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12645 NONAME
-	_ZN9QListView25staticMetaObjectExtraDataE @ 12646 NONAME DATA 8
-	_ZN9QS60Style18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12647 NONAME
-	_ZN9QS60Style25staticMetaObjectExtraDataE @ 12648 NONAME DATA 8
-	_ZN9QShortcut18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12649 NONAME
-	_ZN9QShortcut25staticMetaObjectExtraDataE @ 12650 NONAME DATA 8
-	_ZN9QSizeGrip18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12651 NONAME
-	_ZN9QSizeGrip25staticMetaObjectExtraDataE @ 12652 NONAME DATA 8
-	_ZN9QSplitter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12653 NONAME
-	_ZN9QSplitter25staticMetaObjectExtraDataE @ 12654 NONAME DATA 8
-	_ZN9QTextEdit18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12655 NONAME
-	_ZN9QTextEdit25staticMetaObjectExtraDataE @ 12656 NONAME DATA 8
-	_ZN9QTextList18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12657 NONAME
-	_ZN9QTextList25staticMetaObjectExtraDataE @ 12658 NONAME DATA 8
-	_ZN9QTimeEdit18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12659 NONAME
-	_ZN9QTimeEdit25staticMetaObjectExtraDataE @ 12660 NONAME DATA 8
-	_ZN9QTreeView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12661 NONAME
-	_ZN9QTreeView25staticMetaObjectExtraDataE @ 12662 NONAME DATA 8
-	_ZN9QUndoView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12663 NONAME
-	_ZN9QUndoView25staticMetaObjectExtraDataE @ 12664 NONAME DATA 8
-	_ZNK10QBlittable12capabilitiesEv @ 12665 NONAME
-	_ZNK10QBlittable4sizeEv @ 12666 NONAME
-	_ZNK10QTabWidget14heightForWidthEi @ 12667 NONAME
-	_ZNK10QTextBlock7isValidEv @ 12668 NONAME ABSENT
-	_ZNK10QZipWriter10isWritableEv @ 12669 NONAME
-	_ZNK10QZipWriter17compressionPolicyEv @ 12670 NONAME
-	_ZNK10QZipWriter19creationPermissionsEv @ 12671 NONAME
-	_ZNK10QZipWriter6deviceEv @ 12672 NONAME
-	_ZNK10QZipWriter6existsEv @ 12673 NONAME
-	_ZNK10QZipWriter6statusEv @ 12674 NONAME
-	_ZNK11QTextEngine19nextLogicalPositionEi @ 12675 NONAME
-	_ZNK11QTextEngine23previousLogicalPositionEi @ 12676 NONAME
-	_ZNK11QTextLayout15cursorMoveStyleEv @ 12677 NONAME
-	_ZNK11QTextLayout18leftCursorPositionEi @ 12678 NONAME
-	_ZNK11QTextLayout19rightCursorPositionEi @ 12679 NONAME
-	_ZNK12QFontMetrics10inFontUcs4Ej @ 12680 NONAME
-	_ZNK12QRadioButton15minimumSizeHintEv @ 12681 NONAME
-	_ZNK12QUndoCommand10actionTextEv @ 12682 NONAME
-	_ZNK13QFontMetricsF10inFontUcs4Ej @ 12683 NONAME
-	_ZNK13QTextDocument22defaultCursorMoveStyleEv @ 12684 NONAME
-	_ZNK14QFileOpenEvent8openFileER5QFile6QFlagsIN9QIODevice12OpenModeFlagEE @ 12685 NONAME
-	_Z22qt_fontdata_from_indexi @ 12686 NONAME
-	_ZNK14QWidgetPrivate17hasHeightForWidthEv @ 12687 NONAME
-	_ZNK14QWindowSurface8featuresEv @ 12688 NONAME
-	_ZNK15QRadialGradient11focalRadiusEv @ 12689 NONAME
-	_ZNK15QRadialGradient12centerRadiusEv @ 12690 NONAME
-	_ZNK16QFileSystemModel5rmdirERK11QModelIndex @ 12691 NONAME
-	_ZNK17QInternalMimeData10metaObjectEv @ 12692 NONAME
-	_ZNK17QInternalMimeData12retrieveDataERK7QStringN8QVariant4TypeE @ 12693 NONAME
-	_ZNK17QInternalMimeData7formatsEv @ 12694 NONAME
-	_ZNK17QInternalMimeData9hasFormatERK7QString @ 12695 NONAME
-	_ZNK18QTextureGlyphCache18textureMapForGlyphEj6QFixed @ 12696 NONAME
-	_ZNK18QTextureGlyphCache20subPixelPositionForXE6QFixed @ 12697 NONAME
-	_ZNK18QTextureGlyphCache30calculateSubPixelPositionCountEj @ 12698 NONAME
-	_ZNK19QAbstractProxyModel11hasChildrenERK11QModelIndex @ 12699 NONAME
-	_ZNK19QAbstractProxyModel12canFetchMoreERK11QModelIndex @ 12700 NONAME
-	_ZNK19QAbstractProxyModel20supportedDropActionsEv @ 12701 NONAME
-	_ZNK19QAbstractProxyModel4spanERK11QModelIndex @ 12702 NONAME
-	_ZNK19QAbstractProxyModel5buddyERK11QModelIndex @ 12703 NONAME
-	_ZNK19QAbstractProxyModel8mimeDataERK5QListI11QModelIndexE @ 12704 NONAME
-	_ZNK19QAbstractProxyModel9mimeTypesEv @ 12705 NONAME
-	_ZNK19QBlitterPaintEngine11createStateEP13QPainterState @ 12706 NONAME
-	_ZNK19QIdentityProxyModel10metaObjectEv @ 12707 NONAME
-	_ZNK19QIdentityProxyModel11columnCountERK11QModelIndex @ 12708 NONAME
-	_ZNK19QIdentityProxyModel11mapToSourceERK11QModelIndex @ 12709 NONAME
-	_ZNK19QIdentityProxyModel13mapFromSourceERK11QModelIndex @ 12710 NONAME
-	_ZNK19QIdentityProxyModel20mapSelectionToSourceERK14QItemSelection @ 12711 NONAME
-	_ZNK19QIdentityProxyModel22mapSelectionFromSourceERK14QItemSelection @ 12712 NONAME
-	_ZNK19QIdentityProxyModel5indexEiiRK11QModelIndex @ 12713 NONAME
-	_ZNK19QIdentityProxyModel5matchERK11QModelIndexiRK8QVarianti6QFlagsIN2Qt9MatchFlagEE @ 12714 NONAME
-	_ZNK19QIdentityProxyModel6parentERK11QModelIndex @ 12715 NONAME
-	_ZNK19QIdentityProxyModel8rowCountERK11QModelIndex @ 12716 NONAME
-	_ZNK20QBlittablePixmapData11paintEngineEv @ 12717 NONAME
-	_ZNK20QBlittablePixmapData15hasAlphaChannelEv @ 12718 NONAME
-	_ZNK20QBlittablePixmapData6metricEN12QPaintDevice17PaintDeviceMetricE @ 12719 NONAME
-	_ZNK20QBlittablePixmapData7toImageEv @ 12720 NONAME
-	_ZNK20QBlittablePixmapData9blittableEv @ 12721 NONAME
-	_ZNK20QRasterWindowSurface8featuresEv @ 12722 NONAME
-	_ZNK5QFont17hintingPreferenceEv @ 12723 NONAME
-	_ZNK8QMdiArea11tabsMovableEv @ 12724 NONAME
-	_ZNK8QMdiArea12tabsClosableEv @ 12725 NONAME
-	_ZNK8QPainter16clipBoundingRectEv @ 12726 NONAME
-	_ZNK9QCheckBox15minimumSizeHintEv @ 12727 NONAME
-	_ZNK9QLineEdit15cursorMoveStyleEv @ 12728 NONAME
-	_ZTI10QBlittable @ 12729 NONAME
-	_ZTI17QInternalMimeData @ 12730 NONAME
-	_ZTI19QBlitterPaintEngine @ 12731 NONAME
-	_ZTI19QIdentityProxyModel @ 12732 NONAME
-	_ZTI20QBlittablePixmapData @ 12733 NONAME
-	_ZTV10QBlittable @ 12734 NONAME
-	_ZTV17QInternalMimeData @ 12735 NONAME
-	_ZTV19QBlitterPaintEngine @ 12736 NONAME
-	_ZTV19QIdentityProxyModel @ 12737 NONAME
-	_ZTV20QBlittablePixmapData @ 12738 NONAME
-	_Zls6QDebugPK13QSymbianEvent @ 12739 NONAME
-	_ZN11QTextLayout18setCursorMoveStyleEN2Qt15CursorMoveStyleE @ 12740 NONAME
-	_ZN13QTextDocument25setDefaultCursorMoveStyleEN2Qt15CursorMoveStyleE @ 12741 NONAME
-	_ZN10QBlittableC2ERK5QSize6QFlagsINS_10CapabilityEE @ 12742 NONAME
-	_ZN10QBlittableD0Ev @ 12743 NONAME
-	_ZN10QBlittableD1Ev @ 12744 NONAME
-	_ZN10QBlittableD2Ev @ 12745 NONAME
-	_ZN11QFontEngine16alphaMapForGlyphEj6QFixed @ 12746 NONAME
-	_ZN9QLineEdit18setCursorMoveStyleEN2Qt15CursorMoveStyleE @ 12747 NONAME
-	_ZN11QFontEngine16alphaMapForGlyphEj6QFixedRK10QTransform @ 12748 NONAME
-	_ZN11QFontEngine19alphaRGBMapForGlyphEj6QFixediRK10QTransform @ 12749 NONAME
-	_ZN12QInputDialog7getItemEP7QWidgetRK7QStringS4_RK11QStringListibPb6QFlagsIN2Qt10WindowTypeEES9_INSA_15InputMethodHintEE @ 12750 NONAME
-	_ZN11QTextEngine16getClusterLengthEPtPK17HB_CharAttributesiiiPi @ 12751 NONAME
-	_ZN11QTextEngine18positionInLigatureEPK11QScriptItemi6QFixedS3_ib @ 12752 NONAME
-	_ZN14QPaintEngineEx18drawStaticTextItemEP15QStaticTextItem @ 12753 NONAME
-	_ZNK14QPaintEngineEx23supportsTransformationsEfRK10QTransform @ 12754 NONAME
-	_ZN12QInputDialog7getTextEP7QWidgetRK7QStringS4_N9QLineEdit8EchoModeES4_Pb6QFlagsIN2Qt10WindowTypeEES8_INS9_15InputMethodHintEE @ 12755 NONAME
-	_Z27qt_isExtendedRadialGradientRK6QBrush @ 12756 NONAME
-	_ZN5QFont12setStyleNameERK7QString @ 12757 NONAME
-	_ZNK5QFont9styleNameEv @ 12758 NONAME
-	_ZNK9QFontInfo9styleNameEv @ 12759 NONAME
+	_Z22qt_fontdata_from_indexi @ 12201 NONAME
+	_Z27qt_isExtendedRadialGradientRK6QBrush @ 12202 NONAME
+	_Z28qt_painterPathFromVectorPathRK11QVectorPath @ 12203 NONAME
+	_Z32qGamma_correct_back_to_linear_csP6QImage @ 12204 NONAME
+	_ZN10QBlittable4lockEv @ 12205 NONAME
+	_ZN10QBlittable6unlockEv @ 12206 NONAME
+	_ZN10QBlittableC2ERK5QSize6QFlagsINS_10CapabilityEE @ 12207 NONAME
+	_ZN10QBlittableD0Ev @ 12208 NONAME
+	_ZN10QBlittableD1Ev @ 12209 NONAME
+	_ZN10QBlittableD2Ev @ 12210 NONAME
+	_ZN10QBoxLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12211 NONAME
+	_ZN10QBoxLayout25staticMetaObjectExtraDataE @ 12212 NONAME DATA 8
+	_ZN10QClipboard18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12213 NONAME
+	_ZN10QClipboard25staticMetaObjectExtraDataE @ 12214 NONAME DATA 8
+	_ZN10QCompleter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12215 NONAME
+	_ZN10QCompleter25staticMetaObjectExtraDataE @ 12216 NONAME DATA 8
+	_ZN10QLCDNumber18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12217 NONAME
+	_ZN10QLCDNumber25staticMetaObjectExtraDataE @ 12218 NONAME DATA 8
+	_ZN10QScrollBar18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12219 NONAME
+	_ZN10QScrollBar25staticMetaObjectExtraDataE @ 12220 NONAME DATA 8
+	_ZN10QStatusBar18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12221 NONAME
+	_ZN10QStatusBar25staticMetaObjectExtraDataE @ 12222 NONAME DATA 8
+	_ZN10QTabWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12223 NONAME
+	_ZN10QTabWidget25staticMetaObjectExtraDataE @ 12224 NONAME DATA 8
+	_ZN10QTableView13doItemsLayoutEv @ 12225 NONAME
+	_ZN10QTableView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12226 NONAME
+	_ZN10QTableView25staticMetaObjectExtraDataE @ 12227 NONAME DATA 8
+	_ZN10QTextFrame18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12228 NONAME
+	_ZN10QTextFrame25staticMetaObjectExtraDataE @ 12229 NONAME DATA 8
+	_ZN10QTextTable18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12230 NONAME
+	_ZN10QTextTable25staticMetaObjectExtraDataE @ 12231 NONAME DATA 8
+	_ZN10QUndoGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12232 NONAME
+	_ZN10QUndoGroup25staticMetaObjectExtraDataE @ 12233 NONAME DATA 8
+	_ZN10QUndoStack18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12234 NONAME
+	_ZN10QUndoStack25staticMetaObjectExtraDataE @ 12235 NONAME DATA 8
+	_ZN10QValidator18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12236 NONAME
+	_ZN10QValidator25staticMetaObjectExtraDataE @ 12237 NONAME DATA 8
+	_ZN10QWorkspace18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12238 NONAME
+	_ZN10QWorkspace25staticMetaObjectExtraDataE @ 12239 NONAME DATA 8
+	_ZN10QZipWriter10addSymLinkERK7QStringS2_ @ 12240 NONAME
+	_ZN10QZipWriter12addDirectoryERK7QString @ 12241 NONAME
+	_ZN10QZipWriter20setCompressionPolicyENS_17CompressionPolicyE @ 12242 NONAME
+	_ZN10QZipWriter22setCreationPermissionsE6QFlagsIN5QFile10PermissionEE @ 12243 NONAME
+	_ZN10QZipWriter5closeEv @ 12244 NONAME
+	_ZN10QZipWriter7addFileERK7QStringP9QIODevice @ 12245 NONAME
+	_ZN10QZipWriter7addFileERK7QStringRK10QByteArray @ 12246 NONAME
+	_ZN10QZipWriterC1EP9QIODevice @ 12247 NONAME
+	_ZN10QZipWriterC1ERK7QString6QFlagsIN9QIODevice12OpenModeFlagEE @ 12248 NONAME
+	_ZN10QZipWriterC2EP9QIODevice @ 12249 NONAME
+	_ZN10QZipWriterC2ERK7QString6QFlagsIN9QIODevice12OpenModeFlagEE @ 12250 NONAME
+	_ZN10QZipWriterD1Ev @ 12251 NONAME
+	_ZN10QZipWriterD2Ev @ 12252 NONAME
+	_ZN11QColumnView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12253 NONAME
+	_ZN11QColumnView25staticMetaObjectExtraDataE @ 12254 NONAME DATA 8
+	_ZN11QDockWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12255 NONAME
+	_ZN11QDockWidget25staticMetaObjectExtraDataE @ 12256 NONAME DATA 8
+	_ZN11QFileDialog18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12257 NONAME
+	_ZN11QFileDialog25staticMetaObjectExtraDataE @ 12258 NONAME DATA 8
+	_ZN11QFocusFrame18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12259 NONAME
+	_ZN11QFocusFrame25staticMetaObjectExtraDataE @ 12260 NONAME DATA 8
+	_ZN11QFontDialog18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12261 NONAME
+	_ZN11QFontDialog25staticMetaObjectExtraDataE @ 12262 NONAME DATA 8
+	_ZN11QFontEngine16alphaMapForGlyphEj6QFixed @ 12263 NONAME
+	_ZN11QFontEngine16alphaMapForGlyphEj6QFixedRK10QTransform @ 12264 NONAME
+	_ZN11QFontEngine19alphaRGBMapForGlyphEj6QFixediRK10QTransform @ 12265 NONAME
+	_ZN11QFormLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12266 NONAME
+	_ZN11QFormLayout25staticMetaObjectExtraDataE @ 12267 NONAME DATA 8
+	_ZN11QGridLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12268 NONAME
+	_ZN11QGridLayout25staticMetaObjectExtraDataE @ 12269 NONAME DATA 8
+	_ZN11QHBoxLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12270 NONAME
+	_ZN11QHBoxLayout25staticMetaObjectExtraDataE @ 12271 NONAME DATA 8
+	_ZN11QHeaderView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12272 NONAME
+	_ZN11QHeaderView25staticMetaObjectExtraDataE @ 12273 NONAME DATA 8
+	_ZN11QListWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12274 NONAME
+	_ZN11QListWidget25staticMetaObjectExtraDataE @ 12275 NONAME DATA 8
+	_ZN11QMainWindow18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12276 NONAME
+	_ZN11QMainWindow25staticMetaObjectExtraDataE @ 12277 NONAME DATA 8
+	_ZN11QMessageBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12278 NONAME
+	_ZN11QMessageBox25staticMetaObjectExtraDataE @ 12279 NONAME DATA 8
+	_ZN11QPanGesture18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12280 NONAME
+	_ZN11QPanGesture25staticMetaObjectExtraDataE @ 12281 NONAME DATA 8
+	_ZN11QProxyModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12282 NONAME
+	_ZN11QProxyModel25staticMetaObjectExtraDataE @ 12283 NONAME DATA 8
+	_ZN11QProxyStyle18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12284 NONAME
+	_ZN11QProxyStyle25staticMetaObjectExtraDataE @ 12285 NONAME DATA 8
+	_ZN11QPushButton18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12286 NONAME
+	_ZN11QPushButton25staticMetaObjectExtraDataE @ 12287 NONAME DATA 8
+	_ZN11QRubberBand18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12288 NONAME
+	_ZN11QRubberBand25staticMetaObjectExtraDataE @ 12289 NONAME DATA 8
+	_ZN11QScrollArea18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12290 NONAME
+	_ZN11QScrollArea25staticMetaObjectExtraDataE @ 12291 NONAME DATA 8
+	_ZN11QTapGesture18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12292 NONAME
+	_ZN11QTapGesture25staticMetaObjectExtraDataE @ 12293 NONAME DATA 8
+	_ZN11QTextEngine15beginningOfLineEi @ 12294 NONAME
+	_ZN11QTextEngine16getClusterLengthEPtPK17HB_CharAttributesiiiPi @ 12295 NONAME
+	_ZN11QTextEngine16offsetInLigatureEPK11QScriptItemiii @ 12296 NONAME
+	_ZN11QTextEngine18positionInLigatureEPK11QScriptItemi6QFixedS3_ib @ 12297 NONAME
+	_ZN11QTextEngine22insertionPointsForLineEiR7QVectorIiE @ 12298 NONAME
+	_ZN11QTextEngine25lineNumberForTextPositionEi @ 12299 NONAME
+	_ZN11QTextEngine27positionAfterVisualMovementEiN11QTextCursor13MoveOperationE @ 12300 NONAME
+	_ZN11QTextEngine9alignLineERK11QScriptLine @ 12301 NONAME
+	_ZN11QTextEngine9endOfLineEi @ 12302 NONAME
+	_ZN11QTextLayout18setCursorMoveStyleEN2Qt15CursorMoveStyleE @ 12303 NONAME
+	_ZN11QTextObject18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12304 NONAME
+	_ZN11QTextObject25staticMetaObjectExtraDataE @ 12305 NONAME DATA 8
+	_ZN11QToolButton18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12306 NONAME
+	_ZN11QToolButton25staticMetaObjectExtraDataE @ 12307 NONAME DATA 8
+	_ZN11QTreeWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12308 NONAME
+	_ZN11QTreeWidget25staticMetaObjectExtraDataE @ 12309 NONAME DATA 8
+	_ZN11QVBoxLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12310 NONAME
+	_ZN11QVBoxLayout25staticMetaObjectExtraDataE @ 12311 NONAME DATA 8
+	_ZN11QWizardPage18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12312 NONAME
+	_ZN11QWizardPage25staticMetaObjectExtraDataE @ 12313 NONAME DATA 8
+	_ZN12QActionGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12314 NONAME
+	_ZN12QActionGroup25staticMetaObjectExtraDataE @ 12315 NONAME DATA 8
+	_ZN12QApplication18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12316 NONAME
+	_ZN12QApplication25staticMetaObjectExtraDataE @ 12317 NONAME DATA 8
+	_ZN12QButtonGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12318 NONAME
+	_ZN12QButtonGroup25staticMetaObjectExtraDataE @ 12319 NONAME DATA 8
+	_ZN12QColorDialog18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12320 NONAME
+	_ZN12QColorDialog25staticMetaObjectExtraDataE @ 12321 NONAME DATA 8
+	_ZN12QCommonStyle18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12322 NONAME
+	_ZN12QCommonStyle25staticMetaObjectExtraDataE @ 12323 NONAME DATA 8
+	_ZN12QInputDialog18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12324 NONAME
+	_ZN12QInputDialog25staticMetaObjectExtraDataE @ 12325 NONAME DATA 8
+	_ZN12QInputDialog7getItemEP7QWidgetRK7QStringS4_RK11QStringListibPb6QFlagsIN2Qt10WindowTypeEES9_INSA_15InputMethodHintEE @ 12326 NONAME
+	_ZN12QInputDialog7getTextEP7QWidgetRK7QStringS4_N9QLineEdit8EchoModeES4_Pb6QFlagsIN2Qt10WindowTypeEES8_INS9_15InputMethodHintEE @ 12327 NONAME
+	_ZN12QLineControl18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12328 NONAME
+	_ZN12QLineControl25staticMetaObjectExtraDataE @ 12329 NONAME DATA 8
+	_ZN12QProgressBar18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12330 NONAME
+	_ZN12QProgressBar25staticMetaObjectExtraDataE @ 12331 NONAME DATA 8
+	_ZN12QRadioButton18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12332 NONAME
+	_ZN12QRadioButton25staticMetaObjectExtraDataE @ 12333 NONAME DATA 8
+	_ZN12QStylePlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12334 NONAME
+	_ZN12QStylePlugin25staticMetaObjectExtraDataE @ 12335 NONAME DATA 8
+	_ZN12QTableWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12336 NONAME
+	_ZN12QTableWidget25staticMetaObjectExtraDataE @ 12337 NONAME DATA 8
+	_ZN12QTextBrowser18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12338 NONAME
+	_ZN12QTextBrowser25staticMetaObjectExtraDataE @ 12339 NONAME DATA 8
+	_ZN12QTextControl18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12340 NONAME
+	_ZN12QTextControl25staticMetaObjectExtraDataE @ 12341 NONAME DATA 8
+	_ZN13QDateTimeEdit18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12342 NONAME
+	_ZN13QDateTimeEdit25staticMetaObjectExtraDataE @ 12343 NONAME DATA 8
+	_ZN13QErrorMessage18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12344 NONAME
+	_ZN13QErrorMessage25staticMetaObjectExtraDataE @ 12345 NONAME DATA 8
+	_ZN13QFontComboBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12346 NONAME
+	_ZN13QFontComboBox25staticMetaObjectExtraDataE @ 12347 NONAME DATA 8
+	_ZN13QFontDatabase22resolveFontFamilyAliasERK7QString @ 12348 NONAME
+	_ZN13QGraphicsView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12349 NONAME
+	_ZN13QGraphicsView25staticMetaObjectExtraDataE @ 12350 NONAME DATA 8
+	_ZN13QInputContext18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12351 NONAME
+	_ZN13QInputContext25staticMetaObjectExtraDataE @ 12352 NONAME DATA 8
+	_ZN13QIntValidator18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12353 NONAME
+	_ZN13QIntValidator25staticMetaObjectExtraDataE @ 12354 NONAME DATA 8
+	_ZN13QItemDelegate18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12355 NONAME
+	_ZN13QItemDelegate25staticMetaObjectExtraDataE @ 12356 NONAME DATA 8
+	_ZN13QMdiSubWindow18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12357 NONAME
+	_ZN13QMdiSubWindow25staticMetaObjectExtraDataE @ 12358 NONAME DATA 8
+	_ZN13QPinchGesture18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12359 NONAME
+	_ZN13QPinchGesture25staticMetaObjectExtraDataE @ 12360 NONAME DATA 8
+	_ZN13QPixmapFilter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12361 NONAME
+	_ZN13QPixmapFilter25staticMetaObjectExtraDataE @ 12362 NONAME DATA 8
+	_ZN13QS60MainAppUi25ProcessCommandParametersLE11TApaCommandR4TBufILi256EERK6TDesC8 @ 12363 NONAME
+	_ZN13QSplashScreen18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12364 NONAME
+	_ZN13QSplashScreen25staticMetaObjectExtraDataE @ 12365 NONAME DATA 8
+	_ZN13QSwipeGesture18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12366 NONAME
+	_ZN13QSwipeGesture25staticMetaObjectExtraDataE @ 12367 NONAME DATA 8
+	_ZN13QTextDocument18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12368 NONAME
+	_ZN13QTextDocument25setDefaultCursorMoveStyleEN2Qt15CursorMoveStyleE @ 12369 NONAME
+	_ZN13QTextDocument25staticMetaObjectExtraDataE @ 12370 NONAME DATA 8
+	_ZN13QWidgetAction18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12371 NONAME
+	_ZN13QWidgetAction25staticMetaObjectExtraDataE @ 12372 NONAME DATA 8
+	_ZN13QWindowsStyle18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12373 NONAME
+	_ZN13QWindowsStyle25staticMetaObjectExtraDataE @ 12374 NONAME DATA 8
+	_ZN14QDesktopWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12375 NONAME
+	_ZN14QDesktopWidget25staticMetaObjectExtraDataE @ 12376 NONAME DATA 8
+	_ZN14QDoubleSpinBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12377 NONAME
+	_ZN14QDoubleSpinBox25staticMetaObjectExtraDataE @ 12378 NONAME DATA 8
+	_ZN14QFileOpenEventC1ERK5RFile @ 12379 NONAME
+	_ZN14QFileOpenEventC2ERK5RFile @ 12380 NONAME
+	_ZN14QGraphicsScale18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12381 NONAME
+	_ZN14QGraphicsScale25staticMetaObjectExtraDataE @ 12382 NONAME DATA 8
+	_ZN14QGraphicsScene18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12383 NONAME
+	_ZN14QGraphicsScene25staticMetaObjectExtraDataE @ 12384 NONAME DATA 8
+	_ZN14QImageIOPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12385 NONAME
+	_ZN14QImageIOPlugin25staticMetaObjectExtraDataE @ 12386 NONAME DATA 8
+	_ZN14QPaintEngineEx18drawStaticTextItemEP15QStaticTextItem @ 12387 NONAME
+	_ZN14QPaintEngineEx19drawPixmapFragmentsEPK6QRectFS2_iRK7QPixmap6QFlagsIN8QPainter18PixmapFragmentHintEE @ 12388 NONAME
+	_ZN14QPlainTextEdit18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12389 NONAME
+	_ZN14QPlainTextEdit25staticMetaObjectExtraDataE @ 12390 NONAME DATA 8
+	_ZN14QStackedLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12391 NONAME
+	_ZN14QStackedLayout25staticMetaObjectExtraDataE @ 12392 NONAME DATA 8
+	_ZN14QStackedWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12393 NONAME
+	_ZN14QStackedWidget25staticMetaObjectExtraDataE @ 12394 NONAME DATA 8
+	_ZN14QWindowSurfaceC2EP7QWidgetb @ 12395 NONAME
+	_ZN15QAbstractButton18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12396 NONAME
+	_ZN15QAbstractButton25staticMetaObjectExtraDataE @ 12397 NONAME DATA 8
+	_ZN15QAbstractSlider18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12398 NONAME
+	_ZN15QAbstractSlider25staticMetaObjectExtraDataE @ 12399 NONAME DATA 8
+	_ZN15QCalendarWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12400 NONAME
+	_ZN15QCalendarWidget25staticMetaObjectExtraDataE @ 12401 NONAME DATA 8
+	_ZN15QGraphicsAnchor18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12402 NONAME
+	_ZN15QGraphicsAnchor25staticMetaObjectExtraDataE @ 12403 NONAME DATA 8
+	_ZN15QGraphicsEffect18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12404 NONAME
+	_ZN15QGraphicsEffect25staticMetaObjectExtraDataE @ 12405 NONAME DATA 8
+	_ZN15QGraphicsObject18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12406 NONAME
+	_ZN15QGraphicsObject25staticMetaObjectExtraDataE @ 12407 NONAME DATA 8
+	_ZN15QGraphicsWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12408 NONAME
+	_ZN15QGraphicsWidget25staticMetaObjectExtraDataE @ 12409 NONAME DATA 8
+	_ZN15QProgressDialog18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12410 NONAME
+	_ZN15QProgressDialog25staticMetaObjectExtraDataE @ 12411 NONAME DATA 8
+	_ZN15QRadialGradient14setFocalRadiusEf @ 12412 NONAME
+	_ZN15QRadialGradient15setCenterRadiusEf @ 12413 NONAME
+	_ZN15QRadialGradientC1ERK7QPointFfS2_f @ 12414 NONAME
+	_ZN15QRadialGradientC1Effffff @ 12415 NONAME
+	_ZN15QRadialGradientC2ERK7QPointFfS2_f @ 12416 NONAME
+	_ZN15QRadialGradientC2Effffff @ 12417 NONAME
+	_ZN15QSessionManager18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12418 NONAME
+	_ZN15QSessionManager25staticMetaObjectExtraDataE @ 12419 NONAME DATA 8
+	_ZN15QSplitterHandle18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12420 NONAME
+	_ZN15QSplitterHandle25staticMetaObjectExtraDataE @ 12421 NONAME DATA 8
+	_ZN15QTextBlockGroup18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12422 NONAME
+	_ZN15QTextBlockGroup25staticMetaObjectExtraDataE @ 12423 NONAME DATA 8
+	_ZN16QAbstractSpinBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12424 NONAME
+	_ZN16QAbstractSpinBox25staticMetaObjectExtraDataE @ 12425 NONAME DATA 8
+	_ZN16QDialogButtonBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12426 NONAME
+	_ZN16QDialogButtonBox25staticMetaObjectExtraDataE @ 12427 NONAME DATA 8
+	_ZN16QDoubleValidator18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12428 NONAME
+	_ZN16QDoubleValidator25staticMetaObjectExtraDataE @ 12429 NONAME DATA 8
+	_ZN16QFileSystemModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12430 NONAME
+	_ZN16QFileSystemModel25staticMetaObjectExtraDataE @ 12431 NONAME DATA 8
+	_ZN16QRegExpValidator18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12432 NONAME
+	_ZN16QRegExpValidator25staticMetaObjectExtraDataE @ 12433 NONAME DATA 8
+	_ZN16QStringListModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12434 NONAME
+	_ZN16QStringListModel25staticMetaObjectExtraDataE @ 12435 NONAME DATA 8
+	_ZN16QTreeViewPrivate10initializeEv @ 12436 NONAME
+	_ZN16QTreeViewPrivate15insertViewItemsEiiRK13QTreeViewItem @ 12437 NONAME
+	_ZN16QTreeViewPrivate15removeViewItemsEii @ 12438 NONAME
+	_ZN16QTreeViewPrivate16updateScrollBarsEv @ 12439 NONAME
+	_ZN16QTreeViewPrivate17_q_columnsRemovedERK11QModelIndexii @ 12440 NONAME
+	_ZN16QTreeViewPrivate17_q_modelDestroyedEv @ 12441 NONAME
+	_ZN16QTreeViewPrivate22_q_modelAboutToBeResetEv @ 12442 NONAME
+	_ZN16QTreeViewPrivate22beginAnimatedOperationEv @ 12443 NONAME
+	_ZN16QTreeViewPrivate23_q_endAnimatedOperationEv @ 12444 NONAME
+	_ZN16QTreeViewPrivate23_q_sortIndicatorChangedEiN2Qt9SortOrderE @ 12445 NONAME
+	_ZN16QTreeViewPrivate24prepareAnimatedOperationEiN18QAbstractAnimation9DirectionE @ 12446 NONAME
+	_ZN16QTreeViewPrivate25expandOrCollapseItemAtPosERK6QPoint @ 12447 NONAME
+	_ZN16QTreeViewPrivate26_q_columnsAboutToBeRemovedERK11QModelIndexii @ 12448 NONAME
+	_ZN16QTreeViewPrivate6expandEib @ 12449 NONAME
+	_ZN16QTreeViewPrivate6layoutEibb @ 12450 NONAME
+	_ZN16QTreeViewPrivate6selectERK11QModelIndexS2_6QFlagsIN19QItemSelectionModel13SelectionFlagEE @ 12451 NONAME
+	_ZN16QTreeViewPrivate8collapseEib @ 12452 NONAME
+	_ZN17QAbstractItemView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12453 NONAME
+	_ZN17QAbstractItemView25staticMetaObjectExtraDataE @ 12454 NONAME DATA 8
+	_ZN17QDataWidgetMapper18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12455 NONAME
+	_ZN17QDataWidgetMapper25staticMetaObjectExtraDataE @ 12456 NONAME DATA 8
+	_ZN17QDockWidgetLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12457 NONAME
+	_ZN17QDockWidgetLayout25staticMetaObjectExtraDataE @ 12458 NONAME DATA 8
+	_ZN17QGraphicsRotation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12459 NONAME
+	_ZN17QGraphicsRotation25staticMetaObjectExtraDataE @ 12460 NONAME DATA 8
+	_ZN17QGraphicsTextItem18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12461 NONAME
+	_ZN17QGraphicsTextItem25staticMetaObjectExtraDataE @ 12462 NONAME DATA 8
+	_ZN17QIconEnginePlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12463 NONAME
+	_ZN17QIconEnginePlugin25staticMetaObjectExtraDataE @ 12464 NONAME DATA 8
+	_ZN17QInternalMimeData11canReadDataERK7QString @ 12465 NONAME
+	_ZN17QInternalMimeData11qt_metacallEN11QMetaObject4CallEiPPv @ 12466 NONAME
+	_ZN17QInternalMimeData11qt_metacastEPKc @ 12467 NONAME
+	_ZN17QInternalMimeData13formatsHelperEPK9QMimeData @ 12468 NONAME
+	_ZN17QInternalMimeData15hasFormatHelperERK7QStringPK9QMimeData @ 12469 NONAME
+	_ZN17QInternalMimeData16renderDataHelperERK7QStringPK9QMimeData @ 12470 NONAME
+	_ZN17QInternalMimeData16staticMetaObjectE @ 12471 NONAME DATA 16
+	_ZN17QInternalMimeData18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12472 NONAME
+	_ZN17QInternalMimeData19getStaticMetaObjectEv @ 12473 NONAME
+	_ZN17QInternalMimeData25staticMetaObjectExtraDataE @ 12474 NONAME DATA 8
+	_ZN17QInternalMimeDataC2Ev @ 12475 NONAME
+	_ZN17QInternalMimeDataD0Ev @ 12476 NONAME
+	_ZN17QInternalMimeDataD1Ev @ 12477 NONAME
+	_ZN17QInternalMimeDataD2Ev @ 12478 NONAME
+	_ZN17QPixmapBlurFilter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12479 NONAME
+	_ZN17QPixmapBlurFilter25staticMetaObjectExtraDataE @ 12480 NONAME DATA 8
+	_ZN18QCommandLinkButton18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12481 NONAME
+	_ZN18QCommandLinkButton25staticMetaObjectExtraDataE @ 12482 NONAME DATA 8
+	_ZN18QGraphicsTransform18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12483 NONAME
+	_ZN18QGraphicsTransform25staticMetaObjectExtraDataE @ 12484 NONAME DATA 8
+	_ZN18QGuiPlatformPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12485 NONAME
+	_ZN18QGuiPlatformPlugin25staticMetaObjectExtraDataE @ 12486 NONAME DATA 8
+	_ZN18QStandardItemModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12487 NONAME
+	_ZN18QStandardItemModel25staticMetaObjectExtraDataE @ 12488 NONAME DATA 8
+	_ZN18QSyntaxHighlighter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12489 NONAME
+	_ZN18QSyntaxHighlighter25staticMetaObjectExtraDataE @ 12490 NONAME DATA 8
+	_ZN18QTapAndHoldGesture18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12491 NONAME
+	_ZN18QTapAndHoldGesture25staticMetaObjectExtraDataE @ 12492 NONAME DATA 8
+	_ZN18QTextureGlyphCache19fillInPendingGlyphsEv @ 12493 NONAME
+	_ZN19QAbstractProxyModel11setItemDataERK11QModelIndexRK4QMapIi8QVariantE @ 12494 NONAME
+	_ZN19QAbstractProxyModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12495 NONAME
+	_ZN19QAbstractProxyModel25staticMetaObjectExtraDataE @ 12496 NONAME DATA 8
+	_ZN19QAbstractProxyModel4sortEiN2Qt9SortOrderE @ 12497 NONAME
+	_ZN19QAbstractProxyModel9fetchMoreERK11QModelIndex @ 12498 NONAME
+	_ZN19QAbstractScrollArea18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12499 NONAME
+	_ZN19QAbstractScrollArea25staticMetaObjectExtraDataE @ 12500 NONAME DATA 8
+	_ZN19QApplicationPrivateC1ERiPPcN12QApplication4TypeEi @ 12501 NONAME
+	_ZN19QApplicationPrivateC2ERiPPcN12QApplication4TypeEi @ 12502 NONAME
+	_ZN19QBlitterPaintEngine10drawPixmapERK6QRectFRK7QPixmapS2_ @ 12503 NONAME
+	_ZN19QBlitterPaintEngine10penChangedEv @ 12504 NONAME
+	_ZN19QBlitterPaintEngine11drawEllipseERK6QRectF @ 12505 NONAME
+	_ZN19QBlitterPaintEngine12brushChangedEv @ 12506 NONAME
+	_ZN19QBlitterPaintEngine12drawTextItemERK7QPointFRK9QTextItem @ 12507 NONAME
+	_ZN19QBlitterPaintEngine14opacityChangedEv @ 12508 NONAME
+	_ZN19QBlitterPaintEngine16transformChangedEv @ 12509 NONAME
+	_ZN19QBlitterPaintEngine18brushOriginChangedEv @ 12510 NONAME
+	_ZN19QBlitterPaintEngine18clipEnabledChangedEv @ 12511 NONAME
+	_ZN19QBlitterPaintEngine18drawStaticTextItemEP15QStaticTextItem @ 12512 NONAME
+	_ZN19QBlitterPaintEngine18renderHintsChangedEv @ 12513 NONAME
+	_ZN19QBlitterPaintEngine22compositionModeChangedEv @ 12514 NONAME
+	_ZN19QBlitterPaintEngine3endEv @ 12515 NONAME
+	_ZN19QBlitterPaintEngine4clipERK11QVectorPathN2Qt13ClipOperationE @ 12516 NONAME
+	_ZN19QBlitterPaintEngine4clipERK5QRectN2Qt13ClipOperationE @ 12517 NONAME
+	_ZN19QBlitterPaintEngine4clipERK7QRegionN2Qt13ClipOperationE @ 12518 NONAME
+	_ZN19QBlitterPaintEngine4fillERK11QVectorPathRK6QBrush @ 12519 NONAME
+	_ZN19QBlitterPaintEngine5beginEP12QPaintDevice @ 12520 NONAME
+	_ZN19QBlitterPaintEngine6strokeERK11QVectorPathRK4QPen @ 12521 NONAME
+	_ZN19QBlitterPaintEngine8fillRectERK6QRectFRK6QBrush @ 12522 NONAME
+	_ZN19QBlitterPaintEngine8fillRectERK6QRectFRK6QColor @ 12523 NONAME
+	_ZN19QBlitterPaintEngine8setStateEP13QPainterState @ 12524 NONAME
+	_ZN19QBlitterPaintEngine9drawImageERK6QRectFRK6QImageS2_6QFlagsIN2Qt19ImageConversionFlagEE @ 12525 NONAME
+	_ZN19QBlitterPaintEngine9drawRectsEPK5QRecti @ 12526 NONAME
+	_ZN19QBlitterPaintEngine9drawRectsEPK6QRectFi @ 12527 NONAME
+	_ZN19QBlitterPaintEngineC1EP20QBlittablePixmapData @ 12528 NONAME
+	_ZN19QBlitterPaintEngineC2EP20QBlittablePixmapData @ 12529 NONAME
+	_ZN19QBlitterPaintEngineD0Ev @ 12530 NONAME
+	_ZN19QBlitterPaintEngineD1Ev @ 12531 NONAME
+	_ZN19QBlitterPaintEngineD2Ev @ 12532 NONAME
+	_ZN19QEventDispatcherS6018qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12533 NONAME
+	_ZN19QEventDispatcherS6025staticMetaObjectExtraDataE @ 12534 NONAME DATA 8
+	_ZN19QGraphicsBlurEffect18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12535 NONAME
+	_ZN19QGraphicsBlurEffect25staticMetaObjectExtraDataE @ 12536 NONAME DATA 8
+	_ZN19QGraphicsGridLayout10removeItemEP19QGraphicsLayoutItem @ 12537 NONAME
+	_ZN19QIconEnginePluginV218qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12538 NONAME
+	_ZN19QIconEnginePluginV225staticMetaObjectExtraDataE @ 12539 NONAME DATA 8
+	_ZN19QIdentityProxyModel10insertRowsEiiRK11QModelIndex @ 12540 NONAME
+	_ZN19QIdentityProxyModel10removeRowsEiiRK11QModelIndex @ 12541 NONAME
+	_ZN19QIdentityProxyModel11qt_metacallEN11QMetaObject4CallEiPPv @ 12542 NONAME
+	_ZN19QIdentityProxyModel11qt_metacastEPKc @ 12543 NONAME
+	_ZN19QIdentityProxyModel12dropMimeDataEPK9QMimeDataN2Qt10DropActionEiiRK11QModelIndex @ 12544 NONAME
+	_ZN19QIdentityProxyModel13insertColumnsEiiRK11QModelIndex @ 12545 NONAME
+	_ZN19QIdentityProxyModel13removeColumnsEiiRK11QModelIndex @ 12546 NONAME
+	_ZN19QIdentityProxyModel14setSourceModelEP18QAbstractItemModel @ 12547 NONAME
+	_ZN19QIdentityProxyModel16staticMetaObjectE @ 12548 NONAME DATA 16
+	_ZN19QIdentityProxyModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12549 NONAME
+	_ZN19QIdentityProxyModel19getStaticMetaObjectEv @ 12550 NONAME
+	_ZN19QIdentityProxyModel25staticMetaObjectExtraDataE @ 12551 NONAME DATA 8
+	_ZN19QIdentityProxyModelC1EP7QObject @ 12552 NONAME
+	_ZN19QIdentityProxyModelC1ER26QIdentityProxyModelPrivateP7QObject @ 12553 NONAME
+	_ZN19QIdentityProxyModelC2EP7QObject @ 12554 NONAME
+	_ZN19QIdentityProxyModelC2ER26QIdentityProxyModelPrivateP7QObject @ 12555 NONAME
+	_ZN19QIdentityProxyModelD0Ev @ 12556 NONAME
+	_ZN19QIdentityProxyModelD1Ev @ 12557 NONAME
+	_ZN19QIdentityProxyModelD2Ev @ 12558 NONAME
+	_ZN19QInputContextPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12559 NONAME
+	_ZN19QInputContextPlugin25staticMetaObjectExtraDataE @ 12560 NONAME DATA 8
+	_ZN19QItemSelectionModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12561 NONAME
+	_ZN19QItemSelectionModel25staticMetaObjectExtraDataE @ 12562 NONAME DATA 8
+	_ZN19QKeyEventTransition18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12563 NONAME
+	_ZN19QKeyEventTransition25staticMetaObjectExtraDataE @ 12564 NONAME DATA 8
+	_ZN19QStyledItemDelegate18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12565 NONAME
+	_ZN19QStyledItemDelegate25staticMetaObjectExtraDataE @ 12566 NONAME DATA 8
+	_ZN20QBlittablePixmapData12setBlittableEP10QBlittable @ 12567 NONAME
+	_ZN20QBlittablePixmapData4fillERK6QColor @ 12568 NONAME
+	_ZN20QBlittablePixmapData6bufferEv @ 12569 NONAME
+	_ZN20QBlittablePixmapData6resizeEii @ 12570 NONAME
+	_ZN20QBlittablePixmapData9fromImageERK6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 12571 NONAME
+	_ZN20QBlittablePixmapDataC2Ev @ 12572 NONAME
+	_ZN20QBlittablePixmapDataD0Ev @ 12573 NONAME
+	_ZN20QBlittablePixmapDataD1Ev @ 12574 NONAME
+	_ZN20QBlittablePixmapDataD2Ev @ 12575 NONAME
+	_ZN20QGraphicsProxyWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12576 NONAME
+	_ZN20QGraphicsProxyWidget25staticMetaObjectExtraDataE @ 12577 NONAME DATA 8
+	_ZN20QPaintBufferResource18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12578 NONAME
+	_ZN20QPaintBufferResource25staticMetaObjectExtraDataE @ 12579 NONAME DATA 8
+	_ZN20QPictureFormatPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12580 NONAME
+	_ZN20QPictureFormatPlugin25staticMetaObjectExtraDataE @ 12581 NONAME DATA 8
+	_ZN20QRasterWindowSurfaceC1EP7QWidgetb @ 12582 NONAME
+	_ZN20QRasterWindowSurfaceC2EP7QWidgetb @ 12583 NONAME
+	_ZN20QWidgetResizeHandler18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12584 NONAME
+	_ZN20QWidgetResizeHandler25staticMetaObjectExtraDataE @ 12585 NONAME DATA 8
+	_ZN21QAbstractItemDelegate18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12586 NONAME
+	_ZN21QAbstractItemDelegate25staticMetaObjectExtraDataE @ 12587 NONAME DATA 8
+	_ZN21QGraphicsEffectSource18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12588 NONAME
+	_ZN21QGraphicsEffectSource25staticMetaObjectExtraDataE @ 12589 NONAME DATA 8
+	_ZN21QGraphicsSystemPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12590 NONAME
+	_ZN21QGraphicsSystemPlugin25staticMetaObjectExtraDataE @ 12591 NONAME DATA 8
+	_ZN21QMouseEventTransition18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12592 NONAME
+	_ZN21QMouseEventTransition25staticMetaObjectExtraDataE @ 12593 NONAME DATA 8
+	_ZN21QPixmapColorizeFilter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12594 NONAME
+	_ZN21QPixmapColorizeFilter25staticMetaObjectExtraDataE @ 12595 NONAME DATA 8
+	_ZN21QSortFilterProxyModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12596 NONAME
+	_ZN21QSortFilterProxyModel25staticMetaObjectExtraDataE @ 12597 NONAME DATA 8
+	_ZN22QGraphicsItemAnimation18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12598 NONAME
+	_ZN22QGraphicsItemAnimation25staticMetaObjectExtraDataE @ 12599 NONAME DATA 8
+	_ZN22QGraphicsOpacityEffect18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12600 NONAME
+	_ZN22QGraphicsOpacityEffect25staticMetaObjectExtraDataE @ 12601 NONAME DATA 8
+	_ZN23QGraphicsColorizeEffect18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12602 NONAME
+	_ZN23QGraphicsColorizeEffect25staticMetaObjectExtraDataE @ 12603 NONAME DATA 8
+	_ZN23QImageTextureGlyphCache11fillTextureERKN18QTextureGlyphCache5CoordEj6QFixed @ 12604 NONAME
+	_ZN23QPaintBufferSignalProxy18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12605 NONAME
+	_ZN23QPaintBufferSignalProxy25staticMetaObjectExtraDataE @ 12606 NONAME DATA 8
+	_ZN23QPixmapDropShadowFilter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12607 NONAME
+	_ZN23QPixmapDropShadowFilter25staticMetaObjectExtraDataE @ 12608 NONAME DATA 8
+	_ZN24QPixmapConvolutionFilter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12609 NONAME
+	_ZN24QPixmapConvolutionFilter25staticMetaObjectExtraDataE @ 12610 NONAME DATA 8
+	_ZN24QPlainTextDocumentLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12611 NONAME
+	_ZN24QPlainTextDocumentLayout25staticMetaObjectExtraDataE @ 12612 NONAME DATA 8
+	_ZN25QGraphicsDropShadowEffect18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12613 NONAME
+	_ZN25QGraphicsDropShadowEffect25staticMetaObjectExtraDataE @ 12614 NONAME DATA 8
+	_ZN27QAbstractTextDocumentLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12615 NONAME
+	_ZN27QAbstractTextDocumentLayout25staticMetaObjectExtraDataE @ 12616 NONAME DATA 8
+	_ZN5QDial18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12617 NONAME
+	_ZN5QDial25staticMetaObjectExtraDataE @ 12618 NONAME DATA 8
+	_ZN5QDrag18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12619 NONAME
+	_ZN5QDrag25staticMetaObjectExtraDataE @ 12620 NONAME DATA 8
+	_ZN5QFont12setStyleNameERK7QString @ 12621 NONAME
+	_ZN5QFont20setHintingPreferenceENS_17HintingPreferenceE @ 12622 NONAME
+	_ZN5QMenu18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12623 NONAME
+	_ZN5QMenu25staticMetaObjectExtraDataE @ 12624 NONAME DATA 8
+	_ZN6QFrame18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12625 NONAME
+	_ZN6QFrame25staticMetaObjectExtraDataE @ 12626 NONAME DATA 8
+	_ZN6QImage4fillEN2Qt11GlobalColorE @ 12627 NONAME
+	_ZN6QImage4fillERK6QColor @ 12628 NONAME
+	_ZN6QLabel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12629 NONAME
+	_ZN6QLabel25staticMetaObjectExtraDataE @ 12630 NONAME DATA 8
+	_ZN6QMovie18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12631 NONAME
+	_ZN6QMovie25staticMetaObjectExtraDataE @ 12632 NONAME DATA 8
+	_ZN6QSound18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12633 NONAME
+	_ZN6QSound25staticMetaObjectExtraDataE @ 12634 NONAME DATA 8
+	_ZN6QStyle18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12635 NONAME
+	_ZN6QStyle25staticMetaObjectExtraDataE @ 12636 NONAME DATA 8
+	_ZN7QAction18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12637 NONAME
+	_ZN7QAction25staticMetaObjectExtraDataE @ 12638 NONAME DATA 8
+	_ZN7QDialog18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12639 NONAME
+	_ZN7QDialog25staticMetaObjectExtraDataE @ 12640 NONAME DATA 8
+	_ZN7QLayout18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12641 NONAME
+	_ZN7QLayout25staticMetaObjectExtraDataE @ 12642 NONAME DATA 8
+	_ZN7QSlider18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12643 NONAME
+	_ZN7QSlider25staticMetaObjectExtraDataE @ 12644 NONAME DATA 8
+	_ZN7QTabBar18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12645 NONAME
+	_ZN7QTabBar25staticMetaObjectExtraDataE @ 12646 NONAME DATA 8
+	_ZN7QWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12647 NONAME
+	_ZN7QWidget25staticMetaObjectExtraDataE @ 12648 NONAME DATA 8
+	_ZN7QWizard18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12649 NONAME
+	_ZN7QWizard25staticMetaObjectExtraDataE @ 12650 NONAME DATA 8
+	_ZN8QGesture18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12651 NONAME
+	_ZN8QGesture25staticMetaObjectExtraDataE @ 12652 NONAME DATA 8
+	_ZN8QMdiArea14setTabsMovableEb @ 12653 NONAME
+	_ZN8QMdiArea15setTabsClosableEb @ 12654 NONAME
+	_ZN8QMdiArea18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12655 NONAME
+	_ZN8QMdiArea25staticMetaObjectExtraDataE @ 12656 NONAME DATA 8
+	_ZN8QMenuBar18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12657 NONAME
+	_ZN8QMenuBar25staticMetaObjectExtraDataE @ 12658 NONAME DATA 8
+	_ZN8QPainter19drawPixmapFragmentsEPK6QRectFS2_iRK7QPixmap6QFlagsINS_18PixmapFragmentHintEE @ 12659 NONAME
+	_ZN8QSpinBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12660 NONAME
+	_ZN8QSpinBox25staticMetaObjectExtraDataE @ 12661 NONAME DATA 8
+	_ZN8QToolBar18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12662 NONAME
+	_ZN8QToolBar25staticMetaObjectExtraDataE @ 12663 NONAME DATA 8
+	_ZN8QToolBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12664 NONAME
+	_ZN8QToolBox25staticMetaObjectExtraDataE @ 12665 NONAME DATA 8
+	_ZN9QCheckBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12666 NONAME
+	_ZN9QCheckBox25staticMetaObjectExtraDataE @ 12667 NONAME DATA 8
+	_ZN9QComboBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12668 NONAME
+	_ZN9QComboBox25staticMetaObjectExtraDataE @ 12669 NONAME DATA 8
+	_ZN9QDateEdit18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12670 NONAME
+	_ZN9QDateEdit25staticMetaObjectExtraDataE @ 12671 NONAME DATA 8
+	_ZN9QDirModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12672 NONAME
+	_ZN9QDirModel25staticMetaObjectExtraDataE @ 12673 NONAME DATA 8
+	_ZN9QGroupBox18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12674 NONAME
+	_ZN9QGroupBox25staticMetaObjectExtraDataE @ 12675 NONAME DATA 8
+	_ZN9QLineEdit18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12676 NONAME
+	_ZN9QLineEdit18setCursorMoveStyleEN2Qt15CursorMoveStyleE @ 12677 NONAME
+	_ZN9QLineEdit25staticMetaObjectExtraDataE @ 12678 NONAME DATA 8
+	_ZN9QListView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12679 NONAME
+	_ZN9QListView25staticMetaObjectExtraDataE @ 12680 NONAME DATA 8
+	_ZN9QS60Style18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12681 NONAME
+	_ZN9QS60Style25staticMetaObjectExtraDataE @ 12682 NONAME DATA 8
+	_ZN9QShortcut18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12683 NONAME
+	_ZN9QShortcut25staticMetaObjectExtraDataE @ 12684 NONAME DATA 8
+	_ZN9QSizeGrip18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12685 NONAME
+	_ZN9QSizeGrip25staticMetaObjectExtraDataE @ 12686 NONAME DATA 8
+	_ZN9QSplitter18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12687 NONAME
+	_ZN9QSplitter25staticMetaObjectExtraDataE @ 12688 NONAME DATA 8
+	_ZN9QTextEdit18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12689 NONAME
+	_ZN9QTextEdit25staticMetaObjectExtraDataE @ 12690 NONAME DATA 8
+	_ZN9QTextList18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12691 NONAME
+	_ZN9QTextList25staticMetaObjectExtraDataE @ 12692 NONAME DATA 8
+	_ZN9QTimeEdit18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12693 NONAME
+	_ZN9QTimeEdit25staticMetaObjectExtraDataE @ 12694 NONAME DATA 8
+	_ZN9QTreeView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12695 NONAME
+	_ZN9QTreeView25staticMetaObjectExtraDataE @ 12696 NONAME DATA 8
+	_ZN9QUndoView18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 12697 NONAME
+	_ZN9QUndoView25staticMetaObjectExtraDataE @ 12698 NONAME DATA 8
+	_ZNK10QBlittable12capabilitiesEv @ 12699 NONAME
+	_ZNK10QBlittable4sizeEv @ 12700 NONAME
+	_ZNK10QTabWidget14heightForWidthEi @ 12701 NONAME
+	_ZNK10QZipWriter10isWritableEv @ 12702 NONAME
+	_ZNK10QZipWriter17compressionPolicyEv @ 12703 NONAME
+	_ZNK10QZipWriter19creationPermissionsEv @ 12704 NONAME
+	_ZNK10QZipWriter6deviceEv @ 12705 NONAME
+	_ZNK10QZipWriter6existsEv @ 12706 NONAME
+	_ZNK10QZipWriter6statusEv @ 12707 NONAME
+	_ZNK11QTextEngine19nextLogicalPositionEi @ 12708 NONAME
+	_ZNK11QTextEngine23previousLogicalPositionEi @ 12709 NONAME
+	_ZNK11QTextLayout15cursorMoveStyleEv @ 12710 NONAME
+	_ZNK11QTextLayout18leftCursorPositionEi @ 12711 NONAME
+	_ZNK11QTextLayout19rightCursorPositionEi @ 12712 NONAME
+	_ZNK12QFontMetrics10inFontUcs4Ej @ 12713 NONAME
+	_ZNK12QRadioButton15minimumSizeHintEv @ 12714 NONAME
+	_ZNK12QUndoCommand10actionTextEv @ 12715 NONAME
+	_ZNK13QFontDatabase9hasFamilyERK7QString @ 12716 NONAME
+	_ZNK13QFontMetricsF10inFontUcs4Ej @ 12717 NONAME
+	_ZNK13QTextDocument22defaultCursorMoveStyleEv @ 12718 NONAME
+	_ZNK14QFileOpenEvent8openFileER5QFile6QFlagsIN9QIODevice12OpenModeFlagEE @ 12719 NONAME
+	_ZNK14QPaintEngineEx23supportsTransformationsEfRK10QTransform @ 12720 NONAME
+	_ZNK14QWidgetPrivate17hasHeightForWidthEv @ 12721 NONAME
+	_ZNK14QWindowSurface8featuresEv @ 12722 NONAME
+	_ZNK15QRadialGradient11focalRadiusEv @ 12723 NONAME
+	_ZNK15QRadialGradient12centerRadiusEv @ 12724 NONAME
+	_ZNK16QFileSystemModel5rmdirERK11QModelIndex @ 12725 NONAME
+	_ZNK16QTreeViewPrivate10itemHeightEi @ 12726 NONAME
+	_ZNK16QTreeViewPrivate10modelIndexEii @ 12727 NONAME
+	_ZNK16QTreeViewPrivate12columnRangesERK11QModelIndexS2_ @ 12728 NONAME
+	_ZNK16QTreeViewPrivate16firstVisibleItemEPi @ 12729 NONAME
+	_ZNK16QTreeViewPrivate16itemAtCoordinateEi @ 12730 NONAME
+	_ZNK16QTreeViewPrivate16itemDecorationAtERK6QPoint @ 12731 NONAME
+	_ZNK16QTreeViewPrivate17coordinateForItemEi @ 12732 NONAME
+	_ZNK16QTreeViewPrivate18hasVisibleChildrenERK11QModelIndex @ 12733 NONAME
+	_ZNK16QTreeViewPrivate18indentationForItemEi @ 12734 NONAME
+	_ZNK16QTreeViewPrivate18itemDecorationRectERK11QModelIndex @ 12735 NONAME
+	_ZNK16QTreeViewPrivate18startAndEndColumnsERK5QRect @ 12736 NONAME
+	_ZNK16QTreeViewPrivate19draggablePaintPairsERK5QListI11QModelIndexEP5QRect @ 12737 NONAME
+	_ZNK16QTreeViewPrivate21drawAnimatedOperationEP8QPainter @ 12738 NONAME
+	_ZNK16QTreeViewPrivate25paintAlternatingRowColorsEP8QPainterP22QStyleOptionViewItemV4ii @ 12739 NONAME
+	_ZNK16QTreeViewPrivate30renderTreeToPixmapForAnimationERK5QRect @ 12740 NONAME
+	_ZNK16QTreeViewPrivate6pageUpEi @ 12741 NONAME
+	_ZNK16QTreeViewPrivate8columnAtEi @ 12742 NONAME
+	_ZNK16QTreeViewPrivate8pageDownEi @ 12743 NONAME
+	_ZNK16QTreeViewPrivate9viewIndexERK11QModelIndex @ 12744 NONAME
+	_ZNK17QInternalMimeData10metaObjectEv @ 12745 NONAME
+	_ZNK17QInternalMimeData12retrieveDataERK7QStringN8QVariant4TypeE @ 12746 NONAME
+	_ZNK17QInternalMimeData7formatsEv @ 12747 NONAME
+	_ZNK17QInternalMimeData9hasFormatERK7QString @ 12748 NONAME
+	_ZNK18QTextureGlyphCache18textureMapForGlyphEj6QFixed @ 12749 NONAME
+	_ZNK18QTextureGlyphCache20subPixelPositionForXE6QFixed @ 12750 NONAME
+	_ZNK18QTextureGlyphCache30calculateSubPixelPositionCountEj @ 12751 NONAME
+	_ZNK19QAbstractProxyModel11hasChildrenERK11QModelIndex @ 12752 NONAME
+	_ZNK19QAbstractProxyModel12canFetchMoreERK11QModelIndex @ 12753 NONAME
+	_ZNK19QAbstractProxyModel20supportedDropActionsEv @ 12754 NONAME
+	_ZNK19QAbstractProxyModel4spanERK11QModelIndex @ 12755 NONAME
+	_ZNK19QAbstractProxyModel5buddyERK11QModelIndex @ 12756 NONAME
+	_ZNK19QAbstractProxyModel8mimeDataERK5QListI11QModelIndexE @ 12757 NONAME
+	_ZNK19QAbstractProxyModel9mimeTypesEv @ 12758 NONAME
+	_ZNK19QBlitterPaintEngine11createStateEP13QPainterState @ 12759 NONAME
+	_ZNK19QIdentityProxyModel10metaObjectEv @ 12760 NONAME
+	_ZNK19QIdentityProxyModel11columnCountERK11QModelIndex @ 12761 NONAME
+	_ZNK19QIdentityProxyModel11mapToSourceERK11QModelIndex @ 12762 NONAME
+	_ZNK19QIdentityProxyModel13mapFromSourceERK11QModelIndex @ 12763 NONAME
+	_ZNK19QIdentityProxyModel20mapSelectionToSourceERK14QItemSelection @ 12764 NONAME
+	_ZNK19QIdentityProxyModel22mapSelectionFromSourceERK14QItemSelection @ 12765 NONAME
+	_ZNK19QIdentityProxyModel5indexEiiRK11QModelIndex @ 12766 NONAME
+	_ZNK19QIdentityProxyModel5matchERK11QModelIndexiRK8QVarianti6QFlagsIN2Qt9MatchFlagEE @ 12767 NONAME
+	_ZNK19QIdentityProxyModel6parentERK11QModelIndex @ 12768 NONAME
+	_ZNK19QIdentityProxyModel8rowCountERK11QModelIndex @ 12769 NONAME
+	_ZNK20QBlittablePixmapData11paintEngineEv @ 12770 NONAME
+	_ZNK20QBlittablePixmapData15hasAlphaChannelEv @ 12771 NONAME
+	_ZNK20QBlittablePixmapData6metricEN12QPaintDevice17PaintDeviceMetricE @ 12772 NONAME
+	_ZNK20QBlittablePixmapData7toImageEv @ 12773 NONAME
+	_ZNK20QBlittablePixmapData9blittableEv @ 12774 NONAME
+	_ZNK20QRasterWindowSurface8featuresEv @ 12775 NONAME
+	_ZNK5QFont17hintingPreferenceEv @ 12776 NONAME
+	_ZNK5QFont9styleNameEv @ 12777 NONAME
+	_ZNK8QMdiArea11tabsMovableEv @ 12778 NONAME
+	_ZNK8QMdiArea12tabsClosableEv @ 12779 NONAME
+	_ZNK8QPainter16clipBoundingRectEv @ 12780 NONAME
+	_ZNK9QCheckBox15minimumSizeHintEv @ 12781 NONAME
+	_ZNK9QFontInfo9styleNameEv @ 12782 NONAME
+	_ZNK9QLineEdit15cursorMoveStyleEv @ 12783 NONAME
+	_ZTI10QBlittable @ 12784 NONAME
+	_ZTI16QTreeViewPrivate @ 12785 NONAME
+	_ZTI17QInternalMimeData @ 12786 NONAME
+	_ZTI19QBlitterPaintEngine @ 12787 NONAME
+	_ZTI19QIdentityProxyModel @ 12788 NONAME
+	_ZTI20QBlittablePixmapData @ 12789 NONAME
+	_ZTV10QBlittable @ 12790 NONAME
+	_ZTV16QTreeViewPrivate @ 12791 NONAME
+	_ZTV17QInternalMimeData @ 12792 NONAME
+	_ZTV19QBlitterPaintEngine @ 12793 NONAME
+	_ZTV19QIdentityProxyModel @ 12794 NONAME
+	_ZTV20QBlittablePixmapData @ 12795 NONAME
+	_Zls6QDebugPK13QSymbianEvent @ 12796 NONAME
+	_ZN12QApplication22queryKeyboardModifiersEv @ 12797 NONAME
 
diff --git a/src/s60installs/eabi/QtNetworku.def b/src/s60installs/eabi/QtNetworku.def
index 32c1b97..6e7dedd 100644
--- a/src/s60installs/eabi/QtNetworku.def
+++ b/src/s60installs/eabi/QtNetworku.def
@@ -1168,106 +1168,106 @@ EXPORTS
 	_ZTV35QNetworkConfigurationManagerPrivate @ 1167 NONAME
 	_ZThn8_N19QBearerEnginePluginD0Ev @ 1168 NONAME
 	_ZThn8_N19QBearerEnginePluginD1Ev @ 1169 NONAME
-	_ZN10QUdpSocket18joinMulticastGroupERK12QHostAddress @ 1170 NONAME
-	_ZN10QUdpSocket18joinMulticastGroupERK12QHostAddressRK17QNetworkInterface @ 1171 NONAME
-	_ZN10QUdpSocket19leaveMulticastGroupERK12QHostAddress @ 1172 NONAME
-	_ZN10QUdpSocket19leaveMulticastGroupERK12QHostAddressRK17QNetworkInterface @ 1173 NONAME
-	_ZN10QUdpSocket21setMulticastInterfaceERK17QNetworkInterface @ 1174 NONAME
-	_ZN13QNetworkReply11setFinishedEb @ 1175 NONAME
-	_ZNK10QUdpSocket18multicastInterfaceEv @ 1176 NONAME
-	_ZNK35QNetworkConfigurationManagerPrivate12capabilitiesEv @ 1177 NONAME
-	_ZNK35QNetworkConfigurationManagerPrivate17allConfigurationsE6QFlagsIN21QNetworkConfiguration9StateFlagEE @ 1178 NONAME
-	_ZNK35QNetworkConfigurationManagerPrivate20defaultConfigurationEv @ 1179 NONAME
-	_ZNK35QNetworkConfigurationManagerPrivate27configurationFromIdentifierERK7QString @ 1180 NONAME
-	_ZNK35QNetworkConfigurationManagerPrivate7enginesEv @ 1181 NONAME
-	_ZNK35QNetworkConfigurationManagerPrivate8isOnlineEv @ 1182 NONAME
-	_ZN10QSslSocket17setPeerVerifyNameERK7QString @ 1183 NONAME
-	_ZN22QNetworkSessionPrivate13nativeSessionER15QNetworkSession @ 1184 NONAME
-	_ZN22QNetworkSessionPrivate16nativeOpenSocketER15QNetworkSessionR7RSocketjjj @ 1185 NONAME
-	_ZN22QNetworkSessionPrivate22nativeOpenHostResolverER15QNetworkSessionR13RHostResolverjj @ 1186 NONAME
-	_ZNK10QSslSocket14peerVerifyNameEv @ 1187 NONAME
-	_ZN14QHttpMultiPart11qt_metacallEN11QMetaObject4CallEiPPv @ 1188 NONAME
-	_ZN14QHttpMultiPart11qt_metacastEPKc @ 1189 NONAME
-	_ZN14QHttpMultiPart11setBoundaryERK10QByteArray @ 1190 NONAME
-	_ZN14QHttpMultiPart14setContentTypeENS_11ContentTypeE @ 1191 NONAME
-	_ZN14QHttpMultiPart16staticMetaObjectE @ 1192 NONAME DATA 16
-	_ZN14QHttpMultiPart19getStaticMetaObjectEv @ 1193 NONAME
-	_ZN14QHttpMultiPart6appendERK9QHttpPart @ 1194 NONAME
-	_ZN14QHttpMultiPartC1ENS_11ContentTypeEP7QObject @ 1195 NONAME
-	_ZN14QHttpMultiPartC1EP7QObject @ 1196 NONAME
-	_ZN14QHttpMultiPartC2ENS_11ContentTypeEP7QObject @ 1197 NONAME
-	_ZN14QHttpMultiPartC2EP7QObject @ 1198 NONAME
-	_ZN14QHttpMultiPartD0Ev @ 1199 NONAME
-	_ZN14QHttpMultiPartD1Ev @ 1200 NONAME
-	_ZN14QHttpMultiPartD2Ev @ 1201 NONAME
-	_ZN21QNetworkAccessManager3putERK15QNetworkRequestP14QHttpMultiPart @ 1202 NONAME
-	_ZN21QNetworkAccessManager4postERK15QNetworkRequestP14QHttpMultiPart @ 1203 NONAME
-	_ZN9QHttpPart12setRawHeaderERK10QByteArrayS2_ @ 1204 NONAME
-	_ZN9QHttpPart13setBodyDeviceEP9QIODevice @ 1205 NONAME
-	_ZN9QHttpPart7setBodyERK10QByteArray @ 1206 NONAME
-	_ZN9QHttpPart9setHeaderEN15QNetworkRequest12KnownHeadersERK8QVariant @ 1207 NONAME
-	_ZN9QHttpPartC1ERKS_ @ 1208 NONAME
-	_ZN9QHttpPartC1Ev @ 1209 NONAME
-	_ZN9QHttpPartC2ERKS_ @ 1210 NONAME
-	_ZN9QHttpPartC2Ev @ 1211 NONAME
-	_ZN9QHttpPartD1Ev @ 1212 NONAME
-	_ZN9QHttpPartD2Ev @ 1213 NONAME
-	_ZN9QHttpPartaSERKS_ @ 1214 NONAME
-	_ZNK14QHttpMultiPart10metaObjectEv @ 1215 NONAME
-	_ZNK14QHttpMultiPart8boundaryEv @ 1216 NONAME
-	_ZNK9QHttpParteqERKS_ @ 1217 NONAME
-	_ZTI14QHttpMultiPart @ 1218 NONAME
-	_ZTV14QHttpMultiPart @ 1219 NONAME
-	_ZN10QSslSocket18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1220 NONAME
-	_ZN10QSslSocket25staticMetaObjectExtraDataE @ 1221 NONAME DATA 8
-	_ZN10QTcpServer18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1222 NONAME
-	_ZN10QTcpServer25staticMetaObjectExtraDataE @ 1223 NONAME DATA 8
-	_ZN10QTcpSocket18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1224 NONAME
-	_ZN10QTcpSocket25staticMetaObjectExtraDataE @ 1225 NONAME DATA 8
-	_ZN10QUdpSocket18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1226 NONAME
-	_ZN10QUdpSocket25staticMetaObjectExtraDataE @ 1227 NONAME DATA 8
-	_ZN12QLocalServer18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1228 NONAME
-	_ZN12QLocalServer25staticMetaObjectExtraDataE @ 1229 NONAME DATA 8
-	_ZN12QLocalSocket18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1230 NONAME
-	_ZN12QLocalSocket25staticMetaObjectExtraDataE @ 1231 NONAME DATA 8
-	_ZN13QBearerEngine18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1232 NONAME
-	_ZN13QBearerEngine25staticMetaObjectExtraDataE @ 1233 NONAME DATA 8
-	_ZN13QNetworkReply18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1234 NONAME
-	_ZN13QNetworkReply25staticMetaObjectExtraDataE @ 1235 NONAME DATA 8
-	_ZN14QHttpMultiPart18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1236 NONAME
-	_ZN14QHttpMultiPart25staticMetaObjectExtraDataE @ 1237 NONAME DATA 8
-	_ZN15QAbstractSocket18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1238 NONAME
-	_ZN15QAbstractSocket25staticMetaObjectExtraDataE @ 1239 NONAME DATA 8
-	_ZN15QNetworkSession18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1240 NONAME
-	_ZN15QNetworkSession25staticMetaObjectExtraDataE @ 1241 NONAME DATA 8
-	_ZN17QNetworkCookieJar18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1242 NONAME
-	_ZN17QNetworkCookieJar25staticMetaObjectExtraDataE @ 1243 NONAME DATA 8
-	_ZN17QNetworkDiskCache18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1244 NONAME
-	_ZN17QNetworkDiskCache25staticMetaObjectExtraDataE @ 1245 NONAME DATA 8
-	_ZN19QBearerEnginePlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1246 NONAME
-	_ZN19QBearerEnginePlugin25staticMetaObjectExtraDataE @ 1247 NONAME DATA 8
-	_ZN21QAbstractNetworkCache18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1248 NONAME
-	_ZN21QAbstractNetworkCache25staticMetaObjectExtraDataE @ 1249 NONAME DATA 8
-	_ZN21QNetworkAccessManager18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1250 NONAME
-	_ZN21QNetworkAccessManager25staticMetaObjectExtraDataE @ 1251 NONAME DATA 8
-	_ZN22QNetworkSessionPrivate18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1252 NONAME
-	_ZN22QNetworkSessionPrivate25staticMetaObjectExtraDataE @ 1253 NONAME DATA 8
-	_ZN28QNetworkConfigurationManager18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1254 NONAME
-	_ZN28QNetworkConfigurationManager25staticMetaObjectExtraDataE @ 1255 NONAME DATA 8
-	_ZN35QNetworkConfigurationManagerPrivate18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1256 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate25staticMetaObjectExtraDataE @ 1257 NONAME DATA 8
-	_ZN4QFtp18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1258 NONAME
-	_ZN4QFtp25staticMetaObjectExtraDataE @ 1259 NONAME DATA 8
-	_ZN5QHttp18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1260 NONAME
-	_ZN5QHttp25staticMetaObjectExtraDataE @ 1261 NONAME DATA 8
-	_ZN18QNetworkProxyQuery23setNetworkConfigurationERK21QNetworkConfiguration @ 1262 NONAME
-	_ZN18QNetworkProxyQueryC1ERK21QNetworkConfigurationRK4QUrlNS_9QueryTypeE @ 1263 NONAME
-	_ZN18QNetworkProxyQueryC1ERK21QNetworkConfigurationRK7QStringiS5_NS_9QueryTypeE @ 1264 NONAME
-	_ZN18QNetworkProxyQueryC1ERK21QNetworkConfigurationtRK7QStringNS_9QueryTypeE @ 1265 NONAME
-	_ZN18QNetworkProxyQueryC2ERK21QNetworkConfigurationRK4QUrlNS_9QueryTypeE @ 1266 NONAME
-	_ZN18QNetworkProxyQueryC2ERK21QNetworkConfigurationRK7QStringiS5_NS_9QueryTypeE @ 1267 NONAME
-	_ZN18QNetworkProxyQueryC2ERK21QNetworkConfigurationtRK7QStringNS_9QueryTypeE @ 1268 NONAME
-	_ZNK18QNetworkProxyQuery20networkConfigurationEv @ 1269 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate10initializeEv @ 1270 NONAME
-	_ZN35QNetworkConfigurationManagerPrivate7cleanupEv @ 1271 NONAME
+	_ZN10QSslSocket17setPeerVerifyNameERK7QString @ 1170 NONAME
+	_ZN10QSslSocket18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1171 NONAME
+	_ZN10QSslSocket25staticMetaObjectExtraDataE @ 1172 NONAME DATA 8
+	_ZN10QTcpServer18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1173 NONAME
+	_ZN10QTcpServer25staticMetaObjectExtraDataE @ 1174 NONAME DATA 8
+	_ZN10QTcpSocket18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1175 NONAME
+	_ZN10QTcpSocket25staticMetaObjectExtraDataE @ 1176 NONAME DATA 8
+	_ZN10QUdpSocket18joinMulticastGroupERK12QHostAddress @ 1177 NONAME
+	_ZN10QUdpSocket18joinMulticastGroupERK12QHostAddressRK17QNetworkInterface @ 1178 NONAME
+	_ZN10QUdpSocket18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1179 NONAME
+	_ZN10QUdpSocket19leaveMulticastGroupERK12QHostAddress @ 1180 NONAME
+	_ZN10QUdpSocket19leaveMulticastGroupERK12QHostAddressRK17QNetworkInterface @ 1181 NONAME
+	_ZN10QUdpSocket21setMulticastInterfaceERK17QNetworkInterface @ 1182 NONAME
+	_ZN10QUdpSocket25staticMetaObjectExtraDataE @ 1183 NONAME DATA 8
+	_ZN12QLocalServer18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1184 NONAME
+	_ZN12QLocalServer25staticMetaObjectExtraDataE @ 1185 NONAME DATA 8
+	_ZN12QLocalSocket18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1186 NONAME
+	_ZN12QLocalSocket25staticMetaObjectExtraDataE @ 1187 NONAME DATA 8
+	_ZN13QBearerEngine18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1188 NONAME
+	_ZN13QBearerEngine25staticMetaObjectExtraDataE @ 1189 NONAME DATA 8
+	_ZN13QNetworkReply11setFinishedEb @ 1190 NONAME
+	_ZN13QNetworkReply18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1191 NONAME
+	_ZN13QNetworkReply25staticMetaObjectExtraDataE @ 1192 NONAME DATA 8
+	_ZN14QHttpMultiPart11qt_metacallEN11QMetaObject4CallEiPPv @ 1193 NONAME
+	_ZN14QHttpMultiPart11qt_metacastEPKc @ 1194 NONAME
+	_ZN14QHttpMultiPart11setBoundaryERK10QByteArray @ 1195 NONAME
+	_ZN14QHttpMultiPart14setContentTypeENS_11ContentTypeE @ 1196 NONAME
+	_ZN14QHttpMultiPart16staticMetaObjectE @ 1197 NONAME DATA 16
+	_ZN14QHttpMultiPart18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1198 NONAME
+	_ZN14QHttpMultiPart19getStaticMetaObjectEv @ 1199 NONAME
+	_ZN14QHttpMultiPart25staticMetaObjectExtraDataE @ 1200 NONAME DATA 8
+	_ZN14QHttpMultiPart6appendERK9QHttpPart @ 1201 NONAME
+	_ZN14QHttpMultiPartC1ENS_11ContentTypeEP7QObject @ 1202 NONAME
+	_ZN14QHttpMultiPartC1EP7QObject @ 1203 NONAME
+	_ZN14QHttpMultiPartC2ENS_11ContentTypeEP7QObject @ 1204 NONAME
+	_ZN14QHttpMultiPartC2EP7QObject @ 1205 NONAME
+	_ZN14QHttpMultiPartD0Ev @ 1206 NONAME
+	_ZN14QHttpMultiPartD1Ev @ 1207 NONAME
+	_ZN14QHttpMultiPartD2Ev @ 1208 NONAME
+	_ZN15QAbstractSocket18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1209 NONAME
+	_ZN15QAbstractSocket25staticMetaObjectExtraDataE @ 1210 NONAME DATA 8
+	_ZN15QNetworkSession18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1211 NONAME
+	_ZN15QNetworkSession25staticMetaObjectExtraDataE @ 1212 NONAME DATA 8
+	_ZN17QNetworkCookieJar18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1213 NONAME
+	_ZN17QNetworkCookieJar25staticMetaObjectExtraDataE @ 1214 NONAME DATA 8
+	_ZN17QNetworkDiskCache18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1215 NONAME
+	_ZN17QNetworkDiskCache25staticMetaObjectExtraDataE @ 1216 NONAME DATA 8
+	_ZN18QNetworkProxyQuery23setNetworkConfigurationERK21QNetworkConfiguration @ 1217 NONAME
+	_ZN18QNetworkProxyQueryC1ERK21QNetworkConfigurationRK4QUrlNS_9QueryTypeE @ 1218 NONAME
+	_ZN18QNetworkProxyQueryC1ERK21QNetworkConfigurationRK7QStringiS5_NS_9QueryTypeE @ 1219 NONAME
+	_ZN18QNetworkProxyQueryC1ERK21QNetworkConfigurationtRK7QStringNS_9QueryTypeE @ 1220 NONAME
+	_ZN18QNetworkProxyQueryC2ERK21QNetworkConfigurationRK4QUrlNS_9QueryTypeE @ 1221 NONAME
+	_ZN18QNetworkProxyQueryC2ERK21QNetworkConfigurationRK7QStringiS5_NS_9QueryTypeE @ 1222 NONAME
+	_ZN18QNetworkProxyQueryC2ERK21QNetworkConfigurationtRK7QStringNS_9QueryTypeE @ 1223 NONAME
+	_ZN19QBearerEnginePlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1224 NONAME
+	_ZN19QBearerEnginePlugin25staticMetaObjectExtraDataE @ 1225 NONAME DATA 8
+	_ZN21QAbstractNetworkCache18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1226 NONAME
+	_ZN21QAbstractNetworkCache25staticMetaObjectExtraDataE @ 1227 NONAME DATA 8
+	_ZN21QNetworkAccessManager18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1228 NONAME
+	_ZN21QNetworkAccessManager25staticMetaObjectExtraDataE @ 1229 NONAME DATA 8
+	_ZN21QNetworkAccessManager3putERK15QNetworkRequestP14QHttpMultiPart @ 1230 NONAME
+	_ZN21QNetworkAccessManager4postERK15QNetworkRequestP14QHttpMultiPart @ 1231 NONAME
+	_ZN22QNetworkSessionPrivate13nativeSessionER15QNetworkSession @ 1232 NONAME
+	_ZN22QNetworkSessionPrivate16nativeOpenSocketER15QNetworkSessionR7RSocketjjj @ 1233 NONAME
+	_ZN22QNetworkSessionPrivate18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1234 NONAME
+	_ZN22QNetworkSessionPrivate22nativeOpenHostResolverER15QNetworkSessionR13RHostResolverjj @ 1235 NONAME
+	_ZN22QNetworkSessionPrivate25staticMetaObjectExtraDataE @ 1236 NONAME DATA 8
+	_ZN28QNetworkConfigurationManager18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1237 NONAME
+	_ZN28QNetworkConfigurationManager25staticMetaObjectExtraDataE @ 1238 NONAME DATA 8
+	_ZN35QNetworkConfigurationManagerPrivate10initializeEv @ 1239 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1240 NONAME
+	_ZN35QNetworkConfigurationManagerPrivate25staticMetaObjectExtraDataE @ 1241 NONAME DATA 8
+	_ZN35QNetworkConfigurationManagerPrivate7cleanupEv @ 1242 NONAME
+	_ZN4QFtp18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1243 NONAME
+	_ZN4QFtp25staticMetaObjectExtraDataE @ 1244 NONAME DATA 8
+	_ZN5QHttp18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1245 NONAME
+	_ZN5QHttp25staticMetaObjectExtraDataE @ 1246 NONAME DATA 8
+	_ZN9QHttpPart12setRawHeaderERK10QByteArrayS2_ @ 1247 NONAME
+	_ZN9QHttpPart13setBodyDeviceEP9QIODevice @ 1248 NONAME
+	_ZN9QHttpPart7setBodyERK10QByteArray @ 1249 NONAME
+	_ZN9QHttpPart9setHeaderEN15QNetworkRequest12KnownHeadersERK8QVariant @ 1250 NONAME
+	_ZN9QHttpPartC1ERKS_ @ 1251 NONAME
+	_ZN9QHttpPartC1Ev @ 1252 NONAME
+	_ZN9QHttpPartC2ERKS_ @ 1253 NONAME
+	_ZN9QHttpPartC2Ev @ 1254 NONAME
+	_ZN9QHttpPartD1Ev @ 1255 NONAME
+	_ZN9QHttpPartD2Ev @ 1256 NONAME
+	_ZN9QHttpPartaSERKS_ @ 1257 NONAME
+	_ZNK10QSslSocket14peerVerifyNameEv @ 1258 NONAME
+	_ZNK10QUdpSocket18multicastInterfaceEv @ 1259 NONAME
+	_ZNK14QHttpMultiPart10metaObjectEv @ 1260 NONAME
+	_ZNK14QHttpMultiPart8boundaryEv @ 1261 NONAME
+	_ZNK18QNetworkProxyQuery20networkConfigurationEv @ 1262 NONAME
+	_ZNK35QNetworkConfigurationManagerPrivate12capabilitiesEv @ 1263 NONAME
+	_ZNK35QNetworkConfigurationManagerPrivate17allConfigurationsE6QFlagsIN21QNetworkConfiguration9StateFlagEE @ 1264 NONAME
+	_ZNK35QNetworkConfigurationManagerPrivate20defaultConfigurationEv @ 1265 NONAME
+	_ZNK35QNetworkConfigurationManagerPrivate27configurationFromIdentifierERK7QString @ 1266 NONAME
+	_ZNK35QNetworkConfigurationManagerPrivate7enginesEv @ 1267 NONAME
+	_ZNK35QNetworkConfigurationManagerPrivate8isOnlineEv @ 1268 NONAME
+	_ZNK9QHttpParteqERKS_ @ 1269 NONAME
+	_ZTI14QHttpMultiPart @ 1270 NONAME
+	_ZTV14QHttpMultiPart @ 1271 NONAME
 
diff --git a/src/s60installs/eabi/QtOpenGLu.def b/src/s60installs/eabi/QtOpenGLu.def
index ad33f9c..2d9aa8f 100644
--- a/src/s60installs/eabi/QtOpenGLu.def
+++ b/src/s60installs/eabi/QtOpenGLu.def
@@ -727,60 +727,59 @@ EXPORTS
 	_ZN17QGLGraphicsSystem17platformExtensionEv @ 726 NONAME
 	_ZN17QGLGraphicsSystem25releaseCachedGpuResourcesEv @ 727 NONAME
 	_ZThn4_N17QGLGraphicsSystem25releaseCachedGpuResourcesEv @ 728 NONAME
-	_ZN12QGLFunctionsC1Ev @ 729 NONAME
-	_ZN12QGLFunctionsC2EPK10QGLContext @ 730 NONAME
-	_ZN12QGLFunctionsC2Ev @ 731 NONAME
-	_ZN17QGLContextPrivate17qt_extensionFuncsE @ 732 NONAME DATA 60
-	_ZN20QGLTextureGlyphCache10setContextEPK10QGLContext @ 733 NONAME
-	_ZN20QGLTextureGlyphCache11fillTextureERKN18QTextureGlyphCache5CoordEj6QFixed @ 734 NONAME
-	_ZN20QGLTextureGlyphCacheC1EPK10QGLContextN21QFontEngineGlyphCache4TypeERK10QTransform @ 735 NONAME
-	_ZN20QGLTextureGlyphCacheC2EPK10QGLContextN21QFontEngineGlyphCache4TypeERK10QTransform @ 736 NONAME
-	_ZN22QGLEngineSharedShaders15qShaderSnippetsE @ 737 NONAME DATA 216
-	_ZN22QGLEngineSharedShaders16staticMetaObjectE @ 738 NONAME DATA 16
-	_ZN22QGLEngineSharedShaders17shadersForContextEPK10QGLContext @ 739 NONAME
-	_ZN22QGLEngineSharedShaders18cleanupCustomStageEP20QGLCustomShaderStage @ 740 NONAME
-	_ZN22QGLEngineSharedShaders18findProgramInCacheERK19QGLEngineShaderProg @ 741 NONAME
-	_ZN22QGLEngineSharedShaders19getStaticMetaObjectEv @ 742 NONAME
-	_ZN22QGLEngineSharedShadersC1EPK10QGLContext @ 743 NONAME
-	_ZN22QGLEngineSharedShadersC2EPK10QGLContext @ 744 NONAME
-	_ZN22QGLEngineSharedShadersD1Ev @ 745 NONAME
-	_ZN22QGLEngineSharedShadersD2Ev @ 746 NONAME
-	_ZN26QGLFramebufferObjectFormat9setMipmapEb @ 747 NONAME
-	_ZN27QGLContextGroupResourceBase5valueEPK10QGLContext @ 748 NONAME
-	_ZN27QGLContextGroupResourceBase6insertEPK10QGLContextPv @ 749 NONAME
-	_ZN27QGLContextGroupResourceBase7cleanupEPK10QGLContext @ 750 NONAME
-	_ZN27QGLContextGroupResourceBase7cleanupEPK10QGLContextPv @ 751 NONAME
-	_ZN27QGLContextGroupResourceBaseC2Ev @ 752 NONAME
-	_ZN27QGLContextGroupResourceBaseD0Ev @ 753 NONAME
-	_ZN27QGLContextGroupResourceBaseD1Ev @ 754 NONAME
-	_ZN27QGLContextGroupResourceBaseD2Ev @ 755 NONAME
-	_ZNK12QGLFunctions14openGLFeaturesEv @ 756 NONAME
-	_ZNK12QGLFunctions16hasOpenGLFeatureENS_13OpenGLFeatureE @ 757 NONAME
-	_ZNK14QGLPaintDevice9isFlippedEv @ 758 NONAME
-	_ZNK16QGLWindowSurface8featuresEv @ 759 NONAME
-	_ZNK26QGLFramebufferObjectFormat6mipmapEv @ 760 NONAME
-	_ZTI22QGLContextResourceBase @ 761 NONAME ABSENT
-	_ZTI27QGLContextGroupResourceBase @ 762 NONAME ABSENT
-	_ZTV22QGLContextResourceBase @ 763 NONAME ABSENT
-	_ZTV27QGLContextGroupResourceBase @ 764 NONAME ABSENT
-	_ZThn104_N20QGLTextureGlyphCacheD0Ev @ 765 NONAME
-	_ZThn104_N20QGLTextureGlyphCacheD1Ev @ 766 NONAME
-	_ZThn8_NK16QGLWindowSurface8featuresEv @ 767 NONAME
-	_ZN14QGLSignalProxy18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 768 NONAME
-	_ZN14QGLSignalProxy25staticMetaObjectExtraDataE @ 769 NONAME DATA 8
-	_ZN16QGLShaderProgram18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 770 NONAME
-	_ZN16QGLShaderProgram25staticMetaObjectExtraDataE @ 771 NONAME DATA 8
-	_ZN16QGLWindowSurface18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 772 NONAME
-	_ZN16QGLWindowSurface25staticMetaObjectExtraDataE @ 773 NONAME DATA 8
-	_ZN21QGraphicsShaderEffect18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 774 NONAME
-	_ZN21QGraphicsShaderEffect25staticMetaObjectExtraDataE @ 775 NONAME DATA 8
-	_ZN22QGLEngineShaderManager18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 776 NONAME
-	_ZN22QGLEngineShaderManager25staticMetaObjectExtraDataE @ 777 NONAME DATA 8
-	_ZN9QGLShader18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 778 NONAME
-	_ZN9QGLShader25staticMetaObjectExtraDataE @ 779 NONAME DATA 8
-	_ZN9QGLWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 780 NONAME
-	_ZN9QGLWidget25staticMetaObjectExtraDataE @ 781 NONAME DATA 8
-	_Z28qt_resolve_buffer_extensionsP10QGLContext @ 782 NONAME
-	_ZN12QGLFunctions21initializeGLFunctionsEPK10QGLContext @ 783 NONAME
-	_ZN12QGLFunctionsC1EPK10QGLContext @ 784 NONAME
+	_Z28qt_resolve_buffer_extensionsP10QGLContext @ 729 NONAME
+	_ZN12QGLFunctions21initializeGLFunctionsEPK10QGLContext @ 730 NONAME
+	_ZN12QGLFunctionsC1EPK10QGLContext @ 731 NONAME
+	_ZN12QGLFunctionsC1Ev @ 732 NONAME
+	_ZN12QGLFunctionsC2EPK10QGLContext @ 733 NONAME
+	_ZN12QGLFunctionsC2Ev @ 734 NONAME
+	_ZN14QGLSignalProxy18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 735 NONAME
+	_ZN14QGLSignalProxy25staticMetaObjectExtraDataE @ 736 NONAME DATA 8
+	_ZN16QGLShaderProgram18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 737 NONAME
+	_ZN16QGLShaderProgram25staticMetaObjectExtraDataE @ 738 NONAME DATA 8
+	_ZN16QGLWindowSurface18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 739 NONAME
+	_ZN16QGLWindowSurface25staticMetaObjectExtraDataE @ 740 NONAME DATA 8
+	_ZN17QGL2PaintEngineEx19drawPixmapFragmentsEPK6QRectFS2_iRK7QPixmap6QFlagsIN8QPainter18PixmapFragmentHintEE @ 741 NONAME
+	_ZN17QGLContextPrivate17qt_extensionFuncsE @ 742 NONAME DATA 64
+	_ZN20QGLTextureGlyphCache10setContextEPK10QGLContext @ 743 NONAME
+	_ZN20QGLTextureGlyphCache11fillTextureERKN18QTextureGlyphCache5CoordEj6QFixed @ 744 NONAME
+	_ZN20QGLTextureGlyphCacheC1EPK10QGLContextN21QFontEngineGlyphCache4TypeERK10QTransform @ 745 NONAME
+	_ZN20QGLTextureGlyphCacheC2EPK10QGLContextN21QFontEngineGlyphCache4TypeERK10QTransform @ 746 NONAME
+	_ZN21QGraphicsShaderEffect18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 747 NONAME
+	_ZN21QGraphicsShaderEffect25staticMetaObjectExtraDataE @ 748 NONAME DATA 8
+	_ZN22QGLEngineShaderManager18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 749 NONAME
+	_ZN22QGLEngineShaderManager25staticMetaObjectExtraDataE @ 750 NONAME DATA 8
+	_ZN22QGLEngineSharedShaders15qShaderSnippetsE @ 751 NONAME DATA 216
+	_ZN22QGLEngineSharedShaders16staticMetaObjectE @ 752 NONAME DATA 16
+	_ZN22QGLEngineSharedShaders17shadersForContextEPK10QGLContext @ 753 NONAME
+	_ZN22QGLEngineSharedShaders18cleanupCustomStageEP20QGLCustomShaderStage @ 754 NONAME
+	_ZN22QGLEngineSharedShaders18findProgramInCacheERK19QGLEngineShaderProg @ 755 NONAME
+	_ZN22QGLEngineSharedShaders19getStaticMetaObjectEv @ 756 NONAME
+	_ZN22QGLEngineSharedShadersC1EPK10QGLContext @ 757 NONAME
+	_ZN22QGLEngineSharedShadersC2EPK10QGLContext @ 758 NONAME
+	_ZN22QGLEngineSharedShadersD1Ev @ 759 NONAME
+	_ZN22QGLEngineSharedShadersD2Ev @ 760 NONAME
+	_ZN26QGLFramebufferObjectFormat9setMipmapEb @ 761 NONAME
+	_ZN27QGLContextGroupResourceBase5valueEPK10QGLContext @ 762 NONAME
+	_ZN27QGLContextGroupResourceBase6insertEPK10QGLContextPv @ 763 NONAME
+	_ZN27QGLContextGroupResourceBase7cleanupEPK10QGLContext @ 764 NONAME
+	_ZN27QGLContextGroupResourceBase7cleanupEPK10QGLContextPv @ 765 NONAME
+	_ZN27QGLContextGroupResourceBaseC2Ev @ 766 NONAME
+	_ZN27QGLContextGroupResourceBaseD0Ev @ 767 NONAME
+	_ZN27QGLContextGroupResourceBaseD1Ev @ 768 NONAME
+	_ZN27QGLContextGroupResourceBaseD2Ev @ 769 NONAME
+	_ZN9QGLShader18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 770 NONAME
+	_ZN9QGLShader25staticMetaObjectExtraDataE @ 771 NONAME DATA 8
+	_ZN9QGLWidget18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 772 NONAME
+	_ZN9QGLWidget25staticMetaObjectExtraDataE @ 773 NONAME DATA 8
+	_ZNK12QGLFunctions14openGLFeaturesEv @ 774 NONAME
+	_ZNK12QGLFunctions16hasOpenGLFeatureENS_13OpenGLFeatureE @ 775 NONAME
+	_ZNK14QGLPaintDevice9isFlippedEv @ 776 NONAME
+	_ZNK16QGLWindowSurface8featuresEv @ 777 NONAME
+	_ZNK26QGLFramebufferObjectFormat6mipmapEv @ 778 NONAME
+	_ZTI27QGLContextGroupResourceBase @ 779 NONAME
+	_ZTV27QGLContextGroupResourceBase @ 780 NONAME
+	_ZThn104_N20QGLTextureGlyphCacheD0Ev @ 781 NONAME
+	_ZThn104_N20QGLTextureGlyphCacheD1Ev @ 782 NONAME
+	_ZThn8_NK16QGLWindowSurface8featuresEv @ 783 NONAME
 
diff --git a/src/s60installs/eabi/QtOpenVGu.def b/src/s60installs/eabi/QtOpenVGu.def
index 7e1d7fa..a66df98 100644
--- a/src/s60installs/eabi/QtOpenVGu.def
+++ b/src/s60installs/eabi/QtOpenVGu.def
@@ -216,3 +216,4 @@ EXPORTS
 	_ZN13QVGPixmapData12forceToImageEb @ 215 NONAME
 	_ZNK13QVGPixmapData15toVolatileImageEv @ 216 NONAME
 	_ZNK16QVGWindowSurface8featuresEv @ 217 NONAME
+
diff --git a/src/s60installs/eabi/QtSqlu.def b/src/s60installs/eabi/QtSqlu.def
index 21782b8..def8601 100644
--- a/src/s60installs/eabi/QtSqlu.def
+++ b/src/s60installs/eabi/QtSqlu.def
@@ -475,6 +475,7 @@ EXPORTS
 	_ZN14QSqlTableModel25staticMetaObjectExtraDataE @ 474 NONAME DATA 8
 	_ZN16QSqlDriverPlugin18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 475 NONAME
 	_ZN16QSqlDriverPlugin25staticMetaObjectExtraDataE @ 476 NONAME DATA 8
-	_ZN24QSqlRelationalTableModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 477 NONAME
-	_ZN24QSqlRelationalTableModel25staticMetaObjectExtraDataE @ 478 NONAME DATA 8
+	_ZN24QSqlRelationalTableModel11setJoinModeENS_8JoinModeE @ 477 NONAME
+	_ZN24QSqlRelationalTableModel18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 478 NONAME
+	_ZN24QSqlRelationalTableModel25staticMetaObjectExtraDataE @ 479 NONAME DATA 8
 
diff --git a/src/s60installs/eabi/QtTestu.def b/src/s60installs/eabi/QtTestu.def
index ce98aa6..af0d4b4 100644
--- a/src/s60installs/eabi/QtTestu.def
+++ b/src/s60installs/eabi/QtTestu.def
@@ -163,7 +163,8 @@ EXPORTS
 	_ZNK10QTestTable7isEmptyEv @ 162 NONAME
 	_ZNK10QTestTable8testDataEi @ 163 NONAME
 	_ZNK10QTestTable9dataCountEv @ 164 NONAME
-	_ZN8QTestLog12startLoggingEj @ 165 NONAME
-	_ZN14QTestEventLoop18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 166 NONAME
-	_ZN14QTestEventLoop25staticMetaObjectExtraDataE @ 167 NONAME DATA 8
+	_ZN14QTestEventLoop18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 165 NONAME
+	_ZN14QTestEventLoop25staticMetaObjectExtraDataE @ 166 NONAME DATA 8
+	_ZN5QTest18printAvailableTagsE @ 167 NONAME DATA 1
+	_ZN8QTestLog12startLoggingEj @ 168 NONAME
 
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index a43c3df..c2b462c 100755
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -27,13 +27,16 @@ symbian: {
         $$QMAKE_LIBDIR_QT/QtTest$${QT_LIBINFIX}.dll \
         $$QMAKE_LIBDIR_QT/QtSql$${QT_LIBINFIX}.dll
 
+    # Symbian exports do not like absolute paths, so generate a relative path to original .pro file dir
+    S60_INSTALLS_SOURCE_DIR = $$relativeProPath()
+
     symbian-abld|symbian-sbsv2 {
         pluginLocations = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)
         bearerPluginLocation = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)
         bearerStubZ = $${EPOCROOT}$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin
         BLD_INF_RULES.prj_exports += \
-            "qsymbianbearer.qtplugin /$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" \
-            "qsymbianbearer.qtplugin /epoc32/winscw/c$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin"
+            "$$S60_INSTALLS_SOURCE_DIR/qsymbianbearer.qtplugin /$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" \
+            "$$S60_INSTALLS_SOURCE_DIR/qsymbianbearer.qtplugin /epoc32/winscw/c$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin"
     } else {
         pluginLocations = $$QT_BUILD_TREE/plugins/s60
         bearerPluginLocation = $$QT_BUILD_TREE/plugins/bearer
@@ -171,5 +174,5 @@ symbian: {
         qtlibraries.files += $$QMAKE_LIBDIR_QT/QtMultimedia$${QT_LIBINFIX}.dll
     }
 
-    BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
+    BLD_INF_RULES.prj_exports += "$$S60_INSTALLS_SOURCE_DIR/qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)"
 }
diff --git a/src/scripttools/debugging/qscriptcompletiontask.cpp b/src/scripttools/debugging/qscriptcompletiontask.cpp
index fb250b7..3c94a21 100644
--- a/src/scripttools/debugging/qscriptcompletiontask.cpp
+++ b/src/scripttools/debugging/qscriptcompletiontask.cpp
@@ -172,7 +172,7 @@ void QScriptCompletionTaskPrivate::completeScriptExpression()
     while ((pos > 0) && isIdentChar(contents.at(pos-1)))
         --pos;
     int pos2 = cursorPosition - 1;
-    while ((pos2 < contents.size()-1) && isIdentChar(contents.at(pos2+1)))
+    while ((pos2+1 < contents.size()) && isIdentChar(contents.at(pos2+1)))
         ++pos2;
     QString ident = contents.mid(pos, pos2 - pos + 1);
     position = pos;
diff --git a/src/scripttools/debugging/qscriptdebuggercodeview.cpp b/src/scripttools/debugging/qscriptdebuggercodeview.cpp
index 7c99723..65fd366 100644
--- a/src/scripttools/debugging/qscriptdebuggercodeview.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercodeview.cpp
@@ -233,7 +233,7 @@ bool QScriptDebuggerCodeView::event(QEvent *e)
             return false;
         }
         int pos2 = linePosition - 1;
-        while ((pos2 < contents.size()-1) && isIdentChar(contents.at(pos2+1)))
+        while ((pos2+1 < contents.size()) && isIdentChar(contents.at(pos2+1)))
             ++pos2;
         QString ident = contents.mid(pos, pos2 - pos + 1);
 
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp
index f2b2ccf..71a81c0 100644
--- a/src/sql/kernel/qsqlresult.cpp
+++ b/src/sql/kernel/qsqlresult.cpp
@@ -183,7 +183,7 @@ QString QSqlResultPrivate::namedToPositionalBinding()
         QChar ch = sql.at(i);
         if (ch == QLatin1Char(':') && !inQuote
                 && (i == 0 || sql.at(i - 1) != QLatin1Char(':'))
-                && (i < n - 1 && qIsAlnum(sql.at(i + 1)))) {
+                && (i + 1 < n && qIsAlnum(sql.at(i + 1)))) {
             int pos = i + 2;
             while (pos < n && qIsAlnum(sql.at(pos)))
                 ++pos;
@@ -618,7 +618,7 @@ bool QSqlResult::prepare(const QString& query)
         QChar ch = query.at(i);
         if (ch == QLatin1Char(':') && !inQuote
                 && (i == 0 || query.at(i - 1) != QLatin1Char(':'))
-                && (i < n - 1 && qIsAlnum(query.at(i + 1)))) {
+                && (i + 1 < n && qIsAlnum(query.at(i + 1)))) {
             int pos = i + 2;
             while (pos < n && qIsAlnum(query.at(pos)))
                 ++pos;
diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp
index 5b0406f..0edfaf4 100644
--- a/src/sql/models/qsqlrelationaltablemodel.cpp
+++ b/src/sql/models/qsqlrelationaltablemodel.cpp
@@ -710,24 +710,32 @@ void QSqlRelationalTableModel::clear()
 }
 
 
-/*! \enum QSqlRelationalTableModel::JoinMode
+/*!
+    \enum QSqlRelationalTableModel::JoinMode
+    \since 4.8
 
-    \value InnerJoin - Inner join mode, return rows when there is at least one match in both tables.
-    \value LeftJoin - Left join mode, returns all rows from the left table (table_name1), even if there are no matches in the right table (table_name2).
+    This enum specifies the type of mode to use when joining two tables.
 
-    \see QSqlRelationalTableModel::setJoinMode
-    \since 4.8
+    \value InnerJoin Inner join mode, return rows when there is at least one
+                     match in both tables.
+    \value LeftJoin  Left join mode, returns all rows from the left table
+                     (table_name1), even if there are no matches in the right
+                     table (table_name2).
+
+    \sa QSqlRelationalTableModel::setJoinMode()
 */
 
 /*!
-    Sets the SQL join mode to show or hide rows with NULL foreign keys.
-    In InnerJoin mode (the default) these rows will not be showed: use the
+    \since 4.8
+    Sets the SQL join mode to the value given by \a joinMode to show or hide
+    rows with NULL foreign keys.
+
+    In InnerJoin mode (the default) these rows will not be shown; use the
     LeftJoin mode if you want to show them.
 
-    \see QSqlRelationalTableModel::JoinMode
-    \since 4.8
+    \sa QSqlRelationalTableModel::JoinMode
 */
-void QSqlRelationalTableModel::setJoinMode( QSqlRelationalTableModel::JoinMode joinMode )
+void QSqlRelationalTableModel::setJoinMode(QSqlRelationalTableModel::JoinMode joinMode)
 {
     Q_D(QSqlRelationalTableModel);
     d->joinMode = joinMode;
diff --git a/src/src.pro b/src/src.pro
index 9e29b89..9314fbd 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -11,7 +11,7 @@ nacl: SRC_SUBDIRS -= src_network src_testlib
 !wince*:!symbian:!vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support
 
 !wince*:!symbian-abld:!symbian-sbsv2:include(tools/tools.pro)
-win32:SRC_SUBDIRS += src_activeqt
+win32:!win32-g++*:SRC_SUBDIRS += src_activeqt
 
 contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2): SRC_SUBDIRS += src_opengl
 contains(QT_CONFIG, openvg): SRC_SUBDIRS += src_openvg
diff --git a/src/svg/qsvgstructure.cpp b/src/svg/qsvgstructure.cpp
index cc158ba..4d9fad5 100644
--- a/src/svg/qsvgstructure.cpp
+++ b/src/svg/qsvgstructure.cpp
@@ -369,7 +369,7 @@ QSvgNode * QSvgStructureNode::previousSiblingNode(QSvgNode *n) const
 {
     QSvgNode *prev = 0;
     QList<QSvgNode*>::const_iterator itr = m_renderers.constBegin();
-    while (itr != m_renderers.constEnd()) {
+    for (; itr != m_renderers.constEnd(); ++itr) {
         QSvgNode *node = *itr;
         if (node == n)
             return prev;
diff --git a/src/testlib/qtestxmlstreamer.h b/src/testlib/qtestxmlstreamer.h
index 46318a9..d4a9079 100644
--- a/src/testlib/qtestxmlstreamer.h
+++ b/src/testlib/qtestxmlstreamer.h
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 #ifndef QTESTXMLSTREAMER_H
-#define QTESXMLSTREAMER_H
+#define QTESTXMLSTREAMER_H
 
 #include <QtTest/qtestbasicstreamer.h>
 
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 72fda2d..b1bcab7 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -574,7 +574,7 @@ void Generator::generateProperties()
                 strreg(p.name),
                 strreg(p.type));
         if (!(flags >> 24) && isQRealType(p.type))
-            fprintf(out, "(QMetaType::QReal << 24) | ");
+            fprintf(out, "((uint)QMetaType::QReal << 24) | ");
         fprintf(out, "0x%.8x,\n", flags);
     }
 
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index 13f57f5..9309db1 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -216,8 +216,8 @@ Type Moc::parseType()
             QByteArray templ = lexemUntil(RANGLE);
             for (int i = 0; i < templ.size(); ++i) {
                 type.name += templ.at(i);
-                if ((templ.at(i) == '<' && i < templ.size()-1 && templ.at(i+1) == ':')
-                    || (templ.at(i) == '>' && i < templ.size()-1 && templ.at(i+1) == '>')) {
+                if ((templ.at(i) == '<' && i+1 < templ.size() && templ.at(i+1) == ':')
+                    || (templ.at(i) == '>' && i+1 < templ.size() && templ.at(i+1) == '>')) {
                     type.name += ' ';
                 }
             }
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index 2f5384b..0c7f2ab 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -7748,7 +7748,13 @@ bool QXmlSimpleReaderPrivate::processReference()
                                     return false;
                                 }
                                 if (ret) {
-                                    QString xmlRefString = ret->data();
+                                    QString xmlRefString;
+                                    QString buffer = ret->data();
+                                    while (buffer.length()>0){
+                                        xmlRefString += buffer;
+                                        ret->fetchData();
+                                        buffer = ret->data();
+                                    }
                                     delete ret;
                                     if (!stripTextDecl(xmlRefString)) {
                                         reportParseError(QLatin1String(XMLERR_ERRORINTEXTDECL));
diff --git a/src/xmlpatterns/expr/qevaluationcache.cpp b/src/xmlpatterns/expr/qevaluationcache.cpp
index 67109eb..3b6fc92 100644
--- a/src/xmlpatterns/expr/qevaluationcache.cpp
+++ b/src/xmlpatterns/expr/qevaluationcache.cpp
@@ -49,10 +49,9 @@ template<bool IsForGlobal>
 EvaluationCache<IsForGlobal>::EvaluationCache(const Expression::Ptr &op,
                                               const VariableDeclaration *varDecl,
                                               const VariableSlotID aSlot) : SingleContainer(op)
-                                                                          , m_declaration(varDecl)
+                                                                          , m_declarationUsedByMany(varDecl->usedByMany())
                                                                           , m_varSlot(aSlot)
 {
-    Q_ASSERT(m_declaration);
     Q_ASSERT(m_varSlot > -1);
 }
 
@@ -199,7 +198,7 @@ Expression::Ptr EvaluationCache<IsForGlobal>::compress(const StaticContext::Ptr
     if(m_operand->is(IDRangeVariableReference))
         return m_operand;
 
-    if(m_declaration->usedByMany())
+    if (m_declarationUsedByMany)
     {
         /* If it's only an atomic value an EvaluationCache is overkill. However,
          * it's still needed for functions like fn:current-time() that must adhere to
diff --git a/src/xmlpatterns/expr/qevaluationcache_p.h b/src/xmlpatterns/expr/qevaluationcache_p.h
index 4111634..67ee5c2 100644
--- a/src/xmlpatterns/expr/qevaluationcache_p.h
+++ b/src/xmlpatterns/expr/qevaluationcache_p.h
@@ -125,6 +125,7 @@ namespace QPatternist
     private:
         static DynamicContext::Ptr topFocusContext(const DynamicContext::Ptr &context);
         const VariableDeclaration* m_declaration;
+        bool m_declarationUsedByMany;
         /**
          * This variable must not be called m_slot. If it so, a compiler bug on
          * HP-UX-aCC-64 is triggered in the constructor initializor. See the