Merge remote branch 'origin/4.8' into qa-review-master

Conflicts:
	tests/auto/qaccessibility/tst_qaccessibility.cpp
	tests/auto/qsslsocket/tst_qsslsocket.cpp

10 files changed, 32 insertions, 31 deletions

diff --git a/src/qt3support/text/q3richtext.cpp b/src/qt3support/text/q3richtext.cpp
index 668a322..6c77405 100644
--- a/src/qt3support/text/q3richtext.cpp
+++ b/src/qt3support/text/q3richtext.cpp
@@ -63,6 +63,7 @@
 #include "qstyleoption.h"
 #include "q3stylesheet.h"
 #include "qtextstream.h"
+#include <private/qtextdocument_p.h>
 #include <private/qtextengine_p.h>
 
 #include <stdlib.h>
diff --git a/src/qt3support/tools/q3asciidict.qdoc b/src/qt3support/tools/q3asciidict.qdoc
index e744633..c276682 100644
--- a/src/qt3support/tools/q3asciidict.qdoc
+++ b/src/qt3support/tools/q3asciidict.qdoc
@@ -43,7 +43,7 @@
     performace as a Q3AsciiDict.
 
     Example:
-    \snippet doc/src/snippets/code/doc_src_q3asciidict.qdoc 0
+    \snippet doc/src/snippets/code/doc_src_q3asciidict.cpp 0
     In this example we use a dictionary to keep track of the line
     edits we're using. We insert each line edit into the dictionary
     with a unique name and then access the line edits via the
@@ -164,7 +164,7 @@
     \a item may not be 0.
 
     Equivalent to:
-    \snippet doc/src/snippets/code/doc_src_q3asciidict.qdoc 1
+    \snippet doc/src/snippets/code/doc_src_q3asciidict.cpp 1
 
     If there are two or more items with equal keys, then the most
     recently inserted item will be replaced.
@@ -295,7 +295,7 @@
     iterator that operates on Q3AsciiDict\<X\> (dictionary of X*).
 
     Example:
-    \snippet doc/src/snippets/code/doc_src_q3asciidict.qdoc 2
+    \snippet doc/src/snippets/code/doc_src_q3asciidict.cpp 2
     In the example we insert some line edits into a dictionary, then
     iterate over the dictionary printing the strings associated with
     those line edits.
diff --git a/src/qt3support/tools/q3dict.qdoc b/src/qt3support/tools/q3dict.qdoc
index 6b221f1..8fcbba4 100644
--- a/src/qt3support/tools/q3dict.qdoc
+++ b/src/qt3support/tools/q3dict.qdoc
@@ -192,7 +192,7 @@
     \a item may not be 0.
 
     Equivalent to:
-    \snippet doc/src/snippets/code/doc_src_q3dict.qdoc 0
+    \snippet doc/src/snippets/code/doc_src_q3dict.cpp 0
 
     If there are two or more items with equal keys, then the last item
     that was inserted will be replaced.
@@ -326,7 +326,7 @@
     point to the next item in the (arbitrary) traversal order.
 
     Example:
-    \snippet doc/src/snippets/code/doc_src_q3dict.qdoc 1
+    \snippet doc/src/snippets/code/doc_src_q3dict.cpp 1
     In the example we insert some pointers to line edits into a
     dictionary, then iterate over the dictionary printing the strings
     associated with the line edits.
diff --git a/src/qt3support/tools/q3intdict.qdoc b/src/qt3support/tools/q3intdict.qdoc
index 684fc63..f108f30 100644
--- a/src/qt3support/tools/q3intdict.qdoc
+++ b/src/qt3support/tools/q3intdict.qdoc
@@ -39,7 +39,7 @@
     pointer. Dictionaries provide very fast insertion and lookup.
 
     Example:
-    \snippet doc/src/snippets/code/doc_src_q3intdict.qdoc 0
+    \snippet doc/src/snippets/code/doc_src_q3intdict.cpp 0
 
     See Q3Dict for full details, including the choice of dictionary
     size, and how deletions are handled. 
@@ -145,7 +145,7 @@
     \a item may not be 0.
 
     Equivalent to:
-    \snippet doc/src/snippets/code/doc_src_q3intdict.qdoc 1
+    \snippet doc/src/snippets/code/doc_src_q3intdict.cpp 1
 
     If there are two or more items with equal keys, then the most
     recently inserted item will be replaced.
@@ -270,7 +270,7 @@
     iterator that operates on Q3IntDict\<X\> (dictionary of X*).
 
     Example:
-    \snippet doc/src/snippets/code/doc_src_q3intdict.qdoc 2
+    \snippet doc/src/snippets/code/doc_src_q3intdict.cpp 2
 
     Note that the traversal order is arbitrary; you are not guaranteed the
     order shown above.
