diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2010-04-14 06:01:14 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2010-04-14 06:01:14 (GMT) |
| commit | fb1c371b643e44890c1eada5aba893d62d814e5a (patch) | |
| tree | 52b0e68687c40826aad37b7a920a7338b82228d0 /src/declarative/qml/qdeclarativecomponent.cpp | |
| parent | 6f613c3771a93f74462c6cb7ad105f258a112a4f (diff) | |
| parent | 2bacca7ed7fc2d2cd5c3bfdd2b6b93a840d84341 (diff) | |
| download | Qt-fb1c371b643e44890c1eada5aba893d62d814e5a.zip Qt-fb1c371b643e44890c1eada5aba893d62d814e5a.tar.gz Qt-fb1c371b643e44890c1eada5aba893d62d814e5a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativecomponent.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativecomponent.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index e180374..d319e8f 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -320,6 +320,9 @@ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeEngine *engine, QObject Create a QDeclarativeComponent from the given \a url and give it the specified \a parent and \a engine. + Ensure that the URL provided is full and correct, in particular, use + \l QUrl::fromLocalFile() when loading a file from the local filesystem. + \sa loadUrl() */ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeEngine *engine, const QUrl &url, QObject *parent) @@ -409,6 +412,9 @@ QDeclarativeContext *QDeclarativeComponent::creationContext() const /*! Load the QDeclarativeComponent from the provided \a url. + + Ensure that the URL provided is full and correct, in particular, use + \l QUrl::fromLocalFile() when loading a file from the local filesystem. */ void QDeclarativeComponent::loadUrl(const QUrl &url) { |