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

[Jonathan Riddell]

Git commit d8fc8c2b7c2569218270d03097d1d4a8e7703f19 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  +0    -3    debian/qttools5-dev.install.in
M  +6    -6    debian/rules

https://invent.kde.org/neon/qt/qttools/commit/d8fc8c2b7c2569218270d03097d1d4a8e7703f19

diff --cc debian/qttools5-dev.install.in
index c24dc9b,fd74a1d..62ac409
--- a/debian/qttools5-dev.install.in
+++ b/debian/qttools5-dev.install.in
@@@ -115,9 -113,7 +114,8 @@@ usr/include/*/qt5/QtHelp/qhelpengine.
  usr/include/*/qt5/QtHelp/qhelpenginecore.h
  usr/include/*/qt5/QtHelp/qhelpfilterdata.h
  usr/include/*/qt5/QtHelp/qhelpfilterengine.h
- usr/include/*/qt5/QtHelp/qhelpfiltersettingswidget.h
  usr/include/*/qt5/QtHelp/qhelpindexwidget.h
 +usr/include/*/qt5/QtHelp/qhelplink.h
  usr/include/*/qt5/QtHelp/qhelpsearchengine.h
  usr/include/*/qt5/QtHelp/qhelpsearchquerywidget.h
  usr/include/*/qt5/QtHelp/qhelpsearchresultwidget.h