Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

Conflicts:
	src/declarative/qml/qmlscriptparser.cpp
	src/declarative/qml/qmlscriptparser_p.h

Compiles, but probably next needs a revert/change of module stuff,
since that work seems to have been duplicated.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index b55d77b..6b83c1f 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -270,18 +270,18 @@ QmlComponent::QmlComponent(QmlEngine *engine, const QUrl &url, QObject *parent)
 }
 
 /*!
-    Create a QmlComponent from the given \a url and give it the specified 
+    Create a QmlComponent from the given \a fileName and give it the specified 
     \a parent and \a engine.
 
     \sa loadUrl()
 */
-QmlComponent::QmlComponent(QmlEngine *engine, const QString &url, 
+QmlComponent::QmlComponent(QmlEngine *engine, const QString &fileName, 
                            QObject *parent)
 : QObject(*(new QmlComponentPrivate), parent)
 {
     Q_D(QmlComponent);
     d->engine = engine;
-    loadUrl(QUrl(url));
+    loadUrl(QUrl::fromLocalFile(fileName));
 }
 
 /*!