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

Conflicts:
	src/declarative/qml/qmlcomponentjs.cpp
	src/declarative/qml/qmlcomponentjs_p.h
	src/declarative/qml/qmlcomponentjs_p_p.h

14 files changed, 141 insertions, 457 deletions

diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
index 6c00beb..4c02f95 100644
--- a/src/declarative/qml/qml.pri
+++ b/src/declarative/qml/qml.pri
@@ -5,7 +5,6 @@ SOURCES += qml/qmlparser.cpp \
     qml/qmlexpression.cpp \
     qml/qmlbinding.cpp \
     qml/qmlmetaproperty.cpp \
-    qml/qmlcomponentjs.cpp \
     qml/qmlcomponent.cpp \
     qml/qmlcontext.cpp \
     qml/qmlcustomparser.cpp \
@@ -56,8 +55,6 @@ HEADERS += qml/qmlparser_p.h \
     qml/qmlbinding.h \
     qml/qmlbinding_p.h \
     qml/qmlmetaproperty.h \
-    qml/qmlcomponentjs_p.h \
-    qml/qmlcomponentjs_p_p.h \
     qml/qmlcomponent.h \
     qml/qmlcomponent_p.h \
     qml/qmlcustomparser_p.h \
diff --git a/src/declarative/qml/qmlbinding.cpp b/src/declarative/qml/qmlbinding.cpp
index 50767d6..b637c18 100644
--- a/src/declarative/qml/qmlbinding.cpp
+++ b/src/declarative/qml/qmlbinding.cpp
@@ -170,15 +170,15 @@ void QmlBinding::update(QmlMetaProperty::WriteFlags flags)
             if (!isUndefined && data->property.object() && 
                 !data->property.write(value, flags)) {
 
-                QString fileName = data->fileName;
+                QUrl url = data->url;
                 int line = data->line;
-                if (fileName.isEmpty()) fileName = QLatin1String("<Unknown File>");
+                if (url.isEmpty()) url = QUrl(QLatin1String("<Unknown File>"));
 
                 const char *valueType = 0;
                 if (value.userType() == QVariant::Invalid) valueType = "null";
                 else valueType = QMetaType::typeName(value.userType());
 
-                data->error.setUrl(fileName);
+                data->error.setUrl(url);
                 data->error.setLine(line);
                 data->error.setColumn(-1);
                 data->error.setDescription(QLatin1String("Unable to assign ") +
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index cc177f9..4798406 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -76,6 +76,7 @@
 QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(compilerDump, QML_COMPILER_DUMP);
+DEFINE_BOOL_CONFIG_OPTION(compilerStatDump, QML_COMPILER_STATISTICS_DUMP);
 
 using namespace QmlParser;
 
@@ -613,6 +614,8 @@ bool QmlCompiler::compile(QmlEngine *engine,
     if (!isError()) {
         if (compilerDump())
             out->dumpInstructions();
+        if (compilerStatDump())
+            dumpStats();
     } else {
         reset(out);
     }
@@ -664,6 +667,8 @@ void QmlCompiler::compileTree(Object *tree)
 
 bool QmlCompiler::buildObject(Object *obj, const BindingContext &ctxt)
 {
+    componentStat.objects++;
+
     Q_ASSERT (obj->type != -1);
     const QmlCompiledData::TypeReference &tr =
         output->types.at(obj->type);
@@ -1148,15 +1153,21 @@ bool QmlCompiler::buildComponentFromRoot(QmlParser::Object *obj,
                                          const BindingContext &ctxt)
 {
     ComponentCompileState oldComponentCompileState = compileState;
+    ComponentStat oldComponentStat = componentStat;
+
     compileState = ComponentCompileState();
     compileState.root = obj;
 
+    componentStat = ComponentStat();
+    componentStat.lineNumber = obj->location.start.line;
+
     if (obj)
         COMPILE_CHECK(buildObject(obj, ctxt));
 
     COMPILE_CHECK(completeComponentBuild());
 
     compileState = oldComponentCompileState;
+    componentStat = oldComponentStat;
 
     return true;
 }
@@ -1646,6 +1657,7 @@ void QmlCompiler::saveComponentState()
     Q_ASSERT(!savedCompileStates.contains(compileState.root));
 
     savedCompileStates.insert(compileState.root, compileState);
+    savedComponentStats.append(componentStat);
 }
 
 QmlCompiler::ComponentCompileState
@@ -2454,6 +2466,8 @@ int QmlCompiler::genContextCache()
 
 bool QmlCompiler::completeComponentBuild()
 {
+    componentStat.ids = compileState.ids.count();
+
     for (int ii = 0; ii < compileState.aliasingObjects.count(); ++ii) {
         Object *aliasObject = compileState.aliasingObjects.at(ii);
         COMPILE_CHECK(buildDynamicMeta(aliasObject, ResolveAliases));
@@ -2478,6 +2492,8 @@ bool QmlCompiler::completeComponentBuild()
                 QByteArray(bs.compileData(), bs.compileDataSize());
             type = QmlExpressionPrivate::BasicScriptEngineData;
             binding.isBasicScript = true;
+
+            componentStat.optimizedBindings++;
         } else {
             type = QmlExpressionPrivate::PreTransformedQtScriptData;
 
@@ -2495,6 +2511,8 @@ bool QmlCompiler::completeComponentBuild()
                 QByteArray((const char *)expression.constData(), 
                            expression.length() * sizeof(QChar));
             binding.isBasicScript = false;
+
+            componentStat.scriptBindings++;
         }
         binding.compiledData.prepend(QByteArray((const char *)&type, 
                                                 sizeof(quint32)));
@@ -2505,6 +2523,19 @@ bool QmlCompiler::completeComponentBuild()
     return true;
 }
 
+void QmlCompiler::dumpStats()
+{
+    qWarning().nospace() << "QML Document: " << output->url.toString();
+    for (int ii = 0; ii < savedComponentStats.count(); ++ii) {
+        const ComponentStat &stat = savedComponentStats.at(ii);
+        qWarning().nospace() << "    Component Line " << stat.lineNumber;
+        qWarning().nospace() << "        Total Objects:      " << stat.objects;
+        qWarning().nospace() << "        IDs Used:           " << stat.ids;
+        qWarning().nospace() << "        Optimized Bindings: " << stat.optimizedBindings;
+        qWarning().nospace() << "        QScript Bindings:   " << stat.scriptBindings;
+    }
+}
+
 /*!
     Returns true if from can be assigned to a (QObject) property of type
     to.
diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h
index 9a37832..51c165e 100644
--- a/src/declarative/qml/qmlcompiler_p.h
+++ b/src/declarative/qml/qmlcompiler_p.h
@@ -255,6 +255,8 @@ private:
 
     void addId(const QString &, QmlParser::Object *);
 
+    void dumpStats();
+
     struct BindingReference {
         QmlParser::Variant expression;
         QmlParser::Property *property;
@@ -280,9 +282,25 @@ private:
     };
     ComponentCompileState compileState;
 
+    struct ComponentStat
+    {
+        ComponentStat() 
+            : ids(0), scriptBindings(0), optimizedBindings(0), objects(0) {}
+
+        int lineNumber;
+
+        int ids;
+        int scriptBindings;
+        int optimizedBindings;
+        int objects;
+    };
+    ComponentStat componentStat;
+
     void saveComponentState();
+
     ComponentCompileState componentState(QmlParser::Object *);
     QHash<QmlParser::Object *, ComponentCompileState> savedCompileStates;
+    QList<ComponentStat> savedComponentStats;
 
     QList<QmlError> exceptions;
     QmlCompiledData *output;
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 65af9a5..63f3cfb 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -409,6 +409,9 @@ valid for components created directly from QML.
 */
 QmlContext *QmlComponent::creationContext() const
 {
+    Q_D(const QmlComponent);
+    if(d->creationContext)
+        return d->creationContext;
     QmlDeclarativeData *ddata = QmlDeclarativeData::get(this);
     if (ddata)
         return ddata->context;
@@ -417,6 +420,17 @@ QmlContext *QmlComponent::creationContext() const
 }
 
 /*!
+  \internal
+  Sets the QmlContext the component was created in. This is only
+  desirable for components created in QML script.
+*/
+void QmlComponent::setCreationContext(QmlContext* c)
+{
+    Q_D(QmlComponent);
+    d->creationContext = c;
+}
+
+/*!
     Load the QmlComponent from the provided \a url.
 */
 void QmlComponent::loadUrl(const QUrl &url)
@@ -462,6 +476,24 @@ QList<QmlError> QmlComponent::errors() const
 }
 
 /*!
+    \internal
+    errorsString is only meant as a way to get the errors in script
+*/
+QString QmlComponent::errorsString() const
+{
+    Q_D(const QmlComponent);
+    QString ret;
+    if(!isError())
+        return ret;
+    foreach(const QmlError &e, d->errors) {
+        ret += e.url().toString() + QLatin1String(":") +
+               QString::number(e.line()) + QLatin1String(" ") +
+               e.description() + QLatin1String("\n");
+    }
+    return ret;
+}
+
+/*!
     Return the component URL.  This is the URL passed to either the constructor,
     or the loadUrl() or setData() methods.
 */
@@ -481,6 +513,22 @@ QmlComponent::QmlComponent(QmlComponentPrivate &dd, QObject *parent)
 
 
 /*!
+    \internal
+    A version of create which returns a scriptObject, for use in script
+*/
+QScriptValue QmlComponent::createObject()
+{
+    Q_D(QmlComponent);
+    QmlContext* ctxt = creationContext();
+    if(!ctxt){
+        qWarning() << QLatin1String("createObject can only be used in QML");
+        return QScriptValue();
+    }
+    QObject* ret = create(ctxt);
+    return QmlEnginePrivate::qmlScriptObject(ret, d->engine);
+}
+
+/*!
     Create an object instance from this component.  Returns 0 if creation
     failed.  \a context specifies the context within which to create the object
     instance.  
diff --git a/src/declarative/qml/qmlcomponent.h b/src/declarative/qml/qmlcomponent.h
index 2aa77d3..bd72f20 100644
--- a/src/declarative/qml/qmlcomponent.h
+++ b/src/declarative/qml/qmlcomponent.h
@@ -64,6 +64,10 @@ class Q_DECLARATIVE_EXPORT QmlComponent : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QmlComponent)
+    Q_PROPERTY(bool isNull READ isNull NOTIFY statusChanged)
+    Q_PROPERTY(bool isReady READ isReady NOTIFY statusChanged)
+    Q_PROPERTY(bool isError READ isError NOTIFY statusChanged)
+    Q_PROPERTY(bool isLoading READ isLoading NOTIFY statusChanged)
 
 public:
     QmlComponent(QObject *parent = 0);
@@ -84,6 +88,7 @@ public:
     bool isLoading() const;
 
     QList<QmlError> errors() const;
+    Q_INVOKABLE QString errorsString() const;
 
     qreal progress() const;
 
@@ -93,9 +98,12 @@ public:
     virtual QObject *beginCreate(QmlContext *);
     virtual void completeCreate();
 
+    Q_INVOKABLE QScriptValue createObject();
+
     void loadUrl(const QUrl &url);
     void setData(const QByteArray &, const QUrl &baseUrl);
 
+    void setCreationContext(QmlContext*);
     QmlContext *creationContext() const;
 
     static QmlComponentAttached *qmlAttachedProperties(QObject *);
diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h
index 4b1a076..e69f541 100644
--- a/src/declarative/qml/qmlcomponent_p.h
+++ b/src/declarative/qml/qmlcomponent_p.h
@@ -76,7 +76,7 @@ class QmlComponentPrivate : public QObjectPrivate
     Q_DECLARE_PUBLIC(QmlComponent)
         
 public:
-    QmlComponentPrivate() : typeData(0), progress(0.), start(-1), count(-1), cc(0), componentAttacheds(0), completePending(false), engine(0) {}
+    QmlComponentPrivate() : typeData(0), progress(0.), start(-1), count(-1), cc(0), componentAttacheds(0), completePending(false), engine(0), creationContext(0) {}
 
 
     QObject *create(QmlContext *context, const QBitField &);
@@ -104,6 +104,7 @@ public:
     bool completePending;
 
     QmlEngine *engine;
+    QmlContext *creationContext;
 
     void clear();
 
diff --git a/src/declarative/qml/qmlcomponentjs.cpp b/src/declarative/qml/qmlcomponentjs.cpp
deleted file mode 100644
index 4a63542..0000000
--- a/src/declarative/qml/qmlcomponentjs.cpp
+++ /dev/null
@@ -1,131 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qmlcomponentjs_p.h"
-#include "qmlcomponentjs_p_p.h"
-#include "qmlengine_p.h"
-#include "qmlcomponent.h"
-
-QT_BEGIN_NAMESPACE
-
-QmlComponentJS::QmlComponentJS(QmlEngine *engine, QObject *parent)
-    : QmlComponent(*(new QmlComponentJSPrivate), parent)
-{
-    Q_D(QmlComponentJS);
-    d->engine = engine;
-    connect(this, SIGNAL(statusChanged(QmlComponent::Status)),
-            this, SLOT(statusChange(QmlComponent::Status)));
-}
-
-QmlComponentJS::QmlComponentJS(QmlEngine *engine, const QUrl &url, QObject *parent)
-    : QmlComponent(*(new QmlComponentJSPrivate), parent)
-{
-    Q_D(QmlComponentJS);
-    d->engine = engine;
-    loadUrl(url);
-    connect(this, SIGNAL(statusChanged(QmlComponent::Status)),
-            this, SLOT(statusChange(QmlComponent::Status)));
-}
-
-void QmlComponentJS::setContext(QmlContext* c)
-{
-    Q_D(QmlComponentJS);
-    d->ctxt =c;
-}
-/*!
-    Create a script object instance from this component. Returns a null
-    script object if creation failed. It will create the instance in the
-    same context that it was created it. QmlComponentJS is only
-    meant to be created from with script - C++ developers should just use
-    QmlComponent directly.
-
-    Similar to QmlComponent::create(), but creates an object suitable
-    for usage within scripts.
-*/
-QScriptValue QmlComponentJS::createObject()
-{
-    Q_D(QmlComponentJS);
-    QObject* ret = create(d->ctxt);
-    return QmlEnginePrivate::qmlScriptObject(ret, d->engine);
-}
-
-/*!
-    Return the list of errors that occured during the last compile or create
-    operation, as a single string.  An empty string is returned if isError()
-    is not set.
-
-    This function is similar to errors(), except more useful when called from
-    QML. C++ code should usually use errors().
-
-    \sa errors()
-*/
-QString QmlComponentJS::errorsString() const
-{
-    Q_D(const QmlComponentJS);
-    QString ret;
-    if(!isError())
-        return ret;
-    foreach(const QmlError &e, d->errors) {
-        ret += e.url().toString() + QLatin1String(":") + 
-               QString::number(e.line()) + QLatin1String(" ") + 
-               e.description() + QLatin1String("\n");
-    }
-    return ret;
-}
-
-
-void QmlComponentJS::statusChange(QmlComponent::Status newStatus)
-{
-    Q_D(QmlComponentJS);
-    if(newStatus == d->prevStatus)
-        return;
-    if(newStatus == QmlComponent::Null || d->prevStatus == QmlComponent::Null)
-        emit isNullChanged();
-    if(newStatus == QmlComponent::Ready || d->prevStatus == QmlComponent::Ready)
-        emit isReadyChanged();
-    if(newStatus == QmlComponent::Loading || d->prevStatus == QmlComponent::Loading)
-        emit isLoadingChanged();
-    if(newStatus == QmlComponent::Error || d->prevStatus == QmlComponent::Error)
-        emit isErrorChanged();
-    d->prevStatus = newStatus;
-}
-
-QT_END_NAMESPACE
diff --git a/src/declarative/qml/qmlcomponentjs_p.h b/src/declarative/qml/qmlcomponentjs_p.h
deleted file mode 100644
index 488f355..0000000
--- a/src/declarative/qml/qmlcomponentjs_p.h
+++ /dev/null
@@ -1,98 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCOMPONENTJS_P_H
-#define QMLCOMPONENTJS_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <QtCore/qobject.h>
-#include <QtCore/qstring.h>
-#include <QtDeclarative/qfxglobal.h>
-#include <QtDeclarative/qml.h>
-#include <QtDeclarative/qmlcomponent.h>
-#include <QtDeclarative/qmlerror.h>
-
-QT_BEGIN_NAMESPACE
-
-class QmlComponentJSPrivate;
-class QmlEngine;
-class QmlContext;
-class Q_DECLARATIVE_EXPORT QmlComponentJS : public QmlComponent
-{
-    Q_OBJECT
-    Q_DECLARE_PRIVATE(QmlComponentJS)
-    Q_PROPERTY(bool isNull READ isNull NOTIFY isNullChanged)
-    Q_PROPERTY(bool isReady READ isReady NOTIFY isReadyChanged)
-    Q_PROPERTY(bool isError READ isError NOTIFY isErrorChanged)
-    Q_PROPERTY(bool isLoading READ isLoading NOTIFY isLoadingChanged)
-    friend class QmlEngine;
-public:
-    QmlComponentJS(QmlEngine *, const QUrl &url, QObject *parent = 0);
-    QmlComponentJS(QmlEngine *, QObject *parent=0);
-
-    Q_INVOKABLE QScriptValue createObject();
-    Q_INVOKABLE QString errorsString() const;
-
-    void setContext(QmlContext* c);
-Q_SIGNALS:
-    void isNullChanged();
-    void isErrorChanged();
-    void isReadyChanged();
-    void isLoadingChanged();
-private Q_SLOTS:
-    void statusChange(QmlComponent::Status newStatus);
-};
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QmlComponentJS)
-
-#endif // QMLCOMPONENTJS_P_H
diff --git a/src/declarative/qml/qmlcomponentjs_p_p.h b/src/declarative/qml/qmlcomponentjs_p_p.h
deleted file mode 100644
index 4cb412e..0000000
--- a/src/declarative/qml/qmlcomponentjs_p_p.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QMLCOMPONENTJS_P_P_H
-#define QMLCOMPONENTJS_P_P_H
-
-//
-//  W A R N I N G
-//  -------------
-//
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include "qmlcomponent.h"
-#include "qmlcomponentjs_p.h"
-#include "qmlcomponent_p.h"
-
-QT_BEGIN_NAMESPACE
-
-class QmlContext;
-class QmlComponentJSPrivate : public QmlComponentPrivate
-{
-    Q_DECLARE_PUBLIC(QmlComponentJS)
-public:
-    QmlComponentJSPrivate() : QmlComponentPrivate(),
-        prevStatus(QmlComponentJS::Null), ctxt(0)
-    { }
-
-    QmlComponent::Status prevStatus;
-    QmlContext* ctxt;
-};
-
-QT_END_NAMESPACE
-
-#endif // QMLCOMPONENTJS_P_P_H
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index f7f770e..71a6132 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -75,8 +75,8 @@
 #include <QtGui/qcolor.h>
 #include <QtGui/qvector3d.h>
 #include <QtGui/qsound.h>
+#include <QGraphicsObject>
 #include <qmlcomponent.h>
-#include <private/qmlcomponentjs_p.h>
 #include <private/qmlmetaproperty_p.h>
 #include <private/qmlbinding_p.h>
 #include <private/qmlvme_p.h>
@@ -110,14 +110,6 @@ struct StaticQtMetaObject : public QObject
         { return &static_cast<StaticQtMetaObject*> (0)->staticQtMetaObject; }
 };
 
