[neon/qt/qtdeclarative/Neon/experimental] debian: Merge remote-tracking branch 'origin/master' into Neon/experimental

[Jonathan Riddell]

Git commit 8cdb04d6dae7215ea61cccfc167ab24776cdb106 by Jonathan Riddell.
Committed on 21/10/2020 at 11:09.
Pushed by jriddell into branch 'Neon/experimental'.

Merge remote-tracking branch 'origin/master' into Neon/experimental

M  +54   -2    debian/control
M  +76   -45   debian/patches/fix_test_remove_qlibraryinfo.patch
M  +1    -1    debian/patches/python3.patch
M  +2    -0    debian/qtdeclarative5-doc-dev.install
M  +12   -0    debian/qtdeclarative5-doc-html.install
M  +2    -0    debian/qtdeclarative5-doc.install

https://invent.kde.org/neon/qt/qtdeclarative/commit/8cdb04d6dae7215ea61cccfc167ab24776cdb106

diff --cc debian/qtdeclarative5-doc-dev.install
index 42599b8,07dd9a6..ad608fc
--- a/debian/qtdeclarative5-doc-dev.install
+++ b/debian/qtdeclarative5-doc-dev.install
@@@ -1,4 -1,5 +1,6 @@@
 +usr/share/qt5/doc/*/*.tags
  usr/share/qt5/doc/qtqml/qtqml.tags
+ usr/share/qt5/doc/qtqmlmodels/qtqmlmodels.tags
  usr/share/qt5/doc/qtqmltest/qtqmltest.tags
+ usr/share/qt5/doc/qtqmlworkerscript/qtqmlworkerscript.tags
  usr/share/qt5/doc/qtquick/qtquick.tags
diff --cc debian/qtdeclarative5-doc.install
index a63982f,fc99d83..1973ed6
--- a/debian/qtdeclarative5-doc.install
+++ b/debian/qtdeclarative5-doc.install
@@@ -1,4 -1,5 +1,6 @@@
 +/usr/share/qt5/doc/*.qch
  /usr/share/qt5/doc/qtqml.qch
+ /usr/share/qt5/doc/qtqmlmodels.qch
  /usr/share/qt5/doc/qtqmltest.qch
+ /usr/share/qt5/doc/qtqmlworkerscript.qch
  /usr/share/qt5/doc/qtquick.qch