Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master

Conflicts:
	src/corelib/thread/qthread_unix.cpp

1 files changed, 11 insertions, 11 deletions

diff --git a/doc/src/porting/qt4-tulip.qdoc b/doc/src/porting/qt4-tulip.qdoc
index 161c373..c78ff96 100644
--- a/doc/src/porting/qt4-tulip.qdoc
+++ b/doc/src/porting/qt4-tulip.qdoc
@@ -80,16 +80,16 @@
     addition to the C++ language that is implemented using the standard
     C++ preprocessor. The syntax is:
 
-    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 0
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.cpp 0
 
     Example:
 
-    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 1
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.cpp 1
 
     The iterator variable can also be defined outside the loop. For
     example:
 
-    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 2
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.cpp 2
 
     Just like standard \c for loops, foreach supports braces, \c
     break, \c continue, and nested loops. Qt makes a copy of the
@@ -124,25 +124,25 @@
 
     Traversing a container using a Java-style iterator:
 
-    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 3
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.cpp 3
 
     Modifying items using a Java-style iterator:
 
-    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 4
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.cpp 4
 
     Removing items using a Java-style iterator:
 
-    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 5
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.cpp 5
 
     Iterating over items with a particular value using STL-style vs.
     Java-style iterators:
 
-    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 6
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.cpp 6
 
     Modifying and removing items using STL-style vs. Java-style
     iterators:
 
-    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 7
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.cpp 7
 
     The next group of examples show the API of the container classes
     themselves. The API is similar to the QTL classes of Qt 3, but is nicer
@@ -151,16 +151,16 @@
     Iterating over a QList using an index (which is fast even for large
     lists, because QList is implemented as an array-list):
 
-    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 8
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.cpp 8
 
     Retrieving a value from a map, using a default value if the key
     doesn't exist:
 
-    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 9
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.cpp 9
 
     Getting all the values for a particular key in a QMultiMap or QMultiHash:
 
-    \snippet doc/src/snippets/code/doc_src_qt4-tulip.qdoc 10
+    \snippet doc/src/snippets/code/doc_src_qt4-tulip.cpp 10
 
     \section1 Comparison with Qt 3