-QScriptValue desktopOpenUrl(QScriptContext *ctxt, QScriptEngine *e)
-{
-    if(!ctxt->argumentCount())
-        return e->newVariant(QVariant(false));
-    bool ret = QDesktopServices::openUrl(QUrl(ctxt->argument(0).toString()));
-    return e->newVariant(QVariant(ret));
-}
-
 static QString userLocalDataPath(const QString& app)
 {
     return QDesktopServices::storageLocation(QDesktopServices::DataLocation) + QLatin1String("/") + app;
@@ -130,11 +122,10 @@ QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e)
   inProgressCreations(0), scriptEngine(this), componentAttacheds(0), rootComponent(0), 
   networkAccessManager(0), typeManager(e), uniqueId(1)
 {
+    // Note that all documentation for stuff put on the global object goes in
+    // doc/src/declarative/globalobject.qdoc
     QScriptValue qtObject =
         scriptEngine.newQMetaObject(StaticQtMetaObject::get());
-    QScriptValue desktopObject = scriptEngine.newObject();
-    desktopObject.setProperty(QLatin1String("openUrl"),scriptEngine.newFunction(desktopOpenUrl, 1));
-    qtObject.setProperty(QLatin1String("DesktopServices"), desktopObject);
     scriptEngine.globalObject().setProperty(QLatin1String("Qt"), qtObject);
 
     offlineStoragePath = userLocalDataPath(QLatin1String("QML/OfflineStorage"));
@@ -156,6 +147,7 @@ QmlEnginePrivate::QmlEnginePrivate(QmlEngine *e)
 
     //misc methods
     qtObject.setProperty(QLatin1String("playSound"), scriptEngine.newFunction(QmlEnginePrivate::playSound, 1));
+    qtObject.setProperty(QLatin1String("openUrlExternally"),scriptEngine.newFunction(desktopOpenUrl, 1));
 
     scriptEngine.globalObject().setProperty(QLatin1String("createQmlObject"),
             scriptEngine.newFunction(QmlEnginePrivate::createQmlObject, 1));
@@ -595,63 +587,10 @@ QmlContext *QmlEnginePrivate::getContext(QScriptContext *ctxt)
     return contextClass->contextFromValue(scopeNode);
 }
 
