summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-20 14:22:50 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-20 14:22:50 (GMT)
commit1108a20ee3e4190d58dce1efe0a0bf0b3f88491d (patch)
tree03b44a55a8488de19f234d500bf0144348e828e9
parent15f1eb3ad010dbfd0941ae32d657d4ddcc07b24e (diff)
parentea4ddcec8314fa9650fc103722f419627cc0af08 (diff)
downloadQt-1108a20ee3e4190d58dce1efe0a0bf0b3f88491d.zip
Qt-1108a20ee3e4190d58dce1efe0a0bf0b3f88491d.tar.gz
Qt-1108a20ee3e4190d58dce1efe0a0bf0b3f88491d.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add my 4.6.3 changes
-rw-r--r--dist/changes-4.6.321
1 files changed, 19 insertions, 2 deletions
diff --git a/dist/changes-4.6.3 b/dist/changes-4.6.3
index c109f21..88b4e72 100644
--- a/dist/changes-4.6.3
+++ b/dist/changes-4.6.3
@@ -40,6 +40,9 @@ Optimizations
QtCore
------
+ - QStateMachine
+ * [QTBUG-8842] Ensure history configuration is cleared when a state
+ machine is restarted
- QXmlStreamReader
* [QTBUG-9196] fixed crash when parsing
@@ -85,8 +88,22 @@ QtOpenGL
QtScript
--------
- - foo
- * bar
+ - [QTBUG-7066] Fixed regression introduced in 4.6.0 that made it not
+ possible to change the prototype of the global object
+ - [QTBUG-8366] Fixed regression introduced in 4.6.0 that caused the
+ instanceof operator to throw an error when the right-hand-side is
+ generated by QScriptEngine::newQMetaObject()
+ - [QTBUG-8400] Fixed memory leak when lazily binding QScriptValue to an
+ engine
+ - [QTBUG-9775] Fixed regression introduced in 4.6.0 that caused the
+ qsTr() function not to resolve the translation context correctly when
+ invoked in the global scope
+ - QScriptClass
+ * [QTBUG-8364] Fixed regression introduced in 4.6.0 that could cause
+ the Callable extension to crash
+ - QScriptEngine
+ * [QTBUG-6437] Fixed regression introduced in 4.6.0 that made
+ installTranslatorFunctions() not work with custom global object
QtSql
-----