summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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
12 files changed, 29 insertions, 31 deletions
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
index 36c3727..0910b31 100644
--- a/src/qt3support/network/q3url.cpp
+++ b/src/qt3support/network/q3url.cpp
@@ -109,12 +109,12 @@ static void slashify( QString& s, bool allowMultiple = true )
Example:
- <tt>http://qtsoftware.com:80/cgi-bin/test%20me.pl?cmd=Hello%20you</tt>
+ <tt>http://example.com:80/cgi-bin/test%20me.pl?cmd=Hello%20you</tt>
\table
\header \i Function \i Returns
\row \i \l protocol() \i "http"
- \row \i \l host() \i "qtsoftware.com"
+ \row \i \l host() \i "example.com"
\row \i \l port() \i 80
\row \i \l path() \i "/cgi-bin/test&nbsp;me.pl"
\row \i \l fileName() \i "test&nbsp;me.pl"
@@ -123,13 +123,13 @@ static void slashify( QString& s, bool allowMultiple = true )
Example:
- <tt>http://doc.trolltech.com/qdockarea.html#lines</tt>
+ <tt>http://qt.nokia.com/doc/qdockarea.html#lines</tt>
\table
\header \i Function \i Returns
\row \i \l protocol() \i "http"
- \row \i \l host() \i "doc.trolltech.com"
- \row \i \l fileName() \i "qdockarea.html"
+ \row \i \l host() \i "qt.nokia.com"
+ \row \i \l fileName() \i "doc/qdockarea.html"
\row \i \l ref() \i "lines"
\endtable
diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp
index e15cbf1..0f17231 100644
--- a/src/xml/sax/qxml.cpp
+++ b/src/xml/sax/qxml.cpp
@@ -3149,7 +3149,7 @@ bool QXmlSimpleReader::feature(const QString& name, bool *ok) const
{
const QXmlSimpleReaderPrivate *d = d_func();
- // Qt5 ###: Change these strings to qtsoftware.com
+ // Qt5 ###: Change these strings to qt.nokia.com
if (ok != 0)
*ok = true;
if (name == QLatin1String("http://xml.org/sax/features/namespaces")) {
@@ -3204,7 +3204,7 @@ bool QXmlSimpleReader::feature(const QString& name, bool *ok) const
void QXmlSimpleReader::setFeature(const QString& name, bool enable)
{
Q_D(QXmlSimpleReader);
- // Qt5 ###: Change these strings to qtsoftware.com
+ // Qt5 ###: Change these strings to qt.nokia.com
if (name == QLatin1String("http://xml.org/sax/features/namespaces")) {
d->useNamespaces = enable;
} else if (name == QLatin1String("http://xml.org/sax/features/namespace-prefixes")) {
@@ -3222,7 +3222,7 @@ void QXmlSimpleReader::setFeature(const QString& name, bool enable)
*/
bool QXmlSimpleReader::hasFeature(const QString& name) const
{
- // Qt5 ###: Change these strings to qtsoftware.com
+ // Qt5 ###: Change these strings to qt.nokia.com
if (name == QLatin1String("http://xml.org/sax/features/namespaces")
|| name == QLatin1String("http://xml.org/sax/features/namespace-prefixes")
|| name == QLatin1String("http://trolltech.com/xml/features/report-whitespace-only-CharData") // Shouldn't change in Qt 4
diff --git a/src/xmlpatterns/functions/qsystempropertyfn.cpp b/src/xmlpatterns/functions/qsystempropertyfn.cpp
index 1df6641..88d5cea 100644
--- a/src/xmlpatterns/functions/qsystempropertyfn.cpp
+++ b/src/xmlpatterns/functions/qsystempropertyfn.cpp
@@ -81,7 +81,7 @@ QString SystemPropertyFN::retrieveProperty(const QXmlName name)
case StandardLocalNames::vendor:
return QLatin1String("Nokia Corporation and/or its subsidiary(-ies), a Nokia Company");
case StandardLocalNames::vendor_url:
- return QLatin1String("http://qtsoftware.com/");
+ return QLatin1String("http://qt.nokia.com/");
case StandardLocalNames::product_name:
return QLatin1String("QtXmlPatterns");
case StandardLocalNames::product_version:
generated by cgit v0.12 at 2024-11-06 23:14:41 (GMT)