Title: [88253] trunk/Source/WebKit/qt
- Revision
- 88253
- Author
- [email protected]
- Date
- 2011-06-07 12:17:41 -0700 (Tue, 07 Jun 2011)
Log Message
2011-06-07 Aravind Akella <[email protected]>
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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (88252 => 88253)
--- trunk/Source/WebKit/qt/ChangeLog 2011-06-07 19:09:02 UTC (rev 88252)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-06-07 19:17:41 UTC (rev 88253)
@@ -1,3 +1,21 @@
+2011-06-07 Aravind Akella <[email protected]>
+
+ 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.
+
2011-06-04 Robert Hogan <[email protected]>
Reviewed by Andreas Kling.
Modified: trunk/Source/WebKit/qt/declarative/declarative.pro (88252 => 88253)
--- trunk/Source/WebKit/qt/declarative/declarative.pro 2011-06-07 19:09:02 UTC (rev 88252)
+++ trunk/Source/WebKit/qt/declarative/declarative.pro 2011-06-07 19:17:41 UTC (rev 88253)
@@ -28,7 +28,11 @@
symbian: {
TARGET.EPOCALLOWDLLDATA=1
- TARGET.CAPABILITY = All -Tcb
+ CONFIG(production) {
+ TARGET.CAPABILITY = All -Tcb
+ } else {
+ TARGET.CAPABILITY = All -Tcb -DRM -AllFiles
+ }
load(armcc_warnings)
TARGET = $$TARGET$${QT_LIBINFIX}
}
Modified: trunk/Source/WebKit/qt/symbian/platformplugin/platformplugin.pro (88252 => 88253)
--- trunk/Source/WebKit/qt/symbian/platformplugin/platformplugin.pro 2011-06-07 19:09:02 UTC (rev 88252)
+++ trunk/Source/WebKit/qt/symbian/platformplugin/platformplugin.pro 2011-06-07 19:17:41 UTC (rev 88253)
@@ -48,11 +48,14 @@
DESTDIR = $$OUTPUT_DIR/plugins/$$TARGETPATH
symbian: {
-# EPOCALLOWDLLDATA have to set true because Qt macros has initialised global data
TARGET.EPOCALLOWDLLDATA=1
- TARGET.CAPABILITY = All -Tcb
+ CONFIG(production) {
+ TARGET.CAPABILITY = All -Tcb
+ } else {
+ TARGET.CAPABILITY = All -Tcb -DRM -AllFiles
+ }
+
TARGET.UID3 = 0x2002E674
- TARGET.VID = VID_DEFAULT
TARGET = $$TARGET$${QT_LIBINFIX}
LIBS += -lcone -leikcore -lavkon
Modified: trunk/Source/WebKit/qt/tests/tests.pri (88252 => 88253)
--- trunk/Source/WebKit/qt/tests/tests.pri 2011-06-07 19:09:02 UTC (rev 88252)
+++ trunk/Source/WebKit/qt/tests/tests.pri 2011-06-07 19:17:41 UTC (rev 88253)
@@ -26,7 +26,7 @@
QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
symbian {
- TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices
+ TARGET.CAPABILITY = ReadUserData WriteUserData NetworkServices WriteDeviceData
}
# Use the Qt Mobile theme if it is in the CONFIG
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
