Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7

12 files changed, 1 insertions, 0 deletions

diff --git a/src/quick/doc/images/anchorchanges.png b/src/quick/doc/images/anchorchanges.png
index 4973e4e9aa..12d99393b6 100644
--- a/src/quick/doc/images/anchorchanges.png
+++ b/src/quick/doc/images/anchorchanges.png
diff --git a/src/quick/doc/images/parentchange.png b/src/quick/doc/images/parentchange.png
index 93206fbbb2..05f78eac34 100644
--- a/src/quick/doc/images/parentchange.png
+++ b/src/quick/doc/images/parentchange.png
diff --git a/src/quick/doc/images/qml-borderimage-normal-image.png b/src/quick/doc/images/qml-borderimage-normal-image.png
index ae7460a7d7..fd0dd37c82 100644
--- a/src/quick/doc/images/qml-borderimage-normal-image.png
+++ b/src/quick/doc/images/qml-borderimage-normal-image.png
diff --git a/src/quick/doc/images/qml-borderimage-scaled.png b/src/quick/doc/images/qml-borderimage-scaled.png
index 8035c79f37..e42891ecc7 100644
--- a/src/quick/doc/images/qml-borderimage-scaled.png
+++ b/src/quick/doc/images/qml-borderimage-scaled.png
diff --git a/src/quick/doc/images/qml-borderimage-tiled.png b/src/quick/doc/images/qml-borderimage-tiled.png
index 14883d0dd6..e27d9601c4 100644
--- a/src/quick/doc/images/qml-borderimage-tiled.png
+++ b/src/quick/doc/images/qml-borderimage-tiled.png
diff --git a/src/quick/doc/images/qml-item-canvas-clip-complex.png b/src/quick/doc/images/qml-item-canvas-clip-complex.png
index cb582bad41..92730ff2e0 100644
--- a/src/quick/doc/images/qml-item-canvas-clip-complex.png
+++ b/src/quick/doc/images/qml-item-canvas-clip-complex.png
diff --git a/src/quick/doc/images/qml-item-canvas-startAngle.png b/src/quick/doc/images/qml-item-canvas-startAngle.png
index f81562e5e4..bf82c3aa4b 100644
--- a/src/quick/doc/images/qml-item-canvas-startAngle.png
+++ b/src/quick/doc/images/qml-item-canvas-startAngle.png
diff --git a/src/quick/doc/images/qml-mousearea-snippet.png b/src/quick/doc/images/qml-mousearea-snippet.png
index 15229446c7..d1ddd8d2f5 100644
--- a/src/quick/doc/images/qml-mousearea-snippet.png
+++ b/src/quick/doc/images/qml-mousearea-snippet.png
diff --git a/src/quick/doc/images/qml-photoviewer-demo-small.png b/src/quick/doc/images/qml-photoviewer-demo-small.png
index b16fb4e53a..ada37794ae 100644
--- a/src/quick/doc/images/qml-photoviewer-demo-small.png
+++ b/src/quick/doc/images/qml-photoviewer-demo-small.png
diff --git a/src/quick/doc/images/qml-rssnews-demo-small.png b/src/quick/doc/images/qml-rssnews-demo-small.png
index 451a420623..299f72adc5 100644
--- a/src/quick/doc/images/qml-rssnews-demo-small.png
+++ b/src/quick/doc/images/qml-rssnews-demo-small.png
diff --git a/src/quick/doc/images/qmldesigner-visual-editor.png b/src/quick/doc/images/qmldesigner-visual-editor.png
index 9cd4b8b2dc..94f8239ed4 100644
--- a/src/quick/doc/images/qmldesigner-visual-editor.png
+++ b/src/quick/doc/images/qmldesigner-visual-editor.png
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 4f141a733a..131cd758a5 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -65,6 +65,7 @@ sourcedirs += ../../plugins
 excludedirs += ../../imports/models \
                ../../imports/statemachine
 
+excludefiles += ../util/qquickpropertychanges_p.h
 examples.fileextensions        += "*.qm"
 
 manifestmeta.thumbnail.names += "QtQuick/Threaded ListModel Example" \