diff options
author | Christian Strømme <christian.stromme@theqtcompany.com> | 2015-02-18 00:52:50 +0100 |
---|---|---|
committer | Christian Strømme <christian.stromme@theqtcompany.com> | 2015-02-18 00:59:06 +0100 |
commit | 79e4b98b12a9ee652b19ac69a90b92be5facf6ca (patch) | |
tree | 7210142ccc65b6d5393504c75533b4f27cb82a8b /tests/auto | |
parent | 7e6a7df03509e88c7c97f1d789f87cb684358392 (diff) | |
parent | 2919a036354abf1e637f3bea4de8dc2577191fca (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ic6b7965ae297c462b2b89e5ba373ac204d3da6ad
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/webview/qwebview/tst_qwebview.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/webview/qwebview/tst_qwebview.cpp b/tests/auto/webview/qwebview/tst_qwebview.cpp index c646339..d0a2329 100644 --- a/tests/auto/webview/qwebview/tst_qwebview.cpp +++ b/tests/auto/webview/qwebview/tst_qwebview.cpp @@ -1,24 +1,24 @@ /**************************************************************************** ** -** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the test suite of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file 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 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. +** 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 file may be used under the terms of the GNU Lesser ** General Public License version 3 as published by the Free Software ** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to +** packaging of this file. Please review the following information to ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** @@ -26,7 +26,7 @@ ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 2.0 or later 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 +** the packaging of this file. Please review the following information to ** ensure the GNU General Public License version 2.0 requirements will be ** met: http://www.gnu.org/licenses/gpl-2.0.html. ** |