summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-06-19 15:34:46 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-06-19 15:34:46 (GMT)
commitcb8cfe965d9e5716e4ffc14b90c1fefaab53d126 (patch)
tree86b132fe663bc273694df6deb8780a81157a1d04 /dist
parent0ed2d865900312d3e85886c5e36867e633179a83 (diff)
parent96b4fc79fd4a7b4d9cdae924ccec5643e7a49cf0 (diff)
downloadQt-cb8cfe965d9e5716e4ffc14b90c1fefaab53d126.zip
Qt-cb8cfe965d9e5716e4ffc14b90c1fefaab53d126.tar.gz
Qt-cb8cfe965d9e5716e4ffc14b90c1fefaab53d126.tar.bz2
Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt
Merged webkit with -s ours as all the changes have been imported previously from the trunk. Conflicts: src/3rdparty/webkit/JavaScriptCore/ChangeLog src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/bindings/js/JSDOMBinding.cpp src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowBase.cpp src/3rdparty/webkit/WebCore/bindings/js/JSDOMWindowCustom.cpp src/3rdparty/webkit/WebCore/bindings/js/JSImageConstructor.cpp src/3rdparty/webkit/WebCore/bindings/js/JSMessageChannelConstructor.cpp src/3rdparty/webkit/WebCore/bindings/js/JSXMLHttpRequestConstructor.cpp src/3rdparty/webkit/WebCore/bindings/js/ScriptController.cpp src/3rdparty/webkit/WebCore/css/CSSParser.cpp src/3rdparty/webkit/WebCore/dom/Document.cpp src/3rdparty/webkit/WebCore/generated/JSAttr.cpp src/3rdparty/webkit/WebCore/generated/JSCharacterData.cpp src/3rdparty/webkit/WebCore/generated/JSDOMWindow.cpp src/3rdparty/webkit/WebCore/generated/JSDOMWindow.h src/3rdparty/webkit/WebCore/generated/JSDocument.cpp src/3rdparty/webkit/WebCore/generated/JSDocumentFragment.cpp src/3rdparty/webkit/WebCore/generated/JSElement.cpp src/3rdparty/webkit/WebCore/generated/JSEventTargetNode.cpp src/3rdparty/webkit/WebCore/generated/JSEventTargetNode.h src/3rdparty/webkit/WebCore/generated/JSXSLTProcessor.cpp src/3rdparty/webkit/WebCore/generated/JSXSLTProcessor.h src/3rdparty/webkit/WebCore/html/HTMLAppletElement.cpp src/3rdparty/webkit/WebCore/html/HTMLMediaElement.cpp src/3rdparty/webkit/WebCore/html/HTMLParser.cpp src/3rdparty/webkit/WebCore/html/HTMLParser.h src/3rdparty/webkit/WebCore/html/HTMLSelectElement.cpp src/3rdparty/webkit/WebCore/loader/FrameLoader.cpp src/3rdparty/webkit/WebCore/page/DOMWindow.idl src/3rdparty/webkit/WebCore/page/DragController.cpp
Diffstat (limited to 'dist')
-rw-r--r--dist/changes-4.5.24
1 files changed, 4 insertions, 0 deletions
diff --git a/dist/changes-4.5.2 b/dist/changes-4.5.2
index 91a7bef..163e476 100644
--- a/dist/changes-4.5.2
+++ b/dist/changes-4.5.2
@@ -55,6 +55,10 @@ General Improvements
Plugins (r41346, r43550, r43915, r43917, r43923)
Clipboard (r41360)
SVG (r43590, r43795)
+ * Backported various security fixes (r41262, r41568,
+ r41741, r41854, r42081, r42216, r42223, r42333,
+ r42365, r42532, r42533, r44010)
+
- QAbstractItemView
* [250754] Changing the font of the view did not update the size of the