diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> | 2015-08-10 13:22:24 +0200 |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> | 2015-08-10 11:45:25 +0000 |
commit | e30df2ce13e7d1ec6add8bb0ea4f96217246ec3e (patch) | |
tree | 239f9f50d0a374e63ebdef695b0f13426dc70748 | |
parent | 6accacb3200478d1818dfc4c5b9856833f78da03 (diff) |
Remove GPLv2 from license options
The GPLv2 license is not compatible with the Apache license,
which is the license used for some of the Android code, and
having different licenses on different target platforms is not
a good solution for the end-users, so instead we remove GPLv2
from the license options and go with the standard LGPLv3+Commercial
dual license.
Change-Id: I1112fab94c1bb4d1b3a3edaae0fbf58bba38cce8
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
52 files changed, 55 insertions, 471 deletions
diff --git a/examples/purchasing/qthangman/hangmangame.cpp b/examples/purchasing/qthangman/hangmangame.cpp index fc2d469..34ff42b 100644 --- a/examples/purchasing/qthangman/hangmangame.cpp +++ b/examples/purchasing/qthangman/hangmangame.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/hangmangame.h b/examples/purchasing/qthangman/hangmangame.h index 4a4a553..2aca313 100644 --- a/examples/purchasing/qthangman/hangmangame.h +++ b/examples/purchasing/qthangman/hangmangame.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/main.cpp b/examples/purchasing/qthangman/main.cpp index 6bf4b63..0467d56 100644 --- a/examples/purchasing/qthangman/main.cpp +++ b/examples/purchasing/qthangman/main.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/GameView.qml b/examples/purchasing/qthangman/qml/qthangman/GameView.qml index 0d82869..c80892b 100644 --- a/examples/purchasing/qthangman/qml/qthangman/GameView.qml +++ b/examples/purchasing/qthangman/qml/qthangman/GameView.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/GuessWordView.qml b/examples/purchasing/qthangman/qml/qthangman/GuessWordView.qml index fde4174..77f500a 100644 --- a/examples/purchasing/qthangman/qml/qthangman/GuessWordView.qml +++ b/examples/purchasing/qthangman/qml/qthangman/GuessWordView.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/Hangman.qml b/examples/purchasing/qthangman/qml/qthangman/Hangman.qml index 1b14aa9..11a0320 100644 --- a/examples/purchasing/qthangman/qml/qthangman/Hangman.qml +++ b/examples/purchasing/qthangman/qml/qthangman/Hangman.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/HowToView.qml b/examples/purchasing/qthangman/qml/qthangman/HowToView.qml index 4be86ef..277372f 100644 --- a/examples/purchasing/qthangman/qml/qthangman/HowToView.qml +++ b/examples/purchasing/qthangman/qml/qthangman/HowToView.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/Key.qml b/examples/purchasing/qthangman/qml/qthangman/Key.qml index f76f363..2361741 100644 --- a/examples/purchasing/qthangman/qml/qthangman/Key.qml +++ b/examples/purchasing/qthangman/qml/qthangman/Key.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/Letter.qml b/examples/purchasing/qthangman/qml/qthangman/Letter.qml index 4cae319..ab9edab 100644 --- a/examples/purchasing/qthangman/qml/qthangman/Letter.qml +++ b/examples/purchasing/qthangman/qml/qthangman/Letter.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/LetterSelector.qml b/examples/purchasing/qthangman/qml/qthangman/LetterSelector.qml index 274209d..8495c66 100644 --- a/examples/purchasing/qthangman/qml/qthangman/LetterSelector.qml +++ b/examples/purchasing/qthangman/qml/qthangman/LetterSelector.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/MainView.qml b/examples/purchasing/qthangman/qml/qthangman/MainView.qml index 6653cb0..8cd705c 100644 --- a/examples/purchasing/qthangman/qml/qthangman/MainView.qml +++ b/examples/purchasing/qthangman/qml/qthangman/MainView.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/PageHeader.qml b/examples/purchasing/qthangman/qml/qthangman/PageHeader.qml index 4a89f2a..92bc5fd 100644 --- a/examples/purchasing/qthangman/qml/qthangman/PageHeader.qml +++ b/examples/purchasing/qthangman/qml/qthangman/PageHeader.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/ScoreItem.qml b/examples/purchasing/qthangman/qml/qthangman/ScoreItem.qml index a59b1f0..4ff7968 100644 --- a/examples/purchasing/qthangman/qml/qthangman/ScoreItem.qml +++ b/examples/purchasing/qthangman/qml/qthangman/ScoreItem.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/SimpleButton.qml b/examples/purchasing/qthangman/qml/qthangman/SimpleButton.qml index cf1d760..7c83350 100644 --- a/examples/purchasing/qthangman/qml/qthangman/SimpleButton.qml +++ b/examples/purchasing/qthangman/qml/qthangman/SimpleButton.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/SplashScreen.qml b/examples/purchasing/qthangman/qml/qthangman/SplashScreen.qml index ff7eb52..801ce99 100644 --- a/examples/purchasing/qthangman/qml/qthangman/SplashScreen.qml +++ b/examples/purchasing/qthangman/qml/qthangman/SplashScreen.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/StoreItem.qml b/examples/purchasing/qthangman/qml/qthangman/StoreItem.qml index 88a2916..2385eec 100644 --- a/examples/purchasing/qthangman/qml/qthangman/StoreItem.qml +++ b/examples/purchasing/qthangman/qml/qthangman/StoreItem.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/StoreView.qml b/examples/purchasing/qthangman/qml/qthangman/StoreView.qml index a4473a9..910b4f0 100644 --- a/examples/purchasing/qthangman/qml/qthangman/StoreView.qml +++ b/examples/purchasing/qthangman/qml/qthangman/StoreView.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/Word.qml b/examples/purchasing/qthangman/qml/qthangman/Word.qml index 391874b..2729c4b 100644 --- a/examples/purchasing/qthangman/qml/qthangman/Word.qml +++ b/examples/purchasing/qthangman/qml/qthangman/Word.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/examples/purchasing/qthangman/qml/qthangman/main.qml b/examples/purchasing/qthangman/qml/qthangman/main.qml index 524c159..6bdae45 100644 --- a/examples/purchasing/qthangman/qml/qthangman/main.qml +++ b/examples/purchasing/qthangman/qml/qthangman/main.qml @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java b/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java index ec3d94d..48261b1 100644 --- a/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java +++ b/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/imports/purchasing/inapppurchase.cpp b/src/imports/purchasing/inapppurchase.cpp index 1ba123a..f20fff9 100644 --- a/src/imports/purchasing/inapppurchase.cpp +++ b/src/imports/purchasing/inapppurchase.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/imports/purchasing/qinappproductqmltype.cpp b/src/imports/purchasing/qinappproductqmltype.cpp index 6718f1c..e35c38c 100644 --- a/src/imports/purchasing/qinappproductqmltype.cpp +++ b/src/imports/purchasing/qinappproductqmltype.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/imports/purchasing/qinappproductqmltype_p.h b/src/imports/purchasing/qinappproductqmltype_p.h index 872bdfa..fe40cdb 100644 --- a/src/imports/purchasing/qinappproductqmltype_p.h +++ b/src/imports/purchasing/qinappproductqmltype_p.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/imports/purchasing/qinappstoreqmltype.cpp b/src/imports/purchasing/qinappstoreqmltype.cpp index 3cc89e6..e30aa38 100644 --- a/src/imports/purchasing/qinappstoreqmltype.cpp +++ b/src/imports/purchasing/qinappstoreqmltype.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/imports/purchasing/qinappstoreqmltype_p.h b/src/imports/purchasing/qinappstoreqmltype_p.h index d7210ff..524214a 100644 --- a/src/imports/purchasing/qinappstoreqmltype_p.h +++ b/src/imports/purchasing/qinappstoreqmltype_p.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/android/qandroidinappproduct.cpp b/src/purchasing/inapppurchase/android/qandroidinappproduct.cpp index 3c905ba..7585268 100644 --- a/src/purchasing/inapppurchase/android/qandroidinappproduct.cpp +++ b/src/purchasing/inapppurchase/android/qandroidinappproduct.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/android/qandroidinappproduct_p.h b/src/purchasing/inapppurchase/android/qandroidinappproduct_p.h index ae1a4db..7c9626d 100644 --- a/src/purchasing/inapppurchase/android/qandroidinappproduct_p.h +++ b/src/purchasing/inapppurchase/android/qandroidinappproduct_p.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp index 924a228..87c044d 100644 --- a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp +++ b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -49,7 +41,7 @@ QT_BEGIN_NAMESPACE -// #define QANDROIDINAPPPURCHASEBACKEND_DEBUG +#define QANDROIDINAPPPURCHASEBACKEND_DEBUG QAndroidInAppPurchaseBackend::QAndroidInAppPurchaseBackend(QObject *parent) : QInAppPurchaseBackend(parent) diff --git a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend_p.h b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend_p.h index 80a934d..62ac31c 100644 --- a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend_p.h +++ b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend_p.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/android/qandroidinapptransaction.cpp b/src/purchasing/inapppurchase/android/qandroidinapptransaction.cpp index d9db6e3..d516f5e 100644 --- a/src/purchasing/inapppurchase/android/qandroidinapptransaction.cpp +++ b/src/purchasing/inapppurchase/android/qandroidinapptransaction.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/android/qandroidinapptransaction_p.h b/src/purchasing/inapppurchase/android/qandroidinapptransaction_p.h index 778e652..e50e58b 100644 --- a/src/purchasing/inapppurchase/android/qandroidinapptransaction_p.h +++ b/src/purchasing/inapppurchase/android/qandroidinapptransaction_p.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/android/qandroidjni.cpp b/src/purchasing/inapppurchase/android/qandroidjni.cpp index 16f7ea0..3c4d700 100644 --- a/src/purchasing/inapppurchase/android/qandroidjni.cpp +++ b/src/purchasing/inapppurchase/android/qandroidjni.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/ios/qiosinapppurchasebackend.mm b/src/purchasing/inapppurchase/ios/qiosinapppurchasebackend.mm index f876ef8..92f3bb0 100644 --- a/src/purchasing/inapppurchase/ios/qiosinapppurchasebackend.mm +++ b/src/purchasing/inapppurchase/ios/qiosinapppurchasebackend.mm @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/ios/qiosinapppurchasebackend_p.h b/src/purchasing/inapppurchase/ios/qiosinapppurchasebackend_p.h index a6bde88..83febbe 100644 --- a/src/purchasing/inapppurchase/ios/qiosinapppurchasebackend_p.h +++ b/src/purchasing/inapppurchase/ios/qiosinapppurchasebackend_p.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/ios/qiosinapppurchaseproduct.mm b/src/purchasing/inapppurchase/ios/qiosinapppurchaseproduct.mm index 0d9228b..903e5f5 100644 --- a/src/purchasing/inapppurchase/ios/qiosinapppurchaseproduct.mm +++ b/src/purchasing/inapppurchase/ios/qiosinapppurchaseproduct.mm @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/ios/qiosinapppurchaseproduct_p.h b/src/purchasing/inapppurchase/ios/qiosinapppurchaseproduct_p.h index 16ff2e7..ff51f87 100644 --- a/src/purchasing/inapppurchase/ios/qiosinapppurchaseproduct_p.h +++ b/src/purchasing/inapppurchase/ios/qiosinapppurchaseproduct_p.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/ios/qiosinapppurchasetransaction.mm b/src/purchasing/inapppurchase/ios/qiosinapppurchasetransaction.mm index 0368db6..fccb74c 100644 --- a/src/purchasing/inapppurchase/ios/qiosinapppurchasetransaction.mm +++ b/src/purchasing/inapppurchase/ios/qiosinapppurchasetransaction.mm @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/ios/qiosinapppurchasetransaction_p.h b/src/purchasing/inapppurchase/ios/qiosinapppurchasetransaction_p.h index 49133e1..fe9d4df 100644 --- a/src/purchasing/inapppurchase/ios/qiosinapppurchasetransaction_p.h +++ b/src/purchasing/inapppurchase/ios/qiosinapppurchasetransaction_p.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/qinappproduct.cpp b/src/purchasing/inapppurchase/qinappproduct.cpp index e4a26e3..535316e 100644 --- a/src/purchasing/inapppurchase/qinappproduct.cpp +++ b/src/purchasing/inapppurchase/qinappproduct.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/qinappproduct.h b/src/purchasing/inapppurchase/qinappproduct.h index 9aaec86..422ade5 100644 --- a/src/purchasing/inapppurchase/qinappproduct.h +++ b/src/purchasing/inapppurchase/qinappproduct.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/qinapppurchasebackend.cpp b/src/purchasing/inapppurchase/qinapppurchasebackend.cpp index f43e06d..69e8bd5 100644 --- a/src/purchasing/inapppurchase/qinapppurchasebackend.cpp +++ b/src/purchasing/inapppurchase/qinapppurchasebackend.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/qinapppurchasebackend_p.h b/src/purchasing/inapppurchase/qinapppurchasebackend_p.h index 8aeceb3..f4a0785 100644 --- a/src/purchasing/inapppurchase/qinapppurchasebackend_p.h +++ b/src/purchasing/inapppurchase/qinapppurchasebackend_p.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/qinapppurchasebackendfactory.cpp b/src/purchasing/inapppurchase/qinapppurchasebackendfactory.cpp index af06306..be2ad60 100644 --- a/src/purchasing/inapppurchase/qinapppurchasebackendfactory.cpp +++ b/src/purchasing/inapppurchase/qinapppurchasebackendfactory.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/qinapppurchasebackendfactory_p.h b/src/purchasing/inapppurchase/qinapppurchasebackendfactory_p.h index 6c8ac31..2d213c4 100644 --- a/src/purchasing/inapppurchase/qinapppurchasebackendfactory_p.h +++ b/src/purchasing/inapppurchase/qinapppurchasebackendfactory_p.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/qinappstore.cpp b/src/purchasing/inapppurchase/qinappstore.cpp index f1322da..3ee797e 100644 --- a/src/purchasing/inapppurchase/qinappstore.cpp +++ b/src/purchasing/inapppurchase/qinappstore.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/qinappstore.h b/src/purchasing/inapppurchase/qinappstore.h index a0f870a..e016c71 100644 --- a/src/purchasing/inapppurchase/qinappstore.h +++ b/src/purchasing/inapppurchase/qinappstore.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/qinappstore_p.h b/src/purchasing/inapppurchase/qinappstore_p.h index fce9dad..9c43cde 100644 --- a/src/purchasing/inapppurchase/qinappstore_p.h +++ b/src/purchasing/inapppurchase/qinappstore_p.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/qinapptransaction.cpp b/src/purchasing/inapppurchase/qinapptransaction.cpp index 4000337..6f2d50d 100644 --- a/src/purchasing/inapppurchase/qinapptransaction.cpp +++ b/src/purchasing/inapppurchase/qinapptransaction.cpp @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/inapppurchase/qinapptransaction.h b/src/purchasing/inapppurchase/qinapptransaction.h index b2c058c..6b9e17c 100644 --- a/src/purchasing/inapppurchase/qinapptransaction.h +++ b/src/purchasing/inapppurchase/qinapptransaction.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/purchasing/qtpurchasingglobal.h b/src/purchasing/qtpurchasingglobal.h index 5dd44a0..ee0ab74 100644 --- a/src/purchasing/qtpurchasingglobal.h +++ b/src/purchasing/qtpurchasingglobal.h @@ -5,7 +5,7 @@ ** ** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/tests/auto/purchasing/qinappstore/tst_qinappstore.cpp b/tests/auto/purchasing/qinappstore/tst_qinappstore.cpp index fb9af20..e0398ad 100644 --- a/tests/auto/purchasing/qinappstore/tst_qinappstore.cpp +++ b/tests/auto/purchasing/qinappstore/tst_qinappstore.cpp @@ -3,9 +3,9 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the test suite of the Qt Toolkit. +** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/tests/manual/qinappstore/tst_qinappstore.cpp b/tests/manual/qinappstore/tst_qinappstore.cpp index 29d8ed4..7fd5227 100644 --- a/tests/manual/qinappstore/tst_qinappstore.cpp +++ b/tests/manual/qinappstore/tst_qinappstore.cpp @@ -3,9 +3,9 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the test suite of the Qt Toolkit. +** This file is part of the Purchasing module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL3$ +** $QT_BEGIN_LICENSE:LGPL3-COMM$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the @@ -22,14 +22,6 @@ ** ensure the GNU Lesser General Public License version 3 requirements ** will be met: https://www.gnu.org/licenses/lgpl.html. ** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later 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 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** ** $QT_END_LICENSE$ ** ****************************************************************************/ |