diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2018-04-26 13:12:07 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@qt.io> | 2018-04-26 11:07:42 +0000 |
| commit | 6401fd7200615fe21b8b1621553eba4096dbe332 (patch) | |
| tree | efdc5c15c2def1c70c31a2cf120df7e85d8a0025 /packaging-tools/configurations | |
| parent | d596f4015f90eb0cd74a78c3ac504a8610e4d94e (diff) | |
Put back deprecated qtwebengine components
We need to override existing deprecated installation with empty
packages so that old installation directories get removed.
Task-number: QTBUG-67941
Change-Id: I06892dddffa2bd907944553ce12aa8f05a919ebe
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Diffstat (limited to 'packaging-tools/configurations')
4 files changed, 35 insertions, 0 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtwebengine.win32_msvc2015/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtwebengine.win32_msvc2015/meta/package.xml new file mode 100644 index 000000000..1b5a3506c --- /dev/null +++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtwebengine.win32_msvc2015/meta/package.xml @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Qt WebEngine for msvc2015 32-bit</DisplayName> + <Description></Description> + <Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version> + <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> + <AutoDependOn>qt.qt5.5110.qtwebengine, qt.qt5.5110.win32_msvc2015</AutoDependOn> + <Dependencies>qt.qt5.5110.win32_msvc2015</Dependencies> + <Virtual>true</Virtual> + <SortingPriority></SortingPriority> + <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives> +</Package> + + diff --git a/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtwebengine.win64_msvc2015_64/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtwebengine.win64_msvc2015_64/meta/package.xml new file mode 100644 index 000000000..cf0d47326 --- /dev/null +++ b/packaging-tools/configurations/pkg_templates/pkg_qt5_5110/qt.qt5.5110.qtwebengine.win64_msvc2015_64/meta/package.xml @@ -0,0 +1,14 @@ +<?xml version="1.0"?> +<Package> + <DisplayName>Qt WebEngine for msvc2015 64-bit</DisplayName> + <Description></Description> + <Version>5.11.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version> + <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> + <AutoDependOn>qt.qt5.5110.qtwebengine, qt.qt5.5110.win64_msvc2015_64</AutoDependOn> + <Dependencies>qt.qt5.5110.win64_msvc2015_64</Dependencies> + <Virtual>true</Virtual> + <SortingPriority></SortingPriority> + <DownloadableArchives><!--ONLINE_ARCHIVE_LIST--></DownloadableArchives> +</Package> + + diff --git a/packaging-tools/configurations/windows/x64/qt5-5110/x86_64-qt5-5110-msvc2015_64-conf b/packaging-tools/configurations/windows/x64/qt5-5110/x86_64-qt5-5110-msvc2015_64-conf index 17912ed49..6d8b7a07d 100644 --- a/packaging-tools/configurations/windows/x64/qt5-5110/x86_64-qt5-5110-msvc2015_64-conf +++ b/packaging-tools/configurations/windows/x64/qt5-5110/x86_64-qt5-5110-msvc2015_64-conf @@ -180,3 +180,6 @@ target_install_base: /%QT_VERSION%/msvc2015_64 [qt5.5110.qtwebglplugin.win64_msvc2015_64] archive_uri: /qt/%QT_VERSION%/latest/qtwebglplugin/qtwebglplugin-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86_64.7z +# QtWebEngine provided as separate installable component in installer +[qt.qt5.5110.qtwebengine] +[qt.qt5.5110.qtwebengine.win64_msvc2015_64] diff --git a/packaging-tools/configurations/windows/x86/qt5-5110/x86-qt5-5110-msvc2015_32-conf b/packaging-tools/configurations/windows/x86/qt5-5110/x86-qt5-5110-msvc2015_32-conf index b683ed764..abfc4181f 100644 --- a/packaging-tools/configurations/windows/x86/qt5-5110/x86-qt5-5110-msvc2015_32-conf +++ b/packaging-tools/configurations/windows/x86/qt5-5110/x86-qt5-5110-msvc2015_32-conf @@ -180,3 +180,7 @@ target_install_base: /%QT_VERSION%/msvc2015 [qt5.5110.qtwebglplugin.win32_msvc2015] archive_uri: /qt/%QT_VERSION%/latest/qtwebglplugin/qtwebglplugin-Windows-Windows_10-MSVC2015-Windows-Windows_10-X86.7z +# QtWebEngine provided as separate installable component in installer +[qt.qt5.5110.qtwebengine] +[qt.qt5.5110.qtwebengine.win32_msvc2015] + |