[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[ossy at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit e5a5ff2473d91fa03b412238ab36f331f0b78229
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 4 23:21:03 2010 +0000

    [Qt] Unreviewed buildfix after r55542 on Windows.
    
    * WebCore.pro:
     - plugins/win/PluginDatabaseWin.cpp removed.
     - platform/win/WebCoreInstanceHandle.cpp added.
    
    * platform/win/WebCoreInstanceHandle.cpp: Remove explicit qualification in namespace declaration to make gcc happy.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55556 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ad91a71..8aeabf0 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-04  Csaba Osztrogonác  <ossy at webkit.org>
+
+        [Qt] Unreviewed buildfix after r55542 on Windows.
+
+        * WebCore.pro:
+         - plugins/win/PluginDatabaseWin.cpp removed.
+         - platform/win/WebCoreInstanceHandle.cpp added.
+
+        * platform/win/WebCoreInstanceHandle.cpp: Remove explicit qualification in namespace declaration to make gcc happy.
+
 2010-03-04  Nate Chapin  <japhet at chromium.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 876d3eb..b30697f 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2148,12 +2148,12 @@ contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
             INCLUDEPATH += $$PWD/plugins/win \
                            $$PWD/platform/win
     
-            SOURCES += page/win/PageWin.cpp \
-                       plugins/win/PluginDatabaseWin.cpp \
+            SOURCES += plugins/win/PluginDatabaseWin.cpp \
                        plugins/win/PluginPackageWin.cpp \
                        plugins/win/PluginMessageThrottlerWin.cpp \
                        plugins/win/PluginViewWin.cpp \
-                       platform/win/BitmapInfo.cpp
+                       platform/win/BitmapInfo.cpp \
+                       platform/win/WebCoreInstanceHandle.cpp
     
             LIBS += \
                 -ladvapi32 \
diff --git a/WebCore/platform/win/WebCoreInstanceHandle.cpp b/WebCore/platform/win/WebCoreInstanceHandle.cpp
index 33ef931..dd21b2d 100644
--- a/WebCore/platform/win/WebCoreInstanceHandle.cpp
+++ b/WebCore/platform/win/WebCoreInstanceHandle.cpp
@@ -28,6 +28,6 @@
 
 namespace WebCore {
 
-HINSTANCE WebCore::s_instanceHandle;
+HINSTANCE s_instanceHandle;
 
 } // namespace WebCore

-- 
WebKit Debian packaging