If you have landed a change into the trunk that you would like to include in the release branch or you have an exceptional patch that needs to be included, please edit this wiki page and add the SVN revision or bugzilla id to the list below.

Patches that have been included in the release before they have been landed in the trunk are tracked at ​https://bugs.webkit.org/show_bug.cgi?id=32653 .

(The page is being watched and an email is automatically sent when it is edited)

Patches for QtWebKit 4.6

Patches for inclusion in the qtwebkit-4.6 branch of ​http://gitorious.org/+qtwebkit-developers/webkit/qtwebkit . All changes in that branch are submitted into Qt's 4.6 branch on a weekly basis.

Incoming

Rejected

• (not landed) - ​https://bugs.webkit.org/show_bug.cgi?id=30681 -- Use Symbian's time functions in DateMath. This might need a guard for certain Symbian versions. ​https://bug-30681-attachments.webkit.org/attachment.cgi?id=44235 -- It appears that this will be solved on OpenC -- Putting on hold
• r52516 - ​https://bugs.webkit.org/show_bug.cgi?id=32121 -- [Qt] implement ImageDecoderQt::clearFrameBufferCache() -- Bug reopened, patch appears to have problems

Applied

• Week 3
  • Integration into Qt 4.6 pending with commit c2573f74fb8a09484b385e4469d887bb0fea8cb9:
    • ​https://bugs.webkit.org/show_bug.cgi?id=33887 - QGraphicsWebView shows combo box popups in the wrong position -- Use ​https://bug-33887-attachments.webkit.org/attachment.cgi?id=47007 for applying. (The patch for 4.6.1 and webkit-trunk are different)
  • Integrated into Qt 4.6 with merge commit 304c70a03406eb16b9a08719769655b75bf6d8e3:
    • r53390 - ​https://bugs.webkit.org/show_bug.cgi?id=33573 -- [Qt] [Symbian] SetWindow call in npapi plugin does not happen when the coordinates are negative
    • ​https://bugs.webkit.org/show_bug.cgi?id=32988 -- Add RVCT compiler optimization flags -Otime -O3; update to a previous patch.
    • ​https://bugs.webkit.org/show_bug.cgi?id=33591 -- [Qt/Win] Flash in QGraphicsWebView does not process hover correctly.

• Week 2
  • Integrated into Qt 4.6 with merge commit 796f8235d1d41878030e6992a225fafb1ee64fbe.
    • r52311 - ​https://bugs.webkit.org/show_bug.cgi?id=32668 -- [Qt] Add new scrollRecursively API to QWebFrame;
    • r53127 - ​https://bugs.webkit.org/show_bug.cgi?id=33423 - [Qt] XSL stylesheets can load documents from a different origin

• Week 1
  • Integrated into Qt 4.6 with merge commit 796f8235d1d41878030e6992a225fafb1ee64fbe :
    • r52928 ​https://bugs.webkit.org/show_bug.cgi?id=32684 -- [Qt] Allow the application to override online/offline network status. This is a temporary solution, while we are negotiating the new Bearer Management API for Qt 4.7;
    • (not landed) ​https://bugs.webkit.org/show_bug.cgi?id=32988 -- Add RVCT compiler optimization flags -Otime -O3
    • (not landed) ​https://bugs.webkit.org/show_bug.cgi?id=33084 -- Fix for RVCT -Otime fatal compiler error
    • (not landed) ​https://bugs.webkit.org/show_bug.cgi?id=33280 -- [RVCT] ACID3 test crash
    • r52914 -- ​https://bugs.webkit.org/show_bug.cgi?id=31673 -- [Qt] Private API to suspend/resume active Javascript DOM objects
  • Integrated into Qt 4.6 with 53817ebe67158d642fd5d85dfdcf4d96e91b093b (or earlier):
    • r51871 -- Make WebKit build correctly on FreeBSD, IA64, and Alpha.
    • r52682 - ​https://bugs.webkit.org/show_bug.cgi?id=33082 -- Do not include Frame.h under WebCore/html/canvas

• Week 53
  • (not landed) ​https://bugs.webkit.org/show_bug.cgi?id=29048 -- [Qt] make RenderStyle.h compile in winscw compiler. - was already applied in commit 20e982d90067406485dcf1ca6d23ec0efad721c2
  • r52261 - ​https://bugs.webkit.org/show_bug.cgi?id=32555 -- [Qt] support navigator.onLine and ononline/onoffline events.
  • r52648 - ​https://bugs.webkit.org/show_bug.cgi?id=33040 -- Disable datagrid implementation as it is not ready for general web use yet.

• Older
  • r51103 - ​https://bugs.webkit.org/show_bug.cgi?id=29443 -- WebKit crashes when loading certain SVG images
  • r51306 - ​https://bugs.webkit.org/show_bug.cgi?id=31681 -- [Qt] Wrong runtime instance objects of wrapped QObjects may be used if the wrapped object died before the gc removed the instance
  • r51307 - ​https://bugs.webkit.org/show_bug.cgi?id=31773 -- [Symbian] Fix lastIndexOf() for Symbian
  • r51308 - ​https://bugs.webkit.org/show_bug.cgi?id=31355 -- Documentation fixes
  • r51461 - ​https://bugs.webkit.org/show_bug.cgi?id=31943 -- Apply workaround for the limitation of VirtualFree with MEM_RELEASE to all ports running on Windows (possibly a crash on Win only)
  • r51515 - ​https://bugs.webkit.org/show_bug.cgi?id=31961 -- [Qt][Symbian] Report SymbianOS in user agent string for Symbian
  • r52152 - ​https://bugs.webkit.org/show_bug.cgi?id=30914 -- [Qt] Javascript Prompt API default return values check failure on QtLauncher
  • r52337 - ​https://bugs.webkit.org/show_bug.cgi?id=32713 -- [Qt] make wtf/Assertions.h compile in winscw compiler.
  • r52259 - [Qt] Symbian build fix: Don't include QtXml/qxmlstream.h but omit the prefix

Patches for QtWebKit 2010.1

• We haven't created a release branch yet :-)