summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
Diffstat (limited to 'Objects')
0 files changed, 0 insertions, 0 deletions
demos/browser/data/defaultbookmarks.xbel2
-rw-r--r--demos/browser/settings.cpp2
-rw-r--r--dist/README19
-rw-r--r--dist/changes-4.5.02
-rw-r--r--dist/changes-4.5.12
-rw-r--r--dist/changes-4.5.24
-rw-r--r--dist/changes-4.5.32
-rw-r--r--dist/changes-4.6.02
-rw-r--r--doc/src/classes/qnamespace.qdoc4
-rw-r--r--doc/src/compiler-notes.qdoc2
-rw-r--r--doc/src/examples/activeqt/dotnet.qdoc2
-rw-r--r--doc/src/examples/activeqt/hierarchy-demo.qdocinc2
-rw-r--r--doc/src/examples/activeqt/menus.qdoc2
-rw-r--r--doc/src/examples/activeqt/multiple-demo.qdocinc4
-rw-r--r--doc/src/examples/activeqt/opengl-demo.qdocinc2
-rw-r--r--doc/src/examples/activeqt/opengl.qdoc2
-rw-r--r--doc/src/examples/activeqt/simple-demo.qdocinc2
-rw-r--r--doc/src/examples/activeqt/simple.qdoc2
-rw-r--r--doc/src/examples/activeqt/wrapper-demo.qdocinc8
-rw-r--r--doc/src/index.qdoc18
-rw-r--r--doc/src/legal/commercialeditions.qdoc2
-rw-r--r--doc/src/legal/opensourceedition.qdoc2
-rw-r--r--doc/src/qt4-intro.qdoc6
-rw-r--r--doc/src/qtxml.qdoc16
-rw-r--r--doc/src/snippets/code/doc_src_examples_activeqt_menus.qdoc2
-rw-r--r--doc/src/snippets/code/doc_src_qtxml.qdoc16
-rw-r--r--doc/src/snippets/code/src_activeqt_container_qaxbase.cpp4
-rw-r--r--doc/src/snippets/code/src_corelib_io_qurl.cpp6
-rw-r--r--doc/src/snippets/code/src_corelib_tools_qbytearray.cpp2
-rw-r--r--doc/src/snippets/code/src_corelib_tools_qregexp.cpp2
-rw-r--r--doc/src/snippets/code/src_network_access_qhttp.cpp6
-rw-r--r--doc/src/snippets/code/src_network_access_qnetworkaccessmanager.cpp4
-rw-r--r--doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp4
-rw-r--r--doc/src/snippets/code/src_network_kernel_qhostinfo.cpp6
-rw-r--r--doc/src/snippets/code/src_qt3support_network_q3http.cpp8
-rw-r--r--doc/src/snippets/code/src_qt3support_network_q3url.cpp10
-rw-r--r--doc/src/snippets/code/src_xml_dom_qdom.cpp4
-rw-r--r--doc/src/snippets/qxmlschema/main.cpp4
-rw-r--r--doc/src/snippets/qxmlschemavalidator/main.cpp4
-rw-r--r--doc/src/snippets/qxmlstreamwriter/main.cpp2
-rw-r--r--doc/src/snippets/textblock-fragments/xmlwriter.cpp2
-rw-r--r--doc/src/snippets/textdocument-blocks/xmlwriter.cpp2
-rw-r--r--doc/src/snippets/textdocument-frames/xmlwriter.cpp2
-rw-r--r--doc/src/snippets/textdocument-tables/xmlwriter.cpp2
-rw-r--r--doc/src/trolltech-webpages.qdoc88
-rw-r--r--examples/xml/dombookmarks/frank.xbel4
-rw-r--r--examples/xml/dombookmarks/jennifer.xbel6
-rw-r--r--examples/xml/saxbookmarks/frank.xbel4
-rw-r--r--examples/xml/saxbookmarks/jennifer.xbel6
-rw-r--r--examples/xml/streambookmarks/frank.xbel4
-rw-r--r--examples/xml/streambookmarks/jennifer.xbel8
-rw-r--r--src/corelib/io/qurl.cpp8
-rw-r--r--src/corelib/xml/qxmlstream.h2
-rw-r--r--src/gui/dialogs/qmessagebox.cpp4
-rw-r--r--src/gui/kernel/qwidget.cpp2
-rw-r--r--src/gui/text/qtextformat.cpp2
-rw-r--r--src/gui/widgets/qvalidator.cpp4
-rw-r--r--src/network/access/qhttp.cpp9
-rw-r--r--src/network/socket/qabstractsocket.cpp2
-rw-r--r--src/qt3support/network/q3http.cpp9
-rw-r--r--src/qt3support/network/q3url.cpp10
-rw-r--r--src/xml/sax/qxml.cpp6
-rw-r--r--src/xmlpatterns/functions/qsystempropertyfn.cpp2
-rw-r--r--tests/auto/qhttp/tst_qhttp.cpp8
-rw-r--r--tests/auto/qxmlschema/tst_qxmlschema.cpp24
-rw-r--r--tests/auto/qxmlschemavalidator/tst_qxmlschemavalidator.cpp12
-rw-r--r--tools/designer/src/lib/shared/textpropertyeditor.cpp2
-rw-r--r--tools/doxygen/config/header.html4
-rw-r--r--tools/doxygen/config/phonon.doxyfile2
-rw-r--r--tools/installer/nsis/installer.nsi6
-rw-r--r--tools/installer/nsis/opensource.ini8
-rw-r--r--tools/linguist/phrasebooks/polish.qph2
-rw-r--r--tools/qdoc3/test/assistant.qdocconf2
-rw-r--r--tools/qdoc3/test/carbide-eclipse-integration.qdocconf2
-rw-r--r--tools/qdoc3/test/designer.qdocconf2
-rw-r--r--tools/qdoc3/test/eclipse-integration.qdocconf2
-rw-r--r--tools/qdoc3/test/jambi.qdocconf2
-rw-r--r--tools/qdoc3/test/linguist.qdocconf2
-rw-r--r--tools/qdoc3/test/qmake.qdocconf2
-rw-r--r--tools/qdoc3/test/qt-build-docs.qdocconf2
-rw-r--r--tools/qdoc3/test/qt-html-templates.qdocconf2
-rw-r--r--tools/qdoc3/test/qt-inc.qdocconf6
-rw-r--r--tools/qdoc3/test/qt.qdocconf2
-rw-r--r--tools/qdoc3/test/standalone-eclipse-integration.qdocconf2
-rw-r--r--tools/qtconfig/previewwidgetbase.ui2
-rw-r--r--translations/assistant_adp_de.ts4
-rw-r--r--translations/assistant_adp_ja.ts4
-rw-r--r--translations/assistant_adp_pl.ts4
-rw-r--r--translations/assistant_adp_zh_CN.ts4
-rw-r--r--translations/assistant_adp_zh_TW.ts4
-rw-r--r--translations/assistant_pl.ts4
-rw-r--r--translations/assistant_zh_CN.ts4
-rw-r--r--translations/assistant_zh_TW.ts8
-rw-r--r--translations/designer_ja.ts4
-rw-r--r--translations/designer_pl.ts4
-rw-r--r--translations/designer_zh_CN.ts4
-rw-r--r--translations/designer_zh_TW.ts8
-rw-r--r--translations/linguist_ja.ts8
-rw-r--r--translations/linguist_pl.ts4
-rw-r--r--translations/linguist_zh_CN.ts8
-rw-r--r--translations/linguist_zh_TW.ts8
-rw-r--r--translations/qt_ar.ts5
-rw-r--r--translations/qt_da.ts12
-rw-r--r--translations/qt_de.ts4
-rw-r--r--translations/qt_es.ts10
-rw-r--r--translations/qt_fr.ts18
-rw-r--r--translations/qt_iw.ts2
-rw-r--r--translations/qt_ja_JP.ts14
-rw-r--r--translations/qt_pl.ts10
-rw-r--r--translations/qt_pt.ts10
-rw-r--r--translations/qt_ru.ts12
-rw-r--r--translations/qt_sk.ts10
-rw-r--r--translations/qt_sv.ts6
-rw-r--r--translations/qt_uk.ts10
-rw-r--r--translations/qt_untranslated.ts2
-rw-r--r--translations/qt_zh_CN.ts14
-rw-r--r--translations/qt_zh_TW.ts18
-rw-r--r--translations/qtconfig_pl.ts4
-rw-r--r--translations/qtconfig_ru.ts2
-rw-r--r--translations/qtconfig_untranslated.ts2
-rw-r--r--translations/qtconfig_zh_CN.ts4
-rw-r--r--translations/qtconfig_zh_TW.ts4
-rw-r--r--util/qlalr/doc/qlalr.qdocconf4
-rwxr-xr-xutil/scripts/make_qfeatures_dot_h2
125 files changed, 370 insertions, 376 deletions
diff --git a/demos/browser/browsermainwindow.cpp b/demos/browser/browsermainwindow.cpp
index 4f56cda..8d4df01 100644
--- a/demos/browser/browsermainwindow.cpp
+++ b/demos/browser/browsermainwindow.cpp
@@ -839,7 +839,7 @@ void BrowserMainWindow::slotHome()
{
QSettings settings;
settings.beginGroup(QLatin1String("MainWindow"));
- QString home = settings.value(QLatin1String("home"), QLatin1String("http://qtsoftware.com/")).toString();
+ QString home = settings.value(QLatin1String("home"), QLatin1String("http://qt.nokia.com/")).toString();
loadPage(home);
}
diff --git a/demos/browser/data/defaultbookmarks.xbel b/demos/browser/data/defaultbookmarks.xbel
index 8c83032..6211811 100644
--- a/demos/browser/data/defaultbookmarks.xbel
+++ b/demos/browser/data/defaultbookmarks.xbel
@@ -3,7 +3,7 @@
<xbel version="1.0">
<folder folded="yes">
<title>Bookmarks Bar</title>
- <bookmark href="http://qtsoftware.com/">
+ <bookmark href="http://qt.nokia.com/">
<title>Qt Home Page</title>
</bookmark>
<bookmark href="http://webkit.org/">
diff --git a/demos/browser/settings.cpp b/demos/browser/settings.cpp
index eae199e..6c49e26 100644
--- a/demos/browser/settings.cpp
+++ b/demos/browser/settings.cpp
@@ -89,7 +89,7 @@ void SettingsDialog::loadFromSettings()
{
QSettings settings;
settings.beginGroup(QLatin1String("MainWindow"));
- QString defaultHome = QLatin1String("http://qtsoftware.com");
+ QString defaultHome = QLatin1String("http://qt.nokia.com");
homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
settings.endGroup();
diff --git a/dist/README b/dist/README
index c9e7677..039fbc2 100644
--- a/dist/README
+++ b/dist/README
@@ -2,11 +2,11 @@ This is Qt version %VERSION%.
Qt is a comprehensive cross-platform C++ application framework. Qt 4
introduces new features and many improvements over the 3.x series. See
-http://doc.qtsoftware.com/latest/qt4-intro.html for details.
+http://qt.nokia.com/doc/latest/qt4-intro.html for details.
The Qt 4.x series is not binary compatible or source compatible with
the 3.x series. For more information on porting from Qt 3 to Qt 4, see
-http://doc.qtsoftware.com/latest/porting4.html .
+http://qt.nokia.com/doc/latest/porting4.html .
INSTALLING Qt
@@ -37,7 +37,7 @@ The Qt reference documentation is available locally in Qt's doc/html
directory. You can use Qt Assistant to view it; to launch Assistant,
type 'assistant' on the command line or use the Start menu. On Mac OS
X, you can find it in /Developer/Applications/Qt. The latest
-documentation is available at http://doc.qtsoftware.com/ .
+documentation is available at http://qt.nokia.com/doc/ .
SUPPORTED PLATFORMS
@@ -90,10 +90,7 @@ For this release, the following platforms have been tested:
wincewm60standard-msvc2008
For a complete list of supported platforms, see
-http://doc.qtsoftware.com/latest/supported-platforms.html
-
-For a description of Qt's platform support policy, see
-http://qtsoftware.com/support-services/support/platform-support-policy
+http://qt.nokia.com/doc/latest/supported-platforms.html.
COMMERCIAL EDITIONS
@@ -106,15 +103,15 @@ the QtCore, QtGui (except QGraphicsView), QtTest, QtDBus and
Qt3Support modules.
For a full listing of the contents of each module, please refer to
-http://doc.qtsoftware.com/latest/modules.html
+http://qt.nokia.com/doc/latest/modules.html
HOW TO REPORT A BUG
If you think you have found a bug in Qt, we would like to hear about
it so that we can fix it. Before reporting a bug, please check
-http://qtsoftware.com/developer/faqs/ and
-http://qtsoftware.com/products/appdev/platform/platforms/ to see if
+http://qt.nokia.com/developer/faqs/ and
+http://qt.nokia.com/products/appdev/platform/platforms/ to see if
the issue is already known.
Always include the following information in your bug report: the name
@@ -128,7 +125,7 @@ such a program can be created with some minor changes to one of the
many example programs in Qt's examples directory. Please submit the
bug report using the Task Tracker on the Trolltech website:
-http://qtsoftware.com/developer/task-tracker
+http://qt.nokia.com/developer/task-tracker
Qt is a trademark of Nokia Corporation and/or its subsidiary(-ies).
diff --git a/dist/changes-4.5.0 b/dist/changes-4.5.0
index 3fc075f..fbb2c8f 100644
--- a/dist/changes-4.5.0
+++ b/dist/changes-4.5.0
@@ -10,7 +10,7 @@ Applications compiled for 4.4 will continue to run with 4.5.
Some of the changes listed in this file include issue tracking numbers
corresponding to tasks in the Task Tracker:
- http://www.qtsoftware.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/dist/changes-4.5.1 b/dist/changes-4.5.1
index c9e689f..cb541da 100644
--- a/dist/changes-4.5.1
+++ b/dist/changes-4.5.1
@@ -11,7 +11,7 @@ Applications compiled for 4.4 will continue to run with 4.5.
Some of the changes listed in this file include issue tracking numbers
corresponding to tasks in the Task Tracker:
- http://www.qtsoftware.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/dist/changes-4.5.2 b/dist/changes-4.5.2
index 163e476..9a7b5e4 100644
--- a/dist/changes-4.5.2
+++ b/dist/changes-4.5.2
@@ -3,7 +3,7 @@ compatibility (source and binary) with Qt 4.5.1. For more details,
refer to the online documentation included in this distribution. The
documentation is also available online:
- http://doc.qtsoftware.com/4.5
+ http://qt.nokia.com/doc/4.5
The Qt version 4.5 series is binary compatible with the 4.4.x series.
Applications compiled for 4.4 will continue to run with 4.5.
@@ -11,7 +11,7 @@ Applications compiled for 4.4 will continue to run with 4.5.
Some of the changes listed in this file include issue tracking numbers
corresponding to tasks in the Task Tracker:
- http://www.qtsoftware.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/dist/changes-4.5.3 b/dist/changes-4.5.3
index 096d28c..09214c2 100644
--- a/dist/changes-4.5.3
+++ b/dist/changes-4.5.3
@@ -11,7 +11,7 @@ Applications compiled for 4.4 will continue to run with 4.5.
Some of the changes listed in this file include issue tracking numbers
corresponding to tasks in the Task Tracker:
- http://www.qtsoftware.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/dist/changes-4.6.0 b/dist/changes-4.6.0
index 7a6decf..9685168 100644
--- a/dist/changes-4.6.0
+++ b/dist/changes-4.6.0
@@ -10,7 +10,7 @@ Applications compiled for 4.5 will continue to run with 4.6.
Some of the changes listed in this file include issue tracking numbers
corresponding to tasks in the Task Tracker:
- http://www.qtsoftware.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/doc/src/classes/qnamespace.qdoc b/doc/src/classes/qnamespace.qdoc
index 2ea43e2..2ccc639 100644
--- a/doc/src/classes/qnamespace.qdoc
+++ b/doc/src/classes/qnamespace.qdoc
@@ -2575,10 +2575,10 @@
\value ElideNone Ellipsis should NOT appear in the text.
Qt::ElideMiddle is normally the most appropriate choice for URLs (e.g.,
- "\l{http://www.qtsoftware.com/careers/movingto/beijing/}{http://www.qtsof...ovingto/beijing/}"),
+ "\l{http://qt.nokia.com/careers/movingto/brisbane/}{http://qt.nok...ovingto/brisbane/}"),
whereas Qt::ElideRight is appropriate
for other strings (e.g.,
- "\l{http://doc.trolltech.com/qq/qq09-mac-deployment.html}{Deploying Applications on Ma...}").
+ "\l{http://qt.nokia.com/doc/qq/qq09-mac-deployment.html}{Deploying Applications on Ma...}").
\sa QAbstractItemView::textElideMode, QFontMetrics::elidedText(), AlignmentFlag QTabBar::elideMode
*/
diff --git a/doc/src/compiler-notes.qdoc b/doc/src/compiler-notes.qdoc
index 05e1676..4873cf5 100644
--- a/doc/src/compiler-notes.qdoc
+++ b/doc/src/compiler-notes.qdoc
@@ -248,7 +248,7 @@
With Visual Studio 2005 Service Pack 1 a bug was introduced which
causes Qt not to compile, this has been fixed with a hotfix available
from Microsoft. See this
- \l{http://www.qtsoftware.com/developer/faqs/faq.2006-12-18.3281869860}{Knowledge Base entry}
+ \l{http://qt.nokia.com/developer/faqs/faq.2006-12-18.3281869860}{Knowledge Base entry}
for more information.
\section1 IBM xlC (AIX)
diff --git a/doc/src/examples/activeqt/dotnet.qdoc b/doc/src/examples/activeqt/dotnet.qdoc
index ec7ea5f..c33f6f8 100644
--- a/doc/src/examples/activeqt/dotnet.qdoc
+++ b/doc/src/examples/activeqt/dotnet.qdoc
@@ -325,7 +325,7 @@
any of our datatypes into a QObject subclass to make its API
available to .NET. This has the positive side effect that the same
API is automatically available in
- \l{http://qtsoftware.com/products/qsa/}{QSA}, the cross platform
+ \l{http://qt.nokia.com/products/qsa/}{QSA}, the cross platform
scripting solution for Qt applications, and to COM clients in general.
When using the "IJW" method, in priciple the only limitation is the
diff --git a/doc/src/examples/activeqt/hierarchy-demo.qdocinc b/doc/src/examples/activeqt/hierarchy-demo.qdocinc
index 9d0cb5e..e7cb56e 100644
--- a/doc/src/examples/activeqt/hierarchy-demo.qdocinc
+++ b/doc/src/examples/activeqt/hierarchy-demo.qdocinc
@@ -27,7 +27,7 @@ function setFont( form )
This widget can have many children!
</p>
<object ID="ParentWidget" CLASSID="CLSID:d574a747-8016-46db-a07c-b2b4854ee75c"
-CODEBASE="http://qtsoftware.com/demos/hierarchy.cab">
+CODEBASE="http://qt.nokia.com/demos/hierarchy.cab">
[Object not available! Did you forget to build and register the server?]
</object><br />
<form>
diff --git a/doc/src/examples/activeqt/menus.qdoc b/doc/src/examples/activeqt/menus.qdoc
index 4c4b78c..8214f6d 100644
--- a/doc/src/examples/activeqt/menus.qdoc
+++ b/doc/src/examples/activeqt/menus.qdoc
@@ -49,7 +49,7 @@
\raw HTML
<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>
\endraw
diff --git a/doc/src/examples/activeqt/multiple-demo.qdocinc b/doc/src/examples/activeqt/multiple-demo.qdocinc
index ee174bf..339fc20 100644
--- a/doc/src/examples/activeqt/multiple-demo.qdocinc
+++ b/doc/src/examples/activeqt/multiple-demo.qdocinc
@@ -15,7 +15,7 @@ function setWidth( form )
<p />
This is one QWidget subclass:<br />
<object ID="Ax1" CLASSID="CLSID:1D9928BD-4453-4bdd-903D-E525ED17FDE5"
-CODEBASE="http://qtsoftware.com/demos/multipleax.cab">
+CODEBASE="http://qt.nokia.com/demos/multipleax.cab">
[Object not available! Did you forget to build and register the server?]
</object><br />
<form>
@@ -28,7 +28,7 @@ Fill Color: <input type="edit" ID="colorEdit" value = "red" />
<p />
This is another QWidget subclass:<br />
<object ID="Ax2" CLASSID="CLSID:58139D56-6BE9-4b17-937D-1B1EDEDD5B71"
-CODEBASE="http://qtsoftware.com/demos/multipleax.cab">
+CODEBASE="http://qt.nokia.com/demos/multipleax.cab">
[Object not available! Did you forget to build and register the server?]
</object><br />
<form>
diff --git a/doc/src/examples/activeqt/opengl-demo.qdocinc b/doc/src/examples/activeqt/opengl-demo.qdocinc
index 44df0c4..ccc1452 100644
--- a/doc/src/examples/activeqt/opengl-demo.qdocinc
+++ b/doc/src/examples/activeqt/opengl-demo.qdocinc
@@ -12,7 +12,7 @@ function setRot( form )
<p />
An OpenGL scene:<br />
<object ID="GLBox" CLASSID="CLSID:5fd9c22e-ed45-43fa-ba13-1530bb6b03e0"
-CODEBASE="http://qtsoftware.com/demos/openglax.cab">
+CODEBASE="http://qt.nokia.com/demos/openglax.cab">
[Object not available! Did you forget to build and register the server?]
</object><br />
diff --git a/doc/src/examples/activeqt/opengl.qdoc b/doc/src/examples/activeqt/opengl.qdoc
index 184b639..d7eaf9c 100644
--- a/doc/src/examples/activeqt/opengl.qdoc
+++ b/doc/src/examples/activeqt/opengl.qdoc
@@ -57,7 +57,7 @@
<p />
An OpenGL scene:<br />
<object ID="GLBox" CLASSID="CLSID:5fd9c22e-ed45-43fa-ba13-1530bb6b03e0"
- CODEBASE="http://qtsoftware.com/demos/openglax.cab">
+ CODEBASE="http://qt.nokia.com/demos/openglax.cab">
[Object not available! Did you forget to build and register the server?]
</object><br />
diff --git a/doc/src/examples/activeqt/simple-demo.qdocinc b/doc/src/examples/activeqt/simple-demo.qdocinc
index 45a346c..5eee8bc 100644
--- a/doc/src/examples/activeqt/simple-demo.qdocinc
+++ b/doc/src/examples/activeqt/simple-demo.qdocinc
@@ -1,7 +1,7 @@
\raw HTML
//! [0]
<object ID="QSimpleAX" CLASSID="CLSID:DF16845C-92CD-4AAB-A982-EB9840E74669"
-CODEBASE="http://qtsoftware.com/demos/simpleax.cab">
+CODEBASE="http://qt.nokia.com/demos/simpleax.cab">
<PARAM NAME="text" VALUE="A simple control" />
<PARAM NAME="value" VALUE="1" />
[Object not available! Did you forget to build and register the server?]
diff --git a/doc/src/examples/activeqt/simple.qdoc b/doc/src/examples/activeqt/simple.qdoc
index f5ec85a..c9c77c4 100644
--- a/doc/src/examples/activeqt/simple.qdoc
+++ b/doc/src/examples/activeqt/simple.qdoc
@@ -46,7 +46,7 @@
\raw HTML
<object ID="QSimpleAX" CLASSID="CLSID:DF16845C-92CD-4AAB-A982-EB9840E74669"
- CODEBASE="http://qtsoftware.com/demos/simpleax.cab">
+ CODEBASE="http://qt.nokia.com/demos/simpleax.cab">
<PARAM NAME="text" VALUE="A simple control" />
<PARAM NAME="value" VALUE="1" />
[Object not available! Did you forget to build and register the server?]
diff --git a/doc/src/examples/activeqt/wrapper-demo.qdocinc b/doc/src/examples/activeqt/wrapper-demo.qdocinc
index 1457119..a00c505 100644
--- a/doc/src/examples/activeqt/wrapper-demo.qdocinc
+++ b/doc/src/examples/activeqt/wrapper-demo.qdocinc
@@ -20,7 +20,7 @@ End Sub
<p />
A QPushButton:<br />
<object ID="PushButton" CLASSID="CLSID:2B262458-A4B6-468B-B7D4-CF5FEE0A7092"
-CODEBASE="http://qtsoftware.com/demos/wrapperax.cab">
+CODEBASE="http://qt.nokia.com/demos/wrapperax.cab">
<PARAM NAME="text" VALUE="Click me!" />
[Object not available! Did you forget to build and register the server?]
</object><br />
@@ -28,7 +28,7 @@ CODEBASE="http://qtsoftware.com/demos/wrapperax.cab">
<p />
A QCheckBox:<br />
<object ID="CheckBox" CLASSID="CLSID:6E795de9-872d-43cf-a831-496ef9d86c68"
-CODEBASE="http://qtsoftware.com/demos/wrapperax.cab">
+CODEBASE="http://qt.nokia.com/demos/wrapperax.cab">
<PARAM NAME="text" VALUE="Check me!" />
[Object not available! Did you forget to build and register the server?]
</object><br />
@@ -36,14 +36,14 @@ CODEBASE="http://qtsoftware.com/demos/wrapperax.cab">
<p />
A QToolButton:<br />
<object ID="ToolButton" CLASSID="CLSID:7c0ffe7a-60c3-4666-bde2-5cf2b54390a1"
-CODEBASE="http://qtsoftware.com/demos/wrapperax.cab">
+CODEBASE="http://qt.nokia.com/demos/wrapperax.cab">
[Object not available! Did you forget to build and register the server?]
</object><br />
<p />
A QRadioButton:<br />
<object ID="RadioButton" CLASSID="CLSID:afcf78c8-446c-409a-93b3-ba2959039189"
-CODEBASE="http://qtsoftware.com/demos/wrapperax.cab">
+CODEBASE="http://qt.nokia.com/demos/wrapperax.cab">
<PARAM NAME="text" VALUE="Tune me!" />
[Object not available! Did you forget to build and register the server?]
</object><br />
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index c535545..6fb4c8e 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -110,8 +110,8 @@
</td>
<td valign="top">
<ul>
- <li><a href="http://www.qtsoftware.com/products">About Qt</a></li>
- <li><a href="http://www.qtsoftware.com/about">About Us</a></li>
+ <li><a href="http://qt.nokia.com/products">About Qt</a></li>
+ <li><a href="http://qt.nokia.com/about">About Us</a></li>
<li><a href="commercialeditions.html">Commercial Edition</a></li>
<li><a href="opensourceedition.html">Open Source Edition</a></li>
<li><a href="supported-platforms.html">Supported Platforms</a></li>
@@ -119,11 +119,11 @@
</td>
<td valign="top">
<ul>
- <li><a href="http://www.qtsoftware.com/developer/faqs/">Frequently Asked Questions</a></li>
- <li><a href="http://www.qtsoftware.com/developer/community/">Qt Community Web Sites</a></li>
+ <li><a href="http://qt.nokia.com/developer/faqs/">Frequently Asked Questions</a></li>
+ <li><a href="http://qt.nokia.com/developer/community/">Qt Community Web Sites</a></li>
<li><a href="http://doc.trolltech.com/qq/">Qt Quarterly</a></li>
<li><a href="bughowto.html">How to Report a Bug</a></li>
- <li><a href="http://www.qtsoftware.com/developer/">Other Online Resources</a></li>
+ <li><a href="http://qt.nokia.com/developer/">Other Online Resources</a></li>
</ul>
</td>
</tr>
@@ -207,11 +207,11 @@
<tr>
<td valign="top">
<ul>
- <li><a href="http://www.qtsoftware.com/products/add-on-products">Qt Solutions</a></li>
- <li><a href="http://www.qtsoftware.com/products/appdev">Partner Add-ons</a></li>
+ <li><a href="http://qt.nokia.com/products/add-on-products">Qt Solutions</a></li>
+ <li><a href="http://qt.nokia.com/products/appdev">Partner Add-ons</a></li>
<li><a href="http://qt-apps.org">Third-Party Qt Components (qt-apps.org)</a></li>
- <li><a href="http://www.qtsoftware.com/support-services/support-services/">Support</a></li>
- <li><a href="http://www.qtsoftware.com/support-services/training/">Training</a></li>
+ <li><a href="http://qt.nokia.com/support-services/support-services/">Support</a></li>
+ <li><a href="http://qt.nokia.com/support-services/training/">Training</a></li>
</ul>
</td>
<td valign="top">
diff --git a/doc/src/legal/commercialeditions.qdoc b/doc/src/legal/commercialeditions.qdoc
index a8ef276..93c1bc0 100644
--- a/doc/src/legal/commercialeditions.qdoc
+++ b/doc/src/legal/commercialeditions.qdoc
@@ -110,7 +110,7 @@
For further information and assistance, please contact Qt
sales.
- Web: http://www.qtsoftware.com/contact.
+ Web: http://qt.nokia.com/contact.
Phone, U.S. office (for North America): \bold{1-650-813-1676}.
diff --git a/doc/src/legal/opensourceedition.qdoc b/doc/src/legal/opensourceedition.qdoc
index 4a23df4..8a76f27 100644
--- a/doc/src/legal/opensourceedition.qdoc
+++ b/doc/src/legal/opensourceedition.qdoc
@@ -82,7 +82,7 @@
Information about Qt Commercial License Agreements is available
in the \l{Qt Licensing Overview} on the Qt website or by contacting
- the sales department at http://www.qtsoftware.com/contact.
+ the sales department at http://qt.nokia.com/contact.
If you are in doubt what edition of Qt is right for your project,
please contact
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index d2be2cb..45a95b2 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -162,7 +162,7 @@
\endlist
For more information about improvements in each Qt release, see
- the \l{http://www.qtsoftware.com/developer/changes/}
+ the \l{http://qt.nokia.com/developer/changes/}
{detailed lists of changes}.
\section1 Significant Improvements
@@ -444,13 +444,13 @@
A comprehensive list of changes between Qt 4.4 and Qt 4.5 is included
in the \c changes-4.5.0 file
- \l{http://www.qtsoftware.com/developer/changes/changes-4.5.0}{available online}.
+ \l{http://qt.nokia.com/developer/changes/changes-4.5.0}{available online}.
A \l{Known Issues in %VERSION%}{list of known issues} for this release is also
available.
Changes between this release and the previous release are provided
in the \c{changes-%VERSION%} file (also
- \l{http://www.qtsoftware.com/developer/changes/changes-%VERSION%}{available online}).
+ \l{http://qt.nokia.com/developer/changes/changes-%VERSION%}{available online}).
A list of other Qt 4 features can be found on the
\bold{\l{What's New in Qt 4}} page.
diff --git a/doc/src/qtxml.qdoc b/doc/src/qtxml.qdoc
index d0ace8b..4df2589 100644
--- a/doc/src/qtxml.qdoc
+++ b/doc/src/qtxml.qdoc
@@ -328,7 +328,7 @@
for reporting local names, namespace prefixes and URIs. With \e
http://xml.org/sax/features/namespaces set to true the parser will
report \e title as the local name of the \e fnord:title attribute, \e
- fnord being the namespace prefix and \e http://www.qtsoftware.com/fnord/ as
+ fnord being the namespace prefix and \e http://example.com/fnord/ as
the namespace URI. When \e http://xml.org/sax/features/namespaces is
false none of them are reported.
@@ -511,18 +511,18 @@
Before we can apply a namespace to element or attribute names we must
declare it.
- Namespaces are URIs like \e http://www.qtsoftware.com/fnord/book/. This
+ Namespaces are URIs like \e http://example.com/fnord/book/. This
does not mean that data must be available at this address; the URI is
simply used to provide a unique name.
We declare namespaces in the same way as attributes; strictly speaking
they \e are attributes. To make for example \e
- http://www.qtsoftware.com/fnord/ the document's default XML namespace \e
+ http://example.com/fnord/ the document's default XML namespace \e
xmlns we write
\snippet doc/src/snippets/code/doc_src_qtxml.qdoc 8
- To distinguish the \e http://www.qtsoftware.com/fnord/book/ namespace from
+ To distinguish the \e http://example.com/fnord/book/ namespace from
the default, we must supply it with a prefix:
\snippet doc/src/snippets/code/doc_src_qtxml.qdoc 9
@@ -549,12 +549,12 @@
\snippet doc/src/snippets/code/doc_src_qtxml.qdoc 10
Within the \e document element we have two namespaces declared. The
- default namespace \e http://www.qtsoftware.com/fnord/ applies to the \e
+ default namespace \e http://example.com/fnord/ applies to the \e
book element, the \e chapter element, the appropriate \e title element
and of course to \e document itself.
The \e book:author and \e book:title elements belong to the namespace
- with the URI \e http://www.qtsoftware.com/fnord/book/.
+ with the URI \e http://example.com/fnord/book/.
The two \e book:author attributes \e title and \e name have no XML
namespace assigned. They are only members of the "traditional"
@@ -562,7 +562,7 @@
\e title attributes in \e book:author are forbidden.
In the above example we circumvent the last rule by adding a \e title
- attribute from the \e http://www.qtsoftware.com/fnord/ namespace to \e
+ attribute from the \e http://example.com/fnord/ namespace to \e
book:author: the \e fnord:title comes from the namespace with the
prefix \e fnord that is declared in the \e book:author element.
@@ -603,7 +603,7 @@
local part of \e book:title.)
\o The \e {namespace URI} ("Uniform Resource Identifier") is a unique
identifier for a namespace. It looks like a URL
- (e.g. \e http://www.qtsoftware.com/fnord/ ) but does not require
+ (e.g. \e http://example.com/fnord/ ) but does not require
data to be accessible by the given protocol at the named address.
\endlist
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..566633f 100644
--- a/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
+++ b/doc/src/snippets/code/src_corelib_tools_qbytearray.cpp
@@ -218,7 +218,7 @@ if (url.startsWith("ftp:"))
//! [26]
-QByteArray url("http://qtsoftware.com/index.html");
+QByteArray url("http://qt.nokia.com/index.html");
if (url.endsWith(".html"))
...
//! [26]
diff --git a/doc/src/snippets/code/src_corelib_tools_qregexp.cpp b/doc/src/snippets/code/src_corelib_tools_qregexp.cpp
index ae25885..c41cd06 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\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_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_access_qnetworkdiskcache.cpp b/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp
index acd3938..51f27df 100644
--- a/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp
+++ b/doc/src/snippets/code/src_network_access_qnetworkdiskcache.cpp
@@ -7,11 +7,11 @@ manager->setCache(diskCache);
//! [1]
// do a normal request (preferred from network, as this is the default)
-QNetworkRequest request(QUrl(QString("http://www.qtsoftware.com")));
+QNetworkRequest request(QUrl(QString("http://qt.nokia.com")));
manager->get(request);
// do a request preferred from cache
-QNetworkRequest request2(QUrl(QString("http://www.qtsoftware.com")));
+QNetworkRequest request2(QUrl(QString("http://qt.nokia.com")));
request2.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
manager->get(request2);
//! [1]
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_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..536840a 100644
--- a/doc/src/snippets/code/src_qt3support_network_q3url.cpp
+++ b/doc/src/snippets/code/src_qt3support_network_q3url.cpp
@@ -1,15 +1,15 @@
//! [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]
@@ -30,7 +30,7 @@ Q3Url url( "ftp://ftp.trolltech.com/qt/source", "file:///usr/local" );
//! [5]
-QString url = http://qtsoftware.com
+QString url = http://qt.nokia.com
Q3Url::encode( url );
// url is now "http%3A//www%20trolltech%20com"
//! [5]
@@ -39,5 +39,5 @@ Q3Url::encode( url );
//! [6]
QString url = "http%3A//www%20trolltech%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_xml_dom_qdom.cpp b/doc/src/snippets/code/src_xml_dom_qdom.cpp
index d07d6d2..50a4124 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,7 +76,7 @@ QDomElement element4 = document.createElement("MyElement");
QDomElement e = //...
//...
QDomAttr a = e.attributeNode("href");
-cout << a.value() << endl; // prints "http://qtsoftware.com"
+cout << a.value() << endl; // prints "http://qt.nokia.com"
a.setValue("http://doc.trolltech.com"); // change the node's attribute
QDomAttr a2 = e.attributeNode("href");
cout << a2.value() << endl; // prints "http://doc.trolltech.com"
diff --git a/doc/src/snippets/qxmlschema/main.cpp b/doc/src/snippets/qxmlschema/main.cpp
index 6cf9f00..7f433a6 100644
--- a/doc/src/snippets/qxmlschema/main.cpp
+++ b/doc/src/snippets/qxmlschema/main.cpp
@@ -85,8 +85,8 @@ void Schema::loadFromData() const
QByteArray data( "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"<xsd:schema"
" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
- " xmlns=\"http://www.qtsoftware.com/xmlschematest\""
- " targetNamespace=\"http://www.qtsoftware.com/xmlschematest\""
+ " xmlns=\"http://qt.nokia.com/xmlschematest\""
+ " targetNamespace=\"http://qt.nokia.com/xmlschematest\""
" version=\"1.0\""
" elementFormDefault=\"qualified\">"
"</xsd:schema>" );
diff --git a/doc/src/snippets/qxmlschemavalidator/main.cpp b/doc/src/snippets/qxmlschemavalidator/main.cpp
index 3c6417b..b5a8a0b 100644
--- a/doc/src/snippets/qxmlschemavalidator/main.cpp
+++ b/doc/src/snippets/qxmlschemavalidator/main.cpp
@@ -109,8 +109,8 @@ QXmlSchema SchemaValidator::getSchema() const
QByteArray data("<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
"<xsd:schema"
" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\""
- " xmlns=\"http://www.qtsoftware.com/xmlschematest\""
- " targetNamespace=\"http://www.qtsoftware.com/xmlschematest\""
+ " xmlns=\"http://qt.nokia.com/xmlschematest\""
+ " targetNamespace=\"http://qt.nokia.com/xmlschematest\""
" version=\"1.0\""
" elementFormDefault=\"qualified\">"
"</xsd:schema>");
diff --git a/doc/src/snippets/qxmlstreamwriter/main.cpp b/doc/src/snippets/qxmlstreamwriter/main.cpp
index be20c83..c0be999 100644
--- a/doc/src/snippets/qxmlstreamwriter/main.cpp
+++ b/doc/src/snippets/qxmlstreamwriter/main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
stream.writeAttribute("folded", "no");
//! [write element]
stream.writeStartElement("bookmark");
- stream.writeAttribute("href", "http://www.qtsoftware.com/");
+ stream.writeAttribute("href", "http://qt.nokia.com/");
stream.writeTextElement("title", "Qt Home");
stream.writeEndElement(); // bookmark
//! [write element]
diff --git a/doc/src/snippets/textblock-fragments/xmlwriter.cpp b/doc/src/snippets/textblock-fragments/xmlwriter.cpp
index 73a6306..45e0217 100644
--- a/doc/src/snippets/textblock-fragments/xmlwriter.cpp
+++ b/doc/src/snippets/textblock-fragments/xmlwriter.cpp
@@ -47,7 +47,7 @@ QDomDocument *XmlWriter::toXml()
{
QDomImplementation implementation;
QDomDocumentType docType = implementation.createDocumentType(
- "scribe-document", "scribe", "qtsoftware.com/scribe");
+ "scribe-document", "scribe", "qt.nokia.com/scribe");
document = new QDomDocument(docType);
diff --git a/doc/src/snippets/textdocument-blocks/xmlwriter.cpp b/doc/src/snippets/textdocument-blocks/xmlwriter.cpp
index f8253f1..0cc5269 100644
--- a/doc/src/snippets/textdocument-blocks/xmlwriter.cpp
+++ b/doc/src/snippets/textdocument-blocks/xmlwriter.cpp
@@ -47,7 +47,7 @@ QDomDocument *XmlWriter::toXml()
{
QDomImplementation implementation;
QDomDocumentType docType = implementation.createDocumentType(
- "scribe-document", "scribe", "qtsoftware.com/scribe");
+ "scribe-document", "scribe", "qt.nokia.com/scribe");
document = new QDomDocument(docType);
diff --git a/doc/src/snippets/textdocument-frames/xmlwriter.cpp b/doc/src/snippets/textdocument-frames/xmlwriter.cpp
index 07bde22..49b0939 100644
--- a/doc/src/snippets/textdocument-frames/xmlwriter.cpp
+++ b/doc/src/snippets/textdocument-frames/xmlwriter.cpp
@@ -47,7 +47,7 @@ QDomDocument *XmlWriter::toXml()
{
QDomImplementation implementation;
QDomDocumentType docType = implementation.createDocumentType(
- "scribe-document", "scribe", "qtsoftware.com/scribe");
+ "scribe-document", "scribe", "qt.nokia.com/scribe");
document = new QDomDocument(docType);
diff --git a/doc/src/snippets/textdocument-tables/xmlwriter.cpp b/doc/src/snippets/textdocument-tables/xmlwriter.cpp
index b96d3c3..54f7aae 100644
--- a/doc/src/snippets/textdocument-tables/xmlwriter.cpp
+++ b/doc/src/snippets/textdocument-tables/xmlwriter.cpp
@@ -47,7 +47,7 @@ QDomDocument *XmlWriter::toXml()
{
QDomImplementation implementation;
QDomDocumentType docType = implementation.createDocumentType(
- "scribe-document", "scribe", "qtsoftware.com/scribe");
+ "scribe-document", "scribe", "qt.nokia.com/scribe");
document = new QDomDocument(docType);
diff --git a/doc/src/trolltech-webpages.qdoc b/doc/src/trolltech-webpages.qdoc
index 7018d84..20e6c66 100644
--- a/doc/src/trolltech-webpages.qdoc
+++ b/doc/src/trolltech-webpages.qdoc
@@ -40,202 +40,202 @@
****************************************************************************/
/*!
- \externalpage http://www.qtsoftware.com/products/qt
+ \externalpage http://qt.nokia.com/
\title Qt website
*/
/*!
- \externalpage http://www.qtsoftware.com/bugreport-form
+ \externalpage http://qt.nokia.com/
+ \title Qt Homepage
+*/
+
+/*!
+ \externalpage http://qt.nokia.com/bugreport-form
\title Bug Report Form
*/
/*!
- \externalpage http://www.qtsoftware.com/products/add-on-products/add-on-products/
+ \externalpage http://qt.nokia.com/products/add-on-products/add-on-products/
\title Third-Party Tools
*/
/*!
- \externalpage http://www.qtsoftware.com/products/add-on-products
+ \externalpage http://qt.nokia.com/products/add-on-products
\title Qt Solutions
*/
/*!
- \externalpage http://www.qtsoftware.com/developer/documentation/books
+ \externalpage http://qt.nokia.com/developer/books
\title Books about Qt Programming
*/
/*!
- \externalpage http://www.qtsoftware.com/products/qt/qt3/book
+ \externalpage http://qt.nokia.com/developer/books/3
\title GUI Programming with Qt 3
*/
/*!
- \externalpage http://www.qtsoftware.com/products/qt/
- \title Qt Homepage
-*/
-
-/*!
- \externalpage http://www.qtsoftware.com/products/qt
+ \externalpage http://qt.nokia.com/about
\title About Qt
*/
/*!
- \externalpage http://www.qtsoftware.com/products/qt/indepth/vs-integration
+ \externalpage http://qt.nokia.com/products/developer-tools
\title Visual Studio Integration
*/
/*!
- \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Widgets/qtcalendarwidget/
+ \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Widgets/qtcalendarwidget/
\title Calendar Widget
*/
/*!
- \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Widgets/qtwizard/
+ \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Widgets/qtwizard/
\title QtWizard
*/
/*!
- \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Utilities/qtcorba/
+ \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Utilities/qtcorba/
\title CORBA Framework
*/
/*!
- \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Widgets/qtwindowlistmenu/
+ \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Widgets/qtwindowlistmenu/
\title Window Menu
*/
/*!
- \externalpage http://www.qtsoftware.com/customers/casestories
+ \externalpage http://qt.nokia.com/qt-in-use
\title Customer Success Stories
*/
/*!
- \externalpage http://www.qtsoftware.com/developer
+ \externalpage http://qt.nokia.com/developer
\title Developer Zone
*/
/*!
- \externalpage http://www.qtsoftware.com/developer/downloads
+ \externalpage http://qt.nokia.com/downloads
\title Downloads
*/
/*!
- \externalpage http://www.qtsoftware.com/developer/faqs/
+ \externalpage http://qt.nokia.com/developer/faqs/
\title FAQs
*/
/*!
- \externalpage http://www.qtsoftware.com/developer/faqs/licensing
+ \externalpage http://qt.nokia.com/developer/faqs/licensing/
\title License FAQ
*/
/*!
- \externalpage http://www.qtsoftware.com/developer/downloads/freesoftware
+ \externalpage http://qt.nokia.com/products/licensing/
\title Free Software and Contributions
*/
/*!
- \externalpage http://www.qtsoftware.com/products/qt/licenses/licensing/
+ \externalpage http://qt.nokia.com/products/licensing/
\title Qt Licensing Overview
*/
/*!
- \externalpage http://www.qtsoftware.com/products/qt/licenses/pricing/
+ \externalpage http://qt.nokia.com/products/pricing/
\title Qt License Pricing
*/
/*!
- \externalpage http://www.qtsoftware.com/products/qt/orderform
+ \externalpage http://qt.nokia.com/contact
\title How to Order
*/
/*!
- \externalpage http://www.qtsoftware.com/support-services/support/platform-support-policy
+ \externalpage http://qt.nokia.com/doc/supported-platforms.html
\title Platform Support Policy
*/
/*!
- \externalpage http://www.qtsoftware.com/products/
+ \externalpage http://qt.nokia.com/products/
\title Product Overview
*/
/*!
- \externalpage http://www.qtsoftware.com/developer/supported-platforms/supported-platforms/
+ \externalpage http://qt.nokia.com/doc/supported-platforms.html
\title Qt 4 Platforms Overview
*/
/*!
- \externalpage http://www.qtsoftware.com/products/qtopia/
+ \externalpage http://qt.nokia.com/products/qtopia/
\title Qt Extended
*/
/*!
- \externalpage http://doc.trolltech.com/qq/
+ \externalpage http://qt.nokia.com/doc/qq/
\title Qt Quarterly
*/
/*!
- \externalpage http://www.qtsoftware.com/developer/task-tracker
+ \externalpage http://qt.nokia.com/developer/task-tracker
\title Task Tracker
*/
/*!
- \externalpage http://lists.trolltech.com
+ \externalpage http://qt.nokia.com/lists
\title Qt Mailing Lists
*/
/*!
- \externalpage http://www.qtsoftware.com/products/qt/learnmore/whitepapers
+ \externalpage http://qt.nokia.com/products/files/pdf/
\title Whitepapers
*/
/*!
- \externalpage http://doc.trolltech.com/qtcanvas
+ \externalpage http://qt.nokia.com/doc/qtcanvas
\title QtCanvas
*/
/*!
- \externalpage http://labs.trolltech.com/page/Projects/Itemview/Modeltest
+ \externalpage http://labs.qt.nokia.com/page/Projects/Itemview/Modeltest
\title ModelTest
*/
/*!
- \externalpage http://labs.trolltech.com/page/Projects/Accessibility/QDBusBridge
+ \externalpage http://labs.qt.nokia.com/page/Projects/Accessibility/QDBusBridge
\title D-Bus Accessibility Bridge
*/
/*!
- \externalpage http://labs.trolltech.com/blogs/2008/12/05/qtestlib-now-with-nice-graphs-pointing-upwards/
+ \externalpage http://labs.qt.nokia.com/blogs/2008/12/05/qtestlib-now-with-nice-graphs-pointing-upwards/
\title qtestlib-tools Announcement
*/
/*!
- \externalpage http://labs.trolltech.com/gitweb?p=qtestlib-tools;a=summary
+ \externalpage http://labs.qt.nokia.com/gitweb?p=qtestlib-tools;a=summary
\title qtestlib-tools
*/
/*!
- \externalpage http://www.qtsoftware.com/developer/downloads/qt/qsa
+ \externalpage http://qt.nokia.com/products/library/modular-class-library#info_scripting
\title Qt Script for Applications (QSA)
*/
/*!
- \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Utilities/qtsharedmemory/
+ \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Utilities/qtsharedmemory/
\title QtSharedMemory
*/
/*!
- \externalpage http://doc.trolltech.com/qq/qq21-portingcanvas.html
+ \externalpage http://qt.nokia.com/qq/qq21-portingcanvas.html
\title Porting to Qt 4.2's Graphics View
*/
/*!
- \externalpage http://www.qtsoftware.com/products/add-on-products/catalog/4/Windows/qtwinforms/
+ \externalpage http://qt.nokia.com/products/add-on-products/catalog/4/Windows/qtwinforms/
\title QtWinForms Solution
*/
/*!
- \externalpage http://www.qtsoftware.com/developer/faqs/qt/installation
+ \externalpage http://qt.nokia.com/developer/faqs/qt/installation
\title Installation FAQ
*/
diff --git a/examples/xml/dombookmarks/frank.xbel b/examples/xml/dombookmarks/frank.xbel
index d6a12c6..4dfaa4c 100644
--- a/examples/xml/dombookmarks/frank.xbel
+++ b/examples/xml/dombookmarks/frank.xbel
@@ -80,8 +80,8 @@
<bookmark href="http://doc.trolltech.com/4.0/">
<title>Qt 4.0 Reference</title>
</bookmark>
- <bookmark href="http://qtsoftware.com/">
- <title>Trolltech Home Page</title>
+ <bookmark href="http://qt.nokia.com/">
+ <title>Qt Home Page</title>
</bookmark>
</folder>
<folder folded="yes">
diff --git a/examples/xml/dombookmarks/jennifer.xbel b/examples/xml/dombookmarks/jennifer.xbel
index 597880a..dafdb67 100644
--- a/examples/xml/dombookmarks/jennifer.xbel
+++ b/examples/xml/dombookmarks/jennifer.xbel
@@ -48,13 +48,13 @@
<bookmark href="http://doc.trolltech.com/qq/">
<title>Qt Quarterly</title>
</bookmark>
- <bookmark href="http://qtsoftware.com/">
- <title>Trolltech's home page</title>
+ <bookmark href="http://qt.nokia.com/">
+ <title>Qt home page</title>
</bookmark>
<bookmark href="http://doc.trolltech.com/4.0/">
<title>Qt 4.0 documentation</title>
</bookmark>
- <bookmark href="http://qtsoftware.com/developer/faqs/">
+ <bookmark href="http://qt.nokia.com/developer/faqs/">
<title>Frequently Asked Questions</title>
</bookmark>
</folder>
diff --git a/examples/xml/saxbookmarks/frank.xbel b/examples/xml/saxbookmarks/frank.xbel
index d6a12c6..4dfaa4c 100644
--- a/examples/xml/saxbookmarks/frank.xbel
+++ b/examples/xml/saxbookmarks/frank.xbel
@@ -80,8 +80,8 @@
<bookmark href="http://doc.trolltech.com/4.0/">
<title>Qt 4.0 Reference</title>
</bookmark>
- <bookmark href="http://qtsoftware.com/">
- <title>Trolltech Home Page</title>
+ <bookmark href="http://qt.nokia.com/">
+ <title>Qt Home Page</title>
</bookmark>
</folder>
<folder folded="yes">
diff --git a/examples/xml/saxbookmarks/jennifer.xbel b/examples/xml/saxbookmarks/jennifer.xbel
index 597880a..51f0996 100644
--- a/examples/xml/saxbookmarks/jennifer.xbel
+++ b/examples/xml/saxbookmarks/jennifer.xbel
@@ -48,13 +48,13 @@
<bookmark href="http://doc.trolltech.com/qq/">
<title>Qt Quarterly</title>
</bookmark>
- <bookmark href="http://qtsoftware.com/">
- <title>Trolltech's home page</title>
+ <bookmark href="http://qt.nokia.com/">
+ <title>qt home page</title>
</bookmark>
<bookmark href="http://doc.trolltech.com/4.0/">
<title>Qt 4.0 documentation</title>
</bookmark>
- <bookmark href="http://qtsoftware.com/developer/faqs/">
+ <bookmark href="http://qt.nokia.com/developer/faqs/">
<title>Frequently Asked Questions</title>
</bookmark>
</folder>
diff --git a/examples/xml/streambookmarks/frank.xbel b/examples/xml/streambookmarks/frank.xbel
index d6a12c6..4dfaa4c 100644
--- a/examples/xml/streambookmarks/frank.xbel
+++ b/examples/xml/streambookmarks/frank.xbel
@@ -80,8 +80,8 @@
<bookmark href="http://doc.trolltech.com/4.0/">
<title>Qt 4.0 Reference</title>
</bookmark>
- <bookmark href="http://qtsoftware.com/">
- <title>Trolltech Home Page</title>
+ <bookmark href="http://qt.nokia.com/">
+ <title>Qt Home Page</title>
</bookmark>
</folder>
<folder folded="yes">
diff --git a/examples/xml/streambookmarks/jennifer.xbel b/examples/xml/streambookmarks/jennifer.xbel
index 597880a..ea75cbc 100644
--- a/examples/xml/streambookmarks/jennifer.xbel
+++ b/examples/xml/streambookmarks/jennifer.xbel
@@ -4,7 +4,7 @@
<folder folded="no">
<title>Qt Resources</title>
<folder folded="yes">
- <title>Trolltech Partners</title>
+ <title>Qt Partners</title>
<bookmark href="http://partners.trolltech.com/partners/training.html">
<title>Training Partners</title>
</bookmark>
@@ -48,13 +48,13 @@
<bookmark href="http://doc.trolltech.com/qq/">
<title>Qt Quarterly</title>
</bookmark>
- <bookmark href="http://qtsoftware.com/">
- <title>Trolltech's home page</title>
+ <bookmark href="http://qt.nokia.com/">
+ <title>Qt home page</title>
</bookmark>
<bookmark href="http://doc.trolltech.com/4.0/">
<title>Qt 4.0 documentation</title>
</bookmark>
- <bookmark href="http://qtsoftware.com/developer/faqs/">
+ <bookmark href="http://qt.nokia.com/developer/faqs/">
<title>Frequently Asked Questions</title>
</bookmark>
</folder>
diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp
index 5c1d4f3..77df601 100644
--- a/src/corelib/io/qurl.cpp
+++ b/src/corelib/io/qurl.cpp
@@ -5657,7 +5657,7 @@ QString QUrl::fromPunycode(const QByteArray &pc)
The ASCII Compatible Encoding (ACE) is defined by RFC 3490, RFC 3491
and RFC 3492. It is part of the Internationalizing Domain Names in
Applications (IDNA) specification, which allows for domain names
- (like \c "qtsoftware.com") to be written using international
+ (like \c "example.com") to be written using international
characters.
*/
QString QUrl::fromAce(const QByteArray &domain)
@@ -5674,7 +5674,7 @@ QString QUrl::fromAce(const QByteArray &domain)
The ASCII-Compatible Encoding (ACE) is defined by RFC 3490, RFC 3491
and RFC 3492. It is part of the Internationalizing Domain Names in
Applications (IDNA) specification, which allows for domain names
- (like \c "qtsoftware.com") to be written using international
+ (like \c "example.com") to be written using international
characters.
*/
QByteArray QUrl::toAce(const QString &domain)
@@ -5966,10 +5966,10 @@ bool QUrl::isParentOf(const QUrl &childUrl) const
Use resolved("..") instead.
\oldcode
- QUrl url("http://qtsoftware.com/Developer/");
+ QUrl url("http://example.com/Developer/");
url.cdUp();
\newcode
- QUrl url("http://qtsoftware.com/Developer/");
+ QUrl url("http://example.com/Developer/");
url = url.resolved("..");
\endcode
*/
diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/xml/qxmlstream.h
index 9c1b6d2..3353cd4 100644
--- a/src/corelib/xml/qxmlstream.h
+++ b/src/corelib/xml/qxmlstream.h
@@ -60,7 +60,7 @@ QT_MODULE(Core)
// keep binary compatibility
//
// The list of supported platforms is in:
-// http://qtsoftware.com/developer/notes/supported_platforms
+// http://qt.nokia.com/doc/supported_platforms.html
//
// These platforms do not support symbol moving nor duplication
// (because duplicate symbols cause warnings when linking):
diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp
index 4444b2c..7a81ea5 100644
--- a/src/gui/dialogs/qmessagebox.cpp
+++ b/src/gui/dialogs/qmessagebox.cpp
@@ -1712,10 +1712,10 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title)
"use such applications in combination with software subject to the "
"terms of the GNU GPL version 3.0 or where you are otherwise willing "
"to comply with the terms of the GNU GPL version 3.0.</p>"
- "<p>Please see <a href=\"http://www.qtsoftware.com/products/licensing\">www.qtsoftware.com/products/licensing</a> "
+ "<p>Please see <a href=\"http://qt.nokia.com/products/licensing\">qt.nokia.com/products/licensing</a> "
"for an overview of Qt licensing.</p>"
"<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>"
- "<p>Qt is a Nokia product. See <a href=\"http://www.qtsoftware.com/qt/\">www.qtsoftware.com/qt</a> "
+ "<p>Qt is a Nokia product. See <a href=\"http://qt.nokia.com/\">qt.nokia.com</a> "
"for more information.</p>"
);
QMessageBox *msgBox = new QMessageBox(parent);
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 23a72a4..cc41f73 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -4177,7 +4177,7 @@ void QWidget::setForegroundRole(QPalette::ColorRole role)
assigning roles to a widget's palette is not guaranteed to change the
appearance of the widget. Instead, you may choose to apply a \l
styleSheet. You can refer to our Knowledge Base article
- \l{http://qtsoftware.com/developer/knowledgebase/22}{here} for more
+ \l{http://qt.nokia.com/developer/knowledgebase/22}{here} for more
information.
\warning Do not use this function in conjunction with \l{Qt Style Sheets}.
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index 4ab1c4a..9a2f49b6 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -1604,7 +1604,7 @@ void QTextCharFormat::setUnderlineStyle(UnderlineStyle style)
\fn void QTextCharFormat::setAnchorHref(const QString &value)
Sets the hypertext link for the text format to the given \a value.
- This is typically a URL like "http://qtsoftware.com/index.html".
+ This is typically a URL like "http://example.com/index.html".
The anchor will be displayed with the \a value as its display text;
if you want to display different text call setAnchorNames().
diff --git a/src/gui/widgets/qvalidator.cpp b/src/gui/widgets/qvalidator.cpp
index ca343fb..7db0247 100644
--- a/src/gui/widgets/qvalidator.cpp
+++ b/src/gui/widgets/qvalidator.cpp
@@ -90,7 +90,7 @@ QT_BEGIN_NAMESPACE
Intermediate, and "asdf" and 1114 is \l Invalid.
\i For an editable combobox that accepts URLs, any well-formed URL
- is \l Acceptable, "http://qtsoftware.com/," is \l Intermediate
+ is \l Acceptable, "http://example.com/," is \l Intermediate
(it might be a cut and paste action that accidentally took in a
comma at the end), the empty string is \l Intermediate (the user
might select and delete all of the text in preparation for entering
@@ -98,7 +98,7 @@ QT_BEGIN_NAMESPACE
\i For a spin box that accepts lengths, "11cm" and "1in" are \l
Acceptable, "11" and the empty string are \l Intermediate, and
- "http://qtsoftware.com" and "hour" are \l Invalid.
+ "http://example.com" and "hour" are \l Invalid.
\endlist
diff --git a/src/network/access/qhttp.cpp b/src/network/access/qhttp.cpp
index 839a2d2..9d0b413 100644
--- a/src/network/access/qhttp.cpp
+++ b/src/network/access/qhttp.cpp
@@ -1452,8 +1452,7 @@ QString QHttpRequestHeader::toString() const
To make an HTTP request you must set up suitable HTTP headers. The
following example demonstrates how to request the main HTML page
- from the Trolltech home page (i.e., the URL
- \c http://qtsoftware.com/index.html):
+ from the Qt website (i.e., the URL \c http://qt.nokia.com/index.html):
\snippet doc/src/snippets/code/src_network_access_qhttp.cpp 2
@@ -2166,7 +2165,7 @@ int QHttp::setProxy(const QNetworkProxy &proxy)
as specified in the constructor.
\a path must be a absolute path like \c /index.html or an
- absolute URI like \c http://qtsoftware.com/index.html and
+ absolute URI like \c http://example.com/index.html and
must be encoded with either QUrl::toPercentEncoding() or
QUrl::encodedPath().
@@ -2205,7 +2204,7 @@ int QHttp::get(const QString &path, QIODevice *to)
as specified in the constructor.
\a path must be an absolute path like \c /index.html or an
- absolute URI like \c http://qtsoftware.com/index.html and
+ absolute URI like \c http://example.com/index.html and
must be encoded with either QUrl::toPercentEncoding() or
QUrl::encodedPath().
@@ -2256,7 +2255,7 @@ int QHttp::post(const QString &path, const QByteArray &data, QIODevice *to)
or as specified in the constructor.
\a path must be an absolute path like \c /index.html or an
- absolute URI like \c http://qtsoftware.com/index.html.
+ absolute URI like \c http://example.com/index.html.
The function does not block; instead, it returns immediately. The request
is scheduled, and its execution is performed asynchronously. The
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index 52b6d07..49ffe3d 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -1249,7 +1249,7 @@ bool QAbstractSocket::isValid() const
\a hostName may be an IP address in string form (e.g.,
"43.195.83.32"), or it may be a host name (e.g.,
- "qtsoftware.com"). QAbstractSocket will do a lookup only if
+ "example.com"). QAbstractSocket will do a lookup only if
required. \a port is in native byte order.
\sa state(), peerName(), peerAddress(), peerPort(), waitForConnected()
diff --git a/src/qt3support/network/q3http.cpp b/src/qt3support/network/q3http.cpp
index 45e470d..c1c2148 100644
--- a/src/qt3support/network/q3http.cpp
+++ b/src/qt3support/network/q3http.cpp
@@ -1048,8 +1048,7 @@ QString Q3HttpRequestHeader::toString() const
To make an HTTP request you must set up suitable HTTP headers. The
following example demonstrates, how to request the main HTML page
- from the Trolltech home page (i.e. the URL
- http://qtsoftware.com/index.html):
+ from the Qt website (i.e. the URL \c http://qt.nokia.com/index.html):
\snippet doc/src/snippets/code/src_qt3support_network_q3http.cpp 3
@@ -1535,7 +1534,7 @@ int Q3Http::setHost(const QString &hostname, Q_UINT16 port )
as specified in the constructor.
\a path must be an absolute path like \c /index.html or an
- absolute URI like \c http://qtsoftware.com/index.html.
+ absolute URI like \c http://example.com/index.html.
If the IO device \a to is 0 the readyRead() signal is emitted
every time new content data is available to read.
@@ -1568,7 +1567,7 @@ int Q3Http::get( const QString& path, QIODevice* to )
as specified in the constructor.
\a path must be an absolute path like \c /index.html or an
- absolute URI like \c http://qtsoftware.com/index.html.
+ absolute URI like \c http://example.com/index.html.
The incoming data comes via the \a data IO device.
@@ -1615,7 +1614,7 @@ int Q3Http::post( const QString& path, const QByteArray& data, QIODevice* to )
or as specified in the constructor.
\a path must be an absolute path like \c /index.html or an
- absolute URI like \c http://qtsoftware.com/index.html.
+ absolute URI like \c http://example.com/index.html.
The function does not block and returns immediately. The request
is scheduled, and its execution is performed asynchronously. The
diff --git a/src/qt3support/network/q3url.cpp b/src/qt3support/network/q3url.cpp