diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2013-04-24 22:20:30 +0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-24 19:26:37 +0200 |
| commit | 20d33b96acf95fc1e162c4e8ed00d4b0b20806d9 (patch) | |
| tree | 67f6cb407ba1ed4fc18926cd843864a985f51226 /src/quick | |
| parent | 73d8bcda7d1b4317f38d8a2844294601325915aa (diff) | |
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>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/doc/snippets/qml/text/onLinkActivated.qml | 2 | ||||
| -rw-r--r-- | src/quick/doc/src/appdevguide/debugging.qdoc | 4 | ||||
| -rw-r--r-- | src/quick/items/qquicktext.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/quick/doc/snippets/qml/text/onLinkActivated.qml b/src/quick/doc/snippets/qml/text/onLinkActivated.qml index 9bb4d3a0bb..7a44dcc557 100644 --- 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 94ce13459c..f1869972e4 100644 --- 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 9a90b408c3..e83a2cb08b 100644 --- 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. */ /*! |