From bbfb9dadbf6cf8a59f1d39e62131c9af653800e9 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 11 Feb 2015 14:37:56 +0200 Subject: Update copyright headers Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I2febb46d711c51eeb08f13418a4fc15ab0502f1a Reviewed-by: Friedemann Kleint --- examples/activeqt/wrapper/doc/src/wrapper.qdoc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/activeqt/wrapper/doc') diff --git a/examples/activeqt/wrapper/doc/src/wrapper.qdoc b/examples/activeqt/wrapper/doc/src/wrapper.qdoc index 41debb9..f51fe12 100644 --- a/examples/activeqt/wrapper/doc/src/wrapper.qdoc +++ b/examples/activeqt/wrapper/doc/src/wrapper.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 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$ -- cgit v1.2.3