From f88ea80a68b285e84ce3fea98263548ae413d1d8 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Thu, 22 Apr 2010 16:27:06 +1000
Subject: Fix URL for Qt Bug Tracker.

---
 dist/changes-4.7.0 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index b9aa64d..d5b4672 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -8,11 +8,11 @@ The Qt version 4.7 series is binary compatible with the 4.6.x series.
 Applications compiled for 4.6 will continue to run with 4.7.
 
 Some of the changes listed in this file include issue tracking numbers
-corresponding to tasks in the Task Tracker:
+corresponding to tasks in the Qt Bug Tracker:
 
-  http://qt.nokia.com/developer/task-tracker
+  http://bugreports.qt.nokia.com/
 
-Each of these identifiers can be entered in the task tracker to obtain more
+Each of these identifiers can be entered in the bug tracker to obtain more
 information about a particular change.
 
 ****************************************************************************
-- 
cgit v0.12


From 1b3ddbf73ac4db4aa4a6cea4f09dc04644d03ca7 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Thu, 22 Apr 2010 16:59:10 +1000
Subject: Add new QDataStream version for Qt 4.8.

---
 src/corelib/io/qdatastream.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h
index 222ba8f..774c4bc 100644
--- a/src/corelib/io/qdatastream.h
+++ b/src/corelib/io/qdatastream.h
@@ -85,10 +85,11 @@ public:
         Qt_4_4 = 10,
         Qt_4_5 = 11,
         Qt_4_6 = 12,
-        Qt_4_7 = Qt_4_6
-#if QT_VERSION >= 0x040800
-#error Add the datastream version for this Qt version
+        Qt_4_7 = Qt_4_6,
         Qt_4_8 = Qt_4_7
+#if QT_VERSION >= 0x040900
+#error Add the datastream version for this Qt version
+        Qt_4_9 = Qt_4_8
 #endif
     };
 
-- 
cgit v0.12


From 59289f8ca93fd10def7227b298013a0a988e664c Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Thu, 22 Apr 2010 17:00:51 +1000
Subject: Revert "Add new QDataStream version for Qt 4.8."

This reverts commit 1b3ddbf73ac4db4aa4a6cea4f09dc04644d03ca7.
---
 src/corelib/io/qdatastream.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h
index 774c4bc..222ba8f 100644
--- a/src/corelib/io/qdatastream.h
+++ b/src/corelib/io/qdatastream.h
@@ -85,11 +85,10 @@ public:
         Qt_4_4 = 10,
         Qt_4_5 = 11,
         Qt_4_6 = 12,
-        Qt_4_7 = Qt_4_6,
-        Qt_4_8 = Qt_4_7
-#if QT_VERSION >= 0x040900
+        Qt_4_7 = Qt_4_6
+#if QT_VERSION >= 0x040800
 #error Add the datastream version for this Qt version
-        Qt_4_9 = Qt_4_8
+        Qt_4_8 = Qt_4_7
 #endif
     };
 
-- 
cgit v0.12


From 70bafa8e138d938fd34736c46b015d88b5d7feef Mon Sep 17 00:00:00 2001
From: Martin Smith <msmith@trolltech.com>
Date: Thu, 22 Apr 2010 12:06:53 +0200
Subject: qdoc: Updated the extra images variable again, for each
 manual.qdocconf.

And this time I also did it for qdeclarative.qdocconf
---
 tools/qdoc3/test/assistant.qdocconf    |  3 +--
 tools/qdoc3/test/designer.qdocconf     |  3 +--
 tools/qdoc3/test/linguist.qdocconf     |  3 +--
 tools/qdoc3/test/qdeclarative.qdocconf | 41 ++++++++++++++++++++++++++++++++--
 tools/qdoc3/test/qmake.qdocconf        |  3 +--
 5 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 65137f5..1deefce 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -16,8 +16,7 @@ qhp.Assistant.file                = assistant.qhp
 qhp.Assistant.namespace           = com.trolltech.assistant.470
 qhp.Assistant.virtualFolder       = qdoc
 qhp.Assistant.indexTitle          = Qt Assistant Manual
