diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-20 14:56:05 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 14:56:05 +0100 |
commit | 616207ec9783cf58661f35782fee6f8c825f205f (patch) | |
tree | 54a0c8b75d194563f9c49fcfe7870fd10f018187 /examples/activeqt/simpleqml/main.qml | |
parent | e92a1ce71a355a620b809317778c5d8208906d9c (diff) | |
parent | 99611af4845e4c7893a03c0b13f2fd2275f318e3 (diff) | |
download | qtactiveqt-616207ec9783cf58661f35782fee6f8c825f205f.tar.gz |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
examples/activeqt/webbrowser/main.cpp
examples/activeqt/webbrowser/webaxwidget.h
Change-Id: I80775f6d355a278880d7e6044390b67a6f6a893e
Diffstat (limited to 'examples/activeqt/simpleqml/main.qml')
-rw-r--r-- | examples/activeqt/simpleqml/main.qml | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/examples/activeqt/simpleqml/main.qml b/examples/activeqt/simpleqml/main.qml index cb75da2..63737d9 100644 --- a/examples/activeqt/simpleqml/main.qml +++ b/examples/activeqt/simpleqml/main.qml @@ -6,7 +6,17 @@ ** 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 |