summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-21 00:55:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-21 00:55:47 (GMT)
commit5942fcab9e3a0d2bc6d770e697518dc181f3a139 (patch)
tree8c69a29355c13274085afa82af119122eb2ef495 /dist
parentc12af169a157a5ba2e25289b996648a9a8e3cb9f (diff)
parentaf2df9e88705eeda2df5cdd46c5f7ec195facb8a (diff)
downloadQt-5942fcab9e3a0d2bc6d770e697518dc181f3a139.zip
Qt-5942fcab9e3a0d2bc6d770e697518dc181f3a139.tar.gz
Qt-5942fcab9e3a0d2bc6d770e697518dc181f3a139.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: (22 commits) 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 QApplication::closeAllWindows() should ignore windows being closed Examples: Fix compilation with namespace. Use QApplication::arguments() to check for command line args Added support for .rc files on VS2010. Doc: Updating CSS and JS ...
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