Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	.qmake.conf
	src/qml/jsruntime/qv4context_p.h
	src/qml/jsruntime/qv4debugging.cpp
	src/qml/jsruntime/qv4engine.cpp
	src/qml/jsruntime/qv4functionobject_p.h
	src/qml/jsruntime/qv4qobjectwrapper.cpp
	src/quick/scenegraph/shaders/visualization.frag
	tests/auto/qml/qjsengine/tst_qjsengine.cpp

Change-Id: I492e8546c278f80a300a2129e9a29d861e144a30

diff --cc src/qml/compiler/qqmltypecompiler.cpp
Simple merge

diff --cc src/qml/compiler/qv4ssa.cpp
Simple merge

diff --cc src/qml/jsruntime/qv4context.cpp
index 85bcadd,5ca47a8..40c02ef
--- 1/src/qml/jsruntime/qv4context.cpp
--- 2/src/qml/jsruntime/qv4context.cpp
+++ b/src/qml/jsruntime/qv4context.cpp
@@@ -473,5 -463,100 +473,21 @@@ ReturnedValue ExecutionContext::getProp
          }
      }
      ScopedValue n(scope, name);
 -    return throwReferenceError(n);
 -}
 -
 -
 -ReturnedValue ExecutionContext::throwError(const ValueRef value)
 -{
 -    return d()->engine->throwException(value);
 +    return engine()->throwReferenceError(n);
  }
 -ReturnedValue ExecutionContext::throwError(const QString &message)
+ 
 -    Scope scope(this);
 -    ScopedValue v(scope, d()->engine->newString(message));
 -    v = d()->engine->newErrorObject(v);
 -    return throwError(v);
 -}
 -
 -ReturnedValue ExecutionContext::throwSyntaxError(const QString &message, const QString &fileName, int line, int column)
 -{
 -    Scope scope(this);
 -    Scoped<Object> error(scope, d()->engine->newSyntaxErrorObject(message, fileName, line, column));
 -    return throwError(error);
 -}
 -
 -ReturnedValue ExecutionContext::throwSyntaxError(const QString &message)
 -{
 -    Scope scope(this);
 -    Scoped<Object> error(scope, d()->engine->newSyntaxErrorObject(message));
 -    return throwError(error);
 -}
 -
 -ReturnedValue ExecutionContext::throwTypeError()
 -{
 -    Scope scope(this);
 -    Scoped<Object> error(scope, d()->engine->newTypeErrorObject(QStringLiteral("Type error")));
 -    return throwError(error);
 -}
 -
 -ReturnedValue ExecutionContext::throwTypeError(const QString &message)
 -{
 -    Scope scope(this);
 -    Scoped<Object> error(scope, d()->engine->newTypeErrorObject(message));
 -    return throwError(error);
 -}
 -
 -ReturnedValue ExecutionContext::throwUnimplemented(const QString &message)
 -{
 -    Scope scope(this);
 -    ScopedValue v(scope, d()->engine->newString(QStringLiteral("Unimplemented ") + message));
 -    v = d()->engine->newErrorObject(v);
 -    return throwError(v);
 -}
 -
 -ReturnedValue ExecutionContext::catchException(StackTrace *trace)
 -{
 -    return d()->engine->catchException(this, trace);
 -}
 -
 -ReturnedValue ExecutionContext::throwReferenceError(const ValueRef value)
 -{
 -    Scope scope(this);
 -    Scoped<String> s(scope, value->toString(this));
 -    QString msg = s->toQString() + QStringLiteral(" is not defined");
 -    Scoped<Object> error(scope, d()->engine->newReferenceErrorObject(msg));
 -    return throwError(error);
 -}
 -
 -ReturnedValue ExecutionContext::throwReferenceError(const QString &message, const QString &fileName, int line, int column)
 -{
 -    Scope scope(this);
 -    QString msg = message;
 -    Scoped<Object> error(scope, d()->engine->newReferenceErrorObject(msg, fileName, line, column));
 -    return throwError(error);
 -}
 -
 -ReturnedValue ExecutionContext::throwRangeError(const ValueRef value)
 -{
 -    Scope scope(this);
 -    ScopedString s(scope, value->toString(this));
 -    QString msg = s->toQString() + QStringLiteral(" out of range");
 -    ScopedObject error(scope, d()->engine->newRangeErrorObject(msg));
 -    return throwError(error);
 -}
 -
 -ReturnedValue ExecutionContext::throwRangeError(const QString &message)
 -{
 -    Scope scope(this);
 -    ScopedObject error(scope, d()->engine->newRangeErrorObject(message));
 -    return throwError(error);
 -}
