diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-18 09:37:17 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-18 09:37:27 +0200 |
commit | ea2a8b12fe36203c29f0bd1a85dc41aada905bf3 (patch) | |
tree | 77eb93febef29b34f7b0589366314cc6da34aa1d /src/script/doc/snippets/code/doc_src_qtscript.cpp | |
parent | cd7d2dc5481f7954da7ebec27b86adda2602c5b7 (diff) | |
parent | 13f4c129c2ba12956a6105bd57f407cc07708ca1 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Idebaee1835329337ee03e27e9499b951a5cdb907
Diffstat (limited to 'src/script/doc/snippets/code/doc_src_qtscript.cpp')
-rw-r--r-- | src/script/doc/snippets/code/doc_src_qtscript.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/script/doc/snippets/code/doc_src_qtscript.cpp b/src/script/doc/snippets/code/doc_src_qtscript.cpp index 93087c5..cfc7fe9 100644 --- a/src/script/doc/snippets/code/doc_src_qtscript.cpp +++ b/src/script/doc/snippets/code/doc_src_qtscript.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 documentation 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 |