-/*!
-    This function is intended for use inside QML only. In C++ just create a
-    component object as usual.
-
-    This function takes the URL of a QML file as its only argument. It returns
-    a component object which can be used to create and load that QML file.
-
-    Example QmlJS is below, remember that QML files that might be loaded
-    over the network cannot be expected to be ready immediately.
-    \code
-        var component;
-        var sprite;
-        function finishCreation(){
-            if(component.isReady()){
-                sprite = component.createObject();
-                if(sprite == 0){
-                    // Error Handling
-                }else{
-                    sprite.parent = page;
-                    sprite.x = 200;
-                    //...
-                }
-            }else if(component.isError()){
-                // Error Handling
-            }
-        }
-
-        component = createComponent("Sprite.qml");
-        if(component.isReady()){
-            finishCreation();
-        }else{
-            component.statusChanged.connect(finishCreation);
-        }
-    \endcode
-
-    If you are certain the files will be local, you could simplify to
-
-    \code
-        component = createComponent("Sprite.qml");
-        sprite = component.createObject();
-        if(sprite == 0){
-            // Error Handling
-            print(component.errorsString());
-        }else{
-            sprite.parent = page;
-            sprite.x = 200;
-            //...
-        }
-    \endcode
-
-    If you want to just create an arbitrary string of QML, instead of
-    loading a qml file, consider the createQmlObject() function.
-*/
 QScriptValue QmlEnginePrivate::createComponent(QScriptContext *ctxt,
                                                QScriptEngine *engine)
 {
-    QmlComponentJS* c;
+    QmlComponent* c;
 
     QmlEnginePrivate *activeEnginePriv =
         static_cast<QmlScriptEngine*>(engine)->p;
@@ -659,42 +598,17 @@ QScriptValue QmlEnginePrivate::createComponent(QScriptContext *ctxt,
 
     QmlContext* context = activeEnginePriv->getContext(ctxt);
     if(ctxt->argumentCount() != 1) {
-        c = new QmlComponentJS(activeEngine);
+        c = new QmlComponent(activeEngine);
     }else{
         QUrl url = QUrl(context->resolvedUrl(ctxt->argument(0).toString()));
         if(!url.isValid())
             url = QUrl(ctxt->argument(0).toString());
-        c = new QmlComponentJS(activeEngine, url, activeEngine);
+        c = new QmlComponent(activeEngine, url, activeEngine);
     }
-    c->setContext(context);
+    c->setCreationContext(context);
     return engine->newQObject(c);
 }
 
-/*!
-    Creates a new object from the specified string of QML. It requires a
-    second argument, which is the id of an existing QML object to use as
-    the new object's parent. If a third argument is provided, this is used
-    as the filepath that the qml came from.
-
-    Example (where targetItem is the id of an existing QML item):
-    \code
-    newObject = createQmlObject('import Qt 4.6; Rectangle {color: "red"; width: 20; height: 20}',
-        targetItem, "dynamicSnippet1");
-    \endcode
-
-    This function is intended for use inside QML only. It is intended to behave
-    similarly to eval, but for creating QML elements.
-
-    Returns the created object, or null if there is an error. In the case of an
-    error, details of the error are output using qWarning().
-
-    Note that this function returns immediately, and therefore may not work if
-    the QML loads new components. If you are trying to load a new component,
-    for example from a QML file, consider the createComponent() function
-    instead. 'New components' refers to external QML files that have not yet
-    been loaded, and so it is safe to use createQmlObject to load built-in
-    components.
-*/
 QScriptValue QmlEnginePrivate::createQmlObject(QScriptContext *ctxt, QScriptEngine *engine)
 {
     QmlEnginePrivate *activeEnginePriv =
@@ -708,8 +622,6 @@ QScriptValue QmlEnginePrivate::createQmlObject(QScriptContext *ctxt, QScriptEngi
     QUrl url;
     if(ctxt->argumentCount() > 2)
         url = QUrl(ctxt->argument(2).toString());
-    else
-        url = QUrl(QLatin1String("DynamicQML"));
     QObject *parentArg = activeEnginePriv->objectClass->toQObject(ctxt->argument(1));
     QmlContext *qmlCtxt = qmlContext(parentArg);
     if (url.isEmpty()) {
@@ -719,6 +631,7 @@ QScriptValue QmlEnginePrivate::createQmlObject(QScriptContext *ctxt, QScriptEngi
     }
 
     QmlComponent component(activeEngine, qml.toUtf8(), url);
+
     if(component.isError()) {
         QList<QmlError> errors = component.errors();
         qWarning() <<"QmlEngine::createQmlObject():";
@@ -741,38 +654,15 @@ QScriptValue QmlEnginePrivate::createQmlObject(QScriptContext *ctxt, QScriptEngi
 
     if(obj) {
         obj->setParent(parentArg);
-        obj->setProperty("parent", QVariant::fromValue<QObject*>(parentArg));
+        QGraphicsObject* gobj = qobject_cast<QGraphicsObject*>(obj);
+        QGraphicsObject* gparent = qobject_cast<QGraphicsObject*>(parentArg);
+        if(gobj && gparent)
+            gobj->setParentItem(gparent);
         return qmlScriptObject(obj, activeEngine);
     }
     return engine->nullValue();
 }
 
-/*!
-    This function is intended for use inside QML only. In C++ just create a
-    QVector3D as usual.
-
-    This function takes three numeric components and combines them into a
-    QVector3D value that can be used with any property that takes a
-    QVector3D argument.  The following QML code:
-
-    \code
-    transform: Rotation {
-        id: rotation
-        origin.x: Container.width / 2;
-        axis: vector(0, 1, 1)
-    }
-    \endcode
-
-    is equivalent to:
-
-    \code
-    transform: Rotation {
-        id: rotation
-        origin.x: Container.width / 2;
-        axis.x: 0; axis.y: 1; axis.z: 0
-    }
-    \endcode
-*/
 QScriptValue QmlEnginePrivate::vector(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() < 3)
@@ -898,19 +788,14 @@ QScriptValue QmlEnginePrivate::playSound(QScriptContext *ctxt, QScriptEngine *en
     return engine->undefinedValue();
 }
 
-/*!
-    This function allows tinting one color with another.
-
-    The tint color should usually be mostly transparent, or you will not be able to see the underlying color. The below example provides a slight red tint by having the tint color be pure red which is only 1/16th opaque.
-
-    \qml
-    Rectangle { x: 0; width: 80; height: 80; color: "lightsteelblue" }
-    Rectangle { x: 100; width: 80; height: 80; color: Qt.tint("lightsteelblue", "#10FF0000") }
-    \endqml
-    \image declarative-rect_tint.png
+QScriptValue QmlEnginePrivate::desktopOpenUrl(QScriptContext *ctxt, QScriptEngine *e)
+{
+    if(ctxt->argumentCount() < 1)
+        return e->newVariant(QVariant(false));
+    bool ret = QDesktopServices::openUrl(QUrl(ctxt->argument(0).toString()));
+    return e->newVariant(QVariant(ret));
+}
 
-    Tint is most useful when a subtle change is intended to be conveyed due to some event; you can then use tinting to more effectively tune the visible color.
-*/
 QScriptValue QmlEnginePrivate::tint(QScriptContext *ctxt, QScriptEngine *engine)
 {
     if(ctxt->argumentCount() < 2)
diff --git a/src/declarative/qml/qmlengine_p.h b/src/declarative/qml/qmlengine_p.h
index 18f7f35..b050ef6 100644
--- a/src/declarative/qml/qmlengine_p.h
+++ b/src/declarative/qml/qmlengine_p.h
@@ -255,6 +255,7 @@ public:
     QVariant scriptValueToVariant(const QScriptValue &);
 
     static QScriptValue qmlScriptObject(QObject*, QmlEngine*);
+
     static QScriptValue createComponent(QScriptContext*, QScriptEngine*);
     static QScriptValue createQmlObject(QScriptContext*, QScriptEngine*);
     static QScriptValue vector(QScriptContext*, QScriptEngine*);
@@ -269,6 +270,7 @@ public:
     static QScriptValue tint(QScriptContext*, QScriptEngine*);
 
     static QScriptValue playSound(QScriptContext*, QScriptEngine*);
+    static QScriptValue desktopOpenUrl(QScriptContext*, QScriptEngine*);
 
     static QScriptEngine *getScriptEngine(QmlEngine *e) { return &e->d_func()->scriptEngine; }
     static QmlEngine *getEngine(QScriptEngine *e) { return static_cast<QmlScriptEngine*>(e)->p->q_func(); }
diff --git a/src/declarative/qml/qmlexpression.cpp b/src/declarative/qml/qmlexpression.cpp
index dc2d4cd..3924b35 100644
--- a/src/declarative/qml/qmlexpression.cpp
+++ b/src/declarative/qml/qmlexpression.cpp
@@ -92,7 +92,7 @@ void QmlExpressionPrivate::init(QmlContext *ctxt, const QString &expr,
 void QmlExpressionPrivate::init(QmlContext *ctxt, void *expr, QmlRefCount *rc, 
                                 QObject *me, const QUrl &url, int lineNumber)
 {
-    data->fileName = url.toString();
+    data->url = url;
     data->line = lineNumber;
 
     quint32 *exprData = (quint32 *)expr;
@@ -113,7 +113,7 @@ void QmlExpressionPrivate::init(QmlContext *ctxt, void *expr, QmlRefCount *rc,
 #if !defined(Q_OS_SYMBIAN) //XXX Why doesn't this work?
         if (!dd->programs.at(progIdx)) {
             dd->programs[progIdx] =
-                new QScriptProgram(data->expression, data->fileName, data->line);
+                new QScriptProgram(data->expression, data->url.toString(), data->line);
         }
 #endif
 
@@ -310,12 +310,12 @@ QVariant QmlExpressionPrivate::evalQtScript(QObject *secondaryScope, bool *isUnd
 
         if (data->expressionRewritten) {
             data->expressionFunction = scriptEngine->evaluate(data->expression, 
-                                                              data->fileName, data->line);
+                                                              data->url.toString(), data->line);
         } else {
             QmlRewrite::RewriteBinding rewriteBinding;
 
             const QString code = rewriteBinding(data->expression);
-            data->expressionFunction = scriptEngine->evaluate(code, data->fileName, data->line);
+            data->expressionFunction = scriptEngine->evaluate(code, data->url.toString(), data->line);
         }
 
         scriptEngine->popContext();
@@ -484,7 +484,7 @@ void QmlExpression::setTrackChange(bool trackChange)
 QUrl QmlExpression::sourceFile() const
 {
     Q_D(const QmlExpression);
-    return QUrl(d->data->fileName);
+    return d->data->url;
 }
 
 /*!
@@ -498,13 +498,13 @@ int QmlExpression::lineNumber() const
 }
 
 /*!
-    Set the location of this expression to \a line of \a fileName. This information
+    Set the location of this expression to \a line of \a url. This information
     is used by the script engine.
 */
-void QmlExpression::setSourceLocation(const QUrl &fileName, int line)
+void QmlExpression::setSourceLocation(const QUrl &url, int line)
 {
     Q_D(QmlExpression);
-    d->data->fileName = fileName.toString();
+    d->data->url = url;
     d->data->line = line;
 }
 
diff --git a/src/declarative/qml/qmlexpression_p.h b/src/declarative/qml/qmlexpression_p.h
index 24c3987..ea572c3 100644
--- a/src/declarative/qml/qmlexpression_p.h
+++ b/src/declarative/qml/qmlexpression_p.h
@@ -98,7 +98,7 @@ public:
     QObject *me;
     bool trackChange;
 
-    QString fileName;
+    QUrl url;
     int line;
 
     struct SignalGuard : public QGuard<QObject> {