qt5.9.5: Revert doc and examples component autodependency configurationv5.9.5-packaging

Use <Dependencies> from the main component instead to prevent unintended
deinstallations when using the maintenancetool.

Drawback is that deinstall does not work for doc and examples packages
when removing separately installable components.

Remove unused qtserialbus doc and examples components.

Task-number: QTBUG-66374
Change-Id: Ia4336498ca2fff3d911d24312692b0b39cd4d3ab
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>

30 files changed, 9 insertions, 52 deletions

diff --git a/packaging-tools/configurations/all-os/qt595-doc-examples-conf b/packaging-tools/configurations/all-os/qt595-doc-examples-conf
index fe8936785..b1558ca6e 100644
--- a/packaging-tools/configurations/all-os/qt595-doc-examples-conf
+++ b/packaging-tools/configurations/all-os/qt595-doc-examples-conf
@@ -148,14 +148,6 @@ archive_uri:            /qt/%QT_VERSION%/latest/examples/qtscript-examples-%QT_V
 target_install_dir:
 package_strip_dirs:     1
 
-[qt.595.examples.qtserialbus]
-archives:               595.examples.qtserialbus
-target_install_base:    /Examples/Qt-5.9.5/
-[595.examples.qtserialbus]
-archive_uri:            /qt/%QT_VERSION%/latest/examples/qtserialbus-examples-%QT_VERSION_AND_TAG%.7z
-target_install_dir:
-package_strip_dirs:     1
-
 [qt.595.examples.qtspeech]
 archives:               595.examples.qtspeech
 target_install_base:    /Examples/Qt-5.9.5/
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtcharts/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtcharts/meta/package.xml
index e33410b04..05d853b06 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtcharts/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtcharts/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtcharts</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtdatavis3d/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtdatavis3d/meta/package.xml
index 398970ea5..705ae49c0 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtdatavis3d/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtdatavis3d/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtdatavis3d</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtnetworkauth/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtnetworkauth/meta/package.xml
index a060bb0ed..6621d943d 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtnetworkauth/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtnetworkauth/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtnetworkauth</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtpurchasing/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtpurchasing/meta/package.xml
index f51ba4376..8055f4ef5 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtpurchasing/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtpurchasing/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtpurchasing</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtremoteobjects/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtremoteobjects/meta/package.xml
index 4db4e82c3..90da0b5f8 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtremoteobjects/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtremoteobjects/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtremoteobjects</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtscript/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtscript/meta/package.xml
index dbc0d4b73..25d669fa3 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtscript/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtscript/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtscript</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtserialbus/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtserialbus/meta/package.xml
deleted file mode 100644
index f8d58789d..000000000
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtserialbus/meta/package.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Documentation for Qt SerialBus (Technology Preview)</DisplayName>
-    <Description>Documentation for Qt SerialBus (Technology Preview)</Description>
-    <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtserialbus</AutoDependOn>
-    <SortingPriority>1</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtvirtualkeyboard/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtvirtualkeyboard/meta/package.xml
index 026cec896..ae58095b7 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtvirtualkeyboard/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtvirtualkeyboard/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtvirtualkeyboard</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtwebengine/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtwebengine/meta/package.xml
index fac1e6eae..ffd6e2d2d 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtwebengine/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc.qtwebengine/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtwebengine</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc/meta/package.xml
index 912004d21..695e86e8e 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.doc/meta/package.xml
@@ -6,7 +6,6 @@
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Dependencies>qt.tools</Dependencies>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtcharts/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtcharts/meta/package.xml
index 822b65469..f17ef9798 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtcharts/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtcharts/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtcharts</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtdatavis3d/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtdatavis3d/meta/package.xml
index de99134f7..40535c201 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtdatavis3d/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtdatavis3d/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtdatavis3d</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtnetworkauth/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtnetworkauth/meta/package.xml
index 462728048..4dd6ac59b 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtnetworkauth/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtnetworkauth/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtnetworkauth</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtpurchasing/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtpurchasing/meta/package.xml
index c885761f2..9a3d5d7d2 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtpurchasing/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtpurchasing/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtpurchasing</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtremoteobjects/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtremoteobjects/meta/package.xml
index 91df5123e..bccf37f85 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtremoteobjects/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtremoteobjects/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtremoteobjects</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtscript/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtscript/meta/package.xml
index ea012eb8e..d16be2f1b 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtscript/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtscript/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtscript</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtserialbus/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtserialbus/meta/package.xml
deleted file mode 100644
index 83d36c6d8..000000000
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtserialbus/meta/package.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<Package>
-    <DisplayName>Examples for Qt SerialBus (Technology Preview)</DisplayName>
-    <Description>Examples for Qt SerialBus (Technology Preview)</Description>
-    <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
-    <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
-    <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtserialbus</AutoDependOn>
-    <SortingPriority>1</SortingPriority>
-    <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtvirtualkeyboard/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtvirtualkeyboard/meta/package.xml
index a5c8551d7..df77e5375 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtvirtualkeyboard/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtvirtualkeyboard/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtvirtualkeyboard</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtwebengine/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtwebengine/meta/package.xml
index 64d9bd6ab..66617d7ee 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtwebengine/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples.qtwebengine/meta/package.xml
@@ -5,7 +5,6 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595.qtwebengine</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples/meta/package.xml
index f032a716a..c920a0052 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.examples/meta/package.xml
@@ -7,7 +7,6 @@
     <Script>installscript.qs</Script>
     <Dependencies>qt.tools</Dependencies>
     <Virtual>true</Virtual>
