[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[hausmann at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 0cde6f4ccc8a25c05babae3f45116816945282db
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 09:45:30 2010 +0000

    [Qt] Fix broken export macros in package builds.
    
    Reviewed by Tor Arne Vestbø.
    
    https://bugs.webkit.org/show_bug.cgi?id=33202
    
    Always define QT_MAKEDLL unless we're doing a static
    build or we're building inside of Qt. When building
    inside of Qt the correct define is pulled from qbase.pri.
    
    * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52792 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 768cf87..f52c441 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2010-01-05  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Fix broken export macros in package builds.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33202
+
+        Always define QT_MAKEDLL unless we're doing a static
+        build or we're building inside of Qt. When building
+        inside of Qt the correct define is pulled from qbase.pri.
+
+        * WebCore.pro:
+
 2010-01-04  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin Fisher.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index be7a576..e31866d 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -35,7 +35,6 @@ CONFIG(standalone_package) {
     PRECOMPILED_HEADER = $$PWD/../WebKit/qt/WebKit_pch.h
     DEFINES *= NDEBUG
 } else {
-    !static: DEFINES += QT_MAKEDLL
 
     CONFIG(debug, debug|release) {
         isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = generated$${QMAKE_DIR_SEP}debug
@@ -47,7 +46,10 @@ CONFIG(standalone_package) {
 
 }
 
-!CONFIG(QTDIR_build): DESTDIR = $$OUTPUT_DIR/lib
+!CONFIG(QTDIR_build) {
+    DESTDIR = $$OUTPUT_DIR/lib
+    !static: DEFINES += QT_MAKEDLL
+}
 
 GENERATED_SOURCES_DIR_SLASH = $$GENERATED_SOURCES_DIR${QMAKE_DIR_SEP}
 

-- 
WebKit Debian packaging