Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

1 files changed, 2 insertions, 2 deletions

diff --git a/examples/declarative/cppextensions/referenceexamples/binding/main.cpp b/examples/declarative/cppextensions/referenceexamples/binding/main.cpp
index fe1bbc8..150f961 100644
--- a/examples/declarative/cppextensions/referenceexamples/binding/main.cpp
+++ b/examples/declarative/cppextensions/referenceexamples/binding/main.cpp
@@ -57,7 +57,7 @@ int main(int argc, char ** argv)
     qmlRegisterType<Girl>("People", 1,0, "Girl");
 
     QDeclarativeEngine engine;
-    QDeclarativeComponent component(&engine, ":example.qml");
+    QDeclarativeComponent component(&engine, QUrl("qrc:example.qml"));
     BirthdayParty *party = qobject_cast<BirthdayParty *>(component.create());
 
     if (party && party->host()) {
@@ -85,7 +85,7 @@ int main(int argc, char ** argv)
 
         party->startParty();
     } else {
-        qWarning() << "An error occurred";
+        qWarning() << component.errors();
     }
 
     return app.exec();