-    <AutoDependOn>qt.595</AutoDependOn>
     <SortingPriority>1</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtcharts/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtcharts/meta/package.xml
index 6b26c1c93..d038d3c35 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtcharts/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtcharts/meta/package.xml
@@ -7,6 +7,7 @@
     <Default>false</Default>
     <SortingPriority>89</SortingPriority>
     <AutoDependOn></AutoDependOn>
+    <Dependencies>qt.595.doc.qtcharts, qt.595.examples.qtcharts</Dependencies>
     <Script>installscript.qs</Script>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtdatavis3d/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtdatavis3d/meta/package.xml
index 7259ddf8d..7ee7a370e 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtdatavis3d/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtdatavis3d/meta/package.xml
@@ -7,6 +7,7 @@
     <Default>false</Default>
     <SortingPriority>88</SortingPriority>
     <AutoDependOn></AutoDependOn>
+    <Dependencies>qt.595.doc.qtdatavis3d, qt.595.examples.qtdatavis3d</Dependencies>
     <Script>installscript.qs</Script>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtnetworkauth/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtnetworkauth/meta/package.xml
index 171b0f108..3489e64f0 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtnetworkauth/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtnetworkauth/meta/package.xml
@@ -7,6 +7,7 @@
     <Default>false</Default>
     <SortingPriority>10</SortingPriority>
     <AutoDependOn></AutoDependOn>
+    <Dependencies>qt.595.doc.qtnetworkauth, qt.595.examples.qtnetworkauth</Dependencies>
     <Script>installscript.qs</Script>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtpurchasing/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtpurchasing/meta/package.xml
index dd9c7c304..a7c96e9ef 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtpurchasing/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtpurchasing/meta/package.xml
@@ -7,6 +7,7 @@
     <Default>false</Default>
     <SortingPriority>87</SortingPriority>
     <AutoDependOn></AutoDependOn>
+    <Dependencies>qt.595.doc.qtpurchasing, qt.595.examples.qtpurchasing</Dependencies>
     <Script>installscript.qs</Script>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtremoteobjects/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtremoteobjects/meta/package.xml
index ea5dacf7b..1123354fc 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtremoteobjects/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtremoteobjects/meta/package.xml
@@ -7,6 +7,7 @@
     <Default>false</Default>
     <SortingPriority>10</SortingPriority>
     <AutoDependOn></AutoDependOn>
+    <Dependencies>qt.595.doc.qtremoteobjects, qt.595.examples.qtremoteobjects</Dependencies>
     <Script>installscript.qs</Script>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtscript/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtscript/meta/package.xml
index d8fde6faa..3ce5dee2b 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtscript/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtscript/meta/package.xml
@@ -7,6 +7,7 @@
     <Default>false</Default>
     <SortingPriority>9</SortingPriority>
     <AutoDependOn></AutoDependOn>
+    <Dependencies>qt.595.doc.qtscript, qt.595.examples.qtscript</Dependencies>
     <Script>installscript.qs</Script>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtvirtualkeyboard/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtvirtualkeyboard/meta/package.xml
index 8d7fc2427..e62c5c1e0 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtvirtualkeyboard/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtvirtualkeyboard/meta/package.xml
@@ -7,6 +7,7 @@
     <Default>false</Default>
     <SortingPriority>85</SortingPriority>
     <AutoDependOn></AutoDependOn>
+    <Dependencies>qt.595.doc.qtvirtualkeyboard, qt.595.examples.qtvirtualkeyboard</Dependencies>
     <Script>installscript.qs</Script>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtwebengine/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtwebengine/meta/package.xml
index 0021f43c9..be66ac967 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtwebengine/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595.qtwebengine/meta/package.xml
@@ -7,6 +7,7 @@
     <Default>false</Default>
     <SortingPriority>13</SortingPriority>
     <AutoDependOn></AutoDependOn>
+    <Dependencies>qt.595.doc.qtwebengine, qt.595.examples.qtwebengine</Dependencies>
     <Script>installscript.qs</Script>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
 </Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595/meta/package.xml
index e9a88794b..21d89f3f4 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_595/qt.595/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_595/qt.595/meta/package.xml
@@ -5,6 +5,7 @@
     <Version>5.9.5-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
     <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
     <Script>installscript.qs</Script>
+    <Dependencies>qt.595.doc, qt.595.examples</Dependencies>
     <Virtual>false</Virtual>
     <SortingPriority>595</SortingPriority>
     <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>