Improve QmlComponent API

Having to use QUrl::fromLocalFile() is crummy.  Add appropriate overloads the QmlComponent, and resolve relative paths against a "base url" set on the QmlEngine.

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);