diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-12 13:25:09 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-12 13:25:09 (GMT) |
| commit | 05c1839531008d3cab40fb6fdaa22667c2133d7e (patch) | |
| tree | d13d25325b6b34311d30b8c396ffe99b06275e3f /dist | |
| parent | d39104d9b0ce43f872d2880baef8e1cff289adb8 (diff) | |
| parent | aeec06b844f21286fd228cbcc1cac7f5ea65e46b (diff) | |
| download | Qt-05c1839531008d3cab40fb6fdaa22667c2133d7e.zip Qt-05c1839531008d3cab40fb6fdaa22667c2133d7e.tar.gz Qt-05c1839531008d3cab40fb6fdaa22667c2133d7e.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6
Conflicts:
dist/changes-4.6.0
src/corelib/tools/qscopedpointer_p.h
src/gui/widgets/qlcdnumber.cpp
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/changes-4.6.0 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0 index 63822ab..a257c91 100644 --- a/dist/changes-4.6.0 +++ b/dist/changes-4.6.0 @@ -11,9 +11,9 @@ Some of the changes listed in this file include issue tracking numbers corresponding to tasks in the Qt Bug Tracker, the (now obsolete) Task Tracker, or the Merge Request queue of the public source repository. -Each of these identifiers can be entered in the tracker to obtain more -information about a particular change. Issue numbers for the various -trackers have the following formats: +Qt Bug Tracker: http://bugreports.qt.nokia.com +Task Tracker: http://qt.nokia.com/developer/task-tracker +Merge Request: http://qt.gitorious.org QTBUG-1234 - Qt Bug Tracker: http://bugreports.qt.nokia.com MR#1234 - Merge Request: http://qt.gitorious.org @@ -57,8 +57,6 @@ MR#1234 - Merge Request: http://qt.gitorious.org - New state machine framework added to QtCore. - - QContiguousCache - * New class for efficiently caching items within a scrolling view. Third party components ---------------------- @@ -611,7 +609,8 @@ QtWebKit * New functions for defining local URL schemes. - QWebSettings - * New options for text encoding and off-line web application cache (HTML5). + * New options for text encoding, printing shrink factor and off-line web + application cache (HTML5). - QWebView * Support for render hints. |