Merge remote-tracking branch 'origin/5.9' into 5.10

Change-Id: I37bc7afea415261639b71e7b8dfc9177fdd4cb62

9 files changed, 87 insertions, 75 deletions

diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4
index c0e861a706..0659875b9a 100644
--- a/dist/changes-5.9.4
+++ b/dist/changes-5.9.4
@@ -29,7 +29,13 @@ QtQml
  - [QTBUG-56521][QTBUG-56532] Added private qmlUnregisterType(int) for
    advanced use cases such as re-registering an enum, or cleaning up
    when a plugin is unloaded
- - [QTBUG-61209] Fixed handling of QML cache files during URL interception
+ - [QTBUG-61209] Fixed handling of QML cache files during URL interception.
+   This changes the semantics of URL redirects. Previously a redirected URL
+   was used as the base URL for further URL resolution. This doesn't work
+   because redirection occurs after interception and interception should
+   not influence the resolution of further URLs. We now use the original
+   URL as base URL for resolution of further URLs and rely on the server to
+   redirect those, too.
  - [QTBUG-63844] Fixed a crash in QMetaObject::activate() when using
    a Loader to load items with animations
 
diff --git a/src/qml/animations/qabstractanimationjob.cpp b/src/qml/animations/qabstractanimationjob.cpp
index 1ac4925ed3..b726d2fc43 100644
--- a/src/qml/animations/qabstractanimationjob.cpp
+++ b/src/qml/animations/qabstractanimationjob.cpp
@@ -91,9 +91,8 @@ QQmlAnimationTimer *QQmlAnimationTimer::instance()
 
 void QQmlAnimationTimer::ensureTimerUpdate()
 {
-    QQmlAnimationTimer *inst = QQmlAnimationTimer::instance(false);
     QUnifiedTimer *instU = QUnifiedTimer::instance(false);
-    if (instU && inst && inst->isPaused)
+    if (instU && isPaused)
         instU->updateAnimationTimers(-1);
 }
 
@@ -128,9 +127,7 @@ void QQmlAnimationTimer::updateAnimationsTime(qint64 delta)
 
 void QQmlAnimationTimer::updateAnimationTimer()
 {
-    QQmlAnimationTimer *inst = QQmlAnimationTimer::instance(false);
-    if (inst)
-        inst->restartAnimationTimer();
+    restartAnimationTimer();
 }
 
 void QQmlAnimationTimer::restartAnimationTimer()
