From 332dcaed490da5d35cdc01d038a88811e0cae9ee Mon Sep 17 00:00:00 2001 From: Teemu Kaukoranta Date: Mon, 20 May 2013 16:08:20 +0300 Subject: Fixed licenses Updated licenses using replace-licenses.zsh from mkdist repo. Possible copyright and contact changes will come later. Change-Id: I228cc29e0ed7fa98284d41e87a45a294cc8fb42d Reviewed-by: Janne Anttila Reviewed-by: Sergio Ahumada --- examples/tutorial/main.cpp | 46 +++++++++++----------- examples/tutorial/tests/01_parts/PartsTest.qml | 46 +++++++++++----------- .../tutorial/tests/02_validate/ValidateTest.qml | 46 +++++++++++----------- .../ApplicationUnderTest.qml | 44 ++++++++++----------- .../tutorial/tests/04_findItem/FindItemTest.qml | 44 ++++++++++----------- examples/tutorial/tests/04_findItem/TenPinTest.qml | 44 ++++++++++----------- examples/tutorial/tests/05_input/InputTest.qml | 44 ++++++++++----------- examples/tutorial/tests/05_input/TenPinTest.qml | 44 ++++++++++----------- examples/tutorial/tests/06_data/InputTest.qml | 44 ++++++++++----------- examples/tutorial/tests/06_data/InputTests.qml | 44 ++++++++++----------- examples/tutorial/tests/06_data/TenPinTest.qml | 44 ++++++++++----------- examples/tutorial/tpframe.cpp | 44 ++++++++++----------- examples/tutorial/tpframe.h | 44 ++++++++++----------- examples/tutorial/tpframeball.cpp | 44 ++++++++++----------- examples/tutorial/tpframeball.h | 44 ++++++++++----------- examples/tutorial/tpgame.cpp | 44 ++++++++++----------- examples/tutorial/tpgame.h | 46 +++++++++++----------- scripts/update_license.pl | 46 +++++++++++----------- .../imports/qtsystemtest/qml/Application.qml | 44 ++++++++++----------- .../qtsystemtest/qml/ApplicationObjectsCache.js | 44 ++++++++++----------- src/interpreter/imports/qtsystemtest/qml/Js.qml | 46 +++++++++++----------- .../imports/qtsystemtest/qml/Remote.qml | 44 ++++++++++----------- src/interpreter/imports/qtsystemtest/qml/Test.qml | 44 ++++++++++----------- .../imports/qtsystemtest/qml/TestCollection.qml | 44 ++++++++++----------- .../imports/qtsystemtest/qml/TestItem.qml | 44 ++++++++++----------- .../imports/qtsystemtest/qml/TestMethod.qml | 44 ++++++++++----------- .../qtsystemtest/qml/itemhandlers/QstObject.qml | 44 ++++++++++----------- .../qtsystemtest/qml/itemhandlers/QstWidget.qml | 46 +++++++++++----------- .../qtsystemtest/scripts/ApplicationRegistry.js | 44 ++++++++++----------- .../imports/qtsystemtest/scripts/Class.js | 44 ++++++++++----------- .../qtsystemtest/scripts/ComponentCacher.js | 44 ++++++++++----------- .../imports/qtsystemtest/scripts/Console.js | 44 ++++++++++----------- .../imports/qtsystemtest/scripts/Datatype.js | 44 ++++++++++----------- .../imports/qtsystemtest/scripts/Exception.js | 44 ++++++++++----------- .../imports/qtsystemtest/scripts/Expect.js | 44 ++++++++++----------- .../imports/qtsystemtest/scripts/Functional.js | 44 ++++++++++----------- .../imports/qtsystemtest/scripts/ItemFactory.js | 44 ++++++++++----------- .../imports/qtsystemtest/scripts/JsCore.js | 44 ++++++++++----------- .../imports/qtsystemtest/scripts/QstCore.js | 46 +++++++++++----------- .../imports/qtsystemtest/scripts/SourceBuilder.js | 44 ++++++++++----------- .../imports/qtsystemtest/scripts/api.js | 46 +++++++++++----------- .../imports/qtsystemtest/src/imports.cpp | 44 ++++++++++----------- src/interpreter/imports/qtsystemtest/src/imports.h | 46 +++++++++++----------- .../imports/qtsystemtest/src/qstcoreapi.cpp | 46 +++++++++++----------- .../imports/qtsystemtest/src/qstcoreapi.h | 44 ++++++++++----------- .../imports/qtsystemtest/src/qstlocalprocess.cpp | 44 ++++++++++----------- .../imports/qtsystemtest/src/qstlocalprocess.h | 44 ++++++++++----------- .../imports/qtsystemtest/src/qstutils.cpp | 46 +++++++++++----------- .../imports/qtsystemtest/src/qstutils.h | 46 +++++++++++----------- .../imports/qtsystemtest/src/qtuitestglobal.h | 44 ++++++++++----------- src/interpreter/imports/runner/qml/Config.qml | 46 +++++++++++----------- src/interpreter/imports/runner/qml/Logger.qml | 44 ++++++++++----------- .../imports/runner/qml/PlainTextLogger.qml | 44 ++++++++++----------- src/interpreter/imports/runner/qml/XUnitLogger.qml | 44 ++++++++++----------- src/interpreter/imports/runner/qml/XmlLogger.qml | 44 ++++++++++----------- src/interpreter/imports/runner/src/imports.cpp | 46 +++++++++++----------- src/interpreter/imports/runner/src/imports.h | 46 +++++++++++----------- .../imports/runner/src/qstlogwriter.cpp | 44 ++++++++++----------- src/interpreter/imports/runner/src/qstlogwriter.h | 44 ++++++++++----------- .../imports/runner/src/qstxunitwriter.cpp | 44 ++++++++++----------- .../imports/runner/src/qstxunitwriter.h | 44 ++++++++++----------- src/interpreter/runner/main.cpp | 44 ++++++++++----------- src/interpreter/runner/qstjsengine.cpp | 46 +++++++++++----------- src/interpreter/runner/qstjsengine.h | 46 +++++++++++----------- src/interpreter/runner/qstrunnerbootstrap.cpp | 44 ++++++++++----------- src/interpreter/runner/qstrunnerbootstrap.h | 44 ++++++++++----------- src/interpreter/runner/qstrunnercore.cpp | 44 ++++++++++----------- src/interpreter/runner/qstrunnercore.h | 44 ++++++++++----------- src/interpreter/runner/scripts/QstRunner.js | 44 ++++++++++----------- src/interpreter/runner/scripts/QstRunner.qml | 44 ++++++++++----------- src/objectBrowser/main.cpp | 44 ++++++++++----------- src/objectBrowser/qtestbrowserdlg.cpp | 44 ++++++++++----------- src/objectBrowser/qtestbrowserdlg_p.h | 44 ++++++++++----------- src/protocol/QstConnection | 46 +++++++++++----------- src/protocol/QstConnectionManager | 46 +++++++++++----------- src/protocol/QstDebug | 46 +++++++++++----------- src/protocol/QstProtocol | 46 +++++++++++----------- src/protocol/qstconnection.cpp | 44 ++++++++++----------- src/protocol/qstconnection.h | 44 ++++++++++----------- src/protocol/qstconnectionmanager.cpp | 46 +++++++++++----------- src/protocol/qstconnectionmanager.h | 44 ++++++++++----------- src/protocol/qstdebug.h | 46 +++++++++++----------- src/protocol/qstglobal.h | 44 ++++++++++----------- src/protocol/qstprotocol.cpp | 44 ++++++++++----------- src/protocol/qstprotocol.h | 44 ++++++++++----------- src/remote/daemon/appmanager.cpp | 44 ++++++++++----------- src/remote/daemon/appmanager.h | 44 ++++++++++----------- src/remote/daemon/main.cpp | 46 +++++++++++----------- src/remote/daemon/qtuitest_debug.h | 46 +++++++++++----------- src/remote/daemon/qtuitestdsettings.cpp | 44 ++++++++++----------- src/remote/daemon/qtuitestdsettings.h | 44 ++++++++++----------- src/remote/daemon/qtuitestmaster.cpp | 44 ++++++++++----------- src/remote/daemon/qtuitestmaster_p.h | 44 ++++++++++----------- src/remote/daemon/qtuitestserver.cpp | 44 ++++++++++----------- src/remote/daemon/qtuitestserver.h | 44 ++++++++++----------- src/remote/daemon/qtuitestslave.cpp | 44 ++++++++++----------- src/remote/daemon/qtuitestslave.h | 44 ++++++++++----------- src/remote/slave/lib/qasciikey.cpp | 44 ++++++++++----------- src/remote/slave/lib/qeventwatcher.cpp | 44 ++++++++++----------- src/remote/slave/lib/qeventwatcher_p.h | 44 ++++++++++----------- src/remote/slave/lib/qinputgenerator.cpp | 44 ++++++++++----------- src/remote/slave/lib/qinputgenerator_generic.cpp | 44 ++++++++++----------- src/remote/slave/lib/qinputgenerator_generic_p.h | 44 ++++++++++----------- src/remote/slave/lib/qinputgenerator_p.h | 44 ++++++++++----------- src/remote/slave/lib/qinputgenerator_qwindow.cpp | 44 ++++++++++----------- src/remote/slave/lib/qinputgenerator_qwindow_p.h | 44 ++++++++++----------- src/remote/slave/lib/qsensorgenerator.cpp | 44 ++++++++++----------- src/remote/slave/lib/qsensorgenerator_p.h | 44 ++++++++++----------- src/remote/slave/lib/qtestslave.cpp | 44 ++++++++++----------- src/remote/slave/lib/qtestslave.h | 44 ++++++++++----------- src/remote/slave/lib/qtestwidgets.cpp | 44 ++++++++++----------- src/remote/slave/lib/qtestwidgets.h | 44 ++++++++++----------- src/remote/slave/lib/qtuitestconnectionmanager.cpp | 44 ++++++++++----------- src/remote/slave/lib/qtuitestconnectionmanager_p.h | 44 ++++++++++----------- src/remote/slave/lib/qtuitestmessagehandler.h | 44 ++++++++++----------- src/remote/slave/lib/qtuitestnamespace.cpp | 44 ++++++++++----------- src/remote/slave/lib/qtuitestnamespace.h | 44 ++++++++++----------- src/remote/slave/lib/qtuitestwidgetinterface.cpp | 44 ++++++++++----------- src/remote/slave/lib/qtuitestwidgetinterface.h | 44 ++++++++++----------- src/remote/slave/lib/qtuitestwidgets.cpp | 44 ++++++++++----------- src/remote/slave/lib/qtuitestwidgets_p.h | 44 ++++++++++----------- src/remote/slave/lib/testapplication.cpp | 44 ++++++++++----------- src/remote/slave/lib/testapplication.h | 44 ++++++++++----------- src/remote/slave/lib/testobject.cpp | 44 ++++++++++----------- src/remote/slave/lib/testobject.h | 44 ++++++++++----------- src/remote/slave/lib/testquickfactory.cpp | 44 ++++++++++----------- src/remote/slave/lib/testquickfactory.h | 46 +++++++++++----------- src/remote/slave/lib/testquickitem.cpp | 44 ++++++++++----------- src/remote/slave/lib/testquickitem.h | 44 ++++++++++----------- src/remote/slave/lib/testquickobject.cpp | 44 ++++++++++----------- src/remote/slave/lib/testquickobject.h | 44 ++++++++++----------- src/remote/slave/lib/testquickview.cpp | 44 ++++++++++----------- src/remote/slave/lib/testquickview.h | 44 ++++++++++----------- src/remote/slave/lib/testslaveserver.cpp | 44 ++++++++++----------- src/remote/slave/lib/testslaveserver.h | 44 ++++++++++----------- src/remote/slave/lib/testwidget.cpp | 44 ++++++++++----------- src/remote/slave/lib/testwidget.h | 44 ++++++++++----------- src/remote/slave/lib/testwindow.cpp | 44 ++++++++++----------- src/remote/slave/lib/testwindow.h | 44 ++++++++++----------- .../slave/styleplugin/qtuiteststyleplugin.cpp | 44 ++++++++++----------- src/testapp/main.cpp | 46 +++++++++++----------- src/testapp/mainwindow.cpp | 44 ++++++++++----------- src/testapp/mainwindow.h | 44 ++++++++++----------- tests/AllTests.qml | 46 +++++++++++----------- tests/InterpreterTests.qml | 46 +++++++++++----------- tests/MyConfig.qml | 46 +++++++++++----------- tests/RemoteTests.qml | 46 +++++++++++----------- tests/interpreter/CoreTests.qml | 44 ++++++++++----------- tests/interpreter/RunnerTests.qml | 46 +++++++++++----------- .../interpreter/core/ApplicationRegistryTests.qml | 46 +++++++++++----------- tests/interpreter/core/ClassTest.qml | 44 ++++++++++----------- tests/interpreter/core/ExpectApiTests.qml | 46 +++++++++++----------- tests/interpreter/core/FailApiTest.qml | 44 ++++++++++----------- tests/interpreter/core/ItemHandlerTests.qml | 46 +++++++++++----------- tests/interpreter/core/LocalProcessTest.qml | 44 ++++++++++----------- tests/interpreter/core/SleepTest.qml | 46 +++++++++++----------- .../core/application/CustomApplicationTest.qml | 44 ++++++++++----------- .../core/application/DefaultApplicationTest.qml | 44 ++++++++++----------- .../interpreter/core/application/MyApplication.js | 46 +++++++++++----------- .../interpreter/core/application/MyApplication.qml | 46 +++++++++++----------- .../core/application/RegisterUnregisterAppTest.qml | 44 ++++++++++----------- .../core/itemhandlers/CustomItemHandlerTest.qml | 44 ++++++++++----------- .../core/itemhandlers/DefaultItemHandlerTest.qml | 44 ++++++++++----------- .../core/itemhandlers/QstPushButton.qml | 46 +++++++++++----------- .../itemhandlers/RegisterUnregisterHandlerTest.qml | 44 ++++++++++----------- tests/interpreter/loggers/data/ExpectTests.qml | 44 ++++++++++----------- tests/interpreter/loggers/data/FailTest.qml | 46 +++++++++++----------- tests/interpreter/loggers/data/PassTest.qml | 46 +++++++++++----------- tests/interpreter/loggers/data/SkipTest.qml | 46 +++++++++++----------- tests/interpreter/loggers/data/SubTests.qml | 46 +++++++++++----------- tests/interpreter/loggers/data/Tests.qml | 46 +++++++++++----------- tests/interpreter/loggers/data/qsystemtest.xsd | 44 ++++++++++----------- tests/interpreter/runner/DefaultConfigTest.qml | 46 +++++++++++----------- tests/interpreter/runner/EmptyTest.qml | 46 +++++++++++----------- tests/interpreter/runner/EmptyTests.qml | 46 +++++++++++----------- tests/interpreter/runner/FailTest.qml | 44 ++++++++++----------- tests/interpreter/runner/MyUtils.js | 46 +++++++++++----------- tests/interpreter/runner/RunnerInternals.js | 46 +++++++++++----------- tests/interpreter/runner/SkipTest.qml | 44 ++++++++++----------- tests/interpreter/runner/UntestedTest.qml | 44 ++++++++++----------- tests/interpreter/runner/UntestedTests.qml | 44 ++++++++++----------- tests/remote/AssistantTest.qml | 44 ++++++++++----------- tests/remote/QstObjectApiTests.qml | 46 +++++++++++----------- tests/remote/RemoteApiTests.qml | 46 +++++++++++----------- tests/remote/RunProcessTests.qml | 46 +++++++++++----------- tests/remote/TestAppWidgetTest.qml | 44 ++++++++++----------- tests/remote/common/ApplicationTest.qml | 44 ++++++++++----------- .../qstobject/InheritanceBasedItemHandlerTest.qml | 44 ++++++++++----------- tests/remote/qstobject/ItemPropertyTest.qml | 46 +++++++++++----------- tests/remote/qstobject/MyQLineEdit.qml | 46 +++++++++++----------- tests/remote/qstobject/ParentApiTest.qml | 46 +++++++++++----------- tests/remote/qstobject/QstObjectApiTests.qml | 46 +++++++++++----------- tests/remote/runProcess/RunCommandTest.qml | 46 +++++++++++----------- 193 files changed, 4304 insertions(+), 4304 deletions(-) diff --git a/examples/tutorial/main.cpp b/examples/tutorial/main.cpp index b7928ae..614b0ef 100644 --- a/examples/tutorial/main.cpp +++ b/examples/tutorial/main.cpp @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** 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. +** +** 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 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tests/01_parts/PartsTest.qml b/examples/tutorial/tests/01_parts/PartsTest.qml index 7570353..da64958 100644 --- a/examples/tutorial/tests/01_parts/PartsTest.qml +++ b/examples/tutorial/tests/01_parts/PartsTest.qml @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** 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. +** +** 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 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tests/02_validate/ValidateTest.qml b/examples/tutorial/tests/02_validate/ValidateTest.qml index f701dcc..57c0305 100644 --- a/examples/tutorial/tests/02_validate/ValidateTest.qml +++ b/examples/tutorial/tests/02_validate/ValidateTest.qml @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** 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. +** +** 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 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tests/03_applicationUnderTest/ApplicationUnderTest.qml b/examples/tutorial/tests/03_applicationUnderTest/ApplicationUnderTest.qml index e1d6150..8bba706 100644 --- a/examples/tutorial/tests/03_applicationUnderTest/ApplicationUnderTest.qml +++ b/examples/tutorial/tests/03_applicationUnderTest/ApplicationUnderTest.qml @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. +** 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. ** -** 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 -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tests/04_findItem/FindItemTest.qml b/examples/tutorial/tests/04_findItem/FindItemTest.qml index 505b753..2632beb 100644 --- a/examples/tutorial/tests/04_findItem/FindItemTest.qml +++ b/examples/tutorial/tests/04_findItem/FindItemTest.qml @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. +** 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. ** -** 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 -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tests/04_findItem/TenPinTest.qml b/examples/tutorial/tests/04_findItem/TenPinTest.qml index 961321d..044c8a6 100644 --- a/examples/tutorial/tests/04_findItem/TenPinTest.qml +++ b/examples/tutorial/tests/04_findItem/TenPinTest.qml @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. +** 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. ** -** 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 -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tests/05_input/InputTest.qml b/examples/tutorial/tests/05_input/InputTest.qml index ddfabd1..4de06b7 100644 --- a/examples/tutorial/tests/05_input/InputTest.qml +++ b/examples/tutorial/tests/05_input/InputTest.qml @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. +** 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. ** -** 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 -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tests/05_input/TenPinTest.qml b/examples/tutorial/tests/05_input/TenPinTest.qml index 961321d..044c8a6 100644 --- a/examples/tutorial/tests/05_input/TenPinTest.qml +++ b/examples/tutorial/tests/05_input/TenPinTest.qml @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. +** 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. ** -** 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 -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tests/06_data/InputTest.qml b/examples/tutorial/tests/06_data/InputTest.qml index 1b6610f..29f4528 100644 --- a/examples/tutorial/tests/06_data/InputTest.qml +++ b/examples/tutorial/tests/06_data/InputTest.qml @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. +** 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. ** -** 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 -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tests/06_data/InputTests.qml b/examples/tutorial/tests/06_data/InputTests.qml index d76a8a2..b061927 100644 --- a/examples/tutorial/tests/06_data/InputTests.qml +++ b/examples/tutorial/tests/06_data/InputTests.qml @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. +** 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. ** -** 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 -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tests/06_data/TenPinTest.qml b/examples/tutorial/tests/06_data/TenPinTest.qml index 961321d..044c8a6 100644 --- a/examples/tutorial/tests/06_data/TenPinTest.qml +++ b/examples/tutorial/tests/06_data/TenPinTest.qml @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. +** 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. ** -** 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 -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tpframe.cpp b/examples/tutorial/tpframe.cpp index bd71d0a..e9cd55f 100644 --- a/examples/tutorial/tpframe.cpp +++ b/examples/tutorial/tpframe.cpp @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. +** 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. ** -** 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 -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tpframe.h b/examples/tutorial/tpframe.h index e0416ba..0e82a93 100644 --- a/examples/tutorial/tpframe.h +++ b/examples/tutorial/tpframe.h @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. +** 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. ** -** 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 -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tpframeball.cpp b/examples/tutorial/tpframeball.cpp index d69884a..ee76d48 100644 --- a/examples/tutorial/tpframeball.cpp +++ b/examples/tutorial/tpframeball.cpp @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. +** 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. ** -** 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 -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tpframeball.h b/examples/tutorial/tpframeball.h index bf9602e..d4d1a92 100644 --- a/examples/tutorial/tpframeball.h +++ b/examples/tutorial/tpframeball.h @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. +** 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. ** -** 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 -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tpgame.cpp b/examples/tutorial/tpgame.cpp index 80f2da4..7c069b2 100644 --- a/examples/tutorial/tpgame.cpp +++ b/examples/tutorial/tpgame.cpp @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. +** 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. ** -** 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 -** 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/examples/tutorial/tpgame.h b/examples/tutorial/tpgame.h index a884211..f7d6644 100644 --- a/examples/tutorial/tpgame.h +++ b/examples/tutorial/tpgame.h @@ -6,33 +6,33 @@ ** This file is part of QtSystemTest. ** ** $QT_BEGIN_LICENSE:LGPL$ +** 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 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 -** 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. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** 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. +** +** 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 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** +** 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. ** ** ** $QT_END_LICENSE$ diff --git a/scripts/update_license.pl b/scripts/update_license.pl index 9644759..c3a7869 100644 --- a/scripts/update_license.pl +++ b/scripts/update_license.pl @@ -18,33 +18,33 @@ print <