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

[andreas.kling at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit e1c572f6dd3598fe016099a188836162f5d04cae
Author: andreas.kling at nokia.com <andreas.kling at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Nov 15 21:46:36 2010 +0000

    2010-11-15  Andreas Kling  <kling at webkit.org>
    
            Reviewed by Tor Arne Vestbø.
    
            [Qt] Make WTF_USE_MEEGOTOUCH available for WebKit2 as well
    
            Move this into WebCore/features.pri which is used by both WebCore and WebKit2.
    
            * WebCore.pro:
            * features.pri:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@72034 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 28c21c4..44f7991 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-15  Andreas Kling  <kling at webkit.org>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Make WTF_USE_MEEGOTOUCH available for WebKit2 as well
+
+        Move this into WebCore/features.pri which is used by both WebCore and WebKit2.
+
+        * WebCore.pro:
+        * features.pri:
+
 2010-11-15  Martin Robinson  <mrobinson at igalia.com>
 
         Build fix for GTK+.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 84e2f2e..737304b 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2,10 +2,6 @@
 CONFIG += building-libs
 CONFIG += depend_includepath
 
-meegotouch {
-    DEFINES += WTF_USE_MEEGOTOUCH=1
-}
-
 v8:exists($$[QT_INSTALL_PREFIX]/src/3rdparty/v8/include/v8.h) {
     message(Using V8 with QtScript)
     QT += script
diff --git a/WebCore/features.pri b/WebCore/features.pri
index 28071ab..2076c04 100644
--- a/WebCore/features.pri
+++ b/WebCore/features.pri
@@ -8,6 +8,10 @@ CONFIG(production) {
     DEFINES += ENABLE_XSLT=0
 }
 
+meegotouch {
+    DEFINES += WTF_USE_MEEGOTOUCH=1
+}
+
 ## load mobilityconfig if mobility is available
 load(mobilityconfig, true)
 

-- 
WebKit Debian packaging