@@ -175,45 +172,38 @@ void QQmlAnimationTimer::registerAnimation(QAbstractAnimationJob *animation, boo
     if (animation->userControlDisabled())
         return;
 
-    QQmlAnimationTimer *inst = instance(true); //we create the instance if needed
-    inst->registerRunningAnimation(animation);
+    registerRunningAnimation(animation);
     if (isTopLevel) {
         Q_ASSERT(!animation->m_hasRegisteredTimer);
         animation->m_hasRegisteredTimer = true;
-        inst->animationsToStart << animation;
-        if (!inst->startAnimationPending) {
-            inst->startAnimationPending = true;
-            QMetaObject::invokeMethod(inst, "startAnimations", Qt::QueuedConnection);
+        animationsToStart << animation;
+        if (!startAnimationPending) {
+            startAnimationPending = true;
+            QMetaObject::invokeMethod(this, "startAnimations", Qt::QueuedConnection);
         }
     }
 }
 
 void QQmlAnimationTimer::unregisterAnimation(QAbstractAnimationJob *animation)
 {
-    QQmlAnimationTimer *inst = QQmlAnimationTimer::instance(false);
-    if (inst) {
-        //at this point the unified timer should have been created
-        //but it might also have been already destroyed in case the application is shutting down
+    unregisterRunningAnimation(animation);
 
-        inst->unregisterRunningAnimation(animation);
-
-        if (!animation->m_hasRegisteredTimer)
-            return;
+    if (!animation->m_hasRegisteredTimer)
+        return;
 
-        int idx = inst->animations.indexOf(animation);
-        if (idx != -1) {
-            inst->animations.removeAt(idx);
-            // this is needed if we unregister an animation while its running
-            if (idx <= inst->currentAnimationIdx)
-                --inst->currentAnimationIdx;
+    int idx = animations.indexOf(animation);
+    if (idx != -1) {
+        animations.removeAt(idx);
+        // this is needed if we unregister an animation while its running
+        if (idx <= currentAnimationIdx)
+            --currentAnimationIdx;
 
-            if (inst->animations.isEmpty() && !inst->stopTimerPending) {
-                inst->stopTimerPending = true;
-                QMetaObject::invokeMethod(inst, "stopTimer", Qt::QueuedConnection);
-            }
-        } else {
-            inst->animationsToStart.removeOne(animation);
+        if (animations.isEmpty() && !stopTimerPending) {
+            stopTimerPending = true;
+            QMetaObject::invokeMethod(this, "stopTimer", Qt::QueuedConnection);
         }
+    } else {
+        animationsToStart.removeOne(animation);
     }
     animation->m_hasRegisteredTimer = false;
 }
@@ -302,8 +292,10 @@ QAbstractAnimationJob::~QAbstractAnimationJob()
         stateChanged(oldState, m_state);
 
         Q_ASSERT(m_state == Stopped);
-        if (oldState == Running)
-            QQmlAnimationTimer::unregisterAnimation(this);
+        if (oldState == Running) {
+            Q_ASSERT(QQmlAnimationTimer::instance() == m_timer);
+            m_timer->unregisterAnimation(this);
+        }
         Q_ASSERT(!m_hasRegisteredTimer);
     }
 
@@ -327,6 +319,9 @@ void QAbstractAnimationJob::setState(QAbstractAnimationJob::State newState)
     if (m_loopCount == 0)
         return;
 
+    if (!m_timer)
+        m_timer = QQmlAnimationTimer::instance();
+
     State oldState = m_state;
     int oldCurrentTime = m_currentTime;
     int oldCurrentLoop = m_currentLoop;
@@ -352,11 +347,11 @@ void QAbstractAnimationJob::setState(QAbstractAnimationJob::State newState)
     bool isTopLevel = !m_group || m_group->isStopped();
     if (oldState == Running) {
         if (newState == Paused && m_hasRegisteredTimer)
-            QQmlAnimationTimer::ensureTimerUpdate();
+            m_timer->ensureTimerUpdate();
         //the animation, is not running any more
-        QQmlAnimationTimer::unregisterAnimation(this);
+        m_timer->unregisterAnimation(this);
     } else if (newState == Running) {
-        QQmlAnimationTimer::registerAnimation(this, isTopLevel);
+        m_timer->registerAnimation(this, isTopLevel);
     }
 
     //starting an animation qualifies as a top level loop change
@@ -383,7 +378,7 @@ void QAbstractAnimationJob::setState(QAbstractAnimationJob::State newState)
                 m_currentLoop = 0;
                 if (isTopLevel) {
                     // currentTime needs to be updated if pauseTimer is active
-                    RETURN_IF_DELETED(QQmlAnimationTimer::ensureTimerUpdate());
+                    RETURN_IF_DELETED(m_timer->ensureTimerUpdate());
                     RETURN_IF_DELETED(setCurrentTime(m_totalCurrentTime));
                 }
             }
@@ -420,14 +415,14 @@ void QAbstractAnimationJob::setDirection(Direction direction)
     // the commands order below is important: first we need to setCurrentTime with the old direction,
     // then update the direction on this and all children and finally restart the pauseTimer if needed
     if (m_hasRegisteredTimer)
-        QQmlAnimationTimer::ensureTimerUpdate();
+        m_timer->ensureTimerUpdate();
 
     m_direction = direction;
     updateDirection(direction);
 
     if (m_hasRegisteredTimer)
         // needed to update the timer interval in case of a pause animation
-        QQmlAnimationTimer::updateAnimationTimer();
+        m_timer->updateAnimationTimer();
 }
 
 void QAbstractAnimationJob::setLoopCount(int loopCount)
diff --git a/src/qml/animations/qabstractanimationjob_p.h b/src/qml/animations/qabstractanimationjob_p.h
index 95a39b1301..63fd4b0dac 100644
--- a/src/qml/animations/qabstractanimationjob_p.h
+++ b/src/qml/animations/qabstractanimationjob_p.h
@@ -60,6 +60,8 @@ QT_BEGIN_NAMESPACE
 
 class QAnimationGroupJob;
 class QAnimationJobChangeListener;