++Heap::FunctionObject *ExecutionContext::getFunctionObject() const
+ {
 -ReturnedValue ExecutionContext::throwURIError(const ValueRef msg)
 -{
 -    Scope scope(this);
 -    ScopedObject error(scope, d()->engine->newURIErrorObject(msg));
 -    return throwError(error);
++    Scope scope(d()->engine);
++    ScopedContext it(scope, this->d());
++    for (; it; it = it->d()->parent) {
++        if (const CallContext *callCtx = it->asCallContext())
++            return callCtx->d()->function;
++        else if (it->asCatchContext() || it->asWithContext())
++            continue; // look in the parent context for a FunctionObject
++        else
++            break;
++    }
+ 
++    return 0;
+ }

diff --cc src/qml/jsruntime/qv4context_p.h
index ea2d266,99a982a..48319c7
--- 1/src/qml/jsruntime/qv4context_p.h
--- 2/src/qml/jsruntime/qv4context_p.h
+++ b/src/qml/jsruntime/qv4context_p.h
@@@ -149,13 -140,20 +149,17 @@@ struct Q_QML_EXPORT ExecutionContext : 
  
      void setProperty(String *name, const ValueRef value);
      ReturnedValue getProperty(String *name);
 -    ReturnedValue getPropertyAndBase(String *name, Object *&base);
 +    ReturnedValue getPropertyAndBase(String *name, Heap::Object **base);
      bool deleteProperty(String *name);
  
 -    // Can only be called from within catch(...), rethrows if no JS exception.
 -    ReturnedValue catchException(StackTrace *trace = 0);
 -
      inline CallContext *asCallContext();
      inline const CallContext *asCallContext() const;
 -    inline FunctionObject *getFunctionObject() const;
+     inline const CatchContext *asCatchContext() const;
+     inline const WithContext *asWithContext() const;
+ 
++    Heap::FunctionObject *getFunctionObject() const;
  
 -    static void markObjects(Managed *m, ExecutionEngine *e);
 +    static void markObjects(Heap::Base *m, ExecutionEngine *e);
  };
  
  struct CallContext : public ExecutionContext
@@@ -199,9 -225,71 +203,19 @@@ inline CallContext *ExecutionContext::a
  
  inline const CallContext *ExecutionContext::asCallContext() const
  {
 -    return d()->type >= Type_SimpleCallContext ? static_cast<const CallContext *>(this) : 0;
 +    return d()->type >= Heap::ExecutionContext::Type_SimpleCallContext ? static_cast<const CallContext *>(this) : 0;
  }
  
 -    return d()->type == Type_CatchContext ? static_cast<const CatchContext *>(this) : 0;
+ inline const CatchContext *ExecutionContext::asCatchContext() const
+ {
 -    return d()->type == Type_WithContext ? static_cast<const WithContext *>(this) : 0;
 -}
 -
 -inline FunctionObject *ExecutionContext::getFunctionObject() const
 -{
 -    for (const ExecutionContext *it = this; it; it = it->d()->parent) {
 -        if (const CallContext *callCtx = it->asCallContext())
 -            return callCtx->d()->function;
 -        else if (it->asCatchContext() || it->asWithContext())
 -            continue; // look in the parent context for a FunctionObject
 -        else
 -            break;
 -    }
 -
 -    return 0;
 -}
 -
 -inline void ExecutionEngine::pushContext(CallContext *context)
 -{
 -    context->d()->parent = current;
 -    current = context;
 -}
 -
 -inline ExecutionContext *ExecutionEngine::popContext()
 -{
 -    Q_ASSERT(current->d()->parent);
 -    current = current->d()->parent;
 -    return current;
 -}
 -
 -struct ExecutionContextSaver
 -{
 -    ExecutionEngine *engine;
 -    ExecutionContext *savedContext;
 -
 -    ExecutionContextSaver(ExecutionContext *context)
 -        : engine(context->d()->engine)
 -        , savedContext(context)
 -    {
 -    }
 -    ~ExecutionContextSaver()
 -    {
 -        engine->current = savedContext;
 -    }
 -};
 -
 -inline Scope::Scope(ExecutionContext *ctx)
 -    : engine(ctx->d()->engine)
 -#ifndef QT_NO_DEBUG
 -    , size(0)
 -#endif
 -{
 -    mark = engine->jsStackTop;
++    return d()->type == Heap::ExecutionContext::Type_CatchContext ? static_cast<const CatchContext *>(this) : 0;
+ }
+ 
+ inline const WithContext *ExecutionContext::asWithContext() const
+ {
++    return d()->type == Heap::ExecutionContext::Type_WithContext ? static_cast<const WithContext *>(this) : 0;
+ }
+ 
  /* Function *f, int argc */
  #define requiredMemoryForExecutionContect(f, argc) \
      ((sizeof(CallContext::Data) + 7) & ~7) + sizeof(Value) * (f->varCount() + qMax((uint)argc, f->formalParameterCount())) + sizeof(CallData)

