summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-21 10:32:32 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-21 10:32:32 (GMT)
commit6abd7066c7916fbafbf0b0b2b2a5fbbe8e017af9 (patch)
tree78dcb4f70bc8ebddcb776001079baa46b21b494e /dist
parentbe04377b22475772e376a51017855a00cc732e80 (diff)
parent04ad0950378fb4255064c10d5a4d64c1074035ed (diff)
downloadQt-6abd7066c7916fbafbf0b0b2b2a5fbbe8e017af9.zip
Qt-6abd7066c7916fbafbf0b0b2b2a5fbbe8e017af9.tar.gz
Qt-6abd7066c7916fbafbf0b0b2b2a5fbbe8e017af9.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) qdoc: Fixed html error, but the problem is still there. qdoc: Changed number of columns to 1. Oila! Doc: Changes to the HTMLGenerator, style and js remove dead code that will never get called. add bytes and activeTime to corelwan. Fix formating of license header. fix irix build clarify wording of warning message close scope while inside assignment only if the last char is a closing brace deprecate undocumented -E option use qtPrepareTool for qdoc unify QMAKE_QMAKE path separator fixing simplify arcane conditional, once again qdoc: Propagate the language information into the XML as before. Removed a change from the 4.7.0 change log. Improve look and feel of itemviews on mac doc: Fixed many broken links. doc: Fixed many broken links. update 4.7.0 changes QPushButton's click area exceeds the button area by far on Mac OS X ...
Diffstat (limited to 'dist')
-rw-r--r--dist/changes-4.7.08
1 files changed, 0 insertions, 8 deletions
diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index a57575e..34d002c 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -54,8 +54,6 @@ QtCore
* Significantly improved performance of the type() function
- QState
* [QTBUG-7741] Added a function to get the out-going transitions
- - QStateMachine
- * [QTBUG-8842] Reset history states when (re)starting machine
- QXmlStreamReader
* [QTBUG-9196] fixed crash when parsing
- QTimer
@@ -166,12 +164,6 @@ QtNetwork
* [QTBUG-2515] Do not make OpenSSL prompt for a password
* [QTBUG-6504, QTBUG-8924, QTBUG-5645] Fix memleak
-QtOpenGL
---------
- - QGLWidget
- * [QTBUG-7865] Fixed bug where GL widgets were not fully updated on
- Windows Vista/7 with Aero disabled.
-
QtScript
--------
- Updated src/3rdparty/javascriptcore to a more recent version