summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-18 07:26:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-18 07:26:35 (GMT)
commit86fb4d8754b0d01e88238c3d2af4c28e3624d702 (patch)
tree10780bc1c2632afdc811b037745f415c35ebacab /src/declarative
parent5e435bfcad5a05c775c9d45edbd2659c87416754 (diff)
parentc2e8af87b10eaf57d397d467a79fcc24fa23bacf (diff)
downloadQt-86fb4d8754b0d01e88238c3d2af4c28e3624d702.zip
Qt-86fb4d8754b0d01e88238c3d2af4c28e3624d702.tar.gz
Qt-86fb4d8754b0d01e88238c3d2af4c28e3624d702.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Improve documentation for QDeclarativeView::setSource()
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/util/qdeclarativeview.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp
index bab991b..45995ce 100644
--- a/src/declarative/util/qdeclarativeview.cpp
+++ b/src/declarative/util/qdeclarativeview.cpp
@@ -319,6 +319,8 @@ QDeclarativeView::~QDeclarativeView()
Ensure that the URL provided is full and correct, in particular, use
\l QUrl::fromLocalFile() when loading a file from the local filesystem.
+
+ \sa {Network Transparency}{Loading Resources in QML}
*/
/*!