diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:42:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-30 08:48:01 +0100 |
| commit | c9acfe0bc8dbaec1065614fa2039ebe7e05b4bda (patch) | |
| tree | 6ced392965bf01be840da14e7f1606b0b5b2293d /src/activeqt/container/qaxobject.h | |
| parent | f263d206341472e23e0e1ad536faa1b0a22286c0 (diff) | |
| parent | cacf666f95df9790cebf5d5cdb0609cee257fab3 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4
Conflicts:
.qmake.conf
Change-Id: Ie457478a64a28434afb3361dfc6f9478dd9c58bd
Diffstat (limited to 'src/activeqt/container/qaxobject.h')
| -rw-r--r-- | src/activeqt/container/qaxobject.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/activeqt/container/qaxobject.h b/src/activeqt/container/qaxobject.h index f7e16d2..25d8f1d 100644 --- a/src/activeqt/container/qaxobject.h +++ b/src/activeqt/container/qaxobject.h @@ -6,7 +6,17 @@ ** This file is part of the ActiveQt framework 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 |