[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 99d1dcd23b1a2cb84f636b5c363dd23890edea66
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Dec 21 12:39:48 2010 +0000

    2010-12-21  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Set BUILDING_QT__ consistently
            https://bugs.webkit.org/show_bug.cgi?id=51341
    
            * JavaScriptCore.pri: Remove the definition of BUILDING_QT__ as it
            is already defined in WebKit.pri.
    2010-12-21  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
    
            Reviewed by Andreas Kling.
    
            [Qt] Set BUILDING_QT__ consistently
            https://bugs.webkit.org/show_bug.cgi?id=51341
    
            * WebKit2.pro: Remove the definition of BUILDING_QT__ as it
            is already defined in WebKit.pri.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74407 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index fcd7e21..eb1be8b 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-21  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Set BUILDING_QT__ consistently
+        https://bugs.webkit.org/show_bug.cgi?id=51341
+
+        * JavaScriptCore.pri: Remove the definition of BUILDING_QT__ as it
+        is already defined in WebKit.pri.
+
 2010-12-20  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Oliver Hunt.
diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri
index 0590b94..7f553b9 100644
--- a/JavaScriptCore/JavaScriptCore.pri
+++ b/JavaScriptCore/JavaScriptCore.pri
@@ -53,7 +53,7 @@ INCLUDEPATH = \
 
 win32-*: DEFINES += _HAS_TR1=0
 
-DEFINES += BUILDING_QT__ BUILDING_JavaScriptCore BUILDING_WTF
+DEFINES += BUILDING_JavaScriptCore BUILDING_WTF
 
 # CONFIG += text_breaking_with_icu
 
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 7a438c0..2ecaacc 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-21  Laszlo Gombos  <laszlo.1.gombos at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] Set BUILDING_QT__ consistently
+        https://bugs.webkit.org/show_bug.cgi?id=51341
+
+        * WebKit2.pro: Remove the definition of BUILDING_QT__ as it
+        is already defined in WebKit.pri.
+
 2010-12-20  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 2b73af3..c5c17f7 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -161,8 +161,6 @@ INCLUDEPATH += \
 PREFIX_HEADER = $$PWD/../WebKit2/WebKit2Prefix.h
 QMAKE_CXXFLAGS += "-include $$PREFIX_HEADER"
 
-DEFINES += BUILDING_QT__
-
 WEBKIT2_GENERATED_HEADERS = \
     $$WEBKIT2_GENERATED_SOURCES_DIR/AuthenticationManagerMessages.h \
     $$WEBKIT2_GENERATED_SOURCES_DIR/DownloadProxyMessages.h \

-- 
WebKit Debian packaging