summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-11-11 03:20:46 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-11-11 03:20:46 (GMT)
commitba476d7f31ba609110508d294be7da4f46459d2a (patch)
tree612c3c6c8996ec9b2793cc8c97d867136a1b6cf8
parent975c439ef2068a48994da07b827ce835c002bfee (diff)
parent4f434ffe541f2e98d6c47fd48a588807f1a231e9 (diff)
downloadQt-ba476d7f31ba609110508d294be7da4f46459d2a.zip
Qt-ba476d7f31ba609110508d294be7da4f46459d2a.tar.gz
Qt-ba476d7f31ba609110508d294be7da4f46459d2a.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts: dist/changes-4.6.0
-rw-r--r--dist/changes-4.6.013
1 files changed, 8 insertions, 5 deletions
diff --git a/dist/changes-4.6.0 b/dist/changes-4.6.0
index 08ca066..fee8729 100644
--- a/dist/changes-4.6.0
+++ b/dist/changes-4.6.0
@@ -11,12 +11,13 @@ 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.
-Qt Bug Tracker: http://bugreports.qt.nokia.com
-Task Tracker: http://qt.nokia.com/developer/task-tracker
-Merge Request: http://qt.gitorious.org
+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:
-Each of these identifiers can be entered in the task tracker to obtain more
-information about a particular change.
+QTBUG-1234 - Qt Bug Tracker: http://bugreports.qt.nokia.com
+MR#1234 - Merge Request: http://qt.gitorious.org
+123456 - Task Tracker: http://qt.nokia.com/developer/task-tracker
****************************************************************************
* General *
@@ -56,6 +57,8 @@ information about a particular change.
- New state machine framework added to QtCore.
+ - QContiguousCache
+ * New class for efficiently caching items within a scrolling view.
Third party components
----------------------