diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-10-08 08:30:50 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-10-08 08:30:50 (GMT) |
| commit | db531c30eb73ff7aeac9cf07b06d6a108b2c13ec (patch) | |
| tree | f52f09cbc0d72ebddea7586c2589cb260a0484e2 /src/declarative/util | |
| parent | 6f5c3d1c6f9d3a826821d12139070e9772eae749 (diff) | |
| parent | 2b66a299baef677df027c1530764c6d4b201d166 (diff) | |
| download | Qt-db531c30eb73ff7aeac9cf07b06d6a108b2c13ec.zip Qt-db531c30eb73ff7aeac9cf07b06d6a108b2c13ec.tar.gz Qt-db531c30eb73ff7aeac9cf07b06d6a108b2c13ec.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util')
| -rw-r--r-- | src/declarative/util/qmlview.cpp | 10 | ||||
| -rw-r--r-- | src/declarative/util/qmlview.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/src/declarative/util/qmlview.cpp b/src/declarative/util/qmlview.cpp index f932e4a..14f8279 100644 --- a/src/declarative/util/qmlview.cpp +++ b/src/declarative/util/qmlview.cpp @@ -235,6 +235,16 @@ void QmlView::setUrl(const QUrl& url) } /*! + Returns the source URL, if set. + + \sa setUrl() + */ +QUrl QmlView::url() const +{ + return d->source; +} + +/*! Sets the source to the URL from the \a filename, and sets the QML string to \a qml. */ diff --git a/src/declarative/util/qmlview.h b/src/declarative/util/qmlview.h index b54101f..faf2564 100644 --- a/src/declarative/util/qmlview.h +++ b/src/declarative/util/qmlview.h @@ -70,6 +70,7 @@ public: virtual ~QmlView(); void setUrl(const QUrl&); + QUrl url() const; void setQml(const QString &qml, const QString &filename=QString()); QString qml() const; QmlEngine* engine(); |