diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-18 08:55:15 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-18 08:56:11 +0200 |
commit | 13f4c129c2ba12956a6105bd57f407cc07708ca1 (patch) | |
tree | e92a180d0e8c96f6de7488bbd2af58e7923c0069 /examples/script/qstetrix/tetrixboard.cpp | |
parent | a4c96742f5166d6354f2ac22233d4679d12ec3ae (diff) | |
parent | 95b51b007efdec4994f9c0e01b3a9609ffdedf21 (diff) | |
download | qtscript-13f4c129c2ba12956a6105bd57f407cc07708ca1.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3
Conflicts:
.qmake.conf
qtscript.pro
Change-Id: If0f8875c8af2afb717ba394fac4e506076f01517
Diffstat (limited to 'examples/script/qstetrix/tetrixboard.cpp')
-rw-r--r-- | examples/script/qstetrix/tetrixboard.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/examples/script/qstetrix/tetrixboard.cpp b/examples/script/qstetrix/tetrixboard.cpp index deba1cf..f92e9a7 100644 --- a/examples/script/qstetrix/tetrixboard.cpp +++ b/examples/script/qstetrix/tetrixboard.cpp @@ -1,12 +1,22 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the examples of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** BSD License Usage +** Alternatively, you may use this file under the terms of the BSD license +** as follows: ** ** "Redistribution and use in source and binary forms, with or without ** modification, are permitted provided that the following conditions are |