Fix some more old references and links to Nokia

Task-number: QTBUG-28156
Change-Id: I9ba0d6f1e92103219bec1e61e716b6b2f269a8ad
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
This commit is contained in:
Sergio Ahumada 2013-01-26 13:39:56 +01:00 committed by The Qt Project
parent 223ba7e66a
commit f262815f2e
29 changed files with 65 additions and 65 deletions

View File

@ -51,14 +51,14 @@ QString contentType = header.value("content-type");
//! [2] //! [2]
QHttpRequestHeader header("GET", QUrl::toPercentEncoding("/index.html")); QHttpRequestHeader header("GET", QUrl::toPercentEncoding("/index.html"));
header.setValue("Host", "qt.nokia.com"); header.setValue("Host", "qt-project.org");
http->setHost("qt.nokia.com"); http->setHost("qt-project.org");
http->request(header); http->request(header);
//! [2] //! [2]
//! [3] //! [3]
http->setHost("qt.nokia.com"); // id == 1 http->setHost("qt-project.org"); // id == 1
http->get(QUrl::toPercentEncoding("/index.html")); // id == 2 http->get(QUrl::toPercentEncoding("/index.html")); // id == 2
//! [3] //! [3]

View File

@ -192,6 +192,6 @@
fetched with QTextBlock::userData(). Matching parentheses can be fetched with QTextBlock::userData(). Matching parentheses can be
highlighted with an extra selection. The "Matching Parentheses highlighted with an extra selection. The "Matching Parentheses
with QSyntaxHighlighter" article in Qt Quarterly 31 implements with QSyntaxHighlighter" article in Qt Quarterly 31 implements
this. You find it here: \l{http://doc.qt.nokia.com/qq/}. this. You find it here: \l{http://doc.qt.digia.com/qq/}.
*/ */

View File

@ -248,7 +248,7 @@
It is possible to implement parenthesis matching with It is possible to implement parenthesis matching with
QSyntaxHighlighter. The "Matching Parentheses with QSyntaxHighlighter. The "Matching Parentheses with
QSyntaxHighlighter" article in Qt Quarterly 31 QSyntaxHighlighter" article in Qt Quarterly 31
(\l{http://doc.qt.nokia.com/qq/}) implements this. We also have (\l{http://doc.qt.digia.com/qq/}) implements this. We also have
the \l{Code Editor Example}, which shows how to implement line the \l{Code Editor Example}, which shows how to implement line
numbers and how to highlight the current line. numbers and how to highlight the current line.

View File

@ -4,7 +4,7 @@ Qt documentation, which can be viewed using Qt Assistant or a Web browser.
The tutorial is also available online at The tutorial is also available online at
http://qt.nokia.com/doc/4.4/tutorial.html http://qt-project.org/doc/qt-5.0/qtwidgets/tutorials-addressbook.html
All programs corresponding to the chapters in the tutorial should All programs corresponding to the chapters in the tutorial should
automatically be built when Qt is compiled, or will be provided as automatically be built when Qt is compiled, or will be provided as

View File

@ -4,7 +4,7 @@ Qt documentation, which can be viewed using Qt Assistant or a Web browser.
The tutorial is also available online at The tutorial is also available online at
http://qt.nokia.com/doc/tutorial.html http://qt-project.org/doc/qt-5.0/qtwidgets/tutorials-addressbook.html
All programs corresponding to the chapters in the tutorial should All programs corresponding to the chapters in the tutorial should
automatically be built when Qt is compiled, or will be provided as automatically be built when Qt is compiled, or will be provided as

View File

@ -67,7 +67,7 @@ void MainWindow::on_aboutAction_triggered()
{ {
QMessageBox::about(this, tr("About Style sheet"), QMessageBox::about(this, tr("About Style sheet"),
tr("The <b>Style Sheet</b> example shows how widgets can be styled " tr("The <b>Style Sheet</b> example shows how widgets can be styled "
"using <a href=\"http://qt.nokia.com/doc/4.5/stylesheet.html\">Qt " "using <a href=\"http://doc.qt.digia.com/4.5/stylesheet.html\">Qt "
"Style Sheets</a>. Click <b>File|Edit Style Sheet</b> to pop up the " "Style Sheets</a>. Click <b>File|Edit Style Sheet</b> to pop up the "
"style editor, and either choose an existing style sheet or design " "style editor, and either choose an existing style sheet or design "
"your own.")); "your own."));

View File

@ -71,16 +71,16 @@
</folder> </folder>
<folder folded="no"> <folder folded="no">
<title>Qt</title> <title>Qt</title>
<bookmark href="http://qt.nokia.com/doc/2.3/"> <bookmark href="http://doc.qt.digia.com/2.3/">
<title>Qt 2.3 Reference</title> <title>Qt 2.3 Reference</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/doc/3.3/"> <bookmark href="http://doc.qt.digia.com/3.3/">
<title>Qt 3.3 Reference</title> <title>Qt 3.3 Reference</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/doc/4.0/"> <bookmark href="http://doc.qt.digia.com/4.0/">
<title>Qt 4.0 Reference</title> <title>Qt 4.0 Reference</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/"> <bookmark href="http://qt-project.org/">
<title>Qt Home Page</title> <title>Qt Home Page</title>
</bookmark> </bookmark>
</folder> </folder>

View File

@ -45,16 +45,16 @@
<title>QtQuestions</title> <title>QtQuestions</title>
</bookmark> </bookmark>
</folder> </folder>
<bookmark href="http://qt.nokia.com/doc/qq/"> <bookmark href="http://doc.qt.digia.com/qq/">
<title>Qt Quarterly</title> <title>Qt Quarterly</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/"> <bookmark href="http://qt-project.org/">
<title>Qt home page</title> <title>Qt home page</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/doc/4.0/"> <bookmark href="http://doc.qt.digia.com/4.0/">
<title>Qt 4.0 documentation</title> <title>Qt 4.0 documentation</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/developer/faqs/"> <bookmark href="http://qt-project.org/faq/">
<title>Frequently Asked Questions</title> <title>Frequently Asked Questions</title>
</bookmark> </bookmark>
</folder> </folder>

View File

@ -5,7 +5,7 @@
</head> </head>
<body> <body>
<p>A paragraph.</p> <p>A paragraph.</p>
<p>A second paragraph. Check out our <a href="http://labs.qt.nokia.com/">developer blogs</a></p> <p>A second paragraph. Check out our <a href="http://blog.qt.digia.com/">developer blogs</a></p>
<p>And the last paragraph. Or our <a href="http://qt.nokia.com/doc/">online documentation</a>.</p> <p>And the last paragraph. Or our <a href="http://qt-project.org/doc/">online documentation</a>.</p>
</body> </body>
</html> </html>

View File

@ -76,7 +76,7 @@ RSSListing::RSSListing(QWidget *parent)
{ {
lineEdit = new QLineEdit(this); lineEdit = new QLineEdit(this);
lineEdit->setText("http://labs.qt.nokia.com/blogs/feed"); lineEdit->setText("http://blog.qt.digia.com/feed/");
fetchButton = new QPushButton(tr("Fetch"), this); fetchButton = new QPushButton(tr("Fetch"), this);

View File

@ -71,16 +71,16 @@
</folder> </folder>
<folder folded="no"> <folder folded="no">
<title>Qt</title> <title>Qt</title>
<bookmark href="http://qt.nokia.com/doc/2.3/"> <bookmark href="http://doc.qt.digia.com/2.3/">
<title>Qt 2.3 Reference</title> <title>Qt 2.3 Reference</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/doc/3.3/"> <bookmark href="http://doc.qt.digia.com/3.3/">
<title>Qt 3.3 Reference</title> <title>Qt 3.3 Reference</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/doc/4.0/"> <bookmark href="http://doc.qt.digia.com/4.0/">
<title>Qt 4.0 Reference</title> <title>Qt 4.0 Reference</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/"> <bookmark href="http://qt-project.org/">
<title>Qt Home Page</title> <title>Qt Home Page</title>
</bookmark> </bookmark>
</folder> </folder>

View File

@ -45,16 +45,16 @@
<title>QtQuestions</title> <title>QtQuestions</title>
</bookmark> </bookmark>
</folder> </folder>
<bookmark href="http://qt.nokia.com/doc/qq/"> <bookmark href="http://doc.qt.digia.com/qq/">
<title>Qt Quarterly</title> <title>Qt Quarterly</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/"> <bookmark href="http://qt-project.org/">
<title>qt home page</title> <title>qt home page</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/doc/4.0/"> <bookmark href="http://doc.qt.digia.com/4.0/">
<title>Qt 4.0 documentation</title> <title>Qt 4.0 documentation</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/developer/faqs/"> <bookmark href="http://qt-project.org/faq/">
<title>Frequently Asked Questions</title> <title>Frequently Asked Questions</title>
</bookmark> </bookmark>
</folder> </folder>

View File

@ -71,16 +71,16 @@
</folder> </folder>
<folder folded="no"> <folder folded="no">
<title>Qt</title> <title>Qt</title>
<bookmark href="http://qt.nokia.com/doc/2.3/"> <bookmark href="http://doc.qt.digia.com/2.3/">
<title>Qt 2.3 Reference</title> <title>Qt 2.3 Reference</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/doc/3.3/"> <bookmark href="http://doc.qt.digia.com/3.3/">
<title>Qt 3.3 Reference</title> <title>Qt 3.3 Reference</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/doc/4.0/"> <bookmark href="http://doc.qt.digia.com/4.0/">
<title>Qt 4.0 Reference</title> <title>Qt 4.0 Reference</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/"> <bookmark href="http://qt-project.org/">
<title>Qt Home Page</title> <title>Qt Home Page</title>
</bookmark> </bookmark>
</folder> </folder>

View File

@ -45,16 +45,16 @@
<title>QtQuestions</title> <title>QtQuestions</title>
</bookmark> </bookmark>
</folder> </folder>
<bookmark href="http://qt.nokia.com/doc/qq/"> <bookmark href="http://doc.qt.digia.com/qq/">
<title>Qt Quarterly</title> <title>Qt Quarterly</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/"> <bookmark href="http://qt-project.org/">
<title>Qt home page</title> <title>Qt home page</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/doc/4.0/"> <bookmark href="http://doc.qt.digia.com/4.0/">
<title>Qt 4.0 documentation</title> <title>Qt 4.0 documentation</title>
</bookmark> </bookmark>
<bookmark href="http://qt.nokia.com/developer/faqs/"> <bookmark href="http://qt-project.org/faq/">
<title>Frequently Asked Questions</title> <title>Frequently Asked Questions</title>
</bookmark> </bookmark>
</folder> </folder>

View File

@ -45,7 +45,7 @@ QUrl url("http://www.example.com/List of holidays.xml");
//! [1] //! [1]
QUrl url = QUrl::fromEncoded("http://qt.nokia.com/List%20of%20holidays.xml"); QUrl url = QUrl::fromEncoded("http://qt-project.org/List%20of%20holidays.xml");
//! [1] //! [1]
@ -73,10 +73,10 @@ http://www.example.com/cgi-bin/drawgraph.cgi?type(pie)color(green)
//! [5] //! [5]
QUrl baseUrl("http://qt.nokia.com/support"); QUrl baseUrl("http://qt.digia.com/Support/");
QUrl relativeUrl("../products/solutions"); QUrl relativeUrl("../Product/Library/");
qDebug(baseUrl.resolved(relativeUrl).toString()); qDebug(baseUrl.resolved(relativeUrl).toString());
// prints "http://qt.nokia.com/products/solutions" // prints "http://qt.digia.com/Product/Library/"
//! [5] //! [5]

View File

@ -258,7 +258,7 @@ if (url.startsWith("ftp:"))
//! [26] //! [26]
QByteArray url("http://qt.nokia.com/index.html"); QByteArray url("http://qt-project.org/doc/qt-5.0/qtdoc/index.html");
if (url.endsWith(".html")) if (url.endsWith(".html"))
... ...
//! [26] //! [26]
@ -286,16 +286,16 @@ QByteArray z = x.mid(5); // z == "pineapples"
//! [30] //! [30]
QByteArray x("Qt by NOKIA"); QByteArray x("Qt by DIGIA");
QByteArray y = x.toLower(); QByteArray y = x.toLower();
// y == "qt by nokia" // y == "qt by digia"
//! [30] //! [30]
//! [31] //! [31]
QByteArray x("Qt by NOKIA"); QByteArray x("Qt by DIGIA");
QByteArray y = x.toUpper(); QByteArray y = x.toUpper();
// y == "QT BY NOKIA" // y == "QT BY DIGIA"
//! [31] //! [31]

View File

@ -61,8 +61,8 @@ int main(int argc, char *argv[])
stream.writeAttribute("folded", "no"); stream.writeAttribute("folded", "no");
//! [write element] //! [write element]
stream.writeStartElement("bookmark"); stream.writeStartElement("bookmark");
stream.writeAttribute("href", "http://qt.nokia.com/"); stream.writeAttribute("href", "http://qt-project.org/");
stream.writeTextElement("title", "Qt Home"); stream.writeTextElement("title", "Qt Project");
stream.writeEndElement(); // bookmark stream.writeEndElement(); // bookmark
//! [write element] //! [write element]
stream.writeEndElement(); // folder stream.writeEndElement(); // folder

View File

@ -100,7 +100,7 @@
event delivery mechanisms are flexible. The documentation for event delivery mechanisms are flexible. The documentation for
QCoreApplication::notify() concisely tells the whole story; the QCoreApplication::notify() concisely tells the whole story; the
\e{Qt Quarterly} article \e{Qt Quarterly} article
\l{http://doc.qt.nokia.com/qq/qq11-events.html}{Another Look at Events} \l{http://doc.qt.digia.com/qq/qq11-events.html}{Another Look at Events}
rehashes it less concisely. Here we will explain enough for 95% rehashes it less concisely. Here we will explain enough for 95%
of applications. of applications.

View File

@ -2492,7 +2492,7 @@
"\l{http://bugreports.qt-project.org/browse/QTWEBSITE-13}{http://bugreports.qt.../QTWEBSITE-13/}"), "\l{http://bugreports.qt-project.org/browse/QTWEBSITE-13}{http://bugreports.qt.../QTWEBSITE-13/}"),
whereas Qt::ElideRight is appropriate whereas Qt::ElideRight is appropriate
for other strings (e.g., for other strings (e.g.,
"\l{http://qt.nokia.com/doc/qq/qq09-mac-deployment.html}{Deploying Applications on Ma...}"). "\l{http://doc.qt.digia.com/qq/qq09-mac-deployment.html}{Deploying Applications on Ma...}").
\sa QAbstractItemView::textElideMode, QFontMetrics::elidedText(), AlignmentFlag, QTabBar::elideMode \sa QAbstractItemView::textElideMode, QFontMetrics::elidedText(), AlignmentFlag, QTabBar::elideMode
*/ */

View File

@ -3861,7 +3861,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\section1 Examples: \section1 Examples:
\list \list
\li qt.nokia.com becomes http://qt.nokia.com \li qt-project.org becomes http://qt-project.org
\li ftp.qt-project.org becomes ftp://ftp.qt-project.org \li ftp.qt-project.org becomes ftp://ftp.qt-project.org
\li hostname becomes http://hostname \li hostname becomes http://hostname
\li /home/user/test.html becomes file:///home/user/test.html \li /home/user/test.html becomes file:///home/user/test.html

View File

@ -83,7 +83,7 @@ QT_BEGIN_NAMESPACE
memory. memory.
The \e{Qt Quarterly} article The \e{Qt Quarterly} article
\l{http://qt.nokia.com/doc/qq/qq12-qpixmapcache.html}{Optimizing \l{http://doc.qt.digia.com/qq/qq12-qpixmapcache.html}{Optimizing
with QPixmapCache} explains how to use QPixmapCache to speed up with QPixmapCache} explains how to use QPixmapCache to speed up
applications by caching the results of painting. applications by caching the results of painting.

View File

@ -43,13 +43,13 @@ QNetworkAccessManager *manager = new QNetworkAccessManager(this);
connect(manager, SIGNAL(finished(QNetworkReply*)), connect(manager, SIGNAL(finished(QNetworkReply*)),
this, SLOT(replyFinished(QNetworkReply*))); this, SLOT(replyFinished(QNetworkReply*)));
manager->get(QNetworkRequest(QUrl("http://qt.nokia.com"))); manager->get(QNetworkRequest(QUrl("http://qt-project.org")));
//! [0] //! [0]
//! [1] //! [1]
QNetworkRequest request; QNetworkRequest request;
request.setUrl(QUrl("http://qt.nokia.com")); request.setUrl(QUrl("http://qt-project.org"));
request.setRawHeader("User-Agent", "MyOwnBrowser 1.0"); request.setRawHeader("User-Agent", "MyOwnBrowser 1.0");
QNetworkReply *reply = manager->get(request); QNetworkReply *reply = manager->get(request);

View File

@ -47,11 +47,11 @@ manager->setCache(diskCache);
//! [1] //! [1]
// do a normal request (preferred from network, as this is the default) // do a normal request (preferred from network, as this is the default)
QNetworkRequest request(QUrl(QString("http://qt.nokia.com"))); QNetworkRequest request(QUrl(QString("http://qt-project.org")));
manager->get(request); manager->get(request);
// do a request preferred from cache // do a request preferred from cache
QNetworkRequest request2(QUrl(QString("http://qt.nokia.com"))); QNetworkRequest request2(QUrl(QString("http://qt-project.org")));
request2.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache); request2.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
manager->get(request2); manager->get(request2);
//! [1] //! [1]

View File

@ -39,8 +39,8 @@
****************************************************************************/ ****************************************************************************/
//! [0] //! [0]
// To find the IP address of qt.nokia.com // To find the IP address of qt-project.org
QHostInfo::lookupHost("qt.nokia.com", QHostInfo::lookupHost("qt-project.org",
this, SLOT(printResults(QHostInfo))); this, SLOT(printResults(QHostInfo)));
// To find the host name for 4.2.2.1 // To find the host name for 4.2.2.1
@ -50,7 +50,7 @@ QHostInfo::lookupHost("4.2.2.1",
//! [1] //! [1]
QHostInfo info = QHostInfo::fromName("qt.nokia.com"); QHostInfo info = QHostInfo::fromName("qt-project.org");
//! [1] //! [1]

View File

@ -3573,7 +3573,7 @@ bool QWizardPage::validatePage()
from the rest of your implementation, whenever the value of isComplete() from the rest of your implementation, whenever the value of isComplete()
changes. This ensures that QWizard updates the enabled or disabled state of changes. This ensures that QWizard updates the enabled or disabled state of
its buttons. An example of the reimplementation is its buttons. An example of the reimplementation is
available \l{http://qt.nokia.com/doc/qq/qq22-qwizard.html#validatebeforeitstoolate} available \l{http://doc.qt.digia.com/qq/qq22-qwizard.html#validatebeforeitstoolate}
{here}. {here}.
\sa completeChanged(), isFinalPage() \sa completeChanged(), isFinalPage()

View File

@ -576,7 +576,7 @@
problem. problem.
Qt Labs provides software called Qt Labs provides software called
\l{http://labs.qt.nokia.com/page/Projects/Itemview/Modeltest}{ModelTest}, \l{http://qt-project.org/wiki/Model_Test}{ModelTest},
which checks models while your programming is running. Every time the model which checks models while your programming is running. Every time the model
is changed, ModelTest scans the model and reports errors with an assert. is changed, ModelTest scans the model and reports errors with an assert.
This is especially important for tree models, since their hierarchical This is especially important for tree models, since their hierarchical

View File

@ -249,7 +249,7 @@
For further guidance when implementing these functions, see the For further guidance when implementing these functions, see the
\e{Qt Quarterly} article \e{Qt Quarterly} article
\l{http://doc.qt.nokia.com/qq/qq04-height-for-width.html} \l{http://doc.qt.digia.com/qq/qq04-height-for-width.html}
{Trading Height for Width}. {Trading Height for Width}.

View File

@ -109,7 +109,7 @@ QSizePolicy::operator QVariant() const
be expressed using hasHeightForWidth(), heightForWidth(), and be expressed using hasHeightForWidth(), heightForWidth(), and
minimumHeightForWidth(). For more explanation see the \e{Qt minimumHeightForWidth(). For more explanation see the \e{Qt
Quarterly} article Quarterly} article
\l{http://qt.nokia.com/doc/qq/qq04-height-for-width.html}{Trading \l{http://doc.qt.digia.com/qq/qq04-height-for-width.html}{Trading
Height for Width}. Height for Width}.
\sa QLayout \sa QLayout

View File

@ -108,7 +108,7 @@ QDomElement element4 = document.createElement("MyElement");
//! [7] //! [7]
<link href="http://qt.nokia.com" color="red" /> <link href="http://qt-project.org" color="red" />
//! [7] //! [7]
@ -116,10 +116,10 @@ QDomElement element4 = document.createElement("MyElement");
QDomElement e = //... QDomElement e = //...
//... //...
QDomAttr a = e.attributeNode("href"); QDomAttr a = e.attributeNode("href");
cout << a.value() << endl; // prints "http://qt.nokia.com" cout << a.value() << endl; // prints "http://qt-project.org"
a.setValue("http://qt.nokia.com/doc"); // change the node's attribute a.setValue("http://qt-project.org/doc"); // change the node's attribute
QDomAttr a2 = e.attributeNode("href"); QDomAttr a2 = e.attributeNode("href");
cout << a2.value() << endl; // prints "http://qt.nokia.com/doc" cout << a2.value() << endl; // prints "http://qt-project.org/doc"
//! [8] //! [8]