[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit cd568f5b3e9ab5a23e3beb1e6a7422a9557cc12a
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 11 04:58:58 2010 +0000

    2010-12-10  Siddharth Mathur  <siddharth.mathur at nokia.com>
    
            Reviewed by Eric Seidel.
    
            [Qt][WK2] Make WebKit2 static library compile on Symbian
            https://bugs.webkit.org/show_bug.cgi?id=50861
    
            * WebKit2.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73834 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 02f4ec3..ca1fe7b 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-10  Siddharth Mathur  <siddharth.mathur at nokia.com>
+
+        Reviewed by Eric Seidel.
+
+        [Qt][WK2] Make WebKit2 static library compile on Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=50861
+
+        * WebKit2.pro:
+
 2010-12-10  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index a35a1cc..fc9e54f 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -23,11 +23,22 @@ CONFIG += staticlib
 TARGET = $$WEBKIT2_TARGET
 DESTDIR = $$WEBKIT2_DESTDIR
 
-!CONFIG(release, debug|release) {
-    OBJECTS_DIR = obj/debug
-} else { # Release
-    OBJECTS_DIR = obj/release
-    DEFINES += NDEBUG
+!symbian {
+    !CONFIG(release, debug|release) {
+        OBJECTS_DIR = obj/debug
+    } else { # Release
+        OBJECTS_DIR = obj/release
+        DEFINES += NDEBUG
+    }
+}
+
+symbian {
+    # DEFINES += QT_MAKEDLL
+    DEFINES += BUILDING_WEBKIT
+    MMP_RULES += "USERINCLUDE ../WebCore/bridge"
+    MMP_RULES += "USERINCLUDE ../WebCore/platform/text"
+    MMP_RULES += "USERINCLUDE ../WebCore/platform/animation"
+    MMP_RULES += "USERINCLUDE ../WebCore/rendering"
 }
 
 # Build both debug and release configurations
@@ -380,10 +391,6 @@ HEADERS += \
     WebProcess/Plugins/Netscape/NPJSObject.h \
     WebProcess/Plugins/Netscape/NPRuntimeObjectMap.h \
     WebProcess/Plugins/Netscape/NPRuntimeUtilities.h \
-    WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp \
-    WebProcess/Plugins/Netscape/NetscapePlugin.h \
-    WebProcess/Plugins/Netscape/NetscapePluginModule.h \
-    WebProcess/Plugins/Netscape/NetscapePluginStream.h \
     WebProcess/Plugins/Plugin.h \
     WebProcess/Plugins/PluginController.h \
     WebProcess/Plugins/PluginView.h \
@@ -585,11 +592,6 @@ SOURCES += \
     WebProcess/Plugins/Netscape/NPJSObject.cpp \
     WebProcess/Plugins/Netscape/NPRuntimeObjectMap.cpp \
     WebProcess/Plugins/Netscape/NPRuntimeUtilities.cpp \
-    WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp \
-    WebProcess/Plugins/Netscape/NetscapePlugin.cpp \
-    WebProcess/Plugins/Netscape/NetscapePluginModule.cpp \
-    WebProcess/Plugins/Netscape/NetscapePluginStream.cpp \
-    WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp \
     WebProcess/Plugins/Plugin.cpp \
     WebProcess/Plugins/PluginView.cpp \
     WebProcess/WebCoreSupport/WebChromeClient.cpp \
@@ -628,3 +630,19 @@ SOURCES += \
     WebProcess/qt/WebProcessMainQt.cpp \
     WebProcess/qt/WebProcessQt.cpp \
     $$WEBKIT2_GENERATED_SOURCES
+
+    !symbian: {
+            # TODO: Resolve compiler errors with NPEvent/QEvents on Symbian
+            INCLUDEPATH += $$WK2_DIR/WebProcess/Plugins/Netscape
+            HEADERS += \
+                $$WK2_DIR/WebProcess/Plugins/Netscape/NetscapePlugin.h \
+                $$WK2_DIR/WebProcess/Plugins/Netscape/NetscapePluginModule.h \
+                $$WK2_DIR/WebProcess/Plugins/Netscape/NetscapePluginStream.h
+
+            SOURCES += \
+                $$WK2_DIR/WebProcess/Plugins/Netscape/NetscapeBrowserFuncs.cpp \
+                $$WK2_DIR/WebProcess/Plugins/Netscape/NetscapePlugin.cpp \
+                $$WK2_DIR/WebProcess/Plugins/Netscape/NetscapePluginModule.cpp \
+                $$WK2_DIR/WebProcess/Plugins/Netscape/NetscapePluginStream.cpp \
+                $$WK2_DIR/WebProcess/Plugins/Netscape/qt/NetscapePluginQt.cpp
+    }

-- 
WebKit Debian packaging