[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 5fd1100859cf7889cf34988dfbd1e029f70c7f7f
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Dec 11 09:10:24 2010 +0000

    2010-12-11  Sheriff Bot  <webkit.review.bot at gmail.com>
    
            Unreviewed, rolling out r73834.
            http://trac.webkit.org/changeset/73834
            https://bugs.webkit.org/show_bug.cgi?id=50866
    
            It broke Qt-WebKit2 build, because of missing WK2_DIR variable
            (Requested by Ossy on #webkit).
    
            * WebKit2.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73847 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index ca1fe7b..7ec8aee 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-11  Sheriff Bot  <webkit.review.bot at gmail.com>
+
+        Unreviewed, rolling out r73834.
+        http://trac.webkit.org/changeset/73834
+        https://bugs.webkit.org/show_bug.cgi?id=50866
+
+        It broke Qt-WebKit2 build, because of missing WK2_DIR variable
+        (Requested by Ossy on #webkit).
+
+        * WebKit2.pro:
+
 2010-12-10  Siddharth Mathur  <siddharth.mathur at nokia.com>
 
         Reviewed by Eric Seidel.
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index fc9e54f..a35a1cc 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -23,22 +23,11 @@ CONFIG += staticlib
 TARGET = $$WEBKIT2_TARGET
 DESTDIR = $$WEBKIT2_DESTDIR
 
-!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"
+!CONFIG(release, debug|release) {
+    OBJECTS_DIR = obj/debug
+} else { # Release
+    OBJECTS_DIR = obj/release
+    DEFINES += NDEBUG
 }
 
 # Build both debug and release configurations
@@ -391,6 +380,10 @@ 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 \
@@ -592,6 +585,11 @@ 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 \
@@ -630,19 +628,3 @@ 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