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

Conflicts:
	.qmake.conf
	LICENSE.GPLv2
	examples/qml/networkaccessmanagerfactory/view.qml
	src/qml/jsruntime/qv4runtime.cpp
	src/qml/jsruntime/qv4stringobject.cpp

Change-Id: I5d12f436d60995e51d5c2f59d364e9cbc24f8e32

diff --cc examples/qml/networkaccessmanagerfactory/view.qml
Simple merge

diff --cc examples/quick/demos/maroon/doc/src/maroon.qdoc
Simple merge

diff --cc examples/quick/demos/photoviewer/doc/src/photoviewer.qdoc
Simple merge

diff --cc src/imports/statemachine/state.cpp
Simple merge

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

diff --cc src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc
Simple merge

diff --cc src/qml/doc/src/qmllanguageref/syntax/signals.qdoc
Simple merge

diff --cc src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc
Simple merge

diff --cc src/qml/doc/src/whatsnew.qdoc
Simple merge

diff --cc src/qml/jit/qv4regalloc.cpp
index 9b2754a,f9f494c..4bc8e14
--- 1/src/qml/jit/qv4regalloc.cpp
--- 2/src/qml/jit/qv4regalloc.cpp
+++ b/src/qml/jit/qv4regalloc.cpp
@@@ -31,9 -31,8 +31,10 @@@
  **
  ****************************************************************************/
  
 +#include <QtCore/QBuffer>
 +#include <QtCore/QDebug>
  #include "qv4regalloc_p.h"
+ #include "qv4alloca_p.h"
  #include <private/qv4value_inl_p.h>
  
  #include <algorithm>

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

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

diff --cc src/qml/jsruntime/qv4runtime.cpp
index 20707d0,b019d4d..c31de6a
--- 1/src/qml/jsruntime/qv4runtime.cpp
--- 2/src/qml/jsruntime/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
@@@ -1002,12 -958,12 +1002,12 @@@ ReturnedValue Runtime::callElement(Exec
      return o->call(callData);
  }
  
 -ReturnedValue Runtime::callValue(ExecutionContext *context, const ValueRef func, CallData *callData)
 +ReturnedValue Runtime::callValue(ExecutionEngine *engine, const Value &func, CallData *callData)
  {
 -    if (!func->isObject())
 -        return context->throwTypeError(QStringLiteral("%1 is not a function").arg(func->toQStringNoThrow()));
 +    if (!func.isObject())
-         return engine->throwTypeError();
++        return engine->throwTypeError(QStringLiteral("%1 is not a function").arg(func.toQStringNoThrow()));
  
 -    return func->objectValue()->call(callData);
 +    return func.objectValue()->call(callData);
  }
  
  

diff --cc src/qml/jsruntime/qv4stringobject.cpp
index a589ae9,8bf9a09..e0b84f6
--- 1/src/qml/jsruntime/qv4stringobject.cpp
--- 2/src/qml/jsruntime/qv4stringobject.cpp
+++ b/src/qml/jsruntime/qv4stringobject.cpp
@@@ -38,10 -37,16 +38,10 @@@
  #include "qv4objectproto_p.h"
  #include "qv4mm_p.h"
  #include "qv4scopedvalue_p.h"
- 
+ #include "qv4alloca_p.h"
 -#include <QtCore/qnumeric.h>
 -#include <QtCore/qmath.h>
  #include <QtCore/QDateTime>
 -#include <QtCore/QStringList>
  #include <QtCore/QDebug>
 -#include <cmath>
 -#include <qmath.h>
 -#include <qnumeric.h>
 -#include <cassert>
 +#include <QtCore/QStringList>
  
  #include <private/qqmljsengine_p.h>
  #include <private/qqmljslexer_p.h>

diff --cc src/qml/qml/qqmlengine.cpp
Simple merge

diff --cc src/qml/qml/qqmltypeloader.cpp
index ac4dcbd,0ac1d7f..ea9b83c
--- 1/src/qml/qml/qqmltypeloader.cpp
--- 2/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@@ -883,20 -887,37 +883,23 @@@ one of these three preconditions are me
  Thus QQmlDataBlob::done() will always eventually be called, even if the blob has an error set.
  */
  
 -/*!
 -Create a new QQmlDataLoader for \a engine.
 -*/
 -QQmlDataLoader::QQmlDataLoader(QQmlEngine *engine)
 -: m_engine(engine), m_thread(new QQmlDataLoaderThread(this))
 -{
 -}
 -
 -/*! \internal */
 -QQmlDataLoader::~QQmlDataLoader()
 -{
 -    invalidate();
 -}
 -
 -void QQmlDataLoader::invalidate()
 +void QQmlTypeLoader::invalidate()
  {
-     for (NetworkReplies::Iterator iter = m_networkReplies.begin(); iter != m_networkReplies.end(); ++iter)
-         (*iter)->release();
-     m_networkReplies.clear();
- 
      if (m_thread) {
          shutdownThread();
          delete m_thread;
          m_thread = 0;
      }
+ 
+     // Need to delete the network replies after
+     // the loader thread is shutdown as it could be
+     // getting new replies while we clear them
+     for (NetworkReplies::Iterator iter = m_networkReplies.begin(); iter != m_networkReplies.end(); ++iter)
+         (*iter)->release();
+     m_networkReplies.clear();
  }
  
 -void QQmlDataLoader::lock()
 +void QQmlTypeLoader::lock()
  {
      m_thread->lock();
  }

diff --cc src/qml/types/qqmldelegatemodel.cpp
Simple merge

diff --cc src/qml/types/qqmltimer.cpp
Simple merge

diff --cc src/qml/types/qquickpackage.cpp
Simple merge

diff --cc src/qmltest/quicktest.cpp
Simple merge

diff --cc src/quick/doc/src/concepts/effects/sprites.qdoc
Simple merge

diff --cc src/quick/doc/src/concepts/input/focus.qdoc
Simple merge

diff --cc src/quick/doc/src/dynamicview-tutorial.qdoc
Simple merge

diff --cc src/quick/doc/src/whatsnew.qdoc
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --cc src/quick/scenegraph/util/qsgtexture.cpp
Simple merge

diff --cc src/quick/util/qquickfontmetrics.cpp
Simple merge

diff --cc src/quick/util/qquickimageprovider.cpp
Simple merge

diff --cc src/quick/util/qquicktextmetrics.cpp
Simple merge

diff --cc tests/auto/qml/qjsengine/tst_qjsengine.cpp
Simple merge

diff --cc tests/auto/qml/qqmltimer/tst_qqmltimer.cpp
Simple merge

diff --cc tests/auto/quick/nodes/tst_nodestest.cpp
Simple merge

diff --cc tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp
Simple merge

diff --cc tests/auto/quick/qquicktext/tst_qquicktext.cpp
Simple merge

diff --cc tests/auto/quick/scenegraph/tst_scenegraph.cpp
Simple merge