5 files changed, 23 insertions, 13 deletions

diff --git a/src/declarative/items/context2d/qsgcontext2d.cpp b/src/declarative/items/context2d/qsgcontext2d.cpp
index 6ee87cf144..4d455419ad 100644
--- a/src/declarative/items/context2d/qsgcontext2d.cpp
+++ b/src/declarative/items/context2d/qsgcontext2d.cpp
@@ -3361,7 +3361,7 @@ void QSGContext2D::release()
     }
 }
 
-void QSGContext2D::processCommands(const QScriptValue& commands)
+void QSGContext2D::processCommands(const QJSValue& commands)
 {
 #ifdef QSGCANVASITEM_DEBUG
     QElapsedTimer t;
@@ -3369,7 +3369,7 @@ void QSGContext2D::processCommands(const QScriptValue& commands)
 #endif
     int ii = 0;
     if (commands.isArray()) {
-        QScriptValue cmd = commands.property(ii);
+        QJSValue cmd = commands.property(ii);
         while(cmd.isValid()) {
             processCommand(cmd);
             ii++;
@@ -3460,7 +3460,7 @@ bool QSGContext2D::event(QEvent *e)
     return QObject::event(e);
 }
 
-void QSGContext2D::processCommand(const QScriptValue& cmd)
+void QSGContext2D::processCommand(const QJSValue& cmd)
 {
     int action = cmd.property(0).toInt32();
     switch (action) {
diff --git a/src/declarative/items/context2d/qsgcontext2d_p.h b/src/declarative/items/context2d/qsgcontext2d_p.h
index 335d954fc1..f8fc9b75a2 100644
--- a/src/declarative/items/context2d/qsgcontext2d_p.h
+++ b/src/declarative/items/context2d/qsgcontext2d_p.h
@@ -55,7 +55,7 @@
 #include <QtCore/qmetatype.h>
 #include <QtCore/qcoreevent.h>
 #include <QtCore/qvariant.h>
-#include <QtScript/qscriptvalue.h>
+#include <QtDeclarative/qjsvalue.h>
 #include <private/qv8engine_p.h>
 #include <QMutex>
 #include <QWaitCondition>
@@ -323,7 +323,7 @@ public slots:
 
     void paint(QPainter* painter);
     void sync();
-    void processCommands(const QScriptValue& commands);
+    void processCommands(const QJSValue& commands);
 signals:
     void changed();
     void painted();
@@ -385,7 +385,7 @@ protected:
     virtual bool event(QEvent *);
 
 private:
-    void processCommand(const QScriptValue& command);
+    void processCommand(const QJSValue& command);
 
     Q_DECLARE_PRIVATE(QSGContext2D)
 };
diff --git a/src/declarative/items/qsgitem.cpp b/src/declarative/items/qsgitem.cpp
index 6769489711..a0ccf74336 100644
--- a/src/declarative/items/qsgitem.cpp
+++ b/src/declarative/items/qsgitem.cpp
@@ -42,7 +42,7 @@
 #include "qsgitem.h"
 
 #include "qsgcanvas.h"
-#include <QtScript/qscriptengine.h>
+#include <QtDeclarative/qjsengine.h>
 #include "qsgcanvas_p.h"
 #include "qsgevent.h"
 
diff --git a/src/declarative/items/qsgloader.cpp b/src/declarative/items/qsgloader.cpp
index 0d1febacb4..ccf16896fb 100644
--- a/src/declarative/items/qsgloader.cpp
+++ b/src/declarative/items/qsgloader.cpp
@@ -165,7 +165,7 @@ void QSGLoader::setSourceComponent(QDeclarativeComponent *comp)
     d->component = comp;
     d->ownComponent = false;
     if (!d->component) {
-        emit sourceChanged();
+        emit sourceComponentChanged();
         emit statusChanged();
         emit progressChanged();
         emit itemChanged();
@@ -197,7 +197,10 @@ void QSGLoaderPrivate::load()
                 q, SIGNAL(progressChanged()));
         emit q->statusChanged();
         emit q->progressChanged();
-        emit q->sourceChanged();
+        if (ownComponent)
+            emit q->sourceChanged();
+        else
+            emit q->sourceComponentChanged();
         emit q->itemChanged();
     }
 }
@@ -209,7 +212,10 @@ void QSGLoaderPrivate::_q_sourceLoaded()
     if (component) {
         if (!component->errors().isEmpty()) {
             QDeclarativeEnginePrivate::warning(qmlEngine(q), component->errors());
-            emit q->sourceChanged();
+            if (ownComponent)
+                emit q->sourceChanged();
+            else
+                emit q->sourceComponentChanged();
             emit q->statusChanged();
             emit q->progressChanged();
             return;
@@ -253,7 +259,10 @@ void QSGLoaderPrivate::_q_sourceLoaded()
             source = QUrl();
         }
         component->completeCreate();
-        emit q->sourceChanged();
+        if (ownComponent)
+            emit q->sourceChanged();
+        else
+            emit q->sourceComponentChanged();
         emit q->statusChanged();
         emit q->progressChanged();
         emit q->itemChanged();
diff --git a/src/declarative/items/qsgloader_p.h b/src/declarative/items/qsgloader_p.h
index b8605db567..832d3a6138 100644
--- a/src/declarative/items/qsgloader_p.h
+++ b/src/declarative/items/qsgloader_p.h
@@ -58,13 +58,13 @@ class Q_AUTOTEST_EXPORT QSGLoader : public QSGImplicitSizeItem
     Q_ENUMS(Status)
 
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
-    Q_PROPERTY(QDeclarativeComponent *sourceComponent READ sourceComponent WRITE setSourceComponent RESET resetSourceComponent NOTIFY sourceChanged)
+    Q_PROPERTY(QDeclarativeComponent *sourceComponent READ sourceComponent WRITE setSourceComponent RESET resetSourceComponent NOTIFY sourceComponentChanged)
     Q_PROPERTY(QSGItem *item READ item NOTIFY itemChanged)
     Q_PROPERTY(Status status READ status NOTIFY statusChanged)
     Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged)
 
 public:
-    QSGLoader(QSGItem *parent=0);
+    QSGLoader(QSGItem *parent = 0);
     virtual ~QSGLoader();
 
     QUrl source() const;
@@ -83,6 +83,7 @@ public:
 Q_SIGNALS:
     void itemChanged();
     void sourceChanged();
+    void sourceComponentChanged();
     void statusChanged();
     void progressChanged();
     void loaded();