aboutsummaryrefslogtreecommitdiffstats
path: root/doc/codesnippets/doc/src/snippets/designer/imagedialog/main.cpp
diff options
context:
space:
mode:
authorTeemu Kaukoranta <teemu.kaukoranta@digia.com>2013-05-20 15:26:59 +0300
committerSergio Ahumada <sergio.ahumada@digia.com>2013-05-23 11:16:40 +0200
commitfa2e571b6c68aa9439a88fc7ab441b6e091268df (patch)
tree21d8496604e459b51a55fcc3963801b44e9cf871 /doc/codesnippets/doc/src/snippets/designer/imagedialog/main.cpp
parenta6785ad13fc096c60b2fc38d4220010ae708743a (diff)
Fixed licenses
License fixed using replace-licenses.zsh from mkdist repo. Possible copyright and contact changes will come later. Change-Id: I18b977ac33f1b00e99fa7aae6c1a824769ce5f6e Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Diffstat (limited to 'doc/codesnippets/doc/src/snippets/designer/imagedialog/main.cpp')
-rw-r--r--doc/codesnippets/doc/src/snippets/designer/imagedialog/main.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/doc/codesnippets/doc/src/snippets/designer/imagedialog/main.cpp b/doc/codesnippets/doc/src/snippets/designer/imagedialog/main.cpp
index d47631aa6..017497b25 100644
--- a/doc/codesnippets/doc/src/snippets/designer/imagedialog/main.cpp
+++ b/doc/codesnippets/doc/src/snippets/designer/imagedialog/main.cpp
@@ -6,11 +6,13 @@
** This file is part of the documentation of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the 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. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
@@ -20,10 +22,9 @@
** 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 version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** 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
** Alternatively, this file may be used under the terms of the GNU
@@ -33,8 +34,7 @@
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+**
** $QT_END_LICENSE$
**
****************************************************************************/