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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit e9f5304a38514fe78086ed91407cf4962bd83dd5
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 06:21:50 2010 +0000

    2010-12-09  Qi Zhang  <qi.2.zhang at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] enable orientation flag when QtMobility available
            https://bugs.webkit.org/show_bug.cgi?id=50781
    
            When QtMobility available, enable orientation flag by default.
    
            * features.pri:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73687 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2812bb9..7262bc1 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-09  Qi Zhang  <qi.2.zhang at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] enable orientation flag when QtMobility available
+        https://bugs.webkit.org/show_bug.cgi?id=50781
+
+        When QtMobility available, enable orientation flag by default.
+
+        * features.pri:
+
 2010-12-09  Kenichi Ishibashi  <bashi at google.com>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/features.pri b/WebCore/features.pri
index 54377ef..82bb715 100644
--- a/WebCore/features.pri
+++ b/WebCore/features.pri
@@ -42,7 +42,6 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
 !contains(DEFINES, ENABLE_DOM_STORAGE=.): DEFINES += ENABLE_DOM_STORAGE=1
 !contains(DEFINES, ENABLE_ICONDATABASE=.): DEFINES += ENABLE_ICONDATABASE=1
 !contains(DEFINES, ENABLE_CHANNEL_MESSAGING=.): DEFINES += ENABLE_CHANNEL_MESSAGING=1
-!contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=0
 !contains(DEFINES, ENABLE_DIRECTORY_UPLOAD=.): DEFINES += ENABLE_DIRECTORY_UPLOAD=0
 !contains(DEFINES, ENABLE_FILE_SYSTEM=.): DEFINES += ENABLE_FILE_SYSTEM=0
 
@@ -121,6 +120,14 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) {
     }
 }
 
+# orientation support if QtMobility exists
+contains(MOBILITY_CONFIG, sensors) {
+   !contains(DEFINES, ENABLE_ORIENTATION_EVENTS=.): DEFINES += ENABLE_ORIENTATION_EVENTS=1
+   !contains(DEFINES, ENABLE_DEVICE_ORIENTATION=.): DEFINES += ENABLE_DEVICE_ORIENTATION=1
+   CONFIG *= mobility
+   MOBILITY *= sensors
+}
+
 # Bearer management is part of Qt 4.7
 # for older version, check for mobility with bearer
 !contains(DEFINES, ENABLE_QT_BEARER=.) {

-- 
WebKit Debian packaging