diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-02-26 09:53:22 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-02-26 09:53:48 +0100 |
| commit | 78a1e54683e80ee4c029816c7308c94ca85712bd (patch) | |
| tree | e22cc9a091c2b4780bc1587d2a5b548704ad3a89 /dist/packages | |
| parent | e5d2246c53a1f683de70b9f5044fe5d64704380e (diff) | |
| parent | f0951246d8192c8fbd3ea7f6366f476736ae1a2d (diff) | |
Merge remote-tracking branch 'origin/2.0'
Change-Id: I962f4f19909c06e1da03c14072b15f97de02a07d
Diffstat (limited to 'dist/packages')
| -rw-r--r-- | dist/packages/org.qtproject.ifw/meta/3RDPARTY | 4 | ||||
| -rw-r--r-- | dist/packages/org.qtproject.ifw/meta/LGPL_EXCEPTION.txt | 2 | ||||
| -rw-r--r-- | dist/packages/org.qtproject.ifw/meta/package.xml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/dist/packages/org.qtproject.ifw/meta/3RDPARTY b/dist/packages/org.qtproject.ifw/meta/3RDPARTY index 58b055221..59325fa83 100644 --- a/dist/packages/org.qtproject.ifw/meta/3RDPARTY +++ b/dist/packages/org.qtproject.ifw/meta/3RDPARTY @@ -20,7 +20,7 @@ KD Tools Sources for the KD Tools library are under src/libs/kdtools. The library is released under the same license as the rest -of the installer framework (GPL 3.0/LGPL 2.1 with Digia -exception/Digia Commercial License). +of the installer framework (LGPL 3.0/LGPL 2.1 with The Qt Company +exception/The Qt Company Commercial License). The copyright is owned by Klaralvdalens Datakonsult AB. diff --git a/dist/packages/org.qtproject.ifw/meta/LGPL_EXCEPTION.txt b/dist/packages/org.qtproject.ifw/meta/LGPL_EXCEPTION.txt index add80b931..918157a31 100644 --- a/dist/packages/org.qtproject.ifw/meta/LGPL_EXCEPTION.txt +++ b/dist/packages/org.qtproject.ifw/meta/LGPL_EXCEPTION.txt @@ -1,4 +1,4 @@ -Digia Qt LGPL Exception version 1.1 +The Qt Company LGPL Exception version 1.1 As an additional permission to the GNU Lesser General Public License version 2.1, the object code form of a "work that uses the Library" may incorporate diff --git a/dist/packages/org.qtproject.ifw/meta/package.xml b/dist/packages/org.qtproject.ifw/meta/package.xml index 2c7f592bb..3a54cb9d3 100644 --- a/dist/packages/org.qtproject.ifw/meta/package.xml +++ b/dist/packages/org.qtproject.ifw/meta/package.xml @@ -6,7 +6,7 @@ <ReleaseDate>2013-12-12</ReleaseDate> <Licenses> <License name="LGPL 2.1" file="LICENSE.LGPL" /> - <License name="Digial Qt LGPL Exception 1.1" file="LGPL_EXCEPTION.txt" /> + <License name="The Qt Company LGPL Exception 1.1" file="LGPL_EXCEPTION.txt" /> <License name="Third Party Code Licenses" file="3RDPARTY" /> </Licenses> <Script>installscript.qs</Script> |