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

Conflicts:
	src/declarative/qml/qmlengine.cpp

1 files changed, 5 insertions, 1 deletions

diff --git a/src/declarative/qml/qmlengine.h b/src/declarative/qml/qmlengine.h
index a07ea96..0c9da39 100644
--- a/src/declarative/qml/qmlengine.h
+++ b/src/declarative/qml/qmlengine.h
@@ -94,13 +94,16 @@ public:
     void setNetworkAccessManager(QNetworkAccessManager *);
     QNetworkAccessManager *networkAccessManager() const;
 
+    QUrl baseUrl() const;
+    void setBaseUrl(const QUrl &);
+
     static QmlContext *contextForObject(const QObject *);
     static void setContextForObject(QObject *, QmlContext *);
 
     static QScriptValue qmlScriptObject(QObject*, QmlEngine*);
 
     static QScriptValue createComponent(QScriptContext*, QScriptEngine*);
-    static QScriptValue createQMLObject(QScriptContext*, QScriptEngine*);
+    static QScriptValue createQmlObject(QScriptContext*, QScriptEngine*);
 
 private:
     // LK: move to the private class
@@ -113,6 +116,7 @@ private:
     friend class QmlContext;
     friend class QmlContextPrivate;
     friend class QmlExpression;
+    friend class QmlExpressionPrivate;
     friend class QmlBasicScript;
     friend class QmlVME;
     friend class QmlComponent;