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

commit-queue at webkit.org commit-queue at webkit.org
Wed Dec 22 18:16:40 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 6ef982cd5b47cb9eed4fd998754c019dd9475370
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 9 11:12:48 2010 +0000

    2010-12-09  Siddharth Mathur  <siddharth.mathur at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            Use BUILDING_WEBKIT like other ports
            https://bugs.webkit.org/show_bug.cgi?id=50713
    
            * WebCore.pro: Change BUILD_WEBKIT to BUILDING_WEBKIT
    2010-12-09  Siddharth Mathur  <siddharth.mathur at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            Use BUILDING_WEBKIT like other ports
            https://bugs.webkit.org/show_bug.cgi?id=50713
    
            * Api/qwebkitglobal.h: change BUILD_WEBKIT to BUILDING_WEBKIT
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73602 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 63a6f17..551ce33 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-09  Siddharth Mathur  <siddharth.mathur at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        Use BUILDING_WEBKIT like other ports
+        https://bugs.webkit.org/show_bug.cgi?id=50713
+
+        * WebCore.pro: Change BUILD_WEBKIT to BUILDING_WEBKIT
+
 2010-12-08  Erik Arvidsson  <arv at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 0f88538..0eaff5a 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -125,7 +125,7 @@ CONFIG(release):!CONFIG(standalone_package) {
     unix:contains(QT_CONFIG, reduce_relocations):CONFIG += bsymbolic_functions
 }
 
-DEFINES += BUILD_WEBKIT
+DEFINES += BUILDING_WEBKIT
 
 # Remove whole program optimizations due to miscompilations
 win32-msvc2005|win32-msvc2008|wince*:{
diff --git a/WebKit/qt/Api/qwebkitglobal.h b/WebKit/qt/Api/qwebkitglobal.h
index a6be571..7ee56de 100644
--- a/WebKit/qt/Api/qwebkitglobal.h
+++ b/WebKit/qt/Api/qwebkitglobal.h
@@ -29,7 +29,7 @@
 #define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch))
 
 #if defined(QT_MAKEDLL)        /* create a Qt DLL library */
-#  if defined(BUILD_WEBKIT)
+#  if defined(BUILDING_WEBKIT)
 #      define QWEBKIT_EXPORT Q_DECL_EXPORT
 #  else
 #      define QWEBKIT_EXPORT Q_DECL_IMPORT
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index dbdadf4..bd964b7 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-09  Siddharth Mathur  <siddharth.mathur at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        Use BUILDING_WEBKIT like other ports
+        https://bugs.webkit.org/show_bug.cgi?id=50713
+
+        * Api/qwebkitglobal.h: change BUILD_WEBKIT to BUILDING_WEBKIT
+
 2010-12-08  Qi Zhang  <qi.2.zhang at nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list