torarnv

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 34b5ccc..32a4868 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2013-02-27  Simon Hausmann  <simon.hausmann@digia.com>
+
+        [Qt][Mac] Fix massive parallel builds
+
+        Reviewed by NOBODY (OOPS!).

torarnv

From 95f638764157606fdff3dd1ebd0aff521a37237e Mon Sep 17 00:00:00 2001
From: Andras Becsi <andras.becsi@digia.com>
Date: Wed, 26 Sep 2012 17:48:37 +0200
Subject: [PATCH] Add QML examples for WebKit integration

Add flickrview and youtubeview examples covering the use of the
WebKit WebView QML API.

    - FlickrView is an example that utilizes the flickr.com RSS
      feed of public photos and displays the full size images in

torarnv

commit 64d854bf44b4878ebd6f5f35921ddc2177ea42a8
Author: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Date:   Fri Oct 5 16:34:02 2012 +0200

    WIP: modularize documentation

diff --git a/configure b/configure
index 58d7a86..9dea8c4 100755
--- a/configure
+++ b/configure

torarnv

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index ede6787..8b1c06f 100644
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,22 @@
+2012-05-02  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        [Qt] Fix vkb showing incorrect flags/keys when content changes
+
+        Reviewed by NOBODY (OOPS!).

torarnv

diff --git i/src/v8/v8.pri w/src/v8/v8.pri
index ec0561a..03d4bf7 100644
--- i/src/v8/v8.pri
+++ w/src/v8/v8.pri
@@ -7,7 +7,7 @@ isEmpty(QT_ARCH) {
 
 isEmpty(V8_TARGET_ARCH) {
     # Detect target
-    equals(QT_ARCH, x86_64)|contains(CONFIG, x86_64):V8_TARGET_ARCH = x64
+    equals(QT_ARCH, x86_64):                         V8_TARGET_ARCH = x64

torarnv

diff --git i/Source/api.pri w/Source/api.pri
index d22d43c..6b23ea4 100644
--- i/Source/api.pri
+++ w/Source/api.pri
@@ -4,10 +4,24 @@
 # See 'Tools/qmake/README' for an overview of the build system
 # -------------------------------------------------------------------
 
-TEMPLATE = lib
 TARGET = QtWebKit

torarnv

 flex 
 kernel 
 libfontconfig1-dev 
 libfreetype6-dev 
 libgles2 
 libncurses5-dev 
 libpng12-dev 
 libpthread-stubs0 
 libreadline5-dev 
 libtiff4-dev 

torarnv

From b2658e3ac5951eab8d22cc1193a3c293ed0c88fc Mon Sep 17 00:00:00 2001
From: Antonio Gomes <tonikitoo@webkit.org>
Date: Mon, 19 Oct 2009 09:51:20 -0400
Subject: [PATCH] QWebPage's view object can easily become a dangling pointer since it can not be
 owned by the qwebpage object itself nor by qwebview (or qgraphicswebview).

Patch by Antonio Gomes <tonikitoo@webkit.org> on 2009-10-19
Reviewed by NOBODY (OOPS!).

Patch makes QWebPagePrivate's view object to be a QPointer. That way qwebpage's 'view'

torarnv

From 93a2c15c712d56a51e5e4f2a6502e285a538b0d2 Mon Sep 17 00:00:00 2001
From: Antonio Gomes <tonikitoo@webkit.org>
Date: Tue, 13 Oct 2009 22:09:26 -0400
Subject: [PATCH] Wrong ifdef combination in QGraphicsWebView's event method.

Patch by Antonio Gomes <tonikitoo@webkit.org> on 2009-10-13
Reviewed by NOBODY (OOPS!).

* Api/qgraphicswebview.cpp:
(QGraphicsWebView::event):