summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-11 10:38:02 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-11 10:38:02 (GMT)
commitc3bbde7cb06cf753853065821f4ee828948afe42 (patch)
treeed6b0a8db5cdeed88e693f4fd7d8aa54152d6a0d
parentf5408614bf3fe20ad5c4937c2329c8a77b8753cf (diff)
downloadQt-c3bbde7cb06cf753853065821f4ee828948afe42.zip
Qt-c3bbde7cb06cf753853065821f4ee828948afe42.tar.gz
Qt-c3bbde7cb06cf753853065821f4ee828948afe42.tar.bz2
Update URL for Qt web site.
Reviewed-by: Trust Me
-rw-r--r--dist/changes-4.3.02
-rw-r--r--src/3rdparty/phonon/ds9/ds9.desktop2
-rw-r--r--tests/auto/q3dns/tst_q3dns.cpp2
-rw-r--r--tests/auto/q3uridrag/tst_q3uridrag.cpp20
-rw-r--r--tests/auto/qhostinfo/tst_qhostinfo.cpp2
-rw-r--r--tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp26
-rw-r--r--tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp2
-rw-r--r--tests/auto/qurl/tst_qurl.cpp78
-rw-r--r--tests/auto/qvariant/tst_qvariant.cpp2
-rw-r--r--tests/auto/qxmlstream/data/namespaceCDATA.ref16
-rw-r--r--tests/auto/qxmlstream/data/namespaceCDATA.xml4
-rw-r--r--tests/auto/uic/baseline/batchtranslation.ui2
-rw-r--r--tests/auto/uic/baseline/batchtranslation.ui.h2
-rw-r--r--tests/auto/uic/baseline/config.ui2
-rw-r--r--tests/auto/uic/baseline/config.ui.h2
-rw-r--r--tests/auto/uic/baseline/finddialog.ui2
-rw-r--r--tests/auto/uic/baseline/finddialog.ui.h2
-rw-r--r--tests/auto/uic/baseline/formwindowsettings.ui2
-rw-r--r--tests/auto/uic/baseline/formwindowsettings.ui.h2
-rw-r--r--tests/auto/uic/baseline/helpdialog.ui2
-rw-r--r--tests/auto/uic/baseline/helpdialog.ui.h2
-rw-r--r--tests/auto/uic/baseline/listwidgeteditor.ui2
-rw-r--r--tests/auto/uic/baseline/listwidgeteditor.ui.h2
-rw-r--r--tests/auto/uic/baseline/mainwindowbase.ui2
-rw-r--r--tests/auto/uic/baseline/mainwindowbase.ui.h2
-rw-r--r--tests/auto/uic/baseline/newactiondialog.ui2
-rw-r--r--tests/auto/uic/baseline/newactiondialog.ui.h2
-rw-r--r--tests/auto/uic/baseline/newform.ui2
-rw-r--r--tests/auto/uic/baseline/newform.ui.h2
-rw-r--r--tests/auto/uic/baseline/orderdialog.ui2
-rw-r--r--tests/auto/uic/baseline/orderdialog.ui.h2
-rw-r--r--tests/auto/uic/baseline/paletteeditor.ui2
-rw-r--r--tests/auto/uic/baseline/paletteeditor.ui.h2
-rw-r--r--tests/auto/uic/baseline/paletteeditoradvancedbase.ui2
-rw-r--r--tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h2
-rw-r--r--tests/auto/uic/baseline/phrasebookbox.ui2
-rw-r--r--tests/auto/uic/baseline/phrasebookbox.ui.h2
-rw-r--r--tests/auto/uic/baseline/plugindialog.ui2
-rw-r--r--tests/auto/uic/baseline/plugindialog.ui.h2
-rw-r--r--tests/auto/uic/baseline/previewwidget.ui2
-rw-r--r--tests/auto/uic/baseline/previewwidget.ui.h2
-rw-r--r--tests/auto/uic/baseline/previewwidgetbase.ui4
-rw-r--r--tests/auto/uic/baseline/previewwidgetbase.ui.h4
-rw-r--r--tests/auto/uic/baseline/qfiledialog.ui2
-rw-r--r--tests/auto/uic/baseline/qfiledialog.ui.h2
-rw-r--r--tests/auto/uic/baseline/qtgradientdialog.ui2
-rw-r--r--tests/auto/uic/baseline/qtgradientdialog.ui.h2
-rw-r--r--tests/auto/uic/baseline/qtgradienteditor.ui2
-rw-r--r--tests/auto/uic/baseline/qtgradienteditor.ui.h2
-rw-r--r--tests/auto/uic/baseline/qtgradientviewdialog.ui2
-rw-r--r--tests/auto/uic/baseline/qtgradientviewdialog.ui.h2
-rw-r--r--tests/auto/uic/baseline/saveformastemplate.ui2
-rw-r--r--tests/auto/uic/baseline/saveformastemplate.ui.h2
-rw-r--r--tests/auto/uic/baseline/statistics.ui2
-rw-r--r--tests/auto/uic/baseline/statistics.ui.h2
-rw-r--r--tests/auto/uic/baseline/stringlisteditor.ui2
-rw-r--r--tests/auto/uic/baseline/stringlisteditor.ui.h2
-rw-r--r--tests/auto/uic/baseline/tabbedbrowser.ui2
-rw-r--r--tests/auto/uic/baseline/tabbedbrowser.ui.h2
-rw-r--r--tests/auto/uic/baseline/tablewidgeteditor.ui2
-rw-r--r--tests/auto/uic/baseline/tablewidgeteditor.ui.h2
-rw-r--r--tests/auto/uic/baseline/translatedialog.ui2
-rw-r--r--tests/auto/uic/baseline/translatedialog.ui.h2
-rw-r--r--tests/auto/uic/baseline/treewidgeteditor.ui2
-rw-r--r--tests/auto/uic/baseline/treewidgeteditor.ui.h2
-rw-r--r--tests/auto/uic/baseline/trpreviewtool.ui2
-rw-r--r--tests/auto/uic/baseline/trpreviewtool.ui.h2
-rw-r--r--tests/auto/uic3/baseline/previewwidget.ui2
-rw-r--r--tests/auto/uic3/baseline/previewwidget.ui.42
-rw-r--r--tests/auto/uic3/baseline/previewwidgetbase.ui2
-rw-r--r--tests/auto/uic3/baseline/previewwidgetbase.ui.42
-rw-r--r--tests/auto/uic3/baseline/qactivexselect.ui2
-rw-r--r--tests/auto/uic3/baseline/qactivexselect.ui.42
-rw-r--r--tests/auto/uiloader/baseline/batchtranslation.ui2
-rw-r--r--tests/auto/uiloader/baseline/config.ui2
-rw-r--r--tests/auto/uiloader/baseline/finddialog.ui2
-rw-r--r--tests/auto/uiloader/baseline/formwindowsettings.ui2
-rw-r--r--tests/auto/uiloader/baseline/helpdialog.ui2
-rw-r--r--tests/auto/uiloader/baseline/listwidgeteditor.ui2
-rw-r--r--tests/auto/uiloader/baseline/mainwindowbase.ui2
-rw-r--r--tests/auto/uiloader/baseline/newactiondialog.ui2
-rw-r--r--tests/auto/uiloader/baseline/newform.ui2
-rw-r--r--tests/auto/uiloader/baseline/orderdialog.ui2
-rw-r--r--tests/auto/uiloader/baseline/paletteeditor.ui2
-rw-r--r--tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui2
-rw-r--r--tests/auto/uiloader/baseline/phrasebookbox.ui2
-rw-r--r--tests/auto/uiloader/baseline/plugindialog.ui2
-rw-r--r--tests/auto/uiloader/baseline/previewwidget.ui2
-rw-r--r--tests/auto/uiloader/baseline/previewwidgetbase.ui4
-rw-r--r--tests/auto/uiloader/baseline/qfiledialog.ui2
-rw-r--r--tests/auto/uiloader/baseline/qtgradientdialog.ui2
-rw-r--r--tests/auto/uiloader/baseline/qtgradienteditor.ui2
-rw-r--r--tests/auto/uiloader/baseline/qtgradientviewdialog.ui2
-rw-r--r--tests/auto/uiloader/baseline/saveformastemplate.ui2
-rw-r--r--tests/auto/uiloader/baseline/statistics.ui2
-rw-r--r--tests/auto/uiloader/baseline/stringlisteditor.ui2
-rw-r--r--tests/auto/uiloader/baseline/tabbedbrowser.ui2
-rw-r--r--tests/auto/uiloader/baseline/tablewidgeteditor.ui2
-rw-r--r--tests/auto/uiloader/baseline/translatedialog.ui2
-rw-r--r--tests/auto/uiloader/baseline/treewidgeteditor.ui2
-rw-r--r--tests/auto/uiloader/baseline/trpreviewtool.ui2
101 files changed, 171 insertions, 171 deletions
diff --git a/dist/changes-4.3.0 b/dist/changes-4.3.0
index dc64740..1f3cbc4 100644
--- a/dist/changes-4.3.0
+++ b/dist/changes-4.3.0
@@ -13,7 +13,7 @@ in Platform Specific Changes below.
Some of the changes listed in this file include issue tracking numbers
corresponding to tasks in the Task Tracker:
- http://www.trolltech.com/developer/task-tracker
+ http://qt.nokia.com/developer/task-tracker
Each of these identifiers can be entered in the task tracker to obtain
more information about a particular change.
diff --git a/src/3rdparty/phonon/ds9/ds9.desktop b/src/3rdparty/phonon/ds9/ds9.desktop
index 370011e..ece3c9c 100644
--- a/src/3rdparty/phonon/ds9/ds9.desktop
+++ b/src/3rdparty/phonon/ds9/ds9.desktop
@@ -5,7 +5,7 @@ MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;app
X-KDE-Library=phonon_ds9
X-KDE-PhononBackendInfo-InterfaceVersion=1
X-KDE-PhononBackendInfo-Version=0.1
-X-KDE-PhononBackendInfo-Website=http://www.trolltech.com/
+X-KDE-PhononBackendInfo-Website=http://qt.nokia.com/
InitialPreference=15
Name=DirectShow9
diff --git a/tests/auto/q3dns/tst_q3dns.cpp b/tests/auto/q3dns/tst_q3dns.cpp
index ead4eff..018ce84 100644
--- a/tests/auto/q3dns/tst_q3dns.cpp
+++ b/tests/auto/q3dns/tst_q3dns.cpp
@@ -206,7 +206,7 @@ void tst_Q3Dns::simpleLookup()
int c = 0;
char **v = 0;
QCoreApplication a(c, v);
- Q3Dns dns("www.trolltech.com");
+ Q3Dns dns("qt.nokia.com");
QSignalSpy spy(&dns, SIGNAL(resultsReady()));
connect(&dns, SIGNAL(resultsReady()), this, SLOT(simpleLookupDone()));
diff --git a/tests/auto/q3uridrag/tst_q3uridrag.cpp b/tests/auto/q3uridrag/tst_q3uridrag.cpp
index 8df35f3..c8d9c7d 100644
--- a/tests/auto/q3uridrag/tst_q3uridrag.cpp
+++ b/tests/auto/q3uridrag/tst_q3uridrag.cpp
@@ -109,14 +109,14 @@ void tst_Q3UriDrag::decodeLocalFiles_data()
#endif
QTest::newRow("multipleFilesWithAbsPaths") << multipleFilesWithAbsPaths << multipleFilesWithAbsPaths;
- QTest::newRow("nonLocalFile") << QStringList("http://www.trolltech.com") << QStringList();
+ QTest::newRow("nonLocalFile") << QStringList("http://qt.nokia.com") << QStringList();
QStringList mixOfLocalAndNonLocalFiles;
#ifdef Q_WS_WIN
- mixOfLocalAndNonLocalFiles << "http://www.trolltech.com" << "c:/main.cpp" << "ftp://qt.nokia.com/doc";
+ mixOfLocalAndNonLocalFiles << "http://qt.nokia.com" << "c:/main.cpp" << "ftp://qt.nokia.com/doc";
QTest::newRow("mixOfLocalAndNonLocalFiles") << mixOfLocalAndNonLocalFiles << QStringList("c:/main.cpp");
#else
- mixOfLocalAndNonLocalFiles << "http://www.trolltech.com" << "/main.cpp" << "ftp://qt.nokia.com/doc";
+ mixOfLocalAndNonLocalFiles << "http://qt.nokia.com" << "/main.cpp" << "ftp://qt.nokia.com/doc";
QTest::newRow("mixOfLocalAndNonLocalFiles") << mixOfLocalAndNonLocalFiles << QStringList("/main.cpp");
#endif
}
@@ -157,16 +157,16 @@ void tst_Q3UriDrag::decodeToUnicodeUris_data()
#endif
QTest::newRow("multipleFiles") << multipleFiles << multipleFilesUU;
- QTest::newRow("nonLocalUris") << QStringList("http://www.trolltech.com") << QStringList("http://www.trolltech.com");
+ QTest::newRow("nonLocalUris") << QStringList("http://qt.nokia.com") << QStringList("http://www.trolltech.com");
QStringList mixOfLocalAndNonLocalUris;
QStringList mixOfLocalAndNonLocalUrisUU;
#ifdef Q_WS_WIN
- mixOfLocalAndNonLocalUris << "http://www.trolltech.com" << "c:/with space main.cpp" << "ftp://qt.nokia.com/doc";
- mixOfLocalAndNonLocalUrisUU << "http://www.trolltech.com" << "c:/with space main.cpp" << "ftp://qt.nokia.com/doc";
+ mixOfLocalAndNonLocalUris << "http://qt.nokia.com" << "c:/with space main.cpp" << "ftp://qt.nokia.com/doc";
+ mixOfLocalAndNonLocalUrisUU << "http://qt.nokia.com" << "c:/with space main.cpp" << "ftp://qt.nokia.com/doc";
#else
- mixOfLocalAndNonLocalUris << "http://www.trolltech.com" << "/main.cpp" << "ftp://qt.nokia.com/doc";
- mixOfLocalAndNonLocalUrisUU << "http://www.trolltech.com" << "/main.cpp" << "ftp://qt.nokia.com/doc";
+ mixOfLocalAndNonLocalUris << "http://qt.nokia.com" << "/main.cpp" << "ftp://qt.nokia.com/doc";
+ mixOfLocalAndNonLocalUrisUU << "http://qt.nokia.com" << "/main.cpp" << "ftp://qt.nokia.com/doc";
#endif
QTest::newRow("mixOfLocalAndNonLocalUris") << mixOfLocalAndNonLocalUris << mixOfLocalAndNonLocalUrisUU;
}
@@ -177,7 +177,7 @@ void tst_Q3UriDrag::decodeToUnicodeUris()
//
// Possible AbsoluteURIs are:
//
- // http://www.trolltech.com
+ // http://qt.nokia.com
// c:/main.cpp
//
@@ -210,7 +210,7 @@ void tst_Q3UriDrag::uriToLocalFile_data()
QTest::newRow("fileSchemelocalFileWindowsNetworkPath") << QString("file://somehost/somefile") << QString("//somehost/somefile");
#endif
QTest::newRow("fileSchemelocalFileEncoding") << QString("file:///Fran%e7ois") << QString::fromUtf8("/François");
- QTest::newRow("nonLocalFile") << QString("http://www.trolltech.com") << QString();
+ QTest::newRow("nonLocalFile") << QString("http://qt.nokia.com") << QString();
}
void tst_Q3UriDrag::uriToLocalFile()
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp
index 688111b..55cce10 100644
--- a/tests/auto/qhostinfo/tst_qhostinfo.cpp
+++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp
@@ -375,7 +375,7 @@ class LookupThread : public QThread
protected:
inline void run()
{
- QHostInfo info = QHostInfo::fromName("www.trolltech.com");
+ QHostInfo info = QHostInfo::fromName("qt.nokia.com");
QCOMPARE(info.addresses().at(0).toString(), QString("87.238.50.178"));
}
};
diff --git a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
index 9bf43ea..92b7ae5 100644
--- a/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
+++ b/tests/auto/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
@@ -227,17 +227,17 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
QTest::newRow("no-match-2") << allCookies << "http://foo.bar/web" << result;
QTest::newRow("no-match-3") << allCookies << "http://foo.bar/web/wiki" << result;
QTest::newRow("no-match-4") << allCookies << "http://trolltech.com" << result;
- QTest::newRow("no-match-5") << allCookies << "http://www.trolltech.com" << result;
+ QTest::newRow("no-match-5") << allCookies << "http://qt.nokia.com" << result;
QTest::newRow("no-match-6") << allCookies << "http://trolltech.com/webinar" << result;
- QTest::newRow("no-match-7") << allCookies << "http://www.trolltech.com/webinar" << result;
+ QTest::newRow("no-match-7") << allCookies << "http://qt.nokia.com/webinar" << result;
result = allCookies;
QTest::newRow("match-1") << allCookies << "http://trolltech.com/web" << result;
QTest::newRow("match-2") << allCookies << "http://trolltech.com/web/" << result;
QTest::newRow("match-3") << allCookies << "http://trolltech.com/web/content" << result;
- QTest::newRow("match-4") << allCookies << "http://www.trolltech.com/web" << result;
- QTest::newRow("match-4") << allCookies << "http://www.trolltech.com/web/" << result;
- QTest::newRow("match-6") << allCookies << "http://www.trolltech.com/web/content" << result;
+ QTest::newRow("match-4") << allCookies << "http://qt.nokia.com/web" << result;
+ QTest::newRow("match-4") << allCookies << "http://qt.nokia.com/web/" << result;
+ QTest::newRow("match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
cookie.setPath("/web/wiki");
allCookies += cookie;
@@ -246,19 +246,19 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
QTest::newRow("one-match-1") << allCookies << "http://trolltech.com/web" << result;
QTest::newRow("one-match-2") << allCookies << "http://trolltech.com/web/" << result;
QTest::newRow("one-match-3") << allCookies << "http://trolltech.com/web/content" << result;
- QTest::newRow("one-match-4") << allCookies << "http://www.trolltech.com/web" << result;
- QTest::newRow("one-match-4") << allCookies << "http://www.trolltech.com/web/" << result;
- QTest::newRow("one-match-6") << allCookies << "http://www.trolltech.com/web/content" << result;
+ QTest::newRow("one-match-4") << allCookies << "http://qt.nokia.com/web" << result;
+ QTest::newRow("one-match-4") << allCookies << "http://qt.nokia.com/web/" << result;
+ QTest::newRow("one-match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
result.prepend(cookie); // longer path, it must match first
QTest::newRow("two-matches-1") << allCookies << "http://trolltech.com/web/wiki" << result;
- QTest::newRow("two-matches-2") << allCookies << "http://www.trolltech.com/web/wiki" << result;
+ QTest::newRow("two-matches-2") << allCookies << "http://qt.nokia.com/web/wiki" << result;
// invert the order;
allCookies.clear();
allCookies << result.at(1) << result.at(0);
QTest::newRow("two-matches-3") << allCookies << "http://trolltech.com/web/wiki" << result;
- QTest::newRow("two-matches-4") << allCookies << "http://www.trolltech.com/web/wiki" << result;
+ QTest::newRow("two-matches-4") << allCookies << "http://qt.nokia.com/web/wiki" << result;
// expired cookie
allCookies.clear();
@@ -268,9 +268,9 @@ void tst_QNetworkCookieJar::cookiesForUrl_data()
QTest::newRow("exp-match-1") << allCookies << "http://trolltech.com/web" << result;
QTest::newRow("exp-match-2") << allCookies << "http://trolltech.com/web/" << result;
QTest::newRow("exp-match-3") << allCookies << "http://trolltech.com/web/content" << result;
- QTest::newRow("exp-match-4") << allCookies << "http://www.trolltech.com/web" << result;
- QTest::newRow("exp-match-4") << allCookies << "http://www.trolltech.com/web/" << result;
- QTest::newRow("exp-match-6") << allCookies << "http://www.trolltech.com/web/content" << result;
+ QTest::newRow("exp-match-4") << allCookies << "http://qt.nokia.com/web" << result;
+ QTest::newRow("exp-match-4") << allCookies << "http://qt.nokia.com/web/" << result;
+ QTest::newRow("exp-match-6") << allCookies << "http://qt.nokia.com/web/content" << result;
}
void tst_QNetworkCookieJar::cookiesForUrl()
diff --git a/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp b/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp
index ac30f11..82b0599 100644
--- a/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp
+++ b/tests/auto/qnetworkrequest/tst_qnetworkrequest.cpp
@@ -103,7 +103,7 @@ void tst_QNetworkRequest::ctor_data()
QTest::newRow("nothing") << QUrl();
QTest::newRow("empty") << QUrl();
- QTest::newRow("http") << QUrl("http://www.trolltech.com");
+ QTest::newRow("http") << QUrl("http://qt.nokia.com");
}
void tst_QNetworkRequest::ctor()
diff --git a/tests/auto/qurl/tst_qurl.cpp b/tests/auto/qurl/tst_qurl.cpp
index c054d46..cccb1db 100644
--- a/tests/auto/qurl/tst_qurl.cpp
+++ b/tests/auto/qurl/tst_qurl.cpp
@@ -281,20 +281,20 @@ void tst_QUrl::constructing()
QCOMPARE(url.fragment(), QString::fromLatin1("top"));
url.setScheme("http");
- url.setHost("www.trolltech.com");
+ url.setHost("qt.nokia.com");
QCOMPARE(url.toString(),
- QString::fromLatin1("http://www.trolltech.com?type>login/name>ċge nissemannsen"
+ QString::fromLatin1("http://qt.nokia.com?type>login/name>ċge nissemannsen"
"/ole&du>anne+jĝrgen=sant/prosent>%#top"));
- QUrl justHost("www.trolltech.com");
+ QUrl justHost("qt.nokia.com");
QVERIFY(!justHost.isEmpty());
QVERIFY(justHost.host().isEmpty());
- QCOMPARE(justHost.path(), QString::fromLatin1("www.trolltech.com"));
+ QCOMPARE(justHost.path(), QString::fromLatin1("qt.nokia.com"));
- QUrl hostWithSlashes("//www.trolltech.com");
+ QUrl hostWithSlashes("//qt.nokia.com");
QVERIFY(hostWithSlashes.path().isEmpty());
- QCOMPARE(hostWithSlashes.host(), QString::fromLatin1("www.trolltech.com"));
+ QCOMPARE(hostWithSlashes.host(), QString::fromLatin1("qt.nokia.com"));
QUrl withHashInPath;
@@ -315,7 +315,7 @@ void tst_QUrl::constructing()
void tst_QUrl::assignment()
{
- QUrl url("http://www.trolltech.com/");
+ QUrl url("http://qt.nokia.com/");
QVERIFY(url.isValid());
QUrl copy;
@@ -326,10 +326,10 @@ void tst_QUrl::assignment()
void tst_QUrl::comparison()
{
- QUrl url1("http://www.trolltech.com/");
+ QUrl url1("http://qt.nokia.com/");
QVERIFY(url1.isValid());
- QUrl url2("http://www.trolltech.com/");
+ QUrl url2("http://qt.nokia.com/");
QVERIFY(url2.isValid());
QVERIFY(url1 == url2);
@@ -357,7 +357,7 @@ void tst_QUrl::comparison()
void tst_QUrl::copying()
{
- QUrl url("http://www.trolltech.com/");
+ QUrl url("http://qt.nokia.com/");
QVERIFY(url.isValid());
QUrl copy(url);
@@ -1666,9 +1666,9 @@ void tst_QUrl::toString_constructed_data()
QString n("");
- QTest::newRow("data1") << n << n << n << QString::fromLatin1("www.trolltech.com") << -1 << QString::fromLatin1("index.html")
- << QByteArray() << n << QString::fromLatin1("//www.trolltech.com/index.html")
- << QByteArray("//www.trolltech.com/index.html");
+ QTest::newRow("data1") << n << n << n << QString::fromLatin1("qt.nokia.com") << -1 << QString::fromLatin1("index.html")
+ << QByteArray() << n << QString::fromLatin1("//qt.nokia.com/index.html")
+ << QByteArray("//qt.nokia.com/index.html");
QTest::newRow("data2") << QString::fromLatin1("file") << n << n << n << -1 << QString::fromLatin1("/root") << QByteArray()
<< n << QString::fromLatin1("file:///root") << QByteArray("file:///root");
}
@@ -1784,22 +1784,22 @@ void tst_QUrl::compat_legacy()
/* others
*/
{
- QUrl u( "http://www.trolltech.com/images/ban/pgs_front.jpg" );
+ QUrl u( "http://qt.nokia.com/images/ban/pgs_front.jpg" );
QCOMPARE( u.path(), QString("/images/ban/pgs_front.jpg") );
}
{
- QUrl tmp( "http://www.trolltech.com/images/ban/" );
+ QUrl tmp( "http://qt.nokia.com/images/ban/" );
QUrl u = tmp.resolved(QString("pgs_front.jpg"));
QCOMPARE( u.path(), QString("/images/ban/pgs_front.jpg") );
}
{
QUrl tmp;
- QUrl u = tmp.resolved(QString("http://www.trolltech.com/images/ban/pgs_front.jpg"));
+ QUrl u = tmp.resolved(QString("http://qt.nokia.com/images/ban/pgs_front.jpg"));
QCOMPARE( u.path(), QString("/images/ban/pgs_front.jpg") );
}
{
QUrl tmp;
- QUrl u = tmp.resolved(QString("http://www.trolltech.com/images/ban/pgs_front.jpg"));
+ QUrl u = tmp.resolved(QString("http://qt.nokia.com/images/ban/pgs_front.jpg"));
QFileInfo fi(u.path());
u.setPath(fi.path());
QCOMPARE( u.path(), QString("/images/ban") );
@@ -1881,11 +1881,11 @@ void tst_QUrl::compat_constructor_03_data()
QTest::addColumn<QString>("res");
//next we fill it with data
- QTest::newRow( "protocol00" ) << QString( "http://www.trolltech.com/index.html" ) << QString( "http://www.trolltech.com/index.html" );
- QTest::newRow( "protocol01" ) << QString( "http://www.trolltech.com" ) << QString( "http://www.trolltech.com" );
- QTest::newRow( "protocol02" ) << QString( "http://www.trolltech.com/" ) << QString( "http://www.trolltech.com/" );
- QTest::newRow( "protocol03" ) << QString( "http://www.trolltech.com/foo" ) << QString( "http://www.trolltech.com/foo" );
- QTest::newRow( "protocol04" ) << QString( "http://www.trolltech.com/foo/" ) << QString( "http://www.trolltech.com/foo/" );
+ QTest::newRow( "protocol00" ) << QString( "http://qt.nokia.com/index.html" ) << QString( "http://www.trolltech.com/index.html" );
+ QTest::newRow( "protocol01" ) << QString( "http://qt.nokia.com" ) << QString( "http://www.trolltech.com" );
+ QTest::newRow( "protocol02" ) << QString( "http://qt.nokia.com/" ) << QString( "http://www.trolltech.com/" );
+ QTest::newRow( "protocol03" ) << QString( "http://qt.nokia.com/foo" ) << QString( "http://www.trolltech.com/foo" );
+ QTest::newRow( "protocol04" ) << QString( "http://qt.nokia.com/foo/" ) << QString( "http://www.trolltech.com/foo/" );
QTest::newRow( "protocol05" ) << QString( "ftp://ftp.trolltech.com/foo/index.txt" ) << QString( "ftp://ftp.trolltech.com/foo/index.txt" );
QTest::newRow( "local00" ) << QString( "/foo" ) << QString( "/foo" );
@@ -2008,7 +2008,7 @@ void tst_QUrl::compat_path_data()
QTest::addColumn<QString>("url");
QTest::addColumn<QString>("res");
- QTest::newRow( "protocol00" ) << "http://www.trolltech.com/images/ban/pgs_front.jpg" << "/images/ban/pgs_front.jpg";
+ QTest::newRow( "protocol00" ) << "http://qt.nokia.com/images/ban/pgs_front.jpg" << "/images/ban/pgs_front.jpg";
#if defined( Q_OS_WIN32 )
QTest::newRow( "winShare00" ) << "//Anarki/homes" << "/homes";
@@ -2058,8 +2058,8 @@ void tst_QUrl::compat_decode_data()
QTest::newRow("NormalString") << QByteArray("filename") << QString("filename");
QTest::newRow("NormalStringEncoded") << QByteArray("file%20name") << QString("file name");
QTest::newRow("JustEncoded") << QByteArray("%20") << QString(" ");
- QTest::newRow("HTTPUrl") << QByteArray("http://www.trolltech.com") << QString("http://www.trolltech.com");
- QTest::newRow("HTTPUrlEncoded") << QByteArray("http://www%20trolltech%20com") << QString("http://www trolltech com");
+ QTest::newRow("HTTPUrl") << QByteArray("http://qt.nokia.com") << QString("http://www.trolltech.com");
+ QTest::newRow("HTTPUrlEncoded") << QByteArray("http://www%20trolltech%20com") << QString("http://qt.nokia.com");
QTest::newRow("EmptyString") << QByteArray("") << QString("");
QTest::newRow("Task27166") << QByteArray("Fran%C3%A7aise") << QString("Française");
}
@@ -2080,8 +2080,8 @@ void tst_QUrl::compat_encode_data()
QTest::newRow("NormalString") << QString("filename") << QByteArray("filename");
QTest::newRow("NormalStringEncoded") << QString("file name") << QByteArray("file%20name");
QTest::newRow("JustEncoded") << QString(" ") << QByteArray("%20");
- QTest::newRow("HTTPUrl") << QString("http://www.trolltech.com") << QByteArray("http%3A//www.trolltech.com");
- QTest::newRow("HTTPUrlEncoded") << QString("http://www trolltech com") << QByteArray("http%3A//www%20trolltech%20com");
+ QTest::newRow("HTTPUrl") << QString("http://qt.nokia.com") << QByteArray("http%3A//www.trolltech.com");
+ QTest::newRow("HTTPUrlEncoded") << QString("http://qt.nokia.com") << QByteArray("http%3A//www%20trolltech%20com");
QTest::newRow("EmptyString") << QString("") << QByteArray("");
QTest::newRow("Task27166") << QString::fromLatin1("Française") << QByteArray("Fran%C3%A7aise");
}
@@ -2185,8 +2185,8 @@ void tst_QUrl::symmetry()
QCOMPARE(url.allQueryItemValues("a").join("").toLatin1().constData(), "bdĝf");
QCOMPARE(url.fragment(), QString::fromLatin1("vrĉl"));
- QUrl onlyHost("//www.trolltech.com");
- QCOMPARE(onlyHost.toString(), QString::fromLatin1("//www.trolltech.com"));
+ QUrl onlyHost("//qt.nokia.com");
+ QCOMPARE(onlyHost.toString(), QString::fromLatin1("//qt.nokia.com"));
{
QString urlString = QString::fromLatin1("http://desktop:33326/upnp/{32f525a6-6f31-426e-91ca-01c2e6c2c57e}");
@@ -2288,7 +2288,7 @@ void tst_QUrl::isRelative_data()
QTest::addColumn<QString>("url");
QTest::addColumn<bool>("trueFalse");
- QTest::newRow("not") << QString::fromLatin1("http://www.trolltech.com") << false;
+ QTest::newRow("not") << QString::fromLatin1("http://qt.nokia.com") << false;
QTest::newRow("55288") << QString::fromLatin1("node64.html#fig:form:ana") << true;
// kde
@@ -2491,32 +2491,32 @@ void tst_QUrl::invalidSchemeValidator()
// test that if scheme does not start with an ALPHA, QUrl::isValid() returns false
{
- QUrl url("1http://www.trolltech.com", QUrl::StrictMode);
+ QUrl url("1http://qt.nokia.com", QUrl::StrictMode);
qDebug() << url;
QCOMPARE(url.isValid(), false);
}
{
- QUrl url("http://www.trolltech.com");
- url.setScheme("111http://www.trolltech.com");
+ QUrl url("http://qt.nokia.com");
+ url.setScheme("111http://qt.nokia.com");
QCOMPARE(url.isValid(), false);
}
{
- QUrl url = QUrl::fromEncoded("1http://www.trolltech.com", QUrl::StrictMode);
+ QUrl url = QUrl::fromEncoded("1http://qt.nokia.com", QUrl::StrictMode);
QCOMPARE(url.isValid(), false);
}
// non-ALPHA character at other positions in the scheme are ok
{
- QUrl url("ht111tp://www.trolltech.com", QUrl::StrictMode);
+ QUrl url("ht111tp://qt.nokia.com", QUrl::StrictMode);
QVERIFY(url.isValid());
}
{
- QUrl url("http://www.trolltech.com");
- url.setScheme("ht123tp://www.trolltech.com");
+ QUrl url("http://qt.nokia.com");
+ url.setScheme("ht123tp://qt.nokia.com");
QVERIFY(url.isValid());
}
{
- QUrl url = QUrl::fromEncoded("ht321tp://www.trolltech.com", QUrl::StrictMode);
+ QUrl url = QUrl::fromEncoded("ht321tp://qt.nokia.com", QUrl::StrictMode);
QVERIFY(url.isValid());
}
}
@@ -3432,7 +3432,7 @@ void tst_QUrl::hosts_data()
// normal hostnames
QTest::newRow("normal") << QString("http://intern") << QString("intern");
- QTest::newRow("normal2") << QString("http://www.trolltech.com") << QString("www.trolltech.com");
+ QTest::newRow("normal2") << QString("http://qt.nokia.com") << QString("www.trolltech.com");
// IDN hostnames
QTest::newRow("idn") << QString(QLatin1String("http://\345r.no")) << QString(QLatin1String("\345r.no"));
diff --git a/tests/auto/qvariant/tst_qvariant.cpp b/tests/auto/qvariant/tst_qvariant.cpp
index f1fe319..0e1579f 100644
--- a/tests/auto/qvariant/tst_qvariant.cpp
+++ b/tests/auto/qvariant/tst_qvariant.cpp
@@ -2402,7 +2402,7 @@ void tst_QVariant::saveLoadCustomTypes()
void tst_QVariant::url()
{
- QUrl url("http://www.trolltech.com");
+ QUrl url("http://qt.nokia.com");
QVariant v(url);
diff --git a/tests/auto/qxmlstream/data/namespaceCDATA.ref b/tests/auto/qxmlstream/data/namespaceCDATA.ref
index accd7cf..9734d22 100644
--- a/tests/auto/qxmlstream/data/namespaceCDATA.ref
+++ b/tests/auto/qxmlstream/data/namespaceCDATA.ref
@@ -1,21 +1,21 @@
StartDocument( )
DTD( text="<!DOCTYPE footype [
- <!ATTLIST foo xmlns CDATA #FIXED "http://www.trolltech.com">
- <!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://www.trolltech.com">
+ <!ATTLIST foo xmlns CDATA #FIXED "http://qt.nokia.com">
+ <!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://qt.nokia.com">
]>" dtdName="footype" )
StartElement( name="body" qualifiedName="body" )
Characters( whitespace text="
" )
-StartElement( name="foo" namespaceUri="http://www.trolltech.com" qualifiedName="foo"
- NamespaceDeclaration( namespaceUri="http://www.trolltech.com" )
+StartElement( name="foo" namespaceUri="http://qt.nokia.com" qualifiedName="foo"
+ NamespaceDeclaration( namespaceUri="http://qt.nokia.com" )
)
-EndElement( name="foo" namespaceUri="http://www.trolltech.com" qualifiedName="foo" )
+EndElement( name="foo" namespaceUri="http://qt.nokia.com" qualifiedName="foo" )
Characters( whitespace text="
" )
-StartElement( name="bar" namespaceUri="http://www.trolltech.com" qualifiedName="pre:bar" prefix="pre"
- NamespaceDeclaration( prefix="pre" namespaceUri="http://www.trolltech.com" )
+StartElement( name="bar" namespaceUri="http://qt.nokia.com" qualifiedName="pre:bar" prefix="pre"
+ NamespaceDeclaration( prefix="pre" namespaceUri="http://qt.nokia.com" )
)
-EndElement( name="bar" namespaceUri="http://www.trolltech.com" qualifiedName="pre:bar" )
+EndElement( name="bar" namespaceUri="http://qt.nokia.com" qualifiedName="pre:bar" )
Characters( whitespace text="
" )
EndElement( name="body" qualifiedName="body" )
diff --git a/tests/auto/qxmlstream/data/namespaceCDATA.xml b/tests/auto/qxmlstream/data/namespaceCDATA.xml
index c738534..6475dbc 100644
--- a/tests/auto/qxmlstream/data/namespaceCDATA.xml
+++ b/tests/auto/qxmlstream/data/namespaceCDATA.xml
@@ -1,6 +1,6 @@
<!DOCTYPE footype [
- <!ATTLIST foo xmlns CDATA #FIXED "http://www.trolltech.com">
- <!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://www.trolltech.com">
+ <!ATTLIST foo xmlns CDATA #FIXED "http://qt.nokia.com">
+ <!ATTLIST pre:bar xmlns:pre CDATA #FIXED "http://qt.nokia.com">
]>
<body>
<foo/>
diff --git a/tests/auto/uic/baseline/batchtranslation.ui b/tests/auto/uic/baseline/batchtranslation.ui
index e351ec4..f8a8121 100644
--- a/tests/auto/uic/baseline/batchtranslation.ui
+++ b/tests/auto/uic/baseline/batchtranslation.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/batchtranslation.ui.h b/tests/auto/uic/baseline/batchtranslation.ui.h
index 23030f5..89eb8ab 100644
--- a/tests/auto/uic/baseline/batchtranslation.ui.h
+++ b/tests/auto/uic/baseline/batchtranslation.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/config.ui b/tests/auto/uic/baseline/config.ui
index 47ad5f5..ee7000d 100644
--- a/tests/auto/uic/baseline/config.ui
+++ b/tests/auto/uic/baseline/config.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/config.ui.h b/tests/auto/uic/baseline/config.ui.h
index 2b6eaf8..3db1905 100644
--- a/tests/auto/uic/baseline/config.ui.h
+++ b/tests/auto/uic/baseline/config.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/finddialog.ui b/tests/auto/uic/baseline/finddialog.ui
index df0a303..72c0c1e 100644
--- a/tests/auto/uic/baseline/finddialog.ui
+++ b/tests/auto/uic/baseline/finddialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/finddialog.ui.h b/tests/auto/uic/baseline/finddialog.ui.h
index a0c6c78..0af35bd 100644
--- a/tests/auto/uic/baseline/finddialog.ui.h
+++ b/tests/auto/uic/baseline/finddialog.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/formwindowsettings.ui b/tests/auto/uic/baseline/formwindowsettings.ui
index 77eff67..5d26d04 100644
--- a/tests/auto/uic/baseline/formwindowsettings.ui
+++ b/tests/auto/uic/baseline/formwindowsettings.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/formwindowsettings.ui.h b/tests/auto/uic/baseline/formwindowsettings.ui.h
index 7f0baf6..bed2b2b 100644
--- a/tests/auto/uic/baseline/formwindowsettings.ui.h
+++ b/tests/auto/uic/baseline/formwindowsettings.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/helpdialog.ui b/tests/auto/uic/baseline/helpdialog.ui
index fe6ee9d..5c90b39 100644
--- a/tests/auto/uic/baseline/helpdialog.ui
+++ b/tests/auto/uic/baseline/helpdialog.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/helpdialog.ui.h b/tests/auto/uic/baseline/helpdialog.ui.h
index e0d38b3..6a7c5c2 100644
--- a/tests/auto/uic/baseline/helpdialog.ui.h
+++ b/tests/auto/uic/baseline/helpdialog.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/listwidgeteditor.ui b/tests/auto/uic/baseline/listwidgeteditor.ui
index 9d3dd69..bcfa9a4 100644
--- a/tests/auto/uic/baseline/listwidgeteditor.ui
+++ b/tests/auto/uic/baseline/listwidgeteditor.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/listwidgeteditor.ui.h b/tests/auto/uic/baseline/listwidgeteditor.ui.h
index 316ff39..dc1ef70 100644
--- a/tests/auto/uic/baseline/listwidgeteditor.ui.h
+++ b/tests/auto/uic/baseline/listwidgeteditor.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/mainwindowbase.ui b/tests/auto/uic/baseline/mainwindowbase.ui
index fd88ab1..6afdf89 100644
--- a/tests/auto/uic/baseline/mainwindowbase.ui
+++ b/tests/auto/uic/baseline/mainwindowbase.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/mainwindowbase.ui.h b/tests/auto/uic/baseline/mainwindowbase.ui.h
index 3b40a5c..7133ce3 100644
--- a/tests/auto/uic/baseline/mainwindowbase.ui.h
+++ b/tests/auto/uic/baseline/mainwindowbase.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/newactiondialog.ui b/tests/auto/uic/baseline/newactiondialog.ui
index ec073c1..a07b282 100644
--- a/tests/auto/uic/baseline/newactiondialog.ui
+++ b/tests/auto/uic/baseline/newactiondialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/newactiondialog.ui.h b/tests/auto/uic/baseline/newactiondialog.ui.h
index 69f13fd..56c01aa 100644
--- a/tests/auto/uic/baseline/newactiondialog.ui.h
+++ b/tests/auto/uic/baseline/newactiondialog.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/newform.ui b/tests/auto/uic/baseline/newform.ui
index 4d26151..70cd3a4 100644
--- a/tests/auto/uic/baseline/newform.ui
+++ b/tests/auto/uic/baseline/newform.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/newform.ui.h b/tests/auto/uic/baseline/newform.ui.h
index 46af9cb..dab76c3 100644
--- a/tests/auto/uic/baseline/newform.ui.h
+++ b/tests/auto/uic/baseline/newform.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/orderdialog.ui b/tests/auto/uic/baseline/orderdialog.ui
index 83caa3d..e19f17d 100644
--- a/tests/auto/uic/baseline/orderdialog.ui
+++ b/tests/auto/uic/baseline/orderdialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/orderdialog.ui.h b/tests/auto/uic/baseline/orderdialog.ui.h
index 7460475..63da158 100644
--- a/tests/auto/uic/baseline/orderdialog.ui.h
+++ b/tests/auto/uic/baseline/orderdialog.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/paletteeditor.ui b/tests/auto/uic/baseline/paletteeditor.ui
index def48a1..61d9bb2 100644
--- a/tests/auto/uic/baseline/paletteeditor.ui
+++ b/tests/auto/uic/baseline/paletteeditor.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/paletteeditor.ui.h b/tests/auto/uic/baseline/paletteeditor.ui.h
index 9310ab8..32a48e9 100644
--- a/tests/auto/uic/baseline/paletteeditor.ui.h
+++ b/tests/auto/uic/baseline/paletteeditor.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui
index c8f539e..5aca493 100644
--- a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui
+++ b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
index 618ddfc..32801de 100644
--- a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
+++ b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/phrasebookbox.ui b/tests/auto/uic/baseline/phrasebookbox.ui
index ebfa965..15788a0 100644
--- a/tests/auto/uic/baseline/phrasebookbox.ui
+++ b/tests/auto/uic/baseline/phrasebookbox.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/phrasebookbox.ui.h b/tests/auto/uic/baseline/phrasebookbox.ui.h
index c87cbc2..679fb71 100644
--- a/tests/auto/uic/baseline/phrasebookbox.ui.h
+++ b/tests/auto/uic/baseline/phrasebookbox.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/plugindialog.ui b/tests/auto/uic/baseline/plugindialog.ui
index 3de4270..57eb0dd 100644
--- a/tests/auto/uic/baseline/plugindialog.ui
+++ b/tests/auto/uic/baseline/plugindialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/plugindialog.ui.h b/tests/auto/uic/baseline/plugindialog.ui.h
index bb51f4a..cfa6688 100644
--- a/tests/auto/uic/baseline/plugindialog.ui.h
+++ b/tests/auto/uic/baseline/plugindialog.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/previewwidget.ui b/tests/auto/uic/baseline/previewwidget.ui
index d77004a..5f9159e 100644
--- a/tests/auto/uic/baseline/previewwidget.ui
+++ b/tests/auto/uic/baseline/previewwidget.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/previewwidget.ui.h b/tests/auto/uic/baseline/previewwidget.ui.h
index 71755df..0cc3737 100644
--- a/tests/auto/uic/baseline/previewwidget.ui.h
+++ b/tests/auto/uic/baseline/previewwidget.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/previewwidgetbase.ui b/tests/auto/uic/baseline/previewwidgetbase.ui
index 247c86d..63e7dbf 100644
--- a/tests/auto/uic/baseline/previewwidgetbase.ui
+++ b/tests/auto/uic/baseline/previewwidgetbase.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
@@ -305,7 +305,7 @@
</property>
<property name="text" >
<string>&lt;p>
-&lt;a href=&quot;http://www.trolltech.com&quot;>http://www.trolltech.com&lt;/a>
+&lt;a href=&quot;http://qt.nokia.com&quot;>http://www.trolltech.com&lt;/a>
&lt;/p>
&lt;p>
&lt;a href=&quot;http://www.kde.org&quot;>http://www.kde.org&lt;/a>
diff --git a/tests/auto/uic/baseline/previewwidgetbase.ui.h b/tests/auto/uic/baseline/previewwidgetbase.ui.h
index f69a785..ce837d5 100644
--- a/tests/auto/uic/baseline/previewwidgetbase.ui.h
+++ b/tests/auto/uic/baseline/previewwidgetbase.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
@@ -297,7 +297,7 @@ public:
);
PushButton1->setText(QApplication::translate("PreviewWidgetBase", "PushButton", 0, QApplication::UnicodeUTF8));
textView->setText(QApplication::translate("PreviewWidgetBase", "<p>\n"
-"<a href=\"http://www.trolltech.com\">http://www.trolltech.com</a>\n"
+"<a href=\"http://qt.nokia.com\">http://www.trolltech.com</a>\n"
"</p>\n"
"<p>\n"
"<a href=\"http://www.kde.org\">http://www.kde.org</a>\n"
diff --git a/tests/auto/uic/baseline/qfiledialog.ui b/tests/auto/uic/baseline/qfiledialog.ui
index 44e6b7f..fb16533 100644
--- a/tests/auto/uic/baseline/qfiledialog.ui
+++ b/tests/auto/uic/baseline/qfiledialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/qfiledialog.ui.h b/tests/auto/uic/baseline/qfiledialog.ui.h
index 3b3a626..6508a8d 100644
--- a/tests/auto/uic/baseline/qfiledialog.ui.h
+++ b/tests/auto/uic/baseline/qfiledialog.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/qtgradientdialog.ui b/tests/auto/uic/baseline/qtgradientdialog.ui
index ffd1ead..2e9a5db 100644
--- a/tests/auto/uic/baseline/qtgradientdialog.ui
+++ b/tests/auto/uic/baseline/qtgradientdialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/qtgradientdialog.ui.h b/tests/auto/uic/baseline/qtgradientdialog.ui.h
index 8a5d18c..a07d65e 100644
--- a/tests/auto/uic/baseline/qtgradientdialog.ui.h
+++ b/tests/auto/uic/baseline/qtgradientdialog.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/qtgradienteditor.ui b/tests/auto/uic/baseline/qtgradienteditor.ui
index aa6b288..5e80a2d 100644
--- a/tests/auto/uic/baseline/qtgradienteditor.ui
+++ b/tests/auto/uic/baseline/qtgradienteditor.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/qtgradienteditor.ui.h b/tests/auto/uic/baseline/qtgradienteditor.ui.h
index 5eab3a8..0c2d7a8 100644
--- a/tests/auto/uic/baseline/qtgradienteditor.ui.h
+++ b/tests/auto/uic/baseline/qtgradienteditor.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/qtgradientviewdialog.ui b/tests/auto/uic/baseline/qtgradientviewdialog.ui
index 486cd5d..0a949c9 100644
--- a/tests/auto/uic/baseline/qtgradientviewdialog.ui
+++ b/tests/auto/uic/baseline/qtgradientviewdialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/qtgradientviewdialog.ui.h b/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
index 8836301..ffa2c0a 100644
--- a/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
+++ b/tests/auto/uic/baseline/qtgradientviewdialog.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/saveformastemplate.ui b/tests/auto/uic/baseline/saveformastemplate.ui
index c9e0603..ce0170d 100644
--- a/tests/auto/uic/baseline/saveformastemplate.ui
+++ b/tests/auto/uic/baseline/saveformastemplate.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/saveformastemplate.ui.h b/tests/auto/uic/baseline/saveformastemplate.ui.h
index 1bad01e..d77d304 100644
--- a/tests/auto/uic/baseline/saveformastemplate.ui.h
+++ b/tests/auto/uic/baseline/saveformastemplate.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/statistics.ui b/tests/auto/uic/baseline/statistics.ui
index a9dc546..19b39a9 100644
--- a/tests/auto/uic/baseline/statistics.ui
+++ b/tests/auto/uic/baseline/statistics.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/statistics.ui.h b/tests/auto/uic/baseline/statistics.ui.h
index eb24cfe..f3c4d29 100644
--- a/tests/auto/uic/baseline/statistics.ui.h
+++ b/tests/auto/uic/baseline/statistics.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/stringlisteditor.ui b/tests/auto/uic/baseline/stringlisteditor.ui
index 67369de..0238b94 100644
--- a/tests/auto/uic/baseline/stringlisteditor.ui
+++ b/tests/auto/uic/baseline/stringlisteditor.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/stringlisteditor.ui.h b/tests/auto/uic/baseline/stringlisteditor.ui.h
index ffba0af..981e4c7 100644
--- a/tests/auto/uic/baseline/stringlisteditor.ui.h
+++ b/tests/auto/uic/baseline/stringlisteditor.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/tabbedbrowser.ui b/tests/auto/uic/baseline/tabbedbrowser.ui
index 2149221..616b5ac 100644
--- a/tests/auto/uic/baseline/tabbedbrowser.ui
+++ b/tests/auto/uic/baseline/tabbedbrowser.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/tabbedbrowser.ui.h b/tests/auto/uic/baseline/tabbedbrowser.ui.h
index ecf9024..e6013f8 100644
--- a/tests/auto/uic/baseline/tabbedbrowser.ui.h
+++ b/tests/auto/uic/baseline/tabbedbrowser.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/tablewidgeteditor.ui b/tests/auto/uic/baseline/tablewidgeteditor.ui
index a914e08..aa193d2 100644
--- a/tests/auto/uic/baseline/tablewidgeteditor.ui
+++ b/tests/auto/uic/baseline/tablewidgeteditor.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/tablewidgeteditor.ui.h b/tests/auto/uic/baseline/tablewidgeteditor.ui.h
index 47649ec..dc90d59 100644
--- a/tests/auto/uic/baseline/tablewidgeteditor.ui.h
+++ b/tests/auto/uic/baseline/tablewidgeteditor.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/translatedialog.ui b/tests/auto/uic/baseline/translatedialog.ui
index 0418bac..c086ab6 100644
--- a/tests/auto/uic/baseline/translatedialog.ui
+++ b/tests/auto/uic/baseline/translatedialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/translatedialog.ui.h b/tests/auto/uic/baseline/translatedialog.ui.h
index ec4a0f4..a0ee414 100644
--- a/tests/auto/uic/baseline/translatedialog.ui.h
+++ b/tests/auto/uic/baseline/translatedialog.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/treewidgeteditor.ui b/tests/auto/uic/baseline/treewidgeteditor.ui
index 64190ad..c1d8fd9 100644
--- a/tests/auto/uic/baseline/treewidgeteditor.ui
+++ b/tests/auto/uic/baseline/treewidgeteditor.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/treewidgeteditor.ui.h b/tests/auto/uic/baseline/treewidgeteditor.ui.h
index eb4875d..e2a3cbc 100644
--- a/tests/auto/uic/baseline/treewidgeteditor.ui.h
+++ b/tests/auto/uic/baseline/treewidgeteditor.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/trpreviewtool.ui b/tests/auto/uic/baseline/trpreviewtool.ui
index a9da3b2..f14c24d 100644
--- a/tests/auto/uic/baseline/trpreviewtool.ui
+++ b/tests/auto/uic/baseline/trpreviewtool.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic/baseline/trpreviewtool.ui.h b/tests/auto/uic/baseline/trpreviewtool.ui.h
index e607763..9556a5f 100644
--- a/tests/auto/uic/baseline/trpreviewtool.ui.h
+++ b/tests/auto/uic/baseline/trpreviewtool.ui.h
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uic3/baseline/previewwidget.ui b/tests/auto/uic3/baseline/previewwidget.ui
index 9903937..93a208d 100644
--- a/tests/auto/uic3/baseline/previewwidget.ui
+++ b/tests/auto/uic3/baseline/previewwidget.ui
@@ -274,7 +274,7 @@
</property>
<property name="text">
<string>&lt;p&gt;
-&lt;a href="http://www.trolltech.com/"&gt;http://www.trolltech.com&lt;/a&gt;
+&lt;a href="http://qt.nokia.com/"&gt;http://www.trolltech.com&lt;/a&gt;
&lt;/p&gt;
&lt;p&gt;
&lt;a href="http://www.kde.org/"&gt;http://www.kde.org&lt;/a&gt;
diff --git a/tests/auto/uic3/baseline/previewwidget.ui.4 b/tests/auto/uic3/baseline/previewwidget.ui.4
index bbde2a2..fa56284 100644
--- a/tests/auto/uic3/baseline/previewwidget.ui.4
+++ b/tests/auto/uic3/baseline/previewwidget.ui.4
@@ -224,7 +224,7 @@
</property>
<property name="text">
<string>&lt;p&gt;
-&lt;a href=&quot;http://www.trolltech.com/&quot;&gt;http://www.trolltech.com&lt;/a&gt;
+&lt;a href=&quot;http://qt.nokia.com/&quot;&gt;http://www.trolltech.com&lt;/a&gt;
&lt;/p&gt;
&lt;p&gt;
&lt;a href=&quot;http://www.kde.org/&quot;&gt;http://www.kde.org&lt;/a&gt;
diff --git a/tests/auto/uic3/baseline/previewwidgetbase.ui b/tests/auto/uic3/baseline/previewwidgetbase.ui
index ad7e55c..6b8c9ff 100644
--- a/tests/auto/uic3/baseline/previewwidgetbase.ui
+++ b/tests/auto/uic3/baseline/previewwidgetbase.ui
@@ -274,7 +274,7 @@
</property>
<property name="text">
<string>&lt;p&gt;
-&lt;a href="http://www.trolltech.com"&gt;http://www.trolltech.com&lt;/a&gt;
+&lt;a href="http://qt.nokia.com"&gt;http://www.trolltech.com&lt;/a&gt;
&lt;/p&gt;
&lt;p&gt;
&lt;a href="http://www.kde.org"&gt;http://www.kde.org&lt;/a&gt;
diff --git a/tests/auto/uic3/baseline/previewwidgetbase.ui.4 b/tests/auto/uic3/baseline/previewwidgetbase.ui.4
index f670d19..eafc402 100644
--- a/tests/auto/uic3/baseline/previewwidgetbase.ui.4
+++ b/tests/auto/uic3/baseline/previewwidgetbase.ui.4
@@ -224,7 +224,7 @@
</property>
<property name="text">
<string>&lt;p&gt;
-&lt;a href=&quot;http://www.trolltech.com&quot;&gt;http://www.trolltech.com&lt;/a&gt;
+&lt;a href=&quot;http://qt.nokia.com&quot;&gt;http://www.trolltech.com&lt;/a&gt;
&lt;/p&gt;
&lt;p&gt;
&lt;a href=&quot;http://www.kde.org&quot;&gt;http://www.kde.org&lt;/a&gt;
diff --git a/tests/auto/uic3/baseline/qactivexselect.ui b/tests/auto/uic3/baseline/qactivexselect.ui
index 5ae5115..9dc0c1a 100644
--- a/tests/auto/uic3/baseline/qactivexselect.ui
+++ b/tests/auto/uic3/baseline/qactivexselect.ui
@@ -9,7 +9,7 @@
** licenses for Windows may use this file in accordance with the Qt Commercial
** License Agreement provided with the Software.
**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
+** See http://qt.nokia.com/pricing.html or email sales@trolltech.com for
** information about Qt Commercial License Agreements.
**
** Contact qt-info@nokia.com if any conditions of this licensing are
diff --git a/tests/auto/uic3/baseline/qactivexselect.ui.4 b/tests/auto/uic3/baseline/qactivexselect.ui.4
index 1f1bb99..d200d90 100644
--- a/tests/auto/uic3/baseline/qactivexselect.ui.4
+++ b/tests/auto/uic3/baseline/qactivexselect.ui.4
@@ -10,7 +10,7 @@
** licenses for Windows may use this file in accordance with the Qt Commercial
** License Agreement provided with the Software.
**
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
+** See http://qt.nokia.com/pricing.html or email sales@trolltech.com for
** information about Qt Commercial License Agreements.
**
** Contact qt-info@nokia.com if any conditions of this licensing are
diff --git a/tests/auto/uiloader/baseline/batchtranslation.ui b/tests/auto/uiloader/baseline/batchtranslation.ui
index e351ec4..f8a8121 100644
--- a/tests/auto/uiloader/baseline/batchtranslation.ui
+++ b/tests/auto/uiloader/baseline/batchtranslation.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/config.ui b/tests/auto/uiloader/baseline/config.ui
index 47ad5f5..ee7000d 100644
--- a/tests/auto/uiloader/baseline/config.ui
+++ b/tests/auto/uiloader/baseline/config.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/finddialog.ui b/tests/auto/uiloader/baseline/finddialog.ui
index df0a303..72c0c1e 100644
--- a/tests/auto/uiloader/baseline/finddialog.ui
+++ b/tests/auto/uiloader/baseline/finddialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/formwindowsettings.ui b/tests/auto/uiloader/baseline/formwindowsettings.ui
index 77eff67..5d26d04 100644
--- a/tests/auto/uiloader/baseline/formwindowsettings.ui
+++ b/tests/auto/uiloader/baseline/formwindowsettings.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/helpdialog.ui b/tests/auto/uiloader/baseline/helpdialog.ui
index fe6ee9d..5c90b39 100644
--- a/tests/auto/uiloader/baseline/helpdialog.ui
+++ b/tests/auto/uiloader/baseline/helpdialog.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/listwidgeteditor.ui b/tests/auto/uiloader/baseline/listwidgeteditor.ui
index 9d3dd69..bcfa9a4 100644
--- a/tests/auto/uiloader/baseline/listwidgeteditor.ui
+++ b/tests/auto/uiloader/baseline/listwidgeteditor.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/mainwindowbase.ui b/tests/auto/uiloader/baseline/mainwindowbase.ui
index fd88ab1..6afdf89 100644
--- a/tests/auto/uiloader/baseline/mainwindowbase.ui
+++ b/tests/auto/uiloader/baseline/mainwindowbase.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/newactiondialog.ui b/tests/auto/uiloader/baseline/newactiondialog.ui
index ec073c1..a07b282 100644
--- a/tests/auto/uiloader/baseline/newactiondialog.ui
+++ b/tests/auto/uiloader/baseline/newactiondialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/newform.ui b/tests/auto/uiloader/baseline/newform.ui
index 4d26151..70cd3a4 100644
--- a/tests/auto/uiloader/baseline/newform.ui
+++ b/tests/auto/uiloader/baseline/newform.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/orderdialog.ui b/tests/auto/uiloader/baseline/orderdialog.ui
index 83caa3d..e19f17d 100644
--- a/tests/auto/uiloader/baseline/orderdialog.ui
+++ b/tests/auto/uiloader/baseline/orderdialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/paletteeditor.ui b/tests/auto/uiloader/baseline/paletteeditor.ui
index def48a1..61d9bb2 100644
--- a/tests/auto/uiloader/baseline/paletteeditor.ui
+++ b/tests/auto/uiloader/baseline/paletteeditor.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui b/tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui
index c8f539e..5aca493 100644
--- a/tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui
+++ b/tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/phrasebookbox.ui b/tests/auto/uiloader/baseline/phrasebookbox.ui
index ebfa965..15788a0 100644
--- a/tests/auto/uiloader/baseline/phrasebookbox.ui
+++ b/tests/auto/uiloader/baseline/phrasebookbox.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/plugindialog.ui b/tests/auto/uiloader/baseline/plugindialog.ui
index 3de4270..57eb0dd 100644
--- a/tests/auto/uiloader/baseline/plugindialog.ui
+++ b/tests/auto/uiloader/baseline/plugindialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/previewwidget.ui b/tests/auto/uiloader/baseline/previewwidget.ui
index d77004a..5f9159e 100644
--- a/tests/auto/uiloader/baseline/previewwidget.ui
+++ b/tests/auto/uiloader/baseline/previewwidget.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/previewwidgetbase.ui b/tests/auto/uiloader/baseline/previewwidgetbase.ui
index 247c86d..63e7dbf 100644
--- a/tests/auto/uiloader/baseline/previewwidgetbase.ui
+++ b/tests/auto/uiloader/baseline/previewwidgetbase.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
@@ -305,7 +305,7 @@
</property>
<property name="text" >
<string>&lt;p>
-&lt;a href=&quot;http://www.trolltech.com&quot;>http://www.trolltech.com&lt;/a>
+&lt;a href=&quot;http://qt.nokia.com&quot;>http://www.trolltech.com&lt;/a>
&lt;/p>
&lt;p>
&lt;a href=&quot;http://www.kde.org&quot;>http://www.kde.org&lt;/a>
diff --git a/tests/auto/uiloader/baseline/qfiledialog.ui b/tests/auto/uiloader/baseline/qfiledialog.ui
index 44e6b7f..fb16533 100644
--- a/tests/auto/uiloader/baseline/qfiledialog.ui
+++ b/tests/auto/uiloader/baseline/qfiledialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/qtgradientdialog.ui b/tests/auto/uiloader/baseline/qtgradientdialog.ui
index ffd1ead..2e9a5db 100644
--- a/tests/auto/uiloader/baseline/qtgradientdialog.ui
+++ b/tests/auto/uiloader/baseline/qtgradientdialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/qtgradienteditor.ui b/tests/auto/uiloader/baseline/qtgradienteditor.ui
index aa6b288..5e80a2d 100644
--- a/tests/auto/uiloader/baseline/qtgradienteditor.ui
+++ b/tests/auto/uiloader/baseline/qtgradienteditor.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/qtgradientviewdialog.ui b/tests/auto/uiloader/baseline/qtgradientviewdialog.ui
index 486cd5d..0a949c9 100644
--- a/tests/auto/uiloader/baseline/qtgradientviewdialog.ui
+++ b/tests/auto/uiloader/baseline/qtgradientviewdialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/saveformastemplate.ui b/tests/auto/uiloader/baseline/saveformastemplate.ui
index c9e0603..ce0170d 100644
--- a/tests/auto/uiloader/baseline/saveformastemplate.ui
+++ b/tests/auto/uiloader/baseline/saveformastemplate.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/statistics.ui b/tests/auto/uiloader/baseline/statistics.ui
index a9dc546..19b39a9 100644
--- a/tests/auto/uiloader/baseline/statistics.ui
+++ b/tests/auto/uiloader/baseline/statistics.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/stringlisteditor.ui b/tests/auto/uiloader/baseline/stringlisteditor.ui
index 67369de..0238b94 100644
--- a/tests/auto/uiloader/baseline/stringlisteditor.ui
+++ b/tests/auto/uiloader/baseline/stringlisteditor.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/tabbedbrowser.ui b/tests/auto/uiloader/baseline/tabbedbrowser.ui
index 2149221..616b5ac 100644
--- a/tests/auto/uiloader/baseline/tabbedbrowser.ui
+++ b/tests/auto/uiloader/baseline/tabbedbrowser.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/tablewidgeteditor.ui b/tests/auto/uiloader/baseline/tablewidgeteditor.ui
index a914e08..aa193d2 100644
--- a/tests/auto/uiloader/baseline/tablewidgeteditor.ui
+++ b/tests/auto/uiloader/baseline/tablewidgeteditor.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/translatedialog.ui b/tests/auto/uiloader/baseline/translatedialog.ui
index 0418bac..c086ab6 100644
--- a/tests/auto/uiloader/baseline/translatedialog.ui
+++ b/tests/auto/uiloader/baseline/translatedialog.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/treewidgeteditor.ui b/tests/auto/uiloader/baseline/treewidgeteditor.ui
index 64190ad..c1d8fd9 100644
--- a/tests/auto/uiloader/baseline/treewidgeteditor.ui
+++ b/tests/auto/uiloader/baseline/treewidgeteditor.ui
@@ -15,7 +15,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General
diff --git a/tests/auto/uiloader/baseline/trpreviewtool.ui b/tests/auto/uiloader/baseline/trpreviewtool.ui
index a9da3b2..f14c24d 100644
--- a/tests/auto/uiloader/baseline/trpreviewtool.ui
+++ b/tests/auto/uiloader/baseline/trpreviewtool.ui
@@ -16,7 +16,7 @@
** addition, as a special exception, Trolltech gives you certain
** additional rights. These rights are described in the Trolltech GPL
** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
+** http://qt.nokia.com/products/qt/gplexception/ and in the file
** GPL_EXCEPTION.txt in this package.
**
** Please review the following information to ensure GNU General