Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5

Conflicts:
	demos/embedded/fluidlauncher/pictureflow.cpp
	src/3rdparty/webkit/VERSION
	src/3rdparty/webkit/WebCore/ChangeLog
	src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp
	tests/auto/moc/os9-newlines.h
	tests/auto/qsqldatabase/tst_databases.h
	tools/xmlpatterns/main.h
	tools/xmlpatterns/qcoloringmessagehandler_p.h
	tools/xmlpatterns/qcoloroutput.cpp
	tools/xmlpatterns/qcoloroutput_p.h

1 files changed, 3 insertions, 3 deletions

diff --git a/doc/src/snippets/qstring/main.cpp b/doc/src/snippets/qstring/main.cpp
index 067c2ef..521817e 100644
--- a/doc/src/snippets/qstring/main.cpp
+++ b/doc/src/snippets/qstring/main.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -801,8 +801,8 @@ void Widget::toLongLongFunction()
 void Widget::toLowerFunction()
 {
 //! [75]
-    QString str = "TROlltECH";
-    str = str.toLower();        // str == "trolltech"
+    QString str = "Qt by NOKIA";
+    str = str.toLower();        // str == "qt by nokia"
 //! [75]
 }