summaryrefslogtreecommitdiffstats
path: root/doc/src/examples-android.qdoc
diff options
context:
space:
mode:
authorAntti Kokko <antti.kokko@theqtcompany.com>2015-02-13 15:38:30 +0200
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2015-02-17 10:18:46 +0000
commitebd19207b9987ceeca126ad00b9aba5b3bb26a2d (patch)
tree344654683e5e42f889f1dff562c7130331c7e1f9 /doc/src/examples-android.qdoc
parent61b6d26ddd6502e634e1db25f5ca9f7ee86c2e85 (diff)
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: Iedecec76f88fcf709d31bf7bfc5fe817302ecae1 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'doc/src/examples-android.qdoc')
-rw-r--r--doc/src/examples-android.qdoc12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/examples-android.qdoc b/doc/src/examples-android.qdoc
index ab8782662..67e27fb6b 100644
--- a/doc/src/examples-android.qdoc
+++ b/doc/src/examples-android.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$