+class QQmlAnimationTimer;
+
 class Q_QML_PRIVATE_EXPORT QAbstractAnimationJob
 {
     Q_DISABLE_COPY(QAbstractAnimationJob)
@@ -168,6 +170,7 @@ protected:
 
     QAbstractAnimationJob *m_nextSibling;
     QAbstractAnimationJob *m_previousSibling;
+    QQmlAnimationTimer *m_timer = nullptr;
 
     bool *m_wasDeleted;
     bool m_hasRegisteredTimer:1;
@@ -203,20 +206,20 @@ public:
     static QQmlAnimationTimer *instance();
     static QQmlAnimationTimer *instance(bool create);
 
-    static void registerAnimation(QAbstractAnimationJob *animation, bool isTopLevel);
-    static void unregisterAnimation(QAbstractAnimationJob *animation);
+    void registerAnimation(QAbstractAnimationJob *animation, bool isTopLevel);
+    void unregisterAnimation(QAbstractAnimationJob *animation);
 
     /*
         this is used for updating the currentTime of all animations in case the pause
         timer is active or, otherwise, only of the animation passed as parameter.
     */
-    static void ensureTimerUpdate();
+    void ensureTimerUpdate();
 
     /*
         this will evaluate the need of restarting the pause timer in case there is still
         some pause animations running.
     */
-    static void updateAnimationTimer();
+    void updateAnimationTimer();
 
     void restartAnimationTimer() override;
     void updateAnimationsTime(qint64 timeStep) override;
diff --git a/src/qml/debugger/qqmlprofiler_p.h b/src/qml/debugger/qqmlprofiler_p.h
index f03657508e..54efbb5d73 100644
--- a/src/qml/debugger/qqmlprofiler_p.h
+++ b/src/qml/debugger/qqmlprofiler_p.h
@@ -457,7 +457,12 @@ private:
     QQmlProfiler *profiler;
 };
 
+#endif // QT_NO_QML_DEBUGGER
+
 QT_END_NAMESPACE
+
+#ifndef QT_NO_QML_DEBUGGER
+
 Q_DECLARE_METATYPE(QVector<QQmlProfilerData>)
 Q_DECLARE_METATYPE(QQmlProfiler::LocationHash)
 
diff --git a/src/qml/doc/src/qtqml.qdoc b/src/qml/doc/src/qtqml.qdoc
index 833436a67c..a9f8e2a960 100644
--- a/src/qml/doc/src/qtqml.qdoc
+++ b/src/qml/doc/src/qtqml.qdoc
@@ -134,12 +134,13 @@ the QML code to interact with C++ code.
 \section1 Licenses and Attributions
 
 Qt QML is available under commercial licenses from \l{The Qt Company}.
-In addition, it is available under the
+In addition, it is available under free software licenses. Since Qt 5.4,
+these free software licenses are
 \l{GNU Lesser General Public License, version 3}, or
 the \l{GNU General Public License, version 2}.
 See \l{Qt Licensing} for further details.
 
-Furthermore Qt QML potentially contains third party
+Furthermore Qt QML in Qt \QtVersion may contain third party
 modules under following permissive licenses:
 
 \generatelist{groupsbymodule attributions-qtqml}
diff --git a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
index 27576d488c..99175ab94e 100644
--- a/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
+++ b/src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -176,8 +176,8 @@ attach application code. This can be used to add custom scene graph
 content or render raw OpenGL content. The integration points are
 defined by the render loop.
 
-For detailed description of how the scene graph renderer works, see
-\l {Qt Quick Scene Graph Renderer}.
+For detailed description of how the scene graph renderer for OpenGL
+works, see \l {Qt Quick Scene Graph OpenGL Renderer}.
 
 There are three render loop variants available: \c basic, \c windows,
 and \c threaded. Out of these, \c basic and \c windows are
