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.

6 files changed, 6 insertions, 6 deletions

diff --git a/examples/declarative/extending/adding/main.cpp b/examples/declarative/extending/adding/main.cpp
index 3d78ded..7e5cbef 100644
--- a/examples/declarative/extending/adding/main.cpp
+++ b/examples/declarative/extending/adding/main.cpp
@@ -9,7 +9,7 @@ int main(int argc, char ** argv)
     QCoreApplication app(argc, argv);
 
     QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(":example.qml"));
+    QmlComponent component(&engine, ":example.qml");
     Person *person = qobject_cast<Person *>(component.create());
     if (person) {
         qWarning() << "The person's name is" << person->name();
diff --git a/examples/declarative/extending/attached/main.cpp b/examples/declarative/extending/attached/main.cpp
index 1f10cd0..8b05b9d 100644
--- a/examples/declarative/extending/attached/main.cpp
+++ b/examples/declarative/extending/attached/main.cpp
@@ -10,7 +10,7 @@ int main(int argc, char ** argv)
     QCoreApplication app(argc, argv);
 
     QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(":example.qml"));
+    QmlComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/coercion/main.cpp b/examples/declarative/extending/coercion/main.cpp
index 7439ba9..75846fa 100644
--- a/examples/declarative/extending/coercion/main.cpp
+++ b/examples/declarative/extending/coercion/main.cpp
@@ -10,7 +10,7 @@ int main(int argc, char ** argv)
     QCoreApplication app(argc, argv);
 
     QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(":example.qml"));
+    QmlComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/default/main.cpp b/examples/declarative/extending/default/main.cpp
index 7439ba9..75846fa 100644
--- a/examples/declarative/extending/default/main.cpp
+++ b/examples/declarative/extending/default/main.cpp
@@ -10,7 +10,7 @@ int main(int argc, char ** argv)
     QCoreApplication app(argc, argv);
 
     QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(":example.qml"));
+    QmlComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/grouped/main.cpp b/examples/declarative/extending/grouped/main.cpp
index 0c9bb97..490e596 100644
--- a/examples/declarative/extending/grouped/main.cpp
+++ b/examples/declarative/extending/grouped/main.cpp
@@ -10,7 +10,7 @@ int main(int argc, char ** argv)
     QCoreApplication app(argc, argv);
 
     QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(":example.qml"));
+    QmlComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {
diff --git a/examples/declarative/extending/properties/main.cpp b/examples/declarative/extending/properties/main.cpp
index 7b80914..d487fbe 100644
--- a/examples/declarative/extending/properties/main.cpp
+++ b/examples/declarative/extending/properties/main.cpp
@@ -10,7 +10,7 @@ int main(int argc, char ** argv)
     QCoreApplication app(argc, argv);
 
     QmlEngine engine;
-    QmlComponent component(&engine, QUrl::fromLocalFile(":example.qml"));
+    QmlComponent component(&engine, ":example.qml");
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->celebrant()) {