Merge remote-tracking branch 'origin/master' into refactor

Conflicts:
	src/declarative/declarative.pro

Change-Id: I9c6d8447e1254c6acd32fa0775ff6a79d0d66acd

1 files changed, 6 insertions, 0 deletions

diff --git a/src/declarative/qml/qdeclarativecomponent_p.h b/src/declarative/qml/qdeclarativecomponent_p.h
index 7677f305e2..ba937491b7 100644
--- a/src/declarative/qml/qdeclarativecomponent_p.h
+++ b/src/declarative/qml/qdeclarativecomponent_p.h
@@ -55,6 +55,7 @@
 
 #include "qdeclarativecomponent.h"
 
+#include "private/qv8_p.h"
 #include "private/qdeclarativeengine_p.h"
 #include "private/qdeclarativetypeloader_p.h"
 #include "private/qbitfield_p.h"
@@ -69,6 +70,8 @@
 
 QT_BEGIN_NAMESPACE
 
+class QV8Engine;
+
 class QDeclarativeComponent;
 class QDeclarativeEngine;
 class QDeclarativeCompiledData;
@@ -83,6 +86,8 @@ public:
 
     QObject *beginCreate(QDeclarativeContextData *, const QBitField &);
     void completeCreate();
+    QObject *createObjectWithInitialProperties(v8::Handle<v8::Object> qmlGlobal, v8::Handle<v8::Object> valuemap, QObject *parentObject);
+    QObject *completeCreateObjectWithInitialProperties(v8::Handle<v8::Object> qmlGlobal, v8::Handle<v8::Object> valuemap, QObject *toCreate);
 
     QDeclarativeTypeData *typeData;
     virtual void typeDataReady(QDeclarativeTypeData *);
@@ -115,6 +120,7 @@ public:
                               ConstructionState *state);
     static void complete(QDeclarativeEnginePrivate *enginePriv, ConstructionState *state);
 
+
     QDeclarativeEngine *engine;
     QDeclarativeGuardedContextData creationContext;