@@ -413,10 +413,11 @@ with multiple windows.
 */
 
 /*!
-  \title Qt Quick Scene Graph Renderer
+  \title Qt Quick Scene Graph OpenGL Renderer
   \page qtquick-visualcanvas-scenegraph-renderer.html
 
-  This document explains how the scene graph renderer works internally
+  This document explains how the scene graph renderer for OpenGL
+  works internally
   so that one can write code that uses it in an optimal fashion, both
   performance-wise and feature-wise.
 
@@ -428,7 +429,7 @@ with multiple windows.
   \note Even in the case where every frame is unique and everything is
   uploaded from scratch, the default renderer will perform well.
 
-  The Qt Quick items in a QML scene populates a tree of QSGNode
+  The Qt Quick items in a QML scene populate a tree of QSGNode
   instances.  Once created, this tree is a complete description of how
   a certain frame should be rendered. It does not contain any
   references back to the Qt Quick items at all and will on most
@@ -441,11 +442,11 @@ with multiple windows.
   If needed, the renderer can be completely replaced using the
   internal scene graph back-end API. This is mostly interesting for
   platform vendors who wish to take advantage of non-standard hardware
-  features. For majority of use cases, the default renderer will be
+  features. For the majority of use cases, the default renderer will be
   sufficient.
 
   The default renderer focuses on two primary strategies to optimize
-  the rendering. Batching of draw calls and retention of geometry on
+  the rendering: Batching of draw calls, and retention of geometry on
   the GPU.
 
   \section1 Batching
@@ -458,7 +459,7 @@ with multiple windows.
 
   \image visualcanvas_list.png
 
-  The simplest way of drawing this list is on a cell-by-cell basis. First
+  The simplest way of drawing this list is on a cell-by-cell basis. First,
   the background is drawn. This is a rectangle of a specific color. In
   OpenGL terms this means selecting a shader program to do solid color
   fills, setting up the fill color, setting the transformation matrix
@@ -495,8 +496,8 @@ with multiple windows.
   batches. From Qt Quick core item set, this includes Rectangle items
   with opaque colors and fully opaque images, such as JPEGs or BMPs.
 
-  Another benefit of using opaque primitives, is that opaque
-  primitives does not require \c GL_BLEND to be enabled which can be
+  Another benefit of using opaque primitives is that opaque
+  primitives do not require \c GL_BLEND to be enabled, which can be
   quite costly, especially on mobile and embedded GPUs.
 
   Opaque primitives are rendered in a front-to-back manner with
@@ -533,7 +534,7 @@ with multiple windows.
   and the two text elements in another call, as the texts only overlap
   a background which they are stacked in front of. In the right-most
   case, the background of "Item 4" overlaps the text of "Item 3" so in
-  this case, each of backgrounds and texts need to be drawn using
+  this case, each of backgrounds and texts needs to be drawn using
   separate calls.
 
   Z-wise, the alpha primitives are interleaved with the opaque nodes
@@ -550,7 +551,7 @@ with multiple windows.
 
   The renderer modifies the vertex shader returned from
   QSGMaterialShader::vertexShader() and compresses the z values of the
-  vertex after the model-view and projection matrices has been applied
+  vertex after the model-view and projection matrices have been applied
   and then adds a small translation on the z to position it the
   correct z position.
 
@@ -561,7 +562,7 @@ with multiple windows.
 
   The active texture is a unique OpenGL state, which means that
   multiple primitives using different OpenGL textures cannot be
-  batched. The Qt Quick scene graph for this reason allows multiple
+  batched. The Qt Quick scene graph, for this reason, allows multiple
   QSGTexture instances to be allocated as smaller sub-regions of a
   larger texture; a texture atlas.
 
@@ -603,10 +604,10 @@ with multiple windows.
   Each Qt Quick Item inserts a QSGTransformNode into the scene graph
   tree to manage its x, y, scale or rotation. Child items will be
   populated under this transform node.  The default renderer tracks
-  the state of transform nodes between frames, and will look at
+  the state of transform nodes between frames and will look at
   subtrees to decide if a transform node is a good candidate to become
   a root for a set of batches. A transform node which changes between
-  frames and which has a fairly complex subtree, can become a batch
+  frames and which has a fairly complex subtree can become a batch
   root.
 
   QSGGeometryNodes in the subtree of a batch root are pre-transformed
@@ -621,7 +622,7 @@ with multiple windows.
   removed nodes when panning through a grid or list.
 
   Another benefit of identifying transform nodes as batch roots is
-  that it allows the renderer to retain the parts of the tree that has
+  that it allows the renderer to retain the parts of the tree that have
   not changed. For instance, say a UI consists of a list and a button
   row. When the list is being scrolled and delegates are being added
   and removed, the rest of the UI, the button row, is unchanged and
@@ -684,7 +685,7 @@ with multiple windows.
   to either \c vertex or \c {msaa}.
 
   Vertex antialiasing can produce seams between edges of adjacent
-  primitives, even when the two edges are mathmatically the same.
+  primitives, even when the two edges are mathematically the same.
   Multisample antialiasing does not.
 
 
@@ -722,7 +723,7 @@ with multiple windows.
   job when creating batches and can rely on early-z to avoid overdraw.
 
   When multisample antialiasing is used, content rendered into
-  framebuffer objects, need additional extensions to support multisampling
+  framebuffer objects need additional extensions to support multisampling
   of framebuffers. Typically \c GL_EXT_framebuffer_multisample and
   \c GL_EXT_framebuffer_blit. Most desktop chips have these extensions
   present, but they are less common in embedded chips. When framebuffer
@@ -736,7 +737,7 @@ with multiple windows.
   As stated in the beginning, understanding the finer details of the
   renderer is not required to get good performance. It is written to
   optimize for common use cases and will perform quite well under
-  almost any circumstance.
+  almost any circumstances.
 
   \list
 
@@ -744,7 +745,7 @@ with multiple windows.
   as possible of the geometry being uploaded again and again. By
   setting the environment variable \c {QSG_RENDERER_DEBUG=render}, the
   renderer will output statistics on how well the batching goes, how
-  many batches, which batches are retained and which are opaque and
+  many batches are used, which batches are retained and which are opaque and
   not. When striving for optimal performance, uploads should happen
   only when really needed, batches should be fewer than 10 and at
   least 3-4 of them should be opaque.
@@ -772,16 +773,16 @@ with multiple windows.
   QQuickWindow::createTextureFromImage(), let the image have
   QImage::Format_RGB32, when possible.
 
-  \li Be aware of that overlapping compond items, like in the
-  illustration above, can not be batched.
+  \li Be aware of that overlapping compound items, like in the
+  illustration above, cannot be batched.
 
   \li Clipping breaks batching. Never use on a per-item basis, inside
-  tables cells, item delegates or similar. Instead of clipping text,
+  table cells, item delegates or similar. Instead of clipping text,
   use eliding. Instead of clipping an image, create a
   QQuickImageProvider that returns a cropped image.
 
   \li Batching only works for 16-bit indices. All built-in items use
-  16-bit indices, but custom geometry is free to also use 32-bit
+  16-bit indices, but a custom geometry is free to also use 32-bit
   indices.
 
   \li Some material flags prevent batching, the most limiting one
@@ -792,7 +793,7 @@ with multiple windows.
   QQuickWindow::setColor() will be used in a call to \c glClear(),
   which is potentially faster.
 
-  \li Mipmapped Image items are not placed in global atlas and will
+  \li Mipmapped Image items are not placed in the global atlas and will
   not be batched.
 
   \endlist
diff --git a/src/quick/doc/src/qtquick.qdoc b/src/quick/doc/src/qtquick.qdoc
index e2d4f16dae..ece66cb589 100644
--- a/src/quick/doc/src/qtquick.qdoc
+++ b/src/quick/doc/src/qtquick.qdoc
@@ -89,7 +89,8 @@ To find out more about using the QML language, see the \l{Qt QML} module documen
 \section1 Licenses and Attributions
 
 Qt Quick is available under commercial licenses from \l{The Qt Company}.
-In addition, it is available under the
+In addition, it is available under free software licenses. Since Qt 5.4,
+these free software licenses are
 \l{GNU Lesser General Public License, version 3}, or
 the \l{GNU General Public License, version 2}.
 See \l{Qt Licensing} for further details.
diff --git a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
index a67c659c99..03c5738e56 100644
--- a/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
+++ b/src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp
@@ -203,7 +203,7 @@ void QSGDistanceFieldTextMaterialShader::updateState(const RenderState &state, Q
         updateTextureScale(QVector2D(1.0 / material->textureSize().width(),
                                      1.0 / material->textureSize().height()));
 
-        QOpenGLFunctions *funcs = QOpenGLContext::currentContext()->functions();
+        QOpenGLFunctions *funcs = state.context()->functions();
         funcs->glBindTexture(GL_TEXTURE_2D, material->texture()->textureId);
 
         if (updated) {
diff --git a/src/quick/util/qquickanimationcontroller.cpp b/src/quick/util/qquickanimationcontroller.cpp
index cebb0391ae..5e56460098 100644
--- a/src/quick/util/qquickanimationcontroller.cpp
+++ b/src/quick/util/qquickanimationcontroller.cpp
@@ -223,7 +223,7 @@ void QQuickAnimationController::updateProgress()
 
     d->animationInstance->setDisableUserControl();
     d->animationInstance->start();
-    QQmlAnimationTimer::unregisterAnimation(d->animationInstance);
+    QQmlAnimationTimer::instance()->unregisterAnimation(d->animationInstance);
     d->animationInstance->setCurrentTime(d->progress * d->animationInstance->duration());
 }