Changeset 88253 in webkit


Ignore:
Timestamp:
Jun 7, 2011 12:17:41 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-06-07 Aravind Akella <​aravind.akella@nokia.com>

Reviewed by Laszlo Gombos.

[Qt][Symbian] API test failure qdeclarativewebview
​https://bugs.webkit.org/show_bug.cgi?id=59481

QML files cannot be loaded on Symbian due to difference
in capabilities between qmlwebkitplugin.dll and Qtwebkit.dll.
A PlatSec error that Qtwebkit.dll has "DRM AllFiles" capabilities
missing is observed when dynamically loading the QML plugin.

  • declarative/declarative.pro: Match capabilities in QtWebKit.pro.
  • symbian/platformplugin/platformplugin.pro: Match capabilities with the other 2 DLLs. Also remove TARGET.VID from platformplugin, as it's not used in any other Qt WebKit DLL, and causes build warnings about undefined VENDOR_VID.
  • tests/tests.pri: Add WriteDeviceData capability for API tests.
Location:
trunk/Source/WebKit/qt
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/qt/ChangeLog

    r88135 r88253  
     12011-06-07  Aravind Akella  <aravind.akella@nokia.com>
     2
     3        Reviewed by Laszlo Gombos.
     4
     5        [Qt][Symbian] API test failure qdeclarativewebview
     6        https://bugs.webkit.org/show_bug.cgi?id=59481
     7
     8        QML files cannot be loaded on Symbian due to difference
     9        in capabilities between qmlwebkitplugin.dll and Qtwebkit.dll. 
     10        A PlatSec error that Qtwebkit.dll has "DRM AllFiles" capabilities
     11        missing is observed when dynamically loading the QML plugin.
     12
     13        * declarative/declarative.pro: Match capabilities in QtWebKit.pro.
     14        * symbian/platformplugin/platformplugin.pro: Match capabilities with the other 2 DLLs.
     15        Also remove TARGET.VID from platformplugin, as it's not used in any other Qt WebKit DLL,
     16        and causes build warnings about undefined VENDOR_VID.
     17        * tests/tests.pri: Add WriteDeviceData capability for API tests.
     18
    1192011-06-04  Robert Hogan  <robert@webkit.org>
    220

  • trunk/Source/WebKit/qt/declarative/declarative.pro

    r76496 r88253  
    2929symbian: {
    3030    TARGET.EPOCALLOWDLLDATA=1
    31     TARGET.CAPABILITY = All -Tcb
     31    CONFIG(production) {
     32        TARGET.CAPABILITY = All -Tcb
     33    } else {
     34        TARGET.CAPABILITY = All -Tcb -DRM -AllFiles
     35    }
    3236    load(armcc_warnings)
    3337    TARGET = $$TARGET$${QT_LIBINFIX}

  • trunk/Source/WebKit/qt/symbian/platformplugin/platformplugin.pro

    r87044 r88253  
    4949
    5050symbian: {
    51 # EPOCALLOWDLLDATA have to set true because Qt macros has initialised global data
    5251    TARGET.EPOCALLOWDLLDATA=1
    53     TARGET.CAPABILITY = All -Tcb
     52    CONFIG(production) {
     53        TARGET.CAPABILITY = All -Tcb
     54    } else {
     55        TARGET.CAPABILITY = All -Tcb -DRM -AllFiles
     56    }
     57
    5458    TARGET.UID3 = 0x2002E674
    55     TARGET.VID = VID_DEFAULT
    5659    TARGET = $$TARGET$${QT_LIBINFIX}
    5760

  • trunk/Source/WebKit/qt/tests/tests.pri

    r84334 r88253  
    2727
    2828symbian {
    29     TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
     29    TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices WriteDeviceData
    3030}
    3131
Note: See TracChangeset for help on using the changeset viewer.