diff options
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} |