diff --cc src/qml/jsruntime/qv4dateobject.cpp
Simple merge

diff --cc src/qml/jsruntime/qv4debugging.cpp
index 9361fa1,50142ab..01ee958
--- 1/src/qml/jsruntime/qv4debugging.cpp
--- 2/src/qml/jsruntime/qv4debugging.cpp
+++ b/src/qml/jsruntime/qv4debugging.cpp
@@@ -547,8 -534,12 +546,12 @@@ void Debugger::maybeBreakAtInstruction(
      if (m_pauseRequested) { // Serve debugging requests from the agent
          m_pauseRequested = false;
          pauseAndWait(PauseRequest);
-     } else if (m_haveBreakPoints && reallyHitTheBreakPoint(getFunction()->sourceFile(), lineNumber)) {
-         pauseAndWait(BreakPoint);
+     } else if (m_haveBreakPoints) {
+         if (Function *f = getFunction()) {
 -            const int lineNumber = engine()->currentContext()->d()->lineNumber;
++            const int lineNumber = engine()->currentContext()->lineNumber;
+             if (reallyHitTheBreakPoint(f->sourceFile(), lineNumber))
+                 pauseAndWait(BreakPoint);
+         }
      }
  }
  
@@@ -592,14 -583,11 +595,13 @@@ void Debugger::aboutToThrow(
  
  Function *Debugger::getFunction() const
  {
 -    ExecutionContext *context = m_engine->currentContext();
 -    if (const FunctionObject *function = context->getFunctionObject())
 +    Scope scope(m_engine);
 +    ScopedContext context(scope, m_engine->currentContext());
-     if (CallContext *callCtx = context->asCallContext())
-         return callCtx->d()->function->function;
-     else {
-         Q_ASSERT(context->d()->type == QV4::Heap::ExecutionContext::Type_GlobalContext);
++    ScopedFunctionObject function(scope, context->getFunctionObject());
++    if (function)
+         return function->function();
+     else
          return context->d()->engine->globalCode;
-     }
  }
  
  void Debugger::pauseAndWait(PauseReason reason)

diff --cc src/qml/jsruntime/qv4engine.cpp
index 4f8f329,74b262e..a51ea36
--- 1/src/qml/jsruntime/qv4engine.cpp
--- 2/src/qml/jsruntime/qv4engine.cpp
+++ b/src/qml/jsruntime/qv4engine.cpp
@@@ -761,14 -698,12 +761,14 @@@ QVector<StackFrame> ExecutionEngine::st
      ScopedString name(scope);
      QVector<StackFrame> stack;
  
 -    QV4::ExecutionContext *c = currentContext();
 +    ScopedContext c(scope, currentContext());
++    ScopedFunctionObject function(scope);
      while (c && frameLimit) {
-         CallContext *callCtx = c->asCallContext();
-         if (callCtx && callCtx->d()->function) {
 -        if (FunctionObject *function = c->getFunctionObject()) {
++        function = c->getFunctionObject();
++        if (function) {
              StackFrame frame;
-             ScopedFunctionObject function(scope, callCtx->d()->function);
-             if (function->function())
-                 frame.source = function->function()->sourceFile();
+             if (const Function *f = function->function())
+                 frame.source = f->sourceFile();
              name = function->name();
              frame.function = name->toQString();
              frame.line = -1;
@@@ -788,10 -723,9 +788,9 @@@
          StackFrame frame;
          frame.source = globalCode->sourceFile();
          frame.function = globalCode->name()->toQString();
 -        frame.line = rootContext->d()->lineNumber;
 +        frame.line = rootContext()->lineNumber;
          frame.column = -1;
  
- 
          stack.append(frame);
      }
      return stack;

diff --cc src/qml/jsruntime/qv4global_p.h
Simple merge

diff --cc src/qml/jsruntime/qv4qobjectwrapper.cpp
index 7ec66dd,db1315d..1248991
--- 1/src/qml/jsruntime/qv4qobjectwrapper.cpp
--- 2/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@@ -813,14 -801,18 +813,18 @@@ struct QObjectSlotDispatcher : public Q
              }
  
              f->call(callData);
 -            if (scope.hasException() && v4->v8Engine) {
 -                QQmlError error = QV4::ExecutionEngine::catchExceptionAsQmlError(ctx);
 +            if (scope.hasException()) {
++                QQmlError error = v4->catchExceptionAsQmlError();
+                 if (error.description().isEmpty()) {
+                     QV4::ScopedString name(scope, f->name());
+                     error.setDescription(QString::fromLatin1("Unknown exception occurred during evaluation of connected function: %1").arg(name->toQString()));
+                 }
 -                if (QQmlEngine *qmlEngine = v4->v8Engine->engine()) {
 +                if (QQmlEngine *qmlEngine = v4->qmlEngine()) {
-                     QQmlError error = v4->catchExceptionAsQmlError();
-                     if (error.description().isEmpty()) {
-                         QV4::ScopedString name(scope, f->name());
-                         error.setDescription(QString(QLatin1String("Unknown exception occurred during evaluation of connected function: %1")).arg(name->toQString()));
-                     }
                      QQmlEnginePrivate::get(qmlEngine)->warning(error);
+                 } else {
+                     QMessageLogger(error.url().toString().toLatin1().constData(),
+                                    error.line(), 0).warning().noquote()
+                             << error.toString();
                  }
              }
          }

diff --cc src/quick/items/context2d/qquickcontext2d.cpp
Simple merge

diff --cc src/quick/items/qquicktext_p_p.h
Simple merge

diff --cc src/quick/items/qquicktextedit.cpp
Simple merge

diff --cc src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
Simple merge

diff --cc src/quick/scenegraph/qsgwindowsrenderloop.cpp
Simple merge

diff --cc src/quick/scenegraph/shaders/visualization.frag
index 6cfeac1,15c81f2..458d9dd
--- 1/src/quick/scenegraph/shaders/visualization.frag
--- 2/src/quick/scenegraph/shaders/visualization.frag
+++ b/src/quick/scenegraph/shaders/visualization.frag
@@@ -6,6 -6,6 +6,6 @@@ varying mediump vec2 pos
  void main(void)
  {
      lowp vec4 c = color;
-     c.xyz += pow(max(sin(pos.x + pos.y), 0.0), 2.0) * pattern * 0.1;
 -    c.xyz += pow(max(sin(pos.x + pos.y), 0.0), 2.0) * tweak.z * 0.25;
++    c.xyz += pow(max(sin(pos.x + pos.y), 0.0), 2.0) * pattern * 0.25;
      gl_FragColor = c;
  }

diff --cc tests/auto/qml/qjsengine/tst_qjsengine.cpp
index 13e60fe,d24a1a4..9f86c8e
--- 1/tests/auto/qml/qjsengine/tst_qjsengine.cpp
--- 2/tests/auto/qml/qjsengine/tst_qjsengine.cpp
+++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp
@@@ -174,7 -173,7 +174,8 @@@ private slots
  
      void privateMethods();
  
 +    void engineForObject();
+     void intConversion_QTBUG43309();
  
  signals:
      void testSignal();
@@@ -3626,19 -3603,16 +3627,29 @@@ void tst_QJSEngine::privateMethods(
      }
  }
  
 +void tst_QJSEngine::engineForObject()
 +{
 +    QObject object;
 +    {
 +        QJSEngine engine;
 +        QVERIFY(!qjsEngine(&object));
 +        QJSValue wrapper = engine.newQObject(&object);
 +        QQmlEngine::setObjectOwnership(&object, QQmlEngine::CppOwnership);
 +        QCOMPARE(qjsEngine(&object), wrapper.engine());
 +    }
 +    QVERIFY(!qjsEngine(&object));
 +}
 +
+ void tst_QJSEngine::intConversion_QTBUG43309()
+ {
+     // This failed in the interpreter:
+     QJSEngine engine;
+     QString jsCode = "var n = 0.1; var m = (n*255) | 0; m";
+     QJSValue result = engine.evaluate( jsCode );
+     QVERIFY(result.isNumber());
+     QCOMPARE(result.toNumber(), 25.0);
+ }
+ 
  QTEST_MAIN(tst_QJSEngine)
  
  #include "tst_qjsengine.moc"

diff --cc tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Simple merge

diff --cc tests/auto/qml/qv4debugger/tst_qv4debugger.cpp
Simple merge

diff --cc tools/qmljs/qmljs.cpp
Simple merge