-qhp.Assistant.extraFiles          = index.html \
-				    images/api_examples.png \
+qhp.Assistant.extraFiles          = images/api_examples.png \
                              	    images/api_lookup.png \
                              	    images/api_topics.png \
                              	    images/bg_l_blank.png \
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index 69e3a90..513801a 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -16,8 +16,7 @@ qhp.Designer.file                = designer.qhp
 qhp.Designer.namespace           = com.trolltech.designer.470
 qhp.Designer.virtualFolder       = qdoc
 qhp.Designer.indexTitle          = Qt Designer Manual
-qhp.Designer.extraFiles          = index.html \
-				   images/api_examples.png \
+qhp.Designer.extraFiles          = images/api_examples.png \
                              	   images/api_lookup.png \
                              	   images/api_topics.png \
                              	   images/bg_l_blank.png \
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index e398d29..a3f4f00 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -16,8 +16,7 @@ qhp.Linguist.file                = linguist.qhp
 qhp.Linguist.namespace           = com.trolltech.linguist.470
 qhp.Linguist.virtualFolder       = qdoc
 qhp.Linguist.indexTitle          = Qt Linguist Manual
-qhp.Linguist.extraFiles          = index.html \
-				   images/api_examples.png \
+qhp.Linguist.extraFiles          = images/api_examples.png \
                              	   images/api_lookup.png \
                              	   images/api_topics.png \
                              	   images/bg_l_blank.png \
diff --git a/tools/qdoc3/test/qdeclarative.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index 03514c1..125a410 100644
--- a/tools/qdoc3/test/qdeclarative.qdocconf
+++ b/tools/qdoc3/test/qdeclarative.qdocconf
@@ -27,8 +27,45 @@ qhp.Qml.indexTitle          = Qml Reference
 
 # Files not referenced in any qdoc file
 # See also extraimages.HTML
-qhp.Qml.extraFiles          = classic.css \
-                             images/qt-logo.png
+qhp.Qml.extraFiles            = images/api_examples.png \
+                             	images/api_lookup.png \
+                             	images/api_topics.png \
+                             	images/bg_l_blank.png \
+			     	images/bg_ll_blank.png \
+                             	images/bg_ll.png \
+                             	images/bg_l.png \
+                             	images/bg_lr.png \
+                             	images/bg_r.png \
+                             	images/bg_ul_blank.png \
+                             	images/bg_ul.png \
+                             	images/bg_ur_blank.png \
+                             	images/bg_ur.png \
+			     	images/box_bg.png \
+                             	images/breadcrumb.png \
+                             	images/bullet_dn.png \
+                             	images/bullet_gt.png \
+                             	images/bullet_sq.png \
+                             	images/bullet_up.png \
+                             	images/coloreditorfactoryimage.png \
+                             	images/content_bg.png \
+                             	images/dynamiclayouts-example.png \
+                             	images/feedbackground.png \
+                             	images/form_bg.png \
+                             	images/horBar.png \
+                             	images/page_bg.png \
+                             	images/print.png \
+                             	images/qt_guide.png \
+                             	images/qt_icon.png \
+                             	images/qt-logo.png \
+                             	images/qt_ref_doc.png \
+                             	images/qt_tools.png \
+                             	images/sep.png \
+                             	images/sprites-combined.png \
+                             	images/stylesheet-coffee-plastique.png \
+                             	images/taskmenuextension-example.png \
+			     	scripts/functions.js \
+			     	scripts/jquery.js \
+                             	style/style.css
 
 qhp.Qml.filterAttributes    = qt 4.6.0 qtrefdoc
 qhp.Qml.customFilters.Qt.name = Qt 4.6.0
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index fbb59c0..f38a2a4 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -16,8 +16,7 @@ qhp.qmake.file                = qmake.qhp
 qhp.qmake.namespace           = com.trolltech.qmake.470
 qhp.qmake.virtualFolder       = qdoc
 qhp.qmake.indexTitle          = QMake Manual
-qhp.qmake.extraFiles          = index.html \
-				images/api_examples.png \
+qhp.qmake.extraFiles          = images/api_examples.png \
                              	images/api_lookup.png \
                              	images/api_topics.png \
                              	images/bg_l_blank.png \
-- 
cgit v0.12

