aboutsummaryrefslogtreecommitdiffstats
path: root/packaging-tools/configurations
diff options
context:
space:
mode:
authorAkseli Salovaara <akseli.salovaara@qt.io>2018-04-11 14:03:57 +0300
committerAkseli Salovaara <akseli.salovaara@qt.io>2018-04-13 09:02:37 +0000
commita030b0fd8ddb860f9d6c9cfe8fcf6b88ceb1be1d (patch)
treef9f8ed74f1aead27f87b311cdfd2bd9de09f031b /packaging-tools/configurations
parentb8e7f719d7efd3e6725678e37a7f0a791015324d (diff)
Qt5.11.0: Revert doc and examples component autodependency configuration
Use <Dependencies> from the main component instead to prevent unintended uninstallations when using the maintenancetool. Drawback is that uninstall 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: I0f8a62bfeec9ccb77b6c279d1e1e179150804836 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'packaging-tools/configurations')
-rw-r--r--packaging-tools/configurations/all-os/qt5-5110-doc-examples-conf8
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtcharts/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtdatavis3d/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtnetworkauth/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtpurchasing/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtremoteobjects/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtscript/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtserialbus/meta/package.xml13
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtvirtualkeyboard/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtwebengine/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtcharts/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtdatavis3d/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtnetworkauth/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtpurchasing/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtremoteobjects/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtscript/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtserialbus/meta/package.xml13
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtvirtualkeyboard/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtwebengine/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtcharts/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtdatavis3d/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtnetworkauth/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtpurchasing/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtremoteobjects/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtscript/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtvirtualkeyboard/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtwebengine/meta/package.xml1
-rw-r--r--packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110/meta/package.xml1
30 files changed, 9 insertions, 52 deletions
diff --git a/packaging-tools/configurations/all-os/qt5-5110-doc-examples-conf b/packaging-tools/configurations/all-os/qt5-5110-doc-examples-conf
index 97bcfda4e..b62ec35fd 100644
--- a/packaging-tools/configurations/all-os/qt5-5110-doc-examples-conf
+++ b/packaging-tools/configurations/all-os/qt5-5110-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.qt5.5110.examples.qtserialbus]
-archives: qt5.5110.examples.qtserialbus
-target_install_base: /Examples/Qt-5.11.0/
-[qt5.5110.examples.qtserialbus]
-archive_uri: /qt/%QT_VERSION%/latest/examples/qtserialbus-examples-%QT_VERSION_AND_TAG%.7z
-target_install_dir:
-package_strip_dirs: 1
-
[qt.qt5.5110.examples.qtnetworkauth]
archives: qt5.5110.examples.qtnetworkauth
target_install_base: /Examples/Qt-5.11.0/
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtcharts/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtcharts/meta/package.xml
index 4b742a588..2a0045013 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtcharts/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtcharts/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtcharts</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtdatavis3d/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtdatavis3d/meta/package.xml
index 0f6b25d9b..1c9ed97ed 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtdatavis3d/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtdatavis3d/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtdatavis3d</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtnetworkauth/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtnetworkauth/meta/package.xml
index 9177f5ef3..0d0c982c5 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtnetworkauth/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtnetworkauth/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtnetworkauth</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtpurchasing/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtpurchasing/meta/package.xml
index a3b65ea69..11b343afc 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtpurchasing/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtpurchasing/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtpurchasing</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtremoteobjects/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtremoteobjects/meta/package.xml
index 495c5ea25..4bb928836 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtremoteobjects/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtremoteobjects/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtremoteobjects</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtscript/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtscript/meta/package.xml
index 3f4812330..c6ea526b2 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtscript/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtscript/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtscript</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtserialbus/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtserialbus/meta/package.xml
deleted file mode 100644
index 1bf698462..000000000
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.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.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
- <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtserialbus</AutoDependOn>
- <SortingPriority>1</SortingPriority>
- <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtvirtualkeyboard/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtvirtualkeyboard/meta/package.xml
index 721a67e1c..2998ceb3a 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtvirtualkeyboard/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtvirtualkeyboard/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtvirtualkeyboard</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtwebengine/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtwebengine/meta/package.xml
index 67b74a70d..41eff152e 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtwebengine/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc.qtwebengine/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtwebengine</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc/meta/package.xml
index 5c3d7a93e..2f302c015 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.doc/meta/package.xml
@@ -6,7 +6,6 @@
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Dependencies>qt.tools</Dependencies>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtcharts/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtcharts/meta/package.xml
index f3bd2956f..c6bb6ff2e 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtcharts/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtcharts/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtcharts</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtdatavis3d/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtdatavis3d/meta/package.xml
index a3b930abe..69c5b79d0 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtdatavis3d/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtdatavis3d/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtdatavis3d</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtnetworkauth/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtnetworkauth/meta/package.xml
index 2e9c53dc7..4975afbce 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtnetworkauth/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtnetworkauth/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtnetworkauth</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtpurchasing/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtpurchasing/meta/package.xml
index c600fb0da..ed9d4a427 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtpurchasing/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtpurchasing/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtpurchasing</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtremoteobjects/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtremoteobjects/meta/package.xml
index 3c7df160a..c0879aa79 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtremoteobjects/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtremoteobjects/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtremoteobjects</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtscript/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtscript/meta/package.xml
index c64a512fc..848e86d5a 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtscript/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtscript/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtscript</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtserialbus/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtserialbus/meta/package.xml
deleted file mode 100644
index e13cd261e..000000000
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.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.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
- <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
- <Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtserialbus</AutoDependOn>
- <SortingPriority>1</SortingPriority>
- <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
-</Package>
-
-
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtvirtualkeyboard/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtvirtualkeyboard/meta/package.xml
index fd10d7db2..01b0bc538 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtvirtualkeyboard/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtvirtualkeyboard/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtvirtualkeyboard</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtwebengine/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtwebengine/meta/package.xml
index 579966e25..1fc67ea48 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtwebengine/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples.qtwebengine/meta/package.xml
@@ -5,7 +5,6 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110.qtwebengine</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples/meta/package.xml
index d0db5eb57..36cce8ee4 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.examples/meta/package.xml
@@ -7,7 +7,6 @@
<Script>installscript.qs</Script>
<Dependencies>qt.tools</Dependencies>
<Virtual>true</Virtual>
- <AutoDependOn>qt.qt5.5110</AutoDependOn>
<SortingPriority>1</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
</Package>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtcharts/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtcharts/meta/package.xml
index 1c6689f19..6a82eeaba 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtcharts/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtcharts/meta/package.xml
@@ -6,6 +6,7 @@
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Default>false</Default>
<SortingPriority>89</SortingPriority>
+ <Dependencies>qt.qt5.5110.doc.qtcharts, qt.qt5.5110.examples.qtcharts</Dependencies>
<AutoDependOn></AutoDependOn>
<Script>installscript.qs</Script>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtdatavis3d/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtdatavis3d/meta/package.xml
index 0ec44debe..3d6c7d8d8 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtdatavis3d/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtdatavis3d/meta/package.xml
@@ -6,6 +6,7 @@
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Default>false</Default>
<SortingPriority>88</SortingPriority>
+ <Dependencies>qt.qt5.5110.doc.qtdatavis3d, qt.qt5.5110.examples.qtdatavis3d</Dependencies>
<AutoDependOn></AutoDependOn>
<Script>installscript.qs</Script>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtnetworkauth/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtnetworkauth/meta/package.xml
index 8cee314c9..dd0550de0 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtnetworkauth/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtnetworkauth/meta/package.xml
@@ -6,6 +6,7 @@
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Default>false</Default>
<SortingPriority>10</SortingPriority>
+ <Dependencies>qt.qt5.5110.doc.qtnetworkauth, qt.qt5.5110.examples.qtnetworkauth</Dependencies>
<AutoDependOn></AutoDependOn>
<Script>installscript.qs</Script>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtpurchasing/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtpurchasing/meta/package.xml
index fdb103bb3..4ef94452a 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtpurchasing/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtpurchasing/meta/package.xml
@@ -6,6 +6,7 @@
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Default>false</Default>
<SortingPriority>87</SortingPriority>
+ <Dependencies>qt.qt5.5110.doc.qtpurchasing, qt.qt5.5110.examples.qtpurchasing</Dependencies>
<AutoDependOn></AutoDependOn>
<Script>installscript.qs</Script>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtremoteobjects/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtremoteobjects/meta/package.xml
index bb78be359..137dc1682 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtremoteobjects/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtremoteobjects/meta/package.xml
@@ -6,6 +6,7 @@
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Default>false</Default>
<SortingPriority>10</SortingPriority>
+ <Dependencies>qt.qt5.5110.doc.qtremoteobjects, qt.qt5.5110.examples.qtremoteobjects</Dependencies>
<AutoDependOn></AutoDependOn>
<Script>installscript.qs</Script>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtscript/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtscript/meta/package.xml
index cd19b1564..b37dcfd27 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtscript/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtscript/meta/package.xml
@@ -6,6 +6,7 @@
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Default>false</Default>
<SortingPriority>9</SortingPriority>
+ <Dependencies>qt.qt5.5110.doc.qtscript, qt.qt5.5110.examples.qtscript</Dependencies>
<AutoDependOn></AutoDependOn>
<Script>installscript.qs</Script>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtvirtualkeyboard/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtvirtualkeyboard/meta/package.xml
index 9b1b6b820..7d0fa2aec 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtvirtualkeyboard/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtvirtualkeyboard/meta/package.xml
@@ -6,6 +6,7 @@
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Default>false</Default>
<SortingPriority>85</SortingPriority>
+ <Dependencies>qt.qt5.5110.doc.qtvirtualkeyboard, qt.qt5.5110.examples.qtvirtualkeyboard</Dependencies>
<AutoDependOn></AutoDependOn>
<Script>installscript.qs</Script>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtwebengine/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtwebengine/meta/package.xml
index 8f4af7ad6..b5f90cc78 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtwebengine/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtwebengine/meta/package.xml
@@ -6,6 +6,7 @@
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Default>false</Default>
<SortingPriority>13</SortingPriority>
+ <Dependencies>qt.qt5.5110.doc.qtwebengine, qt.qt5.5110.examples.qtwebengine</Dependencies>
<AutoDependOn></AutoDependOn>
<Script>installscript.qs</Script>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110/meta/package.xml
index 561afc7a1..f839e8a02 100644
--- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110/meta/package.xml
+++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110/meta/package.xml
@@ -5,6 +5,7 @@
<Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version>
<ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate>
<Script>installscript.qs</Script>
+ <Dependencies>qt.qt5.5110.doc, qt.qt5.5110.examples</Dependencies>
<Virtual>false</Virtual>
<SortingPriority>5110</SortingPriority>
<DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives>