Skip to content
Permalink
Browse files
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:

Canonical link: https://commits.webkit.org/51803@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@60780 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
eseidel committed Jun 7, 2010
1 parent dc529c5 commit 4803c789187dec0a0109ad915a867f2e59d242df
Showing 2 changed files with 20 additions and 7 deletions.
@@ -1,3 +1,15 @@
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>

Reviewed by Jeremy Orlow.
@@ -109,18 +109,19 @@ greaterThan(QT_MINOR_VERSION, 5) {
else:DEFINES += ENABLE_XSLT=0
}

!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
!lessThan(QT_MINOR_VERSION, 6): DEFINES += ENABLE_TOUCH_EVENTS=1

0 comments on commit 4803c78

Please sign in to comment.