summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Motoyoshi Kalland <kim.kalland@nokia.com>2010-09-24 12:27:34 +0200
committerJason McDonald <jason.mcdonald@nokia.com>2010-10-07 13:56:41 +1000
commitc770ad8124bce99b45bdbe72ebaa067fb17bf23d (patch)
tree1d6aa3647208c1bbe755562c76099090b68cb82a
parent6daecd573fb3663bf3f6305a8cf73bea52e7eede (diff)
Updated changes-4.7.1.
(cherry picked from commit bed3d1eca213f24dae13cbd4cda4df94d9f0738b)
-rw-r--r--dist/changes-4.7.14
1 files changed, 3 insertions, 1 deletions
diff --git a/dist/changes-4.7.1 b/dist/changes-4.7.1
index 7676368067..fdfecb7783 100644
--- a/dist/changes-4.7.1
+++ b/dist/changes-4.7.1
@@ -100,7 +100,9 @@ QtXmlPatterns
Qt Plugins
----------
-
+ - Jpeg image IO plugin
+ * [QTBUG-13653] Fixed infinite loop when loading jpeg without EOI marker
+ from memory.
****************************************************************************
* Platform Specific Changes *