diff options
| author | jutaipal <juhani.taipale@digia.com> | 2012-12-10 15:27:14 (GMT) |
|---|---|---|
| committer | jutaipal <juhani.taipale@digia.com> | 2012-12-10 15:27:14 (GMT) |
| commit | 5fe472abf55dbab32f3837ea904146addb82e747 (patch) | |
| tree | 1ace504c72aa70b914377242f275824d2e73c288 /src | |
| parent | c761f51c99004d92039a692a27d97ccf907af156 (diff) | |
| download | Qt-5fe472abf55dbab32f3837ea904146addb82e747.zip Qt-5fe472abf55dbab32f3837ea904146addb82e747.tar.gz Qt-5fe472abf55dbab32f3837ea904146addb82e747.tar.bz2 | |
Nokia to Digia changes
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/util/generator.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/opengl/util/generator.cpp b/src/opengl/util/generator.cpp index 51bf664..d30fb45 100644 --- a/src/opengl/util/generator.cpp +++ b/src/opengl/util/generator.cpp @@ -11,7 +11,7 @@ ** 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. +** a written agreement between you and Digia. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser @@ -21,8 +21,8 @@ ** 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. ** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** ** GNU General Public License Usage @@ -34,7 +34,7 @@ ** 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. +** Digia at qt-info@nokia.com. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -298,7 +298,7 @@ void writeIncludeFile(const QSet<QString> &variables, "** Licensees holding valid Qt Commercial licenses may use this file in\n" "** accordance with the Qt Commercial License Agreement provided with the\n" "** Software or, alternatively, in accordance with the terms contained in\n" - "** a written agreement between you and Nokia.\n" + "** a written agreement between you and Digia.\n" "**\n" "** GNU Lesser General Public License Usage\n" "** Alternatively, this file may be used under the terms of the GNU Lesser\n" @@ -308,8 +308,8 @@ void writeIncludeFile(const QSet<QString> &variables, "** ensure the GNU Lesser General Public License version 2.1 requirements\n" "** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.\n" "**\n" - "** In addition, as a special exception, Nokia gives you certain additional\n" - "** rights. These rights are described in the Nokia Qt LGPL Exception\n" + "** In addition, as a special exception, Digia gives you certain additional\n" + "** rights. These rights are described in the Digia Qt LGPL Exception\n" "** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.\n" "**\n" "** GNU General Public License Usage\n" @@ -321,7 +321,7 @@ void writeIncludeFile(const QSet<QString> &variables, "** met: http://www.gnu.org/copyleft/gpl.html.\n" "**\n" "** If you have questions regarding the use of this file, please contact\n" - "** Nokia at qt-info@nokia.com.\n" + "** Digia at qt-info@nokia.com.\n" "** $QT_END_LICENSE$\n" "**\n" "****************************************************************************/\n" |