diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-07-08 06:38:29 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-07-08 06:38:29 (GMT) |
| commit | 4c916bd688bc9e20d75359f12208eb8a33dc6670 (patch) | |
| tree | 190fb084f69128f6a1a788524cda21079f29cc6a /src/declarative/qml/qmlcomponent.h | |
| parent | 239c3581bb84b6484547918fbb1672fed08970dd (diff) | |
| parent | 46688b1e8b953f9e3a12d42b9aa73a8eba904f5b (diff) | |
| download | Qt-4c916bd688bc9e20d75359f12208eb8a33dc6670.zip Qt-4c916bd688bc9e20d75359f12208eb8a33dc6670.tar.gz Qt-4c916bd688bc9e20d75359f12208eb8a33dc6670.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlcomponent.h')
| -rw-r--r-- | src/declarative/qml/qmlcomponent.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h index b29c123..5e6dce9 100644 --- a/src/declarative/qml/qmlcomponent.h +++ b/src/declarative/qml/qmlcomponent.h @@ -67,9 +67,10 @@ class Q_DECLARATIVE_EXPORT QmlComponent : public QObject public: QmlComponent(QObject *parent = 0); QmlComponent(QmlEngine *, QObject *parent=0); + QmlComponent(QmlEngine *, const QString &url, QObject *parent = 0); QmlComponent(QmlEngine *, const QUrl &url, QObject *parent = 0); QmlComponent(QmlEngine *, const QByteArray &data, - const QUrl &baseUrl=QUrl(), QObject *parent=0); + const QUrl &baseUrl, QObject *parent=0); virtual ~QmlComponent(); Q_ENUMS(Status) @@ -92,7 +93,7 @@ public: virtual void completeCreate(); void loadUrl(const QUrl &url); - void setData(const QByteArray &, const QUrl &baseUrl = QUrl()); + void setData(const QByteArray &, const QUrl &baseUrl); Q_SIGNALS: void statusChanged(QmlComponent::Status); |