summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'README.md')
-rw-r--r--README.md9
1 files changed, 4 insertions, 5 deletions
diff --git a/README.md b/README.md
index 5555713..e6e4681 100644
--- a/README.md
+++ b/README.md
@@ -24,11 +24,11 @@ Client library for accessing Enginio service from Qt and QML code.
# Contributing
* Contributing to the Enginio Qt Library works the same way as contributing to any other Qt module
- * See [Qt Contribution Guidelines](http://qt-project.org/wiki/Qt-Contribution-Guidelines)
+ * See [Qt Contribution Guidelines](http://wiki.qt.io/Qt_Contribution_Guidelines)
* Clone the repository from ssh://codereview.qt-project.org/qt/qtenginio.git
* Implement the new feature and automated tests for it
* Make sure all tests pass
- * Push your change for review to [Gerrit](http://qt-project.org/wiki/Gerrit-Introduction)
+ * Push your change for review to [Gerrit](http://wiki.qt.io/Gerrit_Introduction)
* Add reviewers (You can find e-mail addresses in git log and git blame)
# Copyright
@@ -43,7 +43,6 @@ Enginio Qt library is tri-licensed under the Commercial Qt License, the GNU Gene
Licensees holding valid Commercial Qt Licenses may use this library in accordance with the commercial license agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and The Qt Company. For licensing terms and conditions see http://www.qt.io/terms-conditions. For further information use the contact form at http://www.qt.io/contact-us.
**GNU Lesser General Public License Usage**
-Alternatively, this library 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 library. 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. 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.
+Alternatively, this file may be used under the terms of the GNU Lesser 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.
-**GNU General Public License Usage**
-Alternatively, this library 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 library. 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.
+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.