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

Conflicts:
	src/qml/debugger/qv4debugservice.cpp
	src/qml/jsruntime/qv4value_inl_p.h
	src/qml/jsruntime/qv4value_p.h
	src/qml/memory/qv4mm.cpp
	src/qml/memory/qv4mm_p.h
	src/qml/qml/qqmlnotifier_p.h
	src/qml/qml/qqmlproperty.cpp
	src/quick/items/qquickflickable.cpp
	src/quick/items/qquicktextedit.cpp
	tests/auto/quick/qquickwindow/BLACKLIST

The extra changes in qqmlbinding.cpp are ported from changes to
qqmlproperty.cpp that occurred in parallel with writeBinding() being
moved to qqmlbinding.cpp.

Change-Id: I16d1920abf448c29a01822256f52153651a56356

4 files changed, 14 insertions, 8 deletions

diff --git a/src/quick/util/qquickanimatorjob.cpp b/src/quick/util/qquickanimatorjob.cpp
index 016f41d436..0182f8abfb 100644
--- a/src/quick/util/qquickanimatorjob.cpp
+++ b/src/quick/util/qquickanimatorjob.cpp
@@ -135,7 +135,7 @@ void QQuickAnimatorProxyJob::updateState(QAbstractAnimationJob::State newState,
 
 void QQuickAnimatorProxyJob::debugAnimation(QDebug d) const
 {
-    d << "QuickAnimatorProxyJob("<< hex << (void *) this << dec
+    d << "QuickAnimatorProxyJob("<< hex << (const void *) this << dec
       << "state:" << state() << "duration:" << duration()
       << "proxying: (" << job() << ')';
 }
@@ -224,7 +224,7 @@ QQuickAnimatorJob::QQuickAnimatorJob()
 
 void QQuickAnimatorJob::debugAnimation(QDebug d) const
 {
-    d << "QuickAnimatorJob(" << hex << (void *) this << dec
+    d << "QuickAnimatorJob(" << hex << (const void *) this << dec
       << ") state:" << state() << "duration:" << duration()
       << "target:" << m_target << "value:" << m_value;
 }
diff --git a/src/quick/util/qquickanimatorjob_p.h b/src/quick/util/qquickanimatorjob_p.h
index 34c106e89b..ca70aecb8e 100644
--- a/src/quick/util/qquickanimatorjob_p.h
+++ b/src/quick/util/qquickanimatorjob_p.h
@@ -63,7 +63,7 @@ public:
     QQuickAnimatorProxyJob(QAbstractAnimationJob *job, QObject *item);
     ~QQuickAnimatorProxyJob();
 
-    int duration() const { return m_duration; }
+    int duration() const Q_DECL_OVERRIDE { return m_duration; }
 
     QAbstractAnimationJob *job() const { return m_job; }
 
@@ -72,8 +72,8 @@ public:
     void markJobManagedByController() { m_jobManagedByController = true; }
 
 protected:
-    void updateCurrentTime(int);
-    void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState);
+    void updateCurrentTime(int) Q_DECL_OVERRIDE;
+    void updateState(QAbstractAnimationJob::State newState, QAbstractAnimationJob::State oldState) Q_DECL_OVERRIDE;
     void debugAnimation(QDebug d) const Q_DECL_OVERRIDE;
 
 public Q_SLOTS:
@@ -116,7 +116,7 @@ public:
     qreal to() const { return m_to; }
 
     void setDuration(int duration) { m_duration = duration; }
-    int duration() const { return m_duration; }
+    int duration() const Q_DECL_OVERRIDE { return m_duration; }
 
     QEasingCurve easingCurve() const { return m_easing; }
     void setEasingCurve(const QEasingCurve &curve) { m_easing = curve; }
diff --git a/src/quick/util/qquickprofiler_p.h b/src/quick/util/qquickprofiler_p.h
index 2eec9bf877..6b6e7fa062 100644
--- a/src/quick/util/qquickprofiler_p.h
+++ b/src/quick/util/qquickprofiler_p.h
@@ -259,7 +259,7 @@ public:
     }
 
     template<SceneGraphFrameType FrameType, bool Record>
-    static void reportSceneGraphFrame(quint64 payload = -1)
+    static void reportSceneGraphFrame(quint64 payload = ~0)
     {
         qint64 *timings = s_instance->m_sceneGraphData.timings<FrameType>();
         int &offset = s_instance->m_sceneGraphData.offset<FrameType>();
@@ -275,7 +275,7 @@ public:
     }
 
     template<SceneGraphFrameType FrameType, bool Record, SceneGraphFrameType SwitchTo>
-    static void reportSceneGraphFrame(quint64 payload = -1)
+    static void reportSceneGraphFrame(quint64 payload = ~0)
     {
         reportSceneGraphFrame<FrameType, Record>(payload);
         s_instance->m_sceneGraphData.offset<SwitchTo>() = 0;
diff --git a/src/quick/util/qquickstyledtext.cpp b/src/quick/util/qquickstyledtext.cpp
index 6b1768e9ef..c411207121 100644
--- a/src/quick/util/qquickstyledtext.cpp
+++ b/src/quick/util/qquickstyledtext.cpp
@@ -542,6 +542,12 @@ void QQuickStyledTextPrivate::parseEntity(const QChar *&ch, const QString &textI
                 textOut += QChar(38);
             else if (entity == QLatin1String("quot"))
                 textOut += QChar(34);
+            else if (entity == QLatin1String("nbsp"))
+                textOut += QChar(QChar::Nbsp);
+            return;
+        } else if (*ch == QLatin1Char(' ')) {
+            QStringRef entity(&textIn, entityStart - 1, entityLength + 1);
+            textOut += entity + *ch;
             return;
         }
         ++entityLength;