Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into HEAD

Conflicts:
	src/qml/compiler/qv4isel_masm.cpp
	src/qml/jsruntime/qv4script.cpp
	src/qml/qml/qml.pri
	src/qml/qml/qqmltypeloader_p.h

Change-Id: Ia784d855a2131e3289454f12d841ca2c65be15c1

1 files changed, 2 insertions, 36 deletions

diff --git a/src/qml/compiler/qv4isel_p.cpp b/src/qml/compiler/qv4isel_p.cpp
index 5a1a6f5341..2f66628fea 100644
--- a/src/qml/compiler/qv4isel_p.cpp
+++ b/src/qml/compiler/qv4isel_p.cpp
@@ -83,8 +83,8 @@ QV4::CompiledData::CompilationUnit *EvalInstructionSelection::compile(bool gener
     Function *rootFunction = irModule->rootFunction;
     if (!rootFunction)
         return 0;
-    foreach (V4IR::Function *f, irModule->functions)
-        run(f);
+    for (int i = 0; i < irModule->functions.size(); ++i)
+        run(i);
 
     QV4::CompiledData::CompilationUnit *unit = backendCompileStep();
     if (generateUnitData) {
@@ -289,40 +289,6 @@ void IRDecoder::callBuiltin(V4IR::Call *call, V4IR::Temp *result)
         }
     } break;
 
-    case V4IR::Name::builtin_postincrement: {
-        if (V4IR::Member *m = call->args->expr->asMember()) {
-            callBuiltinPostIncrementMember(m->base->asTemp(), *m->name, result);
-            return;
-        } else if (V4IR::Subscript *ss = call->args->expr->asSubscript()) {
-            callBuiltinPostIncrementSubscript(ss->base->asTemp(), ss->index->asTemp(), result);
-            return;
-        } else if (V4IR::Name *n = call->args->expr->asName()) {
-            callBuiltinPostIncrementName(*n->id, result);
-            return;
-        } else if (V4IR::Temp *arg = call->args->expr->asTemp()){
-            assert(arg != 0);
-            callBuiltinPostIncrementValue(arg, result);
-            return;
-        }
-    } break;
-
-    case V4IR::Name::builtin_postdecrement: {
-        if (V4IR::Member *m = call->args->expr->asMember()) {
-            callBuiltinPostDecrementMember(m->base->asTemp(), *m->name, result);
-            return;
-        } else if (V4IR::Subscript *ss = call->args->expr->asSubscript()) {
-            callBuiltinPostDecrementSubscript(ss->base->asTemp(), ss->index->asTemp(), result);
-            return;
-        } else if (V4IR::Name *n = call->args->expr->asName()) {
-            callBuiltinPostDecrementName(*n->id, result);
-            return;
-        } else if (V4IR::Temp *arg = call->args->expr->asTemp()){
-            assert(arg != 0);
-            callBuiltinPostDecrementValue(arg, result);
-            return;
-        }
-    } break;
-
     case V4IR::Name::builtin_throw: {
         V4IR::Expr *arg = call->args->expr;
         assert(arg->asTemp() || arg->asConst());