diff options
| author | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2015-06-30 11:05:08 +0300 |
|---|---|---|
| committer | Antti Kokko <antti.kokko@theqtcompany.com> | 2015-06-30 09:37:06 +0000 |
| commit | e8b934c4fcc7f432d9f7576270691f6dbac3bcbe (patch) | |
| tree | bb0e7d7620e69dee56c650274fbc70cfa2b6ef08 | |
| parent | 34dcddc0063f5b8c8a5bc0481c322da57cbd1004 (diff) | |
Qt 5.5.0: Fix license term texts of qt3d, qtcanvas3d and qtlocationv5.5.0-packaging
Licensing term texts fixed in package description texts for
components:
qt3d, qtcanvas3d, qtlocation and qtwebengine
Change-Id: Iab5f3b8cbb91b294566e6f7818abc31a4999bf2c
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
6 files changed, 6 insertions, 6 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.qtwebengine/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.qtwebengine/meta/package.xml index dcc5e57e1..8b3b16913 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.qtwebengine/meta/package.xml +++ b/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.qtwebengine/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> <DisplayName>Qt WebEngine</DisplayName> - <Description>License options: LGPLv3, GPLv2, Commercial<br><br>NOTE: Not licensed under LGPLv2.1<br><br>The Qt WebEngine module integrates the fast moving Chromium web platform into Qt and provides a convenient API for both Qt Widgets and Qt Quick to utilize Chromium's web capabilities. Qt WebEngine takes full benefit of the whole Qt graphics stack integration allowing seamless mix and overlay of native Qt controls with web content and OpenGL shaders.</Description> + <Description>License options: LGPLv3, GPLv2 or later, Commercial<br><br>NOTE: Not licensed under LGPLv2.1<br><br>The Qt WebEngine module integrates the fast moving Chromium web platform into Qt and provides a convenient API for both Qt Widgets and Qt Quick to utilize Chromium's web capabilities. Qt WebEngine takes full benefit of the whole Qt graphics stack integration allowing seamless mix and overlay of native Qt controls with web content and OpenGL shaders.</Description> <Version>5.5.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Default>true</Default> diff --git a/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qt3d/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qt3d/meta/package.xml index 228709ac4..1636b5330 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qt3d/meta/package.xml +++ b/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qt3d/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> <DisplayName>qt3d</DisplayName> - <Description>License options: LGPLv3, LGPLv2.1, Commercial<br><br>Qt 5.5.0 Add-Ons Qt 3D Source Component</Description> + <Description>License options: LGPLv3, GPLv2.0 or later, Commercial<br><br>NOTE: Not licensed under LGPLv2.1<br><br>Qt 5.5.0 Add-Ons Qt 3D Source Component</Description> <Version>5.5.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. --> diff --git a/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtcanvas3d/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtcanvas3d/meta/package.xml index 5f766d900..f6d70850c 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtcanvas3d/meta/package.xml +++ b/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtcanvas3d/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> <DisplayName>qtcanvas3d</DisplayName> - <Description>License options: LGPLv3, LGPLv2.1, Commercial<br><br>Qt 5.5.0 Add-Ons Qt Canvas 3D Source Component</Description> + <Description>License options: LGPLv3, GPLv2.0 or later, Commercial<br><br>NOTE: Not licensed under LGPLv2.1<br><br>Qt 5.5.0 Add-Ons Qt Canvas 3D Source Component</Description> <Version>5.5.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. --> diff --git a/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtlocation/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtlocation/meta/package.xml index a962d7ac7..c7d2af40f 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtlocation/meta/package.xml +++ b/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtlocation/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> <DisplayName>qtlocation</DisplayName> - <Description>License options: LGPLv3, LGPLv2.1, Commercial<br><br>Qt 5.5.0 Add-Ons Qt Location Source Component</Description> + <Description>License options: LGPLv3, GPLv2.0 or later, Commercial<br><br>NOTE: Not licensed under LGPLv2.1<br><br>Qt 5.5.0 Add-Ons Qt Location Source Component</Description> <Version>5.5.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <!--<Dependencies></Dependencies>--> <!-- Comma-separated list of dependencies - optional --> diff --git a/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtquickcontrols/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtquickcontrols/meta/package.xml index 03f4808f6..d1f790d52 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtquickcontrols/meta/package.xml +++ b/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtquickcontrols/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> <DisplayName>qtquickcontrols</DisplayName> - <Description>License options: LGPLv3, GPLv2, Commercial<br><br>NOTE: Not licensed under LGPLv2.1<br><br>Qt 5.5.0 Add-Ons Qt Web Engine Source Component</Description> + <Description>License options: LGPLv3, GPLv2.0 or later, Commercial<br><br>NOTE: Not licensed under LGPLv2.1<br><br>Qt 5.5.0 Add-Ons Qt Web Engine Source Component</Description> <Version>5.5.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. --> diff --git a/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtwebengine/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtwebengine/meta/package.xml index f2510bac0..4bc1c7c80 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtwebengine/meta/package.xml +++ b/packaging-tools/configurations/pkg_templates/pkg_55/qt.55.src.addons.qtwebengine/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> <DisplayName>qtwebengine</DisplayName> - <Description>License options: LGPLv3, GPLv2, Commercial<br><br>NOTE: Not licensed under LGPLv2.1<br><br>Qt 5.5.0 Add-Ons Qt Web Engine Source Component</Description> + <Description>License options: LGPLv3, GPLv2.0 or later, Commercial<br><br>NOTE: Not licensed under LGPLv2.1<br><br>Qt 5.5.0 Add-Ons Qt Web Engine Source Component</Description> <Version>5.5.0-0%VERSION_NUMBER_AUTO_INCREASE%</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Script>installscript.qs</Script> <!-- File name of a script being loaded - optional. --> |