summaryrefslogtreecommitdiff
path: root/dist
diff options
context:
space:
mode:
authorJani Heikkinen <jani.heikkinen@theqtcompany.com>2015-03-18 10:24:38 +0200
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2015-03-18 09:50:30 +0000
commit4bdf5d76f4214dd49cab8cf5671f364f5435a3bf (patch)
treea689f90d50941225d70b4ac44b60779e743bcff8 /dist
parentfad14425b5b2d3f6263384119c7f0682b1c40aa3 (diff)
downloadqtenginio-4bdf5d76f4214dd49cab8cf5671f364f5435a3bf.tar.gz
Fixed enginio license headers & files
Updated license from old LGLP to new LGPL21 in README.md dist/packages/com.digia.enginio/meta/installscript.qs dist/packages/com.digia.enginio/meta/package.xml dist/packages/com.digia.enginioDocumentation/meta/installscript.qs Removed unused LICENSE.GPL & LICENSE.LGPL Added missing LICENSE.LGPLv21 & LICENSE.FDL Task-number: QTBUG-45042 Change-Id: If7f092a9717a9d2ccb163def785f2cd5c25182d7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Diffstat (limited to 'dist')
-rw-r--r--dist/packages/com.digia.enginio/meta/installscript.qs20
-rw-r--r--dist/packages/com.digia.enginio/meta/package.xml6
-rw-r--r--dist/packages/com.digia.enginioDocumentation/meta/installscript.qs20
3 files changed, 19 insertions, 27 deletions
diff --git a/dist/packages/com.digia.enginio/meta/installscript.qs b/dist/packages/com.digia.enginio/meta/installscript.qs
index 4973de5..65fa2cd 100644
--- a/dist/packages/com.digia.enginio/meta/installscript.qs
+++ b/dist/packages/com.digia.enginio/meta/installscript.qs
@@ -5,6 +5,7 @@
**
** This file is part of the Enginio Qt Client Library.
**
+** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
@@ -15,23 +16,18 @@
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** $QT_END_LICENSE$
**
****************************************************************************/
diff --git a/dist/packages/com.digia.enginio/meta/package.xml b/dist/packages/com.digia.enginio/meta/package.xml
index acdf8d4..c0d6e6e 100644
--- a/dist/packages/com.digia.enginio/meta/package.xml
+++ b/dist/packages/com.digia.enginio/meta/package.xml
@@ -7,10 +7,10 @@
<Name>com.digia.enginio</Name>
<SortingPriority>100</SortingPriority>
<Licenses>
- <License name="LGPL" file="LICENSE.LGPL" />
- <License name="GPL" file="LICENSE.GPL" />
+ <License name="LGPLv21" file="LICENSE.LGPLv21" />
+ <License name="LGPLv3" file="LICENSE.LGPLv3" />
<License name="FDL" file="LICENSE.FDL" />
- <License name="LGPL_EXCEPTION" file="LGPL_EXCEPTION.txt" />
+ <License name="LGPL_EXCEPTION" file="LGPL_EXCEPTION.txt" />
</Licenses>
<Default>script</Default>
<Script>installscript.qs</Script>
diff --git a/dist/packages/com.digia.enginioDocumentation/meta/installscript.qs b/dist/packages/com.digia.enginioDocumentation/meta/installscript.qs
index 32b8ce6..a7eb9d5 100644
--- a/dist/packages/com.digia.enginioDocumentation/meta/installscript.qs
+++ b/dist/packages/com.digia.enginioDocumentation/meta/installscript.qs
@@ -5,6 +5,7 @@
**
** This file is part of the Enginio Qt Client Library.
**
+** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
@@ -15,23 +16,18 @@
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** $QT_END_LICENSE$
**
****************************************************************************/