diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-10-16 15:33:25 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2014-10-16 16:16:30 +0200 |
commit | 399eb81a06f6e11509449f3533e76c8c0ff2b1df (patch) | |
tree | 9291dbb53dda0e760194dcc1409f83142db75b3c /tests/auto/api/testdata/rc/main.cpp | |
parent | 71087bcc7911fb538b6ae560836a97823976f99e (diff) | |
parent | 49afc0e01533f382de0305992aaf05b2e37a72bf (diff) | |
download | qbs-399eb81a06f6e11509449f3533e76c8c0ff2b1df.tar.gz |
Merge remote-tracking branch 'origin/1.3'
Conflicts:
qbs_version.pri
version.js
Change-Id: I645b2f37bae9d36d4bca54b267d57df8b0b7fd21
Diffstat (limited to 'tests/auto/api/testdata/rc/main.cpp')
-rw-r--r-- | tests/auto/api/testdata/rc/main.cpp | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/tests/auto/api/testdata/rc/main.cpp b/tests/auto/api/testdata/rc/main.cpp index 6ea3f271f..67e83e6f0 100644 --- a/tests/auto/api/testdata/rc/main.cpp +++ b/tests/auto/api/testdata/rc/main.cpp @@ -10,16 +10,17 @@ ** 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 Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** conditions see http://www.qt.io/licensing. For further information +** use the contact form at http://www.qt.io/contact-us. ** ** 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. ** ** In addition, as a special exception, Digia gives you certain additional ** rights. These rights are described in the Digia Qt LGPL Exception |