summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2008-12-16 17:25:01 +0100
committerhjk <qtc-committer@nokia.com>2008-12-16 17:25:01 +0100
commit06e5e83e1e27a83413a77b9b134579498e2a7cf4 (patch)
tree18237c0959326dcb8b57456049b572f2420af3d2 /bin
parentda3cb1448320abf99769df46a3c52c028224676d (diff)
downloadqt-creator-06e5e83e1e27a83413a77b9b134579498e2a7cf4.tar.gz
fix license header
Diffstat (limited to 'bin')
-rw-r--r--bin/gdbmacros/gdbmacros.cpp40
1 files changed, 19 insertions, 21 deletions
diff --git a/bin/gdbmacros/gdbmacros.cpp b/bin/gdbmacros/gdbmacros.cpp
index 775819934b..ca19e58702 100644
--- a/bin/gdbmacros/gdbmacros.cpp
+++ b/bin/gdbmacros/gdbmacros.cpp
@@ -1,34 +1,35 @@
-/****************************************************************************
+/***************************************************************************
+**
** This file is part of Qt Creator
**
-** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).*
+** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
**
-** Contact: Qt Software Information (qt-info@nokia.com)**
+** Non-Open Source Usage
**
-** No Commercial Usage
-** This file contains pre-release code and may only be used for evaluation
-** and testing purposes. It may not be used for commercial development. You
-** may use this file in accordance with the terms and conditions contained in
-** the either Technology Preview License Agreement or the Beta Release
-** License Agreement.
+** Licensees may use this file in accordance with the Qt Beta Version
+** License Agreement, Agreement version 2.2 provided with the Software or,
+** alternatively, in accordance with the terms contained in a written
+** agreement between you and Nokia.
**
** GNU General Public License Usage
+**
** Alternatively, this file may be used under the terms of the GNU General
** Public License versions 2.0 or 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 GNU
** General Public Licensing requirements will be met:
+**
** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
-** http://www.gnu.org/copyleft/gpl.html. In addition, as a special
-** exception, Nokia gives you certain additional rights. These rights are
-** described in the Nokia Qt GPL Exception version 1.2, included in the file
-** GPL_EXCEPTION.txt in this package.
+** 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
-****************************************************************************/
-
-// {[(
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt GPL Exception
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
+**
+***************************************************************************/
#include <qglobal.h>
@@ -2497,6 +2498,3 @@ void qDumpObjectData440(
qDebug() << "Unsupported protocol version" << protocolVersion;
}
}
-
-
-// ]})