aboutsummaryrefslogtreecommitdiffstats
path: root/src/share
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2011-04-13 08:42:33 +0200
committerhjk <qtc-committer@nokia.com>2011-04-13 11:49:28 +0200
commit839766396489249c541c60c92f717f77814dcf8b (patch)
tree3e937237a26bdd8ef9ca5f5ee369d1dcec5f5891 /src/share
parent61790e54e8155e1e57bfdd372726dfb2117c4563 (diff)
Update license.
Diffstat (limited to 'src/share')
-rw-r--r--src/share/qtcreator/externaltools/lrelease.xml14
-rw-r--r--src/share/qtcreator/externaltools/lupdate.xml14
-rw-r--r--src/share/qtcreator/externaltools/notepad_win.xml14
-rw-r--r--src/share/qtcreator/externaltools/sort.xml14
-rw-r--r--src/share/qtcreator/externaltools/vi.xml14
-rw-r--r--src/share/qtcreator/externaltools/vi_mac.xml14
6 files changed, 42 insertions, 42 deletions
diff --git a/src/share/qtcreator/externaltools/lrelease.xml b/src/share/qtcreator/externaltools/lrelease.xml
index 219c9e2eff..6f36e39e25 100644
--- a/src/share/qtcreator/externaltools/lrelease.xml
+++ b/src/share/qtcreator/externaltools/lrelease.xml
@@ -6,7 +6,7 @@
**
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
**
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
**
** Commercial Usage
**
@@ -17,12 +17,12 @@
**
** GNU Lesser General Public License Usage
**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** 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.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to 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.
diff --git a/src/share/qtcreator/externaltools/lupdate.xml b/src/share/qtcreator/externaltools/lupdate.xml
index f751ecd309..483e4e4ed0 100644
--- a/src/share/qtcreator/externaltools/lupdate.xml
+++ b/src/share/qtcreator/externaltools/lupdate.xml
@@ -6,7 +6,7 @@
**
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
**
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
**
** Commercial Usage
**
@@ -17,12 +17,12 @@
**
** GNU Lesser General Public License Usage
**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** 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.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to 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.
diff --git a/src/share/qtcreator/externaltools/notepad_win.xml b/src/share/qtcreator/externaltools/notepad_win.xml
index c8fcd42aad..d6723999f4 100644
--- a/src/share/qtcreator/externaltools/notepad_win.xml
+++ b/src/share/qtcreator/externaltools/notepad_win.xml
@@ -6,7 +6,7 @@
**
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
**
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
**
** Commercial Usage
**
@@ -17,12 +17,12 @@
**
** GNU Lesser General Public License Usage
**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** 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.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to 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.
diff --git a/src/share/qtcreator/externaltools/sort.xml b/src/share/qtcreator/externaltools/sort.xml
index 2b4f867e61..f73f4b1563 100644
--- a/src/share/qtcreator/externaltools/sort.xml
+++ b/src/share/qtcreator/externaltools/sort.xml
@@ -6,7 +6,7 @@
**
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
**
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
**
** Commercial Usage
**
@@ -17,12 +17,12 @@
**
** GNU Lesser General Public License Usage
**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** 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.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to 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.
diff --git a/src/share/qtcreator/externaltools/vi.xml b/src/share/qtcreator/externaltools/vi.xml
index 1e1a7d4925..8bbb55ae49 100644
--- a/src/share/qtcreator/externaltools/vi.xml
+++ b/src/share/qtcreator/externaltools/vi.xml
@@ -6,7 +6,7 @@
**
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
**
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
**
** Commercial Usage
**
@@ -17,12 +17,12 @@
**
** GNU Lesser General Public License Usage
**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** 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.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to 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.
diff --git a/src/share/qtcreator/externaltools/vi_mac.xml b/src/share/qtcreator/externaltools/vi_mac.xml
index e2f5fd6d17..50c3533c20 100644
--- a/src/share/qtcreator/externaltools/vi_mac.xml
+++ b/src/share/qtcreator/externaltools/vi_mac.xml
@@ -6,7 +6,7 @@
**
** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
**
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: Nokia Corporation (info@qt.nokia.com)
**
** Commercial Usage
**
@@ -17,12 +17,12 @@
**
** GNU Lesser General Public License Usage
**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** 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.
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to 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.