From a2ed290c33f7c087b71a4da53a4baa891f35751a Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 3 May 2010 16:21:20 +0200
Subject: Updated WebKit to 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2

* Integrated http://trac.webkit.org/changeset/58673 -- Fix qtlibraryinfix not to contain space
---
 src/3rdparty/webkit/.tag                |  2 +-
 src/3rdparty/webkit/VERSION             |  2 +-
 src/3rdparty/webkit/WebCore/ChangeLog   | 11 +++++++++++
 src/3rdparty/webkit/WebCore/WebCore.pro |  2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag
index 7c2b233..b6feeb1 100644
--- a/src/3rdparty/webkit/.tag
+++ b/src/3rdparty/webkit/.tag
@@ -1 +1 @@
-3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2
+992e57ee469bd8c6a2afef6b15896a161ab8aeb3
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index ddaaf50..c3d6314 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
 
-        8941bee5706ef2171ed5def63834deefc7440d11
+        3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index 22315fe..05fc2af 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-05-03  Janne Koskinen  <janne.p.koskinen@digia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix qtlibraryinfix not to contain space
+
+        List catenation with += adds whitespace cutting the infix
+        from the final target.
+
+        * WebCore.pro:
+
 2010-05-03  Thomas Zander <t.zander@nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index 626e050..3d57562 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -72,7 +72,7 @@ CONFIG(QTDIR_build) {
 } else {
     DESTDIR = $$OUTPUT_DIR/lib
     !static: DEFINES += QT_MAKEDLL
-    symbian: TARGET += $${QT_LIBINFIX}
+    symbian: TARGET =$$TARGET$${QT_LIBINFIX}
 }
 include($$PWD/../WebKit/qt/qtwebkit_version.pri)
 VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}
-- 
cgit v0.12