diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-07-10 01:17:51 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-07-10 01:17:51 (GMT) |
| commit | 9c13caa3c99af01a9b4c3ff6e178e7dadb61741f (patch) | |
| tree | b69df0a23c4628359fc3740e09958980eda7478e /src/3rdparty/webkit/WebCore/html/HTMLAttributeNames.in | |
| parent | bb1bdcab28e4c52dcea37dfaaa435045b1985eeb (diff) | |
| parent | 883da42f7c75775502c818aa456c8576d8457ff8 (diff) | |
| download | Qt-9c13caa3c99af01a9b4c3ff6e178e7dadb61741f.zip Qt-9c13caa3c99af01a9b4c3ff6e178e7dadb61741f.tar.gz Qt-9c13caa3c99af01a9b4c3ff6e178e7dadb61741f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv
Conflicts:
examples/itemviews/frozencolumn/main.cpp
src/declarative/canvas/qsimplecanvas.cpp
src/declarative/canvas/qsimplecanvas_p.h
src/declarative/canvas/qsimplecanvasitem.h
src/declarative/extra/qfxparticles.cpp
src/declarative/fx/fx.pri
src/declarative/fx/qfxblurfilter.h
src/declarative/fx/qfxcontentwrapper.cpp
src/declarative/fx/qfxflickable.cpp
src/declarative/fx/qfxfocuspanel.h
src/declarative/fx/qfxfocusrealm.h
src/declarative/fx/qfxhighlightfilter.cpp
src/declarative/fx/qfxhighlightfilter.h
src/declarative/fx/qfximage.cpp
src/declarative/fx/qfxitem.cpp
src/declarative/fx/qfxitem.h
src/declarative/fx/qfxrect.cpp
src/declarative/fx/qfxreflectionfilter.h
src/declarative/fx/qfxshadowfilter.cpp
src/declarative/fx/qfxshadowfilter.h
src/declarative/fx/qfxtext.cpp
src/declarative/fx/qfxtext.h
src/declarative/fx/qfxtextedit.cpp
src/declarative/opengl/glbasicshaders.h
src/declarative/test/qfxtestengine.cpp
src/declarative/test/qfxtestengine.h
src/declarative/test/qfxtestobjects.cpp
src/declarative/test/qfxtestobjects.h
src/declarative/test/qfxtestview.h
src/declarative/util/qfxglobal.h
src/declarative/util/qfxview.cpp
src/gui/graphicsview/qgraphicsitem_p.h
tools/qmlviewer/qmlviewer.cpp
Diffstat (limited to 'src/3rdparty/webkit/WebCore/html/HTMLAttributeNames.in')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/html/HTMLAttributeNames.in | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/WebCore/html/HTMLAttributeNames.in b/src/3rdparty/webkit/WebCore/html/HTMLAttributeNames.in index edd9511..a29d6d2 100644 --- a/src/3rdparty/webkit/WebCore/html/HTMLAttributeNames.in +++ b/src/3rdparty/webkit/WebCore/html/HTMLAttributeNames.in @@ -15,10 +15,13 @@ archive aria-activedescendant aria-checked aria-describedby +aria-disabled +aria-hidden aria-labeledby aria-labelledby aria-level aria-pressed +aria-readonly aria-valuemax aria-valuemin aria-valuenow @@ -67,7 +70,9 @@ direction disabled enctype end +expanded face +focused for frame frameborder @@ -80,6 +85,7 @@ hspace http_equiv id incremental +indeterminate ismap keytype label @@ -115,6 +121,8 @@ onbeforecut onbeforepaste onbeforeunload onblur +oncanplay +oncanplaythrough onchange onclick oncontextmenu @@ -128,6 +136,9 @@ ondragleave ondragover ondragstart ondrop +ondurationchange +onemptied +onended onerror onfocus oninput @@ -135,6 +146,9 @@ onkeydown onkeypress onkeyup onload +onloadeddata +onloadedmetadata +onloadstart onmousedown onmousemove onmouseout @@ -144,15 +158,27 @@ onmousewheel ononline onoffline onpaste +onpause +onplay +onplaying +onprogress +onratechange onreset onresize onscroll onsearch +onseeked +onseeking onselect onselectstart +onstalled onstorage +onsuspend onsubmit +ontimeupdate onunload +onvolumechange +onwaiting onwebkitanimationstart onwebkitanimationiteration onwebkitanimationend @@ -161,7 +187,9 @@ placeholder pluginurl poster precision +primary profile +progress prompt readonly rel @@ -179,6 +207,8 @@ scrolling selected shape size +sortable +sortdirection span spellcheck src |