summaryrefslogtreecommitdiff
path: root/src/plugins/macros/macromanager.cpp
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@nokia.com>2010-12-20 11:10:30 +0100
committerTobias Hunger <tobias.hunger@nokia.com>2010-12-20 11:16:55 +0100
commitf74fdcf5fd9047683ceb9955b0e0d60be6f64fb8 (patch)
tree15210c073f276b2b0e2c8e6f7a5563c5abb142ab /src/plugins/macros/macromanager.cpp
parentf5fbbbfd4f247ac405a50b45bb8cfc0ad97bb305 (diff)
downloadqt-creator-f74fdcf5fd9047683ceb9955b0e0d60be6f64fb8.tar.gz
Macros: Fix license headers
Diffstat (limited to 'src/plugins/macros/macromanager.cpp')
-rw-r--r--src/plugins/macros/macromanager.cpp18
1 files changed, 11 insertions, 7 deletions
diff --git a/src/plugins/macros/macromanager.cpp b/src/plugins/macros/macromanager.cpp
index 2d4537a458..6e6c9bce15 100644
--- a/src/plugins/macros/macromanager.cpp
+++ b/src/plugins/macros/macromanager.cpp
@@ -6,12 +6,12 @@
**
** Contact: Nokia Corporation (qt-info@nokia.com)
**
-** Commercial Usage
+** No 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.
+** 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.
**
** GNU Lesser General Public License Usage
**
@@ -22,8 +22,12 @@
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
**
**************************************************************************/