summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/webkit/WebCore/workers/AbstractWorker.idl
diff options
context:
space:
mode:
authorAlexis Menard <alexis.menard@nokia.com>2009-12-07 13:55:23 +0100
committerAlexis Menard <alexis.menard@nokia.com>2009-12-07 13:55:23 +0100
commit211c0a1dd5c10c60c3383748b13e17e6bdeaea54 (patch)
tree268920a5f40744663dd4bf8d405d35d324926f95 /src/3rdparty/webkit/WebCore/workers/AbstractWorker.idl
parentfd44f52df9275e717292f5c7e90015fc9bf14603 (diff)
parent35a740fa663d4669a45ada9c37c46546e59bbb82 (diff)
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into widgets-ng
Diffstat (limited to 'src/3rdparty/webkit/WebCore/workers/AbstractWorker.idl')
-rw-r--r--src/3rdparty/webkit/WebCore/workers/AbstractWorker.idl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/workers/AbstractWorker.idl b/src/3rdparty/webkit/WebCore/workers/AbstractWorker.idl
index ae7ebc6cf..00b8fbb41 100644
--- a/src/3rdparty/webkit/WebCore/workers/AbstractWorker.idl
+++ b/src/3rdparty/webkit/WebCore/workers/AbstractWorker.idl
@@ -32,8 +32,8 @@ module threads {
interface [
Conditional=WORKERS,
- CustomMarkFunction,
CustomToJS,
+ EventTarget,
GenerateConstructor
] AbstractWorker {