diff options
author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-02-26 09:53:22 +0100 |
---|---|---|
committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-02-26 09:53:48 +0100 |
commit | 78a1e54683e80ee4c029816c7308c94ca85712bd (patch) | |
tree | e22cc9a091c2b4780bc1587d2a5b548704ad3a89 /examples/doc/systeminfo.qdoc | |
parent | e5d2246c53a1f683de70b9f5044fe5d64704380e (diff) | |
parent | f0951246d8192c8fbd3ea7f6366f476736ae1a2d (diff) |
Merge remote-tracking branch 'origin/2.0'
Change-Id: I962f4f19909c06e1da03c14072b15f97de02a07d
Diffstat (limited to 'examples/doc/systeminfo.qdoc')
-rw-r--r-- | examples/doc/systeminfo.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/examples/doc/systeminfo.qdoc b/examples/doc/systeminfo.qdoc index da3b99c10..14da74993 100644 --- a/examples/doc/systeminfo.qdoc +++ b/examples/doc/systeminfo.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 Qt Installer Framework. ** @@ -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://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 |