diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-01-26 13:39:56 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-28 14:27:57 +0100 |
commit | f262815f2ef147113780312a410eccdf4b318a82 (patch) | |
tree | 0bd25c61bd372b77955f0e55f54146e296efb477 /examples | |
parent | 223ba7e66a5220e072f54861881ca85222ddd31b (diff) |
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>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/widgets/doc/src/codeeditor.qdoc | 2 | ||||
-rw-r--r-- | examples/widgets/doc/src/syntaxhighlighter.qdoc | 2 | ||||
-rw-r--r-- | examples/widgets/tutorials/addressbook-fr/README | 2 | ||||
-rw-r--r-- | examples/widgets/tutorials/addressbook/README | 2 | ||||
-rw-r--r-- | examples/widgets/widgets/stylesheet/mainwindow.cpp | 2 | ||||
-rw-r--r-- | examples/xml/dombookmarks/frank.xbel | 8 | ||||
-rw-r--r-- | examples/xml/dombookmarks/jennifer.xbel | 8 | ||||
-rw-r--r-- | examples/xml/htmlinfo/simpleexample.html | 4 | ||||
-rw-r--r-- | examples/xml/rsslisting/rsslisting.cpp | 2 | ||||
-rw-r--r-- | examples/xml/saxbookmarks/frank.xbel | 8 | ||||
-rw-r--r-- | examples/xml/saxbookmarks/jennifer.xbel | 8 | ||||
-rw-r--r-- | examples/xml/streambookmarks/frank.xbel | 8 | ||||
-rw-r--r-- | examples/xml/streambookmarks/jennifer.xbel | 8 |
13 files changed, 32 insertions, 32 deletions
diff --git a/examples/widgets/doc/src/codeeditor.qdoc b/examples/widgets/doc/src/codeeditor.qdoc index 95b75cc82b..a4d1f46a58 100644 --- a/examples/widgets/doc/src/codeeditor.qdoc +++ b/examples/widgets/doc/src/codeeditor.qdoc @@ -192,6 +192,6 @@ fetched with QTextBlock::userData(). Matching parentheses can be highlighted with an extra selection. The "Matching Parentheses 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/}. */ diff --git a/examples/widgets/doc/src/syntaxhighlighter.qdoc b/examples/widgets/doc/src/syntaxhighlighter.qdoc index b417499f6f..ff2b20cad9 100644 --- a/examples/widgets/doc/src/syntaxhighlighter.qdoc +++ b/examples/widgets/doc/src/syntaxhighlighter.qdoc @@ -248,7 +248,7 @@ It is possible to implement parenthesis matching with QSyntaxHighlighter. The "Matching Parentheses with 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 numbers and how to highlight the current line. diff --git a/examples/widgets/tutorials/addressbook-fr/README b/examples/widgets/tutorials/addressbook-fr/README index d24cedf51e..07897b9683 100644 --- a/examples/widgets/tutorials/addressbook-fr/README +++ b/examples/widgets/tutorials/addressbook-fr/README @@ -4,7 +4,7 @@ Qt documentation, which can be viewed using Qt Assistant or a Web browser. 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 automatically be built when Qt is compiled, or will be provided as diff --git a/examples/widgets/tutorials/addressbook/README b/examples/widgets/tutorials/addressbook/README index 39753b4b25..07897b9683 100644 --- a/examples/widgets/tutorials/addressbook/README +++ b/examples/widgets/tutorials/addressbook/README @@ -4,7 +4,7 @@ Qt documentation, which can be viewed using Qt Assistant or a Web browser. 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 automatically be built when Qt is compiled, or will be provided as diff --git a/examples/widgets/widgets/stylesheet/mainwindow.cpp b/examples/widgets/widgets/stylesheet/mainwindow.cpp index df14090f5b..b1444ad069 100644 --- a/examples/widgets/widgets/stylesheet/mainwindow.cpp +++ b/examples/widgets/widgets/stylesheet/mainwindow.cpp @@ -67,7 +67,7 @@ void MainWindow::on_aboutAction_triggered() { QMessageBox::about(this, tr("About Style sheet"), 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 editor, and either choose an existing style sheet or design " "your own.")); diff --git a/examples/xml/dombookmarks/frank.xbel b/examples/xml/dombookmarks/frank.xbel index 6bd63b8b07..2fd5c2e09d 100644 --- a/examples/xml/dombookmarks/frank.xbel +++ b/examples/xml/dombookmarks/frank.xbel @@ -71,16 +71,16 @@ </folder> <folder folded="no"> <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> </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> </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> </bookmark> - <bookmark href="http://qt.nokia.com/"> + <bookmark href="http://qt-project.org/"> <title>Qt Home Page</title> </bookmark> </folder> diff --git a/examples/xml/dombookmarks/jennifer.xbel b/examples/xml/dombookmarks/jennifer.xbel index 36256fda0a..74b7f1519f 100644 --- a/examples/xml/dombookmarks/jennifer.xbel +++ b/examples/xml/dombookmarks/jennifer.xbel @@ -45,16 +45,16 @@ <title>QtQuestions</title> </bookmark> </folder> - <bookmark href="http://qt.nokia.com/doc/qq/"> + <bookmark href="http://doc.qt.digia.com/qq/"> <title>Qt Quarterly</title> </bookmark> - <bookmark href="http://qt.nokia.com/"> + <bookmark href="http://qt-project.org/"> <title>Qt home page</title> </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> </bookmark> - <bookmark href="http://qt.nokia.com/developer/faqs/"> + <bookmark href="http://qt-project.org/faq/"> <title>Frequently Asked Questions</title> </bookmark> </folder> diff --git a/examples/xml/htmlinfo/simpleexample.html b/examples/xml/htmlinfo/simpleexample.html index 83a55cf00a..d46a494979 100644 --- a/examples/xml/htmlinfo/simpleexample.html +++ b/examples/xml/htmlinfo/simpleexample.html @@ -5,7 +5,7 @@ </head> <body> <p>A paragraph.</p> - <p>A second paragraph. Check out our <a href="http://labs.qt.nokia.com/">developer blogs</a></p> - <p>And the last paragraph. Or our <a href="http://qt.nokia.com/doc/">online documentation</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-project.org/doc/">online documentation</a>.</p> </body> </html> diff --git a/examples/xml/rsslisting/rsslisting.cpp b/examples/xml/rsslisting/rsslisting.cpp index d535f679fb..87147e5696 100644 --- a/examples/xml/rsslisting/rsslisting.cpp +++ b/examples/xml/rsslisting/rsslisting.cpp @@ -76,7 +76,7 @@ RSSListing::RSSListing(QWidget *parent) { 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); diff --git a/examples/xml/saxbookmarks/frank.xbel b/examples/xml/saxbookmarks/frank.xbel index 6bd63b8b07..2fd5c2e09d 100644 --- a/examples/xml/saxbookmarks/frank.xbel +++ b/examples/xml/saxbookmarks/frank.xbel @@ -71,16 +71,16 @@ </folder> <folder folded="no"> <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> </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> </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> </bookmark> - <bookmark href="http://qt.nokia.com/"> + <bookmark href="http://qt-project.org/"> <title>Qt Home Page</title> </bookmark> </folder> diff --git a/examples/xml/saxbookmarks/jennifer.xbel b/examples/xml/saxbookmarks/jennifer.xbel index d6a5b41d05..d37b8224df 100644 --- a/examples/xml/saxbookmarks/jennifer.xbel +++ b/examples/xml/saxbookmarks/jennifer.xbel @@ -45,16 +45,16 @@ <title>QtQuestions</title> </bookmark> </folder> - <bookmark href="http://qt.nokia.com/doc/qq/"> + <bookmark href="http://doc.qt.digia.com/qq/"> <title>Qt Quarterly</title> </bookmark> - <bookmark href="http://qt.nokia.com/"> + <bookmark href="http://qt-project.org/"> <title>qt home page</title> </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> </bookmark> - <bookmark href="http://qt.nokia.com/developer/faqs/"> + <bookmark href="http://qt-project.org/faq/"> <title>Frequently Asked Questions</title> </bookmark> </folder> diff --git a/examples/xml/streambookmarks/frank.xbel b/examples/xml/streambookmarks/frank.xbel index 6bd63b8b07..2fd5c2e09d 100644 --- a/examples/xml/streambookmarks/frank.xbel +++ b/examples/xml/streambookmarks/frank.xbel @@ -71,16 +71,16 @@ </folder> <folder folded="no"> <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> </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> </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> </bookmark> - <bookmark href="http://qt.nokia.com/"> + <bookmark href="http://qt-project.org/"> <title>Qt Home Page</title> </bookmark> </folder> diff --git a/examples/xml/streambookmarks/jennifer.xbel b/examples/xml/streambookmarks/jennifer.xbel index 36256fda0a..74b7f1519f 100644 --- a/examples/xml/streambookmarks/jennifer.xbel +++ b/examples/xml/streambookmarks/jennifer.xbel @@ -45,16 +45,16 @@ <title>QtQuestions</title> </bookmark> </folder> - <bookmark href="http://qt.nokia.com/doc/qq/"> + <bookmark href="http://doc.qt.digia.com/qq/"> <title>Qt Quarterly</title> </bookmark> - <bookmark href="http://qt.nokia.com/"> + <bookmark href="http://qt-project.org/"> <title>Qt home page</title> </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> </bookmark> - <bookmark href="http://qt.nokia.com/developer/faqs/"> + <bookmark href="http://qt-project.org/faq/"> <title>Frequently Asked Questions</title> </bookmark> </folder> |