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

vestbo at webkit.org vestbo at webkit.org
Wed Dec 22 15:22:42 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit e4dd40efe9664e9ec751b67bb06bc357f91444e2
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Nov 2 12:08:12 2010 +0000

    [Qt] Don't include Objective-C sources in SOURCES
    
    Reviewed by Andreas Kling.
    
    * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71110 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fdc75b7..1fa372d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-02  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Don't include Objective-C sources in SOURCES
+
+        * WebCore.pro:
+
 2010-11-02  Pavel Podivilov  <podivilov at chromium.org>
 
         Reviewed by Pavel Feldman.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 2a8e22d..e2e98ab 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2780,11 +2780,11 @@ contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {
     
             mac {
                 SOURCES += \
-                    plugins/mac/PluginPackageMac.cpp \
-                    plugins/mac/PluginViewMac.mm
+                    plugins/mac/PluginPackageMac.cpp
                 OBJECTIVE_SOURCES += \
                     platform/text/mac/StringImplMac.mm \
-                    platform/mac/WebCoreNSStringExtras.mm
+                    platform/mac/WebCoreNSStringExtras.mm \
+                    plugins/mac/PluginViewMac.mm
                 INCLUDEPATH += platform/mac
                 # Note: XP_MACOSX is defined in npapi.h
             } else {

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list