summaryrefslogtreecommitdiffstats
path: root/doc/src/mobile.qdoc
diff options
context:
space:
mode:
authorAlex Blasche <alexander.blasche@theqtcompany.com>2015-02-19 06:25:09 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-02-19 06:25:09 +0000
commit79cadf244e8a8a6b596fb33d83a3371028a72b05 (patch)
treefe69f366279f4ac62c402e617d4e6971fdc357e6 /doc/src/mobile.qdoc
parentb45e1f6d8fe0a7c8a36f79ef51e02052a013ea2b (diff)
parent0d3b07541a1f9136178fe0ab1f140375acb033e8 (diff)
Merge "Merge remote-tracking branch 'gerrit/dev' into 5.5" into refs/staging/5.5
Diffstat (limited to 'doc/src/mobile.qdoc')
-rw-r--r--doc/src/mobile.qdoc12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/src/mobile.qdoc b/doc/src/mobile.qdoc
index 726af2234..e15ebc891 100644
--- a/doc/src/mobile.qdoc
+++ b/doc/src/mobile.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$