diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:19:07 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:19:07 +0100 |
commit | 9f552c8ca87c588ea38cd5de5a320f00f56b65c6 (patch) | |
tree | 8f0351a94880b33727bdfe3d7bcdb463c102e329 /src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp | |
parent | 34cd2d63fc3ce594887f5245896c795ffb8596b5 (diff) | |
parent | ffd8366ad503649c6de365c427d0de15ab9a75db (diff) | |
download | qtxmlpatterns-9f552c8ca87c588ea38cd5de5a320f00f56b65c6.tar.gz |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I5164e541f99e42d78d12fbdeea98ecc6db117637
Diffstat (limited to 'src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp')
-rw-r--r-- | src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp b/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp index a6abdf4..80c9687 100644 --- a/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.cpp +++ b/src/xmlpatterns/doc/snippets/doc_src_qtxmlpatterns.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 |