diff options
| author | Akseli Salovaara <akseli.salovaara@qt.io> | 2018-04-16 11:20:28 +0300 |
|---|---|---|
| committer | Akseli Salovaara <akseli.salovaara@qt.io> | 2018-04-16 08:49:10 +0000 |
| commit | 8485e6d24e62a186a9316b6671ca9354215235e4 (patch) | |
| tree | 0ed948d0b229a03c11aff8cfd9ac3bce7a16842c /packaging-tools/configurations | |
| parent | a030b0fd8ddb860f9d6c9cfe8fcf6b88ceb1be1d (diff) | |
Qt 5.11.0: Install docs and examples when only sources selected
qt.qt5.5110 node's package.xml has dependency to qt.qt5.5110.doc and
qt.qt5.5110.examples as it should have but dynamic dependency from
installscript.qs to preview.qt.qt5.511 node was missing. By adding that
dependency docs and examples should install if only source package is
selected from Components tree.
Task-number: QTBUG-67615
Change-Id: I4032758489aa4657a53b7708641757e87d79b76a
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'packaging-tools/configurations')
| -rw-r--r-- | packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110/meta/installscript.qs | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110/meta/installscript.qs b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110/meta/installscript.qs index 08ade0731..b371b1df7 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110/meta/installscript.qs +++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110/meta/installscript.qs @@ -36,12 +36,16 @@ function Component() snapshotBuild = true; if (snapshotBuild) { - // Indicate in DisplayName and Description that this is a snapshot build - var displayName = component.value("DisplayName"); - var description = component.value("Description"); - component.setValue("DisplayName", displayName + " %QT_RELEASE_TAG% snapshot (#%BUILD_NUMBER%)") - component.setValue("Description", description + " %QT_RELEASE_TAG% snapshot (#%BUILD_NUMBER%)") - + // Add automatic dependency for preview component + var autoDependency = component.value("AutoDependOn"); + var dependencyStr = "preview.qt.qt5.511"; + if (autoDependency) { + component.setValue("AutoDependOn", autoDependency + "," + dependencyStr) + } + else { + component.setValue("AutoDependOn", dependencyStr) + } + // this is a snapshot (preview) build, hide the main node from online if (!installer.isOfflineOnly()) component.setValue("Virtual", "true") } |