diff --git a/src/qt3support/tools/q3memarray.qdoc b/src/qt3support/tools/q3memarray.qdoc
index f05f433..5d6f9b2 100644
--- a/src/qt3support/tools/q3memarray.qdoc
+++ b/src/qt3support/tools/q3memarray.qdoc
@@ -51,7 +51,7 @@
     and less copying of data.
 
     Example:
-    \snippet doc/src/snippets/code/doc_src_q3memarray.qdoc 0
+    \snippet doc/src/snippets/code/doc_src_q3memarray.cpp 0
 
     Program output:
     \snippet doc/src/snippets/code/doc_src_q3memarray.qdoc 1
@@ -63,7 +63,7 @@
     the remaining bytes will typically be uninitialized, this can
     cause find() etc. to fail to find the element. Example:
 
-    \snippet doc/src/snippets/code/doc_src_q3memarray.qdoc 2
+    \snippet doc/src/snippets/code/doc_src_q3memarray.cpp 2
 
     To work around this, make sure that you use a struct where
     sizeof() returns the same as the sum of the sizes of the members
@@ -352,10 +352,10 @@
     allocating memory or copying data.
 
     Example I (intended use):
-    \snippet doc/src/snippets/code/doc_src_q3memarray.qdoc 3
+    \snippet doc/src/snippets/code/doc_src_q3memarray.cpp 3
 
     Example II (you don't want to do this):
-    \snippet doc/src/snippets/code/doc_src_q3memarray.qdoc 4
+    \snippet doc/src/snippets/code/doc_src_q3memarray.cpp 4
 
     \warning If you do not call resetRawData(), Q3MemArray will attempt
     to deallocate or reallocate the raw data, which might not be too
diff --git a/src/qt3support/tools/q3ptrdict.qdoc b/src/qt3support/tools/q3ptrdict.qdoc
index 8831a55..21dcdfd 100644
--- a/src/qt3support/tools/q3ptrdict.qdoc
+++ b/src/qt3support/tools/q3ptrdict.qdoc
@@ -39,7 +39,7 @@
     pointer. Dictionaries provide very fast insertion and lookup.
 
     Example:
-    \snippet doc/src/snippets/code/doc_src_q3ptrdict.qdoc 0
+    \snippet doc/src/snippets/code/doc_src_q3ptrdict.cpp 0
     In this example we use a dictionary to add an extra property (a
     char*) to the line edits we're using. 
 
@@ -147,7 +147,7 @@
     \a item may not be 0.
 
     Equivalent to
-    \snippet doc/src/snippets/code/doc_src_q3ptrdict.qdoc 1
+    \snippet doc/src/snippets/code/doc_src_q3ptrdict.cpp 1
 
     If there are two or more items with equal keys, then the most
     recently inserted item will be replaced.
@@ -272,7 +272,7 @@
     iterator that operates on Q3PtrDict\<X\> (dictionary of X*).
 
     Example:
-    \snippet doc/src/snippets/code/doc_src_q3ptrdict.qdoc 2
+    \snippet doc/src/snippets/code/doc_src_q3ptrdict.cpp 2
     In the example we insert some line edits into a dictionary,
     associating a string with each. We then iterate over the
     dictionary printing the associated strings.
diff --git a/src/qt3support/tools/q3ptrlist.qdoc b/src/qt3support/tools/q3ptrlist.qdoc
index 13e478e..e19d6bf 100644
--- a/src/qt3support/tools/q3ptrlist.qdoc
+++ b/src/qt3support/tools/q3ptrlist.qdoc
@@ -54,10 +54,10 @@
 
     \target example
     Example:
-    \snippet doc/src/snippets/code/doc_src_q3ptrlist.qdoc 0
+    \snippet doc/src/snippets/code/doc_src_q3ptrlist.cpp 0
 
     The output is
-    \snippet doc/src/snippets/code/doc_src_q3ptrlist.qdoc 1
+    \snippet doc/src/snippets/code/doc_src_q3ptrlist.cpp 1
 
     Q3PtrList has several member functions for traversing the list, but
     using a Q3PtrListIterator can be more practical. Multiple list
@@ -353,7 +353,7 @@
     auto-deletion\endlink is enabled.
 
     Equivalent to:
-    \snippet doc/src/snippets/code/doc_src_q3ptrlist.qdoc 2
+    \snippet doc/src/snippets/code/doc_src_q3ptrlist.cpp 2
 
     The item after the removed item becomes the new current list item
     if the removed item is not the last item in the list. If the last
@@ -785,10 +785,10 @@
     but it uses Q3PtrListIterator. The class Employee is
     defined there.
 
-    \snippet doc/src/snippets/code/doc_src_q3ptrlist.qdoc 3
+    \snippet doc/src/snippets/code/doc_src_q3ptrlist.cpp 3
 
     The output is
-    \snippet doc/src/snippets/code/doc_src_q3ptrlist.qdoc 4
+    \snippet doc/src/snippets/code/doc_src_q3ptrlist.cpp 4
 
     Using a list iterator is a more robust way of traversing the list
     than using the Q3PtrList member functions \link Q3PtrList::first()
diff --git a/src/qt3support/tools/q3valuelist.qdoc b/src/qt3support/tools/q3valuelist.qdoc
index 99f1634..a5ebf60 100644
--- a/src/qt3support/tools/q3valuelist.qdoc
+++ b/src/qt3support/tools/q3valuelist.qdoc
@@ -71,7 +71,7 @@
     prefer to use the STL-compatible functions.
 
     Example:
-    \snippet doc/src/snippets/code/doc_src_q3valuelist.qdoc 0
+    \snippet doc/src/snippets/code/doc_src_q3valuelist.cpp 0
 
 
     Notice that the latest changes to Mary's salary did not affect the
@@ -99,7 +99,7 @@
     (your application will crash or do unpredictable things). Use
     last() and first() with caution, for example:
 
-    \snippet doc/src/snippets/code/doc_src_q3valuelist.qdoc 1
+    \snippet doc/src/snippets/code/doc_src_q3valuelist.cpp 1
 
     Because Q3ValueList is value-based there is no need to be careful
     about deleting items in the list. The list holds its own copies
@@ -352,7 +352,7 @@
 
     Use the end() function instead. For example:
 
-    \snippet doc/src/snippets/code/doc_src_q3valuelist.qdoc 2
+    \snippet doc/src/snippets/code/doc_src_q3valuelist.cpp 2
 
 */
 
@@ -364,7 +364,7 @@
 
     Use the end() function instead. For example:
 
-    \snippet doc/src/snippets/code/doc_src_q3valuelist.qdoc 3
+    \snippet doc/src/snippets/code/doc_src_q3valuelist.cpp 3
 
 */
 
@@ -443,7 +443,7 @@
     iterator.
 
     Example (see Q3ValueList for the complete code):
-    \snippet doc/src/snippets/code/doc_src_q3valuelist.qdoc 4
+    \snippet doc/src/snippets/code/doc_src_q3valuelist.cpp 4
 
     Q3ValueList is highly optimized for performance and memory usage.
     This means that you must be careful: Q3ValueList does not know
diff --git a/src/qt3support/tools/q3valuestack.qdoc b/src/qt3support/tools/q3valuestack.qdoc
index 4ad0d7d..6c2c57b 100644
--- a/src/qt3support/tools/q3valuestack.qdoc
+++ b/src/qt3support/tools/q3valuestack.qdoc
@@ -44,7 +44,7 @@
     without removing it.
 
     Example:
-    \snippet doc/src/snippets/code/doc_src_q3valuestack.qdoc 0
+    \snippet doc/src/snippets/code/doc_src_q3valuestack.cpp 0
 
     Q3ValueStack is a specialized Q3ValueList provided for convenience.
     All of Q3ValueList's functionality also applies to Q3PtrStack, for
diff --git a/src/qt3support/tools/q3valuevector.qdoc b/src/qt3support/tools/q3valuevector.qdoc
index 58bd8e3..960bbac 100644
--- a/src/qt3support/tools/q3valuevector.qdoc
+++ b/src/qt3support/tools/q3valuevector.qdoc
@@ -70,10 +70,10 @@
     objects it contains.
 
     Example:
-    \snippet doc/src/snippets/code/doc_src_q3valuevector.qdoc 0
+    \snippet doc/src/snippets/code/doc_src_q3valuevector.cpp 0
 
     Program output:
-    \snippet doc/src/snippets/code/doc_src_q3valuevector.qdoc 1
+    \snippet doc/src/snippets/code/doc_src_q3valuevector.cpp 1
 
     As you can see, the most recent change to Joe's salary did not
     affect the value in the vector because the vector created a copy
@@ -102,13 +102,13 @@
     an element that does not exist (your application will probably
     crash). For example:
 
-    \snippet doc/src/snippets/code/doc_src_q3valuevector.qdoc 2
+    \snippet doc/src/snippets/code/doc_src_q3valuevector.cpp 2
 
     Whenever inserting, removing or referencing elements in a vector,
     always make sure you are referring to valid positions. For
     example:
 
-    \snippet doc/src/snippets/code/doc_src_q3valuevector.qdoc 3
+    \snippet doc/src/snippets/code/doc_src_q3valuevector.cpp 3
 
     The iterators provided by vector are random access iterators,
     therefore you can use them with many generic algorithms, for
@@ -127,7 +127,7 @@
     application will crash or do unpredictable things). Use back() and
     front() with caution, for example:
 
-    \snippet doc/src/snippets/code/doc_src_q3valuevector.qdoc 4
+    \snippet doc/src/snippets/code/doc_src_q3valuevector.cpp 4
 
     Because Q3ValueVector manages memory dynamically, it is recommended
     that you contruct a vector with an initial size. Inserting and