diff options
| author | Iikka Eklund <iikka.eklund@theqtcompany.com> | 2015-06-30 10:59:56 +0300 |
|---|---|---|
| committer | Antti Kokko <antti.kokko@theqtcompany.com> | 2015-06-30 09:02:07 +0000 |
| commit | 34dcddc0063f5b8c8a5bc0481c322da57cbd1004 (patch) | |
| tree | fc1adbfd99501d3e6480f9f06e4b6301b1287d8f | |
| parent | cc2fbfc53aae85e9a116aecd10047fce3df1f4a7 (diff) | |
Qt 5.5.0: Fix line feeds of the license agreement text file
Change-Id: I11627876a7e678c429e6ed6ec481c9eb29d46d76
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Antti Kokko <antti.kokko@theqtcompany.com>
| -rw-r--r-- | packaging-tools/configurations/pkg_templates/pkg_tools/qt.license.lgpl/meta/LICENSE | 26 | ||||
| -rw-r--r-- | packaging-tools/configurations/pkg_templates/pkg_tools/qt.license.lgpl/meta/package.xml | 2 |
2 files changed, 6 insertions, 22 deletions
diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.license.lgpl/meta/LICENSE b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.license.lgpl/meta/LICENSE index 2a06c1996..1fcc1367b 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.license.lgpl/meta/LICENSE +++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.license.lgpl/meta/LICENSE @@ -1,27 +1,11 @@ GENERAL ------- -Qt is available under a commercial license with various pricing models -and packages that meet a variety of needs. Commercial Qt license keeps -your code proprietary where only you can control and monetize on your -end product’s development, user experience and distribution. You also -get great perks like additional functionality, productivity enhancing -tools, world-class support and a close strategic relationship with -The Qt Company to make sure your product and development goals are met. - -Qt has been created under the belief of open development and providing -freedom and choice to developers. To support that, The Qt Company also -licenses Qt under open source licenses, where most of the functionality -is available under LGPLv3 or LGPLv2.1. It should be noted that some -components are available only under LGPLv3. In order to preserve the true -meaning of open development and uphold the spirit of free software, it is -imperative that the rules and regulations of open source licenses are -followed. If you use Qt under open-source licenses, you need to make sure -that you comply with all the licenses of the components you use. - -Qt also contains some 3rd party components that are available under -different open-source licenses. Please refer to the documentation for more -details on 3rd party licenses used in Qt. +Qt is available under a commercial license with various pricing models and packages that meet a variety of needs. Commercial Qt license keeps your code proprietary where only you can control and monetize on your end product’s development, user experience and distribution. You also get great perks like additional functionality, productivity enhancing tools, world-class support and a close strategic relationship with The Qt Company to make sure your product and development goals are met. + +Qt has been created under the belief of open development and providing freedom and choice to developers. To support that, The Qt Company also licenses Qt under open source licenses, where most of the functionality is available under LGPLv3 or LGPLv2.1. It should be noted that some components are available only under LGPLv3. In order to preserve the true meaning of open development and uphold the spirit of free software, it is imperative that the rules and regulations of open source licenses are followed. If you use Qt under open-source licenses, you need to make sure that you comply with all the licenses of the components you use. + +Qt also contains some 3rd party components that are available under different open-source licenses. Please refer to the documentation for more details on 3rd party licenses used in Qt. GPLv3 and LGPLv3 diff --git a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.license.lgpl/meta/package.xml b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.license.lgpl/meta/package.xml index b0d4014c6..1459d1d05 100644 --- a/packaging-tools/configurations/pkg_templates/pkg_tools/qt.license.lgpl/meta/package.xml +++ b/packaging-tools/configurations/pkg_templates/pkg_tools/qt.license.lgpl/meta/package.xml @@ -1,7 +1,7 @@ <?xml version="1.0"?> <Package> <DisplayName>Qt License LGPL</DisplayName> - <Version>1.0.0</Version> + <Version>1.0.1</Version> <ReleaseDate>%PACKAGE_CREATION_DATE%</ReleaseDate> <Licenses> <License name="Qt Installer LGPL License Agreement" file="LICENSE" /> |