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

16 files changed, 54 insertions, 54 deletions

diff --git a/doc/src/snippets/code/doc_src_examples_activeqt_menus.qdoc b/doc/src/snippets/code/doc_src_examples_activeqt_menus.qdoc
index 18849dd..8c9165a 100644
--- a/doc/src/snippets/code/doc_src_examples_activeqt_menus.qdoc
+++ b/doc/src/snippets/code/doc_src_examples_activeqt_menus.qdoc
@@ -1,6 +1,6 @@
 //! [0]
 <object ID="QMenus" CLASSID="CLSID:4dc3f340-a6f7-44e4-a79b-3e9217695fbd"
-CODEBASE="http://qtsoftware.com/demos/menusax.cab">
+CODEBASE="http://qt.nokia.com/demos/menusax.cab">
 [Object not available! Did you forget to build and register the server?]
 </object>
 //! [0]
diff --git a/doc/src/snippets/code/doc_src_qtxml.qdoc b/doc/src/snippets/code/doc_src_qtxml.qdoc
index f5dc5a5..11b1fb0 100644
--- a/doc/src/snippets/code/doc_src_qtxml.qdoc
+++ b/doc/src/snippets/code/doc_src_qtxml.qdoc
@@ -19,13 +19,13 @@ QT += xml
 
 
 //! [4]
-<document xmlns:book = 'http://qtsoftware.com/fnord/book/'
-          xmlns      = 'http://qtsoftware.com/fnord/' >
+<document xmlns:book = 'http://example.com/fnord/book/'
+          xmlns      = 'http://example.com/fnord/' >
 //! [4]
 
 
 //! [5]
-<author xmlns:fnord = 'http://qtsoftware.com/fnord/'
+<author xmlns:fnord = 'http://example.com/fnord/'
              title="Ms" 
              fnord:title="Goddess" 
              name="Eris Kallisti"/>
@@ -51,21 +51,21 @@ QT += xml
 
 
 //! [8]
-xmlns="http://qtsoftware.com/fnord/"
+xmlns="http://example.com/fnord/"
 //! [8]
 
 
 //! [9]
-xmlns:book="http://qtsoftware.com/fnord/book/"
+xmlns:book="http://example.com/fnord/book/"
 //! [9]
 
 
 //! [10]
-<document xmlns:book = 'http://qtsoftware.com/fnord/book/'
-          xmlns      = 'http://qtsoftware.com/fnord/' >
+<document xmlns:book = 'http://example.com/fnord/book/'
+          xmlns      = 'http://example.com/fnord/' >
 <book>
   <book:title>Practical XML</book:title>
-  <book:author xmlns:fnord = 'http://qtsoftware.com/fnord/'
+  <book:author xmlns:fnord = 'http://example.com/fnord/'
                title="Ms"
                fnord:title="Goddess"
                name="Eris Kallisti"/>
