diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-06-10 04:57:51 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-06-10 04:57:51 (GMT) |
| commit | 4dc4cfac667389efda4a43df5ff8cfa4ba305a2f (patch) | |
| tree | 5c937ab2e510edb7a359b225132544d938a884a9 /src/declarative/fx/qfxitem_p.h | |
| parent | 29496148abe8506fbf50c99e9a210095c5115a14 (diff) | |
| download | Qt-4dc4cfac667389efda4a43df5ff8cfa4ba305a2f.zip Qt-4dc4cfac667389efda4a43df5ff8cfa4ba305a2f.tar.gz Qt-4dc4cfac667389efda4a43df5ff8cfa4ba305a2f.tar.bz2 | |
Support URLs directly (not just as strings), so they are correctly resolved.
URLs expressed as strings (possible relative) are resolved relative to
the component in which the string expression is converted to a url value.
All items are converted to use QUrl properties, except SqlConnection, where
the databasename is only a special-case URL (this may need further consideration).
Diffstat (limited to 'src/declarative/fx/qfxitem_p.h')
| -rw-r--r-- | src/declarative/fx/qfxitem_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/declarative/fx/qfxitem_p.h b/src/declarative/fx/qfxitem_p.h index a54f523..b38d877 100644 --- a/src/declarative/fx/qfxitem_p.h +++ b/src/declarative/fx/qfxitem_p.h @@ -133,9 +133,8 @@ public: QFxAnchors *_anchors; QFxContents *_contents; QFxItem *qmlItem; - QUrl _qmlurl; QmlComponent *_qmlcomp; - QString _qml; + QUrl _qml; QList<QUrl> _qmlnewloading; QList<QmlComponent*> _qmlnewcomp; |