Merge branch 'dev' of qtdeclarative into wip/v4

Conflicts:
	src/qml/jsruntime/qv4script.cpp

Change-Id: I20136cab29d86862b5bd9208003200bc24bcdacf

1 files changed, 4 insertions, 4 deletions

diff --git a/tools/v4/main.cpp b/tools/v4/main.cpp
index e4a03339e1..a49c7093cf 100644
--- a/tools/v4/main.cpp
+++ b/tools/v4/main.cpp
@@ -77,10 +77,10 @@ struct Print: FunctionObject
         name = scope->engine->newString("print");
     }
 
-    static Value call(Managed *, const CallData &d)
+    static Value call(Managed *, CallData *callData)
     {
-        for (int i = 0; i < d.argc; ++i) {
-            QString s = d.args[i].toQString();
+        for (int i = 0; i < callData->argc; ++i) {
+            QString s = callData->args[i].toQString();
             if (i)
                 std::cout << ' ';
             std::cout << qPrintable(s);
@@ -102,7 +102,7 @@ struct GC: public FunctionObject
         vtbl = &static_vtbl;
         name = scope->engine->newString("gc");
     }
-    static Value call(Managed *m, const CallData &)
+    static Value call(Managed *m, CallData *)
     {
         m->engine()->memoryManager->runGC();
         return Value::undefinedValue();