diff options
| author | Christian Strømme <[email protected]> | 2015-02-18 00:52:50 +0100 |
|---|---|---|
| committer | Christian Strømme <[email protected]> | 2015-02-18 00:59:06 +0100 |
| commit | 79e4b98b12a9ee652b19ac69a90b92be5facf6ca (patch) | |
| tree | 7210142ccc65b6d5393504c75533b4f27cb82a8b /examples/webview | |
| parent | 7e6a7df03509e88c7c97f1d789f87cb684358392 (diff) | |
| parent | 2919a036354abf1e637f3bea4de8dc2577191fca (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ic6b7965ae297c462b2b89e5ba373ac204d3da6ad
Diffstat (limited to 'examples/webview')
| -rw-r--r-- | examples/webview/minibrowser/doc/src/minibrowser.qdoc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/examples/webview/minibrowser/doc/src/minibrowser.qdoc b/examples/webview/minibrowser/doc/src/minibrowser.qdoc index e7dec3e..49e35ca 100644 --- a/examples/webview/minibrowser/doc/src/minibrowser.qdoc +++ b/examples/webview/minibrowser/doc/src/minibrowser.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** 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 documentation of the Qt Toolkit. ** @@ -10,15 +10,15 @@ ** 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 Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free ** Documentation License version 1.3 as published by the Free Software ** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure +** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements ** will be met: http://www.gnu.org/copyleft/fdl.html. ** $QT_END_LICENSE$ |