summaryrefslogtreecommitdiffstats
path: root/mkspecs/macx-pbuilder
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2010-10-18 10:52:13 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2010-10-18 10:52:13 (GMT)
commitd093af32cd780a13a3e43e9c292c53ce9160151e (patch)
tree05d7d3a37bffa67807ac0a604dfb0c109c5460bf /mkspecs/macx-pbuilder
parent6a007684823298721ba2bdb26c8c0f726201547a (diff)
downloadQt-d093af32cd780a13a3e43e9c292c53ce9160151e.zip
Qt-d093af32cd780a13a3e43e9c292c53ce9160151e.tar.gz
Qt-d093af32cd780a13a3e43e9c292c53ce9160151e.tar.bz2
Update license headers to release version.
Diffstat (limited to 'mkspecs/macx-pbuilder')
-rw-r--r--mkspecs/macx-pbuilder/qplatformdefs.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/mkspecs/macx-pbuilder/qplatformdefs.h b/mkspecs/macx-pbuilder/qplatformdefs.h
index 66afad2..0d39496 100644
--- a/mkspecs/macx-pbuilder/qplatformdefs.h
+++ b/mkspecs/macx-pbuilder/qplatformdefs.h
@@ -7,11 +7,11 @@
** This file is part of the qmake spec 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$
**
****************************************************************************/