diff options
| author | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2016-03-04 12:04:54 +0200 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2016-03-08 10:39:20 +0000 |
| commit | 44c7b4218e94844a41176d8b43c9fd18c9750972 (patch) | |
| tree | 404f7359aed165d19891c5e2fbeb126f3d7662b9 | |
| parent | 02ce6492f75f586e99037492b168df5ba36927e8 (diff) | |
Qt5.6: Update src and doc installer config filesv5.7.0-alpha1-packaging
qtenginio and qtwayland need to be attached into monolite src, doc
and example packages separately.
Change-Id: I2d6b453660211ea7330149cd69df3751c32c2704
Reviewed-by: Akseli Salovaara <akseli.salovaara@theqtcompany.com>
| -rw-r--r-- | packaging-tools/configurations/all-os/qt56-doc-examples-conf | 13 | ||||
| -rw-r--r-- | packaging-tools/configurations/all-os/qt56-src-conf | 9 |
2 files changed, 19 insertions, 3 deletions
diff --git a/packaging-tools/configurations/all-os/qt56-doc-examples-conf b/packaging-tools/configurations/all-os/qt56-doc-examples-conf index a2eea3eda..1d0954952 100644 --- a/packaging-tools/configurations/all-os/qt56-doc-examples-conf +++ b/packaging-tools/configurations/all-os/qt56-doc-examples-conf @@ -33,18 +33,27 @@ [qt.56.doc] -archives: 56.doc +archives: 56.doc, 56.doc.qtenginio target_install_base: /Docs/Qt-5.6/ [56.doc] archive_uri: /qt/@QT_VERSION_MINOR@/latest/doc/qt-everywhere-documentation-@QT_VERSION_AND_TAG@.7z package_strip_dirs: 1 +[56.doc.qtenginio] +archive_uri: /qt/@QT_VERSION_MINOR@/latest/doc/qtenginio-documentation-@QT_VERSION_AND_TAG@.7z +package_strip_dirs: 1 [qt.56.examples] -archives: 56.examples +archives: 56.examples, 56.examples.qtenginio, 56.examples.qtwayland target_install_base: /Examples/Qt-5.6/ [56.examples] archive_uri: /qt/@QT_VERSION_MINOR@/latest/examples/qt-everywhere-examples-@QT_VERSION_AND_TAG@.7z package_strip_dirs: 1 +[56.examples.qtenginio] +archive_uri: /qt/@QT_VERSION_MINOR@/latest/examples/qtenginio-examples-@QT_VERSION_AND_TAG@.7z +package_strip_dirs: 1 +[56.examples.qtwayland] +archive_uri: /qt/@QT_VERSION_MINOR@/latest/examples/qtwayland-examples-@QT_VERSION_AND_TAG@.7z +package_strip_dirs: 1 [qt.56.doc.lgplv3.qt3d] archives: 56.doc.lgplv3.qt3d diff --git a/packaging-tools/configurations/all-os/qt56-src-conf b/packaging-tools/configurations/all-os/qt56-src-conf index 4c943d564..a99123769 100644 --- a/packaging-tools/configurations/all-os/qt56-src-conf +++ b/packaging-tools/configurations/all-os/qt56-src-conf @@ -37,11 +37,18 @@ [qt.56.src] [qt.56.src.qteverywhere] -archives: 56.src.qteverywhere +archives: 56.src.qteverywhere, 56.src.qtenginio, 56.src.qtwayland target_install_base: /@QT_VERSION_MINOR@/Src/ [56.src.qteverywhere] archive_uri: /qt/@QT_VERSION_MINOR@/latest/src/single/installer-qt-everywhere-@LICENSE@-src-@QT_VERSION_AND_TAG@.@SRC_ARCHIVE_TYPE@ package_strip_dirs: 1 +[56.src.qtenginio] +archive_uri: /qt/@QT_VERSION_MINOR@/latest/src/submodules/qtenginio-@LICENSE@-src-@QT_VERSION_AND_TAG@.@SRC_ARCHIVE_TYPE@ +package_strip_dirs: 1 +[56.src.qtwayland] +archive_uri: /qt/@QT_VERSION_MINOR@/latest/src/submodules/qtwayland-@LICENSE@-src-@QT_VERSION_AND_TAG@.@SRC_ARCHIVE_TYPE@ +package_strip_dirs: 1 + [qt.56.src.lgplv3] |