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

 Conflicts:
	examples/quick/tableview/pixelator/main.cpp
	examples/quick/demos/

Change-Id: Id7eaae6584017a4ab4ec9dd97b56d5c1a417f0e3

6 files changed, 14 insertions, 10 deletions

diff --git a/examples/quick/demos/photoviewer/i18n/qml_en.qm b/examples/quick/demos/photoviewer/i18n/qml_en.qm
deleted file mode 100644
index 9dad8dffce..0000000000
--- a/examples/quick/demos/photoviewer/i18n/qml_en.qm
+++ /dev/null
diff --git a/examples/quick/demos/photoviewer/i18n/qml_en.ts b/examples/quick/demos/photoviewer/i18n/qml_en.ts
deleted file mode 100644
index 5315a75526..0000000000
--- a/examples/quick/demos/photoviewer/i18n/qml_en.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en">
-</TS>
diff --git a/examples/quick/imageelements/doc/src/imageelements.qdoc b/examples/quick/imageelements/doc/src/imageelements.qdoc
index e32293907c..2c6490fb2c 100644
--- a/examples/quick/imageelements/doc/src/imageelements.qdoc
+++ b/examples/quick/imageelements/doc/src/imageelements.qdoc
@@ -36,29 +36,29 @@
 
     \include examples-run.qdocinc
 
-    \section1 BorderImage
+    \section1 Scaling with BorderImage
 
     \e BorderImage shows off the various scaling modes of the \l BorderImage
     type by setting its horizontalTileMode and verticalTileMode properties.
 
-    \section1 Image
+    \section1 Image Fill
 
     \e Image shows off the various fill modes of the \l Image type.
 
-    \section1 Shadows
+    \section1 Shadow Effects
 
     \e Shadows shows how to create a drop shadow effect for a rectangular item
     using a \l BorderImage:
     \snippet imageelements/content/ShadowRectangle.qml shadow
 
-    \section1 AnimatedSprite
+    \section1 Sprite Animations with AnimatedSprite
 
     \e AnimatedSprite shows how to display a simple animation using an
     \l AnimatedSprite object:
     \snippet imageelements/animatedsprite.qml sprite
     The sprite animation will loop three times.
 
-    \section1 SpriteSequence
+    \section1 Sprite Animations with SpriteSequence
 
     \e SpriteSequence demonstrates using a sprite sequence to draw an animated
     and interactive bear. The \l SpriteSequence object defines five different
diff --git a/src/3rdparty/masm/qt_attribution.json b/src/3rdparty/masm/qt_attribution.json
index c53f1a4bc5..f6803c6b1c 100644
--- a/src/3rdparty/masm/qt_attribution.json
+++ b/src/3rdparty/masm/qt_attribution.json
@@ -4,6 +4,7 @@
     "QDocModule": "qtqml",
     "QtUsage": "Used in Qt QML.",
 
+    "Homepage": "https://trac.webkit.org/wiki/JavaScriptCore",
     "License": "BSD 2-clause \"Simplified\" License",
     "LicenseId": "BSD-2-Clause",
     "LicenseFile": "LICENSE",
diff --git a/src/quick/items/qquickspritesequence.cpp b/src/quick/items/qquickspritesequence.cpp
index cff9b6ab02..eb4b5335e7 100644
--- a/src/quick/items/qquickspritesequence.cpp
+++ b/src/quick/items/qquickspritesequence.cpp
@@ -67,6 +67,7 @@ QT_BEGIN_NAMESPACE
     by \l Sprite types.
 
     For full details, see the \l{Sprite Animations} overview.
+    \sa {Sprite animations with SpriteSequence}
 */
 /*!
     \qmlproperty bool QtQuick::SpriteSequence::running
diff --git a/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp b/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
index 284a324227..20eef9c322 100644
--- a/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
+++ b/tests/auto/qml/qmldiskcache/tst_qmldiskcache.cpp
@@ -90,7 +90,13 @@ static void waitForFileSystem()
     // the newly written file has a modification date newer than an existing cache file, we must
     // wait.
     // Similar effects of lacking precision have been observed on some Linux systems.
-    QThread::sleep(1);
+    static const bool fsHasSubSecondResolution = []() {
+        QDateTime mtime = QFileInfo(QStandardPaths::writableLocation(QStandardPaths::CacheLocation)).lastModified();
+        // 1:1000 chance of a false negative
+        return mtime.toMSecsSinceEpoch() % 1000;
+    }();
+    if (!fsHasSubSecondResolution)
+        QThread::sleep(1);
 }
 
 struct TestCompiler