diff options
Diffstat (limited to 'doc/codesnippets/doc/src/snippets/qsplashscreen')
3 files changed, 34 insertions, 34 deletions
diff --git a/doc/codesnippets/doc/src/snippets/qsplashscreen/main.cpp b/doc/codesnippets/doc/src/snippets/qsplashscreen/main.cpp index 1e489531..fb0b27aa 100644 --- a/doc/codesnippets/doc/src/snippets/qsplashscreen/main.cpp +++ b/doc/codesnippets/doc/src/snippets/qsplashscreen/main.cpp @@ -6,35 +6,35 @@ ## 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 self 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, self file may be used under the terms of the GNU Lesser +## 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 self file. Please review the following information to +## 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. ## -## 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 self -## 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, self file may be used under the terms of the GNU +## 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 self file. Please review the following information to +## 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 are unsure which license is appropriate for your use, please -## contact the sales department at http://www.qtsoftware.com/contact. +## ## $QT_END_LICENSE$ ## ############################################################################ diff --git a/doc/codesnippets/doc/src/snippets/qsplashscreen/mainwindow.cpp b/doc/codesnippets/doc/src/snippets/qsplashscreen/mainwindow.cpp index a5b7cd5f..7c6420e1 100644 --- a/doc/codesnippets/doc/src/snippets/qsplashscreen/mainwindow.cpp +++ b/doc/codesnippets/doc/src/snippets/qsplashscreen/mainwindow.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$ ** ****************************************************************************/ diff --git a/doc/codesnippets/doc/src/snippets/qsplashscreen/mainwindow.h b/doc/codesnippets/doc/src/snippets/qsplashscreen/mainwindow.h index 61074daf..f78b0247 100644 --- a/doc/codesnippets/doc/src/snippets/qsplashscreen/mainwindow.h +++ b/doc/codesnippets/doc/src/snippets/qsplashscreen/mainwindow.h @@ -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$ ** ****************************************************************************/ |