Doc: Replace some references to Nokia

Link to internal QDoc pages, or to qt-project.org

Change-Id: I5d9adae711213873ab57ccfc5bb2d8f74cf5689b
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>

diff --git a/src/qml/doc/snippets/qml/imports/merged-named-imports.qml b/src/qml/doc/snippets/qml/imports/merged-named-imports.qml
index c95d9e6..c37ac5e 100644 (file)
--- a/src/qml/doc/snippets/qml/imports/merged-named-imports.qml
+++ b/src/qml/doc/snippets/qml/imports/merged-named-imports.qml
@@ -39,8 +39,8 @@
 ****************************************************************************/
 
 //! [imports]
-import QtQuick 2.0 as Nokia
-import Ovi 1.0 as Nokia
+import QtQuick 2.0 as Project
+import QtMultimedia 5.0 as Project
 //! [imports]
 
 Item {

diff --git a/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc b/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc
index c195c87..7d2d662 100644 (file)
--- a/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc
+++ b/src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc
@@ -241,7 +241,7 @@ property is only invoked when the property is reassigned to a different object v
     \brief a resource locator.
 
     The \c url type refers to a resource locator (like a file name, for example). It can be either
-    absolute, e.g. "http://qt.nokia.com", or relative, e.g.  "pics/logo.png". A relative URL is
+    absolute, e.g. "http://qt-project.org", or relative, e.g.  "pics/logo.png". A relative URL is
     resolved relative to the URL of the containing component.
 
     For example, the following assigns a valid URL to the \l {Image::source}

diff --git a/src/quick/doc/snippets/qml/text/onLinkActivated.qml b/src/quick/doc/snippets/qml/text/onLinkActivated.qml
index 9bb4d3a..7a44dcc 100644 (file)
--- a/src/quick/doc/snippets/qml/text/onLinkActivated.qml
+++ b/src/quick/doc/snippets/qml/text/onLinkActivated.qml
@@ -45,7 +45,7 @@ Rectangle {
 //![0]
     Text {
             textFormat: Text.RichText
-            text: "The main website is at <a href=\"http://qt.nokia.com\">Nokia Qt DF</a>."
+            text: "See the <a href=\"http://qt-project.org\">Qt Project website</a>."
             onLinkActivated: console.log(link + " link activated")
     }
 //![0]

diff --git a/src/quick/doc/src/appdevguide/debugging.qdoc b/src/quick/doc/src/appdevguide/debugging.qdoc
index 94ce134..f186997 100644 (file)
--- a/src/quick/doc/src/appdevguide/debugging.qdoc
+++ b/src/quick/doc/src/appdevguide/debugging.qdoc
@@ -45,7 +45,7 @@ function f(a, b) {
 \endcode
 
 The output is generated using the qDebug, qWarning, qCritical methods in C++
-(see also http://doc.qt.nokia.com/latest/debug.html#warning-and-debugging-messages).
+(see also \l {Debugging Techniques}).
 
 Setting the environment variable QML_CONSOLE_EXTENDED also prints the source
 code location of the call.
@@ -150,7 +150,7 @@ QQmlImportDatabase::resolveType "Rectangle" = "QDeclarativeRectangle"
 
 \section1 Debugging with Qt Creator
 
-\l{http://qt.nokia.com/products/developer-tools}{Qt Creator} provides built-in
+\l{http://qt-project.org/doc/qtcreator}{Qt Creator} provides built-in
 support for QML debugging. QML projects and standalone C++ applications that
 utilize QML can be debugged on desktops as well as on remote devices.
 For more information, see the Qt Creator Manual.

diff --git a/src/quick/items/qquicktext.cpp b/src/quick/items/qquicktext.cpp
index 9a90b40..e83a2cb 100644 (file)
--- a/src/quick/items/qquicktext.cpp
+++ b/src/quick/items/qquicktext.cpp
@@ -1334,10 +1334,10 @@ QQuickText::~QQuickText()
     \snippet qml/text/onLinkActivated.qml 0
 
     The example code will display the text
-    "The main website is at \l{http://qt.nokia.com}{Nokia Qt DF}."
+    "See the \l{http://qt-project.org}{Qt Project website}."
 
     Clicking on the highlighted link will output
-    \tt{http://qt.nokia.com link activated} to the console.
+    \tt{http://qt-project.org link activated} to the console.
 */
 
 /*!

diff --git a/tests/testapplications/text/textedit.qml b/tests/testapplications/text/textedit.qml
index e0d7dbd..6546abf 100644 (file)
--- a/tests/testapplications/text/textedit.qml
+++ b/tests/testapplications/text/textedit.qml
@@ -144,7 +144,7 @@ Rectangle {
                     "and a language runtime. "+
                     "A collection of C++ APIs is used to integrate these high level features with classic Qt applications."});
                     textmodel.append({ "name": "Links",
-                    "value": "This is a link - <a href=\"http://doc.qt.nokia.com\">Qt Docs</a>"});
+                    "value": "This is a link - <a href=\"http://qt-project.org/doc\">Qt Docs</a>"});
                 }
             }
             ControlView {