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/qml/doc | |
| 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/qml/doc')
| -rw-r--r-- | src/qml/doc/snippets/qml/imports/merged-named-imports.qml | 4 | ||||
| -rw-r--r-- | src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc | 2 |
2 files changed, 3 insertions, 3 deletions
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 c95d9e66eb..c37ac5e48d 100644 --- 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 c195c8724f..7d2d662e4e 100644 --- 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} |