[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[laszlo.1.gombos at nokia.com]

The following commit has been merged in the webkit-1.1 branch:
commit b939742920e17691543643cd75fc68e8843643a7
Author: laszlo.1.gombos at nokia.com <laszlo.1.gombos at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 20 20:24:03 2010 +0000

    2010-02-20  Noam Rosenthal  <noam.rosenthal at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt] ENABLE_3D_RENDERING should be optional
            https://bugs.webkit.org/show_bug.cgi?id=35100
    
            * WebKit.pri: ENABLE_3D_RENDERING moved to a proper feature test
    
    2010-02-20  Noam Rosenthal  <noam.rosenthal at nokia.com>
    
            Reviewed by Laszlo Gombos.
    
            [Qt] ENABLE_3D_RENDERING should be optional
            https://bugs.webkit.org/show_bug.cgi?id=35100
    
            No new tests: this is a build fix.
    
            * WebCore.pri: ENABLE_3D_RENDERING is now a proper feature test
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55056 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 15e28dc..7bcf76e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-02-20  Noam Rosenthal  <noam.rosenthal at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] ENABLE_3D_RENDERING should be optional
+        https://bugs.webkit.org/show_bug.cgi?id=35100
+
+        * WebKit.pri: ENABLE_3D_RENDERING moved to a proper feature test
+
 2010-02-19  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by David Levin.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 03426be..583a0d8 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-20  Noam Rosenthal  <noam.rosenthal at nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt] ENABLE_3D_RENDERING should be optional
+        https://bugs.webkit.org/show_bug.cgi?id=35100
+
+        No new tests: this is a build fix.
+
+        * WebCore.pri: ENABLE_3D_RENDERING is now a proper feature test
+
 2010-02-20  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Maciej Stachowiak.
diff --git a/WebCore/WebCore.pri b/WebCore/WebCore.pri
index ae73583..27f1bb6 100644
--- a/WebCore/WebCore.pri
+++ b/WebCore/WebCore.pri
@@ -55,6 +55,10 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
 !contains(DEFINES, ENABLE_RUBY=.): DEFINES += ENABLE_RUBY=1
 !contains(DEFINES, ENABLE_SANDBOX=.): DEFINES += ENABLE_SANDBOX=1
 
+greaterThan(QT_MINOR_VERSION, 5) {
+    !contains(DEFINES, ENABLE_3D_RENDERING=.): DEFINES += ENABLE_3D_RENDERING=1
+}
+
 # SVG support
 !contains(DEFINES, ENABLE_SVG=0) {
     !contains(DEFINES, ENABLE_SVG=.): DEFINES += ENABLE_SVG=1
diff --git a/WebKit.pri b/WebKit.pri
index e39500f..907a92c 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -50,7 +50,6 @@ building-libs {
     DEPENDPATH += $$PWD/WebKit/qt/Api
 }
 greaterThan(QT_MINOR_VERSION, 5):DEFINES += WTF_USE_ACCELERATED_COMPOSITING
-greaterThan(QT_MINOR_VERSION, 5):DEFINES += ENABLE_3D_RENDERING=1
 
 !mac:!unix|symbian {
     DEFINES += USE_SYSTEM_MALLOC

-- 
WebKit Debian packaging