summaryrefslogtreecommitdiff
path: root/src/x11extras/qtx11extrasglobal.h
diff options
context:
space:
mode:
authorAntti Kokko <antti.kokko@theqtcompany.com>2015-02-13 15:19:10 +0200
committerAntti Kokko <antti.kokko@theqtcompany.com>2015-02-16 06:40:23 +0000
commitfbbd39ea7b005e70e32c6ed284c0779ce9958247 (patch)
tree34e98773b5f45e7fe82db428f23f351cf8b37509 /src/x11extras/qtx11extrasglobal.h
parent1d37d5b362779326abd0cbf31ac2494842bea11c (diff)
downloadqtx11extras-fbbd39ea7b005e70e32c6ed284c0779ce9958247.tar.gz
Update copyright headersv5.5.0-alpha1
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: I5b54cb4819a4d35dd9136d4250f83871bd15c449 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
Diffstat (limited to 'src/x11extras/qtx11extrasglobal.h')
-rw-r--r--src/x11extras/qtx11extrasglobal.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/x11extras/qtx11extrasglobal.h b/src/x11extras/qtx11extrasglobal.h
index c30f1bb..e9614e7 100644
--- a/src/x11extras/qtx11extrasglobal.h
+++ b/src/x11extras/qtx11extrasglobal.h
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2012 Intel Corporation.
-** Contact: http://www.qt-project.org/legal
+** Contact: http://www.qt.io/licensing/
**
** This file is part of the QtCore module of the Qt Toolkit.
**
@@ -10,9 +10,9 @@
** 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
@@ -23,8 +23,8 @@
** 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
+** 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.
**
** $QT_END_LICENSE$