Changeset 60780 in webkit

Timestamp:

Jun 7, 2010 7:29:12 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-06-07 Mahesh Kulakrni <​mahesh.kulkarni@nokia.com>

Reviewed by Simon Hausmann.

[QT] QT_BEARER flag is not enabled on S60 properly
​https://bugs.webkit.org/show_bug.cgi?id=39357

enable QT_BEARER for all platform based on qtmobility +
bearer module availability or for qt 4.7+

• WebCore.pri:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pri (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-06-07  Mahesh Kulakrni  <mahesh.kulkarni@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [QT] QT_BEARER flag is not enabled on S60 properly
+        https://bugs.webkit.org/show_bug.cgi?id=39357
+
+        enable QT_BEARER for all platform based on qtmobility + 
+        bearer module availability or for qt 4.7+
+
+        * WebCore.pri: 
+
 2010-06-07  Leon Clarke  <leonclarke@google.com>
 

trunk/WebCore/WebCore.pri

@@ -110 +110 @@
 }
 
-!CONFIG(QTDIR_build):!contains(DEFINES, ENABLE_QT_BEARER=.) {
-    symbian: {
-        exists($${EPOCROOT}epoc32/release/winscw/udeb/QtBearer.lib)| \
-        exists($${EPOCROOT}epoc32/release/armv5/lib/QtBearer.lib) {
+# Bearer management is part of Qt 4.7
+# for older version, check for mobility with bearer 
+!contains(DEFINES, ENABLE_QT_BEARER=.) {
+     !lessThan(QT_MINOR_VERSION, 7) {
+        DEFINES += ENABLE_QT_BEARER=1
+     } else {
+        load(mobilityconfig)
+        contains(MOBILITY_CONFIG, bearer) {
             DEFINES += ENABLE_QT_BEARER=1
         }
     }
 }
-
-# Bearer management is part of Qt 4.7
-!lessThan(QT_MINOR_VERSION, 7):!contains(DEFINES, ENABLE_QT_BEARER=.):DEFINES += ENABLE_QT_BEARER=1
 
 # Enable touch event support with Qt 4.6