[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.20-204-g221d8e8

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 0fc279472b9cda493f6d350bb4760194067d792f
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 5 14:10:08 2010 +0000

    [Qt] Build break in QtWebkit on Symbian
    https://bugs.webkit.org/show_bug.cgi?id=34597
    
    Patch by Siddharth Mathur <siddharth.mathur at nokia.com> on 2010-02-05
    Reviewed by Ariya Hidayat.
    
    * plugins/PluginView.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2b2f820..6d2c17f 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-05  Siddharth Mathur  <siddharth.mathur at nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
+        [Qt] Build break in QtWebkit on Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=34597
+
+        * plugins/PluginView.h:
+
 2010-02-05  Yury Semikhatsky  <yurys at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/plugins/PluginView.h b/WebCore/plugins/PluginView.h
index 0dd5e0b..ac60fd4 100644
--- a/WebCore/plugins/PluginView.h
+++ b/WebCore/plugins/PluginView.h
@@ -326,7 +326,7 @@ public:
 
 private:
 
-#if defined(XP_UNIX) || PLATFORM(SYMBIAN)
+#if defined(XP_UNIX) || OS(SYMBIAN)
         void setNPWindowIfNeeded();
 #elif defined(XP_MACOSX)
         NP_CGContext m_npCgContext;

-- 
WebKit Debian packaging