diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-02-16 13:13:50 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2011-02-16 13:13:50 (GMT) |
commit | ed5c3b3332e2c95a4f8bba8c341a11f05fc4f775 (patch) | |
tree | e408f932e76c8588d1740c028c7bb29367221624 /src/dbus/qdbusmacros.h | |
parent | 8e2018e5af72347b4c068da735e307aee8596e80 (diff) | |
download | Qt-ed5c3b3332e2c95a4f8bba8c341a11f05fc4f775.zip Qt-ed5c3b3332e2c95a4f8bba8c341a11f05fc4f775.tar.gz Qt-ed5c3b3332e2c95a4f8bba8c341a11f05fc4f775.tar.bz2 |
Change to release license header.
Reviewed-by: Trust Me
Diffstat (limited to 'src/dbus/qdbusmacros.h')
-rw-r--r-- | src/dbus/qdbusmacros.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/dbus/qdbusmacros.h b/src/dbus/qdbusmacros.h index 09fa2a4..f3b6d44 100644 --- a/src/dbus/qdbusmacros.h +++ b/src/dbus/qdbusmacros.h @@ -7,11 +7,11 @@ ** This file is part of the QtDBus module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. +** Commercial Usage +** Licensees holding valid Qt Commercial licenses may use this file in +** accordance with the Qt Commercial License Agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Nokia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -25,16 +25,16 @@ ** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** ** If you have questions regarding the use of this file, please contact ** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** ** $QT_END_LICENSE$ ** ****************************************************************************/ |