diff --git a/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp b/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp
index 94b0da8..219fb70 100644
--- a/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp
+++ b/doc/src/snippets/code/src_activeqt_container_qaxbase.cpp
@@ -105,12 +105,12 @@ ctrl->setControl("DOMAIN/user:password@server/{8E27C92B-1264-101C-8A2F-040224009
 
 
 //! [15]
-activeX->dynamicCall("Navigate(const QString&)", "qtsoftware.com");
+activeX->dynamicCall("Navigate(const QString&)", "qt.nokia.com");
 //! [15]
 
 
 //! [16]
-activeX->dynamicCall("Navigate(\"qtsoftware.com\")");
+activeX->dynamicCall("Navigate(\"qt.nokia.com\")");
 //! [16]
 
 
diff --git a/doc/src/snippets/code/src_corelib_io_qurl.cpp b/doc/src/snippets/code/src_corelib_io_qurl.cpp
index 95de86c..c058e4b 100644
--- a/doc/src/snippets/code/src_corelib_io_qurl.cpp
+++ b/doc/src/snippets/code/src_corelib_io_qurl.cpp
@@ -5,7 +5,7 @@ QUrl url("http://www.example.com/List of holidays.xml");
 
 
 //! [1]
-QUrl url = QUrl::fromEncoded("http://qtsoftware.com/List%20of%20holidays.xml");
+QUrl url = QUrl::fromEncoded("http://qt.nokia.com/List%20of%20holidays.xml");
 //! [1]
 
 
@@ -33,10 +33,10 @@ http://www.example.com/cgi-bin/drawgraph.cgi?type-pie/color-green
 
 
 //! [5]
-QUrl baseUrl("http://qtsoftware.com/support");
+QUrl baseUrl("http://qt.nokia.com/support");
 QUrl relativeUrl("../products/solutions");
 qDebug(baseUrl.resolved(relativeUrl).toString());
-// prints "http://qtsoftware.com/products/solutions"
+// prints "http://qt.nokia.com/products/solutions"
 //! [5]
 
 
diff --git a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
index 3c5b413..c113b72 100644
--- a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
+++ b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
@@ -211,14 +211,14 @@ ba.lastIndexOf("X");        // returns -1
 
 
 //! [25]
-QByteArray url("ftp://ftp.trolltech.com/");
+QByteArray url("ftp://ftp.qt.nokia.com/");
 if (url.startsWith("ftp:"))
     ...
 //! [25]
 
 
 //! [26]
-QByteArray url("http://qtsoftware.com/index.html");
+QByteArray url("http://qt.nokia.com/index.html");
 if (url.endsWith(".html"))
     ...
 //! [26]
@@ -246,16 +246,16 @@ QByteArray z = x.mid(5);        // z == "pineapples"
 
 
 //! [30]
-QByteArray x("TROlltECH");
+QByteArray x("Qt by NOKIA");
 QByteArray y = x.toLower();
-// y == "trolltech"
+// y == "qt by nokia"
 //! [30]
 
 
 //! [31]
-QByteArray x("TROlltECH");
+QByteArray x("Qt by NOKIA");
 QByteArray y = x.toUpper();
-// y == "TROLLTECH"
+// y == "QT BY NOKIA"
 //! [31]
 
 
diff --git a/doc/src/snippets/code/src_corelib_tools_qregexp.cpp b/doc/src/snippets/code/src_corelib_tools_qregexp.cpp
index ae25885..a456f85 100644
--- a/doc/src/snippets/code/src_corelib_tools_qregexp.cpp
+++ b/doc/src/snippets/code/src_corelib_tools_qregexp.cpp
@@ -88,7 +88,7 @@ while (pos >= 0) {
 
 
 //! [10]
-str = "Nokia Corporation and/or its subsidiary(-ies)\tqtsoftware.com\tNorway";
+str = "Nokia Corporation and/or its subsidiary(-ies)\tqt.nokia.com\tNorway";
 QString company, web, country;
 rx.setPattern("^([^\t]+)\t([^\t]+)\t([^\t]+)$");
 if (rx.indexIn(str) != -1) {
diff --git a/doc/src/snippets/code/src_gui_painting_qpainter.cpp b/doc/src/snippets/code/src_gui_painting_qpainter.cpp
index 611daae..536473c 100644
--- a/doc/src/snippets/code/src_gui_painting_qpainter.cpp
+++ b/doc/src/snippets/code/src_gui_painting_qpainter.cpp
@@ -173,7 +173,7 @@ painter.drawPixmap(target, image, source);
 
 //! [17]
 QPainter painter(this);
-painter.drawText(rect, Qt::AlignCenter, tr("Qt by\nTrolltech"));
+painter.drawText(rect, Qt::AlignCenter, tr("Qt by\nNokia"));
 //! [17]
 
 
diff --git a/doc/src/snippets/code/src_network_access_qftp.cpp b/doc/src/snippets/code/src_network_access_qftp.cpp
index 25e3da3..4230d56 100644
--- a/doc/src/snippets/code/src_network_access_qftp.cpp
+++ b/doc/src/snippets/code/src_network_access_qftp.cpp
@@ -1,12 +1,12 @@
 //! [0]
 QFtp *ftp = new QFtp(parent);
-ftp->connectToHost("ftp.trolltech.com");
+ftp->connectToHost("ftp.qt.nokia.com");
 ftp->login();
 //! [0]
 
 
 //! [1]
-ftp->connectToHost("ftp.trolltech.com");  // id == 1
+ftp->connectToHost("ftp.qt.nokia.com");   // id == 1
 ftp->login();                             // id == 2
 ftp->cd("qt");                            // id == 3
 ftp->get("INSTALL");                      // id == 4
diff --git a/doc/src/snippets/code/src_network_access_qhttp.cpp b/doc/src/snippets/code/src_network_access_qhttp.cpp
index 57698a0..d6e814b 100644
--- a/doc/src/snippets/code/src_network_access_qhttp.cpp
+++ b/doc/src/snippets/code/src_network_access_qhttp.cpp
@@ -11,14 +11,14 @@ QString contentType = header.value("content-type");
 
 //! [2]
 QHttpRequestHeader header("GET", QUrl::toPercentEncoding("/index.html"));
-header.setValue("Host", "qtsoftware.com");
-http->setHost("qtsoftware.com");
+header.setValue("Host", "qt.nokia.com");
+http->setHost("qt.nokia.com");
 http->request(header);
 //! [2]
 
 
 //! [3]
-http->setHost("qtsoftware.com");                // id == 1
+http->setHost("qt.nokia.com");                // id == 1
 http->get(QUrl::toPercentEncoding("/index.html")); // id == 2
 //! [3]
 
diff --git a/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp b/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp
index 0ef0a3b..48db4cb 100644
--- a/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp
+++ b/doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp
@@ -3,13 +3,13 @@ QNetworkAccessManager *manager = new QNetworkAccessManager(this);
 connect(manager, SIGNAL(finished(QNetworkReply*)),
         this, SLOT(replyFinished(QNetworkReply*)));
 
-manager->get(QNetworkRequest(QUrl("http://qtsoftware.com")));
+manager->get(QNetworkRequest(QUrl("http://qt.nokia.com")));
 //! [0]
 
 
 //! [1]
 QNetworkRequest request;
-request.setUrl(QUrl("http://qtsoftware.com"));
+request.setUrl(QUrl("http://qt.nokia.com"));
 request.setRawHeader("User-Agent", "MyOwnBrowser 1.0");
 
 QNetworkReply *reply = manager->get(request);
diff --git a/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp b/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp
index e748f90..b96a777 100644
--- a/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp
+++ b/doc/src/snippets/code/src_network_kernel_qhostinfo.cpp
@@ -1,6 +1,6 @@
 //! [0]
-// To find the IP address of qtsoftware.com
-QHostInfo::lookupHost("qtsoftware.com",
+// To find the IP address of qt.nokia.com
+QHostInfo::lookupHost("qt.nokia.com",
                       this, SLOT(printResults(QHostInfo)));
 
 // To find the host name for 4.2.2.1
@@ -10,7 +10,7 @@ QHostInfo::lookupHost("4.2.2.1",
 
 
 //! [1]
-QHostInfo info = QHostInfo::fromName("qtsoftware.com");
+QHostInfo info = QHostInfo::fromName("qt.nokia.com");
 //! [1]
 
 
diff --git a/doc/src/snippets/code/src_qt3support_network_q3ftp.cpp b/doc/src/snippets/code/src_qt3support_network_q3ftp.cpp
index 37e17d4..b5ff0c3 100644
--- a/doc/src/snippets/code/src_qt3support_network_q3ftp.cpp
+++ b/doc/src/snippets/code/src_qt3support_network_q3ftp.cpp
@@ -1,18 +1,18 @@
 //! [0]
-QUrlOperator op( "ftp://ftp.trolltech.com" );
+QUrlOperator op( "ftp://ftp.qt.nokia.com" );
 op.listChildren(); // Asks the server to provide a directory listing
 //! [0]
 
 
 //! [1]
 Q3Ftp *ftp = new Q3Ftp( this ); // this is an optional QObject parent
-ftp->connectToHost( "ftp.trolltech.com" );
+ftp->connectToHost( "ftp.qt.nokia.com" );
 ftp->login();
 //! [1]
 
 
 //! [2]
-ftp->connectToHost( "ftp.trolltech.com" );  // id == 1
+ftp->connectToHost( "ftp.qt.nokia.com" );  // id == 1
 ftp->login();                               // id == 2
 ftp->cd( "qt" );                            // id == 3
 ftp->get( "INSTALL" );                      // id == 4
diff --git a/doc/src/snippets/code/src_qt3support_network_q3http.cpp b/doc/src/snippets/code/src_qt3support_network_q3http.cpp
index 6729c5f..6df626a 100644
--- a/doc/src/snippets/code/src_qt3support_network_q3http.cpp
+++ b/doc/src/snippets/code/src_qt3support_network_q3http.cpp
@@ -10,21 +10,21 @@ QString contentType = header.value( "content-type" );
 
 
 //! [2]
-QUrlOperator op( "http://qtsoftware.com" );
+QUrlOperator op( "http://qt.nokia.com" );
 op.get( "index.html" );
 //! [2]
 
 
 //! [3]
 Q3HttpRequestHeader header( "GET", "/index.html" );
-header.setValue( "Host", "qtsoftware.com" );
-http->setHost( "qtsoftware.com" );
+header.setValue( "Host", "qt.nokia.com" );
+http->setHost( "qt.nokia.com" );
 http->request( header );
 //! [3]
 
 
 //! [4]
-http->setHost( "qtsoftware.com" ); // id == 1
+http->setHost( "qt.nokia.com" ); // id == 1
 http->get( "/index.html" );           // id == 2
 //! [4]
 
diff --git a/doc/src/snippets/code/src_qt3support_network_q3url.cpp b/doc/src/snippets/code/src_qt3support_network_q3url.cpp
index 3b78a57..d0174a9 100644
--- a/doc/src/snippets/code/src_qt3support_network_q3url.cpp
+++ b/doc/src/snippets/code/src_qt3support_network_q3url.cpp
@@ -1,43 +1,43 @@
 //! [0]
-Q3Url url( "http://qtsoftware.com" );
+Q3Url url( "http://qt.nokia.com" );
 // or
 Q3Url url( "file:///home/myself/Mail", "Inbox" );
 //! [0]
 
 
 //! [1]
-Q3Url url( "http://qtsoftware.com" );
+Q3Url url( "http://qt.nokia.com" );
 QString s = url;
 // or
-QString s( "http://qtsoftware.com" );
+QString s( "http://qt.nokia.com" );
 Q3Url url( s );
 //! [1]
 
 
 //! [2]
-Q3Url url( "ftp://ftp.trolltech.com/qt/source", "qt-2.1.0.tar.gz" );
+Q3Url url( "ftp://ftp.qt.nokia.com/qt/source", "qt-2.1.0.tar.gz" );
 //! [2]
 
 
 //! [3]
-Q3Url url( "ftp://ftp.trolltech.com/qt/source", "/usr/local" );
+Q3Url url( "ftp://ftp.qt.nokia.com/qt/source", "/usr/local" );
 //! [3]
 
 
 //! [4]
-Q3Url url( "ftp://ftp.trolltech.com/qt/source", "file:///usr/local" );
+Q3Url url( "ftp://ftp.qt.nokia.com/qt/source", "file:///usr/local" );
 //! [4]
 
 
 //! [5]
-QString url = http://qtsoftware.com
+QString url = http://qt.nokia.com
 Q3Url::encode( url );
-// url is now "http%3A//www%20trolltech%20com"
+// url is now "http%3A//qt%20nokia%20com"
 //! [5]
 
 
 //! [6]
-QString url = "http%3A//www%20trolltech%20com"
+QString url = "http%3A//qt%20nokia%20com"
 Q3Url::decode( url );
-// url is now "http://qtsoftware.com"
+// url is now "http://qt.nokia.com"
 //! [6]
diff --git a/doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp b/doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp
index 03b8f7b..f076a7c 100644
--- a/doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp
+++ b/doc/src/snippets/code/src_qt3support_network_q3urloperator.cpp
@@ -1,6 +1,6 @@
 //! [0]
 Q3UrlOperator *op = new Q3UrlOperator();
-op->copy( QString("ftp://ftp.trolltech.com/qt/source/qt-2.1.0.tar.gz"),
+op->copy( QString("ftp://ftp.qt.nokia.com/qt/source/qt-2.1.0.tar.gz"),
 	 "file:///tmp" );
 //! [0]
 
diff --git a/doc/src/snippets/code/src_xml_dom_qdom.cpp b/doc/src/snippets/code/src_xml_dom_qdom.cpp
index d07d6d2..622295d 100644
--- a/doc/src/snippets/code/src_xml_dom_qdom.cpp
+++ b/doc/src/snippets/code/src_xml_dom_qdom.cpp
@@ -68,7 +68,7 @@ QDomElement element4 = document.createElement("MyElement");
 
 
 //! [7]
-<link href="http://qtsoftware.com" color="red" />
+<link href="http://qt.nokia.com" color="red" />
 //! [7]
 
 
@@ -76,10 +76,10 @@ QDomElement element4 = document.createElement("MyElement");
 QDomElement e = //...
 //...
 QDomAttr a = e.attributeNode("href");
-cout << a.value() << endl;                // prints "http://qtsoftware.com"
-a.setValue("http://doc.trolltech.com"); // change the node's attribute
+cout << a.value() << endl;                // prints "http://qt.nokia.com"
+a.setValue("http://qt.nokia.com/doc"); // change the node's attribute
 QDomAttr a2 = e.attributeNode("href");
-cout << a2.value() << endl;               // prints "http://doc.trolltech.com"
+cout << a2.value() << endl;               // prints "http://qt.nokia.com/doc"
 //! [8]