Merge remote branch 'main/4.7' into 4.7

Conflicts:
	demos/declarative/minehunt/minehunt.cpp
	src/declarative/qml/qdeclarativecompiler.cpp

1 files changed, 12 insertions, 4 deletions

diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp
index 4457404..2338bc3 100644
--- a/src/declarative/qml/qdeclarativevme.cpp
+++ b/src/declarative/qml/qdeclarativevme.cpp
@@ -61,8 +61,6 @@
 #include "qdeclarativeglobal_p.h"
 #include "qdeclarativescriptstring.h"
 
-#include <qfxperf_p_p.h>
-
 #include <QStack>
 #include <QWidget>
 #include <QColor>
@@ -72,6 +70,7 @@
 #include <QtCore/qdebug.h>
 #include <QtCore/qvarlengtharray.h>
 #include <QtCore/qcoreapplication.h>
+#include <QtCore/qdatetime.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -260,8 +259,9 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
 
         case QDeclarativeInstruction::CreateComponent:
             {
-                QObject *qcomp = new QDeclarativeComponent(ctxt->engine, comp, ii + 1, instr.createComponent.count,
-                                                           stack.isEmpty() ? 0 : stack.top());
+                QDeclarativeComponent *qcomp = 
+                    new QDeclarativeComponent(ctxt->engine, comp, ii + 1, instr.createComponent.count,
+                                              stack.isEmpty() ? 0 : stack.top());
 
                 QDeclarativeDeclarativeData *ddata = QDeclarativeDeclarativeData::get(qcomp, true);
                 Q_ASSERT(ddata);
@@ -276,6 +276,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
                 ddata->lineNumber = instr.line;
                 ddata->columnNumber = instr.create.column;
 
+                QDeclarativeComponentPrivate::get(qcomp)->creationContext = ctxt;
+
                 stack.push(qcomp);
                 ii += instr.createComponent.count;
             }
@@ -582,6 +584,12 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack,
             }
             break;
 
+        case QDeclarativeInstruction::StoreImportedScript:
+            {
+                ctxt->addImportedScript(scripts.at(instr.storeScript.value));
+            }
+            break;
+
         case QDeclarativeInstruction::StoreScriptString:
             {
                 QObject *target = stack.top();