Created by Roman Shtylman and last modified
Get this branch:
bzr branch lp:qtwebkit

Branch merges

Related bugs

Related blueprints

Branch information

Kubuntu Packagers

Import details

Import Status: Failed

This branch is an import of the HEAD branch of the Git repository at git://gitorious.org/+qtwebkit-developers/webkit/qtwebkit.git.

The import has been suspended because it failed 5 or more times in succession.

Last successful import was .

Import started on pear and finished taking 9 days — see the log
Import started on galapagos and finished taking 2 hours 40 minutes
Import started on pear and finished taking 10 days
Import started on neumayer and finished taking 3 days — see the log

Recent revisions

75971. By Simon Hausmann

Fix path to OSX Mountain Lion SDK, as pointed out by Mike McQuaid on https://codereview.qt-project.org/#change,31759

75970. By <email address hidden> <<email address hidden>@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Unreviewed Qt/Mac build fix: Use libWebKitSystemInterfaceMountainLion.a
on Mountain Lion.

* WebKit1.pri:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@124002 268f45cc-cd09-0410-ab3c-d52691b4dbfc


75969. By Mark Rowe

Add a Mountain Lion version of libWebKitSystemInterface.a.


Reviewed by John Sullivan.

* Configurations/DebugRelease.xcconfig: Look for the library under its expected name.


Reviewed by John Sullivan.

* Configurations/DebugRelease.xcconfig: Look for the library under its expected name.


Reviewed by John Sullivan.

* Scripts/copy-webkitlibraries-to-product-directory: Include libWebKitSystemInterfaceMountainLion.a in the list of libraries to copy.


Update the WebKitSystemInterface header and binaries.

Reviewed by John Sullivan.

* WebKitSystemInterface.h:
* libWebKitSystemInterfaceLion.a:
* libWebKitSystemInterfaceMountainLion.a: Added.
* libWebKitSystemInterfaceSnowLeopard.a:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@122352 268f45cc-cd09-0410-ab3c-d52691b4dbfc


75968. By Simon Hausmann

Fix build on linux-i386 where gcc would produce warnings

It is the intention to _not_ use -Werror for production builds. Unfortunately
the qmake expression had an error that made the -Werror suppression only work
on x86-64 but not on i386. A surrounding if() as suggested by Ossi fixes this.

In trunk this is already fixed differently by the use of an extra scope.

Task: QTBUG-23987

75967. By Simon Hausmann

Bumped the QtWebKit version to 2.2.3

75966. By Gustavo Noronha Silva <email address hidden>

Fix build with GLib 2.31

Patch by Gustavo Noronha Silva <email address hidden> on 2011-10-12
Reviewed by Martin Robinson.


* configure.ac: add check for pthread rwlock support.


* GNUmakefile.list.am: removed ThreadingGtk.cpp.
* wtf/ThreadingPrimitives.h: remove GTK+-specific definitions.
* wtf/gobject/GOwnPtr.cpp: remove GCond and GMutex specializations.
* wtf/gobject/GOwnPtr.h: ditto.
* wtf/gobject/GTypedefs.h: remove GCond and GMutex forward declarations.
* wtf/gtk/ThreadingGtk.cpp: Removed.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@97269 268f45cc-cd09-0410-ab3c-d52691b4dbfc



75965. By Nicolas Arnaud-Cormos <email address hidden>

JSString::resolveRope() should report extra memory cost to the heap.

At the time a JSString is constructed with fibers, it doesn't report
extra memory cost, which is reasonable because it hasn't allocate
new memory. However when the rope is resolved, it should report memory
cost for the new buffer.

Backport patch by Yong Li
Reviewed by Michael Saboff.

Signed-off-by: Simon Hausmann <email address hidden>

75964. By Nicolas Arnaud-Cormos <email address hidden>

Implement OSAllocator::commit/decommit in the correct way for QNX

We should use mmap(PROT_NONE, MAP_LAZY) instead of posix_madvise() to
implement memory decommitting for QNX.

Backport Patch by Yong Li
Reviewed by Rob Buis.

Signed-off-by: Simon Hausmann <email address hidden>

75963. By commit-queue <email address hidden>

Qt: Doc: Fix typo which marks document to be printed in console font.

Patch by Casper van Donderen <email address hidden> on 2012-04-02
Reviewed by Simon Hausmann.

The qtwebkit-bridge.qdoc file contained a typo where a \c {} was
missing its closing curly bracket, this marked the rest of the page as
text to be printed using the code/console font.
* docs/qtwebkit-bridge.qdoc:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@112872 268f45cc-cd09-0410-ab3c-d52691b4dbfc

75962. By <email address hidden> <<email address hidden>@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Fix the PRI macros used in WTF::String formatters to be compatible with Qt and Visual Studio 2005 and newer.

Add compile time check for Visual Studio 2005 or newer.

Patch by Aron Rosenberg <email address hidden> on 2012-02-23
Reviewed by Simon Hausmann.

* os-win32/inttypes.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@108641 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.